diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-12-19 13:35:52 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-12-19 13:35:52 -0800 |
| commit | 7dcd83e8bded560b6a2c658889995390d3021a92 (patch) | |
| tree | b3cb711457462a5219ac0bdc4d11eb6e71e5c9de /libc/string/x86_64/memset.S | |
| parent | e092e7c30464555b3fb81adc8f2f479e892b0786 (diff) | |
x86_64: fix multiple definition of chk functions
also enable __chk_fail and only try to call it when SSP is on
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/string/x86_64/memset.S')
| -rw-r--r-- | libc/string/x86_64/memset.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/string/x86_64/memset.S b/libc/string/x86_64/memset.S index 562574a4d..df265f394 100644 --- a/libc/string/x86_64/memset.S +++ b/libc/string/x86_64/memset.S @@ -29,10 +29,12 @@ #define LARGE $120000 .text -#if !BZERO_P && defined __PIC__ && !defined NOT_IN_libc +#if defined __PIC__ && !defined NOT_IN_libc ENTRY (__memset_chk) cmpq %rdx, %rcx +#if defined __UCLIBC_HAS_SSP__ jb HIDDEN_JUMPTARGET (__chk_fail) +#endif END (__memset_chk) #endif ENTRY (memset) |