From: H.J. Lu <hongjiu.lu@intel.com>
Date: Wed, 24 Mar 2010 19:16:24 +0000 (-0700)
Subject: Don't define __strpbrk_sse42 in static library
X-Git-Tag: fedora/glibc-2.11.90-17~2^2~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849;p=thirdparty%2Fglibc.git

Don't define __strpbrk_sse42 in static library
---

diff --git a/ChangeLog b/ChangeLog
index 88177a44a73..004c6bfd41a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/multiarch/strpbrk-c.c: Define only if SHARED
+	is defined.
+
 2010-03-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* string/test-memcmp.c (check_result): New function.
diff --git a/sysdeps/x86_64/multiarch/strpbrk-c.c b/sysdeps/x86_64/multiarch/strpbrk-c.c
index c58dcb5605f..bbf5c49d892 100644
--- a/sysdeps/x86_64/multiarch/strpbrk-c.c
+++ b/sysdeps/x86_64/multiarch/strpbrk-c.c
@@ -1,4 +1,8 @@
-#define USE_AS_STRPBRK
-#define STRCSPN_SSE2 __strpbrk_sse2
-#define STRCSPN_SSE42 __strpbrk_sse42
-#include "strcspn-c.c"
+/* Don't define multiple versions for strpbrk in static library since we
+   need strpbrk before the initialization happened.  */
+#ifdef SHARED
+# define USE_AS_STRPBRK
+# define STRCSPN_SSE2 __strpbrk_sse2
+# define STRCSPN_SSE42 __strpbrk_sse42
+# include "strcspn-c.c"
+#endif