From patchwork Mon Dec 17 10:56:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153987 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2335838ljp; Mon, 17 Dec 2018 03:09:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/VN22xYpTptIRhlxi4s+VekUWc7ZEAIP2lgu0x2YGCbZQfFm+t51m4D7F+NzYFyONYe/Djo X-Received: by 2002:a0c:8542:: with SMTP id n60mr12486615qva.205.1545044950590; Mon, 17 Dec 2018 03:09:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545044950; cv=none; d=google.com; s=arc-20160816; b=mRnz/5AKDhVJo22AXccEHFsHqQ9MsXujR5uyoAjFY9r7zSansiA8eCcDVO1fB7qKTH V8ofXaGM8dS/wbHzv3E5bpJJQInDFqy9UhNGdHC1/rEY6ndwrlQNgGNUpU9gAp99bqYb /BVtstg/NnGN92AVJevxsfV/H3rD4g2AocCXPb5CuZCp/0cHeWlJPicXvl4KRKChr1x6 qQgp+Kfi8DILG22UJCzlDUuSSwqfdP2zwIHTtwr+f+D5JujRsFZaunzrfLzuy5Wr7SkL fSb4T4Kp1nqke2jhjmTa3jwwoMD1zlqZoZUZcaJE90sPnCh5jkNfn2vYNg1KF9CDY/Ae McAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=UBrDEL/8GNRM4b55ogWA7uIYylBy9hKpPQIaQIKKC+Q=; b=c8+8pVM7HXII7p0Nr2OqxSiMgNa+7RuPNptou6u9x2+IbZNauZHX9l6HTrr72PwCX9 WH6dVqd6KWwGHXvGgvxJrn0aSdEgh08IdcX13dJAHgoXDePMnNOE/vgIpQIr4CPzNr1I buNO3tZ4QC57aDEdwjHhLMezqN/iJ4CtfbSAYQ5zYpJiJK+akbHkqVCuTI575oxVzxAK CTOVqnXz+CA7Ub8nKgXa0LDwRhfYTxSaehQh72g6TIu2tDGvjIwxefrrMCWxSKHQXrEB 1Mb32tkGbd17tmB06cej5+ZNgEiTvaLb7S7QoaTZyGh17XB5dfMSU86nJwziX4tszTvG 2zHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BFvXGdDh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u15si4112930qki.238.2018.12.17.03.09.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Dec 2018 03:09:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BFvXGdDh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYqlp-00027Y-TJ for patch@linaro.org; Mon, 17 Dec 2018 06:09:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYqbo-0002Y7-Rf for qemu-devel@nongnu.org; Mon, 17 Dec 2018 05:58:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYqa2-00008P-E6 for qemu-devel@nongnu.org; Mon, 17 Dec 2018 05:56:59 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45113) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gYqa2-00007h-42 for qemu-devel@nongnu.org; Mon, 17 Dec 2018 05:56:58 -0500 Received: by mail-wr1-x42b.google.com with SMTP id t6so11595125wrr.12 for ; Mon, 17 Dec 2018 02:56:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UBrDEL/8GNRM4b55ogWA7uIYylBy9hKpPQIaQIKKC+Q=; b=BFvXGdDhWmjWBKG3Bqq4w7WCSBWPt9T+CzyO27apWHTIbmGwetZaFHDmHO0U2r+evo JrlZYW42jFR+2cSkmyVn0dPjIbVYFmPaNB5Bf24dd3+MCczSF1p188HQjU0EObld38Qs 8ShROStcL7KCw93luwfB+ihEhVfH2G7LdgdXY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UBrDEL/8GNRM4b55ogWA7uIYylBy9hKpPQIaQIKKC+Q=; b=nWTmbgO1BCTTB8pLmHLy3W+WwQ83CqcmBaupkX6ScyMJbymlOFhMBfuGY9kVMZKuvD hWPQxGVBwBAyVhrwix8pYfnrAeQU9aAggS9FAfbVlyjnwNCeZc3Mt2u6CDKekKSM/4mw rd6WOa6eY8WH5uL1KzF8GUk8jKttKD532OPh8yhrM72w1Aj71ZrcEFnhVkEYeqvKBZdf 8dPmPMLxLKoD/56zanZLqqkHR1C+Mq7Z49CjMMQglA1OdvhvEnRl8qrOJI1bJMB63AWM M46BT5cU9EoeL6FjV9prtBmThNECeq0hvMUJT4I/PYygiQaY6NOPft/4Ow0yAYBJf989 kHLw== X-Gm-Message-State: AA+aEWYJ4eQ2Zx9j9rah7PTUTOSgVk6ibgXwfaBczr2/7Bg3Xv2MXr4Y ecg+uFw3txioKRdbOnk1HUMtwg== X-Received: by 2002:adf:84e4:: with SMTP id 91mr9974558wrg.237.1545044216822; Mon, 17 Dec 2018 02:56:56 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o64sm10057725wmo.47.2018.12.17.02.56.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Dec 2018 02:56:54 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 219FE3E056A; Mon, 17 Dec 2018 10:56:51 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 17 Dec 2018 10:56:41 +0000 Message-Id: <20181217105650.27361-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181217105650.27361-1-alex.bennee@linaro.org> References: <20181217105650.27361-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL v3 06/15] softfloat: rename canonicalize to sf_canonicalize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Emilio G. Cota" , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" glibc >= 2.25 defines canonicalize in commit eaf5ad0 (Add canonicalize, canonicalizef, canonicalizel., 2016-10-26). Given that we'll be including soon, prepare for this by prefixing our canonicalize() with sf_ to avoid clashing with the libc's canonicalize(). Reported-by: Bastian Koppelmann Tested-by: Bastian Koppelmann Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/fpu/softfloat.c b/fpu/softfloat.c index e1eef954e6..ecdc00c633 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -336,8 +336,8 @@ static inline float64 float64_pack_raw(FloatParts p) #include "softfloat-specialize.h" /* Canonicalize EXP and FRAC, setting CLS. */ -static FloatParts canonicalize(FloatParts part, const FloatFmt *parm, - float_status *status) +static FloatParts sf_canonicalize(FloatParts part, const FloatFmt *parm, + float_status *status) { if (part.exp == parm->exp_max && !parm->arm_althp) { if (part.frac == 0) { @@ -513,7 +513,7 @@ static FloatParts round_canonical(FloatParts p, float_status *s, static FloatParts float16a_unpack_canonical(float16 f, float_status *s, const FloatFmt *params) { - return canonicalize(float16_unpack_raw(f), params, s); + return sf_canonicalize(float16_unpack_raw(f), params, s); } static FloatParts float16_unpack_canonical(float16 f, float_status *s) @@ -534,7 +534,7 @@ static float16 float16_round_pack_canonical(FloatParts p, float_status *s) static FloatParts float32_unpack_canonical(float32 f, float_status *s) { - return canonicalize(float32_unpack_raw(f), &float32_params, s); + return sf_canonicalize(float32_unpack_raw(f), &float32_params, s); } static float32 float32_round_pack_canonical(FloatParts p, float_status *s) @@ -544,7 +544,7 @@ static float32 float32_round_pack_canonical(FloatParts p, float_status *s) static FloatParts float64_unpack_canonical(float64 f, float_status *s) { - return canonicalize(float64_unpack_raw(f), &float64_params, s); + return sf_canonicalize(float64_unpack_raw(f), &float64_params, s); } static float64 float64_round_pack_canonical(FloatParts p, float_status *s)