diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-08-16 20:43:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-16 20:43:54 +0000 |
| commit | 67e7bf137e00a6c9ef79396e40be6b1705a2758c (patch) | |
| tree | 0ac35e33169ae9b07c075a3c623148d2e974d14f /libc | |
| parent | 82f28565ce8f6f45ac0b269819d8242a94dad637 (diff) | |
| parent | 1de2e358caf9a22359e38ab8573cc3e5dcc1602f (diff) | |
| download | android_bionic-67e7bf137e00a6c9ef79396e40be6b1705a2758c.tar.gz android_bionic-67e7bf137e00a6c9ef79396e40be6b1705a2758c.tar.bz2 android_bionic-67e7bf137e00a6c9ef79396e40be6b1705a2758c.zip | |
Merge "Enable FORTIFY in unoptimized builds"
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/include/sys/cdefs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h index 954152076..71d84260f 100644 --- a/libc/include/sys/cdefs.h +++ b/libc/include/sys/cdefs.h @@ -239,7 +239,8 @@ #define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1) -#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 +#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && \ + (defined(__clang__) || (defined(__OPTIMIZE__) && __OPTIMIZE__ > 0)) # define __BIONIC_FORTIFY 1 # if _FORTIFY_SOURCE == 2 # define __bos_level 1 @@ -281,8 +282,7 @@ #define __pass_object_size __pass_object_size_n(__bos_level) #define __pass_object_size0 __pass_object_size_n(0) -/* FIXME: This should be __BIONIC_FORTIFY, but we don't enable FORTIFY in -O0. */ -#if (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0) || defined(__BIONIC_DECLARE_FORTIFY_HELPERS) +#if defined(__BIONIC_FORTIFY) || defined(__BIONIC_DECLARE_FORTIFY_HELPERS) # define __BIONIC_INCLUDE_FORTIFY_HEADERS 1 #endif |