diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-12-19 14:02:14 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-12-19 14:03:00 -0800 |
| commit | 875d11eec5df38bae0003df4a884ef962cf28590 (patch) | |
| tree | 83667b7ab2470a3aba40fb9ee868784d77d7e900 /libc/string/x86_64/memcpy.S | |
| parent | f3217f9be3225c4943677d03b274cbc0cb4ed228 (diff) | |
| parent | 23528282b771d1af3df0fa17f1e909ad3b663f59 (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
libc/signal/sigpause.c
libc/string/x86_64/memset.S
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/string/x86_64/memcpy.S')
| -rw-r--r-- | libc/string/x86_64/memcpy.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/string/x86_64/memcpy.S b/libc/string/x86_64/memcpy.S index 011291447..6d941e0f2 100644 --- a/libc/string/x86_64/memcpy.S +++ b/libc/string/x86_64/memcpy.S @@ -29,7 +29,9 @@ #if defined __PIC__ && !defined NOT_IN_libc ENTRY (__memcpy_chk) cmpq %rdx, %rcx +#if defined __UCLIBC_HAS_SSP__ jb HIDDEN_JUMPTARGET (__chk_fail) +#endif END (__memcpy_chk) #endif ENTRY (BP_SYM (memcpy)) |