From 1e4920e0808439be5e4a6a6e8a736de32c43b070 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 22 Feb 2011 13:26:19 -0500 Subject: memset: fix define usage for shared libs The proper define to check "am I in a shared lib" is "SHARED", not "PIC". The two new memset_chk functions incorrectly depend on "PIC". Signed-off-by: Mike Frysinger --- ChangeLog | 5 +++++ sysdeps/i386/i686/memset_chk.S | 2 +- sysdeps/x86_64/memset_chk.S | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cdecc655a9..bed8caf4e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-04-07 Mike Frysinger + + * sysdeps/i386/i686/memset_chk.S: Change PIC to SHARED. + * sysdeps/x86_64/memset_chk.S: Likewise. + 2012-04-07 David S. Miller * elf/elf.h (R_SPARC_WDISP10): Define. diff --git a/sysdeps/i386/i686/memset_chk.S b/sysdeps/i386/i686/memset_chk.S index 504fc06b18..f2e7fd7813 100644 --- a/sysdeps/i386/i686/memset_chk.S +++ b/sysdeps/i386/i686/memset_chk.S @@ -19,7 +19,7 @@ #include #include "asm-syntax.h" -#ifndef PIC +#ifndef SHARED /* For libc.so this is defined in memset.S. For libc.a, this is a separate source to avoid memset bringing in __chk_fail and all routines diff --git a/sysdeps/x86_64/memset_chk.S b/sysdeps/x86_64/memset_chk.S index 16f1fde165..9efb3d9ee9 100644 --- a/sysdeps/x86_64/memset_chk.S +++ b/sysdeps/x86_64/memset_chk.S @@ -19,7 +19,7 @@ #include #include "asm-syntax.h" -#ifndef PIC +#ifndef SHARED /* For libc.so this is defined in memset.S. For libc.a, this is a separate source to avoid memset bringing in __chk_fail and all routines -- cgit v1.2.3