* configure.ac (sim_hwflags): Clean up definition, AC_SUBST it.

	* configure: Regenerate.
	* Makefile.in (SIM_HWFLAGS): New variable.
	(STD_CFLAGS, NOWARN_CFLAGS): Add it.

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 4ba7028a8538af812a4207d202b730216387d1fa..a50f26601564a09441a6cc568656a5a1f01cc0a8 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-15  Andreas Tobler <andreast-list@fgznet.ch>
+           Doug Evans  <dje@google.com>
+
+       * configure.ac (sim_hwflags): Clean up definition, AC_SUBST it.
+       * configure: Regenerate.
+       * Makefile.in (SIM_HWFLAGS): New variable.
+       (STD_CFLAGS, NOWARN_CFLAGS): Add it.
+
 2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * config.in: Regenerate.

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 71c65cf8265d67065a23346d88a4829315ba2527..db7ff1b96c852a30d9bb442238d7e0c103c6dcdf 100644 (file)
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -70,6 +70,7 @@ MAKEINFO = makeinfo
 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 @@ CONFIG_CFLAGS = $(BSWAP_CFLAGS) \
   $(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  =

diff --git a/sim/ppc/configure b/sim/ppc/configure
index 5b3325aa5c4cf3e03a35a4c1bd0e794b067ad87e..872a9db05063955e27211eb4269e56172977bbf9 100755 (executable)
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -589,6 +589,7 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+sim_hwflags
 sim_fpu
 sim_fpu_cflags
 sim_targ_vals
@@ -3740,7 +3741,9 @@ else
 fi
 
 if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
-  sim_hwflags="-DHAS_UNION_SEMUN";
+  sim_hwflags="-DHAS_UNION_SEMUN"
+else
+  sim_hwflags=""
 fi
 
 
@@ -6008,6 +6011,7 @@ fi
 
 
 
+
 
 
 ac_config_files="$ac_config_files Makefile"

diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 8a580c8a476c68f45f4766b572c1723489d72c97..2dc200caa78a874acbb461f19f5c5ca9172c9c15 100644 (file)
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -301,7 +301,9 @@ else
 fi
 
 if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
-  sim_hwflags="-DHAS_UNION_SEMUN";
+  sim_hwflags="-DHAS_UNION_SEMUN"
+else
+  sim_hwflags=""
 fi
 
 
@@ -901,6 +903,7 @@ AC_SUBST(sim_callback)
 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])