diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-05-09 17:06:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 17:06:54 +0000 |
| commit | 9604c0680fba667f1f73fa62aea8ff22f9f13689 (patch) | |
| tree | d6fdae82b75e7e2c4b8cbc337322567beab948d2 | |
| parent | 38e49504efe2b52195eca19da63e000c2eceed0d (diff) | |
| parent | a01cb05450c6435c9cdca58534ed00eafb07f6eb (diff) | |
| download | build-9604c0680fba667f1f73fa62aea8ff22f9f13689.zip build-9604c0680fba667f1f73fa62aea8ff22f9f13689.tar.gz build-9604c0680fba667f1f73fa62aea8ff22f9f13689.tar.bz2 | |
am a01cb054: am c581e10a: am eca0043b: Merge "Disable canonical prefixes of system headers"
* commit 'a01cb05450c6435c9cdca58534ed00eafb07f6eb':
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 7498ee3..c0be37a 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 85d536b..1472849 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 2a78a50..d882ea6 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 5e50f9f..6515eb5 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 1250767..015d46b 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 2130d03..a7b03b2 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 4f66765..4ebcd93 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 42953ae..ee6c6e2 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 += \ |