Re: [PATCH] MIPS/sim: Fix build breakage

[Mike Frysinger <vapier@gentoo.org>]

[-- 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 --]