diff --git a/ChangeLog b/ChangeLog
index 7d6d2dea2e..e7392a8ac1 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 47e567cfea..f2ebc24fb0 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