aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/ppc/ChangeLog8
-rw-r--r--sim/ppc/Makefile.in5
-rwxr-xr-xsim/ppc/configure6
-rw-r--r--sim/ppc/configure.ac5
4 files changed, 20 insertions, 4 deletions
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 4ba7028..a50f266 100644
--- 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 71c65cf..db7ff1b 100644
--- 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 5b3325a..872a9db 100755
--- 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
@@ -6010,6 +6013,7 @@ fi
+
ac_config_files="$ac_config_files Makefile"
ac_config_commands="$ac_config_commands default"
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 8a580c8..2dc200c 100644
--- 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])