summaryrefslogtreecommitdiff
path: root/video_engine/video_engine_core.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-12 00:41:30 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-12 00:41:30 +0000
commit8d9f6d0c63b44c0af134da69275996db811e4d96 (patch)
treeff0ed2922800eb83a50a5a12cfcea20b531184c1 /video_engine/video_engine_core.target.linux-x86.mk
parentf73a18d86a5e341607cbd1e6027cce1ac24fa395 (diff)
downloadwebrtc-8d9f6d0c63b44c0af134da69275996db811e4d96.tar.gz
Update makefiles after merge of Chromium at 256368
This commit was generated by merge_from_chromium.py. Change-Id: I0f7a0813e7decb34749de0d40c44fc51400e54fe
Diffstat (limited to 'video_engine/video_engine_core.target.linux-x86.mk')
-rw-r--r--video_engine/video_engine_core.target.linux-x86.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/video_engine/video_engine_core.target.linux-x86.mk b/video_engine/video_engine_core.target.linux-x86.mk
index a7114e2a..dc4f4021 100644
--- a/video_engine/video_engine_core.target.linux-x86.mk
+++ b/video_engine/video_engine_core.target.linux-x86.mk
@@ -71,11 +71,10 @@ MY_CFLAGS_Debug := \
-fno-builtin-sin \
-fno-builtin-cosf \
-fno-builtin-sinf \
- -m32 \
- -mmmx \
- -march=pentium4 \
-msse2 \
-mfpmath=sse \
+ -mmmx \
+ -m32 \
-fuse-ld=gold \
-ffunction-sections \
-funwind-tables \
@@ -172,11 +171,10 @@ MY_CFLAGS_Release := \
-fno-builtin-sin \
-fno-builtin-cosf \
-fno-builtin-sinf \
- -m32 \
- -mmmx \
- -march=pentium4 \
-msse2 \
-mfpmath=sse \
+ -mmmx \
+ -m32 \
-fuse-ld=gold \
-ffunction-sections \
-funwind-tables \