diff options
| author | Alan Modra <amodra@gmail.com> | 2016-12-22 13:12:07 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-12-23 23:50:39 +1030 |
| commit | 865422fafaf387745b2979d47b6f448d28e0edb8 (patch) | |
| tree | f26e4851dd3469236fa89cc51965abb9e7ea312f | |
| parent | 6096dda15babc5307b1a0e9624d4e0028fd429e1 (diff) | |
| download | gdb-865422fafaf387745b2979d47b6f448d28e0edb8.zip gdb-865422fafaf387745b2979d47b6f448d28e0edb8.tar.gz gdb-865422fafaf387745b2979d47b6f448d28e0edb8.tar.bz2 | |
hppa-linux-gnu-ranlib: libcpp.a: File format not recognized
This stops an --enable-targets selection affecting the main target in
regards to forcing 64-bit archives. It also means mips64 and s390x
will revert to binutils-2.25 and binutils-2.26 behaviour of not
forcing 64-bit archives at least in the common case when plugins were
enabled.
PR binutils/20464
PR binutils/14625
* configure.ac: Revert 2016-05-25 configure change setting
want_64_bit_archive for mips64 and s390x. Revise USE_64_BIT_ARCHIVE
description.
* configure: Regenerate.
* config.in: Regenerate.
| -rw-r--r-- | bfd/ChangeLog | 10 | ||||
| -rw-r--r-- | bfd/config.in | 2 | ||||
| -rwxr-xr-x | bfd/configure | 9 | ||||
| -rw-r--r-- | bfd/configure.ac | 11 |
4 files changed, 12 insertions, 20 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 68ca152..b7afc73 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2016-12-23 Alan Modra <amodra@gmail.com> + + PR binutils/20464 + PR binutils/14625 + * configure.ac: Revert 2016-05-25 configure change setting + want_64_bit_archive for mips64 and s390x. Revise USE_64_BIT_ARCHIVE + description. + * configure: Regenerate. + * config.in: Regenerate. + 2016-12-23 Tristan Gingold <gingold@adacore.com> * version.m4: Bump version to 2.28.51 diff --git a/bfd/config.in b/bfd/config.in index 341afae..2d5a381 100644 --- a/bfd/config.in +++ b/bfd/config.in @@ -337,7 +337,7 @@ /* Name of host specific header file to include in trad-core.c. */ #undef TRAD_HEADER -/* Define if we should use 64-bit archives. */ +/* Define if 64-bit archives should always be used. */ #undef USE_64_BIT_ARCHIVE /* Use b modifier when opening binary files? */ diff --git a/bfd/configure b/bfd/configure index 5e52fc4..2f05cad 100755 --- a/bfd/configure +++ b/bfd/configure @@ -14655,15 +14655,6 @@ else # all_targets is true selarchs=`echo $selarchs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'` fi # all_targets is true -if test "x$want_64_bit_archive" = xunset; then - # 64-bit MIPS and s390 ELF targets use 64-bit archives. - case "${bfd_backends}" in - *elf64-mips* | *elf64-s390*) - want_64_bit_archive=true - ;; - esac -fi - # 64-bit archives need a 64-bit bfd_vma. if test "x$want_64_bit_archive" = xtrue; then want64=true diff --git a/bfd/configure.ac b/bfd/configure.ac index 3254dae..944fc56 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -786,20 +786,11 @@ else # all_targets is true selarchs=`echo $selarchs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'` fi # all_targets is true -if test "x$want_64_bit_archive" = xunset; then - # 64-bit MIPS and s390 ELF targets use 64-bit archives. - case "${bfd_backends}" in - *elf64-mips* | *elf64-s390*) - want_64_bit_archive=true - ;; - esac -fi - # 64-bit archives need a 64-bit bfd_vma. if test "x$want_64_bit_archive" = xtrue; then want64=true AC_DEFINE(USE_64_BIT_ARCHIVE, 1, - [Define if we should use 64-bit archives.]) + [Define if 64-bit archives should always be used.]) fi case ${host64}-${target64}-${want64} in |