10 files changed, 16 insertions, 16 deletions
diff --git a/sysdeps/i386/i686/fpu/multiarch/Makefile b/sysdeps/i386/fpu/multiarch/Makefile
index 7d9089232f..300758f253 100644
--- a/sysdeps/i386/i686/fpu/multiarch/Makefile
+++ b/sysdeps/i386/fpu/multiarch/Makefile
@@ -1,4 +1,4 @@
 ifeq ($(subdir),math)
-libm-sysdep_routines += e_expf-sse2 e_expf-ia32 s_sinf-sse2 s_cosf-sse2 \
+libm-sysdep_routines += e_expf-sse2 e_expf-i386 s_sinf-sse2 s_cosf-sse2 \
                         s_sincosf-sse2
 endif
diff --git a/sysdeps/i386/i686/fpu/multiarch/e_expf-ia32.S b/sysdeps/i386/fpu/multiarch/e_expf-i386.S
index 8ceb172f06..3a7eb5d5fa 100644
--- a/sysdeps/i386/i686/fpu/multiarch/e_expf-ia32.S
+++ b/sysdeps/i386/fpu/multiarch/e_expf-i386.S
@@ -16,7 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#define __ieee754_expf __ieee754_expf_ia32
-#define __expf_finite __expf_finite_ia32
+#define __ieee754_expf __ieee754_expf_i386
+#define __expf_finite __expf_finite_i386
 
 #include <sysdeps/i386/fpu/e_expf.S>
diff --git a/sysdeps/i386/i686/fpu/multiarch/e_expf-sse2.S b/sysdeps/i386/fpu/multiarch/e_expf-sse2.S
index be3b145e0f..be3b145e0f 100644
--- a/sysdeps/i386/i686/fpu/multiarch/e_expf-sse2.S
+++ b/sysdeps/i386/fpu/multiarch/e_expf-sse2.S
diff --git a/sysdeps/i386/i686/fpu/multiarch/e_expf.c b/sysdeps/i386/fpu/multiarch/e_expf.c
index 697888343b..773812da0b 100644
--- a/sysdeps/i386/i686/fpu/multiarch/e_expf.c
+++ b/sysdeps/i386/fpu/multiarch/e_expf.c
@@ -19,19 +19,19 @@
 #include <init-arch.h>
 
 extern double __ieee754_expf_sse2 (double);
-extern double __ieee754_expf_ia32 (double);
+extern double __ieee754_expf_i386 (double);
 
 double __ieee754_expf (double);
 libm_ifunc (__ieee754_expf,
 	    HAS_CPU_FEATURE (SSE2)
 	    ? __ieee754_expf_sse2
-	    : __ieee754_expf_ia32);
+	    : __ieee754_expf_i386);
 
 extern double __expf_finite_sse2 (double);
-extern double __expf_finite_ia32 (double);
+extern double __expf_finite_i386 (double);
 
 double __expf_finite (double);
 libm_ifunc (__expf_finite,
 	    HAS_CPU_FEATURE (SSE2)
 	    ? __expf_finite_sse2
-	    : __expf_finite_ia32);
+	    : __expf_finite_i386);
diff --git a/sysdeps/i386/i686/fpu/multiarch/s_cosf-sse2.S b/sysdeps/i386/fpu/multiarch/s_cosf-sse2.S
index 0f99edc9e3..0f99edc9e3 100644
--- a/sysdeps/i386/i686/fpu/multiarch/s_cosf-sse2.S
+++ b/sysdeps/i386/fpu/multiarch/s_cosf-sse2.S
diff --git a/sysdeps/i386/i686/fpu/multiarch/s_cosf.c b/sysdeps/i386/fpu/multiarch/s_cosf.c
index e32b2f4529..1a9c3e87b0 100644
--- a/sysdeps/i386/i686/fpu/multiarch/s_cosf.c
+++ b/sysdeps/i386/fpu/multiarch/s_cosf.c
@@ -19,11 +19,11 @@
 #include <init-arch.h>
 
 extern float __cosf_sse2 (float);
-extern float __cosf_ia32 (float);
+extern float __cosf_i386 (float);
 float __cosf (float);
 
-libm_ifunc (__cosf, HAS_CPU_FEATURE (SSE2) ? __cosf_sse2 : __cosf_ia32);
+libm_ifunc (__cosf, HAS_CPU_FEATURE (SSE2) ? __cosf_sse2 : __cosf_i386);
 weak_alias (__cosf, cosf);
 
-#define COSF __cosf_ia32
+#define COSF __cosf_i386
 #include <sysdeps/ieee754/flt-32/s_cosf.c>
diff --git a/sysdeps/i386/i686/fpu/multiarch/s_sincosf-sse2.S b/sysdeps/i386/fpu/multiarch/s_sincosf-sse2.S
index f9aa221d9e..f9aa221d9e 100644
--- a/sysdeps/i386/i686/fpu/multiarch/s_sincosf-sse2.S
+++ b/sysdeps/i386/fpu/multiarch/s_sincosf-sse2.S
diff --git a/sysdeps/i386/i686/fpu/multiarch/s_sincosf.c b/sysdeps/i386/fpu/multiarch/s_sincosf.c
index 0d827e0daa..2132d47b20 100644
--- a/sysdeps/i386/i686/fpu/multiarch/s_sincosf.c
+++ b/sysdeps/i386/fpu/multiarch/s_sincosf.c
@@ -19,12 +19,12 @@
 #include <init-arch.h>
 
 extern void __sincosf_sse2 (float, float *, float *);
-extern void __sincosf_ia32 (float, float *, float *);
+extern void __sincosf_i386 (float, float *, float *);
 void __sincosf (float, float *, float *);
 
 libm_ifunc (__sincosf,
-	    HAS_CPU_FEATURE (SSE2) ? __sincosf_sse2 : __sincosf_ia32);
+	    HAS_CPU_FEATURE (SSE2) ? __sincosf_sse2 : __sincosf_i386);
 weak_alias (__sincosf, sincosf);
 
-#define SINCOSF __sincosf_ia32
+#define SINCOSF __sincosf_i386
 #include <sysdeps/ieee754/flt-32/s_sincosf.c>
diff --git a/sysdeps/i386/i686/fpu/multiarch/s_sinf-sse2.S b/sysdeps/i386/fpu/multiarch/s_sinf-sse2.S
index 1731e4d7be..1731e4d7be 100644
--- a/sysdeps/i386/i686/fpu/multiarch/s_sinf-sse2.S
+++ b/sysdeps/i386/fpu/multiarch/s_sinf-sse2.S
diff --git a/sysdeps/i386/i686/fpu/multiarch/s_sinf.c b/sysdeps/i386/fpu/multiarch/s_sinf.c
index 18afaa2714..b4e0b7d994 100644
--- a/sysdeps/i386/i686/fpu/multiarch/s_sinf.c
+++ b/sysdeps/i386/fpu/multiarch/s_sinf.c
@@ -19,10 +19,10 @@
 #include <init-arch.h>
 
 extern float __sinf_sse2 (float);
-extern float __sinf_ia32 (float);
+extern float __sinf_i386 (float);
 float __sinf (float);
 
-libm_ifunc (__sinf, HAS_CPU_FEATURE (SSE2) ? __sinf_sse2 : __sinf_ia32);
+libm_ifunc (__sinf, HAS_CPU_FEATURE (SSE2) ? __sinf_sse2 : __sinf_i386);
 weak_alias (__sinf, sinf);
-#define SINF __sinf_ia32
+#define SINF __sinf_i386
 #include <sysdeps/ieee754/flt-32/s_sinf.c>