Define PACKAGE macro in all sims' config.h.

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/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.

82 files changed, 543 insertions, 10 deletions

diff --git a/sim/ChangeLog b/sim/ChangeLog
index db1fecb6d7c..638a5ce664c 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure: Regenerate.
+
 2012-06-06  Michael Eager  <eager@eagercon.com>
 
 	* microblaze/interp.c (config.h): Add #include.
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index b0af3dc757b..7757c8ce5a3 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-06-13  Nick Clifton  <nickc@redhat.com>
 
 	* wrapper.c (sim_create_inferior): Treat WMMX2 binaries as iWMMXt
diff --git a/sim/arm/config.in b/sim/arm/config.in
index 76a912604f8..0db6f1eacf3 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 bf7179ebc12..48cfa9a045b 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/ChangeLog b/sim/avr/ChangeLog
index 7b38a16782b..15c287628f4 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/7205
diff --git a/sim/avr/config.in b/sim/avr/config.in
index 76a912604f8..0db6f1eacf3 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 464b55511b3..a6af4702a28 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/ChangeLog b/sim/bfin/ChangeLog
index d27f888dda3..5d09b5a6056 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-04-09  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_HARDWARE): Add bfin_pint.
diff --git a/sim/bfin/config.in b/sim/bfin/config.in
index 80a9adb12d7..04d1e5dabf1 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 286cda89539..c36fa89ca22 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/ChangeLog b/sim/common/ChangeLog
index 54a56134ffa..75afcc19a56 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-16  Joel Brobecker  <brobecker@adacore.com>
+
+	* acinclude.m4 (SIM_AC_COMMON): Define PACKAGE.
+	* config.in, configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	* sim-signal.h (sim_signal_to_target): Rename to ...
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index ef4277503f1..fe0a5b72874 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 040079cdf9a..db15bcc0db0 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 a9d8925139f..d6ad959b3b8 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 8fb62cb440e..7fd0fd8bf47 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/ChangeLog b/sim/cr16/ChangeLog
index c7f11898793..8c3c5a1cd79 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/7205
diff --git a/sim/cr16/config.in b/sim/cr16/config.in
index 76a912604f8..0db6f1eacf3 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 8e69d60518b..cb3a339d1ee 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/ChangeLog b/sim/cris/ChangeLog
index 3f538ecc5fb..a14285cd716 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-18  Nick Clifton  <nickc@redhat.com>
 
 	PR 14072
diff --git a/sim/cris/config.in b/sim/cris/config.in
index 809fc7989ac..a00564c82d2 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 9bfebd58aef..153be18b47d 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/ChangeLog b/sim/d10v/ChangeLog
index 58b34116cb2..1266ead6051 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/7205
diff --git a/sim/d10v/config.in b/sim/d10v/config.in
index 76a912604f8..0db6f1eacf3 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 8e69d60518b..cb3a339d1ee 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/ChangeLog b/sim/erc32/ChangeLog
index 71181e1aee3..3df021f4241 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/7205
diff --git a/sim/erc32/config.in b/sim/erc32/config.in
index 76a912604f8..0db6f1eacf3 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 1ef137cbadf..dfab09d0db8 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/ChangeLog b/sim/frv/ChangeLog
index dfc6928dc1b..c9af6e88dc4 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/frv/config.in b/sim/frv/config.in
index 2f19ba359c7..8de933c329d 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 1bbe75da2aa..cc027a1a846 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/ChangeLog b/sim/h8300/ChangeLog
index 2aaf0fbf2a8..9317b17b86a 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-18  Nick Clifton  <nickc@redhat.com>
 
 	PR 14072
diff --git a/sim/h8300/config.in b/sim/h8300/config.in
index cbaba1a693f..23e3b0492c2 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 61dabac9c81..7aa66b9db95 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/ChangeLog b/sim/iq2000/ChangeLog
index 2fe8559eb27..553c8ef9a45 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/iq2000/config.in b/sim/iq2000/config.in
index 2f19ba359c7..8de933c329d 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 c0cab542b8c..13a86481b38 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/ChangeLog b/sim/lm32/ChangeLog
index c691c7f1fbe..df256ecdcb8 100755
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/lm32/config.in b/sim/lm32/config.in
index 777d3637b9d..faafaf4488d 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 faf13ef78ad..b4826ca0dc0 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/ChangeLog b/sim/m32c/ChangeLog
index 63d6b4acf11..3293da022dc 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/7205
diff --git a/sim/m32c/config.in b/sim/m32c/config.in
index 2f2183263ae..5de3b5e9232 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 4ea74215150..1b01ae3caa1 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/ChangeLog b/sim/m32r/ChangeLog
index d59b73c120d..e0cf4917bb1 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-25  Mike Frysinger  <vapier@gentoo.org>
 
 	* traps-linux.c (sim_core_trans_addr): Delete prototype.
