aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-02-22 13:26:19 -0500
committerMike Frysinger <vapier@gentoo.org>2012-04-07 16:33:50 -0400
commit1e4920e0808439be5e4a6a6e8a736de32c43b070 (patch)
treea1187b330e9d6d82efefae5d8b3348b7746cc964 /sysdeps
parent5ed848f3d8b5b3be92fe3006fd18a089ef982316 (diff)
downloadglibc-1e4920e0808439be5e4a6a6e8a736de32c43b070.tar
glibc-1e4920e0808439be5e4a6a6e8a736de32c43b070.tar.gz
glibc-1e4920e0808439be5e4a6a6e8a736de32c43b070.tar.bz2
glibc-1e4920e0808439be5e4a6a6e8a736de32c43b070.zip
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>
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/i386/i686/memset_chk.S2
-rw-r--r--sysdeps/x86_64/memset_chk.S2
2 files changed, 2 insertions, 2 deletions
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 <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 16f1fde165..9efb3d9ee9 100644
--- 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