From 357c87a5302c5d7c02c10870ebe7a78652807497 Mon Sep 17 00:00:00 2001
From: Android Chromium Automerger <chromium-automerger@android>
Date: Fri, 17 Jan 2014 04:23:28 +0000
Subject: Update makefiles after merge of Chromium at 245421

This commit was generated by merge_from_chromium.py.

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

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

diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 073c551..01244e5 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -80,8 +80,7 @@ MY_CFLAGS_Debug := \
 	-g \
 	-fomit-frame-pointer \
 	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
+	-ffunction-sections
 
 MY_DEFS_Debug := \
 	'-DV8_DEPRECATION_WARNINGS' \
@@ -174,7 +173,8 @@ MY_CFLAGS_Release := \
 	-fdata-sections \
 	-ffunction-sections \
 	-fomit-frame-pointer \
-	-funwind-tables
+	-fno-unwind-tables \
+	-fno-asynchronous-unwind-tables
 
 MY_DEFS_Release := \
 	'-DV8_DEPRECATION_WARNINGS' \
-- 
cgit v1.2.3