Re: patch: sim/ppc sim_hwflags

[Doug Evans <dje at google dot com>]

On Mon, Sep 14, 2009 at 1:42 PM, Andreas Tobler <andreast-list@fgznet.ch> wrote:
> Hello,
>
> current cvs gdb fails to build for me since this issue.
>
> sim_hwflags does not seem to be populated for the build process.
>
> Attached a patch which builds here on poerpc-freebsd8.
>
> The patch itself needs an autoconf run in src/sim/ppc, this diff is not
> included.
>
> I do not know if it is ok, anyway.
>
> Might be I hit an arch which this is needed and the whole world does not
> need it ;).
>
> Andreas
>
>
> Index: Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/sim/ppc/Makefile.in,v
> retrieving revision 1.26
> diff -u -r1.26 Makefile.in
> --- Makefile.in 30 Jul 2009 22:53:18 -0000 ? ? ?1.26
> +++ Makefile.in 14 Sep 2009 20:35:39 -0000
> @@ -70,6 +70,7 @@
> ?RANLIB = @RANLIB@
>
> ?SIM_CFLAGS = @sim_cflags@
> +SIM_HWFLAGS = @sim_hwflags@
> ?INLINE_CFLAGS = @sim_inline@
> ?BSWAP_CFLAGS = @sim_bswap@
> ?ENDIAN_CFLAGS = @sim_endian@
> @@ -116,8 +117,8 @@
> ? $(DEVZERO_CFLAGS)
> ?SIM_FPU_CFLAGS = @sim_fpu_cflags@
>
> -STD_CFLAGS ? ? = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS)
> $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)
> $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
> -NOWARN_CFLAGS ?= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS)
> $(HDEFINES) $(TDEFINES) $(INCLUDES) ?$(SIM_FPU_CFLAGS)
> +STD_CFLAGS ? ? = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS)
> $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)
> $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) $(SIM_HWFLAGS)
> +NOWARN_CFLAGS ?= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS)
> $(HDEFINES) $(TDEFINES) $(INCLUDES) ?$(SIM_FPU_CFLAGS) $(SIM_HWFLAGS)
> ?BUILD_CFLAGS ? = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
>
> ?BUILD_LDFLAGS ?=
> Index: configure.ac
> ===================================================================
> RCS file: /cvs/src/src/sim/ppc/configure.ac,v
> retrieving revision 1.10
> diff -u -r1.10 configure.ac
> --- configure.ac ? ? ? ?18 Nov 2008 21:30:37 -0000 ? ? ?1.10
> +++ configure.ac ? ? ? ?14 Sep 2009 20:35:39 -0000
> @@ -901,6 +901,7 @@
> ?AC_SUBST(sim_targ_vals)
> ?AC_SUBST(sim_fpu_cflags)
> ?AC_SUBST(sim_fpu)
> +AC_SUBST(sim_hwflags)
>
> ?AC_OUTPUT(Makefile,
> ?[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])
>
>

Hi.
I tested and checked in a tweaked version of the patch, and then
decided I didn't like it and wanted it done differently, using
AC_DEFINE, and checked in this version:

2009-09-15  Andreas Tobler <andreast-list@fgznet.ch>
            Doug Evans  <dje@google.com>

        * configure.ac (sim_hwflags): Use AC_DEFINE to define HAVE_UNION_SEMUN.
        * configure: Regenerate.
        * config.in: Regenerate.
        * hw_sem.c: (HAVE_UNION_SEMUN): Renamed from HAS_UNION_SEMUN.

Attachment: sim-090915-ppc-config-1.patch.txt
Description: Text document