diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-17 16:07:13 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-17 16:07:13 +0000 |
| commit | 986ff784656ffcbc180d3126df19dd2620450597 (patch) | |
| tree | 3934704ac28e30f39b368b3986f339c132850639 | |
| parent | b24fe9f4fffcbeaaa54410dec01e9598dbaf9066 (diff) | |
| download | freetype-986ff784656ffcbc180d3126df19dd2620450597.tar.gz | |
Update makefiles after merge of Chromium at 271215
This commit was generated by merge_from_chromium.py.
Change-Id: Ieed7eba8054c911c9364db9566add72bd64c20e3
| -rw-r--r-- | ft2.target.darwin-arm.mk | 12 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 14 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 |
4 files changed, 30 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 4c397d6..1e2c746 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -58,6 +58,12 @@ MY_CFLAGS_Debug := \ -fPIC \ -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 \ @@ -157,6 +163,12 @@ MY_CFLAGS_Release := \ -fPIC \ -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/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 4c397d6..f4ed6c9 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -56,8 +56,15 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -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 \ @@ -155,8 +162,15 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -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/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index a3ad32b..3349c05 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -57,6 +57,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -EL \ -mhard-float \ @@ -157,6 +158,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -EL \ -mhard-float \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 5ddff96..2a8654e 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -55,6 +55,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -msse2 \ -mfpmath=sse \ @@ -154,6 +155,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -msse2 \ -mfpmath=sse \ |