aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-23 18:41:03 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-23 18:41:03 +0000
commitf5da723444ae62fd5e5ce3ca7bbd1dc725ee3d75 (patch)
tree83e3c0c9e300bcc05e6381e21fe235ea36c8c495
parent4ea4dcb4f4632fefb127460e457eb089bc5c05f9 (diff)
downloadots-f5da723444ae62fd5e5ce3ca7bbd1dc725ee3d75.tar.gz
Update makefiles after merge of Chromium at 272566
This commit was generated by merge_from_chromium.py. Change-Id: I09705b413bab8fca79894f18ad8292dc7b89969d
-rw-r--r--ots.target.darwin-arm.mk2
-rw-r--r--ots.target.darwin-arm64.mk2
-rw-r--r--ots.target.darwin-mips.mk2
-rw-r--r--ots.target.darwin-x86.mk2
-rw-r--r--ots.target.darwin-x86_64.mk2
5 files changed, 10 insertions, 0 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index b5d9f93..786eea3 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -70,6 +70,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-fno-tree-sra \
-fno-partial-inlining \
-fno-early-inlining \
@@ -167,6 +168,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-fno-tree-sra \
-fno-partial-inlining \
-fno-early-inlining \
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index 945d54b..cca2770 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -69,6 +69,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-ffunction-sections \
-funwind-tables \
-g \
@@ -155,6 +156,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-ffunction-sections \
-funwind-tables \
-g \
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index c27e3a0..3e8fd53 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 \
@@ -161,6 +162,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 45d4188..b4301ab 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 \
@@ -160,6 +161,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-msse2 \
-mfpmath=sse \
-mmmx \
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index f7156c4..e5f8ee5 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -70,6 +70,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-m64 \
-march=x86-64 \
-ffunction-sections \
@@ -160,6 +161,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-m64 \
-march=x86-64 \
-ffunction-sections \