aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2010-03-24 12:16:24 -0700
committerUlrich Drepper <drepper@redhat.com>2010-03-24 12:16:24 -0700
commit7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849 (patch)
tree84a9f312ac8bf27c7aa8d30a706369b55458f616
parent8863605af91a9a930c0e92e87775cf22780451e0 (diff)
downloadglibc-7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849.zip
glibc-7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849.tar.gz
glibc-7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849.tar.bz2
Don't define __strpbrk_sse42 in static library
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/multiarch/strpbrk-c.c12
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 88177a4..004c6bf 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 c58dcb5..bbf5c49 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