summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-28 10:52:15 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-28 10:52:15 +0000
commit2d9279cf313b68fe51972847465e06c260145b57 (patch)
treea4e7f48a3782ed262181dd1d75e6b07f7e5a25d0
parent10e6603e7b70090b036db7e312d272133ad18bba (diff)
downloadopenssl-2d9279cf313b68fe51972847465e06c260145b57.tar.gz
Update makefiles after merge of Chromium at 273188
This commit was generated by merge_from_chromium.py. Change-Id: Ie3a9204508f6411017ab2228f9faed772f58b08e
-rw-r--r--openssl.target.darwin-arm.mk14
-rw-r--r--openssl.target.darwin-mips.mk2
-rw-r--r--openssl.target.darwin-x86.mk2
-rw-r--r--openssl.target.linux-arm.mk14
-rw-r--r--openssl.target.linux-mips.mk2
-rw-r--r--openssl.target.linux-x86.mk2
6 files changed, 0 insertions, 36 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 38cfe62..cc657a3 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -596,16 +596,9 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-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 \
@@ -712,16 +705,9 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-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/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index aef592a..49f6837 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -591,7 +591,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-EL \
@@ -699,7 +698,6 @@ 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 c7ff427..1cbef4e 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -595,7 +595,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-msse2 \
@@ -711,7 +710,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-msse2 \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 38cfe62..cc657a3 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -596,16 +596,9 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-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 \
@@ -712,16 +705,9 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-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/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index aef592a..49f6837 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -591,7 +591,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-EL \
@@ -699,7 +698,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-EL \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index c7ff427..1cbef4e 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -595,7 +595,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-msse2 \
@@ -711,7 +710,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-w \
-Wno-format \
-msse2 \