about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/x86_64/dla.h8
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a2e155ab8c..108d9a96c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-10-24  Ulrich Drepper  <drepper@gmail.com>
 
+	* sysdeps/x86_64/dla.h (DLA_FMS): Some compilers fail to inline
+	__builtin_fma in some situations.  Have to use an asm.
+
 	* config.make.in: Add have-mfma4 entry.
 	* configure.in: Substitute libc_cv_cc_fma4.
 	* math/Makefile (dbl-only-routines): Add sincostab.
diff --git a/sysdeps/x86_64/dla.h b/sysdeps/x86_64/dla.h
index 7aa06e5f6f..6fe8f740f3 100644
--- a/sysdeps/x86_64/dla.h
+++ b/sysdeps/x86_64/dla.h
@@ -1,6 +1,10 @@
-#if defined __FMA4__ || defined __FMA__
+#ifdef __FMA4__
 # define DLA_FMS(x,y,z) \
-  __builtin_fma (x, y, -z)
+  ({ double __z;							      \
+     asm ("vfmsubsd %3, %2, %1, %0"					      \
+	  : "=x" (__z)							      \
+	  : "x" ((double) (x)), "xm" ((double) (y)) , "x" ((double) (z)));    \
+    __z; })
 #endif
 
 #include "sysdeps/ieee754/dbl-64/dla.h"