commit 25992421df4a9691df5b08735a4086fe3c184b9e
author Android Chromium Automerger <chromium-automerger@android> Wed Aug 27 15:43:29 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Wed Aug 27 15:43:29 2014 +0000
tree 9ef4c44f99d210c7ba16e9d94065b0443d12a109
parent a0b1f89789427ae9d0b0fb8025b7569c6b456a3b

Update makefiles after merge of Chromium at b241671f0248

This commit was generated by merge_from_chromium.py.

Change-Id: Ibf139c6f0ca023537cf1ef8c1b5418564da06ddc

ots.target.darwin-mips.mk

diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index ce45601..b50922b 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -73,8 +73,6 @@
 	-pipe \
 	-fPIC \
 	-Wno-unused-local-typedefs \
-	-EL \
-	-mhard-float \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -170,8 +168,6 @@
 	-pipe \
 	-fPIC \
 	-Wno-unused-local-typedefs \
-	-EL \
-	-mhard-float \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -266,7 +262,6 @@
 	-Wl,--fatal-warnings \
 	-Wl,-z,noexecstack \
 	-fPIC \
-	-EL \
 	-Wl,--no-keep-memory \
 	-nostdlib \
 	-Wl,--no-undefined \
@@ -282,7 +277,6 @@
 	-Wl,--fatal-warnings \
 	-Wl,-z,noexecstack \
 	-fPIC \
-	-EL \
 	-Wl,--no-keep-memory \
 	-nostdlib \
 	-Wl,--no-undefined \

ots.target.linux-mips.mk

diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index ce45601..b50922b 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -73,8 +73,6 @@
 	-pipe \
 	-fPIC \
 	-Wno-unused-local-typedefs \
-	-EL \
-	-mhard-float \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -170,8 +168,6 @@
 	-pipe \
 	-fPIC \
 	-Wno-unused-local-typedefs \
-	-EL \
-	-mhard-float \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -266,7 +262,6 @@
 	-Wl,--fatal-warnings \
 	-Wl,-z,noexecstack \
 	-fPIC \
-	-EL \
 	-Wl,--no-keep-memory \
 	-nostdlib \
 	-Wl,--no-undefined \
@@ -282,7 +277,6 @@
 	-Wl,--fatal-warnings \
 	-Wl,-z,noexecstack \
 	-fPIC \
-	-EL \
 	-Wl,--no-keep-memory \
 	-nostdlib \
 	-Wl,--no-undefined \