Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: Ibbdacaa5ebd98eaa7b02ddc357305bf149ce8e90
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index ffd468f..f70b0d6 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -254,7 +254,6 @@
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
- -Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index cf64579..7bd55fb 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -252,7 +252,6 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index d079e99..14cb473 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -252,7 +252,6 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index ca12b3a..5bb870b 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -252,7 +252,6 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index ffd468f..f70b0d6 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -254,7 +254,6 @@
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
- -Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index cf64579..7bd55fb 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -252,7 +252,6 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index d079e99..14cb473 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -252,7 +252,6 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index ca12b3a..5bb870b 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -252,7 +252,6 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed