From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7944) id 927413858D32; Tue, 14 Nov 2023 18:49:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 927413858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1699987780; bh=9Sau1RzK2VdhPstr1+HC17TL0/MOnspnH6ziS+ons90=; h=From:To:Subject:Date:From; b=SQ31owuKrAGocUx/wQbb1OL6DJZ/LQDTAjd/dUmoo23OF+WY52apc3QZUGNu8/ajS P9IR8tMolGhvPx9dsesghLFFzC0SVXmPA2Ir8v9kgO/KV1EJtxfjIA8LsFqrXaguF7 whI5l6tRzEj5c2exkSNctzV+OkylTr0hK2L3LE7c= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Pranav Kant To: glibc-cvs@sourceware.org Subject: [glibc/google/grte/v5-2.27/master] math: x86: Avoid the use of __libgcc_cmp_return__ for __gcc_CMPtype X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/google/grte/v5-2.27/master X-Git-Oldrev: 3697387eaba3c225239ba2ddd636231033273788 X-Git-Newrev: 950a6559add2cf1a547ae93651e3a96880206054 Message-Id: <20231114184940.927413858D32@sourceware.org> Date: Tue, 14 Nov 2023 18:49:40 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=950a6559add2cf1a547ae93651e3a96880206054 commit 950a6559add2cf1a547ae93651e3a96880206054 Author: Adhemerval Zanella Date: Thu Mar 10 14:41:31 2022 -0300 math: x86: Avoid the use of __libgcc_cmp_return__ for __gcc_CMPtype Diff: --- sysdeps/x86/fpu/sfp-machine.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sysdeps/x86/fpu/sfp-machine.h b/sysdeps/x86/fpu/sfp-machine.h index df8906acb4..fcbcf69053 100644 --- a/sysdeps/x86/fpu/sfp-machine.h +++ b/sysdeps/x86/fpu/sfp-machine.h @@ -1,10 +1,19 @@ /* Configure soft-fp for building sqrtf128. Based on sfp-machine.h in libgcc, with soft-float and other irrelevant parts removed. */ +#if defined __x86_64__ && defined __ILP32__ +typedef long long int __gcc_CMPtype; +#else +typedef long int __gcc_CMPtype; +#endif +#if !defined(__clang__) && defined(__GNUC__) /* The type of the result of a floating point comparison. This must match `__libgcc_cmp_return__' in GCC for the target. */ -typedef int __gcc_CMPtype __attribute__ ((mode (__libgcc_cmp_return__))); -#define CMPtype __gcc_CMPtype +typedef int __gcc_CMPtype_GCC __attribute__ ((mode (__libgcc_cmp_return__))); +# define CMPtype __gcc_CMPtype +_Static_assert(sizeof(__gcc_CMPtype) == sizeof(__gcc_CMPtype_GCC), + "sizeof(__gcc_CMPtype) != sizeof(__gcc_CMPtype_GCC)"); +#endif #ifdef __x86_64__ # define _FP_W_TYPE_SIZE 64