Add i386 strcat multiarch functions hjl/i486/multiarch-old

11 files changed, 123 insertions, 3 deletions

diff --git a/sysdeps/i386/i486/multiarch/strcat.c b/sysdeps/i386/i486/multiarch/strcat.c
new file mode 100644
index 0000000000..b0ad7668cd
--- /dev/null
+++ b/sysdeps/i386/i486/multiarch/strcat.c
@@ -0,0 +1 @@
+#include <sysdeps/i386/multiarch/strcat.c>
diff --git a/sysdeps/i386/multiarch/Makefile b/sysdeps/i386/multiarch/Makefile
index ba6a489303..da553dd66b 100644
--- a/sysdeps/i386/multiarch/Makefile
+++ b/sysdeps/i386/multiarch/Makefile
@@ -31,7 +31,9 @@ sysdep_routines += bcopy-i386 bcopy-i686 bcopy-sse2-unaligned \
 		   strcasecmp_l-ssse3 \
 		   strncase-i386 strncase_l-i386 strncase_l-sse4 \
 		   strncase_l-ssse3 \
-		   strncmp-i386 strncmp-ssse3 strncmp-sse4 
+		   strncmp-i386 strncmp-ssse3 strncmp-sse4 \
+		   strcat-i486 strcat-sse2 strcat-ssse3 \
+		   strncat-i386 strncat-sse2 strncat-ssse3
 endif
 
 ifeq (mathyes,$(subdir)$(config-cflags-avx))
diff --git a/sysdeps/i386/multiarch/strcat-i486.S b/sysdeps/i386/multiarch/strcat-i486.S
new file mode 100644
index 0000000000..e6d51db442
--- /dev/null
+++ b/sysdeps/i386/multiarch/strcat-i486.S
@@ -0,0 +1,12 @@
+#include <init-arch.h>
+#define strcat __strcat_i486
+#undef libc_hidden_builtin_def
+#define libc_hidden_builtin_def(name)
+
+#include <sysdeps/i386/i486/strcat.S>
+
+#ifdef SHARED
+	.globl __GI_strcat
+	.hidden __GI_strcat
+	__GI_strcat = __strcat_i486
+#endif
diff --git a/sysdeps/i386/i686/multiarch/strcat-sse2.S b/sysdeps/i386/multiarch/strcat-sse2.S
index 0f9e13c6d3..0f9e13c6d3 100644
--- a/sysdeps/i386/i686/multiarch/strcat-sse2.S
+++ b/sysdeps/i386/multiarch/strcat-sse2.S
diff --git a/sysdeps/i386/i686/multiarch/strcat-ssse3.S b/sysdeps/i386/multiarch/strcat-ssse3.S
index a5b0bc6818..a5b0bc6818 100644
--- a/sysdeps/i386/i686/multiarch/strcat-ssse3.S
+++ b/sysdeps/i386/multiarch/strcat-ssse3.S
diff --git a/sysdeps/i386/multiarch/strcat.c b/sysdeps/i386/multiarch/strcat.c
new file mode 100644
index 0000000000..17a2af560e
--- /dev/null
+++ b/sysdeps/i386/multiarch/strcat.c
@@ -0,0 +1,51 @@
+/* Multiple versions of strcat.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* Define multiple versions only for the definition in libc.  */
+#if IS_IN (libc)
+/* Redefine strcat so that the compiler won't complain about the type
+   mismatch with the IFUNC selector in strong_alias, below.  */
+# undef strcat
+# define strcat __redirect_strcat
+# include <string.h>
+# undef strcat
+
+# include <init-arch.h>
+
+extern __typeof (__redirect_strcat) __strcat_i486 attribute_hidden;
+extern __typeof (__redirect_strcat) __strcat_sse2 attribute_hidden;
+extern __typeof (__redirect_strcat) __strcat_ssse3 attribute_hidden;
+
+/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
+   ifunc symbol properly.  */
+extern __typeof (__redirect_strcat) strcat;
+extern void *strcat_ifunc (void) __asm__ ("strcat");
+
+void *
+strcat_ifunc (void)
+{
+  if (HAS_CPU_FEATURE (SSSE3))
+    return __strcat_ssse3;
+  else if (HAS_CPU_FEATURE (SSE2))
+    return __strcat_sse2;
+
+  return __strcat_i486;
+}
+__asm__ (".type strcat, %gnu_indirect_function");
+#endif
diff --git a/sysdeps/i386/i686/multiarch/strlen-sse2.S b/sysdeps/i386/multiarch/strlen-sse2.S
index 3d30714b7a..3d30714b7a 100644
--- a/sysdeps/i386/i686/multiarch/strlen-sse2.S
+++ b/sysdeps/i386/multiarch/strlen-sse2.S
diff --git a/sysdeps/i386/i686/multiarch/strncat-c.c b/sysdeps/i386/multiarch/strncat-i386.c
index 132a000545..0f22fbc035 100644
--- a/sysdeps/i386/i686/multiarch/strncat-c.c
+++ b/sysdeps/i386/multiarch/strncat-i386.c
@@ -1,8 +1,8 @@
-#define STRNCAT __strncat_ia32
+#define STRNCAT __strncat_i386
 #ifdef SHARED
 #undef libc_hidden_def
 #define libc_hidden_def(name) \
