aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/x86_64/fpu/dla.h (renamed from sysdeps/x86_64/dla.h)9
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 108d9a96c3..992ad4cb2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
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.
+ * sysdeps/x86_64/dla.h: Move to ...
+ * sysdeps/x86_64/fpu/dla.h: ...here.
+ (DLA_FMS): Some compilers fail to inline __builtin_fma in some
+ situations. Use __builtin_fma only for gcc 4.6 and up.
* config.make.in: Add have-mfma4 entry.
* configure.in: Substitute libc_cv_cc_fma4.
diff --git a/sysdeps/x86_64/dla.h b/sysdeps/x86_64/fpu/dla.h
index 6fe8f740f3..fa2d52bbf0 100644
--- a/sysdeps/x86_64/dla.h
+++ b/sysdeps/x86_64/fpu/dla.h
@@ -1,10 +1,17 @@
+#include <features.h>
+
#ifdef __FMA4__
-# define DLA_FMS(x,y,z) \
+# if __GNUC_PREREQ (4, 6)
+# define DLA_FMS(x,y,z) \
+ __builtin_fma (x, y, -(z))
+# else
+# define DLA_FMS(x,y,z) \
({ double __z; \
asm ("vfmsubsd %3, %2, %1, %0" \
: "=x" (__z) \
: "x" ((double) (x)), "xm" ((double) (y)) , "x" ((double) (z))); \
__z; })
+# endif
#endif
#include "sysdeps/ieee754/dbl-64/dla.h"