aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-28 16:21:46 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-28 16:21:46 +0000
commita087262b1da80e39575351587b2372f872352e12 (patch)
tree4a59a48d51cd0e1deb717f81cdd670d10288d344
parent2e5239c21aa9b22a17fc203d2c98c7aac119d6a6 (diff)
downloadots-a087262b1da80e39575351587b2372f872352e12.tar.gz
Update makefiles after merge of Chromium at 273259
This commit was generated by merge_from_chromium.py. Change-Id: I27d8f4a638f5c2ce5cc004c284e92dcba82aa448
-rw-r--r--ots.target.darwin-arm.mk14
-rw-r--r--ots.target.darwin-mips.mk2
-rw-r--r--ots.target.darwin-x86.mk2
-rw-r--r--ots.target.linux-arm.mk14
-rw-r--r--ots.target.linux-mips.mk2
-rw-r--r--ots.target.linux-x86.mk2
6 files changed, 36 insertions, 0 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index 28ae99d..0497125 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -70,7 +70,14 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-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 \
@@ -162,7 +169,14 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-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/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 30a1b2b..ad66761 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -70,6 +70,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-EL \
-mhard-float \
-ffunction-sections \
@@ -162,6 +163,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-EL \
-mhard-float \
-ffunction-sections \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index d4fd8a6..6c3f6bc 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -69,6 +69,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-msse2 \
-mfpmath=sse \
-mmmx \
@@ -161,6 +162,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-msse2 \
-mfpmath=sse \
-mmmx \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 28ae99d..0497125 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -70,7 +70,14 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-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 \
@@ -162,7 +169,14 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-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/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 30a1b2b..ad66761 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -70,6 +70,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-EL \
-mhard-float \
-ffunction-sections \
@@ -162,6 +163,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-EL \
-mhard-float \
-ffunction-sections \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index d4fd8a6..6c3f6bc 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -69,6 +69,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-msse2 \
-mfpmath=sse \
-mmmx \
@@ -161,6 +162,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-msse2 \
-mfpmath=sse \
-mmmx \