-  __hidden_ver1 (__strncat_ia32, __GI___strncat, __strncat_ia32);
+  __hidden_ver1 (__strncat_i386, __GI___strncat, __strncat_i386);
 #endif
 
 #include "string/strncat.c"
diff --git a/sysdeps/i386/i686/multiarch/strncat-sse2.S b/sysdeps/i386/multiarch/strncat-sse2.S
index f1045b72b8..f1045b72b8 100644
--- a/sysdeps/i386/i686/multiarch/strncat-sse2.S
+++ b/sysdeps/i386/multiarch/strncat-sse2.S
diff --git a/sysdeps/i386/i686/multiarch/strncat-ssse3.S b/sysdeps/i386/multiarch/strncat-ssse3.S
index 625b90a978..625b90a978 100644
--- a/sysdeps/i386/i686/multiarch/strncat-ssse3.S
+++ b/sysdeps/i386/multiarch/strncat-ssse3.S
diff --git a/sysdeps/i386/multiarch/strncat.c b/sysdeps/i386/multiarch/strncat.c
new file mode 100644
index 0000000000..7ab3e38df6
--- /dev/null
+++ b/sysdeps/i386/multiarch/strncat.c
@@ -0,0 +1,54 @@
+/* Multiple versions of strncat.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* Define multiple versions only for the definition in libc.  Don't
+   define multiple versions for strncat in static library since we
+   need strncat before the initialization happened.  */
+#if defined  SHARED && IS_IN (libc)
+# define _HAVE_STRING_ARCH_strncat
+/* Redefine strncat so that the compiler won't complain about the type
+   mismatch with the IFUNC selector in strong_alias, below.  */
+# undef strncat
+# define strncat __redirect_strncat
+# include <string.h>
+# undef strncat
+
+# include <init-arch.h>
+
+extern __typeof (__redirect_strncat) __strncat_i386 attribute_hidden;
+extern __typeof (__redirect_strncat) __strncat_sse2 attribute_hidden;
+extern __typeof (__redirect_strncat) __strncat_ssse3 attribute_hidden;
+
+/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
+   ifunc symbol properly.  */
+extern __typeof (__redirect_strncat) strncat;
+extern void *strncat_ifunc (void) __asm__ ("strncat");
+
+void *
+strncat_ifunc (void)
+{
+  if (HAS_CPU_FEATURE (SSSE3))
+    return __strncat_ssse3;
+  else if (HAS_CPU_FEATURE (SSE2))
+    return __strncat_sse2;
+
+  return __strncat_i386;
+}
+__asm__ (".type strncat, %gnu_indirect_function");
+#endif