commit c2be68e4f688f61ea5c23183b8eaeb4e34aa1c56
author Chih-Hung Hsieh <chh@google.com> Fri May 29 20:16:23 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 29 20:16:23 2015 +0000
tree c687c4379671966f7bfb2e58aee5b0c25c87e4e8
parent 6106f320d3cf4b76774046faf2d843c5b13db593
parent 128d51e67ec3a77c3bf190f13d7068e36d014b31

Merge "Remove gcc 4.9 workaround."

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 482889d..f6dbcb8 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -97,10 +97,6 @@
 			-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!

core/combo/TARGET_linux-x86_64.mk

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index c705b95..7b9cd7b 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -93,10 +93,6 @@
 			-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 \