From 7d9335ecd7ddd16bcbcfcc0f9cc1f0b5d392f849 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 24 Mar 2010 12:16:24 -0700 Subject: Don't define __strpbrk_sse42 in static library --- ChangeLog | 5 +++++ sysdeps/x86_64/multiarch/strpbrk-c.c | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88177a44a7..004c6bfd41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-03-24 H.J. Lu + + * sysdeps/x86_64/multiarch/strpbrk-c.c: Define only if SHARED + is defined. + 2010-03-22 H.J. Lu * 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 c58dcb5605..bbf5c49d89 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 -- cgit 1.4.1