From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3rZZ-0004KL-JK for qemu-devel@nongnu.org; Wed, 04 Apr 2018 19:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3rZY-00044W-PM for qemu-devel@nongnu.org; Wed, 04 Apr 2018 19:12:09 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52037) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f3rZY-00044O-Kk for qemu-devel@nongnu.org; Wed, 04 Apr 2018 19:12:08 -0400 From: "Emilio G. Cota" Date: Wed, 4 Apr 2018 19:11:07 -0400 Message-Id: <1522883475-27858-8-git-send-email-cota@braap.org> In-Reply-To: <1522883475-27858-1-git-send-email-cota@braap.org> References: <1522883475-27858-1-git-send-email-cota@braap.org> Subject: [Qemu-devel] [PATCH v3 07/15] softfloat: rename canonicalize to sf_canonicalize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Richard Henderson , Paolo Bonzini , Mark Cave-Ayland , Bastian Koppelmann 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 Cc: Bastian Koppelmann Signed-off-by: Emilio G. Cota --- fpu/softfloat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 6803279..c3b9d07 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -323,8 +323,8 @@ static inline float64 float64_pack_raw(FloatParts p) } /* 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) { if (part.frac == 0) { @@ -494,7 +494,7 @@ static FloatParts round_canonical(FloatParts p, float_status *s, static FloatParts float16_unpack_canonical(float16 f, float_status *s) { - return canonicalize(float16_unpack_raw(f), &float16_params, s); + return sf_canonicalize(float16_unpack_raw(f), &float16_params, s); } static float16 float16_round_pack_canonical(FloatParts p, float_status *s) @@ -512,7 +512,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) @@ -530,7 +530,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) -- 2.7.4