diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-17 16:07:16 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-17 16:07:16 +0000 |
| commit | c93a21de172e7bb2705a28ac2b20b099d9e31624 (patch) | |
| tree | 3099852cd00440460a48a65546ad2a8b3c6d1177 | |
| parent | f8a586eb11713b140cb3b4431cc8161057973c3f (diff) | |
| download | openssl-c93a21de172e7bb2705a28ac2b20b099d9e31624.tar.gz | |
Update makefiles after merge of Chromium at 271215
This commit was generated by merge_from_chromium.py.
Change-Id: Ia1c4fda8244a3a1c195f81f4d84e0e91b47d6987
| -rw-r--r-- | openssl.target.darwin-arm.mk | 12 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 14 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 2 |
4 files changed, 30 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index 40dbb36..ded746e 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -599,6 +599,12 @@ MY_CFLAGS_Debug := \ -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 \ @@ -707,6 +713,12 @@ MY_CFLAGS_Release := \ -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-arm.mk b/openssl.target.linux-arm.mk index 40dbb36..37dc1d8 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -596,9 +596,16 @@ 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 \ @@ -704,9 +711,16 @@ 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 e8dd5ee..4aea3a2 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-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.linux-x86.mk b/openssl.target.linux-x86.mk index a85252c..2ba6a3b 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-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 \ |