* configure.ac (sim_hwflags): Clean up definition, AC_SUBST it.
* configure: Regenerate. * Makefile.in (SIM_HWFLAGS): New variable. (STD_CFLAGS, NOWARN_CFLAGS): Add it.
This commit is contained in:
parent
fa289fb8df
commit
6ae841305c
|
@ -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>
|
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
* config.in: Regenerate.
|
* config.in: Regenerate.
|
||||||
|
|
|
@ -70,6 +70,7 @@ MAKEINFO = makeinfo
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
|
|
||||||
SIM_CFLAGS = @sim_cflags@
|
SIM_CFLAGS = @sim_cflags@
|
||||||
|
SIM_HWFLAGS = @sim_hwflags@
|
||||||
INLINE_CFLAGS = @sim_inline@
|
INLINE_CFLAGS = @sim_inline@
|
||||||
BSWAP_CFLAGS = @sim_bswap@
|
BSWAP_CFLAGS = @sim_bswap@
|
||||||
ENDIAN_CFLAGS = @sim_endian@
|
ENDIAN_CFLAGS = @sim_endian@
|
||||||
|
@ -116,8 +117,8 @@ CONFIG_CFLAGS = $(BSWAP_CFLAGS) \
|
||||||
$(DEVZERO_CFLAGS)
|
$(DEVZERO_CFLAGS)
|
||||||
SIM_FPU_CFLAGS = @sim_fpu_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)
|
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)
|
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_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
|
||||||
|
|
||||||
BUILD_LDFLAGS =
|
BUILD_LDFLAGS =
|
||||||
|
|
|
@ -589,6 +589,7 @@ ac_includes_default="\
|
||||||
#endif"
|
#endif"
|
||||||
|
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
|
sim_hwflags
|
||||||
sim_fpu
|
sim_fpu
|
||||||
sim_fpu_cflags
|
sim_fpu_cflags
|
||||||
sim_targ_vals
|
sim_targ_vals
|
||||||
|
@ -3740,7 +3741,9 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
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
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -6008,6 +6011,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile"
|
ac_config_files="$ac_config_files Makefile"
|
||||||
|
|
|
@ -301,7 +301,9 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
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
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -901,6 +903,7 @@ AC_SUBST(sim_callback)
|
||||||
AC_SUBST(sim_targ_vals)
|
AC_SUBST(sim_targ_vals)
|
||||||
AC_SUBST(sim_fpu_cflags)
|
AC_SUBST(sim_fpu_cflags)
|
||||||
AC_SUBST(sim_fpu)
|
AC_SUBST(sim_fpu)
|
||||||
|
AC_SUBST(sim_hwflags)
|
||||||
|
|
||||||
AC_OUTPUT(Makefile,
|
AC_OUTPUT(Makefile,
|
||||||
[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])
|
[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])
|
||||||
|
|
Loading…
Reference in New Issue