From patchwork Fri Dec 14 13:54:43 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: 10731201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A01B114DE for ; Fri, 14 Dec 2018 13:59:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA4222D4D2 for ; Fri, 14 Dec 2018 13:59:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE3F82D4E8; Fri, 14 Dec 2018 13:59:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5E3A42D4D2 for ; Fri, 14 Dec 2018 13:59:21 +0000 (UTC) Received: from localhost ([::1]:33657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXnzr-0002Ua-Vs for patchwork-qemu-devel@patchwork.kernel.org; Fri, 14 Dec 2018 08:59:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXnvi-0008M9-88 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 08:55:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXnvg-0001wP-QN for qemu-devel@nongnu.org; Fri, 14 Dec 2018 08:55:02 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:50384) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXnvg-0001vE-DH for qemu-devel@nongnu.org; Fri, 14 Dec 2018 08:55:00 -0500 Received: by mail-wm1-x332.google.com with SMTP id n190so5798631wmd.0 for ; Fri, 14 Dec 2018 05:54:59 -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=LHtsv4yTkY5tPTkCp0OJ2tLaWYV1jqbqiBaVngZZ0N6EHwdS6rvSHN++dqUQN/eXeR +6gpVpuuWZq3roT2CaJj0zj2RmA1rZ6iC5TT1cr2AVbJ9IdU+B0CGJfPzih5OJOgW7ai cvlAvjZJ9blNbDhZ85IZ+ynuD4Q5CkA8f6D+I= 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=Pn1Le6zy25tCUTbXg/x+2+xFH7yR+/AjKYKPK41qbB14atWkg2jrOnLLfFxdzhwNC6 wBO5Ib2m0B+EmNMbC1lkarTVNAVfJWCFkGMjFt9BK3+WY1xrI0SOm3hVAPJTilWUvWi9 iK9HOkBww+wxWy6Jowe3r8A/gs6nHnsVp/eMHifwhgPxq42Fc72LFkNDpVnDaMIMyJhi gjX4yrbXrTMpfpyy0wf8LE1yKM2zibSk1Bm5psI1b2PGyjcLOcQ/rwY7Sg0D4zMtDicg 8adaVa+ys2qAoFXRUDfEJ79oGVklNlZ/jkLWp++L0rQ3oIkM4OelWUJGn2HaxddkTzYl C76A== X-Gm-Message-State: AA+aEWboCPsOk4uLu9tScdCQc5SV8qKGn+DFK1HH7GjQA8zoZSsPIStX AEIIE4CgGoOE6hgV9vaKSH706w== X-Google-Smtp-Source: AFSGD/UOXRrr9BED7uPm1monCK/GCHYQ1co8d+ScUQOnXU/Rp/trLz+cDHCwanSnryZsvmXazFLaqA== X-Received: by 2002:a7b:c852:: with SMTP id c18mr3160261wml.49.1544795697958; Fri, 14 Dec 2018 05:54:57 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o4sm4884596wmh.40.2018.12.14.05.54.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Dec 2018 05:54:56 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 764EC3E055E; Fri, 14 Dec 2018 13:54:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 14 Dec 2018 13:54:43 +0000 Message-Id: <20181214135452.25936-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181214135452.25936-1-alex.bennee@linaro.org> References: <20181214135452.25936-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::332 Subject: [Qemu-devel] [PULL 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 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)