[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r21145 - in /fsf/trunk/libc: ./ include/ misc/ ports/ ports/sysdeps/unix/sysv/linux/tile/tilegx/ string/ sysdeps/i386/i686/m...



Author: eglibc
Date: Sat Oct 13 00:01:45 2012
New Revision: 21145

Log:
Import glibc-mainline for 2012-10-13

Added:
    fsf/trunk/libc/include/ifunc-impl-list.h
    fsf/trunk/libc/misc/ifunc-impl-list.c
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
    fsf/trunk/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Rules
    fsf/trunk/libc/include/string.h
    fsf/trunk/libc/misc/Makefile
    fsf/trunk/libc/misc/Versions
    fsf/trunk/libc/ports/ChangeLog.tile
    fsf/trunk/libc/string/memmem.c
    fsf/trunk/libc/string/test-string.h
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/bcopy.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/bzero.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memchr.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcmp.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy_chk.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove_chk.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/mempcpy.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/mempcpy_chk.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memrchr.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memset.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memset_chk.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/rawmemchr.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/stpcpy.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/stpncpy.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasecmp.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasecmp_l.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasestr-c.c
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcat.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strchr.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcpy.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcspn.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strlen.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncase.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncase_l.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncat.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncmp.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncpy.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strnlen.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strpbrk.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strrchr.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strspn.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strstr-c.c
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcschr.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscmp.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscpy.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcslen.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcsrchr.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/wmemcmp.S
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
    fsf/trunk/libc/sysdeps/x86/bits/byteswap.h
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memcmp.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy_chk.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memmove.c
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memmove_chk.c
    fsf/trunk/libc/sysdeps/x86_64/multiarch/mempcpy.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/mempcpy_chk.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memset.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memset_chk.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/rawmemchr.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/stpcpy.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/stpncpy.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasecmp_l.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr-c.c
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcat.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strchr.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp-sse42.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcpy.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcspn.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strlen.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strncase_l.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strncat.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strncmp.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strncpy.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strnlen.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strpbrk.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strrchr.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strspn.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strstr-c.c
    fsf/trunk/libc/sysdeps/x86_64/multiarch/wcscpy.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/wmemcmp.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Oct 13 00:01:45 2012
@@ -1,4 +1,139 @@
+2012-10-12  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/x86/bits/byteswap.h: Include <bits/types.h>.
+	(__bswap_64): __uint64_t for unsigned 64-bit int.
+
+2012-10-12  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* include/string.h (memmem): Declare libc hidden alias.
+	* string/memmem.c (memmem): Define libc hidden alias.
+	* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c: Use __open,
+	__read, __close instead of open, read, close.
+
 2012-10-11  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/x86_64/multiarch/ifunc-impl-list.c: New file.
+	* sysdeps/x86_64/multiarch/memcmp.S (__memcmp_sse2): Make it
+	global and hidden.
+	* sysdeps/x86_64/multiarch/memcpy.S (__memcpy_sse2): Likewise.
+	* sysdeps/x86_64/multiarch/mempcpy.S (__mempcpy_sse2): Likewise.
+	* sysdeps/x86_64/multiarch/rawmemchr.S (__rawmemchr_sse42):
+	Likewise.
+	(__rawmemchr_sse2): Likewise.
+	* sysdeps/x86_64/multiarch/strcat.S (STRCAT_SSE2): Likewise.
+	* sysdeps/x86_64/multiarch/strchr.S (__strchr_sse42): Likewise.
+	(__strchr_sse2): Likewise.
+	* sysdeps/x86_64/multiarch/strcmp-sse42.S (STRCMP_SSE42): Likewise.
+	* sysdeps/x86_64/multiarch/strcmp.S (STRCMP_SSE2): Likewise.
+	(__strcasecmp_sse2): Likewise.
+	(__strncasecmp_sse2): Likewise.
+	* sysdeps/x86_64/multiarch/strcpy.S (STRCPY_SSE2): Likewise.
+	* sysdeps/x86_64/multiarch/strlen.S (__strlen_sse2): Likewise.
+	* sysdeps/x86_64/multiarch/strnlen.S (__strnlen_sse2): Likewise.
+	* sysdeps/x86_64/multiarch/strrchr.S (__strrchr_sse42): Likewise.
+	(__strrchr_sse2): Likewise.
+	* sysdeps/x86_64/multiarch/memcmp.S: Add comments for
+	ifunc-impl-list.c.
+	* sysdeps/x86_64/multiarch/memcpy.S: Likewise.
+	* sysdeps/x86_64/multiarch/memcpy_chk.S: Likewise.
+	* sysdeps/x86_64/multiarch/memmove.c: Likewise.
+	* sysdeps/x86_64/multiarch/memmove_chk.c: Likewise.
+	* sysdeps/x86_64/multiarch/mempcpy.S: Likewise.
+	* sysdeps/x86_64/multiarch/mempcpy_chk.S: Likewise.
+	* sysdeps/x86_64/multiarch/memset.S: Likewise.
+	* sysdeps/x86_64/multiarch/memset_chk.S: Likewise.
+	* sysdeps/x86_64/multiarch/rawmemchr.S: Likewise.
+	* sysdeps/x86_64/multiarch/stpcpy.S: Likewise.
+	* sysdeps/x86_64/multiarch/stpncpy.S: Likewise.
+	* sysdeps/x86_64/multiarch/strcasecmp_l.S: Likewise.
+	* sysdeps/x86_64/multiarch/strcasestr-c.c: Likewise.
+	* sysdeps/x86_64/multiarch/strcat.S: Likewise.
+	* sysdeps/x86_64/multiarch/strchr.S: Likewise.
+	* sysdeps/x86_64/multiarch/strcmp.S: Likewise.
+	* sysdeps/x86_64/multiarch/strcpy.S: Likewise.
+	* sysdeps/x86_64/multiarch/strcspn.S: Likewise.
+	* sysdeps/x86_64/multiarch/strlen.S: Likewise.
+	* sysdeps/x86_64/multiarch/strncase_l.S: Likewise.
+	* sysdeps/x86_64/multiarch/strncat.S: Likewise.
+	* sysdeps/x86_64/multiarch/strncmp.S: Likewise.
+	* sysdeps/x86_64/multiarch/strncpy.S: Likewise.
+	* sysdeps/x86_64/multiarch/strnlen.S: Likewise.
+	* sysdeps/x86_64/multiarch/strpbrk.S: Likewise.
+	* sysdeps/x86_64/multiarch/strrchr.S: Likewise.
+	* sysdeps/x86_64/multiarch/strspn.S: Likewise.
+	* sysdeps/x86_64/multiarch/strstr-c.c: Likewise.
+	* sysdeps/x86_64/multiarch/wcscpy.S: Likewise.
+	* sysdeps/x86_64/multiarch/wmemcmp.S: Likewise.
+
+	* sysdeps/i386/i686/multiarch/bcopy.S (__bcopy_ia32): Make it
+	global and hidden.
+	* sysdeps/i386/i686/multiarch/bzero.S (__bzero_ia32): Likewise.
+	* sysdeps/i386/i686/multiarch/memcmp.S (__memcmp_ia32): Likewise.
+	* sysdeps/i386/i686/multiarch/memcpy.S (__memcpy_ia32): Likewise.
+	* sysdeps/i386/i686/multiarch/memmove.S (__memmove_ia32):
+	Likewise.
+	* sysdeps/i386/i686/multiarch/mempcpy.S (__mempcpy_ia32):
+	Likewise.
+	* sysdeps/i386/i686/multiarch/strcat.S (STRCAT_IA32): Likewise.
+	* sysdeps/i386/i686/multiarch/strcmp.S (__STRCMP_IA32): Likewise.
+	* sysdeps/i386/i686/multiarch/strcpy.S (STRCPY_IA32): Likewise.
+	* sysdeps/i386/i686/multiarch/bcopy.S: Add comments for
+	ifunc-impl-list.c.
+	* sysdeps/i386/i686/multiarch/bzero.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memchr.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memcmp.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memcpy.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memcpy_chk.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memmove.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memmove_chk.S: Likewise.
+	* sysdeps/i386/i686/multiarch/mempcpy.S: Likewise.
+	* sysdeps/i386/i686/multiarch/mempcpy_chk.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memrchr.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memset.S: Likewise.
+	* sysdeps/i386/i686/multiarch/memset_chk.S: Likewise.
+	* sysdeps/i386/i686/multiarch/rawmemchr.S: Likewise.
+	* sysdeps/i386/i686/multiarch/stpcpy.S: Likewise.
+	* sysdeps/i386/i686/multiarch/stpncpy.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strcasecmp.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strcasecmp_l.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strcasestr-c.c: Likewise.
+	* sysdeps/i386/i686/multiarch/strcat.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strchr.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strcmp.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strcpy.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strcspn.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strlen.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strncase.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strncase_l.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strncat.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strncmp.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strncpy.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strnlen.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strpbrk.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strrchr.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strspn.S: Likewise.
+	* sysdeps/i386/i686/multiarch/strstr-c.c: Likewise.
+	* sysdeps/i386/i686/multiarch/wcschr.S: Likewise.
+	* sysdeps/i386/i686/multiarch/wcscmp.S: Likewise.
+	* sysdeps/i386/i686/multiarch/wcscpy.S: Likewise.
+	* sysdeps/i386/i686/multiarch/wcslen.S: Likewise.
+	* sysdeps/i386/i686/multiarch/wcsrchr.S: Likewise.
+	* sysdeps/i386/i686/multiarch/wmemcmp.S: Likewise.
+	* sysdeps/i386/i686/multiarch/ifunc-impl-list.c: New file.
+
+	* Rules [$(multi-arch) = no] (tests): Filter out $(tests-ifunc).
+	[$(multi-arch) = no] (xtests): Filter out $(xtests-ifunc).
+	* include/ifunc-impl-list.h: New file.
+	* misc/ifunc-impl-list.c: Likewise.
+	* misc/Makefile (routines): Add ifunc-impl-list.
+	* misc/Versions (GLIBC_PRIVATE): Add __libc_ifunc_impl_list.
+	* string/test-string.h: Include <ifunc-impl-list.h>.
+	[TEST_IFUNC && TEST_NAME] (func_list, func_count, impl_count,
+	impl_array): New variables.
+	(FOR_EACH_IMPL): Support func_list if TEST_IFUNC and TEST_NAME
+	are defined.
+	(test_init): Call __libc_ifunc_impl_list to initialize
+	func_list if TEST_IFUNC and TEST_NAME are defined.
 
 	* string/Makefile (strop-tests): Add bcopy and bzero.
 	* string/test-bcopy.c: New file.

Modified: fsf/trunk/libc/Rules
==============================================================================
--- fsf/trunk/libc/Rules (original)
+++ fsf/trunk/libc/Rules Sat Oct 13 00:01:45 2012
@@ -84,6 +84,11 @@
 # This makes all the auxiliary and test programs.
 
 .PHONY: others tests
+ifeq ($(multi-arch),no)
+tests := $(filter-out $(tests-ifunc), $(tests))
+xtests := $(filter-out $(xtests-ifunc), $(xtests))
+endif
+
 ifeq ($(build-programs),yes)
 others: $(addprefix $(objpfx),$(others) $(sysdep-others) $(extra-objs))
 else

Added: fsf/trunk/libc/include/ifunc-impl-list.h
==============================================================================
--- fsf/trunk/libc/include/ifunc-impl-list.h (added)
+++ fsf/trunk/libc/include/ifunc-impl-list.h Sat Oct 13 00:01:45 2012
@@ -1,0 +1,56 @@
+/* Internal header file for __libc_supported_implementations.
+   Copyright (C) 2012 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/>.  */
+
+#ifndef _IFUNC_IMPL_LIST_H
+#define _IFUNC_IMPL_LIST_H	1
+
+#include <stdbool.h>
+#include <stddef.h>
+
+struct libc_ifunc_impl
+{
+  /* The name of function to be tested.  */
+  const char *name;
+  /* The address of function to be tested.  */
+  void (*fn) (void);
+  /* True if this implementation is usable on this machine.  */
+  bool usable;
+};
+
+/* Add an IFUNC implementation, IMPL, for function FUNC, to ARRAY with
+   USABLE at index I and advance I by one.  */
+#define IFUNC_IMPL_ADD(array, i, func, usable, impl) \
+  extern __typeof (func) impl attribute_hidden; \
+  (array)[i++] = (struct libc_ifunc_impl) { #impl, (void (*) (void)) impl, (usable) };
+
+/* Return the number of IFUNC implementations, N, for function FUNC if
+   string NAME matches FUNC.  */
+#define IFUNC_IMPL(n, name, func, ...) \
+  if (strcmp (name, #func) == 0) \
+    { \
+      __VA_ARGS__; \
+      return n; \
+    }
+
+/* Fill ARRAY of MAX elements with IFUNC implementations for function
+   NAME and return the number of valid entries.  */
+extern size_t __libc_ifunc_impl_list (const char *name,
+				      struct libc_ifunc_impl *array,
+				      size_t max);
+
+#endif /* ifunc-impl-list.h */

Modified: fsf/trunk/libc/include/string.h
==============================================================================
--- fsf/trunk/libc/include/string.h (original)
+++ fsf/trunk/libc/include/string.h Sat Oct 13 00:01:45 2012
@@ -89,6 +89,7 @@
 extern char *__strsep_g (char **__stringp, const char *__delim);
 libc_hidden_proto (__strsep_g)
 libc_hidden_proto (strnlen)
+libc_hidden_proto (memmem)
 
 libc_hidden_builtin_proto (memchr)
 libc_hidden_builtin_proto (memcpy)

Modified: fsf/trunk/libc/misc/Makefile
==============================================================================
--- fsf/trunk/libc/misc/Makefile (original)
+++ fsf/trunk/libc/misc/Makefile Sat Oct 13 00:01:45 2012
@@ -65,7 +65,7 @@
 	    getloadavg getclktck \
 	    fgetxattr flistxattr fremovexattr fsetxattr getxattr \
 	    listxattr lgetxattr llistxattr lremovexattr lsetxattr \
-	    removexattr setxattr getauxval
+	    removexattr setxattr getauxval ifunc-impl-list
 
 generated := tst-error1.mtrace tst-error1-mem
 

Modified: fsf/trunk/libc/misc/Versions
==============================================================================
--- fsf/trunk/libc/misc/Versions (original)
+++ fsf/trunk/libc/misc/Versions Sat Oct 13 00:01:45 2012
@@ -151,5 +151,6 @@
   }
   GLIBC_PRIVATE {
     __madvise;
+    __libc_ifunc_impl_list;
   }
 }

Added: fsf/trunk/libc/misc/ifunc-impl-list.c
==============================================================================
--- fsf/trunk/libc/misc/ifunc-impl-list.c (added)
+++ fsf/trunk/libc/misc/ifunc-impl-list.c Sat Oct 13 00:01:45 2012
@@ -1,0 +1,32 @@
+/* Enumerate available IFUNC implementations of a function.  Stub version.
+   Copyright (C) 2012 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/>.  */
+
+#include <ifunc-impl-list.h>
+
+/* Fill ARRAY of MAX elements with IFUNC implementations for function
+   NAME supported on target machine and return the number of valid
+   entries.  */
+
+size_t
+__libc_ifunc_impl_list
+  (const char *name __attribute__ ((unused)),
+   struct libc_ifunc_impl *array __attribute__ ((unused)),
+   size_t max __attribute__ ((unused)))
+{
+  return 0;
+}

Modified: fsf/trunk/libc/ports/ChangeLog.tile
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.tile (original)
+++ fsf/trunk/libc/ports/ChangeLog.tile Sat Oct 13 00:01:45 2012
@@ -1,3 +1,7 @@
+2012-10-11  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c: New file.
+
 2012-10-02  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h: Fix clone

Added: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c (added)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c Sat Oct 13 00:01:45 2012
@@ -1,0 +1,87 @@
+/* Copyright (C) 2012 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/>.  */
+
+#include <errno.h>
+#include <stddef.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sched.h>
+#include <sysdep.h>
+#include <arch/spr_def.h>
+
+
+/* The count of cores horizontally (X dimension) on the chip.  */
+static int chip_width;
+
+/* Read the chip "width" from the /sys filesystem.  */
+static int
+initialize_chip_width (void)
+{
+  int w = 0;
+  int fd;
+
+  fd = __open ("/sys/devices/system/cpu/chip_width", O_RDONLY);
+  if (fd >= 0)
+    {
+      char buf[64];
+      ssize_t n;
+      int i;
+
+      n = __read (fd, buf, sizeof (buf));
+      __close (fd);
+
+      for (i = 0; i < n; ++i)
+        {
+          if (buf[i] < '0' || buf[i] > '9')
+            break;
+          w = (w * 10) + (buf[i] - '0');
+        }
+    }
+
+  /* Store a negative value so we don't try again.  */
+  if (w == 0)
+    w = -1;
+
+  /* Using an atomic idempotent write here makes this thread-safe.  */
+  chip_width = w;
+  return w;
+}
+
+int
+sched_getcpu (void)
+{
+  unsigned int coord;
+  int w = chip_width;
+
+  if (__builtin_expect (w <= 0, 0))
+    {
+      if (w == 0)
+        w = initialize_chip_width ();
+      if (w < 0)
+        {
+          unsigned int cpu;
+          int r = INLINE_SYSCALL (getcpu, 3, &cpu, NULL, NULL);
+          return r == -1 ? r : cpu;
+        }
+    }
+
+  /* Assign 64-bit value to a 32-bit variable to ensure 32-bit multiply.  */
+  coord = __insn_mfspr (SPR_TILE_COORD);
+
+  /* Extract Y coord from bits 7..10 and X coord from bits 18..21.  */
+  return ((coord >> 7) & 0xf) * w + ((coord >> 18) & 0xf);
+}

Modified: fsf/trunk/libc/string/memmem.c
==============================================================================
--- fsf/trunk/libc/string/memmem.c (original)
+++ fsf/trunk/libc/string/memmem.c Sat Oct 13 00:01:45 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004,2008 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -73,5 +73,6 @@
   else
     return two_way_long_needle (haystack, haystack_len, needle, needle_len);
 }
+libc_hidden_def (memmem)
 
 #undef LONG_NEEDLE_THRESHOLD

Modified: fsf/trunk/libc/string/test-string.h
==============================================================================
--- fsf/trunk/libc/string/test-string.h (original)
+++ fsf/trunk/libc/string/test-string.h Sat Oct 13 00:01:45 2012
@@ -50,6 +50,7 @@
 #include <error.h>
 #include <errno.h>
 #include <time.h>
+#include <ifunc-impl-list.h>
 #define GL(x) _##x
 #define GLRO(x) _##x
 #include <hp-timing.h>
@@ -106,9 +107,57 @@
 #define CALL(impl, ...)	\
   (* (proto_t) (impl)->fn) (__VA_ARGS__)
 
-#define FOR_EACH_IMPL(impl, notall) \
+#if defined TEST_IFUNC && defined TEST_NAME
+/* Increase size of FUNC_LIST if assert is triggered at run-time.  */
+static struct libc_ifunc_impl func_list[32];
+static int func_count;
+static int impl_count = -1;
+static impl_t *impl_array;
+
+# define FOR_EACH_IMPL(impl, notall) \
+  impl_t *impl;								\
+  int count;								\
+  if (impl_count == -1)							\
+    {									\
+      impl_count = 0;							\
+      if (func_count != 0)						\
+	{								\
+	  int f;							\
+	  impl_t *skip = NULL, *a;					\
+	  for (impl = __start_impls; impl < __stop_impls; ++impl)	\
+	    if (strcmp (impl->name, TEST_NAME) == 0)			\
+	      skip = impl;						\
+	    else							\
+	      impl_count++;						\
+	  a = impl_array = malloc ((impl_count + func_count) *		\
+				   sizeof (impl_t));			\
+	  for (impl = __start_impls; impl < __stop_impls; ++impl)	\
+	    if (impl != skip)						\
+	      *a++ = *impl;						\
+	  for (f = 0; f < func_count; f++)				\
+	    if (func_list[f].usable)					\
+	      {								\
+		a->name = func_list[f].name;				\
+		a->fn = func_list[f].fn;				\
+		a->test = 1;						\
+		a++;							\
+	      }								\
+	  impl_count = a - impl_array;					\
+	}								\
+      else								\
+        {								\
+	  impl_count = __stop_impls - __start_impls;			\
+	  impl_array = __start_impls;					\
+        }								\
+    }									\
+  impl = impl_array;							\
+  for (count = 0; count < impl_count; ++count, ++impl)			\
+    if (!notall || impl->test)
+#else
+# define FOR_EACH_IMPL(impl, notall) \
   for (impl_t *impl = __start_impls; impl < __stop_impls; ++impl)	\
     if (!notall || impl->test)
+#endif
 
 #define HP_TIMING_BEST(best_time, start, end)	\
   do									\
@@ -127,6 +176,12 @@
 static void
 test_init (void)
 {
+#if defined TEST_IFUNC && defined TEST_NAME
+  func_count = __libc_ifunc_impl_list (TEST_NAME, func_list,
+				       (sizeof func_list
+					/ sizeof func_list[0]));
+#endif
+
   page_size = 2 * getpagesize ();
 #ifdef MIN_PAGE_SIZE
   if (page_size < MIN_PAGE_SIZE)

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/bcopy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/bcopy.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/bcopy.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of bcopy
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -67,6 +68,8 @@
 # define ENTRY(name) \
 	.type __bcopy_ia32, @function; \
 	.p2align 4; \
+	.globl __bcopy_ia32; \
+	.hidden __bcopy_ia32; \
 	__bcopy_ia32: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/bzero.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/bzero.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/bzero.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of bzero
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -67,6 +68,8 @@
 # define ENTRY(name) \
 	.type __bzero_ia32, @function; \
 	.p2align 4; \
+	.globl __bzero_ia32; \
+	.hidden __bzero_ia32; \
 	__bzero_ia32: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Added: fsf/trunk/libc/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/ifunc-impl-list.c (added)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/ifunc-impl-list.c Sat Oct 13 00:01:45 2012
@@ -1,0 +1,326 @@
+/* Enumerate available IFUNC implementations of a function.  i686 version.
+   Copyright (C) 2012 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/>.  */
+
+#include <assert.h>
+#include <string.h>
+#include <wchar.h>
+#include <ifunc-impl-list.h>
+#include "init-arch.h"
+
+/* Maximum number of IFUNC implementations.  */
+#define MAX_IFUNC	3
+
+/* Fill ARRAY of MAX elements with IFUNC implementations for function
+   NAME and return the number of valid entries.  */
+
+size_t
+__libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+			size_t max)
+{
+  assert (max >= MAX_IFUNC);
+
+  size_t i = 0;
+
+  /* Support sysdeps/i386/i686/multiarch/bcopy.S.  */
+  IFUNC_IMPL (i, name, bcopy,
+	      IFUNC_IMPL_ADD (array, i, bcopy, HAS_SSSE3,
+			      __bcopy_ssse3_rep)
+	      IFUNC_IMPL_ADD (array, i, bcopy, HAS_SSSE3, __bcopy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, bcopy, 1, __bcopy_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/bzero.S.  */
+  IFUNC_IMPL (i, name, bzero,
+	      IFUNC_IMPL_ADD (array, i, bzero, HAS_SSE2, __bzero_sse2_rep)
+	      IFUNC_IMPL_ADD (array, i, bzero, HAS_SSE2, __bzero_sse2)
+	      IFUNC_IMPL_ADD (array, i, bzero, 1, __bzero_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/memchr.S.  */
+  IFUNC_IMPL (i, name, memchr,
+	      IFUNC_IMPL_ADD (array, i, memchr, HAS_SSE2,
+			      __memchr_sse2_bsf)
+	      IFUNC_IMPL_ADD (array, i, memchr, HAS_SSE2, __memchr_sse2)
+	      IFUNC_IMPL_ADD (array, i, memchr, 1, __memchr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/memcmp.S.  */
+  IFUNC_IMPL (i, name, memcmp,
+	      IFUNC_IMPL_ADD (array, i, memcmp, HAS_SSE4_2,
+			      __memcmp_sse4_2)
+	      IFUNC_IMPL_ADD (array, i, memcmp, HAS_SSSE3, __memcmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/memmove_chk.S.  */
+  IFUNC_IMPL (i, name, __memmove_chk,
+	      IFUNC_IMPL_ADD (array, i, __memmove_chk, HAS_SSSE3,
+			      __memmove_chk_ssse3_rep)
+	      IFUNC_IMPL_ADD (array, i, __memmove_chk, HAS_SSSE3,
+			      __memmove_chk_ssse3)
+	      IFUNC_IMPL_ADD (array, i, __memmove_chk, 1,
+			      __memmove_chk_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/memmove.S.  */
+  IFUNC_IMPL (i, name, memmove,
+	      IFUNC_IMPL_ADD (array, i, memmove, HAS_SSSE3,
+			      __memmove_ssse3_rep)
+	      IFUNC_IMPL_ADD (array, i, memmove, HAS_SSSE3,
+			      __memmove_ssse3)
+	      IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/memrchr.S.  */
+  IFUNC_IMPL (i, name, memrchr,
+	      IFUNC_IMPL_ADD (array, i, memrchr, HAS_SSE2,
+			      __memrchr_sse2_bsf)
+	      IFUNC_IMPL_ADD (array, i, memrchr, HAS_SSE2, __memrchr_sse2)
+	      IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/memset_chk.S.  */
+  IFUNC_IMPL (i, name, __memset_chk,
+	      IFUNC_IMPL_ADD (array, i, __memset_chk, HAS_SSE2,
+			      __memset_chk_sse2_rep)
+	      IFUNC_IMPL_ADD (array, i, __memset_chk, HAS_SSE2,
+			      __memset_chk_sse2)
+	      IFUNC_IMPL_ADD (array, i, __memset_chk, 1,
+			      __memset_chk_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/memset.S.  */
+  IFUNC_IMPL (i, name, memset,
+	      IFUNC_IMPL_ADD (array, i, memset, HAS_SSE2,
+			      __memset_sse2_rep)
+	      IFUNC_IMPL_ADD (array, i, memset, HAS_SSE2, __memset_sse2)
+	      IFUNC_IMPL_ADD (array, i, memset, 1, __memset_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/rawmemchr.S.  */
+  IFUNC_IMPL (i, name, rawmemchr,
+	      IFUNC_IMPL_ADD (array, i, rawmemchr, HAS_SSE2,
+			      __rawmemchr_sse2_bsf)
+	      IFUNC_IMPL_ADD (array, i, rawmemchr, HAS_SSE2,
+			      __rawmemchr_sse2)
+	      IFUNC_IMPL_ADD (array, i, rawmemchr, 1, __rawmemchr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/stpncpy.S.  */
+  IFUNC_IMPL (i, name, stpncpy,
+	      IFUNC_IMPL_ADD (array, i, stpncpy, HAS_SSSE3,
+			      __stpncpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, stpncpy, HAS_SSE2, __stpncpy_sse2)
+	      IFUNC_IMPL_ADD (array, i, stpncpy, 1, __stpncpy_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/stpcpy.S.  */
+  IFUNC_IMPL (i, name, stpcpy,
+	      IFUNC_IMPL_ADD (array, i, stpcpy, HAS_SSSE3, __stpcpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, stpcpy, HAS_SSE2, __stpcpy_sse2)
+	      IFUNC_IMPL_ADD (array, i, stpcpy, 1, __stpcpy_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strcasecmp.S.  */
+  IFUNC_IMPL (i, name, strcasecmp,
+	      IFUNC_IMPL_ADD (array, i, strcasecmp, HAS_SSE4_2,
+			      __strcasecmp_sse4_2)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp, HAS_SSSE3,
+			      __strcasecmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp, 1, __strcasecmp_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strcasecmp_l.S.  */
+  IFUNC_IMPL (i, name, strcasecmp_l,
+	      IFUNC_IMPL_ADD (array, i, strcasecmp_l, HAS_SSE4_2,
+			      __strcasecmp_l_sse4_2)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp_l, HAS_SSSE3,
+			      __strcasecmp_l_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp_l, 1,
+			      __strcasecmp_l_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strcasestr.c.  */
+  IFUNC_IMPL (i, name, strcasestr,
+	      IFUNC_IMPL_ADD (array, i, strcasestr, HAS_SSE4_2,
+			      __strcasestr_sse42)
+	      IFUNC_IMPL_ADD (array, i, strcasestr, 1, __strcasestr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strcat.S.  */
+  IFUNC_IMPL (i, name, strcat,
+	      IFUNC_IMPL_ADD (array, i, strcat, HAS_SSSE3, __strcat_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcat, HAS_SSE2, __strcat_sse2)
+	      IFUNC_IMPL_ADD (array, i, strcat, 1, __strcat_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strchr.S.  */
+  IFUNC_IMPL (i, name, strchr,
+	      IFUNC_IMPL_ADD (array, i, strchr, HAS_SSE2,
+			      __strchr_sse2_bsf)
+	      IFUNC_IMPL_ADD (array, i, strchr, HAS_SSE2, __strchr_sse2)
+	      IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strcmp.S.  */
+  IFUNC_IMPL (i, name, strcmp,
+	      IFUNC_IMPL_ADD (array, i, strcmp, HAS_SSE4_2,
+			      __strcmp_sse4_2)
+	      IFUNC_IMPL_ADD (array, i, strcmp, HAS_SSSE3, __strcmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strcpy.S.  */
+  IFUNC_IMPL (i, name, strcpy,
+	      IFUNC_IMPL_ADD (array, i, strcpy, HAS_SSSE3, __strcpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcpy, HAS_SSE2, __strcpy_sse2)
+	      IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strcspn.S.  */
+  IFUNC_IMPL (i, name, strcspn,
+	      IFUNC_IMPL_ADD (array, i, strcspn, HAS_SSE4_2,
+			      __strcspn_sse42)
+	      IFUNC_IMPL_ADD (array, i, strcspn, 1, __strcspn_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strncase.S.  */
+  IFUNC_IMPL (i, name, strncasecmp,
+	      IFUNC_IMPL_ADD (array, i, strncasecmp, HAS_SSE4_2,
+			      __strncasecmp_sse4_2)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp, HAS_SSSE3,
+			      __strncasecmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp, 1,
+			      __strncasecmp_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strncase_l.S.  */
+  IFUNC_IMPL (i, name, strncasecmp_l,
+	      IFUNC_IMPL_ADD (array, i, strncasecmp_l,
+			      HAS_SSE4_2, __strncasecmp_l_sse4_2)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp_l,
+			      HAS_SSSE3, __strncasecmp_l_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
+			      __strncasecmp_l_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strncat.S.  */
+  IFUNC_IMPL (i, name, strncat,
+	      IFUNC_IMPL_ADD (array, i, strncat, HAS_SSSE3,
+			      __strncat_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncat, HAS_SSE2, __strncat_sse2)
+	      IFUNC_IMPL_ADD (array, i, strncat, 1, __strncat_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strncpy.S.  */
+  IFUNC_IMPL (i, name, strncpy,
+	      IFUNC_IMPL_ADD (array, i, strncpy, HAS_SSSE3,
+			      __strncpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncpy, HAS_SSE2, __strncpy_sse2)
+	      IFUNC_IMPL_ADD (array, i, strncpy, 1, __strncpy_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strnlen.S.  */
+  IFUNC_IMPL (i, name, strnlen,
+	      IFUNC_IMPL_ADD (array, i, strnlen, HAS_SSE2, __strnlen_sse2)
+	      IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strpbrk.S.  */
+  IFUNC_IMPL (i, name, strpbrk,
+	      IFUNC_IMPL_ADD (array, i, strpbrk, HAS_SSE4_2,
+			      __strpbrk_sse42)
+	      IFUNC_IMPL_ADD (array, i, strpbrk, 1, __strpbrk_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strrchr.S.  */
+  IFUNC_IMPL (i, name, strrchr,
+	      IFUNC_IMPL_ADD (array, i, strrchr, HAS_SSE2,
+			      __strrchr_sse2_bsf)
+	      IFUNC_IMPL_ADD (array, i, strrchr, HAS_SSE2, __strrchr_sse2)
+	      IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strspn.S.  */
+  IFUNC_IMPL (i, name, strspn,
+	      IFUNC_IMPL_ADD (array, i, strspn, HAS_SSE4_2, __strspn_sse42)
+	      IFUNC_IMPL_ADD (array, i, strspn, 1, __strspn_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strstr-c.c.  */
+  IFUNC_IMPL (i, name, strstr,
+	      IFUNC_IMPL_ADD (array, i, strstr, HAS_SSE4_2, __strstr_sse42)
+	      IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/wcschr.S.  */
+  IFUNC_IMPL (i, name, wcschr,
+	      IFUNC_IMPL_ADD (array, i, wcschr, HAS_SSE2, __wcschr_sse2)
+	      IFUNC_IMPL_ADD (array, i, wcschr, 1, __wcschr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/wcscmp.S.  */
+  IFUNC_IMPL (i, name, wcscmp,
+	      IFUNC_IMPL_ADD (array, i, wcscmp, HAS_SSE2, __wcscmp_sse2)
+	      IFUNC_IMPL_ADD (array, i, wcscmp, 1, __wcscmp_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/wcscpy.S.  */
+  IFUNC_IMPL (i, name, wcscpy,
+	      IFUNC_IMPL_ADD (array, i, wcscpy, HAS_SSSE3, __wcscpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, wcscpy, 1, __wcscpy_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/wcslen.S.  */
+  IFUNC_IMPL (i, name, wcslen,
+	      IFUNC_IMPL_ADD (array, i, wcslen, HAS_SSE2, __wcslen_sse2)
+	      IFUNC_IMPL_ADD (array, i, wcslen, 1, __wcslen_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/wcsrchr.S.  */
+  IFUNC_IMPL (i, name, wcsrchr,
+	      IFUNC_IMPL_ADD (array, i, wcsrchr, HAS_SSE2, __wcsrchr_sse2)
+	      IFUNC_IMPL_ADD (array, i, wcsrchr, 1, __wcsrchr_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/wmemcmp.S.  */
+  IFUNC_IMPL (i, name, wmemcmp,
+	      IFUNC_IMPL_ADD (array, i, wmemcmp, HAS_SSE4_2,
+			      __wmemcmp_sse4_2)
+	      IFUNC_IMPL_ADD (array, i, wmemcmp, HAS_SSSE3,
+			      __wmemcmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, wmemcmp, 1, __wmemcmp_ia32))
+
+#ifdef SHARED
+  /* Support sysdeps/i386/i686/multiarch/memcpy_chk.S.  */
+  IFUNC_IMPL (i, name, __memcpy_chk,
+	      IFUNC_IMPL_ADD (array, i, __memcpy_chk, HAS_SSSE3,
+			      __memcpy_chk_ssse3_rep)
+	      IFUNC_IMPL_ADD (array, i, __memcpy_chk, HAS_SSSE3,
+			      __memcpy_chk_ssse3)
+	      IFUNC_IMPL_ADD (array, i, __memcpy_chk, 1,
+			      __memcpy_chk_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/memcpy.S.  */
+  IFUNC_IMPL (i, name, memcpy,
+	      IFUNC_IMPL_ADD (array, i, memcpy, HAS_SSSE3,
+			      __memcpy_ssse3_rep)
+	      IFUNC_IMPL_ADD (array, i, memcpy, HAS_SSSE3, __memcpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/mempcpy_chk.S.  */
+  IFUNC_IMPL (i, name, __mempcpy_chk,
+	      IFUNC_IMPL_ADD (array, i, __mempcpy_chk, HAS_SSSE3,
+			      __mempcpy_chk_ssse3_rep)
+	      IFUNC_IMPL_ADD (array, i, __mempcpy_chk, HAS_SSSE3,
+			      __mempcpy_chk_ssse3)
+	      IFUNC_IMPL_ADD (array, i, __mempcpy_chk, 1,
+			      __mempcpy_chk_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/mempcpy.S.  */
+  IFUNC_IMPL (i, name, mempcpy,
+	      IFUNC_IMPL_ADD (array, i, mempcpy, HAS_SSSE3,
+			      __mempcpy_ssse3_rep)
+	      IFUNC_IMPL_ADD (array, i, mempcpy, HAS_SSSE3,
+			      __mempcpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, mempcpy, 1, __mempcpy_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strlen.S.  */
+  IFUNC_IMPL (i, name, strlen,
+	      IFUNC_IMPL_ADD (array, i, strlen, HAS_SSE2,
+			      __strlen_sse2_bsf)
+	      IFUNC_IMPL_ADD (array, i, strlen, HAS_SSE2, __strlen_sse2)
+	      IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_ia32))
+
+  /* Support sysdeps/i386/i686/multiarch/strncmp.S.  */
+  IFUNC_IMPL (i, name, strncmp,
+	      IFUNC_IMPL_ADD (array, i, strncmp, HAS_SSE4_2,
+			      __strncmp_sse4_2)
+	      IFUNC_IMPL_ADD (array, i, strncmp, HAS_SSSE3,
+			      __strncmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncmp, 1, __strncmp_ia32))
+#endif
+
+  return i;
+}

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memchr.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memchr.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of memchr
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcmp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcmp.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of memcmp
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -67,6 +68,8 @@
 # define ENTRY(name) \
 	.type __memcmp_ia32, @function; \
 	.p2align 4; \
+	.globl __memcmp_ia32; \
+	.hidden __memcmp_ia32; \
 	__memcmp_ia32: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of memcpy
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -51,6 +52,8 @@
 # define ENTRY(name) \
 	.type __memcpy_ia32, @function; \
 	.p2align 4; \
+	.globl __memcpy_ia32; \
+	.hidden __memcpy_ia32; \
 	__memcpy_ia32: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy_chk.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy_chk.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of __memcpy_chk
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of memmove
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -50,6 +51,8 @@
 # define ENTRY(name) \
 	.type __memmove_ia32, @function; \
 	.p2align 4; \
+	.globl __memmove_ia32; \
+	.hidden __memmove_ia32; \
 	__memmove_ia32: cfi_startproc; \
 	CALL_MCOUNT
 # else

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove_chk.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove_chk.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of __memmove_chk
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/mempcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/mempcpy.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/mempcpy.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of mempcpy
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -51,6 +52,8 @@
 # define ENTRY(name) \
 	.type __mempcpy_ia32, @function; \
 	.p2align 4; \
+	.globl __mempcpy_ia32; \
+	.hidden __mempcpy_ia32; \
 	__mempcpy_ia32: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/mempcpy_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/mempcpy_chk.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/mempcpy_chk.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of __mempcpy_chk
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memrchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memrchr.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memrchr.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of memrchr
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memset.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memset.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memset.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of memset
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memset_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memset_chk.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memset_chk.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of __memset_chk
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/rawmemchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/rawmemchr.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/rawmemchr.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of rawmemchr
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/stpcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/stpcpy.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/stpcpy.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of stpcpy
+   All versions must be listed in ifunc-impl-list.c.  */
 #define USE_AS_STPCPY
 #define STRCPY __stpcpy
 #include "strcpy.S"

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/stpncpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/stpncpy.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/stpncpy.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of stpncpy
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCPY __stpncpy
 #define USE_AS_STPCPY
 #define USE_AS_STRNCPY

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasecmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasecmp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasecmp.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Entry point for multi-version x86 strcasecmp.
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasecmp_l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasecmp_l.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasecmp_l.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strcasecmp_l
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCMP __strcasecmp_l
 #define USE_AS_STRCASECMP_L
 #include "strcmp.S"

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasestr-c.c
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasestr-c.c (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcasestr-c.c Sat Oct 13 00:01:45 2012
@@ -1,2 +1,4 @@
+/* Multiple versions of strcasestr
+   All versions must be listed in ifunc-impl-list.c.  */
 #define __strcasestr_sse2 __strcasestr_ia32
 #include <sysdeps/x86_64/multiarch/strcasestr-c.c>

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcat.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcat.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcat.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strcat
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -94,6 +95,8 @@
 # define ENTRY(name) \
 	.type STRCAT_IA32, @function; \
 	.align 16; \
+	.globl STRCAT_IA32; \
+	.hidden STRCAT_IA32; \
 	STRCAT_IA32: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strchr.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strchr.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strchr
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strcmp
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -95,6 +96,8 @@
 # define ENTRY(name) \
 	.type __STRCMP_IA32, @function; \
 	.p2align 4; \
+	.globl __STRCMP_IA32; \
+	.hidden __STRCMP_IA32; \
 	__STRCMP_IA32: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcpy.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcpy.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strcpy
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -110,6 +111,8 @@
 # define ENTRY(name) \
 	.type STRCPY_IA32, @function; \
 	.align 16; \
+	.globl STRCPY_IA32; \
+	.hidden STRCPY_IA32; \
 	STRCPY_IA32: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcspn.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcspn.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcspn.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strcspn
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2009, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strlen.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strlen.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strlen.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strlen
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2009, 2010, 2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncase.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncase.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncase.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Entry point for multi-version x86 strncasecmp.
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncase_l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncase_l.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncase_l.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strncasecmp_l
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCMP __strncasecmp_l
 #define USE_AS_STRNCASECMP_L
 #include "strcmp.S"

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncat.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncat.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncat.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strncat
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCAT strncat
 #define USE_AS_STRNCAT
 #include "strcat.S"

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncmp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncmp.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strncmp
+   All versions must be listed in ifunc-impl-list.c.  */
 #define USE_AS_STRNCMP
 #define STRCMP	strncmp
 #include "strcmp.S"

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncpy.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strncpy.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strncpy
+   All versions must be listed in ifunc-impl-list.c.  */
 #define USE_AS_STRNCPY
 #define STRCPY strncpy
 #include "strcpy.S"

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strnlen.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strnlen.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strnlen.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strnlen
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strpbrk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strpbrk.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strpbrk.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strpbrk
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCSPN strpbrk
 #define USE_AS_STRPBRK
 #include "strcspn.S"

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strrchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strrchr.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strrchr.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strrchr
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strspn.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strspn.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strspn.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strspn
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2009,2010,2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strstr-c.c
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strstr-c.c (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strstr-c.c Sat Oct 13 00:01:45 2012
@@ -1,3 +1,6 @@
+/* Multiple versions of strstr
+   All versions must be listed in ifunc-impl-list.c.  */
+
 #include "init-arch.h"
 
 #define STRSTR __strstr_ia32

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcschr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcschr.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcschr.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of wcschr
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscmp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscmp.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of wcscmp
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscpy.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscpy.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of wcscpy
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcslen.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcslen.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcslen.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of wcslen
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcsrchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcsrchr.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcsrchr.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of wcsrchr
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wmemcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wmemcmp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wmemcmp.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of wmemcmp
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c Sat Oct 13 00:01:45 2012
@@ -1,5 +1,5 @@
 /* Get frequency of the system processor.  powerpc/Linux version.
-   Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000-2012 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
@@ -46,7 +46,7 @@
       && INTERNAL_SYSCALL_ERRNO (timebase_freq, err) == ENOSYS)
 #endif
     {
-      int fd = open ("/proc/cpuinfo", O_RDONLY);
+      int fd = __open ("/proc/cpuinfo", O_RDONLY);
 
       if (__builtin_expect (fd != -1, 1))
 	{
@@ -58,7 +58,7 @@
 	  char buf[1024];
 	  ssize_t n;
 
-	  n = read (fd, buf, sizeof (buf));
+	  n = __read (fd, buf, sizeof (buf));
 	  if (n == sizeof (buf))
 	    {
 	      /* We are here because the 1st read returned exactly sizeof
@@ -76,7 +76,7 @@
 	      while (n >= half_buf)
 		{
 		  memcpy (buf, buf + half_buf, half_buf);
-		  n = read (fd, buf + half_buf, half_buf);
+		  n = __read (fd, buf + half_buf, half_buf);
 		}
 	      if (n >= 0)
 		n += half_buf;
@@ -108,7 +108,7 @@
 		}
 	      timebase_freq = result;
 	    }
-	  close (fd);
+	  __close (fd);
 	}
     }
 

Modified: fsf/trunk/libc/sysdeps/x86/bits/byteswap.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86/bits/byteswap.h (original)
+++ fsf/trunk/libc/sysdeps/x86/bits/byteswap.h Sat Oct 13 00:01:45 2012
@@ -24,6 +24,7 @@
 #define _BITS_BYTESWAP_H 1
 
 #include <features.h>
+#include <bits/types.h>
 #include <bits/wordsize.h>
 
 /* Swap bytes in 16 bit value.  */
@@ -104,15 +105,15 @@
 		     | (((x) & 0x00000000000000ffull) << 56)))
 
 # if __GNUC_PREREQ (4, 2)
-static __inline unsigned long long int
-__bswap_64 (unsigned long long int __bsx)
+static __inline __uint64_t
+__bswap_64 (__uint64_t __bsx)
 {
   return __builtin_bswap64 (__bsx);
 }
 # elif __WORDSIZE == 64
 #  define __bswap_64(x) \
      (__extension__							      \
-      ({ register unsigned long __v, __x = (x);				      \
+      ({ register __uint64_t __v, __x = (x);				      \
 	 if (__builtin_constant_p (__x))				      \
 	   __v = __bswap_constant_64 (__x);				      \
 	 else								      \
@@ -121,7 +122,7 @@
 # else
 #  define __bswap_64(x) \
      (__extension__                                                           \
-      ({ union { __extension__ unsigned long long int __ll;                   \
+      ({ union { __extension__ __uint64_t __ll;		                      \
 		 unsigned int __l[2]; } __w, __r;                             \
 	 if (__builtin_constant_p (x))                                        \
 	   __r.__ll = __bswap_constant_64 (x);                                \
@@ -144,8 +145,8 @@
       | (((x) & 0x000000000000ff00ull) << 40)				      \
       | (((x) & 0x00000000000000ffull) << 56))
 
-static __inline unsigned long long int
-__bswap_64 (unsigned long long int __bsx)
+static __inline __uint64_t
+__bswap_64 (__uint64_t __bsx)
 {
   return __bswap_constant_64 (__bsx);
 }

Added: fsf/trunk/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c (added)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c Sat Oct 13 00:01:45 2012
@@ -1,0 +1,283 @@
+/* Enumerate available IFUNC implementations of a function.  x86-64 version.
+   Copyright (C) 2012 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/>.  */
+
+#include <assert.h>
+#include <string.h>
+#include <wchar.h>
+#include <ifunc-impl-list.h>
+#include "init-arch.h"
+
+/* Maximum number of IFUNC implementations.  */
+#define MAX_IFUNC	4
+
+/* Fill ARRAY of MAX elements with IFUNC implementations for function
+   NAME supported on target machine and return the number of valid
+   entries.  */
+
+size_t
+__libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+			size_t max)
+{
+  assert (max >= MAX_IFUNC);
+
+  size_t i = 0;
+
+  /* Support sysdeps/x86_64/multiarch/memcmp.S.  */
+  IFUNC_IMPL (i, name, memcmp,
+	      IFUNC_IMPL_ADD (array, i, memcmp, HAS_SSE4_1,
+			      __memcmp_sse4_1)
+	      IFUNC_IMPL_ADD (array, i, memcmp, HAS_SSSE3, __memcmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/memmove_chk.S.  */
+  IFUNC_IMPL (i, name, __memmove_chk,
+	      IFUNC_IMPL_ADD (array, i, __memmove_chk, HAS_SSSE3,
+			      __memmove_chk_ssse3_back)
+	      IFUNC_IMPL_ADD (array, i, __memmove_chk, HAS_SSSE3,
+			      __memmove_chk_ssse3)
+	      IFUNC_IMPL_ADD (array, i, __memmove_chk, 1,
+			      __memmove_chk_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/memmove.S.  */
+  IFUNC_IMPL (i, name, memmove,
+	      IFUNC_IMPL_ADD (array, i, memmove, HAS_SSSE3,
+			      __memmove_ssse3_back)
+	      IFUNC_IMPL_ADD (array, i, memmove, HAS_SSSE3,
+			      __memmove_ssse3)
+	      IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/memset_chk.S.  */
+  IFUNC_IMPL (i, name, __memset_chk,
+	      IFUNC_IMPL_ADD (array, i, __memset_chk, 1, __memset_chk_sse2)
+	      IFUNC_IMPL_ADD (array, i, __memset_chk, 1,
+			      __memset_chk_x86_64))
+
+  /* Support sysdeps/x86_64/multiarch/memset.S.  */
+  IFUNC_IMPL (i, name, memset,
+	      IFUNC_IMPL_ADD (array, i, memset, 1, __memset_sse2)
+	      IFUNC_IMPL_ADD (array, i, memset, 1, __memset_x86_64))
+
+  /* Support sysdeps/x86_64/multiarch/rawmemchr.S.  */
+  IFUNC_IMPL (i, name, rawmemchr,
+	      IFUNC_IMPL_ADD (array, i, rawmemchr, HAS_SSE4_2,
+			      __rawmemchr_sse42)
+	      IFUNC_IMPL_ADD (array, i, rawmemchr, 1, __rawmemchr_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/stpncpy.S.  */
+  IFUNC_IMPL (i, name, stpncpy,
+	      IFUNC_IMPL_ADD (array, i, stpncpy, HAS_SSSE3,
+			      __stpncpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, stpncpy, 1,
+			      __stpncpy_sse2_unaligned)
+	      IFUNC_IMPL_ADD (array, i, stpncpy, 1, __stpncpy_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/stpcpy.S.  */
+  IFUNC_IMPL (i, name, stpcpy,
+	      IFUNC_IMPL_ADD (array, i, stpcpy, HAS_SSSE3, __stpcpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, stpcpy, 1, __stpcpy_sse2_unaligned)
+	      IFUNC_IMPL_ADD (array, i, stpcpy, 1, __stpcpy_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strcasecmp_l.S.  */
+  IFUNC_IMPL (i, name, strcasecmp,
+	      IFUNC_IMPL_ADD (array, i, strcasecmp, HAS_AVX,
+			      __strcasecmp_avx)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp, HAS_SSE4_2,
+			      __strcasecmp_sse42)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp, HAS_SSSE3,
+			      __strcasecmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp, 1, __strcasecmp_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strcasecmp_l.S.  */
+  IFUNC_IMPL (i, name, strcasecmp_l,
+	      IFUNC_IMPL_ADD (array, i, strcasecmp_l, HAS_AVX,
+			      __strcasecmp_l_avx)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp_l, HAS_SSE4_2,
+			      __strcasecmp_l_sse42)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp_l, HAS_SSSE3,
+			      __strcasecmp_l_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcasecmp_l, 1,
+			      __strcasecmp_l_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strcasestr.c.  */
+  IFUNC_IMPL (i, name, strcasestr,
+	      IFUNC_IMPL_ADD (array, i, strcasestr, HAS_SSE4_2,
+			      __strcasestr_sse42)
+	      IFUNC_IMPL_ADD (array, i, strcasestr, 1, __strcasestr_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strcat.S.  */
+  IFUNC_IMPL (i, name, strcat,
+	      IFUNC_IMPL_ADD (array, i, strcat, HAS_SSSE3, __strcat_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcat, 1, __strcat_sse2_unaligned)
+	      IFUNC_IMPL_ADD (array, i, strcat, 1, __strcat_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strchr.S.  */
+  IFUNC_IMPL (i, name, strchr,
+	      IFUNC_IMPL_ADD (array, i, strchr, HAS_SSE4_2, __strchr_sse42)
+	      IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_sse2_no_bsf)
+	      IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strcmp.S.  */
+  IFUNC_IMPL (i, name, strcmp,
+	      IFUNC_IMPL_ADD (array, i, strcmp, HAS_SSE4_2, __strcmp_sse42)
+	      IFUNC_IMPL_ADD (array, i, strcmp, HAS_SSSE3, __strcmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strcpy.S.  */
+  IFUNC_IMPL (i, name, strcpy,
+	      IFUNC_IMPL_ADD (array, i, strcpy, HAS_SSSE3, __strcpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_sse2_unaligned)
+	      IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strcspn.S.  */
+  IFUNC_IMPL (i, name, strcspn,
+	      IFUNC_IMPL_ADD (array, i, strcspn, HAS_SSE4_2,
+			      __strcspn_sse42)
+	      IFUNC_IMPL_ADD (array, i, strcspn, 1, __strcspn_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strncase_l.S.  */
+  IFUNC_IMPL (i, name, strncasecmp,
+	      IFUNC_IMPL_ADD (array, i, strncasecmp, HAS_AVX,
+			      __strncasecmp_avx)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp, HAS_SSE4_2,
+			      __strncasecmp_sse42)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp, HAS_SSSE3,
+			      __strncasecmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp, 1,
+			      __strncasecmp_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strncase_l.S.  */
+  IFUNC_IMPL (i, name, strncasecmp_l,
+	      IFUNC_IMPL_ADD (array, i, strncasecmp_l, HAS_AVX,
+			      __strncasecmp_l_avx)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp_l, HAS_SSE4_2,
+			      __strncasecmp_l_sse42)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp_l, HAS_SSSE3,
+			      __strncasecmp_l_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
+			      __strncasecmp_l_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strncat.S.  */
+  IFUNC_IMPL (i, name, strncat,
+	      IFUNC_IMPL_ADD (array, i, strncat, HAS_SSSE3,
+			      __strncat_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncat, 1,
+			      __strncat_sse2_unaligned)
+	      IFUNC_IMPL_ADD (array, i, strncat, 1, __strncat_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strncpy.S.  */
+  IFUNC_IMPL (i, name, strncpy,
+	      IFUNC_IMPL_ADD (array, i, strncpy, HAS_SSSE3,
+			      __strncpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncpy, 1,
+			      __strncpy_sse2_unaligned)
+	      IFUNC_IMPL_ADD (array, i, strncpy, 1, __strncpy_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strnlen.S.  */
+  IFUNC_IMPL (i, name, strnlen,
+	      IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_sse2_no_bsf)
+	      IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strpbrk.S.  */
+  IFUNC_IMPL (i, name, strpbrk,
+	      IFUNC_IMPL_ADD (array, i, strpbrk, HAS_SSE4_2,
+			      __strpbrk_sse42)
+	      IFUNC_IMPL_ADD (array, i, strpbrk, 1, __strpbrk_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strrchr.S.  */
+  IFUNC_IMPL (i, name, strrchr,
+	      IFUNC_IMPL_ADD (array, i, strrchr, HAS_SSE4_2,
+			      __strrchr_sse42)
+	      IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_sse2_no_bsf)
+	      IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strspn.S.  */
+  IFUNC_IMPL (i, name, strspn,
+	      IFUNC_IMPL_ADD (array, i, strspn, HAS_SSE4_2, __strspn_sse42)
+	      IFUNC_IMPL_ADD (array, i, strspn, 1, __strspn_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strstr-c.c.  */
+  IFUNC_IMPL (i, name, strstr,
+	      IFUNC_IMPL_ADD (array, i, strstr, HAS_SSE4_2, __strstr_sse42)
+	      IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/wcscpy.S.  */
+  IFUNC_IMPL (i, name, wcscpy,
+	      IFUNC_IMPL_ADD (array, i, wcscpy, HAS_SSSE3, __wcscpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, wcscpy, 1, __wcscpy_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/wmemcmp.S.  */
+  IFUNC_IMPL (i, name, wmemcmp,
+	      IFUNC_IMPL_ADD (array, i, wmemcmp, HAS_SSE4_1,
+			      __wmemcmp_sse4_1)
+	      IFUNC_IMPL_ADD (array, i, wmemcmp, HAS_SSSE3,
+			      __wmemcmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, wmemcmp, 1, __wmemcmp_sse2))
+
+#ifdef SHARED
+  /* Support sysdeps/x86_64/multiarch/memcpy_chk.S.  */
+  IFUNC_IMPL (i, name, __memcpy_chk,
+	      IFUNC_IMPL_ADD (array, i, __memcpy_chk, HAS_SSSE3,
+			      __memcpy_chk_ssse3_back)
+	      IFUNC_IMPL_ADD (array, i, __memcpy_chk, HAS_SSSE3,
+			      __memcpy_chk_ssse3)
+	      IFUNC_IMPL_ADD (array, i, __memcpy_chk, 1,
+			      __memcpy_chk_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/memcpy.S.  */
+  IFUNC_IMPL (i, name, memcpy,
+	      IFUNC_IMPL_ADD (array, i, memcpy, HAS_SSSE3,
+			      __memcpy_ssse3_back)
+	      IFUNC_IMPL_ADD (array, i, memcpy, HAS_SSSE3, __memcpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/mempcpy_chk.S.  */
+  IFUNC_IMPL (i, name, __mempcpy_chk,
+	      IFUNC_IMPL_ADD (array, i, __mempcpy_chk, HAS_SSSE3,
+			      __mempcpy_chk_ssse3_back)
+	      IFUNC_IMPL_ADD (array, i, __mempcpy_chk, HAS_SSSE3,
+			      __mempcpy_chk_ssse3)
+	      IFUNC_IMPL_ADD (array, i, __mempcpy_chk, 1,
+			      __mempcpy_chk_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/mempcpy.S.  */
+  IFUNC_IMPL (i, name, mempcpy,
+	      IFUNC_IMPL_ADD (array, i, mempcpy, HAS_SSSE3,
+			      __mempcpy_ssse3_back)
+	      IFUNC_IMPL_ADD (array, i, mempcpy, HAS_SSSE3,
+			      __mempcpy_ssse3)
+	      IFUNC_IMPL_ADD (array, i, mempcpy, 1, __mempcpy_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strlen.S.  */
+  IFUNC_IMPL (i, name, strlen,
+	      IFUNC_IMPL_ADD (array, i, strlen, HAS_SSE4_2, __strlen_sse42)
+	      IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_sse2_pminub)
+	      IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_sse2_no_bsf)
+	      IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_sse2)
+	      IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_sse2))
+
+  /* Support sysdeps/x86_64/multiarch/strncmp.S.  */
+  IFUNC_IMPL (i, name, strncmp,
+	      IFUNC_IMPL_ADD (array, i, strncmp, HAS_SSE4_2,
+			      __strncmp_sse42)
+	      IFUNC_IMPL_ADD (array, i, strncmp, HAS_SSSE3,
+			      __strncmp_ssse3)
+	      IFUNC_IMPL_ADD (array, i, strncmp, 1, __strncmp_sse2))
+#endif
+
+  return i;
+}

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memcmp.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memcmp.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of memcmp
-   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -48,6 +49,8 @@
 # define ENTRY(name) \
 	.type __memcmp_sse2, @function; \
 	.p2align 4; \
+	.globl __memcmp_sse2; \
+	.hidden __memcmp_sse2; \
 	__memcmp_sse2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy.S Sat Oct 13 00:01:45 2012
@@ -1,6 +1,6 @@
 /* Multiple versions of memcpy
-   Copyright (C) 2010, 2011
-   Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -45,6 +45,8 @@
 # undef ENTRY
 # define ENTRY(name) \
 	.type __memcpy_sse2, @function; \
+	.globl __memcpy_sse2; \
+	.hidden __memcpy_sse2; \
 	.p2align 4; \
 	__memcpy_sse2: cfi_startproc; \
 	CALL_MCOUNT

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy_chk.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy_chk.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of __memcpy_chk
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memmove.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memmove.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memmove.c Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of memmove.
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memmove_chk.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memmove_chk.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memmove_chk.c Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of __memmove_chk.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2010-2012 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

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/mempcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/mempcpy.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/mempcpy.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of mempcpy
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -43,6 +44,8 @@
 # define ENTRY(name) \
 	.type __mempcpy_sse2, @function; \
 	.p2align 4; \
+	.globl __mempcpy_sse2; \
+	.hidden __mempcpy_sse2; \
 	__mempcpy_sse2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/mempcpy_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/mempcpy_chk.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/mempcpy_chk.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of __mempcpy_chk
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memset.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memset.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memset.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of memset
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2010-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memset_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memset_chk.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memset_chk.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of __memset_chk
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2010-2012 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

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/rawmemchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/rawmemchr.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/rawmemchr.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,6 @@
-/* Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+/* Multiple versions of rawmemchr
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>.
    This file is part of the GNU C Library.
 
@@ -44,6 +46,8 @@
 	.section .text.sse4.2,"ax",@progbits
 	.align	16
 	.type	__rawmemchr_sse42, @function
+	.globl __rawmemchr_sse42
+	.hidden __rawmemchr_sse42
 __rawmemchr_sse42:
 	cfi_startproc
 	CALL_MCOUNT
@@ -81,6 +85,8 @@
 # define ENTRY(name) \
 	.type __rawmemchr_sse2, @function; \
 	.align 16; \
+	.globl __rawmemchr_sse2; \
+	.hidden __rawmemchr_sse2; \
 	__rawmemchr_sse2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/stpcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/stpcpy.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/stpcpy.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of stpcpy
+   All versions must be listed in ifunc-impl-list.c.  */
 #define USE_AS_STPCPY
 #define STRCPY __stpcpy
 #include "strcpy.S"

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/stpncpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/stpncpy.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/stpncpy.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of stpncpy
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCPY __stpncpy
 #define USE_AS_STPCPY
 #define USE_AS_STRNCPY

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasecmp_l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasecmp_l.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasecmp_l.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strcasecmp and strcasecmp_l
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCMP __strcasecmp_l
 #define USE_AS_STRCASECMP_L
 #include "strcmp.S"

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr-c.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr-c.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr-c.c Sat Oct 13 00:01:45 2012
@@ -1,3 +1,6 @@
+/* Multiple versions of strcasestr
+   All versions must be listed in ifunc-impl-list.c.  */
+
 #include "init-arch.h"
 
 #define STRCASESTR __strcasestr_sse2

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcat.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcat.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcat.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of strcat
-   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -63,6 +64,8 @@
 # define ENTRY(name) \
 	.type STRCAT_SSE2, @function; \
 	.align 16; \
+	.globl STRCAT_SSE2; \
+	.hidden STRCAT_SSE2; \
 	STRCAT_SSE2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strchr.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strchr.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,5 @@
-/* strchr with SSE4.2
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+/* Multiple versions of strchr
+   Copyright (C) 2009-2012 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
@@ -82,6 +82,8 @@
 	.section .text.sse4.2,"ax",@progbits
 	.align	16
 	.type	__strchr_sse42, @function
+	.globl	__strchr_sse42
+	.hidden	__strchr_sse42
 __strchr_sse42:
 	cfi_startproc
 	CALL_MCOUNT
@@ -164,6 +166,8 @@
 # define ENTRY(name) \
 	.type __strchr_sse2, @function; \
 	.align 16; \
+	.globl __strchr_sse2; \
+	.hidden __strchr_sse2; \
 	__strchr_sse2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp-sse42.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp-sse42.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp-sse42.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,5 @@
 /* strcmp with SSE4.2
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -48,6 +48,8 @@
 	.section .text.SECTION,"ax",@progbits
 	.align	16
 	.type	STRCMP_SSE42, @function
+	.globl	STRCMP_SSE42
+	.hidden	STRCMP_SSE42
 #ifdef USE_AS_STRCASECMP_L
 ENTRY (GLABEL(__strcasecmp))
 	movq	__libc_tsd_LOCALE@gottpoff(%rip),%rax

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp.S Sat Oct 13 00:01:45 2012
@@ -1,4 +1,4 @@
-/* strcmp with SSE4.2
+/* Multiple versions of strcmp
    Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
@@ -171,6 +171,8 @@
 # define ENTRY(name) \
 	.type STRCMP_SSE2, @function; \
 	.align 16; \
+	.globl STRCMP_SSE2; \
+	.hidden STRCMP_SSE2; \
 	STRCMP_SSE2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END
@@ -181,6 +183,8 @@
 #  define ENTRY2(name) \
 	.type __strcasecmp_sse2, @function; \
 	.align 16; \
+	.globl __strcasecmp_sse2; \
+	.hidden __strcasecmp_sse2; \
 	__strcasecmp_sse2: cfi_startproc; \
 	CALL_MCOUNT
 #  define END2(name) \
@@ -191,6 +195,8 @@
 #  define ENTRY2(name) \
 	.type __strncasecmp_sse2, @function; \
 	.align 16; \
+	.globl __strncasecmp_sse2; \
+	.hidden __strncasecmp_sse2; \
 	__strncasecmp_sse2: cfi_startproc; \
 	CALL_MCOUNT
 #  define END2(name) \

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcpy.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcpy.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of strcpy
-   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -77,6 +78,8 @@
 # define ENTRY(name) \
 	.type STRCPY_SSE2, @function; \
 	.align 16; \
+	.globl STRCPY_SSE2; \
+	.hidden STRCPY_SSE2; \
 	STRCPY_SSE2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcspn.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcspn.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcspn.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of strcspn
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strlen.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strlen.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strlen.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
-/* strlen(str) -- determine the length of the string STR.
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Multiple versions of strlen(str) -- determine the length of the string STR.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>.
    This file is part of the GNU C Library.
 
@@ -49,6 +50,8 @@
 # define ENTRY(name) \
 	.type __strlen_sse2, @function; \
 	.align 16; \
+	.globl __strlen_sse2; \
+	.hidden __strlen_sse2; \
 	__strlen_sse2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strncase_l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strncase_l.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strncase_l.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strncasecmp and strncasecmp_l
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCMP __strncasecmp_l
 #define USE_AS_STRNCASECMP_L
 #include "strcmp.S"

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strncat.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strncat.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strncat.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strncat
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCAT strncat
 #define USE_AS_STRNCAT
 #include "strcat.S"

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strncmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strncmp.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strncmp.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strncmp
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCMP strncmp
 #define USE_AS_STRNCMP
 #include "strcmp.S"

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strncpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strncpy.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strncpy.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strncpy
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCPY strncpy
 #define USE_AS_STRNCPY
 #include "strcpy.S"

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strnlen.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strnlen.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strnlen.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* multiple version of strnlen
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2011-2012 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
@@ -40,6 +41,8 @@
 # define ENTRY(name) \
 	.type __strnlen_sse2, @function; \
 	.align 16; \
+	.globl __strnlen_sse2; \
+	.hidden __strnlen_sse2; \
 	__strnlen_sse2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strpbrk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strpbrk.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strpbrk.S Sat Oct 13 00:01:45 2012
@@ -1,3 +1,5 @@
+/* Multiple versions of strpbrk
+   All versions must be listed in ifunc-impl-list.c.  */
 #define STRCSPN strpbrk
 #define USE_AS_STRPBRK
 #include "strcspn.S"

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strrchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strrchr.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strrchr.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
-/* strrchr with SSE4.2
-   Copyright (C) 2009 Free Software Foundation, Inc.
+/* Multiple versions of strrchr
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2009-2012 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
@@ -87,6 +88,8 @@
 	.section .text.sse4.2,"ax",@progbits
 	.align	16
 	.type	__strrchr_sse42, @function
+	.globl	__strrchr_sse42
+	.hidden	__strrchr_sse42
 __strrchr_sse42:
 	cfi_startproc
 	CALL_MCOUNT
@@ -265,6 +268,8 @@
 # define ENTRY(name) \
 	.type __strrchr_sse2, @function; \
 	.align 16; \
+	.globl __strrchr_sse2; \
+	.hidden __strrchr_sse2; \
 	__strrchr_sse2: cfi_startproc; \
 	CALL_MCOUNT
 # undef END

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strspn.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strspn.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strspn.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of strspn
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strstr-c.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strstr-c.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strstr-c.c Sat Oct 13 00:01:45 2012
@@ -1,4 +1,5 @@
 /* Multiple versions of strstr.
+   All versions must be listed in ifunc-impl-list.c.
    Copyright (C) 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/wcscpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/wcscpy.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/wcscpy.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of wcscpy
-   Copyright (C)  2011 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C)  2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/wmemcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/wmemcmp.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/wmemcmp.S Sat Oct 13 00:01:45 2012
@@ -1,5 +1,6 @@
 /* Multiple versions of wmemcmp
-   Copyright (C)  2011 Free Software Foundation, Inc.
+   All versions must be listed in ifunc-impl-list.c.
+   Copyright (C)  2011-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits