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 /include | |
| parent | eb9cca27b385873c6788b18a13d918c873540866 (diff) | |
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 'include')
| -rw-r--r-- | include/features.h | 5 | ||||
| -rw-r--r-- | include/libc-internal.h | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/features.h b/include/features.h index f4d70d70f..41e83a93f 100644 --- a/include/features.h +++ b/include/features.h @@ -198,9 +198,12 @@ # define __OPTIMIZE_SIZE__ 1 /* disable unsupported features */ -# undef _FORTIFY_SOURCE # undef __LDBL_COMPAT +# ifndef __UCLIBC_HAS_FORTIFY__ +# undef _FORTIFY_SOURCE +# endif + # ifndef __UCLIBC_HAS_THREADS__ # if defined _REENTRANT || defined _THREAD_SAFE # warning requested reentrant code, but thread support was disabled diff --git a/include/libc-internal.h b/include/libc-internal.h index 443b1fc50..3ac0b0509 100644 --- a/include/libc-internal.h +++ b/include/libc-internal.h @@ -65,6 +65,11 @@ libc_hidden_proto(__glibc_strerror_r) /* internal access to program name */ extern const char *__uclibc_progname attribute_hidden; +# ifdef __UCLIBC_HAS_FORTIFY__ +extern void __chk_fail(void) attribute_noreturn; +libc_hidden_proto(__chk_fail) +# endif + # endif /* IS_IN_libc */ #endif /* __ASSEMBLER__ */ |