diff options
| author | Nick Kralevich <nnk@google.com> | 2013-04-29 14:12:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-29 14:12:50 -0700 |
| commit | 3d660f2a7c8a69a33825cb05ffe8667c99138000 (patch) | |
| tree | 66b27293e9448dac4fe44f164c12031586cf0f68 /core/combo | |
| parent | 96cea40fce3939716cfcf1bc8aaeddd99fa396ac (diff) | |
| parent | 042723c0151980fee315678736751f7385977d90 (diff) | |
| download | build-3d660f2a7c8a69a33825cb05ffe8667c99138000.zip build-3d660f2a7c8a69a33825cb05ffe8667c99138000.tar.gz build-3d660f2a7c8a69a33825cb05ffe8667c99138000.tar.bz2 | |
am 042723c0: Merge "x86/mips: enable _FORTIFY_SOURCE=2"
* commit '042723c0151980fee315678736751f7385977d90':
x86/mips: enable _FORTIFY_SOURCE=2
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 83fe657..c878ae5 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -89,7 +89,7 @@ TARGET_GLOBAL_CFLAGS += \ -funwind-tables \ -Wa,--noexecstack \ -Werror=format-security \ - -D_FORTIFY_SOURCE=1 \ + -D_FORTIFY_SOURCE=2 \ $(arch_variant_cflags) android_config_h := $(call select-android-config-h,linux-mips) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 04531b2..5c9a76b 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -90,7 +90,7 @@ TARGET_GLOBAL_CFLAGS += \ -Ulinux \ -Wa,--noexecstack \ -Werror=format-security \ - -D_FORTIFY_SOURCE=1 \ + -D_FORTIFY_SOURCE=2 \ -Wstrict-aliasing=2 \ -fPIC -fPIE \ -ffunction-sections \ |