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 <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index cdecc655a9d5cc84fd3bf59256bda70220af63a7..bed8caf4e1dc9992883b7afc38e24d56a9f3500e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-07  Mike Frysinger  <vapier@gentoo.org>
+
+       * sysdeps/i386/i686/memset_chk.S: Change PIC to SHARED.
+       * sysdeps/x86_64/memset_chk.S: Likewise.
+
 2012-04-07  David S. Miller  <davem@davemloft.net>
 
        * elf/elf.h (R_SPARC_WDISP10): Define.

diff --git a/sysdeps/i386/i686/memset_chk.S b/sysdeps/i386/i686/memset_chk.S
index 504fc06b1805fabcad4cd484dcdca562cfe533a1..f2e7fd7813cd743b0a267d29920e2fef566721af 100644 (file)
--- a/sysdeps/i386/i686/memset_chk.S
+++ b/sysdeps/i386/i686/memset_chk.S
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #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 16f1fde1652606490a5036c469f03dc8b34cacd5..9efb3d9ee98acb5f979987755dd3bff9ef78b40f 100644 (file)
--- a/sysdeps/x86_64/memset_chk.S
+++ b/sysdeps/x86_64/memset_chk.S
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #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