Extend the patch

This commit is contained in:
Mikhail Novosyolov 2018-10-21 19:04:36 +03:00
parent e8130572c8
commit 9cd832f8e9

View file

@ -7,6 +7,8 @@ I did not understand why the gold linker was disallowed on Linux, it was allowed
After commit https://chromium.googlesource.com/chromium/src/+/dd160677bc6cd8a5ab468c187f61902a8fbf4b41%5E%21 After commit https://chromium.googlesource.com/chromium/src/+/dd160677bc6cd8a5ab468c187f61902a8fbf4b41%5E%21
use_lld was forced to True on x86_64 even if use_gold was True. On i586 gold was used correctly. Trying to workaround it. use_lld was forced to True on x86_64 even if use_gold was True. On i586 gold was used correctly. Trying to workaround it.
this patch temporarily breaks building with use+ldd=true because it forces use_ldd=false and use_gold=true.
Author: Mikhail Novosyolov <m.novosyolov@rosalinux.ru> Author: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
--- a/build/config/compiler/BUILD.gn 2018-10-20 12:45:09.760295019 +0300 --- a/build/config/compiler/BUILD.gn 2018-10-20 12:45:09.760295019 +0300
+++ b/build/config/compiler/BUILD.gn 2018-10-20 12:51:07.536125696 +0300 +++ b/build/config/compiler/BUILD.gn 2018-10-20 12:51:07.536125696 +0300
@ -22,7 +24,20 @@ Author: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
--- a/build/config/compiler/compiler.gni 2018-10-21 02:15:50.290369454 +0300 --- 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 +++ b/build/config/compiler/compiler.gni 2018-10-21 12:38:18.521273343 +0300
@@ -157,30 +157,6 @@ @@ -63,6 +63,12 @@
# It's currently not possible to collect AFDO profiles on anything but
# x86{,_64}.
using_mismatched_sample_profile = current_cpu != "x64" && current_cpu != "x86"
+
+ # ROSA-allow-Gold-on-Linux.patch patches out some code for setting these variables,
+ # so we have to set them manually
+ use_lld = false
+ use_gold = true
+
}
assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
@@ -157,30 +163,6 @@
} }
} }