From c462b41bcd55e63fea8e1ea59b454d5d56c751dc Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 22 Aug 2009 15:59:24 +0000 Subject: [PATCH] Minor fixes in sim, gold, gdb for Autoconf 2.64, Automake 1.11. gold/: * Makefile.am (AUTOMAKE_OPTIONS): Add foreign. * testsuite/Makefile.am (AUTOMAKE_OPTIONS): Add foreign. * Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. gdb/: * configure.ac: Use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE, AC_AIX, AC_ISC_POSIX. sim/common/: * aclocal.m4 (SIM_CHECK_MEMBER): Replace definition with definition of AC_CHECK_MEMBER. --- gdb/ChangeLog | 5 +++++ gdb/configure.ac | 4 +--- gold/ChangeLog | 7 +++++++ gold/Makefile.am | 2 +- gold/Makefile.in | 2 +- gold/testsuite/Makefile.am | 2 +- gold/testsuite/Makefile.in | 2 +- sim/common/ChangeLog | 3 +++ sim/common/aclocal.m4 | 23 +---------------------- 9 files changed, 21 insertions(+), 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8d57ddbea44..0e968909988 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2009-08-22 Ralf Wildenhues + + * configure.ac: Use AC_USE_SYSTEM_EXTENSIONS instead of + AC_GNU_SOURCE, AC_AIX, AC_ISC_POSIX. + 2009-08-21 Ken Werner Doug Evans diff --git a/gdb/configure.ac b/gdb/configure.ac index 77f8436235a..9dc736cdbdb 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -26,9 +26,7 @@ AC_CONFIG_HEADER(config.h:config.in) AM_MAINTAINER_MODE AC_PROG_CC -AC_GNU_SOURCE -AC_AIX -AC_ISC_POSIX +AC_USE_SYSTEM_EXTENSIONS gl_EARLY AM_PROG_CC_STDC diff --git a/gold/ChangeLog b/gold/ChangeLog index c57002ca905..97b0f161f8a 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,10 @@ +2009-08-22 Ralf Wildenhues + + * Makefile.am (AUTOMAKE_OPTIONS): Add foreign. + * testsuite/Makefile.am (AUTOMAKE_OPTIONS): Add foreign. + * Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + 2009-08-19 Cary Coutant * resolve.cc (Symbol_table::resolve): Don't complain about defined diff --git a/gold/Makefile.am b/gold/Makefile.am index 513699fb206..4be1d47d1dd 100644 --- a/gold/Makefile.am +++ b/gold/Makefile.am @@ -1,6 +1,6 @@ # Process this file with automake to generate Makefile.in -AUTOMAKE_OPTIONS = +AUTOMAKE_OPTIONS = foreign SUBDIRS = po testsuite diff --git a/gold/Makefile.in b/gold/Makefile.in index c7474b10db0..4af4af8a55e 100644 --- a/gold/Makefile.in +++ b/gold/Makefile.in @@ -301,7 +301,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -AUTOMAKE_OPTIONS = +AUTOMAKE_OPTIONS = foreign SUBDIRS = po testsuite tooldir = $(exec_prefix)/$(target_alias) ACLOCAL_AMFLAGS = -I ../bfd -I ../config diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index e8d03f5f2b3..6aafde980e9 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -4,7 +4,7 @@ # system and the host system are the same. So these tests will not # work when building with a cross-compiler. -AUTOMAKE_OPTIONS = +AUTOMAKE_OPTIONS = foreign # The two_file_test tests -fmerge-constants, so we simply always turn # it on. This may need to be controlled by a configure option diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index d3598d3672b..1f490b2d049 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -1205,7 +1205,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -AUTOMAKE_OPTIONS = +AUTOMAKE_OPTIONS = foreign # The two_file_test tests -fmerge-constants, so we simply always turn # it on. This may need to be controlled by a configure option diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index d6ac0aeff4e..e16f4c93a58 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,8 @@ 2009-08-22 Ralf Wildenhues + * aclocal.m4 (SIM_CHECK_MEMBER): Replace definition with + definition of AC_CHECK_MEMBER. + * aclocal.m4: m4_include toplevel config/override.m4. * configure: Regenerate. diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4 index 1177b7cc17b..24b1aa24861 100644 --- a/sim/common/aclocal.m4 +++ b/sim/common/aclocal.m4 @@ -945,28 +945,7 @@ dnl dnl --------------------------------------------------------- dnl AGGREGATE.MEMBER is for instance `struct passwd.pw_gecos', shell dnl variables are not a valid argument. -AC_DEFUN([SIM_CHECK_MEMBER], -dnl Extract the aggregate name, and the member name -[AC_CACHE_CHECK([for $1], [ac_]patsubst([$1], [[\. ]], [_]), -[ac_]patsubst([$1], [[\. ]], [_])[=no;] -AC_TRY_COMPILE([$4],[ -dnl AGGREGATE ac_aggr; -static ]patsubst([$1], [\..*])[ ac_aggr; -dnl ac_aggr.MEMBER; -if (ac_aggr.]patsubst([$1], [^[^.]*\.])[) -return 0;],[ac_]patsubst([$1], [[\. ]], [_])[=yes;], -AC_TRY_COMPILE([$4],[ -dnl AGGREGATE ac_aggr; -static ]patsubst([$1], [\..*])[ ac_aggr; -dnl ac_aggr.MEMBER; -if (sizeof ac_aggr.]patsubst([$1], [^[^.]*\.])[) -return 0;], -[ac_]patsubst([$1], [[\. ]], [_])[=yes;], -[ac_]patsubst([$1], [[\. ]], [_])[=no;])) -[if test [$]ac_]patsubst([$1], [[\. ]], [_])[ = yes; then :; [$2] -else :; [$3] -fi]) -])dnl SIM_CHECK_MEMBER +AC_DEFUN([SIM_CHECK_MEMBER], defn([AC_CHECK_MEMBER])) dnl dnl Translated from a FC2 autoconf-2.59-3 installation. dnl SIM_CHECK_MEMBERS([AGGREGATE.MEMBER, ...]) -- 2.30.2