diff --git a/sim/m32r/config.in b/sim/m32r/config.in
index 2f19ba359c7..8de933c329d 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 5a68f030903..382a4b213bc 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/ChangeLog b/sim/m68hc11/ChangeLog
index 1c2dd9649dd..645bd8bc95a 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/m68hc11/config.in b/sim/m68hc11/config.in
index 777d3637b9d..faafaf4488d 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 667f0a04e2b..c7eaea0c31f 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/ChangeLog b/sim/mcore/ChangeLog
index 099b2a407d5..c81a80c9b20 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-20  Hans-Peter Nilsson  <hp@axis.com>
 
 	PR 14072
diff --git a/sim/mcore/config.in b/sim/mcore/config.in
index 76a912604f8..0db6f1eacf3 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 bb2d47453cc..e9a1003c548 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/ChangeLog b/sim/microblaze/ChangeLog
index 3cd0a98b073..b36edef19cc 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/microblaze/config.in b/sim/microblaze/config.in
index 76a912604f8..0db6f1eacf3 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 bb2d47453cc..e9a1003c548 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/ChangeLog b/sim/mips/ChangeLog
index c74038a7018..39830b1617f 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-18  Nick Clifton  <nickc@redhat.com>
 
 	PR 14072
diff --git a/sim/mips/config.in b/sim/mips/config.in
index 064a530c393..9f71eb855f7 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 991e42cdf7e..1986f330918 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/ChangeLog b/sim/mn10300/ChangeLog
index 91523db29ed..e8640a7a413 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in
index eb41f73da25..94d04031b91 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 00fb879e4d4..1529ac327b6 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/ChangeLog b/sim/moxie/ChangeLog
index e5bb19b6bd3..1b357760f45 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/moxie/config.in b/sim/moxie/config.in
index 2f19ba359c7..8de933c329d 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 3860f113815..5659a75255e 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/ChangeLog b/sim/ppc/ChangeLog
index b7ba20deec9..9d5be6f300c 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/7205
diff --git a/sim/ppc/configure b/sim/ppc/configure
index d0604d2d509..fd89cb63bc4 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/ChangeLog b/sim/rl78/ChangeLog
index 893bfb32419..b3bddf73662 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/7205
diff --git a/sim/rl78/config.in b/sim/rl78/config.in
index e1d48bdddca..f7b31b125e3 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 062648cc055..55cd48400be 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/ChangeLog b/sim/rx/ChangeLog
index 52c291fb5a9..e5cb451a355 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-24  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/7205
diff --git a/sim/rx/config.in b/sim/rx/config.in
index b640523866e..8af1fff8b58 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 e233fd616c4..933f61d03ce 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/ChangeLog b/sim/sh/ChangeLog
index 4ac9054c835..44f3513850d 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/sh/config.in b/sim/sh/config.in
index 76a912604f8..0db6f1eacf3 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 bb2d47453cc..e9a1003c548 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/ChangeLog b/sim/sh64/ChangeLog
index 50e0c1643f9..25751be0a5f 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-05-18  Nick Clifton  <nickc@redhat.com>
 
 	PR 14072
diff --git a/sim/sh64/config.in b/sim/sh64/config.in
index 2f19ba359c7..8de933c329d 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 df992ca2d45..69e74f6d840 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/ChangeLog b/sim/testsuite/ChangeLog
index 436333290f5..4eae80df2ad 100644
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure: Regenerate.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/testsuite/configure b/sim/testsuite/configure
index 6a582ab1714..f03443b4bef 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/ChangeLog b/sim/v850/ChangeLog
index e1430eed16b..5c4f25de8fb 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.in, configure: Regenerate.
+
 2012-03-28  Rathish C  <rathish.c@kpitcummins.com>
 
 	* sim-main.h (struct _v850_regs): Add new fields mpu0_sregs,
diff --git a/sim/v850/config.in b/sim/v850/config.in
index 4c78de40328..a3f18e95bbd 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 07647609c57..7a3142e56f0 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"