Cleanup FMA4 patch

Move the FMA4 code into its own section.  Avoid some of the duplication
of data resulting from the double use of source files.

22 files changed, 26 insertions, 1 deletions

diff --git a/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c b/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c
index 93fb5a1..f4f68ac 100644
--- a/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c
@@ -1,3 +1,4 @@
 #define __branred __branred_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/branred.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/doasin-fma4.c b/sysdeps/x86_64/fpu/multiarch/doasin-fma4.c
index d7ba67e..53eb419 100644
--- a/sysdeps/x86_64/fpu/multiarch/doasin-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/doasin-fma4.c
@@ -1,3 +1,4 @@
 #define __doasin __doasin_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/doasin.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c b/sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c
index 02b420b..1578b2f 100644
--- a/sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c
@@ -1,5 +1,6 @@
 #define __docos __docos_fma4
 #define __dubcos __dubcos_fma4
 #define __dubsin __dubsin_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/dosincos.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/e_asin-fma4.c b/sysdeps/x86_64/fpu/multiarch/e_asin-fma4.c
index 938bc84..2657c31 100644
--- a/sysdeps/x86_64/fpu/multiarch/e_asin-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/e_asin-fma4.c
@@ -6,5 +6,6 @@
 #define __dubcos __dubcos_fma4
 #define __dubsin __dubsin_fma4
 #define __sin32 __sin32_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/e_asin.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2-fma4.c b/sysdeps/x86_64/fpu/multiarch/e_atan2-fma4.c
index 84a6f86..f4e9862 100644
--- a/sysdeps/x86_64/fpu/multiarch/e_atan2-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2-fma4.c
@@ -5,5 +5,6 @@
 #define __mpatan2 __mpatan2_fma4
 #define __mul __mul_fma4
 #define __sub __sub_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/e_atan2.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp-fma4.c b/sysdeps/x86_64/fpu/multiarch/e_exp-fma4.c
index 942dfff..ae6eb67 100644
--- a/sysdeps/x86_64/fpu/multiarch/e_exp-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/e_exp-fma4.c
@@ -1,5 +1,6 @@
 #define __ieee754_exp __ieee754_exp_fma4
 #define __exp1 __exp1_fma4
 #define __slowexp __slowexp_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/e_exp.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/e_log-fma4.c b/sysdeps/x86_64/fpu/multiarch/e_log-fma4.c
index 0be66d1..a2346cc 100644
--- a/sysdeps/x86_64/fpu/multiarch/e_log-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/e_log-fma4.c
@@ -3,5 +3,6 @@
 #define __add __add_fma4
 #define __dbl_mp __dbl_mp_fma4
 #define __sub __sub_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/e_log.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/e_pow-fma4.c b/sysdeps/x86_64/fpu/multiarch/e_pow-fma4.c
index 20313be..5b3ea8e 100644
--- a/sysdeps/x86_64/fpu/multiarch/e_pow-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/e_pow-fma4.c
@@ -1,5 +1,6 @@
 #define __ieee754_pow __ieee754_pow_fma4
 #define __exp1 __exp1_fma4
 #define __slowpow __slowpow_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/e_pow.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/halfulp-fma4.c b/sysdeps/x86_64/fpu/multiarch/halfulp-fma4.c
index 3fc223e..a00c17c 100644
--- a/sysdeps/x86_64/fpu/multiarch/halfulp-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/halfulp-fma4.c
@@ -1,3 +1,4 @@
 #define __halfulp __halfulp_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/halfulp.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/mpa-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpa-fma4.c
index 7b9e2ef..f8ed8f3 100644
--- a/sysdeps/x86_64/fpu/multiarch/mpa-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/mpa-fma4.c
@@ -6,5 +6,7 @@
 
 #define NO___CPY 1
 #define NO___MP_DBL 1
+#define NO___ACR 1
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/mpa.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c
index 942974b..fbd3bd4 100644
--- a/sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c
@@ -4,5 +4,7 @@
 #define __mpsqrt __mpsqrt_fma4
 #define __mul __mul_fma4
 #define __sub __sub_fma4
