diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2012-06-15 17:20:10 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2012-06-15 17:20:10 +0000 |
| commit | 5f3ef9d03542dc296b9f34b1d01711028c042f55 (patch) | |
| tree | fb373035e84dcfb0ec698bffebe1a80aeb79a347 /sim/common | |
| parent | 663b969e6822015e34d1ab00084501a600341ab2 (diff) | |
| download | gdb-5f3ef9d03542dc296b9f34b1d01711028c042f55.zip gdb-5f3ef9d03542dc296b9f34b1d01711028c042f55.tar.gz gdb-5f3ef9d03542dc296b9f34b1d01711028c042f55.tar.bz2 | |
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.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/common/acinclude.m4 | 7 | ||||
| -rw-r--r-- | sim/common/config.in | 3 | ||||
| -rwxr-xr-x | sim/common/configure | 12 |
4 files changed, 27 insertions, 0 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 54a5613..75afcc1 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 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" |