Update makefiles after merge of Chromium at 275661
This commit was generated by merge_from_chromium.py.
Change-Id: Id7615ee9114cf880afa900f7f3fe6e40ed88139a
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index f4ed6c9..c4bc3be 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -274,7 +274,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -292,7 +291,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk
index 0cdcfb4..e4711e5 100644
--- a/ft2.target.darwin-arm64.mk
+++ b/ft2.target.darwin-arm64.mk
@@ -249,7 +249,6 @@
-fPIC \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -263,7 +262,6 @@
-fPIC \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 3349c05..9f75298 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -263,7 +263,6 @@
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -279,7 +278,6 @@
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 2a8654e..54d579f 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -261,7 +261,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -277,7 +276,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index 8725fcc..0595702 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -259,7 +259,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -275,7 +274,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index f4ed6c9..c4bc3be 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -274,7 +274,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -292,7 +291,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index 0cdcfb4..e4711e5 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -249,7 +249,6 @@
-fPIC \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -263,7 +262,6 @@
-fPIC \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 3349c05..9f75298 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -263,7 +263,6 @@
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -279,7 +278,6 @@
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 2a8654e..54d579f 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -261,7 +261,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -277,7 +276,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index 8725fcc..0595702 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -259,7 +259,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -275,7 +274,6 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \