summaryrefslogtreecommitdiff
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
commit2c5d9565273f7364d4c0cac90b982c95138e7f70 (patch)
tree7fa38969d3799424b5f07dbfc434d527887dffd9
parent219fa3e5a7cb53654e37b3fbff3a65bef99f00b0 (diff)
downloadopenssl-2c5d9565273f7364d4c0cac90b982c95138e7f70.tar.gz
Update makefiles after merge of Chromium at 272566
This commit was generated by merge_from_chromium.py. Change-Id: I603785ed9a59ee61de5c1bc8b8b6ae1c121c6f25
-rw-r--r--openssl.target.darwin-arm.mk2
-rw-r--r--openssl.target.darwin-arm64.mk2
-rw-r--r--openssl.target.darwin-mips.mk2
-rw-r--r--openssl.target.darwin-x86.mk2
-rw-r--r--openssl.target.darwin-x86_64.mk2
5 files changed, 10 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index ded746e..37dc1d8 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -596,6 +596,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-fno-tree-sra \
@@ -710,6 +711,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-fno-tree-sra \
diff --git a/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk
index a82422c..44ad10f 100644
--- a/openssl.target.darwin-arm64.mk
+++ b/openssl.target.darwin-arm64.mk
@@ -586,6 +586,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-ffunction-sections \
@@ -683,6 +684,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-ffunction-sections \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index e8dd5ee..4aea3a2 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -591,6 +591,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-EL \
@@ -697,6 +698,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-EL \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index a85252c..2ba6a3b 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -595,6 +595,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-msse2 \
@@ -709,6 +710,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-msse2 \
diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk
index 2fbab7a..abea39a 100644
--- a/openssl.target.darwin-x86_64.mk
+++ b/openssl.target.darwin-x86_64.mk
@@ -599,6 +599,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-m64 \
@@ -712,6 +713,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-w \
-Wno-format \
-m64 \