Update makefiles after merge of Chromium at 273259
This commit was generated by merge_from_chromium.py.
Change-Id: I70bf922138e2eb64db46440251a820768624f64a
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
index 57adc7c..0fc7465 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
@@ -39,11 +39,18 @@
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-fno-builtin-cos \
-fno-builtin-sin \
-fno-builtin-cosf \
-fno-builtin-sinf \
-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 \
@@ -146,11 +153,18 @@
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-fno-builtin-cos \
-fno-builtin-sin \
-fno-builtin-cosf \
-fno-builtin-sinf \
-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 \