This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.11-277-g7d9335e
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 24 Mar 2010 19:16:43 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-277-g7d9335e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849 (commit)
from 8863605af91a9a930c0e92e87775cf22780451e0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849
commit 7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849
Author: H.J. Lu <hongjiu.lu@intel.com>
Date: Wed Mar 24 12:16:24 2010 -0700
Don't define __strpbrk_sse42 in static library
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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/x86_64/multiarch/strpbrk-c.c | 12 ++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources