From ad2494bb79932c4f2fd55f51e9b0d58676502558 Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Fri, 29 May 2015 10:23:15 -0700
Subject: [PATCH] Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.
BUG: 19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
---
core/combo/TARGET_linux-x86.mk | 4 ----
core/combo/TARGET_linux-x86_64.mk | 4 ----
2 files changed, 8 deletions(-)
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 958885cd4..340f3067a 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 adc690a8e..53b0572cf 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 \