From b728310ae7c2fb8f15365b547f5ad014c766d0ff Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
 <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 8 Aug 2014 20:53:34 +0000
Subject: [PATCH] clang supports -fuse-ld these days, remove a few special
 cases.

This is shorter, and it allows us to remove two trampoline files on Android
(which still weren't updated to trampoline to the 4.8 toolchain and still
referred to the 4.6 toolchain instead).

No intended visible behavior change.

BUG=none

Review URL: https://codereview.chromium.org/450843002

Cr-Commit-Position: refs/heads/master@{#288424}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288424 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../arm-linux-androideabi-ld                       |  1 -
 build/android/arm-linux-androideabi-gold/ld        |  1 -
 build/common.gypi                                  | 38 ++++------------------
 3 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 120000 build/android/arm-linux-androideabi-gold/arm-linux-androideabi-ld
 delete mode 120000 build/android/arm-linux-androideabi-gold/ld

diff --git a/build/android/arm-linux-androideabi-gold/arm-linux-androideabi-ld b/build/android/arm-linux-androideabi-gold/arm-linux-androideabi-ld
deleted file mode 120000
index 5b178e9f4215..000000000000
--- a/build/android/arm-linux-androideabi-gold/arm-linux-androideabi-ld
+++ /dev/null
@@ -1 +0,0 @@
-../../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ld.gold
\ No newline at end of file
diff --git a/build/android/arm-linux-androideabi-gold/ld b/build/android/arm-linux-androideabi-gold/ld
deleted file mode 120000
index 2366ddac0694..000000000000
--- a/build/android/arm-linux-androideabi-gold/ld
+++ /dev/null
@@ -1 +0,0 @@
-../../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/arm-linux-androideabi/bin/ld.gold
\ No newline at end of file
diff --git a/build/common.gypi b/build/common.gypi
index 79d3f986192b..6611eac67eb7 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3805,15 +3805,9 @@
                           '-no-integrated-as',
                           '-B<(android_toolchain)',  # Else /usr/bin/as gets picked up.
                         ],
-
-                        'ldflags!': [
-                          # Clang does not support the following options.
-                          '-fuse-ld=gold',
-                        ],
                         'ldflags': [
-                          # As long as -fuse-ld=gold doesn't work, add a dummy directory
-                          # with an 'ld' that redirects to gold, so that clang uses gold.
-                          '-B<!(cd <(DEPTH) && pwd -P)/build/android/arm-linux-androideabi-gold',
+                          # Let clang can find the ld.gold in the NDK.
+                          '--gcc-toolchain=<(android_toolchain)/..',
                         ],
                       }],
                       ['asan==1', {
@@ -4182,6 +4176,11 @@
             'defines': ['NO_TCMALLOC'],
           }],
           ['linux_use_gold_flags==1', {
+            # Newer gccs and clangs support -fuse-ld, use the flag to force gold
+            # selection.
+            # gcc -- http://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/Optimize-Options.html
+            'ldflags': [ '-fuse-ld=gold', ],
+
             'target_conditions': [
               ['_toolset=="target"', {
                 'ldflags': [
@@ -4212,29 +4211,6 @@
                   }],
                 ],
               }],
-              # Newer gcc's support -fuse-ld, use the flag to force gold
-              # selection.
-              # gcc -- http://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/Optimize-Options.html
-              # TODO(mithro): Watch for clang support at following thread:
-              # http://clang-developers.42468.n3.nabble.com/Adding-fuse-ld-support-to-clang-td4032180.html
-              ['gcc_version>=48 and clang==0', {
-                'target_conditions': [
-                  ['_toolset=="target"', {
-                    'ldflags': [
-                      '-fuse-ld=gold',
-                    ],
-                  }],
-                ],
-              }],
-              ['host_gcc_version>=48 and clang==0', {
-                'target_conditions': [
-                  ['_toolset=="host"', {
-                    'ldflags': [
-                      '-fuse-ld=gold',
-                    ],
-                  }],
-                ],
-              }],
             ],
           }],
           ['linux_use_bundled_binutils==1', {
-- 
2.11.4.GIT