This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA/sim 1/3] Define PACKAGE macro in all sims' config.h.
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Cc: Joel Brobecker <brobecker at adacore dot com>
- Date: Thu, 14 Jun 2012 11:11:56 -0700
- Subject: [RFA/sim 1/3] Define PACKAGE macro in all sims' config.h.
- References: <1339697518-11847-1-git-send-email-brobecker@adacore.com>
Some of the common includes in include/gdb such as callback.h
include bfd.h. But there was a recent change in bfd-in.h to
require that config.h be included before bfd.h can be included:
/* PR 14072: Ensure that config.h is included first. */
#if !defined PACKAGE && !defined PACKAGE_VERSION
#error config.h must be included before this header
#endif
PACKAGE_VERSION is always defined by default by the AC_INIT autoconf
macro, but PACKAGE isn't. This patch updates the SIM_AC_COMMON macro
to define it, and then regenerates all configure scripts and config.in
files.
sim/common/changeLog:
* acinclude.m4 (SIM_AC_COMMON): Define PACKAGE.
* config.in, configure: Regenerate.
sim/ChangeLog:
* configure: Regenerate.
sim/arm/ChangeLog:
* config.in, configure: Regenerate.
sim/avr/ChangeLog:
* config.in, configure: Regenerate.
sim/bfin/ChangeLog:
* config.in, configure: Regenerate.
sim/cr16/ChangeLog:
* config.in, configure: Regenerate.
sim/cris/ChangeLog:
* config.in, configure: Regenerate.
sim/d10v/ChangeLog:
* config.in, configure: Regenerate.
sim/erc32/ChangeLog:
* config.in, configure: Regenerate.
sim/frv/ChangeLog:
* config.in, configure: Regenerate.
sim/h8300/ChangeLog:
* config.in, configure: Regenerate.
sim/iq2000/ChangeLog:
* config.in, configure: Regenerate.
sim/lm32/ChangeLog:
* config.in, configure: Regenerate.
sim/m32c/ChangeLog:
* config.in, configure: Regenerate.
sim/m32c/ChangeLog:
* config.in, configure: Regenerate.
sim/m32r/ChangeLog:
* config.in, configure: Regenerate.
sim/m68hc11/ChangeLog:
* config.in, configure: Regenerate.
sim/mcore/ChangeLog:
* config.in, configure: Regenerate.
sim/microblaze/ChangeLog:
* config.in, configure: Regenerate.
sim/mips/ChangeLog:
* config.in, configure: Regenerate.
sim/mn10300/ChangeLog:
* config.in, configure: Regenerate.
sim/moxie/ChangeLog:
* config.in, configure: Regenerate.
sim/ppc/ChangeLog:
* configure: Regenerate.
sim/rl78/ChangeLog:
* config.in, configure: Regenerate.
sim/rx/ChangeLog:
* config.in, configure: Regenerate.
sim/sh/ChangeLog:
* config.in, configure: Regenerate.
sim/sh64/ChangeLog:
* config.in, configure: Regenerate.
sim/v850/ChangeLog:
* config.in, configure: Regenerate.
sim/testsuite/ChangeLog:
* configure: Regenerate.
Tested on erc32-elf (x86_64-linux host).
OK to commit?
---
sim/arm/config.in | 3 +++
sim/arm/configure | 12 ++++++++++++
sim/avr/config.in | 3 +++
sim/avr/configure | 12 ++++++++++++
sim/bfin/config.in | 3 +++
sim/bfin/configure | 12 ++++++++++++
sim/common/acinclude.m4 | 7 +++++++
sim/common/config.in | 3 +++
sim/common/configure | 12 ++++++++++++
sim/configure | 12 ++++++------
sim/cr16/config.in | 3 +++
sim/cr16/configure | 12 ++++++++++++
sim/cris/config.in | 3 +++
sim/cris/configure | 12 ++++++++++++
sim/d10v/config.in | 3 +++
sim/d10v/configure | 12 ++++++++++++
sim/erc32/config.in | 3 +++
sim/erc32/configure | 12 ++++++++++++
sim/frv/config.in | 3 +++
sim/frv/configure | 12 ++++++++++++
sim/h8300/config.in | 3 +++
sim/h8300/configure | 12 ++++++++++++
sim/iq2000/config.in | 3 +++
sim/iq2000/configure | 12 ++++++++++++
sim/lm32/config.in | 3 +++
sim/lm32/configure | 12 ++++++++++++
sim/m32c/config.in | 3 +++
sim/m32c/configure | 12 ++++++++++++
sim/m32r/config.in | 3 +++
sim/m32r/configure | 12 ++++++++++++
sim/m68hc11/config.in | 3 +++
sim/m68hc11/configure | 12 ++++++++++++
sim/mcore/config.in | 3 +++
sim/mcore/configure | 12 ++++++++++++
sim/microblaze/config.in | 3 +++
sim/microblaze/configure | 12 ++++++++++++
sim/mips/config.in | 3 +++
sim/mips/configure | 12 ++++++++++++
sim/mn10300/config.in | 3 +++
sim/mn10300/configure | 12 ++++++++++++
sim/moxie/config.in | 3 +++
sim/moxie/configure | 12 ++++++++++++
sim/ppc/configure | 44 +++++++++++++++++++++++++++++++++++++++++---
sim/rl78/config.in | 3 +++
sim/rl78/configure | 12 ++++++++++++
sim/rx/config.in | 3 +++
sim/rx/configure | 12 ++++++++++++
sim/sh/config.in | 3 +++
sim/sh/configure | 12 ++++++++++++
sim/sh64/config.in | 3 +++
sim/sh64/configure | 12 ++++++++++++
sim/testsuite/configure | 2 +-
sim/v850/config.in | 3 +++
sim/v850/configure | 12 ++++++++++++
54 files changed, 430 insertions(+), 10 deletions(-)
diff --git a/sim/arm/config.in b/sim/arm/config.in
index 76a9126..0db6f1e 100644
--- a/sim/arm/config.in
+++ b/sim/arm/config.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/arm/configure b/sim/arm/configure
index bf7179e..48cfa9a 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -620,6 +620,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4051,6 +4052,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/avr/config.in b/sim/avr/config.in
index 76a9126..0db6f1e 100644
--- a/sim/avr/config.in
+++ b/sim/avr/config.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/avr/configure b/sim/avr/configure
index 464b555..a6af470 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4050,6 +4051,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/bfin/config.in b/sim/bfin/config.in
index 80a9adb..04d1e5d 100644
--- a/sim/bfin/config.in
+++ b/sim/bfin/config.in
@@ -130,6 +130,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/bfin/configure b/sim/bfin/configure
index 286cda8..c36fa89 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -625,6 +625,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4090,6 +4091,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index ef42775..fe0a5b7 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -47,6 +47,13 @@ AR=${AR-ar}
AC_SUBST(AR)
AC_PROG_RANLIB
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])
+AC_SUBST(PACKAGE)
+
# Dependency checking.
ZW_CREATE_DEPDIR
ZW_PROG_COMPILER_DEPENDENCIES([CC])
diff --git a/sim/common/config.in b/sim/common/config.in
index 040079c..db15bcc 100644
--- a/sim/common/config.in
+++ b/sim/common/config.in
@@ -139,6 +139,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/common/configure b/sim/common/configure
index a9d8925..d6ad959 100755
--- a/sim/common/configure
+++ b/sim/common/configure
@@ -620,6 +620,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -3854,6 +3855,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/configure b/sim/configure
index 8fb62cb..7fd0fd8 100755
--- a/sim/configure
+++ b/sim/configure
@@ -3768,17 +3768,17 @@ subdirs="$subdirs arm"
sim_testsuite=yes
;;
- rx-*-*)
+ rl78-*-*)
- sim_arch=rx
- subdirs="$subdirs rx"
+ sim_arch=rl78
+ subdirs="$subdirs rl78"
;;
- rl78-*-*)
+ rx-*-*)
- sim_arch=rl78
- subdirs="$subdirs rl78"
+ sim_arch=rx
+ subdirs="$subdirs rx"
;;
diff --git a/sim/cr16/config.in b/sim/cr16/config.in
index 76a9126..0db6f1e 100644
--- a/sim/cr16/config.in
+++ b/sim/cr16/config.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/cr16/configure b/sim/cr16/configure
index 8e69d60..cb3a339 100644
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4058,6 +4059,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/cris/config.in b/sim/cris/config.in
index 809fc79..a00564c 100644
--- a/sim/cris/config.in
+++ b/sim/cris/config.in
@@ -91,6 +91,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/cris/configure b/sim/cris/configure
index 9bfebd5..153be18 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -622,6 +622,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4077,6 +4078,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/d10v/config.in b/sim/d10v/config.in
index 76a9126..0db6f1e 100644
--- a/sim/d10v/config.in
+++ b/sim/d10v/config.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/d10v/configure b/sim/d10v/configure
index 8e69d60..cb3a339 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4058,6 +4059,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/erc32/config.in b/sim/erc32/config.in
index 76a9126..0db6f1e 100644
--- a/sim/erc32/config.in
+++ b/sim/erc32/config.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/erc32/configure b/sim/erc32/configure
index 1ef137c..dfab09d 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -621,6 +621,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4052,6 +4053,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/frv/config.in b/sim/frv/config.in
index 2f19ba3..8de933c 100644
--- a/sim/frv/config.in
+++ b/sim/frv/config.in
@@ -76,6 +76,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/frv/configure b/sim/frv/configure
index 1bbe75d..cc027a1 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -623,6 +623,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4070,6 +4071,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/h8300/config.in b/sim/h8300/config.in
index cbaba1a..23e3b04 100644
--- a/sim/h8300/config.in
+++ b/sim/h8300/config.in
@@ -76,6 +76,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/h8300/configure b/sim/h8300/configure
index 61dabac..7aa66b9 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4050,6 +4051,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/iq2000/config.in b/sim/iq2000/config.in
index 2f19ba3..8de933c 100644
--- a/sim/iq2000/config.in
+++ b/sim/iq2000/config.in
@@ -76,6 +76,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index c0cab54..13a8648 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -622,6 +622,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4069,6 +4070,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/lm32/config.in b/sim/lm32/config.in
index 777d363..faafaf4 100644
--- a/sim/lm32/config.in
+++ b/sim/lm32/config.in
@@ -79,6 +79,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/lm32/configure b/sim/lm32/configure
index faf13ef..b4826ca 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -622,6 +622,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4069,6 +4070,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/m32c/config.in b/sim/m32c/config.in
index 2f21832..5de3b5e 100644
--- a/sim/m32c/config.in
+++ b/sim/m32c/config.in
@@ -88,6 +88,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/m32c/configure b/sim/m32c/configure
index 4ea7421..1b01ae3 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4050,6 +4051,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/m32r/config.in b/sim/m32r/config.in
index 2f19ba3..8de933c 100644
--- a/sim/m32r/config.in
+++ b/sim/m32r/config.in
@@ -76,6 +76,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 5a68f03..382a4b2 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -624,6 +624,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4071,6 +4072,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/m68hc11/config.in b/sim/m68hc11/config.in
index 777d363..faafaf4 100644
--- a/sim/m68hc11/config.in
+++ b/sim/m68hc11/config.in
@@ -79,6 +79,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 667f0a0..c7eaea0 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -620,6 +620,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4067,6 +4068,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/mcore/config.in b/sim/mcore/config.in
index 76a9126..0db6f1e 100644
--- a/sim/mcore/config.in
+++ b/sim/mcore/config.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/mcore/configure b/sim/mcore/configure
index bb2d474..e9a1003 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4050,6 +4051,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/microblaze/config.in b/sim/microblaze/config.in
index 76a9126..0db6f1e 100644
--- a/sim/microblaze/config.in
+++ b/sim/microblaze/config.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index bb2d474..e9a1003 100644
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4050,6 +4051,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/mips/config.in b/sim/mips/config.in
index 064a530..9f71eb8 100644
--- a/sim/mips/config.in
+++ b/sim/mips/config.in
@@ -88,6 +88,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/mips/configure b/sim/mips/configure
index 991e42c..1986f33 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -631,6 +631,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4096,6 +4097,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in
index eb41f73..94d0403 100644
--- a/sim/mn10300/config.in
+++ b/sim/mn10300/config.in
@@ -100,6 +100,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 00fb879..1529ac3 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4072,6 +4073,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/moxie/config.in b/sim/moxie/config.in
index 2f19ba3..8de933c 100644
--- a/sim/moxie/config.in
+++ b/sim/moxie/config.in
@@ -76,6 +76,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/moxie/configure b/sim/moxie/configure
index 3860f11..5659a75 100644
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -620,6 +620,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4061,6 +4062,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/ppc/configure b/sim/ppc/configure
index d0604d2..fd89cb6 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -2450,6 +2450,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+## -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# Based on depend.m4 from automake 1.9, modified for standalone use in
+# an environment where GNU make is required.
+
+# ZW_PROG_COMPILER_DEPENDENCIES
+# -----------------------------
+# Variant of _AM_DEPENDENCIES which just does the dependency probe and
+# sets fooDEPMODE accordingly. Cache-variable compatible with
+# original; not side-effect compatible. As the users of this macro
+# may require accurate dependencies for correct builds, it does *not*
+# honor --disable-dependency-checking, and failure to detect a usable
+# method is an error. depcomp is assumed to be located in
+# $ac_aux_dir.
+#
+# FIXME: Should use the Autoconf 2.5x language-selection mechanism.
+
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+
+
+# ZW_CREATE_DEPDIR
+# ----------------
+# As AM_SET_DEPDIR, but also create the directory at config.status time.
+
+
@@ -2625,9 +2663,9 @@ sim_inline="-DDEFAULT_INLINE=0"
# AC_PROG_CPP_WERROR
# Test for GNAT.
-# We require the gnatbind program, and a compiler driver that
-# understands Ada. We use the user's CC setting, already found,
-# and possibly add $1 to the command-line parameters.
+# We require the gnatbind & gnatmake programs, as well as a compiler driver
+# that understands Ada. We use the user's CC setting, already found, and
+# possibly add $1 to the command-line parameters.
#
# Sets the shell variable have_gnat to yes or no as appropriate, and
# substitutes GNATBIND and GNATMAKE.
diff --git a/sim/rl78/config.in b/sim/rl78/config.in
index e1d48bd..f7b31b1 100644
--- a/sim/rl78/config.in
+++ b/sim/rl78/config.in
@@ -76,6 +76,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 062648c..55cd484 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4050,6 +4051,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/rx/config.in b/sim/rx/config.in
index b640523..8af1fff 100644
--- a/sim/rx/config.in
+++ b/sim/rx/config.in
@@ -82,6 +82,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/rx/configure b/sim/rx/configure
index e233fd6..933f61d 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4054,6 +4055,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/sh/config.in b/sim/sh/config.in
index 76a9126..0db6f1e 100644
--- a/sim/sh/config.in
+++ b/sim/sh/config.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/sh/configure b/sim/sh/configure
index bb2d474..e9a1003 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4050,6 +4051,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/sh64/config.in b/sim/sh64/config.in
index 2f19ba3..8de933c 100644
--- a/sim/sh64/config.in
+++ b/sim/sh64/config.in
@@ -76,6 +76,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/sh64/configure b/sim/sh64/configure
index df992ca..69e74f6 100755
--- a/sim/sh64/configure
+++ b/sim/sh64/configure
@@ -622,6 +622,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4069,6 +4070,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
diff --git a/sim/testsuite/configure b/sim/testsuite/configure
index 6a582ab..f03443b 100755
--- a/sim/testsuite/configure
+++ b/sim/testsuite/configure
@@ -1907,7 +1907,7 @@ case "${target}" in
sim_arch=sh
sim_testsuite=yes
;;
- sparc-*-rtems*|sparc-*-elf*)
+ sparc-*-rtems*|sparc-*-elf*|erc32*-*-*)
sim_arch=erc32
sim_testsuite=yes
;;
diff --git a/sim/v850/config.in b/sim/v850/config.in
index 4c78de4..a3f18e9 100644
--- a/sim/v850/config.in
+++ b/sim/v850/config.in
@@ -97,6 +97,9 @@
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/sim/v850/configure b/sim/v850/configure
index 0764760..7a3142e 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -619,6 +619,7 @@ MAKE
CCDEPMODE
DEPDIR
am__leading_dot
+PACKAGE
RANLIB
AR
HDEFINES
@@ -4068,6 +4069,17 @@ else
fi
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
# Dependency checking.
ac_config_commands="$ac_config_commands depdir"
--
1.7.1