diff options
| -rw-r--r-- | sim/bfin/ChangeLog | 5 | ||||
| -rwxr-xr-x | sim/bfin/configure | 39 | ||||
| -rw-r--r-- | sim/bfin/configure.ac | 12 | ||||
| -rw-r--r-- | sim/m68hc11/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/m68hc11/configure.ac | 2 |
5 files changed, 34 insertions, 29 deletions
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 5026a60..2b653b7 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,8 @@ +2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> + + * configure.ac: Use $SIM_DV_SOCKSER_O. + * configure: Regenerated. + 2012-12-20 Joel Brobecker <brobecker@adacore.com> * aclocal.m4: Revert the previous change changing diff --git a/sim/bfin/configure b/sim/bfin/configure index 629e08a..27951c2 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -607,6 +607,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG BFIN_SIM_EXTRA_OBJS +SIM_DV_SOCKSER_O REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION @@ -12294,7 +12295,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12297 "configure" +#line 12298 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12400,7 +12401,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12403 "configure" +#line 12404 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13413,7 +13414,7 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; } fi -if test x"yes" = x"yes"; then +if test x"yes" != x"no"; then sim_hw_p=yes else sim_hw_p=no @@ -13484,6 +13485,19 @@ else *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";; esac done + # mingw does not support sockser + SIM_DV_SOCKSER_O="" + case ${host} in + *mingw*) ;; + *) SIM_DV_SOCKSER_O="dv-sockser.o" + +cat >>confdefs.h <<_ACEOF +#define HAVE_DV_SOCKSER 1 +_ACEOF + + ;; + esac + fi if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs" @@ -13491,6 +13505,10 @@ fi else if test "$sim_hw_p" != yes; then + if test "yes" = "always"; then + as_fn_error "Sorry, but this simulator requires that hardware support +be enabled. Please configure without --disable-hw-support." "$LINENO" 5 + fi sim_hw_objs= sim_hw_cflags="-DWITH_HW=0" sim_hw= @@ -13584,20 +13602,7 @@ fi done -BFIN_SIM_EXTRA_OBJS= - -case ${host} in - *mingw32*) ;; - *) - -cat >>confdefs.h <<_ACEOF -#define HAVE_DV_SOCKSER 1 -_ACEOF - - BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} dv-sockser.o" - ;; -esac - +BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} ${SIM_DV_SOCKSER_O}" BFIN_SIM_EXTRA_OBJS=${BFIN_SIM_EXTRA_OBJS} diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac index edf09ba..bd7df51 100644 --- a/sim/bfin/configure.ac +++ b/sim/bfin/configure.ac @@ -56,17 +56,7 @@ AC_CHECK_HEADERS([ \ sys/mman.h \ ]) -BFIN_SIM_EXTRA_OBJS= - -dnl make sure the dv-sockser code can be supported (i.e. windows) -case ${host} in - *mingw32*) ;; - *) - AC_DEFINE_UNQUOTED([HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.]) - BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} dv-sockser.o" - ;; -esac - +BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} ${SIM_DV_SOCKSER_O}" AC_SUBST([BFIN_SIM_EXTRA_OBJS], ${BFIN_SIM_EXTRA_OBJS}) PKG_PROG_PKG_CONFIG diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 645bd8b..62ddd69 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,8 @@ +2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> + + * configure.ac: Use $SIM_DV_SOCKSER_O. + * configure: Regenerated. + 2012-06-15 Joel Brobecker <brobecker@adacore.com> * config.in, configure: Regenerate. diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac index eef4691..fe4fb37 100644 --- a/sim/m68hc11/configure.ac +++ b/sim/m68hc11/configure.ac @@ -19,7 +19,6 @@ case "${target}" in m68hc11-*-*|m6811-*-*) hw_enabled=yes hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram" - m68hc11_extra_objs="dv-sockser.o" SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1" ;; *) @@ -30,6 +29,7 @@ SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices) AC_CHECK_HEADERS(string.h strings.h stdlib.h stdlib.h fcntl.h) +m68hc11_extra_objs="$SIM_DV_SOCKSER_O" AC_SUBST(m68hc11_extra_objs) SIM_AC_OUTPUT |