From 0af662dfc0f6302c7a89b3ad141079347328a460 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Sat, 17 May 2014 16:07:17 +0000 Subject: Update makefiles after merge of Chromium at 271215 This commit was generated by merge_from_chromium.py. Change-Id: I9f544c8ba5553156a8413c2512153949af8ffa52 --- .../source/cpu_features_android.target.darwin-arm.mk | 12 ++++++++++++ .../source/cpu_features_android.target.linux-arm.mk | 14 ++++++++++++++ .../source/cpu_features_android.target.linux-mips.mk | 2 ++ .../source/cpu_features_android.target.linux-x86.mk | 2 ++ .../source/system_wrappers.target.darwin-arm.mk | 12 ++++++++++++ system_wrappers/source/system_wrappers.target.linux-arm.mk | 14 ++++++++++++++ .../source/system_wrappers.target.linux-mips.mk | 2 ++ system_wrappers/source/system_wrappers.target.linux-x86.mk | 2 ++ 8 files changed, 60 insertions(+) (limited to 'system_wrappers/source') diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk index 8aa16dc0..7a99a174 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk @@ -44,6 +44,12 @@ MY_CFLAGS_Debug := \ -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 \ @@ -150,6 +156,12 @@ MY_CFLAGS_Release := \ -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 \ 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 8aa16dc0..cc26fe5e 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 @@ MY_CFLAGS_Debug := \ -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 \ @@ -145,11 +152,18 @@ MY_CFLAGS_Release := \ -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 \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-mips.mk b/system_wrappers/source/cpu_features_android.target.linux-mips.mk index b99f6dd5..03121126 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-mips.mk @@ -39,6 +39,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -mhard-float \ -fno-builtin-cos \ -fno-builtin-sin \ @@ -145,6 +146,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -mhard-float \ -fno-builtin-cos \ -fno-builtin-sin \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86.mk b/system_wrappers/source/cpu_features_android.target.linux-x86.mk index f96fac3b..0a3a9c6b 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86.mk @@ -38,6 +38,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -141,6 +142,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm.mk b/system_wrappers/source/system_wrappers.target.darwin-arm.mk index 582d8b5b..23547c26 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm.mk @@ -73,6 +73,12 @@ MY_CFLAGS_Debug := \ -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 \ @@ -189,6 +195,12 @@ MY_CFLAGS_Release := \ -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 \ diff --git a/system_wrappers/source/system_wrappers.target.linux-arm.mk b/system_wrappers/source/system_wrappers.target.linux-arm.mk index 582d8b5b..c2058606 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm.mk @@ -68,11 +68,18 @@ MY_CFLAGS_Debug := \ -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 \ @@ -184,11 +191,18 @@ MY_CFLAGS_Release := \ -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 \ diff --git a/system_wrappers/source/system_wrappers.target.linux-mips.mk b/system_wrappers/source/system_wrappers.target.linux-mips.mk index 968c52a7..8267dfeb 100644 --- a/system_wrappers/source/system_wrappers.target.linux-mips.mk +++ b/system_wrappers/source/system_wrappers.target.linux-mips.mk @@ -68,6 +68,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -mhard-float \ -fno-builtin-cos \ -fno-builtin-sin \ @@ -184,6 +185,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -mhard-float \ -fno-builtin-cos \ -fno-builtin-sin \ diff --git a/system_wrappers/source/system_wrappers.target.linux-x86.mk b/system_wrappers/source/system_wrappers.target.linux-x86.mk index c95327f8..5dfc04fc 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86.mk @@ -67,6 +67,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -180,6 +181,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ -- cgit v1.2.3