diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-04-08 14:54:13 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-04-08 14:54:13 +0200 |
| commit | 96bd03c79a7ea9bdf6130e4a641d3144cbefabac (patch) | |
| tree | 231823641c4af12142be32d0dcc1103fa6d206ef /sysdeps/x86_64/memset_chk.S | |
| parent | 624254b18ae5a756baabbcd881faf1440e36151f (diff) | |
| parent | 1e4920e0808439be5e4a6a6e8a736de32c43b070 (diff) | |
| download | glibc-96bd03c79a7ea9bdf6130e4a641d3144cbefabac.tar glibc-96bd03c79a7ea9bdf6130e4a641d3144cbefabac.tar.gz glibc-96bd03c79a7ea9bdf6130e4a641d3144cbefabac.tar.bz2 glibc-96bd03c79a7ea9bdf6130e4a641d3144cbefabac.zip | |
Merge branch 'master' of git://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'sysdeps/x86_64/memset_chk.S')
| -rw-r--r-- | sysdeps/x86_64/memset_chk.S | 2 |
1 files changed, 1 insertions, 1 deletions
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 |