diff options
| author | Andrew Pinski <apinski@marvell.com> | 2023-08-07 13:07:21 +0200 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-08-12 10:24:26 +0930 |
| commit | 9f2c14223f04597b29bbaeab961aedfceacc52c3 (patch) | |
| tree | 0b2cebbf6cba264ca56b5481bdffb2b47ed67287 /config | |
| parent | 83e8a1eff6defc72e6273cfb5379a0a6ddf525b5 (diff) | |
| download | fsf-binutils-gdb-9f2c14223f04597b29bbaeab961aedfceacc52c3.zip fsf-binutils-gdb-9f2c14223f04597b29bbaeab961aedfceacc52c3.tar.gz fsf-binutils-gdb-9f2c14223f04597b29bbaeab961aedfceacc52c3.tar.bz2 | |
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.
config/
* 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.mk | 6 | ||||
| -rw-r--r-- | config/bootstrap-lto.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/config/bootstrap-lto-lean.mk b/config/bootstrap-lto-lean.mk index 79cea50..42cb339 100644 --- a/config/bootstrap-lto-lean.mk +++ b/config/bootstrap-lto-lean.mk @@ -9,9 +9,11 @@ STAGEfeedback_CFLAGS += -flto=jobserver # assumes the host supports the linker plugin LTO_AR = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ar$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ LTO_RANLIB = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ranlib$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ +LTO_NM = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-nm$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ LTO_EXPORTS = AR="$(LTO_AR)"; export AR; \ - RANLIB="$(LTO_RANLIB)"; export RANLIB; -LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)" + RANLIB="$(LTO_RANLIB)"; export RANLIB; \ + NM="$(LTO_NM)"; export NM; +LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)" NM="$(LTO_NM)" do-compare = /bin/true diff --git a/config/bootstrap-lto.mk b/config/bootstrap-lto.mk index 4de07e5..1ddb1d8 100644 --- a/config/bootstrap-lto.mk +++ b/config/bootstrap-lto.mk @@ -9,10 +9,12 @@ STAGEfeedback_CFLAGS += -flto=jobserver -frandom-seed=1 # assumes the host supports the linker plugin LTO_AR = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ar$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ LTO_RANLIB = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-ranlib$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ +LTO_NM = $$r/$(HOST_SUBDIR)/prev-gcc/gcc-nm$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ LTO_EXPORTS = AR="$(LTO_AR)"; export AR; \ - RANLIB="$(LTO_RANLIB)"; export RANLIB; -LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)" + RANLIB="$(LTO_RANLIB)"; export RANLIB; \ + NM="$(LTO_NM)"; export NM; +LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)" NM="$(LTO_NM)" do-compare = $(SHELL) $(srcdir)/contrib/compare-lto $$f1 $$f2 extra-compare = gcc/lto1$(exeext) |