From 986ff784656ffcbc180d3126df19dd2620450597 Mon Sep 17 00:00:00 2001
From: Android Chromium Automerger <chromium-automerger@android>
Date: Sat, 17 May 2014 16:07:13 +0000
Subject: Update makefiles after merge of Chromium at 271215

This commit was generated by merge_from_chromium.py.

Change-Id: Ieed7eba8054c911c9364db9566add72bd64c20e3
---
 ft2.target.linux-arm.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 4c397d6..f4ed6c9 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -56,8 +56,15 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-fno-tree-sra \
+	-fno-partial-inlining \
+	-fno-early-inlining \
+	-fno-tree-copy-prop \
+	-fno-tree-loop-optimize \
+	-fno-move-loop-invariants \
+	-fno-caller-saves \
 	-Wno-psabi \
 	-ffunction-sections \
 	-funwind-tables \
@@ -155,8 +162,15 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-fno-tree-sra \
+	-fno-partial-inlining \
+	-fno-early-inlining \
+	-fno-tree-copy-prop \
+	-fno-tree-loop-optimize \
+	-fno-move-loop-invariants \
+	-fno-caller-saves \
 	-Wno-psabi \
 	-ffunction-sections \
 	-funwind-tables \
-- 
cgit v1.2.3