From f6b71eada3cfbaa13dd4019978e9bd29055bad9f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 26 Aug 2015 08:00:47 -0700 Subject: Replace BZERO_P/PIC with USE_AS_BZERO/SHARED Replace BZERO_P with USE_AS_BZERO in i586/i686 memset.S to support i386 multi-arch memset. Also we should check SHARED not PIC for libc.so since libc.a may be compiled with PIC. * sysdeps/i386/i586/bzero.S (USE_AS_BZERO): New. * sysdeps/i386/i686/bzero.S (USE_AS_BZERO): Likewise. * sysdeps/i386/i586/memset.S (BZERO_P): Removed. Check USE_AS_BZERO/SHARED instead of BZERO_P/PIC. (__memset_zero_constant_len_parameter): New. * sysdeps/i386/i686/memset.S (BZERO_P): Removed. Check USE_AS_BZERO/SHARED instead of BZERO_P/PIC. (__memset_zero_constant_len_parameter): Don't define if __memset_chk or USE_AS_BZERO are defined. --- sysdeps/i386/i686/bzero.S | 1 + 1 file changed, 1 insertion(+) (limited to 'sysdeps/i386/i686/bzero.S') diff --git a/sysdeps/i386/i686/bzero.S b/sysdeps/i386/i686/bzero.S index 34b0faa91b..c7898f18e0 100644 --- a/sysdeps/i386/i686/bzero.S +++ b/sysdeps/i386/i686/bzero.S @@ -1,3 +1,4 @@ +#define USE_AS_BZERO #define memset __bzero #include weak_alias (__bzero, bzero) -- cgit v1.2.3