From: Alan Modra <amodra@gmail.com>
Date: Thu, 22 Dec 2016 02:42:07 +0000 (+1030)
Subject: hppa-linux-gnu-ranlib: libcpp.a: File format not recognized
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=865422fafaf387745b2979d47b6f448d28e0edb8;p=binutils-gdb.git

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.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 68ca1522ab9..b7afc73786f 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 341afae4329..2d5a381fb3e 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 5e52fc4db03..2f05cade07d 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 3254dae5826..944fc567dc1 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