diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-28 16:21:46 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-28 16:21:46 +0000 |
| commit | 21ed393e0da597351a61be6df6134983fbe47ffe (patch) | |
| tree | 6ead13b5f66beae3acb85d1ad2f840fcc3bb9331 | |
| parent | 2d9279cf313b68fe51972847465e06c260145b57 (diff) | |
| download | openssl-21ed393e0da597351a61be6df6134983fbe47ffe.tar.gz | |
Update makefiles after merge of Chromium at 273259
This commit was generated by merge_from_chromium.py.
Change-Id: I73f86dcabcffd8a051c4887968233a214bf2c426
| -rw-r--r-- | openssl.target.darwin-arm.mk | 14 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 2 | ||||
| -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 |
6 files changed, 36 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index cc657a3..38cfe62 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-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 \ @@ -705,9 +712,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.darwin-mips.mk b/openssl.target.darwin-mips.mk index 49f6837..aef592a 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 \ @@ -698,6 +699,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 1cbef4e..c7ff427 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 \ @@ -710,6 +711,7 @@ 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 cc657a3..38cfe62 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 \ @@ -705,9 +712,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 49f6837..aef592a 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 \ @@ -698,6 +699,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 1cbef4e..c7ff427 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 \ @@ -710,6 +711,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -w \ -Wno-format \ -msse2 \ |