summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-09-09 14:33:18 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-09-09 14:33:18 +0000
commit2ae2275db3a454962205bf35360a47772112b4dd (patch)
tree471eadd6ff6e48c1df48e21a22cfa4c176630be9
parent542a308b6de6234b8daae90678ac44f476eab03a (diff)
downloadfreetype-2ae2275db3a454962205bf35360a47772112b4dd.tar.gz
Update makefiles after merge of Chromium at facf66e09bf8
This commit was generated by merge_from_chromium.py. Change-Id: I3207699a55bc2ee055d4a31aabd92f6bd70a3ab6
-rw-r--r--ft2.target.darwin-arm.mk10
-rw-r--r--ft2.target.linux-arm.mk10
2 files changed, 20 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index aaccc04..217c56b 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -61,6 +61,11 @@ MY_CFLAGS_Debug := \
-fno-tree-sra \
-fno-caller-saves \
-Wno-psabi \
+ -fno-partial-inlining \
+ -fno-early-inlining \
+ -fno-tree-copy-prop \
+ -fno-tree-loop-optimize \
+ -fno-move-loop-invariants \
-ffunction-sections \
-funwind-tables \
-g \
@@ -167,6 +172,11 @@ MY_CFLAGS_Release := \
-fno-tree-sra \
-fno-caller-saves \
-Wno-psabi \
+ -fno-partial-inlining \
+ -fno-early-inlining \
+ -fno-tree-copy-prop \
+ -fno-tree-loop-optimize \
+ -fno-move-loop-invariants \
-ffunction-sections \
-funwind-tables \
-g \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index aaccc04..217c56b 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -61,6 +61,11 @@ MY_CFLAGS_Debug := \
-fno-tree-sra \
-fno-caller-saves \
-Wno-psabi \
+ -fno-partial-inlining \
+ -fno-early-inlining \
+ -fno-tree-copy-prop \
+ -fno-tree-loop-optimize \
+ -fno-move-loop-invariants \
-ffunction-sections \
-funwind-tables \
-g \
@@ -167,6 +172,11 @@ MY_CFLAGS_Release := \
-fno-tree-sra \
-fno-caller-saves \
-Wno-psabi \
+ -fno-partial-inlining \
+ -fno-early-inlining \
+ -fno-tree-copy-prop \
+ -fno-tree-loop-optimize \
+ -fno-move-loop-invariants \
-ffunction-sections \
-funwind-tables \
-g \