* [commit/sim] switch autoconf 2.59
@ 2005-01-08 3:40 Andrew Cagney
2005-01-08 4:07 ` Daniel Jacobowitz
` (2 more replies)
0 siblings, 3 replies; 20+ messages in thread
From: Andrew Cagney @ 2005-01-08 3:40 UTC (permalink / raw)
To: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
Same as for gdb, built on ppc (native, sim/ppc built) and amd64. This
patch includes some AC_CONFIG_SUBDIRS changes to sim/configure as they
turn out to be incompatible with autoconf 2.13.
committed,
Andrew
[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 15753 bytes --]
Index: arm/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Replace configure.in. Requires autoconf 2.59 and
correctly calls AC_CONFIG_SUBDIRS.
* configure: Re-generate.
Index: common/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: d10v/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: erc32/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: frv/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: h8300/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: igen/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: m32r/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: m68hc11/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mcore/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mips/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mn10300/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: ppc/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: sh/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/d10v-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/frv-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/m32r-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/mips64el-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: v850/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
--- - 2005-01-07 22:30:23.812637000 -0500
+++ arm/configure.ac 2005-01-07 16:58:56.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:30:24.914564000 -0500
+++ common/configure.ac 2005-01-07 16:59:24.000000000 -0500
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
# This is intended for use by the target specific directories, and by us.
--- - 2005-01-07 22:30:26.174572000 -0500
+++ configure.ac 2005-01-07 21:49:08.000000000 -0500
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.13)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
AC_PROG_CC
@@ -34,160 +34,85 @@
*) AC_MSG_ERROR(bad value ${enableval} given for --enable-sim option) ;;
esac])
-# Assume simulator can be built with cc.
-# If the user passes --enable-sim built it regardless of $(CC).
-only_if_gcc=no
-only_if_enabled=no
-extra_subdirs=common
-
# WHEN ADDING ENTRIES TO THIS MATRIX:
-# Make sure that the left side always has two dashes. Otherwise you
-# can get spurious matches. Even for unambiguous cases, do this as a
-# convention, else the table becomes a real mess to understand and maintain.
-
-case "${target}" in
- arm*-*-* | thumb*-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- strongarm*-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- xscale-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- d10v-*-*) sim_target=d10v ;;
-# OBSOLETE d30v-*-*)
-# OBSOLETE sim_target=d30v
-# OBSOLETE only_if_gcc=yes
-# OBSOLETE extra_subdirs="${extra_subdirs} igen"
-# OBSOLETE ;;
-# OBSOLETE fr30-*-*) sim_target=fr30 ;;
- frv-*-*) sim_target=frv
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- h8300*-*-*)
- sim_target=h8300
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- h8500-*-*) sim_target=h8500 ;;
- i960-*-*) sim_target=i960 ;;
- m32r-*-*) sim_target=m32r ;;
- m68hc11-*-*|m6811-*-*) sim_target=m68hc11 ;;
- mcore-*-*) sim_target=mcore ;;
- mips*-*-*)
- # The MIPS simulator can only be compiled by gcc.
- sim_target=mips
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen testsuite"
- ;;
- mn10300*-*-*)
- # The mn10300 simulator can only be compiled by gcc.
- sim_target=mn10300
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen"
- ;;
- mn10200*-*-*)
- sim_target=mn10200
- ;;
- sh*-*-*)
- sim_target=sh
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | \
- powerpc*-*-elf* | powerpc*-*-linux* | powerpc*-*-netbsd* )
- # The PowerPC simulator uses the GCC extension long long as well as
- # ANSI prototypes, so don't enable it for random host compilers
- # unless asked to.
- sim_target=ppc
- only_if_gcc=yes
- #extra_subdirs="${extra_subdirs}"
- ;;
- tic80-*-*)
- sim_target=tic80
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen"
- ;;
- v850-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- v850e-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- v850ea-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- w65-*-*)
- sim_target=w65
- # The w65 is suffering from gradual decay.
- only_if_enabled=yes
- ;;
- z8k*-*-*) sim_target=z8k ;;
- sparc64-*-*)
- only_if_gcc=yes
- sim_target=none # Don't build erc32 if sparc64.
- ;;
- sparclite*-*-* | sparc86x*-*-*)
- # The SPARC simulator can only be compiled by gcc.
- only_if_gcc=yes
- sim_target=erc32
- ;;
- sparc*-*-*)
- # The SPARC simulator can only be compiled by gcc.
- only_if_gcc=yes
- # Unfortunately erc32 won't build on many hosts, so only enable
- # it if the user really really wants it.
- only_if_enabled=yes
- sim_target=erc32
- ;;
- *) sim_target=none ;;
-esac
-
-
-# Is there a testsuite directory for the target?
-testdir=`echo ${target} | sed -e 's/-.*-/-/'`
-if test -r ${srcdir}/testsuite/${testdir}/configure ; then
- extra_subdirs="${extra_subdirs} testsuite"
-fi
-
-case "${enable_sim}" in
-no) sim_target=none ;;
-yes)
- if test ${only_if_gcc} = yes ; then
- if test "${GCC}" != yes ; then
- echo "Can't enable simulator since not compiling with GCC."
- sim_target=none
- fi
- fi
- ;;
-*)
- if test ${only_if_enabled} = yes ; then
- sim_target=none
- else
- if test ${only_if_gcc} = yes ; then
- if test "${GCC}" != yes ; then
- sim_target=none
- fi
- fi
- fi
- ;;
-esac
-
-if test x"${sim_target}" != xnone ; then
- configdirs="${extra_subdirs} ${sim_target}"
- AC_CONFIG_SUBDIRS($configdirs)
+# Make sure that the left side always has two dashes. Otherwise you
+# can get spurious matches. Even for unambiguous cases, do this as a
+# convention, else the table becomes a real mess to understand and
+# maintain.
+
+if test "${enable_sim}" != no; then
+ testsuite=no
+ common=no
+ igen=no
+ case "${target}" in
+ arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
+ AC_CONFIG_SUBDIRS(arm)
+ testsuite=yes
+ common=yes
+ ;;
+ d10v-*-*)
+ AC_CONFIG_SUBDIRS(d10v)
+ ;;
+ frv-*-*)
+ AC_CONFIG_SUBDIRS(frv)
+ testsuite=yes
+ common=yes
+ ;;
+ h8300*-*-*)
+ AC_CONFIG_SUBDIRS(h8300)
+ testsuite=yes
+ common=yes
+ ;;
+ m32r-*-*)
+ AC_CONFIG_SUBDIRS(m32r)
+ testsuite=yes
+ common=yes
+ ;;
+ m68hc11-*-*|m6811-*-*)
+ AC_CONFIG_SUBDIRS(m68hc11)
+ testsuite=yes
+ common=yes
+ ;;
+ mcore-*-*)
+ AC_CONFIG_SUBDIRS(mcore)
+ testsuite=yes
+ common=yes
+ ;;
+ mips*-*-*)
+ AC_CONFIG_SUBDIRS(mips)
+ testsuite=yes
+ igen=yes
+ ;;
+ mn10300*-*-*)
+ AC_CONFIG_SUBDIRS(mn10300)
+ igen=yes
+ ;;
+ sh*-*-*)
+ AC_CONFIG_SUBDIRS(sh)
+ testsuite=yes
+ common=yes
+ ;;
+ powerpc*-*-* )
+ AC_CONFIG_SUBDIRS(ppc)
+ ;;
+ v850*-*-* )
+ AC_CONFIG_SUBDIRS(v850)
+ common=yes
+ ;;
+ sparc*-*-*)
+ AC_CONFIG_SUBDIRS(erc32)
+ ;;
+ esac
+ if test "$testsuite" = yes; then
+ AC_CONFIG_SUBDIRS(testsuite)
+ fi
+ if test "$common" = yes; then
+ AC_CONFIG_SUBDIRS(common)
+ fi
+ if test "$igen" = yes; then
+ AC_CONFIG_SUBDIRS(igen)
+ fi
fi
AC_OUTPUT(Makefile)
--- - 2005-01-07 22:30:37.909917000 -0500
+++ d10v/configure.ac 2005-01-07 16:59:54.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:30:45.153153000 -0500
+++ erc32/configure.ac 2005-01-07 17:00:10.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:30:51.224799000 -0500
+++ frv/configure.ac 2005-01-07 17:00:27.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:30:57.945903000 -0500
+++ h8300/configure.ac 2005-01-07 17:00:53.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:31:13.959750000 -0500
+++ igen/configure.ac 2005-01-07 17:01:07.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(table.h)
AC_PROG_INSTALL
--- - 2005-01-07 22:31:15.218697000 -0500
+++ m32r/configure.ac 2005-01-07 17:01:24.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:31:16.694734000 -0500
+++ m68hc11/configure.ac 2005-01-07 17:01:44.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.12.1)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:31:18.037595000 -0500
+++ mcore/configure.ac 2005-01-07 17:02:12.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:31:22.327464000 -0500
+++ mips/configure.ac 2005-01-07 17:02:33.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:31:28.717088000 -0500
+++ mn10300/configure.ac 2005-01-07 17:02:51.000000000 -0500
@@ -1,7 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-dnl 2.12 botches SHELL substitution
-AC_PREREQ(2.12.1)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:31:30.222055000 -0500
+++ ppc/configure.ac 2005-01-07 17:03:06.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
AC_PROG_INSTALL
--- - 2005-01-07 22:31:31.918686000 -0500
+++ sh/configure.ac 2005-01-07 17:03:20.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-07 22:31:38.713683000 -0500
+++ testsuite/d10v-elf/configure.ac 2005-01-07 17:03:43.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-07 22:31:41.978390000 -0500
+++ testsuite/frv-elf/configure.ac 2005-01-07 17:04:31.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-07 22:31:43.017006000 -0500
+++ testsuite/m32r-elf/configure.ac 2005-01-07 17:04:46.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-07 22:31:48.381417000 -0500
+++ testsuite/mips64el-elf/configure.ac 2005-01-07 17:05:12.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-07 22:31:58.788454000 -0500
+++ testsuite/configure.ac 2005-01-07 20:29:09.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
AC_INIT(common/bits-tst.c)
CC=${CC-cc}
--- - 2005-01-07 22:32:01.374373000 -0500
+++ v850/configure.ac 2005-01-07 17:05:38.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] switch autoconf 2.59
2005-01-08 3:40 [commit/sim] switch autoconf 2.59 Andrew Cagney
@ 2005-01-08 4:07 ` Daniel Jacobowitz
2005-01-10 16:18 ` Andrew Cagney
2005-01-11 20:20 ` Hans-Peter Nilsson
2 siblings, 0 replies; 20+ messages in thread
From: Daniel Jacobowitz @ 2005-01-08 4:07 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Fri, Jan 07, 2005 at 10:39:17PM -0500, Andrew Cagney wrote:
> Same as for gdb, built on ppc (native, sim/ppc built) and amd64. This
> patch includes some AC_CONFIG_SUBDIRS changes to sim/configure as they
> turn out to be incompatible with autoconf 2.13.
FYI, I remember that Maciej reported a bug in autoconf 2.59 that caused
sim/common/configure to break - something to do with AC_REQUIRE,
probably a macro expanding inside a shell conditional when it
shouldn't. He doesn't seem to have posted any details that I can find.
Just a heads up in case the bug still manifests. Thanks for doing
this!
--
Daniel Jacobowitz
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] switch autoconf 2.59
2005-01-08 3:40 [commit/sim] switch autoconf 2.59 Andrew Cagney
2005-01-08 4:07 ` Daniel Jacobowitz
@ 2005-01-10 16:18 ` Andrew Cagney
2005-01-11 20:20 ` Hans-Peter Nilsson
2 siblings, 0 replies; 20+ messages in thread
From: Andrew Cagney @ 2005-01-10 16:18 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
Andrew Cagney wrote:
> Same as for gdb, built on ppc (native, sim/ppc built) and amd64. This
> patch includes some AC_CONFIG_SUBDIRS changes to sim/configure as they
> turn out to be incompatible with autoconf 2.13.
A number of factors on friday co conspired to stop me committing the
original patch (network failed, a build barfed, ....).
So attached is what was really committed, I suspect that removing the
AC_AUX_DIRECTORY call avoids the bug that daniel hinted at.
PPC builds fine.
really committed,
Andrew
[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 15835 bytes --]
Index: arm/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Replace configure.in. Requires autoconf 2.59 and
correctly calls AC_CONFIG_SUBDIRS.
* configure: Re-generate.
Index: common/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* aclocal.m4 (SIM_AC_COMMON): Delete call to AC_CONFIG_AUX_DIR.
* configure: Re-generate.
Index: d10v/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: erc32/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: frv/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: h8300/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: igen/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: m32r/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: m68hc11/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mcore/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mips/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mn10300/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: ppc/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: sh/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/d10v-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/frv-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/m32r-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/mips64el-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: v850/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
--- - 2005-01-10 11:07:30.108043000 -0500
+++ arm/configure.ac 2005-01-07 16:58:56.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:32.079357000 -0500
+++ common/configure.ac 2005-01-08 17:59:14.000000000 -0500
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
# This is intended for use by the target specific directories, and by us.
--- - 2005-01-10 11:07:34.070449000 -0500
+++ configure.ac 2005-01-07 22:41:24.000000000 -0500
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.13)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
AC_PROG_CC
@@ -34,160 +34,86 @@
*) AC_MSG_ERROR(bad value ${enableval} given for --enable-sim option) ;;
esac])
-# Assume simulator can be built with cc.
-# If the user passes --enable-sim built it regardless of $(CC).
-only_if_gcc=no
-only_if_enabled=no
-extra_subdirs=common
-
# WHEN ADDING ENTRIES TO THIS MATRIX:
-# Make sure that the left side always has two dashes. Otherwise you
-# can get spurious matches. Even for unambiguous cases, do this as a
-# convention, else the table becomes a real mess to understand and maintain.
-
-case "${target}" in
- arm*-*-* | thumb*-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- strongarm*-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- xscale-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- d10v-*-*) sim_target=d10v ;;
-# OBSOLETE d30v-*-*)
-# OBSOLETE sim_target=d30v
-# OBSOLETE only_if_gcc=yes
-# OBSOLETE extra_subdirs="${extra_subdirs} igen"
-# OBSOLETE ;;
-# OBSOLETE fr30-*-*) sim_target=fr30 ;;
- frv-*-*) sim_target=frv
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- h8300*-*-*)
- sim_target=h8300
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- h8500-*-*) sim_target=h8500 ;;
- i960-*-*) sim_target=i960 ;;
- m32r-*-*) sim_target=m32r ;;
- m68hc11-*-*|m6811-*-*) sim_target=m68hc11 ;;
- mcore-*-*) sim_target=mcore ;;
- mips*-*-*)
- # The MIPS simulator can only be compiled by gcc.
- sim_target=mips
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen testsuite"
- ;;
- mn10300*-*-*)
- # The mn10300 simulator can only be compiled by gcc.
- sim_target=mn10300
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen"
- ;;
- mn10200*-*-*)
- sim_target=mn10200
- ;;
- sh*-*-*)
- sim_target=sh
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | \
- powerpc*-*-elf* | powerpc*-*-linux* | powerpc*-*-netbsd* )
- # The PowerPC simulator uses the GCC extension long long as well as
- # ANSI prototypes, so don't enable it for random host compilers
- # unless asked to.
- sim_target=ppc
- only_if_gcc=yes
- #extra_subdirs="${extra_subdirs}"
- ;;
- tic80-*-*)
- sim_target=tic80
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen"
- ;;
- v850-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- v850e-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- v850ea-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- w65-*-*)
- sim_target=w65
- # The w65 is suffering from gradual decay.
- only_if_enabled=yes
- ;;
- z8k*-*-*) sim_target=z8k ;;
- sparc64-*-*)
- only_if_gcc=yes
- sim_target=none # Don't build erc32 if sparc64.
- ;;
- sparclite*-*-* | sparc86x*-*-*)
- # The SPARC simulator can only be compiled by gcc.
- only_if_gcc=yes
- sim_target=erc32
- ;;
- sparc*-*-*)
- # The SPARC simulator can only be compiled by gcc.
- only_if_gcc=yes
- # Unfortunately erc32 won't build on many hosts, so only enable
- # it if the user really really wants it.
- only_if_enabled=yes
- sim_target=erc32
- ;;
- *) sim_target=none ;;
-esac
-
-
-# Is there a testsuite directory for the target?
-testdir=`echo ${target} | sed -e 's/-.*-/-/'`
-if test -r ${srcdir}/testsuite/${testdir}/configure ; then
- extra_subdirs="${extra_subdirs} testsuite"
-fi
-
-case "${enable_sim}" in
-no) sim_target=none ;;
-yes)
- if test ${only_if_gcc} = yes ; then
- if test "${GCC}" != yes ; then
- echo "Can't enable simulator since not compiling with GCC."
- sim_target=none
- fi
- fi
- ;;
-*)
- if test ${only_if_enabled} = yes ; then
- sim_target=none
- else
- if test ${only_if_gcc} = yes ; then
- if test "${GCC}" != yes ; then
- sim_target=none
- fi
- fi
- fi
- ;;
-esac
-
-if test x"${sim_target}" != xnone ; then
- configdirs="${extra_subdirs} ${sim_target}"
- AC_CONFIG_SUBDIRS($configdirs)
+# Make sure that the left side always has two dashes. Otherwise you
+# can get spurious matches. Even for unambiguous cases, do this as a
+# convention, else the table becomes a real mess to understand and
+# maintain.
+
+if test "${enable_sim}" != no; then
+ testsuite=no
+ common=no
+ igen=no
+ case "${target}" in
+ arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
+ AC_CONFIG_SUBDIRS(arm)
+ testsuite=yes
+ common=yes
+ ;;
+ d10v-*-*)
+ AC_CONFIG_SUBDIRS(d10v)
+ ;;
+ frv-*-*)
+ AC_CONFIG_SUBDIRS(frv)
+ testsuite=yes
+ common=yes
+ ;;
+ h8300*-*-*)
+ AC_CONFIG_SUBDIRS(h8300)
+ testsuite=yes
+ common=yes
+ ;;
+ m32r-*-*)
+ AC_CONFIG_SUBDIRS(m32r)
+ testsuite=yes
+ common=yes
+ ;;
+ m68hc11-*-*|m6811-*-*)
+ AC_CONFIG_SUBDIRS(m68hc11)
+ testsuite=yes
+ common=yes
+ ;;
+ mcore-*-*)
+ AC_CONFIG_SUBDIRS(mcore)
+ testsuite=yes
+ common=yes
+ ;;
+ mips*-*-*)
+ AC_CONFIG_SUBDIRS(mips)
+ testsuite=yes
+ igen=yes
+ ;;
+ mn10300*-*-*)
+ AC_CONFIG_SUBDIRS(mn10300)
+ igen=yes
+ ;;
+ sh*-*-*)
+ AC_CONFIG_SUBDIRS(sh)
+ testsuite=yes
+ common=yes
+ ;;
+ powerpc*-*-* )
+ AC_CONFIG_SUBDIRS(ppc)
+ common=yes
+ ;;
+ v850*-*-* )
+ AC_CONFIG_SUBDIRS(v850)
+ common=yes
+ ;;
+ sparc*-*-*)
+ AC_CONFIG_SUBDIRS(erc32)
+ ;;
+ esac
+ if test "$testsuite" = yes; then
+ AC_CONFIG_SUBDIRS(testsuite)
+ fi
+ if test "$common" = yes; then
+ AC_CONFIG_SUBDIRS(common)
+ fi
+ if test "$igen" = yes; then
+ AC_CONFIG_SUBDIRS(igen)
+ fi
fi
AC_OUTPUT(Makefile)
--- - 2005-01-10 11:07:36.307450000 -0500
+++ d10v/configure.ac 2005-01-07 16:59:54.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:38.488149000 -0500
+++ erc32/configure.ac 2005-01-07 17:00:10.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:40.494109000 -0500
+++ frv/configure.ac 2005-01-07 17:00:27.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:42.774681000 -0500
+++ h8300/configure.ac 2005-01-07 17:00:53.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:44.734280000 -0500
+++ igen/configure.ac 2005-01-07 17:01:07.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(table.h)
AC_PROG_INSTALL
--- - 2005-01-10 11:07:47.246876000 -0500
+++ m32r/configure.ac 2005-01-07 17:01:24.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:50.061360000 -0500
+++ m68hc11/configure.ac 2005-01-07 17:01:44.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.12.1)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:52.310655000 -0500
+++ mcore/configure.ac 2005-01-07 17:02:12.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:54.430105000 -0500
+++ mips/configure.ac 2005-01-07 17:02:33.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:56.961787000 -0500
+++ mn10300/configure.ac 2005-01-07 17:02:51.000000000 -0500
@@ -1,7 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-dnl 2.12 botches SHELL substitution
-AC_PREREQ(2.12.1)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:59.143421000 -0500
+++ ppc/configure.ac 2005-01-07 17:03:06.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
AC_PROG_INSTALL
--- - 2005-01-10 11:08:01.671499000 -0500
+++ sh/configure.ac 2005-01-07 17:03:20.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:08:03.617111000 -0500
+++ testsuite/d10v-elf/configure.ac 2005-01-07 17:03:43.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-10 11:08:05.764901000 -0500
+++ testsuite/frv-elf/configure.ac 2005-01-07 17:04:31.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-10 11:08:07.733352000 -0500
+++ testsuite/m32r-elf/configure.ac 2005-01-07 17:04:46.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-10 11:08:10.475154000 -0500
+++ testsuite/mips64el-elf/configure.ac 2005-01-07 17:05:12.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-10 11:08:12.532004000 -0500
+++ testsuite/configure.ac 2005-01-07 20:29:09.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
AC_INIT(common/bits-tst.c)
CC=${CC-cc}
--- - 2005-01-10 11:08:14.648668000 -0500
+++ v850/configure.ac 2005-01-07 17:05:38.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] switch autoconf 2.59
2005-01-08 3:40 [commit/sim] switch autoconf 2.59 Andrew Cagney
2005-01-08 4:07 ` Daniel Jacobowitz
2005-01-10 16:18 ` Andrew Cagney
@ 2005-01-11 20:20 ` Hans-Peter Nilsson
2005-01-11 21:06 ` Andrew Cagney
2 siblings, 1 reply; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-11 20:20 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Fri, 7 Jan 2005, Andrew Cagney wrote:
> Same as for gdb, built on ppc (native, sim/ppc built) and amd64.
Try sim/frv and see huge breakage. Obviously sim/ppc isn't
representative; it doesn't even use SIM_AC_OUTPUT. Breakage due
to not generating Makefile in sim/frv is the first bug I see.
Then follows build errors and warnings due to other autoconfy
things that have changed, such as missing definition of
HAVE_STRING_H and HAVE_STRINGS_H.
Will try and fix obvious stuff myself, have patch for the
SIM_AC_OUTPUT breakage.
Note for future similar reorgs: please test with a CGEN target
such as sim/frv (or sim/cris which will be committed by then. :-)
Perhaps also sim/arm and sim/sh and an igen target for good
measure.
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] switch autoconf 2.59
2005-01-11 20:20 ` Hans-Peter Nilsson
@ 2005-01-11 21:06 ` Andrew Cagney
2005-01-12 1:17 ` Hans-Peter Nilsson
0 siblings, 1 reply; 20+ messages in thread
From: Andrew Cagney @ 2005-01-11 21:06 UTC (permalink / raw)
To: Hans-Peter Nilsson; +Cc: gdb-patches
Hans,
Before commiting this I did a full cross build (using gdb_mbuild.sh). I
found many targets were barfing the first time through but then finished
when restarted (suggests parallel make problem). That's something to
investigate.
Andrew
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] switch autoconf 2.59
2005-01-11 21:06 ` Andrew Cagney
@ 2005-01-12 1:17 ` Hans-Peter Nilsson
2005-01-12 1:26 ` Andrew Cagney
0 siblings, 1 reply; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-12 1:17 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Tue, 11 Jan 2005, Andrew Cagney wrote:
> Before commiting this I did a full cross build (using gdb_mbuild.sh).
Looks like that only builds gdb. (Note subject.) You referred
to sim/ppc as the (only) simulator you tested for the sim
autoconf changes.
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] switch autoconf 2.59
2005-01-12 1:17 ` Hans-Peter Nilsson
@ 2005-01-12 1:26 ` Andrew Cagney
2005-01-12 2:00 ` Hans-Peter Nilsson
0 siblings, 1 reply; 20+ messages in thread
From: Andrew Cagney @ 2005-01-12 1:26 UTC (permalink / raw)
To: Hans-Peter Nilsson; +Cc: gdb-patches
Hans-Peter Nilsson wrote:
> On Tue, 11 Jan 2005, Andrew Cagney wrote:
>
>>Before commiting this I did a full cross build (using gdb_mbuild.sh).
>
>
> Looks like that only builds gdb.
Why do you say that (yes I can read the subject)? It builds the GDB the
source tree (which includes the sim) and typically GDB won't link if the
sim build fails?
Andrew
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] switch autoconf 2.59
2005-01-12 1:26 ` Andrew Cagney
@ 2005-01-12 2:00 ` Hans-Peter Nilsson
2005-01-12 16:29 ` [commit/sim] Force generation of configure and other stuff; Was: " Andrew Cagney
0 siblings, 1 reply; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-12 2:00 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Tue, 11 Jan 2005, Andrew Cagney wrote:
> Hans-Peter Nilsson wrote:
> > On Tue, 11 Jan 2005, Andrew Cagney wrote:
> >>Before commiting this I did a full cross build (using gdb_mbuild.sh).
> > Looks like that only builds gdb.
>
> Why do you say that (yes I can read the subject)? It builds the GDB the
> source tree (which includes the sim) and typically GDB won't link if the
> sim build fails?
Ah, well, then I'm fresh out of wild guesses why it wasn't
noticed that the frv sim (and presumably all CGEN targets and
SIM_AC_OUTPUT users) fails building. To make sure nothing had
crept in locally, I just rechecked; checked out a brand new
"gdb" and did "$srcdir/configure --target=frv-elf && make all"
elsewhere. Host is i686-pc-linux-gnu (FC2), but I see this on
Debian Woody too:
... (from $build/sim)
configure: configuring in frv
configure: running /bin/sh '/home/hp/newgdb/src/sim/frv/configure' --prefix=/usr/local
'--cache-file=./config.cache' '--build=i686-pc-linux-gnu' '--host=i686-pc-linux-gnu' '--target=frv-elf' '--program-transform-name=s,^,frv-elf-,; ' '--srcdir=/home/hp/newgdb/src/sim' 'CC=gcc' 'CFLAGS=-g -O2' 'LDFLAGS=' 'build_alias=i686-pc-linux-gnu' 'host_alias=i686-pc-linux-gnu' 'target_alias=frv-elf' --cache-file=.././config.cache --srcdir=/home/hp/newgdb/src/sim/frv
configure: loading cache .././config.cache
configure: error: cannot run
configure: error: /bin/sh
'/home/hp/newgdb/src/sim/frv/configure' failed for frv
Re-doing the configure and make step, changing the "all" to
"all-gdb" (as in gdb_mbuild.sh), causes the same failure.
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
* [commit/sim] Force generation of configure and other stuff; Was: [commit/sim] switch autoconf 2.59
2005-01-12 2:00 ` Hans-Peter Nilsson
@ 2005-01-12 16:29 ` Andrew Cagney
2005-01-12 17:15 ` [commit/sim] Add common/common.m4; " Andrew Cagney
` (2 more replies)
0 siblings, 3 replies; 20+ messages in thread
From: Andrew Cagney @ 2005-01-12 16:29 UTC (permalink / raw)
To: Hans-Peter Nilsson; +Cc: gdb-patches
Hans-Peter Nilsson wrote:
> On Tue, 11 Jan 2005, Andrew Cagney wrote:
>
>>Hans-Peter Nilsson wrote:
>>
>>>On Tue, 11 Jan 2005, Andrew Cagney wrote:
>>>
>>>>Before commiting this I did a full cross build (using gdb_mbuild.sh).
>>>
>>>Looks like that only builds gdb.
>>
>>Why do you say that (yes I can read the subject)? It builds the GDB the
>>source tree (which includes the sim) and typically GDB won't link if the
>>sim build fails?
>
>
> Ah, well, then I'm fresh out of wild guesses why it wasn't
> noticed that the frv sim (and presumably all CGEN targets and
> SIM_AC_OUTPUT users) fails building. To make sure nothing had
> crept in locally, I just rechecked; checked out a brand new
> "gdb" and did "$srcdir/configure --target=frv-elf && make all"
> elsewhere. Host is i686-pc-linux-gnu (FC2), but I see this on
> Debian Woody too:
I've still a few ideas.
> ... (from $build/sim)
> configure: configuring in frv
> configure: running /bin/sh '/home/hp/newgdb/src/sim/frv/configure' --prefix=/usr/local
> '--cache-file=./config.cache' '--build=i686-pc-linux-gnu' '--host=i686-pc-linux-gnu' '--target=frv-elf' '--program-transform-name=s,^,frv-elf-,; ' '--srcdir=/home/hp/newgdb/src/sim' 'CC=gcc' 'CFLAGS=-g -O2' 'LDFLAGS=' 'build_alias=i686-pc-linux-gnu' 'host_alias=i686-pc-linux-gnu' 'target_alias=frv-elf' --cache-file=.././config.cache --srcdir=/home/hp/newgdb/src/sim/frv
> configure: loading cache .././config.cache
> configure: error: cannot run
> configure: error: /bin/sh
> '/home/hp/newgdb/src/sim/frv/configure' failed for frv
>
> Re-doing the configure and make step, changing the "all" to
> "all-gdb" (as in gdb_mbuild.sh), causes the same failure.
That config failure reeks of the problem I fixed. Seems that you need
to really want to run the new autoconf (unlike the old) - even though I
ran autoconf in all those directories it didn't do as I ask. I've
re-run it with --force and that's had an effect.
The next problem is somewhere in sim/, try running make all-sim; make
all-sim. The first run barfs with no Makefile created, while the second
prints a fail but makefile still manages to exit with zero status. A
guess is that GDB then managed to stumble along and build.
This also rewrites SIM_AC_OUTPUT to be 2.59 ``compliant'' (well at least
it now generates makefiles); and zaps any other stray AC_AUX_DIRECTORY
macros.
With that committed, I'm seeing another autoconf bug. It's using
ac_objext before it's been defined and that is leading to autoconf test
failures (it looks for "conftest." instead of "conftest.o").
:-/
Andrew
^ permalink raw reply [flat|nested] 20+ messages in thread
* [commit/sim] Add common/common.m4; Was: [commit/sim] switch autoconf 2.59
2005-01-12 16:29 ` [commit/sim] Force generation of configure and other stuff; Was: " Andrew Cagney
@ 2005-01-12 17:15 ` Andrew Cagney
2005-01-13 4:04 ` Hans-Peter Nilsson
2005-01-12 17:53 ` [commit/sim] Force generation of configure and other stuff; " Hans-Peter Nilsson
2005-01-13 2:01 ` Hans-Peter Nilsson
2 siblings, 1 reply; 20+ messages in thread
From: Andrew Cagney @ 2005-01-12 17:15 UTC (permalink / raw)
To: Andrew Cagney; +Cc: Hans-Peter Nilsson, gdb-patches
[-- Attachment #1: Type: text/plain, Size: 133 bytes --]
I've also committed the attached. It gets around the SIM_AC_COMMON
problem by inlining the macro's contents.
Your turn :-)
Andrew
[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 16561 bytes --]
Index: sh/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: mn10300/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: d10v/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: erc32/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: frv/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: h8300/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: m32r/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: mcore/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: mips/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: v850/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: common/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* common.m4: New file, based on of aclocal.m4.
Index: arm/ChangeLog
2005-01-12 Andrew Cagney <cagney@gnu.org>
* configure.ac: Update to use ../common/common.m4.
* configure: Re-generate.
Index: arm/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/arm/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- arm/configure.ac 10 Jan 2005 16:14:33 -0000 1.1
+++ arm/configure.ac 12 Jan 2005 17:07:01 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
AC_CHECK_HEADERS(unistd.h)
Index: common/common.m4
===================================================================
RCS file: common/common.m4
diff -N common/common.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ common/common.m4 12 Jan 2005 17:07:03 -0000
@@ -0,0 +1,224 @@
+# This file contains common code used by all simulators.
+#
+# common.m4 invokes AC macros used by all simulators and by the common
+# directory. It is intended to be included before any target specific
+# stuff. SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate
+# the Makefile. It is intended to be invoked last.
+#
+# The simulator's configure.in should look like:
+#
+# dnl Process this file with autoconf to produce a configure script.
+# AC_PREREQ(2.5)dnl
+# AC_INIT(Makefile.in)
+#
+# 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
+AC_PROG_INSTALL
+
+# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test "x$cross_compiling" = "xno"; then
+ CC_FOR_BUILD='$(CC)'
+else
+ CC_FOR_BUILD=gcc
+fi
+AC_SUBST(CC_FOR_BUILD)
+
+AC_SUBST(CFLAGS)
+AC_SUBST(HDEFINES)
+AR=${AR-ar}
+AC_SUBST(AR)
+AC_PROG_RANLIB
+
+dnl We don't use gettext, but bfd does. So we do the appropriate checks
+dnl to see if there are intl libraries we should link against.
+ALL_LINGUAS=
+CY_GNU_GETTEXT
+
+# Check for common headers.
+# FIXME: Seems to me this can cause problems for i386-windows hosts.
+# At one point there were hardcoded AC_DEFINE's if ${host} = i386-*-windows*.
+AC_CHECK_HEADERS(stdlib.h string.h strings.h unistd.h time.h)
+AC_CHECK_HEADERS(sys/time.h sys/resource.h)
+AC_CHECK_HEADERS(fcntl.h fpu_control.h)
+AC_CHECK_HEADERS(dlfcn.h errno.h sys/stat.h)
+AC_CHECK_FUNCS(getrusage time sigaction __setfpucw)
+
+# Check for socket libraries
+AC_CHECK_LIB(socket, bind)
+AC_CHECK_LIB(nsl, gethostbyname)
+
+. ${srcdir}/../../bfd/configure.host
+
+dnl Standard (and optional) simulator options.
+dnl Eventually all simulators will support these.
+dnl Do not add any here that cannot be supported by all simulators.
+dnl Do not add similar but different options to a particular simulator,
+dnl all shall eventually behave the same way.
+
+
+dnl We don't use automake, but we still want to support
+dnl --enable-maintainer-mode.
+USE_MAINTAINER_MODE=no
+AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode Enable developer functionality.],
+[case "${enableval}" in
+ yes) MAINT="" USE_MAINTAINER_MODE=yes ;;
+ no) MAINT="#" ;;
+ *) AC_MSG_ERROR("--enable-maintainer-mode does not take a value"); MAINT="#" ;;
+esac
+if test x"$silent" != x"yes" && test x"$MAINT" = x""; then
+ echo "Setting maintainer mode" 6>&1
+fi],[MAINT="#"])dnl
+AC_SUBST(MAINT)
+
+
+dnl This is a generic option to enable special byte swapping
+dnl insns on *any* cpu.
+AC_ARG_ENABLE(sim-bswap,
+[ --enable-sim-bswap Use Host specific BSWAP instruction.],
+[case "${enableval}" in
+ yes) sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
+ no) sim_bswap="-DWITH_BSWAP=0";;
+ *) AC_MSG_ERROR("--enable-sim-bswap does not take a value"); sim_bswap="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
+ echo "Setting bswap flags = $sim_bswap" 6>&1
+fi],[sim_bswap=""])dnl
+AC_SUBST(sim_bswap)
+
+
+AC_ARG_ENABLE(sim-cflags,
+[ --enable-sim-cflags=opts Extra CFLAGS for use in building simulator],
+[case "${enableval}" in
+ yes) sim_cflags="-O2 -fomit-frame-pointer";;
+ trace) AC_MSG_ERROR("Please use --enable-sim-debug instead."); sim_cflags="";;
+ no) sim_cflags="";;
+ *) sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_cflags" != x""; then
+ echo "Setting sim cflags = $sim_cflags" 6>&1
+fi],[sim_cflags=""])dnl
+AC_SUBST(sim_cflags)
+
+
+dnl --enable-sim-debug is for developers of the simulator
+dnl the allowable values are work-in-progress
+AC_ARG_ENABLE(sim-debug,
+[ --enable-sim-debug=opts Enable debugging flags],
+[case "${enableval}" in
+ yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
+ no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
+ *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
+ echo "Setting sim debug = $sim_debug" 6>&1
+fi],[sim_debug=""])dnl
+AC_SUBST(sim_debug)
+
+
+dnl --enable-sim-stdio is for users of the simulator
+dnl It determines if IO from the program is routed through STDIO (buffered)
+AC_ARG_ENABLE(sim-stdio,
+[ --enable-sim-stdio Specify whether to use stdio for console input/output.],
+[case "${enableval}" in
+ yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
+ no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
+ *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-stdio"); sim_stdio="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
+ echo "Setting stdio flags = $sim_stdio" 6>&1
+fi],[sim_stdio=""])dnl
+AC_SUBST(sim_stdio)
+
+
+dnl --enable-sim-trace is for users of the simulator
+dnl The argument is either a bitmask of things to enable [exactly what is
+dnl up to the simulator], or is a comma separated list of names of tracing
+dnl elements to enable. The latter is only supported on simulators that
+dnl use WITH_TRACE.
+AC_ARG_ENABLE(sim-trace,
+[ --enable-sim-trace=opts Enable tracing flags],
+[case "${enableval}" in
+ yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";;
+ no) sim_trace="-DTRACE=0 -DWITH_TRACE=0";;
+ [[-0-9]]*)
+ sim_trace="-DTRACE='(${enableval})' -DWITH_TRACE='(${enableval})'";;
+ [[a-z]]*)
+ sim_trace=""
+ for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
+ if test x"$sim_trace" = x; then
+ sim_trace="-DWITH_TRACE='(TRACE_$x"
+ else
+ sim_trace="${sim_trace}|TRACE_$x"
+ fi
+ done
+ sim_trace="$sim_trace)'" ;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
+ echo "Setting sim trace = $sim_trace" 6>&1
+fi],[sim_trace=""])dnl
+AC_SUBST(sim_trace)
+
+
+dnl --enable-sim-profile
+dnl The argument is either a bitmask of things to enable [exactly what is
+dnl up to the simulator], or is a comma separated list of names of profiling
+dnl elements to enable. The latter is only supported on simulators that
+dnl use WITH_PROFILE.
+AC_ARG_ENABLE(sim-profile,
+[ --enable-sim-profile=opts Enable profiling flags],
+[case "${enableval}" in
+ yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
+ no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ [[-0-9]]*)
+ sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ [[a-z]]*)
+ sim_profile=""
+ for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
+ if test x"$sim_profile" = x; then
+ sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ else
+ sim_profile="${sim_profile}|PROFILE_$x"
+ fi
+ done
+ sim_profile="$sim_profile)'" ;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
+ echo "Setting sim profile = $sim_profile" 6>&1
+fi],[sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"])dnl
+AC_SUBST(sim_profile)
+
+
+dnl Types used by common code
+AC_TYPE_SIGNAL
+
+dnl Detect exe extension
+AC_EXEEXT
+
+dnl These are available to append to as desired.
+sim_link_files=
+sim_link_links=
+
+dnl Create tconfig.h either from simulator's tconfig.in or default one
+dnl in common.
+sim_link_links=tconfig.h
+if test -f ${srcdir}/tconfig.in
+then
+ sim_link_files=tconfig.in
+else
+ sim_link_files=../common/tconfig.in
+fi
+
+# targ-vals.def points to the libc macro description file.
+case "${target}" in
+*-*-*) TARG_VALS_DEF=../common/nltvals.def ;;
+esac
+sim_link_files="${sim_link_files} ${TARG_VALS_DEF}"
+sim_link_links="${sim_link_links} targ-vals.def"
Index: d10v/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/d10v/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- d10v/configure.ac 10 Jan 2005 16:14:35 -0000 1.1
+++ d10v/configure.ac 12 Jan 2005 17:07:05 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
SIM_AC_OPTION_WARNINGS
Index: erc32/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/erc32/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- erc32/configure.ac 10 Jan 2005 16:14:36 -0000 1.1
+++ erc32/configure.ac 12 Jan 2005 17:07:06 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
AC_CHECK_HEADERS(stdlib.h)
Index: frv/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/frv/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- frv/configure.ac 10 Jan 2005 16:14:37 -0000 1.1
+++ frv/configure.ac 12 Jan 2005 17:07:07 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
Index: h8300/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/h8300/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- h8300/configure.ac 10 Jan 2005 16:14:37 -0000 1.1
+++ h8300/configure.ac 12 Jan 2005 17:07:08 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
AC_CHECK_HEADERS(stdlib.h time.h sys/param.h)
Index: m32r/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/m32r/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- m32r/configure.ac 10 Jan 2005 16:14:38 -0000 1.1
+++ m32r/configure.ac 12 Jan 2005 17:07:10 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
Index: m68hc11/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/m68hc11/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- m68hc11/configure.ac 10 Jan 2005 16:14:39 -0000 1.1
+++ m68hc11/configure.ac 12 Jan 2005 17:07:11 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
dnl Options available in this module
SIM_AC_OPTION_INLINE()
Index: mcore/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/mcore/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- mcore/configure.ac 10 Jan 2005 16:14:39 -0000 1.1
+++ mcore/configure.ac 12 Jan 2005 17:07:13 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
AC_CHECK_HEADERS(unistd.h)
Index: mips/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/mips/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- mips/configure.ac 10 Jan 2005 16:14:40 -0000 1.1
+++ mips/configure.ac 12 Jan 2005 17:07:14 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
dnl Options available in this module
SIM_AC_OPTION_INLINE()
Index: mn10300/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/mn10300/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- mn10300/configure.ac 10 Jan 2005 16:14:42 -0000 1.1
+++ mn10300/configure.ac 12 Jan 2005 17:07:15 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
Index: sh/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/sh/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- sh/configure.ac 10 Jan 2005 16:14:45 -0000 1.1
+++ sh/configure.ac 12 Jan 2005 17:07:17 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
AC_CHECK_HEADERS(unistd.h)
Index: v850/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/v850/configure.ac,v
retrieving revision 1.1
diff -p -u -r1.1 configure.ac
--- v850/configure.ac 10 Jan 2005 16:14:50 -0000 1.1
+++ v850/configure.ac 12 Jan 2005 17:07:19 -0000
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
-SIM_AC_COMMON
+sinclude(../common/common.m4)
+sinclude(../common/aclocal.m4)
SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(,NONSTRICT_ALIGNMENT)
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] Force generation of configure and other stuff; Was: [commit/sim] switch autoconf 2.59
2005-01-12 16:29 ` [commit/sim] Force generation of configure and other stuff; Was: " Andrew Cagney
2005-01-12 17:15 ` [commit/sim] Add common/common.m4; " Andrew Cagney
@ 2005-01-12 17:53 ` Hans-Peter Nilsson
2005-01-12 18:12 ` Andrew Cagney
2005-01-13 2:01 ` Hans-Peter Nilsson
2 siblings, 1 reply; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-12 17:53 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Wed, 12 Jan 2005, Andrew Cagney wrote:
> This also rewrites SIM_AC_OUTPUT to be 2.59 ``compliant'' (well at least
> it now generates makefiles); and zaps any other stray AC_AUX_DIRECTORY
> macros.
And magically got rid of the $CONFIG_FILES-now-starts-with-a-space
problem!
> With that committed, I'm seeing another autoconf bug. It's using
> ac_objext before it's been defined and that is leading to autoconf test
> failures (it looks for "conftest." instead of "conftest.o").
Goody. I got this far as well, but thought I should get a grip
on that ac_objext (and why not ac_cv_objext or whatever) thingy
first. I had a similar patch for the SIM_AC_OUTPUT problem, but
sed:ed out the space and kept the curious CONFIG_FILES test.
(What was it there for?)
Time for me to have another look.
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] Force generation of configure and other stuff; Was: [commit/sim] switch autoconf 2.59
2005-01-12 17:53 ` [commit/sim] Force generation of configure and other stuff; " Hans-Peter Nilsson
@ 2005-01-12 18:12 ` Andrew Cagney
2005-01-12 18:19 ` Hans-Peter Nilsson
0 siblings, 1 reply; 20+ messages in thread
From: Andrew Cagney @ 2005-01-12 18:12 UTC (permalink / raw)
To: Hans-Peter Nilsson; +Cc: gdb-patches
> Goody. I got this far as well, but thought I should get a grip
> on that ac_objext (and why not ac_cv_objext or whatever) thingy
> first. I had a similar patch for the SIM_AC_OUTPUT problem, but
> sed:ed out the space and kept the curious CONFIG_FILES test.
> (What was it there for?)
Which config_files test?
Andrew
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] Force generation of configure and other stuff; Was: [commit/sim] switch autoconf 2.59
2005-01-12 18:12 ` Andrew Cagney
@ 2005-01-12 18:19 ` Hans-Peter Nilsson
2005-01-12 18:50 ` Andrew Cagney
0 siblings, 1 reply; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-12 18:19 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Wed, 12 Jan 2005, Andrew Cagney wrote:
> > Goody. I got this far as well, but thought I should get a grip
> > on that ac_objext (and why not ac_cv_objext or whatever) thingy
> > first. I had a similar patch for the SIM_AC_OUTPUT problem, but
> > sed:ed out the space and kept the curious CONFIG_FILES test.
> > (What was it there for?)
>
> Which config_files test?
(No smiley?) The
[case "x$CONFIG_FILES" in
xMakefile*)
that used to be in SIM_AC_OUTPUT, but which you just removed.
Oh, I see now why it was there; CONFIG_FILES was supposed to
have different values for the different AC_CONFIG_FILES parts.
Never mind, this is all history now. But since you asked.
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] Force generation of configure and other stuff; Was: [commit/sim] switch autoconf 2.59
2005-01-12 18:19 ` Hans-Peter Nilsson
@ 2005-01-12 18:50 ` Andrew Cagney
0 siblings, 0 replies; 20+ messages in thread
From: Andrew Cagney @ 2005-01-12 18:50 UTC (permalink / raw)
To: Hans-Peter Nilsson; +Cc: gdb-patches
Hans-Peter Nilsson wrote:
> On Wed, 12 Jan 2005, Andrew Cagney wrote:
>
>>>Goody. I got this far as well, but thought I should get a grip
>>>on that ac_objext (and why not ac_cv_objext or whatever) thingy
>>>first. I had a similar patch for the SIM_AC_OUTPUT problem, but
>>>sed:ed out the space and kept the curious CONFIG_FILES test.
>>>(What was it there for?)
>>
>>Which config_files test?
>
>
> (No smiley?) The
> [case "x$CONFIG_FILES" in
> xMakefile*)
> that used to be in SIM_AC_OUTPUT, but which you just removed.
>
> Oh, I see now why it was there; CONFIG_FILES was supposed to
> have different values for the different AC_CONFIG_FILES parts.
Oh, that. Yea, I didn't understand it worked so I replaced it :-) (yes,
it was doing some sort of thing like you describe but I couldn't figure
out exactly how or what).
> Never mind, this is all history now. But since you asked.
Thanks
Andrew
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] Force generation of configure and other stuff; Was: [commit/sim] switch autoconf 2.59
2005-01-12 16:29 ` [commit/sim] Force generation of configure and other stuff; Was: " Andrew Cagney
2005-01-12 17:15 ` [commit/sim] Add common/common.m4; " Andrew Cagney
2005-01-12 17:53 ` [commit/sim] Force generation of configure and other stuff; " Hans-Peter Nilsson
@ 2005-01-13 2:01 ` Hans-Peter Nilsson
2 siblings, 0 replies; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-13 2:01 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Wed, 12 Jan 2005, Andrew Cagney wrote:
> Seems that you need
> to really want to run the new autoconf (unlike the old) - even though I
> ran autoconf in all those directories it didn't do as I ask. I've
> re-run it with --force and that's had an effect.
BIG WARNING regarding autoconf 2.59: stupid or nonexistent
dependency checking wrt. sincluded files. It doesn't seem to
follow sinclude wrt. changes, so if there was a change only in
such a file, configure isn't remade. So, I recommend always
using --force. Clues correcting any misunderstanding on my part
are welcome.
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] Add common/common.m4; Was: [commit/sim] switch autoconf 2.59
2005-01-12 17:15 ` [commit/sim] Add common/common.m4; " Andrew Cagney
@ 2005-01-13 4:04 ` Hans-Peter Nilsson
2005-01-13 13:17 ` Hans-Peter Nilsson
2005-01-13 21:50 ` Andrew Cagney
0 siblings, 2 replies; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-13 4:04 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
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". ;-)
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.
Editing aclocal:SIM_AC_COMMON to look *exactly* like common.a4
(or indeed leaving it the same; the ifelse does the same) and
this diff to sim/frv/configure.ac (note order of sincludes
assumed fixed as per above):
--- configure.ac.fixed Thu Jan 13 04:25:38 2005
+++ configure.ac Thu Jan 13 04:33:45 2005
@@ -3,7 +3,7 @@ AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
sinclude(../common/aclocal.m4)
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
*should* do the same. But it doesn't; it seems for example
AC_CANONICAL_SYSTEM and AC_PROG_CC aren't called (and from that
point configury derails causing declarations and macros wrong
and missing at compile time). Weird. A prominent note that the
contents of common.m4 must not be wrapped and called as a macro
seems in order. The comment at the top of common.m4
"autoconf.info says this should be called right after AC_INIT"
doesn't tell the important part of the story.
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] Add common/common.m4; Was: [commit/sim] switch autoconf 2.59
2005-01-13 4:04 ` Hans-Peter Nilsson
@ 2005-01-13 13:17 ` Hans-Peter Nilsson
2005-01-13 21:50 ` Andrew Cagney
1 sibling, 0 replies; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-13 13:17 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Wed, 12 Jan 2005, Hans-Peter Nilsson wrote:
> 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". ;-)
Anyway, I can clean it up if you wish. I'd:
- Remove sim/common/common.m4, including the contents last in
sim/common/aclocal.m4 (they're always used together and I can
see common.m4 using more / future macros from aclocal.m4) and
adjust all sim/* users.
- Remove SIM_AC_COMMON from aclocal.m4
- Put a big warning in before the common.m4/SIM_AC_COMMON
contents that the first macros in the former SIM_AC_COMMON
*must not* be wrapped in a macro.
- Build and test all sim targets. :-)
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] Add common/common.m4; Was: [commit/sim] switch autoconf 2.59
2005-01-13 4:04 ` Hans-Peter Nilsson
2005-01-13 13:17 ` Hans-Peter Nilsson
@ 2005-01-13 21:50 ` Andrew Cagney
2005-01-14 20:11 ` [commit/sim] flip and separate; Was: " Andrew Cagney
1 sibling, 1 reply; 20+ messages in thread
From: Andrew Cagney @ 2005-01-13 21:50 UTC (permalink / raw)
To: Hans-Peter Nilsson; +Cc: gdb-patches
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
^ permalink raw reply [flat|nested] 20+ messages in thread
* [commit/sim] flip and separate; Was: [commit/sim] Add common/common.m4; Was: [commit/sim] switch autoconf 2.59
2005-01-13 21:50 ` Andrew Cagney
@ 2005-01-14 20:11 ` Andrew Cagney
2005-01-14 21:46 ` Hans-Peter Nilsson
0 siblings, 1 reply; 20+ messages in thread
From: Andrew Cagney @ 2005-01-14 20:11 UTC (permalink / raw)
To: gdb-patches; +Cc: Hans-Peter Nilsson
[-- Attachment #1: Type: text/plain, Size: 2007 bytes --]
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
>
[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 13215 bytes --]
Index: arm/ChangeLog
2005-01-14 Andrew Cagney <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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 <cagney@gnu.org>
* 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
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [commit/sim] flip and separate; Was: [commit/sim] Add common/common.m4; Was: [commit/sim] switch autoconf 2.59
2005-01-14 20:11 ` [commit/sim] flip and separate; Was: " Andrew Cagney
@ 2005-01-14 21:46 ` Hans-Peter Nilsson
0 siblings, 0 replies; 20+ messages in thread
From: Hans-Peter Nilsson @ 2005-01-14 21:46 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
On Fri, 14 Jan 2005, Andrew Cagney wrote:
> 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?
Cool, frv-sim works (used as a model for sim/cris).
Thanks!
Now all that's left to appease us pedants is to remove the
now-uncalled SIM_AC_COMMON macro (fix all references to it in
comments to say something like "when X is in a macro"), adjust
all AC_PREREQ examples to say 2.59 and the related stuff in
README-HACKING. ;-)
brgds, H-P
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2005-01-14 21:46 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-08 3:40 [commit/sim] switch autoconf 2.59 Andrew Cagney
2005-01-08 4:07 ` Daniel Jacobowitz
2005-01-10 16:18 ` Andrew Cagney
2005-01-11 20:20 ` Hans-Peter Nilsson
2005-01-11 21:06 ` Andrew Cagney
2005-01-12 1:17 ` Hans-Peter Nilsson
2005-01-12 1:26 ` Andrew Cagney
2005-01-12 2:00 ` Hans-Peter Nilsson
2005-01-12 16:29 ` [commit/sim] Force generation of configure and other stuff; Was: " Andrew Cagney
2005-01-12 17:15 ` [commit/sim] Add common/common.m4; " Andrew Cagney
2005-01-13 4:04 ` Hans-Peter Nilsson
2005-01-13 13:17 ` Hans-Peter Nilsson
2005-01-13 21:50 ` Andrew Cagney
2005-01-14 20:11 ` [commit/sim] flip and separate; Was: " Andrew Cagney
2005-01-14 21:46 ` Hans-Peter Nilsson
2005-01-12 17:53 ` [commit/sim] Force generation of configure and other stuff; " Hans-Peter Nilsson
2005-01-12 18:12 ` Andrew Cagney
2005-01-12 18:19 ` Hans-Peter Nilsson
2005-01-12 18:50 ` Andrew Cagney
2005-01-13 2:01 ` Hans-Peter Nilsson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox