From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5517 invoked by alias); 14 Jan 2005 20:11:05 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 4590 invoked from network); 14 Jan 2005 20:10:19 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 14 Jan 2005 20:10:19 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id j0EKAIr4031434 for ; Fri, 14 Jan 2005 15:10:18 -0500 Received: from localhost.redhat.com (vpn50-84.rdu.redhat.com [172.16.50.84]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id j0EKA7r16086; Fri, 14 Jan 2005 15:10:07 -0500 Received: from [127.0.0.1] (localhost.localdomain [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id B0B0E7D79; Fri, 14 Jan 2005 15:08:09 -0500 (EST) Message-ID: <41E826A9.7030203@gnu.org> Date: Fri, 14 Jan 2005 20:11:00 -0000 From: Andrew Cagney User-Agent: Mozilla Thunderbird 0.8 (X11/20041020) MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Cc: Hans-Peter Nilsson Subject: [commit/sim] flip and separate; Was: [commit/sim] Add common/common.m4; Was: [commit/sim] switch autoconf 2.59 References: <41DF55E5.7010307@gnu.org> <41E43F98.1010601@gnu.org> <41E47C74.3050607@gnu.org> <41E5501A.3000907@gnu.org> <41E55AB7.1060802@gnu.org> <41E6ECA1.2040209@gnu.org> In-Reply-To: <41E6ECA1.2040209@gnu.org> Content-Type: multipart/mixed; boundary="------------040309050509040905000406" X-SW-Source: 2005-01/txt/msg00160.txt.bz2 This is a multi-part message in MIME format. --------------040309050509040905000406 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 2007 Hello, The attached patch does what the discussion below suggests: - flips the common.m4/aclocal.m4 include order - separates out AC_CONFIG_HEADER adding it explicitly to each file (including common/configure.ac) Next? committed, Andrew > Hans-Peter Nilsson wrote: > >> On Wed, 12 Jan 2005, Andrew Cagney wrote: >> >> >>> I've also committed the attached. It gets around the SIM_AC_COMMON >>> problem by inlining the macro's contents. >>> >>> Your turn :-) >> >> >> >> With current sources (after adding common.m4), CY_GNU_GETTEXT is >> not defined before use (checkout, configury and build as >> before): >> ... >> configure: configuring in frv >> ... >> /n/asic/slask/hp/fixsimbreakage/src/sim/frv/configure: CY_GNU_GETTEXT: >> command not found >> ... >> (further problems ignored.) >> >> The bug seen above can be fixed by sincluding aclocal.m4 before >> common.m4, putting the definition before the call. (After that >> I then see some disturbing warnings when compiling >> sim/frv/sem.c, but those aren't any fault of the configury at >> least, so that's to be considered a success.) >> >> I'm not sure why you didn't just sinclude common.m4 from >> aclocal.m4 and why you didn't remove SIM_AC_COMMON from >> aclocal.m4. Therefore I don't know how you want the above and >> the worry below actually fixed and so I'll pass back the "your >> turn". ;-) > > > (I don't like nested includes, and aclocal.m4 should just contain macro > definitions :-) > > Have a look at common/configure.ac. It's still calling SIM_AC_COMMON > with a parameter, hence my reason for keeping the SIM_AC_COMMON macro > (well for at least the moment). > > To do like you suggest would mean adding AC_CONFIG_HEADER to > */configure.ac (possibly not a bad thing - common/ is probably still > broken). > >> The biggest problem is that I don't understand why breaking out >> SIM_AC_COMMON to common.m4 should help at all, but it does. > > > Yea, weird :-) > > I'll flip the sinclude order. > > Andrew > --------------040309050509040905000406 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 13215 Index: arm/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: common/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Replace SIM_AC_COMMON with sinclude of common.m4. Add explicit call to AC_CONFIG_HEADER. * common.m4: Delete call to AC_CONFIG_HEADER, update usage. * configure: Re-generate. Index: d10v/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: erc32/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: frv/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: h8300/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: m32r/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: m68hc11/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: mcore/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: mips/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: mn10300/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: sh/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: v850/ChangeLog 2005-01-14 Andrew Cagney * configure.ac: Sinclude aclocal.m4 before common.m4. Add explicit call to AC_CONFIG_HEADER. * configure: Regenerate. Index: common/common.m4 =================================================================== RCS file: /cvs/src/src/sim/common/common.m4,v retrieving revision 1.1 diff -p -u -r1.1 common.m4 --- common/common.m4 12 Jan 2005 17:12:41 -0000 1.1 +++ common/common.m4 14 Jan 2005 20:00:39 -0000 @@ -10,13 +10,13 @@ # dnl Process this file with autoconf to produce a configure script. # AC_PREREQ(2.5)dnl # AC_INIT(Makefile.in) +# AC_CONFIG_HEADER(config.h:config.in) # +# sinclude(../common/aclocal.m4) # sinclude(../common/common.m4) # # ... target specific stuff ... -# autoconf.info says this should be called right after AC_INIT. -AC_CONFIG_HEADER(config.h:config.in) AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AC_PROG_CC Index: common/configure.ac =================================================================== RCS file: /cvs/src/src/sim/common/configure.ac,v retrieving revision 1.1 diff -p -u -r1.1 configure.ac --- common/configure.ac 10 Jan 2005 16:14:34 -0000 1.1 +++ common/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,9 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(cconfig.h:config.in) -# This is intended for use by the target specific directories, and by us. -SIM_AC_COMMON(cconfig.h) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) # Put a useful copy of CPP_FOR_TARGET in Makefile. # This is only used to build the target values header files. These files are Index: arm/configure.ac =================================================================== RCS file: /cvs/src/src/sim/arm/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- arm/configure.ac 12 Jan 2005 17:12:40 -0000 1.2 +++ arm/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + AC_CHECK_HEADERS(unistd.h) COPRO="armcopro.o maverick.o iwmmxt.o" Index: d10v/configure.ac =================================================================== RCS file: /cvs/src/src/sim/d10v/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- d10v/configure.ac 12 Jan 2005 17:12:41 -0000 1.2 +++ d10v/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + SIM_AC_OPTION_WARNINGS AC_CHECK_HEADERS(unistd.h) Index: erc32/configure.ac =================================================================== RCS file: /cvs/src/src/sim/erc32/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- erc32/configure.ac 12 Jan 2005 17:12:42 -0000 1.2 +++ erc32/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + AC_CHECK_HEADERS(stdlib.h) # In the Cygwin environment, we need some additional flags. Index: frv/configure.ac =================================================================== RCS file: /cvs/src/src/sim/frv/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- frv/configure.ac 12 Jan 2005 17:12:42 -0000 1.2 +++ frv/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + SIM_AC_OPTION_ENDIAN(BIG_ENDIAN) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_HOSTENDIAN Index: h8300/configure.ac =================================================================== RCS file: /cvs/src/src/sim/h8300/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- h8300/configure.ac 12 Jan 2005 17:12:43 -0000 1.2 +++ h8300/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + AC_CHECK_HEADERS(stdlib.h time.h sys/param.h) SIM_AC_OUTPUT Index: m32r/configure.ac =================================================================== RCS file: /cvs/src/src/sim/m32r/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- m32r/configure.ac 12 Jan 2005 17:12:43 -0000 1.2 +++ m32r/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + SIM_AC_OPTION_ENDIAN(BIG_ENDIAN) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_HOSTENDIAN Index: m68hc11/configure.ac =================================================================== RCS file: /cvs/src/src/sim/m68hc11/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- m68hc11/configure.ac 12 Jan 2005 17:12:44 -0000 1.2 +++ m68hc11/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + dnl Options available in this module SIM_AC_OPTION_INLINE() SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) Index: mcore/configure.ac =================================================================== RCS file: /cvs/src/src/sim/mcore/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- mcore/configure.ac 12 Jan 2005 17:12:44 -0000 1.2 +++ mcore/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + AC_CHECK_HEADERS(unistd.h) SIM_AC_OUTPUT Index: mips/configure.ac =================================================================== RCS file: /cvs/src/src/sim/mips/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- mips/configure.ac 12 Jan 2005 17:12:45 -0000 1.2 +++ mips/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + dnl Options available in this module SIM_AC_OPTION_INLINE() SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) Index: mn10300/configure.ac =================================================================== RCS file: /cvs/src/src/sim/mn10300/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- mn10300/configure.ac 12 Jan 2005 17:12:45 -0000 1.2 +++ mn10300/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN) SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) SIM_AC_OPTION_HOSTENDIAN Index: sh/configure.ac =================================================================== RCS file: /cvs/src/src/sim/sh/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- sh/configure.ac 12 Jan 2005 17:12:45 -0000 1.2 +++ sh/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + AC_CHECK_HEADERS(unistd.h) SIM_AC_OUTPUT Index: v850/configure.ac =================================================================== RCS file: /cvs/src/src/sim/v850/configure.ac,v retrieving revision 1.2 diff -p -u -r1.2 configure.ac --- v850/configure.ac 12 Jan 2005 17:12:46 -0000 1.2 +++ v850/configure.ac 14 Jan 2005 20:00:39 -0000 @@ -1,10 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59)dnl AC_INIT(Makefile.in) +AC_CONFIG_HEADER(config.h:config.in) -sinclude(../common/common.m4) sinclude(../common/aclocal.m4) +# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around +# it by inlining the macro's contents. +sinclude(../common/common.m4) + SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN) SIM_AC_OPTION_ALIGNMENT(,NONSTRICT_ALIGNMENT) SIM_AC_OPTION_HOSTENDIAN --------------040309050509040905000406--