From 89f8b2711b317ccf82f770d76eb56eee57ad9e7a Mon Sep 17 00:00:00 2001
From: Android Chromium Automerger <chromium-automerger@android>
Date: Wed, 15 Jan 2014 12:17:35 +0000
Subject: Update makefiles after merge of Chromium at 244866

This commit was generated by merge_from_chromium.py.

Change-Id: Id89a420be48add92d674dcb271f90744335747b4
---
 ft2.target.linux-x86.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'ft2.target.linux-x86.mk')

diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 36b186f..073c551 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -54,7 +54,6 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-funwind-tables \
 	-Wno-format \
 	-m32 \
 	-mmmx \
@@ -81,7 +80,8 @@ MY_CFLAGS_Debug := \
 	-g \
 	-fomit-frame-pointer \
 	-fdata-sections \
-	-ffunction-sections
+	-ffunction-sections \
+	-funwind-tables
 
 MY_DEFS_Debug := \
 	'-DV8_DEPRECATION_WARNINGS' \
@@ -132,7 +132,6 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
-	-Wno-error=c++0x-compat \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -148,7 +147,6 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-funwind-tables \
 	-Wno-format \
 	-m32 \
 	-mmmx \
@@ -175,7 +173,8 @@ MY_CFLAGS_Release := \
 	-fno-ident \
 	-fdata-sections \
 	-ffunction-sections \
-	-fomit-frame-pointer
+	-fomit-frame-pointer \
+	-funwind-tables
 
 MY_DEFS_Release := \
 	'-DV8_DEPRECATION_WARNINGS' \
@@ -226,7 +225,6 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
-	-Wno-error=c++0x-compat \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
-- 
cgit v1.2.3