Clean up last dla.h change

diff --git a/ChangeLog b/ChangeLog
index b401ec4a2f73aad138845229e5704a609f0fd46b..5c234d5b8528934fec54fdff4a235c87cfaaf0bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-10-23  Ulrich Drepper  <drepper@gmail.com>
+
+       * sysdeps/ieee754/dbl-64/dla.h: Move DLA_FMA definition to...
+       * sysdeps/x86_64/dla.h: ...here.  New file.
+       * sysdeps/ieee754/dbl-64/doasin.c: Use <dla.h> not "dla.h".
+       * sysdeps/ieee754/dbl-64/dosincos.c: Likewise.
+       * sysdeps/ieee754/dbl-64/e_atan2.c: Likewise.
+       * sysdeps/ieee754/dbl-64/e_log.c: Likewise.
+       * sysdeps/ieee754/dbl-64/e_pow.c: Likewise.
+       * sysdeps/ieee754/dbl-64/e_sqrt.c: Likewise.
+       * sysdeps/ieee754/dbl-64/halfulp.c: Likewise.
+       * sysdeps/ieee754/dbl-64/s_atan.c: Likewise.
+       * sysdeps/ieee754/dbl-64/s_tan.c: Likewise.
+
 2011-10-23  Andreas Schwab  <schwab@linux-m68k.org>
 
        * sysdeps/ieee754/ldbl-128ibm/e_jnl.c: Add __jnl_finite and

diff --git a/sysdeps/ieee754/dbl-64/dla.h b/sysdeps/ieee754/dbl-64/dla.h
index 0ca87620cb6177cb0b4b58dde4fd66e33420a6ae..af202ad7a71528b086f04a75686fd6e1a6d82456 100644 (file)
--- a/sysdeps/ieee754/dbl-64/dla.h
+++ b/sysdeps/ieee754/dbl-64/dla.h
@@ -35,18 +35,6 @@
 /* IEEE double.                                                        */
 /***********************************************************************/
 
-/* We can use fma instructions if available.  */
-#if defined __x86_64__ || (defined __i386__ && defined __SSE2_MATH__)
-# ifdef __FMA4__
-#  define DLA_FMA(x,y,z) \
-          ({ double __zz; \
-             asm ("vfmsubsd %3, %2, %1, %0"                                  \
-                  : "=x" (__zz) : "x" (x), "xm" (y), "x" (z));               \
-             __zz; })
-# endif
-#endif
-
-
 /* CN = 1+2**27 = '41a0000002000000' IEEE double format */
 #define  CN   134217729.0
 

diff --git a/sysdeps/ieee754/dbl-64/doasin.c b/sysdeps/ieee754/dbl-64/doasin.c
index 9ed760954123762a820e1317ec6929d8e023bdb6..c21d4b7df8931d7f17458a74afe83314f3bab52a 100644 (file)
--- a/sysdeps/ieee754/dbl-64/doasin.c
+++ b/sysdeps/ieee754/dbl-64/doasin.c
@@ -31,7 +31,7 @@
 
 #include "endian.h"
 #include "mydefs.h"
-#include "dla.h"
+#include <dla.h>
 #include "math_private.h"
 
 /********************************************************************/

diff --git a/sysdeps/ieee754/dbl-64/dosincos.c b/sysdeps/ieee754/dbl-64/dosincos.c
index 654f3424e86d3067613c2fefaa7f3014c5df23ae..4ae88c31cd8551f2b84704a6def172565e8faa32 100644 (file)
--- a/sysdeps/ieee754/dbl-64/dosincos.c
+++ b/sysdeps/ieee754/dbl-64/dosincos.c
@@ -36,7 +36,7 @@
 #include "endian.h"
 #include "mydefs.h"
 #include "sincos.tbl"
-#include "dla.h"
+#include <dla.h>
 #include "dosincos.h"
 #include "math_private.h"
 

diff --git a/sysdeps/ieee754/dbl-64/e_atan2.c b/sysdeps/ieee754/dbl-64/e_atan2.c
index 4d8c23af954433a93d7d4922eb243004414bee3b..f8f678bc5464de798fb103946a4a9197d635f3c5 100644 (file)
--- a/sysdeps/ieee754/dbl-64/e_atan2.c
+++ b/sysdeps/ieee754/dbl-64/e_atan2.c
@@ -37,7 +37,7 @@
 /*                                                                      */
 /************************************************************************/
 
-#include "dla.h"
+#include <dla.h>
 #include "mpa.h"
 #include "MathLib.h"
 #include "uatan.tbl"

