* Re: another build breakage
[not found] ` <20120518053358.GA29726@bubble.grove.modra.org>
@ 2012-05-18 13:12 ` Maciej W. Rozycki
2012-05-18 14:27 ` [PATCH] MIPS/sim: Fix " Maciej W. Rozycki
0 siblings, 1 reply; 6+ messages in thread
From: Maciej W. Rozycki @ 2012-05-18 13:12 UTC (permalink / raw)
To: Alan Modra
Cc: Cary Coutant, Tom Tromey, Nick Clifton, Binutils Development, gdb
On Fri, 18 May 2012, Alan Modra wrote:
> Hopefully this is the last of them. Committed.
>
> gas/
> * config/obj-evax.c: Include as.h first.
> opcodes/
> * ia64-opc.c: Remove #include "ansidecl.h".
> * z8kgen.c: Include sysdep.h first.
Not quite so (with mips-sde-elf):
i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -DPROFILE=1 -DWITH_PROFILE=-1 -DWITH_ALIGNMENT=NONSTRICT_ALIGNMENT -DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=63 -DWITH_DEFAULT_TARGET_BYTE_ORDER=BIG_ENDIAN -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=64 -DWITH_HW=0 -DWITH_HOST_BYTE_ORDER=LITTLE_ENDIAN -DWITH_RESERVED_BITS=1 -DWITH_SMP=0 -Wall -Wdeclaration-after-statement -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -DTARGET_ENABLE_FR=1 -DMIPS_MACH_DEFAULT=bfd_mach_mipsisa64r2 -I. -I.../sim/mips -I../common -I.../sim/mips/../common -I../../include -I.../sim/mips/../..//include -I../../bfd -I.../sim/mips/../..//bfd -I../../opcodes -I.../sim/mips/../..//opcodes -g -O2 -c -o callback.o -MT callback.o -MMD -MP -MF .deps/callback.Tpo .../sim/mips/../common/callback.c
In file included from .../sim/mips/../..//include/gdb/callback.h:55,
from .../sim/mips/../common/callback.c:49:
../../bfd/bfd.h:36:2: error: #error config.h must be included before this headermake[3]: *** [callback.o] Error 1
make[3]: Leaving directory `.../sim/mips'
-- are we supposed to fix it up in GDB/simulator? What about any config.h
discrepancies between subdirs (noted by someone already)?
Maciej
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] MIPS/sim: Fix build breakage
2012-05-18 13:12 ` another build breakage Maciej W. Rozycki
@ 2012-05-18 14:27 ` Maciej W. Rozycki
2012-05-19 3:49 ` Mike Frysinger
0 siblings, 1 reply; 6+ messages in thread
From: Maciej W. Rozycki @ 2012-05-18 14:27 UTC (permalink / raw)
To: Alan Modra
Cc: Cary Coutant, Tom Tromey, Nick Clifton, Binutils Development,
gdb, gdb-patches
On Fri, 18 May 2012, Maciej W. Rozycki wrote:
> > Hopefully this is the last of them. Committed.
> >
> > gas/
> > * config/obj-evax.c: Include as.h first.
> > opcodes/
> > * ia64-opc.c: Remove #include "ansidecl.h".
> > * z8kgen.c: Include sysdep.h first.
>
> Not quite so (with mips-sde-elf):
>
> i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -DPROFILE=1 -DWITH_PROFILE=-1 -DWITH_ALIGNMENT=NONSTRICT_ALIGNMENT -DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=63 -DWITH_DEFAULT_TARGET_BYTE_ORDER=BIG_ENDIAN -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=64 -DWITH_HW=0 -DWITH_HOST_BYTE_ORDER=LITTLE_ENDIAN -DWITH_RESERVED_BITS=1 -DWITH_SMP=0 -Wall -Wdeclaration-after-statement -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -DTARGET_ENABLE_FR=1 -DMIPS_MACH_DEFAULT=bfd_mach_mipsisa64r2 -I. -I.../sim/mips -I../common -I.../sim/mips/../common -I../../include -I.../sim/mips/../..//include -I../../bfd -I.../sim/mips/../..//bfd -I../../opcodes -I.../sim/mips/../..//opcodes -g -O2 -c -o callback.o -MT callback.o -MMD -MP -MF .deps/callback.Tpo .../sim/mips/../common/callback.c
> In file included from .../sim/mips/../..//include/gdb/callback.h:55,
> from .../sim/mips/../common/callback.c:49:
> ../../bfd/bfd.h:36:2: error: #error config.h must be included before this headermake[3]: *** [callback.o] Error 1
> make[3]: Leaving directory `.../sim/mips'
>
> -- are we supposed to fix it up in GDB/simulator? What about any config.h
> discrepancies between subdirs (noted by someone already)?
This fixes the build for me, I can connect to the MIPS simulator and
single-step, examine registers, etc., so it seems to work, but I haven't
verified it further, I am not fully set up to run GNU sim testing right
now. Obviously other targets may require further tweaks.
It looks like some generated files (i.e. ppc and the top-level) were not
rebuilt at the last check-in time too, hence differences beyond those
one'd expect from this change alone.
Maciej
2012-05-18 Maciej W. Rozycki <macro@codesourcery.com>
sim/common/
* acinclude.m4 (SIM_AC_COMMON): Define PACKAGE.
* gentmap.c (gen_targ_map_c): Produce "sim-main.h" inclusion.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
sim/igen/
* igen/configure.ac: Define PACKAGE.
* igen/config.in: Regenerate.
* igen/configure: Regenerate.
sim/mips/
* interp.c: Move the inclusion of "config.h" ahead of "bfd.h".
* config.in: Regenerate.
* configure: Regenerate.
sim/arm/
* config.in: Regenerate.
* configure: Regenerate.
sim/avr/
* config.in: Regenerate.
* configure: Regenerate.
sim/bfin/
* config.in: Regenerate.
* configure: Regenerate.
sim/cr16/
* config.in: Regenerate.
* configure: Regenerate.
sim/cris/
* config.in: Regenerate.
* configure: Regenerate.
sim/d10v/
* config.in: Regenerate.
* configure: Regenerate.
sim/erc32/
* config.in: Regenerate.
* configure: Regenerate.
sim/frv/
* config.in: Regenerate.
* configure: Regenerate.
sim/h8300/
* config.in: Regenerate.
* configure: Regenerate.
sim/iq2000/
* config.in: Regenerate.
* configure: Regenerate.
sim/lm32/
* config.in: Regenerate.
* configure: Regenerate.
sim/m32c/
* config.in: Regenerate.
* configure: Regenerate.
sim/m32r/
* config.in: Regenerate.
* configure: Regenerate.
sim/m68hc11/
* config.in: Regenerate.
* configure: Regenerate.
sim/mcore/
* config.in: Regenerate.
* configure: Regenerate.
sim/microblaze/
* config.in: Regenerate.
* configure: Regenerate.
sim/mn10300/
* config.in: Regenerate.
* configure: Regenerate.
sim/moxie/
* config.in: Regenerate.
* configure: Regenerate.
sim/ppc/
* configure: Regenerate.
sim/rl78/
* config.in: Regenerate.
* configure: Regenerate.
sim/rx/
* config.in: Regenerate.
* configure: Regenerate.
sim/sh/
* config.in: Regenerate.
* configure: Regenerate.
sim/sh64/
* config.in: Regenerate.
* configure: Regenerate.
sim/v850/
* config.in: Regenerate.
* configure: Regenerate.
sim/
* configure: Regenerate.
gdb-sim-config.diff
Index: gdb-fsf-trunk-quilt/sim/arm/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/arm/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/arm/configure 2012-05-18 14:49:43.085564202 +0100
@@ -649,6 +649,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3937,6 +3938,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/avr/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/avr/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/avr/configure 2012-05-18 14:49:36.655412331 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3936,6 +3937,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/bfin/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/bfin/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/bfin/configure 2012-05-18 14:49:46.735563666 +0100
@@ -654,6 +654,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3976,6 +3977,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/common/acinclude.m4
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/common/acinclude.m4 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/common/acinclude.m4 2012-05-18 14:48:28.535596656 +0100
@@ -28,6 +28,9 @@ AC_DEFUN([SIM_AC_COMMON],
AC_REQUIRE([AC_PROG_CC])
# autoconf.info says this should be called right after AC_INIT.
AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in)
+PACKAGE=sim
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package.])
+AC_SUBST(PACKAGE)
AC_CANONICAL_SYSTEM
AC_USE_SYSTEM_EXTENSIONS
AC_ARG_PROGRAM
Index: gdb-fsf-trunk-quilt/sim/common/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/common/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/common/configure 2012-05-18 14:49:37.945408730 +0100
@@ -642,6 +642,7 @@ build_os
build_vendor
build_cpu
build
+PACKAGE
OBJEXT
EXEEXT
ac_ct_CC
@@ -3744,6 +3745,13 @@ DEPDIR="${am__leading_dot}deps"
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers cconfig.h:config.in"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
Index: gdb-fsf-trunk-quilt/sim/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/configure 2012-05-18 14:49:38.315403831 +0100
@@ -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"
;;
Index: gdb-fsf-trunk-quilt/sim/cr16/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/cr16/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/cr16/configure 2012-05-18 14:49:40.125417369 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3944,6 +3945,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/cris/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/cris/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/cris/configure 2012-05-18 14:49:37.025559356 +0100
@@ -651,6 +651,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3963,6 +3964,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/d10v/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/d10v/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/d10v/configure 2012-05-18 14:49:38.655482056 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3944,6 +3945,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/erc32/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/erc32/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/erc32/configure 2012-05-18 14:49:35.945421288 +0100
@@ -650,6 +650,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3938,6 +3939,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/frv/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/frv/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/frv/configure 2012-05-18 14:49:37.435559393 +0100
@@ -652,6 +652,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3956,6 +3957,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/h8300/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/h8300/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/h8300/configure 2012-05-18 14:49:42.665428566 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3936,6 +3937,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/iq2000/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/iq2000/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/iq2000/configure 2012-05-18 14:49:39.415413704 +0100
@@ -651,6 +651,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3955,6 +3956,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/lm32/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/lm32/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/lm32/configure 2012-05-18 14:49:44.745560161 +0100
@@ -651,6 +651,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3955,6 +3956,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/m32c/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/m32c/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/m32c/configure 2012-05-18 14:49:36.295441763 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3936,6 +3937,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/m32r/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/m32r/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/m32r/configure 2012-05-18 14:49:40.845423470 +0100
@@ -653,6 +653,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3957,6 +3958,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/m68hc11/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/m68hc11/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/m68hc11/configure 2012-05-18 14:49:43.585560285 +0100
@@ -649,6 +649,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3953,6 +3954,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/mcore/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/mcore/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/mcore/configure 2012-05-18 14:49:47.205604219 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3936,6 +3937,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/microblaze/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/microblaze/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/microblaze/configure 2012-05-18 14:49:35.115434398 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3936,6 +3937,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/mips/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/mips/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/mips/configure 2012-05-18 14:49:46.055580379 +0100
@@ -660,6 +660,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3982,6 +3983,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/mn10300/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/mn10300/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/mn10300/configure 2012-05-18 14:49:34.775420701 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3958,6 +3959,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/moxie/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/moxie/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/moxie/configure 2012-05-18 14:49:40.485405821 +0100
@@ -649,6 +649,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3947,6 +3948,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/ppc/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/ppc/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/ppc/configure 2012-05-18 14:49:39.065445499 +0100
@@ -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.
Index: gdb-fsf-trunk-quilt/sim/rl78/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/rl78/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/rl78/configure 2012-05-18 14:49:45.385563684 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3936,6 +3937,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/rx/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/rx/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/rx/configure 2012-05-18 14:49:34.415403594 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3940,6 +3941,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/sh/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/sh/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/sh/configure 2012-05-18 14:49:47.545428721 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3936,6 +3937,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/sh64/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/sh64/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/sh64/configure 2012-05-18 14:49:44.085560309 +0100
@@ -651,6 +651,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3955,6 +3956,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/v850/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/v850/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/v850/configure 2012-05-18 14:49:39.775429397 +0100
@@ -648,6 +648,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -3954,6 +3955,13 @@ rmdir .tst 2>/dev/null
DEPDIR="${am__leading_dot}deps"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
# autoconf.info says this should be called right after AC_INIT.
ac_config_headers="$ac_config_headers config.h:config.in"
Index: gdb-fsf-trunk-quilt/sim/arm/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/arm/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/arm/config.in 2012-05-18 14:41:19.125567532 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/avr/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/avr/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/avr/config.in 2012-05-18 14:41:19.125567532 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/bfin/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/bfin/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/bfin/config.in 2012-05-18 14:41:19.125567532 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/common/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/common/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/common/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/cr16/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/cr16/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/cr16/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/cris/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/cris/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/cris/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/d10v/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/d10v/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/d10v/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/erc32/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/erc32/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/erc32/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/frv/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/frv/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/frv/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/h8300/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/h8300/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/h8300/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/iq2000/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/iq2000/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/iq2000/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/lm32/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/lm32/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/lm32/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/m32c/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/m32c/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/m32c/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/m32r/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/m32r/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/m32r/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/m68hc11/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/m68hc11/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/m68hc11/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/mcore/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/mcore/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/mcore/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/microblaze/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/microblaze/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/microblaze/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/mips/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/mips/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/mips/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/mn10300/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/mn10300/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/mn10300/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/moxie/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/moxie/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/moxie/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/rl78/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/rl78/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/rl78/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/rx/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/rx/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/rx/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/sh/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/sh/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/sh/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/sh64/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/sh64/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/sh64/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/v850/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/v850/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/v850/config.in 2012-05-18 14:41:19.135580284 +0100
@@ -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
Index: gdb-fsf-trunk-quilt/sim/igen/config.in
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/igen/config.in 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/igen/config.in 2012-05-18 14:49:35.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Name of this package. */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
Index: gdb-fsf-trunk-quilt/sim/igen/configure
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/igen/configure 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/igen/configure 2012-05-18 14:49:35.585559367 +0100
@@ -623,6 +623,7 @@ CC
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
+PACKAGE
WERROR_CFLAGS
WARN_CFLAGS
sim_xor_endian
@@ -2355,6 +2356,14 @@ sim_inline="-DDEFAULT_INLINE=0"
+PACKAGE=sim
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
for ac_t in install-sh install.sh shtool; do
Index: gdb-fsf-trunk-quilt/sim/igen/configure.ac
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/igen/configure.ac 2012-05-18 14:41:13.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/igen/configure.ac 2012-05-18 14:49:06.495409894 +0100
@@ -3,6 +3,10 @@ AC_PREREQ(2.59)dnl
AC_INIT(table.h)
sinclude(../common/acinclude.m4)
+PACKAGE=sim
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package.])
+AC_SUBST(PACKAGE)
+
AC_PROG_INSTALL
AC_PROG_CC
Index: gdb-fsf-trunk-quilt/sim/common/gentmap.c
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/common/gentmap.c 2010-05-18 18:26:36.000000000 +0100
+++ gdb-fsf-trunk-quilt/sim/common/gentmap.c 2012-05-18 14:57:00.685560781 +0100
@@ -68,6 +68,7 @@ gen_targ_map_c ()
printf ("#include <errno.h>\n");
printf ("#include <fcntl.h>\n");
+ printf ("#include \"sim-main.h\"\n");
printf ("#include \"ansidecl.h\"\n");
printf ("#include \"gdb/callback.h\"\n");
printf ("#include \"targ-vals.h\"\n");
Index: gdb-fsf-trunk-quilt/sim/mips/interp.c
===================================================================
--- gdb-fsf-trunk-quilt.orig/sim/mips/interp.c 2011-11-08 11:26:22.000000000 +0000
+++ gdb-fsf-trunk-quilt/sim/mips/interp.c 2012-05-18 14:59:54.655559388 +0100
@@ -29,6 +29,8 @@ code on the hardware.
#define TRACE (1)
#endif
+#include "config.h"
+
#include "bfd.h"
#include "sim-main.h"
#include "sim-utils.h"
@@ -39,8 +41,6 @@ code on the hardware.
#include "itable.h"
-#include "config.h"
-
#include <stdio.h>
#include <stdarg.h>
#include <ansidecl.h>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] MIPS/sim: Fix build breakage
2012-05-18 14:27 ` [PATCH] MIPS/sim: Fix " Maciej W. Rozycki
@ 2012-05-19 3:49 ` Mike Frysinger
2012-05-22 0:11 ` Maciej W. Rozycki
0 siblings, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2012-05-19 3:49 UTC (permalink / raw)
To: binutils
Cc: Maciej W. Rozycki, Alan Modra, Cary Coutant, Tom Tromey,
Nick Clifton, gdb, gdb-patches
[-- Attachment #1: Type: Text/Plain, Size: 2202 bytes --]
On Friday 18 May 2012 10:26:35 Maciej W. Rozycki wrote:
> This fixes the build for me, I can connect to the MIPS simulator and
> single-step, examine registers, etc., so it seems to work, but I haven't
> verified it further, I am not fully set up to run GNU sim testing right
> now. Obviously other targets may require further tweaks.
Nick posted a patch to fix things. are you guys fighting over who gets there
first ? :)
> It looks like some generated files (i.e. ppc and the top-level) were not
> rebuilt at the last check-in time too, hence differences beyond those
> one'd expect from this change alone.
the ppc/ subdir doesn't use common/, so there's no need to regen when it
changes. the changes you show here are just updated autotools, and ones i
haven't bothered committing. you may if you like, just providing info.
maybe it's me, but i also don't typically include the regenerated output in
the diffs posted to the list since they're generally noise. would rather focus
on the things that the dev is changing.
> * gentmap.c (gen_targ_map_c): Produce "sim-main.h" inclusion.
how come ?
> --- gdb-fsf-trunk-quilt.orig/sim/common/acinclude.m4
> +++ gdb-fsf-trunk-quilt/sim/common/acinclude.m4
> @@ -28,6 +28,9 @@ AC_DEFUN([SIM_AC_COMMON],
> AC_REQUIRE([AC_PROG_CC])
> # autoconf.info says this should be called right after AC_INIT.
> AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in)
> +PACKAGE=sim
> +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package.])
> +AC_SUBST(PACKAGE)
> AC_CANONICAL_SYSTEM
> AC_USE_SYSTEM_EXTENSIONS
> AC_ARG_PROGRAM
i'd relocate this new code further down in the SIM_AC_COMMON definition. maybe
above the "# Dependency checking." line.
> --- gdb-fsf-trunk-quilt.orig/sim/igen/configure.ac
> +++ gdb-fsf-trunk-quilt/sim/igen/configure.ac
> @@ -3,6 +3,10 @@ AC_PREREQ(2.59)dnl
> AC_INIT(table.h)
> sinclude(../common/acinclude.m4)
>
> +PACKAGE=sim
> +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package.])
> +AC_SUBST(PACKAGE)
> +
> AC_PROG_INSTALL
> AC_PROG_CC
hrm, we should prob look at migrating igen more over to the common m4 code
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] MIPS/sim: Fix build breakage
2012-05-19 3:49 ` Mike Frysinger
@ 2012-05-22 0:11 ` Maciej W. Rozycki
2012-05-22 1:51 ` Mike Frysinger
0 siblings, 1 reply; 6+ messages in thread
From: Maciej W. Rozycki @ 2012-05-22 0:11 UTC (permalink / raw)
To: Mike Frysinger
Cc: binutils, Alan Modra, Cary Coutant, Tom Tromey, Nick Clifton,
gdb, gdb-patches
On Sat, 19 May 2012, Mike Frysinger wrote:
> Nick posted a patch to fix things. are you guys fighting over who gets there
> first ? :)
Nope, just trying to get other work done, and since I did these tweaks
anyway I decided to share them in case they would help someone else too.
I can see Nick's commited his fixes now, so that settles it.
Maciej
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] MIPS/sim: Fix build breakage
2012-05-22 0:11 ` Maciej W. Rozycki
@ 2012-05-22 1:51 ` Mike Frysinger
2012-05-22 14:26 ` Maciej W. Rozycki
0 siblings, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2012-05-22 1:51 UTC (permalink / raw)
To: Maciej W. Rozycki
Cc: binutils, Alan Modra, Cary Coutant, Tom Tromey, Nick Clifton,
gdb, gdb-patches
[-- Attachment #1: Type: Text/Plain, Size: 541 bytes --]
On Monday 21 May 2012 20:11:10 Maciej W. Rozycki wrote:
> On Sat, 19 May 2012, Mike Frysinger wrote:
> > Nick posted a patch to fix things. are you guys fighting over who gets
> > there first ? :)
>
> Nope, just trying to get other work done, and since I did these tweaks
> anyway I decided to share them in case they would help someone else too.
> I can see Nick's commited his fixes now, so that settles it.
so Nick's patch addresses your build failures ? seems like you guys had some
overlap, but not entirely ...
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] MIPS/sim: Fix build breakage
2012-05-22 1:51 ` Mike Frysinger
@ 2012-05-22 14:26 ` Maciej W. Rozycki
0 siblings, 0 replies; 6+ messages in thread
From: Maciej W. Rozycki @ 2012-05-22 14:26 UTC (permalink / raw)
To: Mike Frysinger
Cc: binutils, Alan Modra, Cary Coutant, Tom Tromey, Nick Clifton,
gdb, gdb-patches
On Tue, 22 May 2012, Mike Frysinger wrote:
> > Nope, just trying to get other work done, and since I did these tweaks
> > anyway I decided to share them in case they would help someone else too.
> > I can see Nick's commited his fixes now, so that settles it.
>
> so Nick's patch addresses your build failures ? seems like you guys had some
> overlap, but not entirely ...
Yep, no build failure for mips-sde-elf anymore.
Maciej
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-22 14:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <87k40alojr.fsf@fleche.redhat.com>
[not found] ` <CAHACq4qUY_V1O+H7Z8f0TUXkkV-+0Hwb3fYU+4BdS31x53LwqA@mail.gmail.com>
[not found] ` <20120518020107.GN27540@bubble.grove.modra.org>
[not found] ` <20120518020534.GO27540@bubble.grove.modra.org>
[not found] ` <20120518053358.GA29726@bubble.grove.modra.org>
2012-05-18 13:12 ` another build breakage Maciej W. Rozycki
2012-05-18 14:27 ` [PATCH] MIPS/sim: Fix " Maciej W. Rozycki
2012-05-19 3:49 ` Mike Frysinger
2012-05-22 0:11 ` Maciej W. Rozycki
2012-05-22 1:51 ` Mike Frysinger
2012-05-22 14:26 ` Maciej W. Rozycki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).