This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] bfd: fix build with --enable-targets=all in 32-bit hosts
- From: Jose E.Marchesi <jemarch at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 23 May 2019 21:22:57 -0000
- Subject: [binutils-gdb] bfd: fix build with --enable-targets=all in 32-bit hosts
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=45d5293f6e098ff7e85a30554fcdc8c7f00db675
commit 45d5293f6e098ff7e85a30554fcdc8c7f00db675
Author: Jose E. Marchesi <jose.marchesi@oracle.com>
Date: Thu May 23 23:17:39 2019 +0200
bfd: fix build with --enable-targets=all in 32-bit hosts
This patch avoids for bpf_elf64_le_vec to be referenced in targmatch.h
when building a BFD without BFD64, resulting in an undefined symbol.
This was a regression introduced along with the BPF target.
bfd/ChangeLog:
2019-05-23 Jose E. Marchesi <jose.marchesi@oracle.com>
* config.bfd (targ_cpu): Process bpf-*-none only if BFD64.
* configure.ac: Set target_size=64 for bpf_elf64_le_vec and
bpf_elf64_be_vec.
* configure: Regenerate.
Diff:
---
bfd/ChangeLog | 8 +++++++-
bfd/config.bfd | 2 ++
bfd/configure | 4 ++--
bfd/configure.ac | 4 ++--
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 85f0036..aa0a38d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,12 @@
2019-05-23 Jose E. Marchesi <jose.marchesi@oracle.com>
- * configure.ac: Add bpf_elf64_le_vec and bpf_elf64_be_vec.
+ * config.bfd (targ_cpu): Process bpf-*-none only if BFD64.
+ * configure.ac: Set target_size=64 for bpf_elf64_le_vec and
+ bpf_elf64_be_vec.
+ * configure: Regenerate.
+
+2019-05-23 Jose E. Marchesi <jose.marchesi@oracle.com>
+
* configure: Regenerated.
* Makefile.am (ALL_MACHINES): Add cpu-bpf.lo.
(ALL_MACHINES_CFILES): Add cpu-bpf.c.
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 562c331..8bc330e 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -480,11 +480,13 @@ case "${targ}" in
targ_defvec=d30v_elf32_vec
;;
+#ifdef BFD64
bpf-*-none)
targ_defvec=bpf_elf64_le_vec
targ_selvecs=bpf_elf64_be_vec
targ_underscore=yes
;;
+#endif
epiphany-*-*)
targ_defvec=epiphany_elf32_vec
diff --git a/bfd/configure b/bfd/configure
index f2f8735..2efeaf3 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14752,8 +14752,8 @@ do
elf32_le_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
elf64_be_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
elf64_le_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
- bpf_elf64_le_vec) tb="$tb elf64-bpf.lo elf64.lo $elf" ;;
- bpf_elf64_be_vec) tb="$tb elf64-bpf.lo elf64.lo $elf" ;;
+ bpf_elf64_le_vec) tb="$tb elf64-bpf.lo elf64.lo $elf"; target_size=64;;
+ bpf_elf64_be_vec) tb="$tb elf64-bpf.lo elf64.lo $elf"; target_size=64 ;;
epiphany_elf32_vec) tb="$tb elf32-epiphany.lo elf32.lo $elf" ;;
fr30_elf32_vec) tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
frv_elf32_vec) tb="$tb elf32-frv.lo elf32.lo $elf" ;;
diff --git a/bfd/configure.ac b/bfd/configure.ac
index fe6754e..c941389 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -476,8 +476,8 @@ do
elf32_le_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
elf64_be_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
elf64_le_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
- bpf_elf64_le_vec) tb="$tb elf64-bpf.lo elf64.lo $elf" ;;
- bpf_elf64_be_vec) tb="$tb elf64-bpf.lo elf64.lo $elf" ;;
+ bpf_elf64_le_vec) tb="$tb elf64-bpf.lo elf64.lo $elf"; target_size=64;;
+ bpf_elf64_be_vec) tb="$tb elf64-bpf.lo elf64.lo $elf"; target_size=64 ;;
epiphany_elf32_vec) tb="$tb elf32-epiphany.lo elf32.lo $elf" ;;
fr30_elf32_vec) tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
frv_elf32_vec) tb="$tb elf32-frv.lo elf32.lo $elf" ;;