summaryrefslogtreecommitdiff
path: root/ft2.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-12 00:41:29 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-12 00:41:29 +0000
commitb2a4be12f8f7ef9305e20e0d3b19c3fce4441f3c (patch)
tree052074064f3adcde678b2da3faf93f7b6725e37a /ft2.target.linux-x86.mk
parent4222ef4684afde38d583e2a7881a547ac4ccfa37 (diff)
downloadfreetype-b2a4be12f8f7ef9305e20e0d3b19c3fce4441f3c.tar.gz
Update makefiles after merge of Chromium at 256368
This commit was generated by merge_from_chromium.py. Change-Id: Iefd4afa427efbe6ff509435510f716a1c76797c9
Diffstat (limited to 'ft2.target.linux-x86.mk')
-rw-r--r--ft2.target.linux-x86.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 512514f..3eadd67 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -55,11 +55,10 @@ MY_CFLAGS_Debug := \
-pipe \
-fPIC \
-Wno-format \
- -m32 \
- -mmmx \
- -march=pentium4 \
-msse2 \
-mfpmath=sse \
+ -mmmx \
+ -m32 \
-fuse-ld=gold \
-ffunction-sections \
-funwind-tables \
@@ -151,11 +150,10 @@ MY_CFLAGS_Release := \
-pipe \
-fPIC \
-Wno-format \
- -m32 \
- -mmmx \
- -march=pentium4 \
-msse2 \
-mfpmath=sse \
+ -mmmx \
+ -m32 \
-fuse-ld=gold \
-ffunction-sections \
-funwind-tables \