From 5f3ef9d03542dc296b9f34b1d01711028c042f55 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 15 Jun 2012 17:20:10 +0000 Subject: 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. --- sim/m68hc11/ChangeLog | 4 ++++ sim/m68hc11/config.in | 3 +++ sim/m68hc11/configure | 12 ++++++++++++ 3 files changed, 19 insertions(+) (limited to 'sim/m68hc11') diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 1c2dd96..645bd8b 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2012-06-15 Joel Brobecker + + * config.in, configure: Regenerate. + 2012-03-24 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. 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" -- cgit v1.1