summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAndrew Pinski <apinski@marvell.com>2021-09-18 01:08:17 +0000
committerAndrew Pinski <apinski@marvell.com>2021-09-19 17:29:36 +0000
commit68aace4458364fee201889aaaedfce59beb972f2 (patch)
treeb8443f16a9cb5371eb5621fa0af4b9e150ca6612 /config
parentMinor cleanups to forward threader. (diff)
downloadgcc-68aace4458364fee201889aaaedfce59beb972f2.tar.gz
gcc-68aace4458364fee201889aaaedfce59beb972f2.tar.bz2
gcc-68aace4458364fee201889aaaedfce59beb972f2.tar.xz
Fix PR bootstrap/102389: --with-build-config=bootstrap-lto is broken
So the problem here is that now the lto-plugin requires NM that works with LTO to work so we need to pass down NM just like we do for ranlib and ar. OK? Bootstrapped and tested with --with-build-config=bootstrap-lto on aarch64-linux-gnu. Note you need to use binutils 2.35 or later too due to ttps://sourceware.org/PR25355 (I will submit another patch to improve the installation instructions too). config/ChangeLog: PR bootstrap/102389 * bootstrap-lto-lean.mk: Handle NM like RANLIB AND AR. * bootstrap-lto.mk: Likewise.
Diffstat (limited to 'config')
-rw-r--r--config/bootstrap-lto-lean.mk6
-rw-r--r--config/bootstrap-lto.mk6
2 files changed, 8 insertions, 4 deletions
diff --git a/config/bootstrap-lto-lean.mk b/config/bootstrap-lto-lean.mk
index 79cea50a4c6..42cb3394c70 100644
--- a/config/bootstrap-lto-lean.mk
+++ b/config/bootstrap-lto-lean.mk
@@ -9,9 +9,11 @@ STAGEfeedback_CFLAGS += -flto=jobserver
9# assumes the host supports the linker plugin 9# assumes the host supports the linker plugin
10LTO_AR = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ar$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ 10LTO_AR = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ar$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/
11LTO_RANLIB = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ranlib$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ 11LTO_RANLIB = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ranlib$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/
12LTO_NM = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-nm$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/
12 13
13LTO_EXPORTS = AR="$(LTO_AR)"; export AR; \ 14LTO_EXPORTS = AR="$(LTO_AR)"; export AR; \
14 RANLIB="$(LTO_RANLIB)"; export RANLIB; 15 RANLIB="$(LTO_RANLIB)"; export RANLIB; \
15LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)" 16 NM="$(LTO_NM)"; export NM;
17LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)" NM="$(LTO_NM)"
16 18
17do-compare = /bin/true 19do-compare = /bin/true
diff --git a/config/bootstrap-lto.mk b/config/bootstrap-lto.mk
index 4de07e5b226..1ddb1d870ba 100644
--- a/config/bootstrap-lto.mk
+++ b/config/bootstrap-lto.mk
@@ -9,10 +9,12 @@ STAGEfeedback_CFLAGS += -flto=jobserver -frandom-seed=1
9# assumes the host supports the linker plugin 9# assumes the host supports the linker plugin
10LTO_AR = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ar$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ 10LTO_AR = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ar$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/
11LTO_RANLIB = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ranlib$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ 11LTO_RANLIB = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ranlib$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/
12LTO_NM = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-nm$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/
12 13
13LTO_EXPORTS = AR="$(LTO_AR)"; export AR; \ 14LTO_EXPORTS = AR="$(LTO_AR)"; export AR; \
14 RANLIB="$(LTO_RANLIB)"; export RANLIB; 15 RANLIB="$(LTO_RANLIB)"; export RANLIB; \
15LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)" 16 NM="$(LTO_NM)"; export NM;
17LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)" NM="$(LTO_NM)"
16 18
17do-compare = $(SHELL) $(srcdir)/contrib/compare-lto $$f1 $$f2 19do-compare = $(SHELL) $(srcdir)/contrib/compare-lto $$f1 $$f2
18extra-compare = gcc/lto1$(exeext) 20extra-compare = gcc/lto1$(exeext)