Compile s_llround.c with -Wno-error for x32 build

Message ID CAMe9rOoGdygzX5L4av+7a8Py7tG2ZTNjyKkDddvYR+id=4JkuQ@mail.gmail.com
State Committed
Headers

Commit Message

H.J. Lu Dec. 19, 2014, 4:33 p.m. UTC
  On Fri, Dec 19, 2014 at 8:25 AM, Joseph Myers <joseph@codesourcery.com> wrote:
> On Fri, 19 Dec 2014, H.J. Lu wrote:
>
>> On x32, I got
>>
>> ../sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c:75:24: error:
>> conflicting types for built-in function ‘lround’ [-Werror]
>>  weak_alias (__llround, lround)
>>                         ^
>> ./../include/libc-symbols.h:128:26: note: in definition of macro
>> ‘_weak_alias’
>>    extern __typeof (name) aliasname __attribute__ ((weak, alias
>> (#name)));
>>                           ^
>> ../sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c:75:1: note: in
>> expansion of macro ‘weak_alias’
>>  weak_alias (__llround, lround)
>>  ^
>> cc1: all warnings being treated as errors
>>
>> Since x32 returns 32-bit long int and 64-bit long long int in the
>> same 64-bit register, we make the 32b-bit lround an alias of the
>> 64-bit llround.  This patch adds -Wno-error for x32 build to silence
>> the compiler.  Verified on x32, i686 and x86-64 with GCC 4.8.3.  I
>> checked it in as an obvious fix.
>
> I think -fno-builtin-lround would be better than -Wno-error if it works to
> fix the warning.  (Cf. the CFLAGS-nldbl-*.c settings in
> sysdeps/ieee754/ldbl-opt/Makefile.)
>

It works.  I checked in this.

Thanks.
  

Patch

diff --git a/ChangeLog b/ChangeLog
index 7d6d2de..e7392a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@ 
+2014-12-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+ * sysdeps/x86_64/x32/Makefile (CFLAGS-s_llround.c): Replace
+ -Wno-error with -fno-builtin-lround.
+
 2014-12-19  Torvald Riegel  <triegel@redhat.com>

  * sysdeps/unix/sysv/linux/i386/lowlevellock-futex.h: New file.
diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile
index 47e567c..f2ebc24 100644
--- a/sysdeps/x86_64/x32/Makefile
+++ b/sysdeps/x86_64/x32/Makefile
@@ -1,6 +1,6 @@ 
 ifeq ($(subdir),math)
 # Since x32 returns 32-bit long int and 64-bit long long int in the
 # same 64-bit register, we make the 32b-bit lround an alias of the
-# 64-bit llround.  Add -Wno-error to silence the compiler.
-CFLAGS-s_llround.c += -Wno-error
+# 64-bit llround.  Add -fno-builtin-lround to silence the compiler.
+CFLAGS-s_llround.c += -fno-builtin-lround
 endif