Clean up last dla.h change

2011-10-23 12:50:28 -04:00 · 2011-10-23 12:50:28 -04:00 · c8b3296bbe
commit c8b3296bbe
parent 246ad57ad6
12 changed files with 32 additions and 21 deletions
--- a/14
+++ b/14
@ -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
--- 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

--- 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"

 /********************************************************************/
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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] = {
--- 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"
--- 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"
--- a/sysdeps/x86_64/dla.h
+++ 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"