diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-05-29 10:23:15 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2015-05-29 10:27:58 -0700 |
| commit | ad2494bb79932c4f2fd55f51e9b0d58676502558 (patch) | |
| tree | 35e851eb31e4c52f2bacd4d09df17775d6cb7ef7 | |
| parent | bdbf074186275fcfbe90293fc1da26da837fd32d (diff) | |
| download | build-ad2494bb79932c4f2fd55f51e9b0d58676502558.zip build-ad2494bb79932c4f2fd55f51e9b0d58676502558.tar.gz build-ad2494bb79932c4f2fd55f51e9b0d58676502558.tar.bz2 | |
Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.
BUG: 19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86_64.mk | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 958885c..340f306 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -97,10 +97,6 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ -include $(android_config_h) \ -I $(dir $(android_config_h)) -# Work around gcc 4.9 devirtualization bug, https://b.corp.google.com/19872411. -$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ - -fno-devirtualize \ - $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) ifeq ($(ARCH_X86_HAVE_SSSE3),true) # yes, really SSSE3, not SSE3! diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index adc690a..53b0572 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -93,10 +93,6 @@ TARGET_GLOBAL_CFLAGS += \ -no-canonical-prefixes \ -fno-canonical-system-headers -# Work around gcc 4.9 devirtualization bug, https://b.corp.google.com/19872411. -TARGET_GLOBAL_CFLAGS += \ - -fno-devirtualize \ - # Help catch common 32/64-bit errors. TARGET_GLOBAL_CFLAGS += \ -Werror=pointer-to-int-cast \ |