summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-28 16:21:43 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-28 16:21:43 +0000
commit0f774d123b76a767714e46dd82049af5478155ce (patch)
treeedcdc52a33eb0fd2cbee66b62773c3596bf003f9
parentf11f3deadfb2209b4210e5f1c6abe67d30044f6a (diff)
downloadfreetype-0f774d123b76a767714e46dd82049af5478155ce.tar.gz
Update makefiles after merge of Chromium at 273259
This commit was generated by merge_from_chromium.py. Change-Id: I31ef589bfc7198ea151adf1b24e3f46f4357b40f
-rw-r--r--ft2.target.darwin-arm.mk14
-rw-r--r--ft2.target.darwin-mips.mk2
-rw-r--r--ft2.target.darwin-x86.mk2
-rw-r--r--ft2.target.linux-arm.mk14
-rw-r--r--ft2.target.linux-mips.mk2
-rw-r--r--ft2.target.linux-x86.mk2
6 files changed, 36 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 3e97831..bc4479f 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-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 \
@@ -156,8 +163,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.darwin-mips.mk b/ft2.target.darwin-mips.mk
index bd50851..1cf3d82 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -57,6 +57,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-Wno-format \
-EL \
-mhard-float \
@@ -158,6 +159,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-Wno-format \
-EL \
-mhard-float \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 5011c7b..4cc5972 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -55,6 +55,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-Wno-format \
-msse2 \
-mfpmath=sse \
@@ -155,6 +156,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-Wno-format \
-msse2 \
-mfpmath=sse \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 3e97831..bc4479f 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 \
@@ -156,8 +163,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 bd50851..1cf3d82 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 \
@@ -158,6 +159,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 5011c7b..4cc5972 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 \
@@ -155,6 +156,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-Wno-format \
-msse2 \
-mfpmath=sse \