clang supports -fuse-ld these days, remove a few special cases.

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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=288424

[Nico, 2014-08-08 17:32:57]

I build base in components mode with OS=android and re-ran the link line with
-v. This is the start link line before this change:

/usr/local/google/home/thakis/src/chrome/src/build/android/arm-linux-androideabi-gold/arm-linux-androideabi-ld

With this change:

/usr/local/google/home/thakis/src/chrome/src/third_party/android_tools/ndk//toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld.gold

The new path is a bit convoluted, but it's the right binary.

(I wonder if we should use "our" bundled gold when targeting android – probably
doesn't matter all that much.)

[Nico, 2014-08-08 17:34:39]

*I built base…


On Fri, Aug 8, 2014 at 10:32 AM, <thakis@chromium.org> wrote:

> Reviewers: hans,
>
> Message:
> I build base in components mode with OS=android and re-ran the link line
> with
> -v. This is the start link line before this change:
>
> /usr/local/google/home/thakis/src/chrome/src/build/android/
> arm-linux-androideabi-gold/arm-linux-androideabi-ld
>
> With this change:
>
> /usr/local/google/home/thakis/src/chrome/src/third_party/
> android_tools/ndk//toolchains/arm-linux-androideabi-4.8/
> prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/
> 4.8/../../../../arm-linux-androideabi/bin/ld.gold
>
> The new path is a bit convoluted, but it's the right binary.
>
> (I wonder if we should use "our" bundled gold when targeting android -
> probably
> doesn't matter all that much.)
>
> Description:
> 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
>
> Please review this at https://codereview.chromium.org/450843002/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files (+7, -33 lines):
>   D build/android/arm-linux-androideabi-gold/arm-linux-androideabi-ld
>   D build/android/arm-linux-androideabi-gold/ld
>   M build/common.gypi
>
>
> Index: build/android/arm-linux-androideabi-gold/arm-linux-androideabi-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 5b178e9f42157b264787ffa42b4f115937a8e234..
> 0000000000000000000000000000000000000000
> --- 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
> Index: build/android/arm-linux-androideabi-gold/ld
> diff --git a/build/android/arm-linux-androideabi-gold/ld
> b/build/android/arm-linux-androideabi-gold/ld
> deleted file mode 120000
> index 2366ddac0694de18b32cf93addfdeb32a05d521d..
> 0000000000000000000000000000000000000000
> --- 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
> Index: build/common.gypi
> diff --git a/build/common.gypi b/build/common.gypi
> index 79d3f986192bbaf837dd0ca5cf28c76735f82604..
> 6611eac67eb7861fb85baaeabaf9cae6e054913e 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', {
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[hans, 2014-08-08 17:41:23]

lgtm

[Nico, 2014-08-08 18:28:09]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2014-08-08 18:29:10]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thakis@chromium.org/450843002/20001

[commit-bot: I haz the power, 2014-08-08 20:53:41]

Change committed as 288424