diff --git a/sysdeps/x86_64/fpu/multiarch/svml_d_cos8_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_d_cos8_core_avx512.S
index 86543d50d3..b2675d9647 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_d_cos8_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_d_cos8_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_d_trig_data.h"
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_cos_knl)
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_d_exp8_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_d_exp8_core_avx512.S
index bccc56858d..98f2bc2e41 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_d_exp8_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_d_exp8_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_d_exp_data.h"
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_exp_knl)
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_d_log8_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_d_log8_core_avx512.S
index 230ebe8ceb..20d4d967e0 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_d_log8_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_d_log8_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_d_log_data.h"
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_log_knl)
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_d_pow8_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_d_pow8_core_avx512.S
index 963fbe3662..a4c6c27147 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_d_pow8_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_d_pow8_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_d_pow_data.h"
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 /* ALGORITHM DESCRIPTION:
 
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_d_sin8_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_d_sin8_core_avx512.S
index 54bd8679d1..f3de17b413 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_d_sin8_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_d_sin8_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_d_trig_data.h"
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_sin_knl)
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_d_sincos8_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_d_sincos8_core_avx512.S
index f6297e0024..a05a900ede 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_d_sincos8_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_d_sincos8_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_d_trig_data.h"
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 /*
    ALGORITHM DESCRIPTION:
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_s_cosf16_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_s_cosf16_core_avx512.S
index b0612c9357..5929fc0203 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_s_cosf16_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_s_cosf16_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_s_trig_data.h"
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_cosf_knl)
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_s_expf16_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_s_expf16_core_avx512.S
index 599b67f83b..71ed573a6e 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_s_expf16_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_s_expf16_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_s_expf_data.h"
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_expf_knl)
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_s_logf16_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_s_logf16_core_avx512.S
index 0070b0c419..b0062a1eb5 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_s_logf16_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_s_logf16_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_s_logf_data.h"
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_logf_knl)
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_s_powf16_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_s_powf16_core_avx512.S
index 306895838b..c05960bc31 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_s_powf16_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_s_powf16_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_s_powf_data.h"
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 /*
    ALGORITHM DESCRIPTION:
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_s_sincosf16_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_s_sincosf16_core_avx512.S
index 9a2aebb023..9ab6af69be 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_s_sincosf16_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_s_sincosf16_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_s_trig_data.h"
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 /*
    ALGORITHM DESCRIPTION:
diff --git a/sysdeps/x86_64/fpu/multiarch/svml_s_sinf16_core_avx512.S b/sysdeps/x86_64/fpu/multiarch/svml_s_sinf16_core_avx512.S
index 33b210fac0..0c037fd663 100644
--- a/sysdeps/x86_64/fpu/multiarch/svml_s_sinf16_core_avx512.S
+++ b/sysdeps/x86_64/fpu/multiarch/svml_s_sinf16_core_avx512.S
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 #include "svml_s_trig_data.h"
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY(_ZGVeN16v_sinf_knl)
diff --git a/sysdeps/x86_64/fpu/svml_d_acos2_core.S b/sysdeps/x86_64/fpu/svml_d_acos2_core.S
index 8c573fcff1..1022d7e4e7 100644
--- a/sysdeps/x86_64/fpu/svml_d_acos2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_acos2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_acos)
diff --git a/sysdeps/x86_64/fpu/svml_d_acos4_core.S b/sysdeps/x86_64/fpu/svml_d_acos4_core.S
index ef2253f3dd..b4a8990f5a 100644
--- a/sysdeps/x86_64/fpu/svml_d_acos4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_acos4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_acos)
diff --git a/sysdeps/x86_64/fpu/svml_d_acos4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_acos4_core_avx.S
index cc5377850c..48e610f4ef 100644
--- a/sysdeps/x86_64/fpu/svml_d_acos4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_acos4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_acos)
diff --git a/sysdeps/x86_64/fpu/svml_d_acos8_core.S b/sysdeps/x86_64/fpu/svml_d_acos8_core.S
index 3bf8d8dcdf..8f8017a72d 100644
--- a/sysdeps/x86_64/fpu/svml_d_acos8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_acos8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_acos)
diff --git a/sysdeps/x86_64/fpu/svml_d_acosh2_core.S b/sysdeps/x86_64/fpu/svml_d_acosh2_core.S
index ab92795d13..23d22de0fe 100644
--- a/sysdeps/x86_64/fpu/svml_d_acosh2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_acosh2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_acosh)
diff --git a/sysdeps/x86_64/fpu/svml_d_acosh4_core.S b/sysdeps/x86_64/fpu/svml_d_acosh4_core.S
index 91ff3018c1..5bef8065f7 100644
--- a/sysdeps/x86_64/fpu/svml_d_acosh4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_acosh4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_acosh)
diff --git a/sysdeps/x86_64/fpu/svml_d_acosh4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_acosh4_core_avx.S
index 84cbe5871c..95dd9ed670 100644
--- a/sysdeps/x86_64/fpu/svml_d_acosh4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_acosh4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_acosh)
diff --git a/sysdeps/x86_64/fpu/svml_d_acosh8_core.S b/sysdeps/x86_64/fpu/svml_d_acosh8_core.S
index 0b4521ce64..6277eebc1e 100644
--- a/sysdeps/x86_64/fpu/svml_d_acosh8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_acosh8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_acosh)
diff --git a/sysdeps/x86_64/fpu/svml_d_asin2_core.S b/sysdeps/x86_64/fpu/svml_d_asin2_core.S
index 911625030f..13c186ac08 100644
--- a/sysdeps/x86_64/fpu/svml_d_asin2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_asin2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_asin)
diff --git a/sysdeps/x86_64/fpu/svml_d_asin4_core.S b/sysdeps/x86_64/fpu/svml_d_asin4_core.S
index 222a0b8f73..50ea5a4207 100644
--- a/sysdeps/x86_64/fpu/svml_d_asin4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_asin4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_asin)
diff --git a/sysdeps/x86_64/fpu/svml_d_asin4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_asin4_core_avx.S
index 04ff322ea6..6de73c97cf 100644
--- a/sysdeps/x86_64/fpu/svml_d_asin4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_asin4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_asin)
diff --git a/sysdeps/x86_64/fpu/svml_d_asin8_core.S b/sysdeps/x86_64/fpu/svml_d_asin8_core.S
index bea94b954c..aaf93dc8e9 100644
--- a/sysdeps/x86_64/fpu/svml_d_asin8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_asin8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_asin)
diff --git a/sysdeps/x86_64/fpu/svml_d_asinh2_core.S b/sysdeps/x86_64/fpu/svml_d_asinh2_core.S
index a621fae3fb..00723458e4 100644
--- a/sysdeps/x86_64/fpu/svml_d_asinh2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_asinh2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_asinh)
diff --git a/sysdeps/x86_64/fpu/svml_d_asinh4_core.S b/sysdeps/x86_64/fpu/svml_d_asinh4_core.S
index a0332eca57..f2e13c3a0a 100644
--- a/sysdeps/x86_64/fpu/svml_d_asinh4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_asinh4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_asinh)
diff --git a/sysdeps/x86_64/fpu/svml_d_asinh4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_asinh4_core_avx.S
index bc365d7dd7..51324b697f 100644
--- a/sysdeps/x86_64/fpu/svml_d_asinh4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_asinh4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_asinh)
diff --git a/sysdeps/x86_64/fpu/svml_d_asinh8_core.S b/sysdeps/x86_64/fpu/svml_d_asinh8_core.S
index 2271466d99..3c32741b39 100644
--- a/sysdeps/x86_64/fpu/svml_d_asinh8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_asinh8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_asinh)
diff --git a/sysdeps/x86_64/fpu/svml_d_atan22_core.S b/sysdeps/x86_64/fpu/svml_d_atan22_core.S
index 7f40f1be6f..6b3cef4269 100644
--- a/sysdeps/x86_64/fpu/svml_d_atan22_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atan22_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2vv_atan2)
diff --git a/sysdeps/x86_64/fpu/svml_d_atan24_core.S b/sysdeps/x86_64/fpu/svml_d_atan24_core.S
index afb8296d80..7f76bf166c 100644
--- a/sysdeps/x86_64/fpu/svml_d_atan24_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atan24_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4vv_atan2)
diff --git a/sysdeps/x86_64/fpu/svml_d_atan24_core_avx.S b/sysdeps/x86_64/fpu/svml_d_atan24_core_avx.S
index 81db9cd297..7e8fead6e0 100644
--- a/sysdeps/x86_64/fpu/svml_d_atan24_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_atan24_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4vv_atan2)
diff --git a/sysdeps/x86_64/fpu/svml_d_atan28_core.S b/sysdeps/x86_64/fpu/svml_d_atan28_core.S
index 9c25de34b6..2c710eadac 100644
--- a/sysdeps/x86_64/fpu/svml_d_atan28_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atan28_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8vv_atan2)
diff --git a/sysdeps/x86_64/fpu/svml_d_atan2_core.S b/sysdeps/x86_64/fpu/svml_d_atan2_core.S
index bd4020ab69..7ea434fec5 100644
--- a/sysdeps/x86_64/fpu/svml_d_atan2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atan2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_atan)
diff --git a/sysdeps/x86_64/fpu/svml_d_atan4_core.S b/sysdeps/x86_64/fpu/svml_d_atan4_core.S
index 89737790f4..06e3e2a870 100644
--- a/sysdeps/x86_64/fpu/svml_d_atan4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atan4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_atan)
diff --git a/sysdeps/x86_64/fpu/svml_d_atan4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_atan4_core_avx.S
index 8abe407abe..73a8ab8ebb 100644
--- a/sysdeps/x86_64/fpu/svml_d_atan4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_atan4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_atan)
diff --git a/sysdeps/x86_64/fpu/svml_d_atan8_core.S b/sysdeps/x86_64/fpu/svml_d_atan8_core.S
index cea8caf797..dfb6f788bc 100644
--- a/sysdeps/x86_64/fpu/svml_d_atan8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atan8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_atan)
diff --git a/sysdeps/x86_64/fpu/svml_d_atanh2_core.S b/sysdeps/x86_64/fpu/svml_d_atanh2_core.S
index 8c300fbc09..f112f43793 100644
--- a/sysdeps/x86_64/fpu/svml_d_atanh2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atanh2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_atanh)
diff --git a/sysdeps/x86_64/fpu/svml_d_atanh4_core.S b/sysdeps/x86_64/fpu/svml_d_atanh4_core.S
index df63d2d655..ba74bcfeb5 100644
--- a/sysdeps/x86_64/fpu/svml_d_atanh4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atanh4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_atanh)
diff --git a/sysdeps/x86_64/fpu/svml_d_atanh4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_atanh4_core_avx.S
index 0bb51b2d60..9d1fa7f8c7 100644
--- a/sysdeps/x86_64/fpu/svml_d_atanh4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_atanh4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_atanh)
diff --git a/sysdeps/x86_64/fpu/svml_d_atanh8_core.S b/sysdeps/x86_64/fpu/svml_d_atanh8_core.S
index 956230e978..24011dad24 100644
--- a/sysdeps/x86_64/fpu/svml_d_atanh8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_atanh8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_atanh)
diff --git a/sysdeps/x86_64/fpu/svml_d_cbrt2_core.S b/sysdeps/x86_64/fpu/svml_d_cbrt2_core.S
index 5ca1129c7f..3a3152000b 100644
--- a/sysdeps/x86_64/fpu/svml_d_cbrt2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cbrt2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_cbrt)
diff --git a/sysdeps/x86_64/fpu/svml_d_cbrt4_core.S b/sysdeps/x86_64/fpu/svml_d_cbrt4_core.S
index c3948ec480..31e0bc46db 100644
--- a/sysdeps/x86_64/fpu/svml_d_cbrt4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cbrt4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_cbrt)
diff --git a/sysdeps/x86_64/fpu/svml_d_cbrt4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_cbrt4_core_avx.S
index b64825e876..8b4122c7ad 100644
--- a/sysdeps/x86_64/fpu/svml_d_cbrt4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_cbrt4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_cbrt)
diff --git a/sysdeps/x86_64/fpu/svml_d_cbrt8_core.S b/sysdeps/x86_64/fpu/svml_d_cbrt8_core.S
index 312f015706..0aac584981 100644
--- a/sysdeps/x86_64/fpu/svml_d_cbrt8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cbrt8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_cbrt)
diff --git a/sysdeps/x86_64/fpu/svml_d_cos2_core.S b/sysdeps/x86_64/fpu/svml_d_cos2_core.S
index 02a6583776..d2ea460b50 100644
--- a/sysdeps/x86_64/fpu/svml_d_cos2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cos2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_cos)
diff --git a/sysdeps/x86_64/fpu/svml_d_cos4_core.S b/sysdeps/x86_64/fpu/svml_d_cos4_core.S
index f066ceaf4c..1f09e366c2 100644
--- a/sysdeps/x86_64/fpu/svml_d_cos4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cos4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_cos)
diff --git a/sysdeps/x86_64/fpu/svml_d_cos4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_cos4_core_avx.S
index 5212078c9c..e96205ec00 100644
--- a/sysdeps/x86_64/fpu/svml_d_cos4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_cos4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_cos)
diff --git a/sysdeps/x86_64/fpu/svml_d_cos8_core.S b/sysdeps/x86_64/fpu/svml_d_cos8_core.S
index 2ac8e4687a..ef3c7a0a71 100644
--- a/sysdeps/x86_64/fpu/svml_d_cos8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cos8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_cos)
diff --git a/sysdeps/x86_64/fpu/svml_d_cosh2_core.S b/sysdeps/x86_64/fpu/svml_d_cosh2_core.S
index 6aa76d40ed..55b4ae267b 100644
--- a/sysdeps/x86_64/fpu/svml_d_cosh2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cosh2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_cosh)
diff --git a/sysdeps/x86_64/fpu/svml_d_cosh4_core.S b/sysdeps/x86_64/fpu/svml_d_cosh4_core.S
index d3a7bec3f4..9a99bd3fab 100644
--- a/sysdeps/x86_64/fpu/svml_d_cosh4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cosh4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_cosh)
diff --git a/sysdeps/x86_64/fpu/svml_d_cosh4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_cosh4_core_avx.S
index 73612e33bc..8a514c8790 100644
--- a/sysdeps/x86_64/fpu/svml_d_cosh4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_cosh4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_cosh)
diff --git a/sysdeps/x86_64/fpu/svml_d_cosh8_core.S b/sysdeps/x86_64/fpu/svml_d_cosh8_core.S
index e89d2c23fb..35ab7f6ee9 100644
--- a/sysdeps/x86_64/fpu/svml_d_cosh8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_cosh8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_cosh)
diff --git a/sysdeps/x86_64/fpu/svml_d_erf2_core.S b/sysdeps/x86_64/fpu/svml_d_erf2_core.S
index 828dd59cb3..0622c3caac 100644
--- a/sysdeps/x86_64/fpu/svml_d_erf2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_erf2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_erf)
diff --git a/sysdeps/x86_64/fpu/svml_d_erf4_core.S b/sysdeps/x86_64/fpu/svml_d_erf4_core.S
index 9432824d8a..6f95c5feef 100644
--- a/sysdeps/x86_64/fpu/svml_d_erf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_erf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_erf)
diff --git a/sysdeps/x86_64/fpu/svml_d_erf4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_erf4_core_avx.S
index e3f73f9044..4815f8468a 100644
--- a/sysdeps/x86_64/fpu/svml_d_erf4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_erf4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_erf)
diff --git a/sysdeps/x86_64/fpu/svml_d_erf8_core.S b/sysdeps/x86_64/fpu/svml_d_erf8_core.S
index fde688f5dd..079f423284 100644
--- a/sysdeps/x86_64/fpu/svml_d_erf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_erf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_erf)
diff --git a/sysdeps/x86_64/fpu/svml_d_erfc2_core.S b/sysdeps/x86_64/fpu/svml_d_erfc2_core.S
index 530d358b8b..cb239f82e8 100644
--- a/sysdeps/x86_64/fpu/svml_d_erfc2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_erfc2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_erfc)
diff --git a/sysdeps/x86_64/fpu/svml_d_erfc4_core.S b/sysdeps/x86_64/fpu/svml_d_erfc4_core.S
index c6b3e2c367..2b42b3af83 100644
--- a/sysdeps/x86_64/fpu/svml_d_erfc4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_erfc4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_erfc)
diff --git a/sysdeps/x86_64/fpu/svml_d_erfc4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_erfc4_core_avx.S
index e81ca48897..9e16bf2ec5 100644
--- a/sysdeps/x86_64/fpu/svml_d_erfc4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_erfc4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_erfc)
diff --git a/sysdeps/x86_64/fpu/svml_d_erfc8_core.S b/sysdeps/x86_64/fpu/svml_d_erfc8_core.S
index b3d31fec27..f781a7af9a 100644
--- a/sysdeps/x86_64/fpu/svml_d_erfc8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_erfc8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_erfc)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp102_core.S b/sysdeps/x86_64/fpu/svml_d_exp102_core.S
index 8e6131d717..d6d7da6fec 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp102_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp102_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_exp10)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp104_core.S b/sysdeps/x86_64/fpu/svml_d_exp104_core.S
index e226bb88bb..e0c651f904 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp104_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp104_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_exp10)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp104_core_avx.S b/sysdeps/x86_64/fpu/svml_d_exp104_core_avx.S
index 8758d35449..ca3931eb8b 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp104_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp104_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_exp10)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp108_core.S b/sysdeps/x86_64/fpu/svml_d_exp108_core.S
index 745d3c7ec7..ad2ba994c0 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp108_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp108_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_exp10)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp22_core.S b/sysdeps/x86_64/fpu/svml_d_exp22_core.S
index 3639892544..4205e5510d 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp22_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp22_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_exp2)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp24_core.S b/sysdeps/x86_64/fpu/svml_d_exp24_core.S
index aea3afc3e3..4be1ee4e48 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp24_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp24_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_exp2)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp24_core_avx.S b/sysdeps/x86_64/fpu/svml_d_exp24_core_avx.S
index 68f28b8f63..b09da67af1 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp24_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp24_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_exp2)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp28_core.S b/sysdeps/x86_64/fpu/svml_d_exp28_core.S
index dc0b3e77d0..0e8e027713 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp28_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp28_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_exp2)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp2_core.S b/sysdeps/x86_64/fpu/svml_d_exp2_core.S
index 14e41b9707..15109ef829 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_exp)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp4_core.S b/sysdeps/x86_64/fpu/svml_d_exp4_core.S
index cf91c08ab4..de35ab001f 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_exp)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_exp4_core_avx.S
index b1ed2bc0ae..452558041c 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_exp)
diff --git a/sysdeps/x86_64/fpu/svml_d_exp8_core.S b/sysdeps/x86_64/fpu/svml_d_exp8_core.S
index ef7d62c1ec..88e663fa9b 100644
--- a/sysdeps/x86_64/fpu/svml_d_exp8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_exp8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_exp)
diff --git a/sysdeps/x86_64/fpu/svml_d_expm12_core.S b/sysdeps/x86_64/fpu/svml_d_expm12_core.S
index b5bfd598a8..315d12e2e9 100644
--- a/sysdeps/x86_64/fpu/svml_d_expm12_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_expm12_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_expm1)
diff --git a/sysdeps/x86_64/fpu/svml_d_expm14_core.S b/sysdeps/x86_64/fpu/svml_d_expm14_core.S
index 1986f086ff..902a85bd4a 100644
--- a/sysdeps/x86_64/fpu/svml_d_expm14_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_expm14_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_expm1)
diff --git a/sysdeps/x86_64/fpu/svml_d_expm14_core_avx.S b/sysdeps/x86_64/fpu/svml_d_expm14_core_avx.S
index 333a7011ae..f8f7d15759 100644
--- a/sysdeps/x86_64/fpu/svml_d_expm14_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_expm14_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_expm1)
diff --git a/sysdeps/x86_64/fpu/svml_d_expm18_core.S b/sysdeps/x86_64/fpu/svml_d_expm18_core.S
index d008c4273d..513688ebf5 100644
--- a/sysdeps/x86_64/fpu/svml_d_expm18_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_expm18_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_expm1)
diff --git a/sysdeps/x86_64/fpu/svml_d_hypot2_core.S b/sysdeps/x86_64/fpu/svml_d_hypot2_core.S
index 6532e46a8b..c746560128 100644
--- a/sysdeps/x86_64/fpu/svml_d_hypot2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_hypot2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2vv_hypot)
diff --git a/sysdeps/x86_64/fpu/svml_d_hypot4_core.S b/sysdeps/x86_64/fpu/svml_d_hypot4_core.S
index 1383ac5304..aa1e2b330b 100644
--- a/sysdeps/x86_64/fpu/svml_d_hypot4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_hypot4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4vv_hypot)
diff --git a/sysdeps/x86_64/fpu/svml_d_hypot4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_hypot4_core_avx.S
index 6b1b165a2c..7028c55eab 100644
--- a/sysdeps/x86_64/fpu/svml_d_hypot4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_hypot4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4vv_hypot)
diff --git a/sysdeps/x86_64/fpu/svml_d_hypot8_core.S b/sysdeps/x86_64/fpu/svml_d_hypot8_core.S
index ec73ba6184..10c831fd08 100644
--- a/sysdeps/x86_64/fpu/svml_d_hypot8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_hypot8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8vv_hypot)
diff --git a/sysdeps/x86_64/fpu/svml_d_log102_core.S b/sysdeps/x86_64/fpu/svml_d_log102_core.S
index 9e0aa00f7e..a63e82bdbc 100644
--- a/sysdeps/x86_64/fpu/svml_d_log102_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log102_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_log10)
diff --git a/sysdeps/x86_64/fpu/svml_d_log104_core.S b/sysdeps/x86_64/fpu/svml_d_log104_core.S
index cc5e285dee..051ad8284a 100644
--- a/sysdeps/x86_64/fpu/svml_d_log104_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log104_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_log10)
diff --git a/sysdeps/x86_64/fpu/svml_d_log104_core_avx.S b/sysdeps/x86_64/fpu/svml_d_log104_core_avx.S
index ea1cb93a9d..f08b78e35e 100644
--- a/sysdeps/x86_64/fpu/svml_d_log104_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_log104_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_log10)
diff --git a/sysdeps/x86_64/fpu/svml_d_log108_core.S b/sysdeps/x86_64/fpu/svml_d_log108_core.S
index 59d5835cc7..8b5a59cf00 100644
--- a/sysdeps/x86_64/fpu/svml_d_log108_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log108_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_log10)
diff --git a/sysdeps/x86_64/fpu/svml_d_log1p2_core.S b/sysdeps/x86_64/fpu/svml_d_log1p2_core.S
index b40e238e11..058e6d47da 100644
--- a/sysdeps/x86_64/fpu/svml_d_log1p2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log1p2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_log1p)
diff --git a/sysdeps/x86_64/fpu/svml_d_log1p4_core.S b/sysdeps/x86_64/fpu/svml_d_log1p4_core.S
index 2c76849ca8..7c27ab9a5c 100644
--- a/sysdeps/x86_64/fpu/svml_d_log1p4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log1p4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_log1p)
diff --git a/sysdeps/x86_64/fpu/svml_d_log1p4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_log1p4_core_avx.S
index 42ace645e7..8b0b20f018 100644
--- a/sysdeps/x86_64/fpu/svml_d_log1p4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_log1p4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_log1p)
diff --git a/sysdeps/x86_64/fpu/svml_d_log1p8_core.S b/sysdeps/x86_64/fpu/svml_d_log1p8_core.S
index cca39f1847..1c6be998d7 100644
--- a/sysdeps/x86_64/fpu/svml_d_log1p8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log1p8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_log1p)
diff --git a/sysdeps/x86_64/fpu/svml_d_log22_core.S b/sysdeps/x86_64/fpu/svml_d_log22_core.S
index 8c8464b2f8..5e998a38e1 100644
--- a/sysdeps/x86_64/fpu/svml_d_log22_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log22_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_log2)
diff --git a/sysdeps/x86_64/fpu/svml_d_log24_core.S b/sysdeps/x86_64/fpu/svml_d_log24_core.S
index b75936f785..b2c3c4a727 100644
--- a/sysdeps/x86_64/fpu/svml_d_log24_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log24_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_log2)
diff --git a/sysdeps/x86_64/fpu/svml_d_log24_core_avx.S b/sysdeps/x86_64/fpu/svml_d_log24_core_avx.S
index f4a946033f..eaeee60be5 100644
--- a/sysdeps/x86_64/fpu/svml_d_log24_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_log24_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_log2)
diff --git a/sysdeps/x86_64/fpu/svml_d_log28_core.S b/sysdeps/x86_64/fpu/svml_d_log28_core.S
index e547d8431b..e81a0d27d7 100644
--- a/sysdeps/x86_64/fpu/svml_d_log28_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log28_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_log2)
diff --git a/sysdeps/x86_64/fpu/svml_d_log2_core.S b/sysdeps/x86_64/fpu/svml_d_log2_core.S
index 1e9790d78c..e38d58d465 100644
--- a/sysdeps/x86_64/fpu/svml_d_log2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_log)
diff --git a/sysdeps/x86_64/fpu/svml_d_log4_core.S b/sysdeps/x86_64/fpu/svml_d_log4_core.S
index cac601bb62..ab2801d343 100644
--- a/sysdeps/x86_64/fpu/svml_d_log4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_log)
diff --git a/sysdeps/x86_64/fpu/svml_d_log4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_log4_core_avx.S
index f769844917..ace1ac535a 100644
--- a/sysdeps/x86_64/fpu/svml_d_log4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_log4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_log)
diff --git a/sysdeps/x86_64/fpu/svml_d_log8_core.S b/sysdeps/x86_64/fpu/svml_d_log8_core.S
index 56284de286..37c0bcce11 100644
--- a/sysdeps/x86_64/fpu/svml_d_log8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_log8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_log)
diff --git a/sysdeps/x86_64/fpu/svml_d_pow2_core.S b/sysdeps/x86_64/fpu/svml_d_pow2_core.S
index f8cf580f76..7142d6ece4 100644
--- a/sysdeps/x86_64/fpu/svml_d_pow2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_pow2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2vv_pow)
diff --git a/sysdeps/x86_64/fpu/svml_d_pow4_core.S b/sysdeps/x86_64/fpu/svml_d_pow4_core.S
index 4cf403230d..572ba50519 100644
--- a/sysdeps/x86_64/fpu/svml_d_pow4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_pow4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4vv_pow)
diff --git a/sysdeps/x86_64/fpu/svml_d_pow4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_pow4_core_avx.S
index f72e9532f3..e8f7c56d82 100644
--- a/sysdeps/x86_64/fpu/svml_d_pow4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_pow4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4vv_pow)
diff --git a/sysdeps/x86_64/fpu/svml_d_pow8_core.S b/sysdeps/x86_64/fpu/svml_d_pow8_core.S
index 0b99cf6570..3f7d63cad0 100644
--- a/sysdeps/x86_64/fpu/svml_d_pow8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_pow8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8vv_pow)
diff --git a/sysdeps/x86_64/fpu/svml_d_sin2_core.S b/sysdeps/x86_64/fpu/svml_d_sin2_core.S
index 40f23bf473..c101822478 100644
--- a/sysdeps/x86_64/fpu/svml_d_sin2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sin2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_sin)
diff --git a/sysdeps/x86_64/fpu/svml_d_sin4_core.S b/sysdeps/x86_64/fpu/svml_d_sin4_core.S
index f7c6e5de88..53464f52e0 100644
--- a/sysdeps/x86_64/fpu/svml_d_sin4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sin4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_sin)
diff --git a/sysdeps/x86_64/fpu/svml_d_sin4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_sin4_core_avx.S
index 694ac1977a..d291d020dc 100644
--- a/sysdeps/x86_64/fpu/svml_d_sin4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_sin4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_sin)
diff --git a/sysdeps/x86_64/fpu/svml_d_sin8_core.S b/sysdeps/x86_64/fpu/svml_d_sin8_core.S
index c3c978a843..03dbf25620 100644
--- a/sysdeps/x86_64/fpu/svml_d_sin8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sin8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_sin)
diff --git a/sysdeps/x86_64/fpu/svml_d_sincos2_core.S b/sysdeps/x86_64/fpu/svml_d_sincos2_core.S
index 617e206870..3e9f604ead 100644
--- a/sysdeps/x86_64/fpu/svml_d_sincos2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sincos2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2vl8l8_sincos)
diff --git a/sysdeps/x86_64/fpu/svml_d_sincos4_core.S b/sysdeps/x86_64/fpu/svml_d_sincos4_core.S
index 53d491102e..b20361129b 100644
--- a/sysdeps/x86_64/fpu/svml_d_sincos4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sincos4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4vl8l8_sincos)
diff --git a/sysdeps/x86_64/fpu/svml_d_sincos4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_sincos4_core_avx.S
index ef798926f3..242c812c7c 100644
--- a/sysdeps/x86_64/fpu/svml_d_sincos4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_sincos4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4vl8l8_sincos)
diff --git a/sysdeps/x86_64/fpu/svml_d_sincos8_core.S b/sysdeps/x86_64/fpu/svml_d_sincos8_core.S
index d9ae0bedd0..6a39b7dbb4 100644
--- a/sysdeps/x86_64/fpu/svml_d_sincos8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sincos8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8vl8l8_sincos)
diff --git a/sysdeps/x86_64/fpu/svml_d_sinh2_core.S b/sysdeps/x86_64/fpu/svml_d_sinh2_core.S
index 205ad3b582..ab96636d0e 100644
--- a/sysdeps/x86_64/fpu/svml_d_sinh2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sinh2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_sinh)
diff --git a/sysdeps/x86_64/fpu/svml_d_sinh4_core.S b/sysdeps/x86_64/fpu/svml_d_sinh4_core.S
index 8f8bc794d6..9017582a06 100644
--- a/sysdeps/x86_64/fpu/svml_d_sinh4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sinh4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_sinh)
diff --git a/sysdeps/x86_64/fpu/svml_d_sinh4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_sinh4_core_avx.S
index 771fb2cd78..71aeb8d84d 100644
--- a/sysdeps/x86_64/fpu/svml_d_sinh4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_sinh4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_sinh)
diff --git a/sysdeps/x86_64/fpu/svml_d_sinh8_core.S b/sysdeps/x86_64/fpu/svml_d_sinh8_core.S
index 0279264b30..1dd49a9dbb 100644
--- a/sysdeps/x86_64/fpu/svml_d_sinh8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_sinh8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_sinh)
diff --git a/sysdeps/x86_64/fpu/svml_d_tan2_core.S b/sysdeps/x86_64/fpu/svml_d_tan2_core.S
index 6fdc334a40..f127f7819c 100644
--- a/sysdeps/x86_64/fpu/svml_d_tan2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_tan2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_tan)
diff --git a/sysdeps/x86_64/fpu/svml_d_tan4_core.S b/sysdeps/x86_64/fpu/svml_d_tan4_core.S
index 50e5331768..c1325c0984 100644
--- a/sysdeps/x86_64/fpu/svml_d_tan4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_tan4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_tan)
diff --git a/sysdeps/x86_64/fpu/svml_d_tan4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_tan4_core_avx.S
index e4b1f1ed93..0088977a95 100644
--- a/sysdeps/x86_64/fpu/svml_d_tan4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_tan4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_tan)
diff --git a/sysdeps/x86_64/fpu/svml_d_tan8_core.S b/sysdeps/x86_64/fpu/svml_d_tan8_core.S
index fd26488470..b92659d894 100644
--- a/sysdeps/x86_64/fpu/svml_d_tan8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_tan8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_tan)
diff --git a/sysdeps/x86_64/fpu/svml_d_tanh2_core.S b/sysdeps/x86_64/fpu/svml_d_tanh2_core.S
index 1970e4622c..867adfaeef 100644
--- a/sysdeps/x86_64/fpu/svml_d_tanh2_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_tanh2_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN2v_tanh)
diff --git a/sysdeps/x86_64/fpu/svml_d_tanh4_core.S b/sysdeps/x86_64/fpu/svml_d_tanh4_core.S
index 1205efdec8..720539fa07 100644
--- a/sysdeps/x86_64/fpu/svml_d_tanh4_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_tanh4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN4v_tanh)
diff --git a/sysdeps/x86_64/fpu/svml_d_tanh4_core_avx.S b/sysdeps/x86_64/fpu/svml_d_tanh4_core_avx.S
index c42f63c865..270a76e495 100644
--- a/sysdeps/x86_64/fpu/svml_d_tanh4_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_d_tanh4_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVcN4v_tanh)
diff --git a/sysdeps/x86_64/fpu/svml_d_tanh8_core.S b/sysdeps/x86_64/fpu/svml_d_tanh8_core.S
index fe7c82370d..0ec89c2636 100644
--- a/sysdeps/x86_64/fpu/svml_d_tanh8_core.S
+++ b/sysdeps/x86_64/fpu/svml_d_tanh8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_d_wrapper_impl.h"
+#include "svml_d_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN8v_tanh)
diff --git a/sysdeps/x86_64/fpu/svml_d_wrapper_impl.h b/sysdeps/x86_64/fpu/svml_d_wrapper_impl.h.S
similarity index 100%
rename from sysdeps/x86_64/fpu/svml_d_wrapper_impl.h
rename to sysdeps/x86_64/fpu/svml_d_wrapper_impl.h.S
diff --git a/sysdeps/x86_64/fpu/svml_s_acosf16_core.S b/sysdeps/x86_64/fpu/svml_s_acosf16_core.S
index 8dbe96d505..054713e328 100644
--- a/sysdeps/x86_64/fpu/svml_s_acosf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_acosf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_acosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_acosf4_core.S b/sysdeps/x86_64/fpu/svml_s_acosf4_core.S
index aeb82221f8..4160c34fb4 100644
--- a/sysdeps/x86_64/fpu/svml_s_acosf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_acosf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_acosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_acosf8_core.S b/sysdeps/x86_64/fpu/svml_s_acosf8_core.S
index 189f81005e..8e2efc1146 100644
--- a/sysdeps/x86_64/fpu/svml_s_acosf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_acosf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_acosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_acosf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_acosf8_core_avx.S
index fb432639ab..f0ee911cbe 100644
--- a/sysdeps/x86_64/fpu/svml_s_acosf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_acosf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_acosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_acoshf16_core.S b/sysdeps/x86_64/fpu/svml_s_acoshf16_core.S
index e5ece41ec6..391f1af733 100644
--- a/sysdeps/x86_64/fpu/svml_s_acoshf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_acoshf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_acoshf)
diff --git a/sysdeps/x86_64/fpu/svml_s_acoshf4_core.S b/sysdeps/x86_64/fpu/svml_s_acoshf4_core.S
index d728e9f54f..ecb8705328 100644
--- a/sysdeps/x86_64/fpu/svml_s_acoshf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_acoshf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_acoshf)
diff --git a/sysdeps/x86_64/fpu/svml_s_acoshf8_core.S b/sysdeps/x86_64/fpu/svml_s_acoshf8_core.S
index 1f8352077e..cbac2627b7 100644
--- a/sysdeps/x86_64/fpu/svml_s_acoshf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_acoshf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_acoshf)
diff --git a/sysdeps/x86_64/fpu/svml_s_acoshf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_acoshf8_core_avx.S
index b9fc52c289..ead2bf3f2b 100644
--- a/sysdeps/x86_64/fpu/svml_s_acoshf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_acoshf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_acoshf)
diff --git a/sysdeps/x86_64/fpu/svml_s_asinf16_core.S b/sysdeps/x86_64/fpu/svml_s_asinf16_core.S
index 54e947edd1..717d340b24 100644
--- a/sysdeps/x86_64/fpu/svml_s_asinf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_asinf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_asinf)
diff --git a/sysdeps/x86_64/fpu/svml_s_asinf4_core.S b/sysdeps/x86_64/fpu/svml_s_asinf4_core.S
index 10bddc352b..6b94efd9d3 100644
--- a/sysdeps/x86_64/fpu/svml_s_asinf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_asinf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_asinf)
diff --git a/sysdeps/x86_64/fpu/svml_s_asinf8_core.S b/sysdeps/x86_64/fpu/svml_s_asinf8_core.S
index 77f4d83a2c..4e490cbd5f 100644
--- a/sysdeps/x86_64/fpu/svml_s_asinf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_asinf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_asinf)
diff --git a/sysdeps/x86_64/fpu/svml_s_asinf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_asinf8_core_avx.S
index 6202b4d4cf..cde5528197 100644
--- a/sysdeps/x86_64/fpu/svml_s_asinf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_asinf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_asinf)
diff --git a/sysdeps/x86_64/fpu/svml_s_asinhf16_core.S b/sysdeps/x86_64/fpu/svml_s_asinhf16_core.S
index 16de57456e..ffb49184f7 100644
--- a/sysdeps/x86_64/fpu/svml_s_asinhf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_asinhf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_asinhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_asinhf4_core.S b/sysdeps/x86_64/fpu/svml_s_asinhf4_core.S
index 07dacc599f..ad4acbbd66 100644
--- a/sysdeps/x86_64/fpu/svml_s_asinhf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_asinhf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_asinhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_asinhf8_core.S b/sysdeps/x86_64/fpu/svml_s_asinhf8_core.S
index b874f4256b..41a1527162 100644
--- a/sysdeps/x86_64/fpu/svml_s_asinhf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_asinhf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_asinhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_asinhf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_asinhf8_core_avx.S
index b00a52e005..44607cd889 100644
--- a/sysdeps/x86_64/fpu/svml_s_asinhf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_asinhf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_asinhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_atan2f16_core.S b/sysdeps/x86_64/fpu/svml_s_atan2f16_core.S
index 345792d376..612b5af828 100644
--- a/sysdeps/x86_64/fpu/svml_s_atan2f16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atan2f16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16vv_atan2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_atan2f4_core.S b/sysdeps/x86_64/fpu/svml_s_atan2f4_core.S
index 536b739f04..a3fb092911 100644
--- a/sysdeps/x86_64/fpu/svml_s_atan2f4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atan2f4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4vv_atan2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_atan2f8_core.S b/sysdeps/x86_64/fpu/svml_s_atan2f8_core.S
index 67376ca528..2f694b6486 100644
--- a/sysdeps/x86_64/fpu/svml_s_atan2f8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atan2f8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8vv_atan2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_atan2f8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_atan2f8_core_avx.S
index 1c670d627f..06c856191b 100644
--- a/sysdeps/x86_64/fpu/svml_s_atan2f8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_atan2f8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY(_ZGVcN8vv_atan2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_atanf16_core.S b/sysdeps/x86_64/fpu/svml_s_atanf16_core.S
index b1471451a0..59a0267aa0 100644
--- a/sysdeps/x86_64/fpu/svml_s_atanf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atanf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_atanf)
diff --git a/sysdeps/x86_64/fpu/svml_s_atanf4_core.S b/sysdeps/x86_64/fpu/svml_s_atanf4_core.S
index ea118a7984..2567206463 100644
--- a/sysdeps/x86_64/fpu/svml_s_atanf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atanf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_atanf)
diff --git a/sysdeps/x86_64/fpu/svml_s_atanf8_core.S b/sysdeps/x86_64/fpu/svml_s_atanf8_core.S
index 8fad748544..b7961c7dbc 100644
--- a/sysdeps/x86_64/fpu/svml_s_atanf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atanf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_atanf)
diff --git a/sysdeps/x86_64/fpu/svml_s_atanf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_atanf8_core_avx.S
index 1216b8a057..bedb807e1f 100644
--- a/sysdeps/x86_64/fpu/svml_s_atanf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_atanf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_atanf)
diff --git a/sysdeps/x86_64/fpu/svml_s_atanhf16_core.S b/sysdeps/x86_64/fpu/svml_s_atanhf16_core.S
index 96dce010ec..240d943d6c 100644
--- a/sysdeps/x86_64/fpu/svml_s_atanhf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atanhf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_atanhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_atanhf4_core.S b/sysdeps/x86_64/fpu/svml_s_atanhf4_core.S
index 1c1ec2bd0f..af4f58944f 100644
--- a/sysdeps/x86_64/fpu/svml_s_atanhf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atanhf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_atanhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_atanhf8_core.S b/sysdeps/x86_64/fpu/svml_s_atanhf8_core.S
index d92825330e..d23d62a18b 100644
--- a/sysdeps/x86_64/fpu/svml_s_atanhf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_atanhf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_atanhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_atanhf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_atanhf8_core_avx.S
index 54d0b77b08..e5ec0c8eac 100644
--- a/sysdeps/x86_64/fpu/svml_s_atanhf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_atanhf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_atanhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_cbrtf16_core.S b/sysdeps/x86_64/fpu/svml_s_cbrtf16_core.S
index efe9149807..726631e734 100644
--- a/sysdeps/x86_64/fpu/svml_s_cbrtf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_cbrtf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_cbrtf)
diff --git a/sysdeps/x86_64/fpu/svml_s_cbrtf4_core.S b/sysdeps/x86_64/fpu/svml_s_cbrtf4_core.S
index 687c549d7f..44e4f9f678 100644
--- a/sysdeps/x86_64/fpu/svml_s_cbrtf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_cbrtf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_cbrtf)
diff --git a/sysdeps/x86_64/fpu/svml_s_cbrtf8_core.S b/sysdeps/x86_64/fpu/svml_s_cbrtf8_core.S
index 2bb6fe8e78..e202f42255 100644
--- a/sysdeps/x86_64/fpu/svml_s_cbrtf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_cbrtf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_cbrtf)
diff --git a/sysdeps/x86_64/fpu/svml_s_cbrtf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_cbrtf8_core_avx.S
index 592f2cd419..b5f0f8ebdb 100644
--- a/sysdeps/x86_64/fpu/svml_s_cbrtf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_cbrtf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_cbrtf)
diff --git a/sysdeps/x86_64/fpu/svml_s_cosf16_core.S b/sysdeps/x86_64/fpu/svml_s_cosf16_core.S
index 8daeffc289..8775f8da9c 100644
--- a/sysdeps/x86_64/fpu/svml_s_cosf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_cosf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_cosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_cosf4_core.S b/sysdeps/x86_64/fpu/svml_s_cosf4_core.S
index c6c3a4a622..5d9806898b 100644
--- a/sysdeps/x86_64/fpu/svml_s_cosf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_cosf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_cosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_cosf8_core.S b/sysdeps/x86_64/fpu/svml_s_cosf8_core.S
index a4033da6de..5730e4265d 100644
--- a/sysdeps/x86_64/fpu/svml_s_cosf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_cosf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_cosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_cosf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_cosf8_core_avx.S
index 12c6fddfa8..ab49929b56 100644
--- a/sysdeps/x86_64/fpu/svml_s_cosf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_cosf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_cosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_coshf16_core.S b/sysdeps/x86_64/fpu/svml_s_coshf16_core.S
index 97667390aa..8668f5bc86 100644
--- a/sysdeps/x86_64/fpu/svml_s_coshf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_coshf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_coshf)
diff --git a/sysdeps/x86_64/fpu/svml_s_coshf4_core.S b/sysdeps/x86_64/fpu/svml_s_coshf4_core.S
index 8803c5e70b..82b893cd76 100644
--- a/sysdeps/x86_64/fpu/svml_s_coshf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_coshf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_coshf)
diff --git a/sysdeps/x86_64/fpu/svml_s_coshf8_core.S b/sysdeps/x86_64/fpu/svml_s_coshf8_core.S
index 85b144938e..1527b69e28 100644
--- a/sysdeps/x86_64/fpu/svml_s_coshf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_coshf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_coshf)
diff --git a/sysdeps/x86_64/fpu/svml_s_coshf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_coshf8_core_avx.S
index 8e4e1c19bb..f4ccf65eb9 100644
--- a/sysdeps/x86_64/fpu/svml_s_coshf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_coshf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_coshf)
diff --git a/sysdeps/x86_64/fpu/svml_s_erfcf16_core.S b/sysdeps/x86_64/fpu/svml_s_erfcf16_core.S
index 0a14a1a4da..ca5a3cae8a 100644
--- a/sysdeps/x86_64/fpu/svml_s_erfcf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_erfcf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_erfcf)
diff --git a/sysdeps/x86_64/fpu/svml_s_erfcf4_core.S b/sysdeps/x86_64/fpu/svml_s_erfcf4_core.S
index 0a7e3b79ee..ee98c24e3e 100644
--- a/sysdeps/x86_64/fpu/svml_s_erfcf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_erfcf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_erfcf)
diff --git a/sysdeps/x86_64/fpu/svml_s_erfcf8_core.S b/sysdeps/x86_64/fpu/svml_s_erfcf8_core.S
index 8122963d73..ef1f77458b 100644
--- a/sysdeps/x86_64/fpu/svml_s_erfcf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_erfcf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_erfcf)
diff --git a/sysdeps/x86_64/fpu/svml_s_erfcf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_erfcf8_core_avx.S
index 4f347c4d3c..803c9533c2 100644
--- a/sysdeps/x86_64/fpu/svml_s_erfcf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_erfcf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_erfcf)
diff --git a/sysdeps/x86_64/fpu/svml_s_erff16_core.S b/sysdeps/x86_64/fpu/svml_s_erff16_core.S
index d544a6742d..95be88c16d 100644
--- a/sysdeps/x86_64/fpu/svml_s_erff16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_erff16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_erff)
diff --git a/sysdeps/x86_64/fpu/svml_s_erff4_core.S b/sysdeps/x86_64/fpu/svml_s_erff4_core.S
index 4a83c8b6cc..3f9aace76b 100644
--- a/sysdeps/x86_64/fpu/svml_s_erff4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_erff4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_erff)
diff --git a/sysdeps/x86_64/fpu/svml_s_erff8_core.S b/sysdeps/x86_64/fpu/svml_s_erff8_core.S
index d91b5ad0c2..eb018cde99 100644
--- a/sysdeps/x86_64/fpu/svml_s_erff8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_erff8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_erff)
diff --git a/sysdeps/x86_64/fpu/svml_s_erff8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_erff8_core_avx.S
index b2a8e7a152..87ded07bf1 100644
--- a/sysdeps/x86_64/fpu/svml_s_erff8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_erff8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_erff)
diff --git a/sysdeps/x86_64/fpu/svml_s_exp10f16_core.S b/sysdeps/x86_64/fpu/svml_s_exp10f16_core.S
index 6e59aa2d45..64bfc69929 100644
--- a/sysdeps/x86_64/fpu/svml_s_exp10f16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_exp10f16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_exp10f)
diff --git a/sysdeps/x86_64/fpu/svml_s_exp10f4_core.S b/sysdeps/x86_64/fpu/svml_s_exp10f4_core.S
index 3ebc7ed06d..652231cacf 100644
--- a/sysdeps/x86_64/fpu/svml_s_exp10f4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_exp10f4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_exp10f)
diff --git a/sysdeps/x86_64/fpu/svml_s_exp10f8_core.S b/sysdeps/x86_64/fpu/svml_s_exp10f8_core.S
index 338caf3fc2..61a9b908ca 100644
--- a/sysdeps/x86_64/fpu/svml_s_exp10f8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_exp10f8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_exp10f)
diff --git a/sysdeps/x86_64/fpu/svml_s_exp10f8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_exp10f8_core_avx.S
index e0b6202662..f436570d36 100644
--- a/sysdeps/x86_64/fpu/svml_s_exp10f8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_exp10f8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_exp10f)
diff --git a/sysdeps/x86_64/fpu/svml_s_exp2f16_core.S b/sysdeps/x86_64/fpu/svml_s_exp2f16_core.S
index 2a73400a0b..0d3d6c0c9d 100644
--- a/sysdeps/x86_64/fpu/svml_s_exp2f16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_exp2f16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_exp2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_exp2f4_core.S b/sysdeps/x86_64/fpu/svml_s_exp2f4_core.S
index ef6d68974c..05975db34f 100644
--- a/sysdeps/x86_64/fpu/svml_s_exp2f4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_exp2f4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_exp2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_exp2f8_core.S b/sysdeps/x86_64/fpu/svml_s_exp2f8_core.S
index f7efe3736c..0dbeb46254 100644
--- a/sysdeps/x86_64/fpu/svml_s_exp2f8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_exp2f8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_exp2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_exp2f8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_exp2f8_core_avx.S
index b394654549..77e67248a7 100644
--- a/sysdeps/x86_64/fpu/svml_s_exp2f8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_exp2f8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_exp2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_expf16_core.S b/sysdeps/x86_64/fpu/svml_s_expf16_core.S
index cb3fc1f333..b99898deb3 100644
--- a/sysdeps/x86_64/fpu/svml_s_expf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_expf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_expf)
diff --git a/sysdeps/x86_64/fpu/svml_s_expf4_core.S b/sysdeps/x86_64/fpu/svml_s_expf4_core.S
index 587e90bf33..2aaefa163e 100644
--- a/sysdeps/x86_64/fpu/svml_s_expf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_expf4_core.S
@@ -18,7 +18,7 @@
 
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_expf)
diff --git a/sysdeps/x86_64/fpu/svml_s_expf8_core.S b/sysdeps/x86_64/fpu/svml_s_expf8_core.S
index 01ca10da37..6f14117d74 100644
--- a/sysdeps/x86_64/fpu/svml_s_expf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_expf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_expf)
diff --git a/sysdeps/x86_64/fpu/svml_s_expf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_expf8_core_avx.S
index a3ede96599..6e2cd7b8af 100644
--- a/sysdeps/x86_64/fpu/svml_s_expf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_expf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY(_ZGVcN8v_expf)
diff --git a/sysdeps/x86_64/fpu/svml_s_expm1f16_core.S b/sysdeps/x86_64/fpu/svml_s_expm1f16_core.S
index 082cf1e6e5..7f3d9826ae 100644
--- a/sysdeps/x86_64/fpu/svml_s_expm1f16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_expm1f16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_expm1f)
diff --git a/sysdeps/x86_64/fpu/svml_s_expm1f4_core.S b/sysdeps/x86_64/fpu/svml_s_expm1f4_core.S
index c1b1860728..13f5ccdf3a 100644
--- a/sysdeps/x86_64/fpu/svml_s_expm1f4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_expm1f4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_expm1f)
diff --git a/sysdeps/x86_64/fpu/svml_s_expm1f8_core.S b/sysdeps/x86_64/fpu/svml_s_expm1f8_core.S
index a39538dfd7..3f69069585 100644
--- a/sysdeps/x86_64/fpu/svml_s_expm1f8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_expm1f8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_expm1f)
diff --git a/sysdeps/x86_64/fpu/svml_s_expm1f8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_expm1f8_core_avx.S
index eaaca17ce7..dc6a7a4973 100644
--- a/sysdeps/x86_64/fpu/svml_s_expm1f8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_expm1f8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_expm1f)
diff --git a/sysdeps/x86_64/fpu/svml_s_hypotf16_core.S b/sysdeps/x86_64/fpu/svml_s_hypotf16_core.S
index 34ca783049..672f05269c 100644
--- a/sysdeps/x86_64/fpu/svml_s_hypotf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_hypotf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16vv_hypotf)
diff --git a/sysdeps/x86_64/fpu/svml_s_hypotf4_core.S b/sysdeps/x86_64/fpu/svml_s_hypotf4_core.S
index e1d8ad19a6..dd09fad865 100644
--- a/sysdeps/x86_64/fpu/svml_s_hypotf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_hypotf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4vv_hypotf)
diff --git a/sysdeps/x86_64/fpu/svml_s_hypotf8_core.S b/sysdeps/x86_64/fpu/svml_s_hypotf8_core.S
index f5aa9f1e10..6d87708238 100644
--- a/sysdeps/x86_64/fpu/svml_s_hypotf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_hypotf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8vv_hypotf)
diff --git a/sysdeps/x86_64/fpu/svml_s_hypotf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_hypotf8_core_avx.S
index 707e91d7d3..7edb0d3cf2 100644
--- a/sysdeps/x86_64/fpu/svml_s_hypotf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_hypotf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY(_ZGVcN8vv_hypotf)
diff --git a/sysdeps/x86_64/fpu/svml_s_log10f16_core.S b/sysdeps/x86_64/fpu/svml_s_log10f16_core.S
index 8544bfb78c..e9df420be5 100644
--- a/sysdeps/x86_64/fpu/svml_s_log10f16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log10f16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_log10f)
diff --git a/sysdeps/x86_64/fpu/svml_s_log10f4_core.S b/sysdeps/x86_64/fpu/svml_s_log10f4_core.S
index 82188bedf4..7ac8512459 100644
--- a/sysdeps/x86_64/fpu/svml_s_log10f4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log10f4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_log10f)
diff --git a/sysdeps/x86_64/fpu/svml_s_log10f8_core.S b/sysdeps/x86_64/fpu/svml_s_log10f8_core.S
index 03eea3415c..9f6006d2d1 100644
--- a/sysdeps/x86_64/fpu/svml_s_log10f8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log10f8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_log10f)
diff --git a/sysdeps/x86_64/fpu/svml_s_log10f8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_log10f8_core_avx.S
index 9943a86eb5..b811d10876 100644
--- a/sysdeps/x86_64/fpu/svml_s_log10f8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_log10f8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_log10f)
diff --git a/sysdeps/x86_64/fpu/svml_s_log1pf16_core.S b/sysdeps/x86_64/fpu/svml_s_log1pf16_core.S
index 9e70217b1e..20c838b4de 100644
--- a/sysdeps/x86_64/fpu/svml_s_log1pf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log1pf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_log1pf)
diff --git a/sysdeps/x86_64/fpu/svml_s_log1pf4_core.S b/sysdeps/x86_64/fpu/svml_s_log1pf4_core.S
index 4de7f84564..2e179b91e6 100644
--- a/sysdeps/x86_64/fpu/svml_s_log1pf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log1pf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_log1pf)
diff --git a/sysdeps/x86_64/fpu/svml_s_log1pf8_core.S b/sysdeps/x86_64/fpu/svml_s_log1pf8_core.S
index edf35f29ca..9a24ad132f 100644
--- a/sysdeps/x86_64/fpu/svml_s_log1pf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log1pf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_log1pf)
diff --git a/sysdeps/x86_64/fpu/svml_s_log1pf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_log1pf8_core_avx.S
index 1acd26070f..3055ce8d96 100644
--- a/sysdeps/x86_64/fpu/svml_s_log1pf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_log1pf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_log1pf)
diff --git a/sysdeps/x86_64/fpu/svml_s_log2f16_core.S b/sysdeps/x86_64/fpu/svml_s_log2f16_core.S
index 1a21fe6996..9305f1fc2d 100644
--- a/sysdeps/x86_64/fpu/svml_s_log2f16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log2f16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_log2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_log2f4_core.S b/sysdeps/x86_64/fpu/svml_s_log2f4_core.S
index fd28c9e43b..4bcc88b349 100644
--- a/sysdeps/x86_64/fpu/svml_s_log2f4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log2f4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_log2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_log2f8_core.S b/sysdeps/x86_64/fpu/svml_s_log2f8_core.S
index 8f6254f7d2..db51a650be 100644
--- a/sysdeps/x86_64/fpu/svml_s_log2f8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_log2f8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_log2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_log2f8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_log2f8_core_avx.S
index 6a1832faa4..743fcd3d91 100644
--- a/sysdeps/x86_64/fpu/svml_s_log2f8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_log2f8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_log2f)
diff --git a/sysdeps/x86_64/fpu/svml_s_logf16_core.S b/sysdeps/x86_64/fpu/svml_s_logf16_core.S
index d9df2536d2..2de06af230 100644
--- a/sysdeps/x86_64/fpu/svml_s_logf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_logf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_logf)
diff --git a/sysdeps/x86_64/fpu/svml_s_logf4_core.S b/sysdeps/x86_64/fpu/svml_s_logf4_core.S
index 8300d4464e..6edb8f6cec 100644
--- a/sysdeps/x86_64/fpu/svml_s_logf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_logf4_core.S
@@ -18,7 +18,7 @@
 
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_logf)
diff --git a/sysdeps/x86_64/fpu/svml_s_logf8_core.S b/sysdeps/x86_64/fpu/svml_s_logf8_core.S
index 2d779866f4..df57322134 100644
--- a/sysdeps/x86_64/fpu/svml_s_logf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_logf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_logf)
diff --git a/sysdeps/x86_64/fpu/svml_s_logf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_logf8_core_avx.S
index 8e77a9ea2d..a78dca2ce5 100644
--- a/sysdeps/x86_64/fpu/svml_s_logf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_logf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY(_ZGVcN8v_logf)
diff --git a/sysdeps/x86_64/fpu/svml_s_powf16_core.S b/sysdeps/x86_64/fpu/svml_s_powf16_core.S
index 117d907007..69fef6a25d 100644
--- a/sysdeps/x86_64/fpu/svml_s_powf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_powf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16vv_powf)
diff --git a/sysdeps/x86_64/fpu/svml_s_powf4_core.S b/sysdeps/x86_64/fpu/svml_s_powf4_core.S
index d328436a0a..f28a9ed9d5 100644
--- a/sysdeps/x86_64/fpu/svml_s_powf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_powf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4vv_powf)
diff --git a/sysdeps/x86_64/fpu/svml_s_powf8_core.S b/sysdeps/x86_64/fpu/svml_s_powf8_core.S
index 881c841eb5..ace548b93e 100644
--- a/sysdeps/x86_64/fpu/svml_s_powf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_powf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8vv_powf)
diff --git a/sysdeps/x86_64/fpu/svml_s_powf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_powf8_core_avx.S
index 7d71c56106..d269163620 100644
--- a/sysdeps/x86_64/fpu/svml_s_powf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_powf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY(_ZGVcN8vv_powf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sincosf16_core.S b/sysdeps/x86_64/fpu/svml_s_sincosf16_core.S
index c46f34cc33..6b13904f32 100644
--- a/sysdeps/x86_64/fpu/svml_s_sincosf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sincosf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16vl4l4_sincosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sincosf4_core.S b/sysdeps/x86_64/fpu/svml_s_sincosf4_core.S
index a2c38364fb..5e8e68cb46 100644
--- a/sysdeps/x86_64/fpu/svml_s_sincosf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sincosf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4vl4l4_sincosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sincosf8_core.S b/sysdeps/x86_64/fpu/svml_s_sincosf8_core.S
index c6e9d544a2..62d4ed96a0 100644
--- a/sysdeps/x86_64/fpu/svml_s_sincosf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sincosf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8vl4l4_sincosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sincosf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_sincosf8_core_avx.S
index fe5fbd929d..39d3b6135c 100644
--- a/sysdeps/x86_64/fpu/svml_s_sincosf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_sincosf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8vl4l4_sincosf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sinf16_core.S b/sysdeps/x86_64/fpu/svml_s_sinf16_core.S
index d456e801b6..32a89294f6 100644
--- a/sysdeps/x86_64/fpu/svml_s_sinf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sinf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_sinf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sinf4_core.S b/sysdeps/x86_64/fpu/svml_s_sinf4_core.S
index 5b89563158..ad7e12f8da 100644
--- a/sysdeps/x86_64/fpu/svml_s_sinf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sinf4_core.S
@@ -18,7 +18,7 @@
 
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_sinf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sinf8_core.S b/sysdeps/x86_64/fpu/svml_s_sinf8_core.S
index f1bf44fa6f..bb80a43360 100644
--- a/sysdeps/x86_64/fpu/svml_s_sinf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sinf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_sinf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sinf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_sinf8_core_avx.S
index 14de999a89..a296e1a233 100644
--- a/sysdeps/x86_64/fpu/svml_s_sinf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_sinf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY(_ZGVcN8v_sinf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sinhf16_core.S b/sysdeps/x86_64/fpu/svml_s_sinhf16_core.S
index da1269c156..666270e804 100644
--- a/sysdeps/x86_64/fpu/svml_s_sinhf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sinhf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_sinhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sinhf4_core.S b/sysdeps/x86_64/fpu/svml_s_sinhf4_core.S
index c233bf1ac6..50b36b81a6 100644
--- a/sysdeps/x86_64/fpu/svml_s_sinhf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sinhf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_sinhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sinhf8_core.S b/sysdeps/x86_64/fpu/svml_s_sinhf8_core.S
index 9e301d8896..1d2913eb88 100644
--- a/sysdeps/x86_64/fpu/svml_s_sinhf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_sinhf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_sinhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_sinhf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_sinhf8_core_avx.S
index f21eb1e26c..555ca75a04 100644
--- a/sysdeps/x86_64/fpu/svml_s_sinhf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_sinhf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_sinhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_tanf16_core.S b/sysdeps/x86_64/fpu/svml_s_tanf16_core.S
index f8ce7880fb..1e66c2c186 100644
--- a/sysdeps/x86_64/fpu/svml_s_tanf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_tanf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_tanf)
diff --git a/sysdeps/x86_64/fpu/svml_s_tanf4_core.S b/sysdeps/x86_64/fpu/svml_s_tanf4_core.S
index 3b6c0603c8..868a6ab327 100644
--- a/sysdeps/x86_64/fpu/svml_s_tanf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_tanf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_tanf)
diff --git a/sysdeps/x86_64/fpu/svml_s_tanf8_core.S b/sysdeps/x86_64/fpu/svml_s_tanf8_core.S
index 084f2b4c95..92a2e583c0 100644
--- a/sysdeps/x86_64/fpu/svml_s_tanf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_tanf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_tanf)
diff --git a/sysdeps/x86_64/fpu/svml_s_tanf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_tanf8_core_avx.S
index 8d42d3bec4..0b506755d8 100644
--- a/sysdeps/x86_64/fpu/svml_s_tanf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_tanf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_tanf)
diff --git a/sysdeps/x86_64/fpu/svml_s_tanhf16_core.S b/sysdeps/x86_64/fpu/svml_s_tanhf16_core.S
index c25c5925a4..b7166b480a 100644
--- a/sysdeps/x86_64/fpu/svml_s_tanhf16_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_tanhf16_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVeN16v_tanhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_tanhf4_core.S b/sysdeps/x86_64/fpu/svml_s_tanhf4_core.S
index a6cf56cbe4..5fe52830b1 100644
--- a/sysdeps/x86_64/fpu/svml_s_tanhf4_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_tanhf4_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVbN4v_tanhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_tanhf8_core.S b/sysdeps/x86_64/fpu/svml_s_tanhf8_core.S
index 610c4e0759..9ea6b9bc8c 100644
--- a/sysdeps/x86_64/fpu/svml_s_tanhf8_core.S
+++ b/sysdeps/x86_64/fpu/svml_s_tanhf8_core.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
 	.text
 ENTRY (_ZGVdN8v_tanhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_tanhf8_core_avx.S b/sysdeps/x86_64/fpu/svml_s_tanhf8_core_avx.S
index 5e9eca577f..9230746e01 100644
--- a/sysdeps/x86_64/fpu/svml_s_tanhf8_core_avx.S
+++ b/sysdeps/x86_64/fpu/svml_s_tanhf8_core_avx.S
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include "svml_s_wrapper_impl.h"
+#include "svml_s_wrapper_impl.h.S"
 
         .text
 ENTRY (_ZGVcN8v_tanhf)
diff --git a/sysdeps/x86_64/fpu/svml_s_wrapper_impl.h b/sysdeps/x86_64/fpu/svml_s_wrapper_impl.h.S
similarity index 100%
rename from sysdeps/x86_64/fpu/svml_s_wrapper_impl.h
rename to sysdeps/x86_64/fpu/svml_s_wrapper_impl.h.S
