aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2010-08-19 23:42:03 +0000
committerIan Lance Taylor <ian@airs.com>2010-08-19 23:42:03 +0000
commitdd0b1884ce93ccc4107c0711de9e0c8c0b44b701 (patch)
treebafc67177f7ffa5e48c22e2cadb3a2bf9d4248f8
parent7223e9ca5a5ab5eecd2d14328ceade93bcb43f3d (diff)
downloadgdb-dd0b1884ce93ccc4107c0711de9e0c8c0b44b701.zip
gdb-dd0b1884ce93ccc4107c0711de9e0c8c0b44b701.tar.gz
gdb-dd0b1884ce93ccc4107c0711de9e0c8c0b44b701.tar.bz2
* Makefile.in: Rebuild with automake 1.11.1.
* aclocal.m4: Likewise. * testsuite/Makefile.in: Likewise.
-rw-r--r--gold/ChangeLog6
-rw-r--r--gold/Makefile.in15
-rw-r--r--gold/aclocal.m46
-rw-r--r--gold/testsuite/Makefile.in11
4 files changed, 23 insertions, 15 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 83eef92..97a0b88 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,11 @@
2010-08-19 Ian Lance Taylor <iant@google.com>
+ * Makefile.in: Rebuild with automake 1.11.1.
+ * aclocal.m4: Likewise.
+ * testsuite/Makefile.in: Likewise.
+
+2010-08-19 Ian Lance Taylor <iant@google.com>
+
PR 10893
* i386.cc (class Output_data_plt_i386): Update declarations.
Define Global_ifunc and Local_ifunc types. Add global_ifuncs_ and
diff --git a/gold/Makefile.in b/gold/Makefile.in
index fdc9dab..bf729cf 100644
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -716,7 +716,7 @@ distclean-compile:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -741,7 +741,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -956,10 +956,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set_logs=; if test "X$(TEST_LOGS)" = X.log; then \
- set_logs=TEST_LOGS=; \
- fi; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+ @list='$(TEST_LOGS)'; \
+ list=`for f in $$list; do \
+ test .log = $$f || echo $$f; \
+ done | tr '\012\015' ' '`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
.log.html:
@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \
diff --git a/gold/aclocal.m4 b/gold/aclocal.m4
index db48652..ded4d60 100644
--- a/gold/aclocal.m4
+++ b/gold/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index f96942f..fdb50dc 100644
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3129,10 +3129,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set_logs=; if test "X$(TEST_LOGS)" = X.log; then \
- set_logs=TEST_LOGS=; \
- fi; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+ @list='$(TEST_LOGS)'; \
+ list=`for f in $$list; do \
+ test .log = $$f || echo $$f; \
+ done | tr '\012\015' ' '`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
.log.html:
@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \