diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-09 09:23:48 +0100 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-09 09:23:48 +0100 |
| commit | 82098ab9b853c33ee8ade61c9510b295cc696de1 (patch) | |
| tree | 8f4cbadd3425d95002e78cafdbdc0bdf32cedc41 /libc/string/x86_64/memcpy.S | |
| parent | eb9cca27b385873c6788b18a13d918c873540866 (diff) | |
| download | uClibc-alpine-82098ab9b853c33ee8ade61c9510b295cc696de1.tar.bz2 uClibc-alpine-82098ab9b853c33ee8ade61c9510b295cc696de1.tar.xz | |
guard *_chk() related stuff with UCLIBC_HAS_FORTIFY
Guard x86_64 memset_chk/memcpy_chk be guarded by UCLIBC_HAS_FORTIFY.
Compile ssp.c if one of SSP/FORTIFY is defined.
Guard __chk_fail() with UCLIBC_HAS_FORTIFY and move its prototype to libc-internal.h.
Disable _FORTIFY_SOURCE if UCLIBC_HAS_FORTIFY is not set.
The config option itself is omitted on purpose,
headers need to be reviewed and generic *_chk() functions need to be first provided.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Diffstat (limited to 'libc/string/x86_64/memcpy.S')
| -rw-r--r-- | libc/string/x86_64/memcpy.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libc/string/x86_64/memcpy.S b/libc/string/x86_64/memcpy.S index 6d941e0f2..9c8169b42 100644 --- a/libc/string/x86_64/memcpy.S +++ b/libc/string/x86_64/memcpy.S @@ -26,12 +26,10 @@ #define MEMPCPY_P (defined memcpy) .text -#if defined __PIC__ && !defined NOT_IN_libc +#if defined __PIC__ && !defined NOT_IN_libc && defined __UCLIBC_HAS_FORTIFY__ 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)) |