From 9fa748bfefc495a63b522414e449aa8891d29909 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sun, 21 Oct 2018 17:14:39 +0300 Subject: [PATCH] Extend the patch --- ROSA-allow-Gold-on-Linux.patch | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/ROSA-allow-Gold-on-Linux.patch b/ROSA-allow-Gold-on-Linux.patch index 8a400a9..011f886 100644 --- a/ROSA-allow-Gold-on-Linux.patch +++ b/ROSA-allow-Gold-on-Linux.patch @@ -22,10 +22,11 @@ Author: Mikhail Novosyolov --- a/build/config/compiler/compiler.gni 2018-10-21 02:15:50.290369454 +0300 +++ b/build/config/compiler/compiler.gni 2018-10-21 12:38:18.521273343 +0300 -@@ -158,19 +158,6 @@ +@@ -157,30 +157,6 @@ + } } - declare_args() { +-declare_args() { - # Set to true to use lld, the LLVM linker. This flag may be used on Windows, - # Linux or Fuchsia. - # TODO(pcc): Enable lld on more architectures on Linux. E.g. we probably need @@ -39,6 +40,18 @@ Author: Mikhail Novosyolov -} - -declare_args() { - # Whether to use the gold linker from binutils instead of lld or bfd. - use_gold = !use_lld && !(is_chromecast && is_linux && - (current_cpu == "arm" || current_cpu == "mipsel")) && +- # Whether to use the gold linker from binutils instead of lld or bfd. +- use_gold = !use_lld && !(is_chromecast && is_linux && +- (current_cpu == "arm" || current_cpu == "mipsel")) && +- ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || +- current_cpu == "arm" || current_cpu == "mipsel" || +- current_cpu == "mips64el")) || +- (is_android && (current_cpu == "x86" || current_cpu == "x64" || +- current_cpu == "arm" || current_cpu == "arm64"))) +-} +- + # If it wasn't manually set, set to an appropriate default. + assert(symbol_level >= -1 && symbol_level <= 2, "Invalid symbol_level") + if (symbol_level == -1) { + +