diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-05-09 16:55:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-09 16:55:00 +0000 |
| commit | eca0043b869cb10792e2f3e79d4714bde2945bac (patch) | |
| tree | 9506761bfa33dfdff72eb0723117b7b9a822bf16 | |
| parent | 3afc688a6acc1753a2b104719a7a27f223f50750 (diff) | |
| parent | 48f239c94faca140427afc9aa06cf356b1b6b0de (diff) | |
| download | build-eca0043b869cb10792e2f3e79d4714bde2945bac.tar.gz | |
Merge "Disable canonical prefixes of system headers"
| -rw-r--r-- | core/clang/config.mk | 3 | ||||
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 3 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm64.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips64.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86_64.mk | 4 |
8 files changed, 17 insertions, 3 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index b8f76f24f7..c598e7daba 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -31,7 +31,8 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \ -funswitch-loops \ -Wno-psabi \ -Wno-unused-but-set-variable \ - -Wno-unused-but-set-parameter + -Wno-unused-but-set-parameter \ + -fno-canonical-system-headers # Clang flags for all host rules CLANG_CONFIG_HOST_EXTRA_ASFLAGS := diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index 85d536b4b1..1472849020 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -52,7 +52,8 @@ HOST_GLOBAL_LDFLAGS += -static endif # BUILD_HOST_static HOST_GLOBAL_CFLAGS += -fPIC \ - -include $(call select-android-config-h,linux-x86) + -no-canonical-prefixes \ + -include $(call select-android-config-h,linux-x86) # Disable new longjmp in glibc 2.11 and later. See bug 2967937. HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 81d0813184..8c8a01a0a4 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -103,6 +103,8 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ -fno-short-enums \ + -no-canonical-prefixes \ + -fno-canonical-system-headers \ $(arch_variant_cflags) \ -include $(android_config_h) \ -I $(dir $(android_config_h)) diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 5e50f9fd7f..6515eb5094 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -87,6 +87,8 @@ TARGET_GLOBAL_CFLAGS += \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ -fno-short-enums \ + -no-canonical-prefixes \ + -fno-canonical-system-headers \ $(arch_variant_cflags) \ -include $(android_config_h) \ -I $(dir $(android_config_h)) diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 1250767550..015d46b8c2 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -90,6 +90,8 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ -Wa,--noexecstack \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ + -no-canonical-prefixes \ + -fno-canonical-system-headers \ $(arch_variant_cflags) \ -include $(android_config_h) \ -I $(dir $(android_config_h)) diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk index 2130d03591..a7b03b2fca 100644 --- a/core/combo/TARGET_linux-mips64.mk +++ b/core/combo/TARGET_linux-mips64.mk @@ -95,6 +95,8 @@ TARGET_GLOBAL_CFLAGS += \ -Wa,--noexecstack \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ + -no-canonical-prefixes \ + -fno-canonical-system-headers \ $(arch_variant_cflags) \ -include $(android_config_h) \ -I $(dir $(android_config_h)) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 4f66765d32..4ebcd93297 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -122,6 +122,8 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ -fstack-protector \ -m32 \ -msse2 \ + -no-canonical-prefixes \ + -fno-canonical-system-headers \ -include $(android_config_h) \ -I $(dir $(android_config_h)) diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 42953ae52c..ee6c6e2e22 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -120,7 +120,9 @@ TARGET_GLOBAL_CFLAGS += \ -funswitch-loops \ -funwind-tables \ -fstack-protector \ - -m64 + -m64 \ + -no-canonical-prefixes \ + -fno-canonical-system-headers # Help catch common 32/64-bit errors. TARGET_GLOBAL_CFLAGS += \ |