]>
Commit | Line | Data |
---|---|---|
b5aaf4cf AM |
1 | http://bugs.gentoo.org/353816 |
2 | http://sourceware.org/ml/libc-alpha/2011-02/msg00152.html | |
3 | ||
4 | From 87fac357a6243982ce21cb71e21bbe0d35234eed Mon Sep 17 00:00:00 2001 | |
5 | From: Mike Frysinger <vapier@gentoo.org> | |
6 | Date: Tue, 22 Feb 2011 13:26:19 -0500 | |
7 | Subject: [PATCH] memset: fix define usage for shared libs | |
8 | ||
9 | The proper define to check "am I in a shared lib" is "SHARED", not "PIC". | |
10 | The two new memset_chk functions incorrectly depend on "PIC". | |
11 | ||
12 | Signed-off-by: Mike Frysinger <vapier@gentoo.org> | |
13 | ||
14 | 2011-02-22 Mike Frysinger <vapier@gentoo.org> | |
15 | ||
16 | * sysdeps/i386/i686/memset_chk.S: Change PIC to SHARED. | |
17 | * sysdeps/x86_64/memset_chk.S: Likewise. | |
18 | --- | |
19 | sysdeps/i386/i686/memset_chk.S | 2 +- | |
20 | sysdeps/x86_64/memset_chk.S | 2 +- | |
21 | 2 files changed, 2 insertions(+), 2 deletions(-) | |
22 | ||
23 | diff --git a/sysdeps/i386/i686/memset_chk.S b/sysdeps/i386/i686/memset_chk.S | |
24 | index cd93d5e..e7511a0 100644 | |
25 | --- a/sysdeps/i386/i686/memset_chk.S | |
26 | +++ b/sysdeps/i386/i686/memset_chk.S | |
27 | @@ -20,7 +20,7 @@ | |
28 | #include <sysdep.h> | |
29 | #include "asm-syntax.h" | |
30 | ||
31 | -#ifndef PIC | |
32 | +#ifndef SHARED | |
33 | /* For libc.so this is defined in memset.S. | |
34 | For libc.a, this is a separate source to avoid | |
35 | memset bringing in __chk_fail and all routines | |
36 | diff --git a/sysdeps/x86_64/memset_chk.S b/sysdeps/x86_64/memset_chk.S | |
37 | index c1c8c23..2c4fffc 100644 | |
38 | --- a/sysdeps/x86_64/memset_chk.S | |
39 | +++ b/sysdeps/x86_64/memset_chk.S | |
40 | @@ -20,7 +20,7 @@ | |
41 | #include <sysdep.h> | |
42 | #include "asm-syntax.h" | |
43 | ||
44 | -#ifndef PIC | |
45 | +#ifndef SHARED | |
46 | /* For libc.so this is defined in memset.S. | |
47 | For libc.a, this is a separate source to avoid | |
48 | memset bringing in __chk_fail and all routines | |
49 | -- | |
50 | 1.7.4.1 | |
51 |