diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/Makefile.am | 8 | ||||
| -rw-r--r-- | bfd/Makefile.in | 8 | ||||
| -rw-r--r-- | bfd/config.bfd | 2 | ||||
| -rwxr-xr-x | bfd/configure | 4 | ||||
| -rw-r--r-- | bfd/configure.in | 4 | ||||
| -rw-r--r-- | bfd/targets.c | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 62fae5b..c55450e 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -288,8 +288,6 @@ BFD32_BACKENDS = \ elf32-pj.lo \ elf32-ppc.lo \ elf32-s390.lo \ - elf32-score.lo \ - elf32-score7.lo \ elf32-sh.lo \ elf32-sh-symbian.lo \ elf32-sh64.lo \ @@ -474,8 +472,6 @@ BFD32_BACKENDS_CFILES = \ elf32-sh64.c \ elf32-sh64-com.c \ elf32-s390.c \ - elf32-score.c \ - elf32-score7.c \ elf32-sh.c \ elf32-sh-symbian.c \ elfxx-sparc.c \ @@ -588,6 +584,8 @@ BFD64_BACKENDS = \ elfn32-mips.lo \ elf64-mips.lo \ elf64-mmix.lo \ + elf32-score.lo \ + elf32-score7.lo \ elf64-sh64.lo \ elf64-ppc.lo \ elf64-s390.lo \ @@ -623,6 +621,8 @@ BFD64_BACKENDS_CFILES = \ elf64-mmix.c \ elf64-ppc.c \ elf64-s390.c \ + elf32-score.c \ + elf32-score7.c \ elf64-sh64.c \ elf64-sparc.c \ elf64.c \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index b011252..190888e 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -555,8 +555,6 @@ BFD32_BACKENDS = \ elf32-pj.lo \ elf32-ppc.lo \ elf32-s390.lo \ - elf32-score.lo \ - elf32-score7.lo \ elf32-sh.lo \ elf32-sh-symbian.lo \ elf32-sh64.lo \ @@ -741,8 +739,6 @@ BFD32_BACKENDS_CFILES = \ elf32-sh64.c \ elf32-sh64-com.c \ elf32-s390.c \ - elf32-score.c \ - elf32-score7.c \ elf32-sh.c \ elf32-sh-symbian.c \ elfxx-sparc.c \ @@ -856,6 +852,8 @@ BFD64_BACKENDS = \ elfn32-mips.lo \ elf64-mips.lo \ elf64-mmix.lo \ + elf32-score.lo \ + elf32-score7.lo \ elf64-sh64.lo \ elf64-ppc.lo \ elf64-s390.lo \ @@ -891,6 +889,8 @@ BFD64_BACKENDS_CFILES = \ elf64-mmix.c \ elf64-ppc.c \ elf64-s390.c \ + elf32-score.c \ + elf32-score7.c \ elf64-sh64.c \ elf64-sparc.c \ elf64.c \ diff --git a/bfd/config.bfd b/bfd/config.bfd index 8a448fa..9082658 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -1192,14 +1192,12 @@ case "${targ}" in targ_defvec=bfd_elf64_s390_vec want64=true ;; -#endif score*-*-elf*) targ_defvec=bfd_elf32_bigscore_vec targ_selvecs=bfd_elf32_littlescore_vec ;; -#ifdef BFD64 sh64l*-*-elf*) targ_defvec=bfd_elf32_sh64l_vec targ_selvecs="bfd_elf32_sh64_vec bfd_elf64_sh64l_vec bfd_elf64_sh64_vec bfd_elf32_shl_vec bfd_elf32_sh_vec" diff --git a/bfd/configure b/bfd/configure index a45eef3..288137b 100755 --- a/bfd/configure +++ b/bfd/configure @@ -21027,8 +21027,8 @@ do bfd_elf32_powerpcle_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_s390_vec) tb="$tb elf32-s390.lo elf32.lo $elf" ;; - bfd_elf32_bigscore_vec) tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true;; - bfd_elf32_littlescore_vec) tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true;; + bfd_elf32_bigscore_vec) tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;; + bfd_elf32_littlescore_vec) tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;; # FIXME: We include cofflink.lo not because it's needed for # bfd_elf32_sh64[l]_vec, but because we include bfd_elf32_sh[l]_vec # which needs it but does not list it. Should be fixed in right place. diff --git a/bfd/configure.in b/bfd/configure.in index df52026..5704a0d 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -748,8 +748,8 @@ do bfd_elf32_powerpcle_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_s390_vec) tb="$tb elf32-s390.lo elf32.lo $elf" ;; - bfd_elf32_bigscore_vec) tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true;; - bfd_elf32_littlescore_vec) tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true;; + bfd_elf32_bigscore_vec) tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;; + bfd_elf32_littlescore_vec) tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;; # FIXME: We include cofflink.lo not because it's needed for # bfd_elf32_sh64[l]_vec, but because we include bfd_elf32_sh[l]_vec # which needs it but does not list it. Should be fixed in right place. diff --git a/bfd/targets.c b/bfd/targets.c index 2eab663..aef9c29 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -980,8 +980,10 @@ static const bfd_target * const _bfd_target_vector[] = &bfd_elf32_powerpc_vxworks_vec, &bfd_elf32_powerpcle_vec, &bfd_elf32_s390_vec, +#ifdef BFD64 &bfd_elf32_bigscore_vec, - &bfd_elf32_littlescore_vec, + &bfd_elf32_littlescore_vec, +#endif &bfd_elf32_sh_vec, &bfd_elf32_shblin_vec, &bfd_elf32_shl_vec, |