summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2016-12-08 09:50:17 +1030
committerAlan Modra <amodra@gmail.com>2016-12-08 21:35:11 +1030
commitda17fe9de923fcee29e6f809693eb7e590966575 (patch)
tree9b3066ea97e529f3673f151d67047712ab1b6954 /config
parent8e2a4f11d477986aa360a3b588d35a194efe58f8 (diff)
downloadbinutils-gdb-da17fe9de923fcee29e6f809693eb7e590966575.tar.gz
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.
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog6
-rw-r--r--config/acx.m42
-rw-r--r--config/bootstrap-asan.mk2
-rw-r--r--config/multi.m43
4 files changed, 9 insertions, 4 deletions
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