sync binutils config/ with gcc

config/
	* acx.m4: Import from gcc.
	* bootstrap-asan.mk: Likewise.
	* multi.m4: Likewise.
/
	* configure: Regnerate.
gas/
	* configure: Regnerate.
ld/
	* configure: Regnerate.
libiberty/
	* configure: Regnerate.
zlib/
	* configure: Regnerate.

13 files changed, 30 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index ee8013a9682..1852129116e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-08  Alan Modra  <amodra@gmail.com>
+
+	* configure: Regenerate.
+
 2016-12-02  Josh Conner  <joshconner@google.com>
 
 	* configure.ac: Add fuchsia to targets that use ELF.
diff --git a/config/ChangeLog b/config/ChangeLog
index bb77be0e15c..629d0cb785e 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-08  Alan Modra  <amodra@gmail.com>
+
+	* acx.m4: Import from gcc.
+	* bootstrap-asan.mk: Likewise.
+	* multi.m4: Likewise.
+
 2016-01-18  Alan Modra  <amodra@gmail.com>
 
 	PR binutils/19481
diff --git a/config/acx.m4 b/config/acx.m4
index 9ff31eb85f3..ab42972f4a0 100644
--- a/config/acx.m4
+++ b/config/acx.m4
@@ -404,7 +404,7 @@ AC_DEFUN([ACX_PROG_CMP_IGNORE_INITIAL],
 [AC_CACHE_CHECK([how to compare bootstrapped objects], gcc_cv_prog_cmp_skip,
 [ echo abfoo >t1
   echo cdfoo >t2
-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+  gcc_cv_prog_cmp_skip='tail -c +17 $$f1 > tmp-foo1; tail -c +17 $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
   if cmp t1 t2 2 2 > /dev/null 2>&1; then
     if cmp t1 t2 1 1 > /dev/null 2>&1; then
       :
diff --git a/config/bootstrap-asan.mk b/config/bootstrap-asan.mk
index 70baaf9bb17..e73d4c2cfb8 100644
--- a/config/bootstrap-asan.mk
+++ b/config/bootstrap-asan.mk
@@ -1,7 +1,7 @@
 # This option enables -fsanitize=address for stage2 and stage3.
 
 # Suppress LeakSanitizer in bootstrap.
-export LSAN_OPTIONS="detect_leaks=0"
+export ASAN_OPTIONS=detect_leaks=0:use_odr_indicator=1
 
 STAGE2_CFLAGS += -fsanitize=address
 STAGE3_CFLAGS += -fsanitize=address
diff --git a/config/multi.m4 b/config/multi.m4
index 5b62ecc0aa0..bba338a8265 100644
--- a/config/multi.m4
+++ b/config/multi.m4
@@ -64,5 +64,4 @@ multi_basedir="$multi_basedir"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 CC="$CC"
 CXX="$CXX"
-GFORTRAN="$GFORTRAN"
-GCJ="$GCJ"])])dnl
+GFORTRAN="$GFORTRAN"])])dnl
diff --git a/configure b/configure
index 5b0ceb7a244..f6d12b8721c 100755
--- a/configure
+++ b/configure
@@ -5377,7 +5377,7 @@ if test "${gcc_cv_prog_cmp_skip+set}" = set; then :
 else
    echo abfoo >t1
   echo cdfoo >t2
-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+  gcc_cv_prog_cmp_skip='tail -c +17 $$f1 > tmp-foo1; tail -c +17 $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
   if cmp t1 t2 2 2 > /dev/null 2>&1; then
     if cmp t1 t2 1 1 > /dev/null 2>&1; then
       :
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7eec9692d72..e2e340c16bf 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-08  Alan Modra  <amodra@gmail.com>
+
+	* configure: Regenerate.
+
 2016-12-07  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* config/tc-mips.c (is_opcode_valid): Use local `isa'
diff --git a/gas/configure b/gas/configure
index 98da0db8485..e187df76845 100755
--- a/gas/configure
+++ b/gas/configure
@@ -11661,7 +11661,7 @@ if test "${gcc_cv_prog_cmp_skip+set}" = set; then :
 else
    echo abfoo >t1
   echo cdfoo >t2
-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+  gcc_cv_prog_cmp_skip='tail -c +17 $$f1 > tmp-foo1; tail -c +17 $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
   if cmp t1 t2 2 2 > /dev/null 2>&1; then
     if cmp t1 t2 1 1 > /dev/null 2>&1; then
       :
diff --git a/ld/ChangeLog b/ld/ChangeLog
index dd5ffe2cff9..c4dadfc81d9 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-08  Alan Modra  <amodra@gmail.com>
+
+	* configure: Regenerate.
+
 2016-12-06  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/ld-powerpc/tocopt7.s,
diff --git a/ld/configure b/ld/configure
index e6bed083b3f..5c3b555c634 100755
--- a/ld/configure
+++ b/ld/configure
@@ -16382,7 +16382,7 @@ if test "${gcc_cv_prog_cmp_skip+set}" = set; then :
 else
    echo abfoo >t1
   echo cdfoo >t2
-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+  gcc_cv_prog_cmp_skip='tail -c +17 $$f1 > tmp-foo1; tail -c +17 $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
   if cmp t1 t2 2 2 > /dev/null 2>&1; then
     if cmp t1 t2 1 1 > /dev/null 2>&1; then
       :
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index f800e0c0a25..f4781095976 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-08  Alan Modra  <amodra@gmail.com>
+
+	* configure: Regenerate.
+
 2016-12-06  DJ Delorie  <dj@redhat.com>
 
 	* argv.c (expandargv): Check for directories passed as @-files.
diff --git a/libiberty/configure b/libiberty/configure
index 5c4dda5d1d5..b95e000f2e4 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -5146,7 +5146,8 @@ case "${host}" in
 	PICFLAG=-fpic
 	;;
     # FIXME: Simplify to sh*-*-netbsd*?
-    sh-*-netbsdelf* | shl*-*-netbsdelf*)
+    sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
+      sh64-*-netbsd* | sh64l*-*-netbsd*)
 	PICFLAG=-fpic
 	;;
     # Default to -fPIC unless specified otherwise.
diff --git a/zlib/configure b/zlib/configure
index bba9fd284ef..bed9e3ea2bf 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -11954,7 +11954,6 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 CC="$CC"
 CXX="$CXX"
 GFORTRAN="$GFORTRAN"
-GCJ="$GCJ"
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"