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 --- sysdeps/x86_64/multiarch/strpbrk-c.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'sysdeps') 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 v1.2.3-70-g09d2