about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ports/ChangeLog.alpha5
-rw-r--r--ports/sysdeps/alpha/Makefile2
2 files changed, 7 insertions, 0 deletions
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 210453b923..21a4f12cb4 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2012-12-07  Richard Henderson  <rth@redhat.com>
+
+	* sysdeps/alpha/Makefile [$(subdir) = math]
+	(CFLAGS-s_isnan.c): New variable.
+
 2012-11-30  Richard Henderson  <rth@redhat.com>
 
 	* sysdeps/alpha/fpu/libm-test-ulps: Update.
diff --git a/ports/sysdeps/alpha/Makefile b/ports/sysdeps/alpha/Makefile
index 1a80db8dcc..4387cb719a 100644
--- a/ports/sysdeps/alpha/Makefile
+++ b/ports/sysdeps/alpha/Makefile
@@ -43,6 +43,8 @@ CFLAGS-s_fma.c = -mieee-with-inexact
 CFLAGS-s_fmaf.c = -mieee-with-inexact
 # This test tries to check for inexact being raised by arithmetic.
 CFLAGS-test-misc.c += -mieee-with-inexact
+# Avoid "conflicting types for built-in function" warnings
+CFLAGS-s_isnan.c += -fno-builtin-isnanf
 endif
 
 # Build everything with full IEEE math support, and with dynamic rounding;