+#define AVOID_MPATAN_H 1
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/mpatan.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c
index e7c469e..e6e44d4 100644
--- a/sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c
@@ -4,5 +4,6 @@
 #define __mpatan __mpatan_fma4
 #define __mpsqrt __mpsqrt_fma4
 #define __mul __mul_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/mpatan2.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/mpexp-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpexp-fma4.c
index 021970c..07ca6e9 100644
--- a/sysdeps/x86_64/fpu/multiarch/mpexp-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/mpexp-fma4.c
@@ -3,5 +3,7 @@
 #define __dbl_mp __dbl_mp_fma4
 #define __dvd __dvd_fma4
 #define __mul __mul_fma4
+#define AVOID_MPEXP_H 1
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/mpexp.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/mplog-fma4.c b/sysdeps/x86_64/fpu/multiarch/mplog-fma4.c
index 9581eaf..b473311 100644
--- a/sysdeps/x86_64/fpu/multiarch/mplog-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/mplog-fma4.c
@@ -3,5 +3,6 @@
 #define __mpexp __mpexp_fma4
 #define __mul __mul_fma4
 #define __sub __sub_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/mplog.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c
index 43b6493..f8a1ba2 100644
--- a/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c
@@ -2,5 +2,7 @@
 #define __dbl_mp __dbl_mp_fma4
 #define __mul __mul_fma4
 #define __sub __sub_fma4
+#define AVOID_MPSQRT_H 1
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/mpsqrt.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/mptan-fma4.c b/sysdeps/x86_64/fpu/multiarch/mptan-fma4.c
index 767924e..fb4a9d4 100644
--- a/sysdeps/x86_64/fpu/multiarch/mptan-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/mptan-fma4.c
@@ -2,5 +2,6 @@
 #define __c32 __c32_fma4
 #define __dvd __dvd_fma4
 #define __mpranred __mpranred_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/mptan.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan-fma4.c b/sysdeps/x86_64/fpu/multiarch/s_atan-fma4.c
index a8f0977..9e83e6c 100644
--- a/sysdeps/x86_64/fpu/multiarch/s_atan-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_atan-fma4.c
@@ -4,5 +4,6 @@
 #define __mpatan __mpatan_fma4
 #define __mul __mul_fma4
 #define __sub __sub_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/s_atan.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c b/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c
index 97cef8b..2501af9 100644
--- a/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c
@@ -7,5 +7,6 @@
 #define __mpcos1 __mpcos1_fma4
 #define __mpsin __mpsin_fma4
 #define __mpsin1 __mpsin1_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/s_sin.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c b/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c
index c3cefc2..d7dab3c 100644
--- a/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c
@@ -4,6 +4,6 @@
 #define __mpranred __mpranred_fma4
 #define __mptan __mptan_fma4
 #define __sub __sub_fma4
-
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c b/sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c
index f0d2d27..ebbfa18 100644
--- a/sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c
@@ -10,5 +10,6 @@
 #define __dbl_mp __dbl_mp_fma4
 #define __mul __mul_fma4
 #define __sub __sub_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/sincos32.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/slowexp-fma4.c b/sysdeps/x86_64/fpu/multiarch/slowexp-fma4.c
index 83cb359..3bcde84 100644
--- a/sysdeps/x86_64/fpu/multiarch/slowexp-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/slowexp-fma4.c
@@ -4,5 +4,6 @@
 #define __mpexp __mpexp_fma4
 #define __mul __mul_fma4
 #define __sub __sub_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/slowexp.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/slowpow-fma4.c b/sysdeps/x86_64/fpu/multiarch/slowpow-fma4.c
index 744f3f6..69d6982 100644
--- a/sysdeps/x86_64/fpu/multiarch/slowpow-fma4.c
+++ b/sysdeps/x86_64/fpu/multiarch/slowpow-fma4.c
@@ -6,5 +6,6 @@
 #define __mul __mul_fma4
 #define __sub __sub_fma4
 #define __halfulp __halfulp_fma4
+#define SECTION __attribute__ ((section (".text.fma4")))
 
 #include <sysdeps/ieee754/dbl-64/slowpow.c>