diff --git a/sysdeps/ieee754/dbl-64/e_log.c b/sysdeps/ieee754/dbl-64/e_log.c
index c158c8be30fcc0c41f1cf23069797be7006f4a59..14851638a56566cf2f62529c19a40185a87a1e23 100644 (file)
--- a/sysdeps/ieee754/dbl-64/e_log.c
+++ b/sysdeps/ieee754/dbl-64/e_log.c
@@ -36,7 +36,7 @@
 
 
 #include "endian.h"
-#include "dla.h"
+#include <dla.h>
 #include "mpa.h"
 #include "MathLib.h"
 #include "math_private.h"

diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c
index 643e1cb9cf6954de1c6b73a094a38d0ca0f5bc78..789054015decb8405b47ab4623c6e792dbebecf5 100644 (file)
--- a/sysdeps/ieee754/dbl-64/e_pow.c
+++ b/sysdeps/ieee754/dbl-64/e_pow.c
@@ -37,7 +37,7 @@
 /***************************************************************************/
 #include "endian.h"
 #include "upow.h"
-#include "dla.h"
+#include <dla.h>
 #include "mydefs.h"
 #include "MathLib.h"
 #include "upow.tbl"

diff --git a/sysdeps/ieee754/dbl-64/e_sqrt.c b/sysdeps/ieee754/dbl-64/e_sqrt.c
index 05d1e71a0cb6bc94bcb3711012eea4af80bde6db..c507c598d7360ec00141d8d6a3e6ebe3f1236823 100644 (file)
--- a/sysdeps/ieee754/dbl-64/e_sqrt.c
+++ b/sysdeps/ieee754/dbl-64/e_sqrt.c
@@ -35,7 +35,7 @@
 
 #include "endian.h"
 #include "mydefs.h"
-#include "dla.h"
+#include <dla.h>
 #include "MathLib.h"
 #include "root.tbl"
 #include "math_private.h"

diff --git a/sysdeps/ieee754/dbl-64/halfulp.c b/sysdeps/ieee754/dbl-64/halfulp.c
index 5d2733463002fd5697a8030f2a23f68b1a270876..373d4052213bb1a71a0b048957d1bd3fbc36076e 100644 (file)
--- a/sysdeps/ieee754/dbl-64/halfulp.c
+++ b/sysdeps/ieee754/dbl-64/halfulp.c
@@ -37,7 +37,7 @@
 
 #include "endian.h"
 #include "mydefs.h"
-#include "dla.h"
+#include <dla.h>
 #include "math_private.h"
 
 static const int4 tab54[32] = {

diff --git a/sysdeps/ieee754/dbl-64/s_atan.c b/sysdeps/ieee754/dbl-64/s_atan.c
index b948f503a659fd8e1c749bde296081dc6cbc7e92..5ea83261aaa75afa25c6f4e88355e2dbdce920ce 100644 (file)
--- a/sysdeps/ieee754/dbl-64/s_atan.c
+++ b/sysdeps/ieee754/dbl-64/s_atan.c
@@ -37,7 +37,7 @@
 /*                                                                      */
 /************************************************************************/
 
-#include "dla.h"
+#include <dla.h>
 #include "mpa.h"
 #include "MathLib.h"
 #include "uatan.tbl"

diff --git a/sysdeps/ieee754/dbl-64/s_tan.c b/sysdeps/ieee754/dbl-64/s_tan.c
index 015b027dc45d68f4c6d716e887b32b8fcd0342e9..df8eedd9229addf444f6fe844496e4ee357494ae 100644 (file)
--- a/sysdeps/ieee754/dbl-64/s_tan.c
+++ b/sysdeps/ieee754/dbl-64/s_tan.c
@@ -36,7 +36,7 @@
 
 #include <errno.h>
 #include "endian.h"
-#include "dla.h"
+#include <dla.h>
 #include "mpa.h"
 #include "MathLib.h"
 #include "math.h"

diff --git a/sysdeps/x86_64/dla.h b/sysdeps/x86_64/dla.h
new file mode 100644 (file)
index 0000000..bb6c8c4
--- /dev/null
+++ b/sysdeps/x86_64/dla.h
@@ -0,0 +1,9 @@
+#ifdef __FMA4__
+# define DLA_FMA(x,y,z) \
+          ({ double __zz; \
+             asm ("vfmsubsd %3, %2, %1, %0"                                  \
+                  : "=x" (__zz) : "x" (x), "xm" (y), "x" (z));               \
+             __zz; })
+#endif
+
+#include "sysdeps/ieee754/dbl-64/dla.h"