diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2017-11-07 20:50:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2017-11-19 08:26:28 +0100 |
| commit | a745c4bfc8a9b5db4e48387170da0dc1d39e3abe (patch) | |
| tree | cbcad0531c831d3b2a8420fdeb330147fbe598e1 /include | |
| parent | bcbbc6d4f00914279ae42006d13a54bb9b91f144 (diff) | |
remove unused FORTIFY code fragments
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.h | 16 | ||||
| -rw-r--r-- | include/libc-internal.h | 5 | ||||
| -rw-r--r-- | include/sys/cdefs.h | 7 | ||||
| -rw-r--r-- | include/unistd.h | 6 |
4 files changed, 2 insertions, 32 deletions
diff --git a/include/features.h b/include/features.h index 7dc913f33..4a1066531 100644 --- a/include/features.h +++ b/include/features.h @@ -207,9 +207,8 @@ /* disable unsupported features */ # undef __LDBL_COMPAT -# ifndef __UCLIBC_HAS_FORTIFY__ -# undef _FORTIFY_SOURCE -# endif +/* no support for FORTIFY */ +# undef _FORTIFY_SOURCE # ifndef __UCLIBC_HAS_THREADS__ # if defined _REENTRANT || defined _THREAD_SAFE @@ -352,17 +351,6 @@ # define __USE_REENTRANT 1 #endif -#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \ - && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 -# if _FORTIFY_SOURCE > 1 -# define __USE_FORTIFY_LEVEL 2 -# else -# define __USE_FORTIFY_LEVEL 1 -# endif -#else -# define __USE_FORTIFY_LEVEL 0 -#endif - /* We do support the IEC 559 math functionality, real and complex. */ #ifdef __UCLIBC_HAS_FLOATS__ #define __STDC_IEC_559__ 1 diff --git a/include/libc-internal.h b/include/libc-internal.h index 87af07cc5..250f7f885 100644 --- a/include/libc-internal.h +++ b/include/libc-internal.h @@ -67,11 +67,6 @@ libc_hidden_proto(__xpg_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 - # ifdef __UCLIBC_HAS_SSP__ extern void __stack_chk_fail(void) attribute_noreturn __cold; # endif diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h index 6cd38114b..a4359a05c 100644 --- a/include/sys/cdefs.h +++ b/include/sys/cdefs.h @@ -129,10 +129,6 @@ #endif -/* Fortify support. */ -#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) -#define __bos0(ptr) __builtin_object_size (ptr, 0) - #if __GNUC_PREREQ (4,3) # define __warndecl(name, msg) \ extern void name (void) __attribute__((__warning__ (msg))) @@ -300,9 +296,6 @@ #if __GNUC_PREREQ (3,4) # define __attribute_warn_unused_result__ \ __attribute__ ((__warn_unused_result__)) -# if __USE_FORTIFY_LEVEL > 0 -# define __wur __attribute_warn_unused_result__ -# endif #else # define __attribute_warn_unused_result__ /* empty */ #endif diff --git a/include/unistd.h b/include/unistd.h index c7364cf99..fdde8f02f 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -1248,12 +1248,6 @@ extern void swab (const void *__restrict __from, void *__restrict __to, extern char *ctermid (char *__s) __THROW; #endif - -/* Define some macros helping to catch buffer overflows. */ -#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline -# include <bits/unistd.h> -#endif - __END_DECLS |