From 203a206d14e4892bc4ab9448e08617506b5d613d Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 12 Mar 2021 22:17:39 +1030 Subject: [PATCH] riscv --enable-targets=all on 32-bit host Attempting to build --enable-targets=all on a 32-bit host results in a number of errors like the following. eelf32lriscv.o: in function `gldelf32lriscv_after_allocation': eelf32lriscv.c:98: undefined reference to `bfd_elf32_riscv_restart_relax_sections' That's due to needing --enable-64-bit-bfd to get the riscv BFD support built. * Makefile.am (ALL_EMULATION_SOURCES): Move riscv files to.. (ALL_64_EMULATION_SOURCES): ..here. * Makefile.in: Regenerate. --- ld/ChangeLog | 6 ++++++ ld/Makefile.am | 12 ++++++------ ld/Makefile.in | 12 ++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 35c5e203f5d..fe68e6ded9b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2021-03-12 Alan Modra + + * Makefile.am (ALL_EMULATION_SOURCES): Move riscv files to.. + (ALL_64_EMULATION_SOURCES): ..here. + * Makefile.in: Regenerate. + 2021-03-12 Clément Chigot * emultempl/aix.em: Ensure .tdata section is removed diff --git a/ld/Makefile.am b/ld/Makefile.am index 3fcaab71dcd..606a9179b19 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -262,12 +262,6 @@ ALL_EMULATION_SOURCES = \ eelf32ppcsim.c \ eelf32ppcvxworks.c \ eelf32ppcwindiss.c \ - eelf32lriscv.c \ - eelf32lriscv_ilp32f.c \ - eelf32lriscv_ilp32.c \ - eelf32briscv.c \ - eelf32briscv_ilp32f.c \ - eelf32briscv_ilp32.c \ eelf32rl78.c \ eelf32rx.c \ eelf32rx_linux.c \ @@ -416,6 +410,12 @@ ALL_64_EMULATION_SOURCES = \ eelf32ltsmipn32.c \ eelf32ltsmipn32_fbsd.c \ eelf32mipswindiss.c \ + eelf32lriscv.c \ + eelf32lriscv_ilp32f.c \ + eelf32lriscv_ilp32.c \ + eelf32briscv.c \ + eelf32briscv_ilp32f.c \ + eelf32briscv_ilp32.c \ eelf64_aix.c \ eelf64bpf.c \ eelf64_ia64.c \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 27b18c1185e..f1be6bc320f 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -752,12 +752,6 @@ ALL_EMULATION_SOURCES = \ eelf32ppcsim.c \ eelf32ppcvxworks.c \ eelf32ppcwindiss.c \ - eelf32lriscv.c \ - eelf32lriscv_ilp32f.c \ - eelf32lriscv_ilp32.c \ - eelf32briscv.c \ - eelf32briscv_ilp32f.c \ - eelf32briscv_ilp32.c \ eelf32rl78.c \ eelf32rx.c \ eelf32rx_linux.c \ @@ -905,6 +899,12 @@ ALL_64_EMULATION_SOURCES = \ eelf32ltsmipn32.c \ eelf32ltsmipn32_fbsd.c \ eelf32mipswindiss.c \ + eelf32lriscv.c \ + eelf32lriscv_ilp32f.c \ + eelf32lriscv_ilp32.c \ + eelf32briscv.c \ + eelf32briscv_ilp32f.c \ + eelf32briscv_ilp32.c \ eelf64_aix.c \ eelf64bpf.c \ eelf64_ia64.c \ -- 2.30.2