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