FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sim: rewrite SIM_AC_OPTION_HARDWARE a bit to simplify things

Browse source 
There's no need to put the majority of the logic into the 3rd arg of the
AC_ARG_ENABLE.  Coupled with the lack of indentation, it makes it hard to
follow, error prone to update, and duplicates code (with the 4th arg).

So pull the logic out of the 3rd arg and outside of the AC_ARG_ENABLE
macro.  This allows us to gut the 4th arg entirely, merge with the code
that followed the macro, and fix bugs related to the new dv-sockser in
the process.

Hopefully building the various sims with the default sim-hardware
settings, as well as with explicit --{dis,en}able-sim-hardware flags,
should all just work now.
This commit is contained in:
Mike Frysinger 2013-03-26 18:00:04 +00:00
parent 1fb2e2b569
commit 1517bd2742
23 changed files with 448 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sim/bfin/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, configure: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Use $SIM_DV_SOCKSER_O. * configure.ac: Use $SIM_DV_SOCKSER_O.

58
sim/bfin/aclocal.m4 vendored
View file

@ -28,7 +28,8 @@
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>. # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
@ -171,6 +172,61 @@ else
fi[]dnl fi[]dnl
])# PKG_CHECK_MODULES ])# PKG_CHECK_MODULES
# PKG_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable pkgconfigdir as the location where a module
# should install pkg-config .pc files. By default the directory is
# $libdir/pkgconfig, but the default can be changed by passing
# DIRECTORY. The user can override through the --with-pkgconfigdir
# parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
[pkg-config installation directory @<:@]pkg_default[@:>@])
AC_ARG_WITH([pkgconfigdir],
[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
[with_pkgconfigdir=]pkg_default)
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_INSTALLDIR
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable noarch_pkgconfigdir as the location where a
# module should install arch-independent pkg-config .pc files. By
# default the directory is $datadir/pkgconfig, but the default can be
# changed by passing DIRECTORY. The user can override through the
# --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
[pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
AC_ARG_WITH([noarch-pkgconfigdir],
[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
[with_noarch_pkgconfigdir=]pkg_default)
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_NOARCH_INSTALLDIR
# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# -------------------------------------------
# Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])# PKG_CHECK_VAR
# AM_CONDITIONAL -*- Autoconf -*- # AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008

57
sim/bfin/configure vendored
View file

@ -1431,7 +1431,8 @@ Optional Features:
--enable-sim-build-warnings --enable-sim-build-warnings
enable SIM specific build-time compiler warnings if enable SIM specific build-time compiler warnings if
gcc is used gcc is used
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12295,7 +12296,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12298 "configure" #line 12299 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12401,7 +12402,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12404 "configure" #line 12405 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13415,10 +13416,11 @@ fi
if test x"yes" != x"no"; then if test x"yes" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test ""; then if test ""; then
hardware="" hardware=""
else else
@ -13457,20 +13459,29 @@ hardware="$hardware \
bfin_wp \ bfin_wp \
eth_phy \ eth_phy \
" "
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then 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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13498,28 +13509,11 @@ _ACEOF
;; ;;
esac esac
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
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 fi
sim_hw_objs= case " $hardware " in
sim_hw_cflags="-DWITH_HW=0" *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13564,7 +13558,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
for ac_func in getuid getgid geteuid getegid setuid setgid mmap munmap kill pread for ac_func in getuid getgid geteuid getegid setuid setgid mmap munmap kill pread

4
sim/common/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* acinclude.m4: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* acinclude.m4: Add SIM_DV_SOCKSER_O which is empty on hosts * acinclude.m4: Add SIM_DV_SOCKSER_O which is empty on hosts

48
sim/common/acinclude.m4
View file

@ -609,30 +609,38 @@ dnl arg[3] is a space separated list of extra target specific devices.
AC_DEFUN([SIM_AC_OPTION_HARDWARE], AC_DEFUN([SIM_AC_OPTION_HARDWARE],
[ [
if test x"[$1]" != x"no"; then if test x"[$1]" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test "[$2]"; then if test "[$2]"; then
hardware="[$2]" hardware="[$2]"
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware [$3]" hardware="$hardware [$3]"
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/dv-\1.o/g'`"
AC_ARG_ENABLE(sim-hardware, AC_ARG_ENABLE(sim-hardware,
[ --enable-sim-hardware=LIST Specify the hardware to be included in the build.], [AS_HELP_STRING([--enable-sim-hardware=LIST],
[ [Specify the hardware to be included in the build.])])
case "${enableval}" in case ${enable_sim_hardware} in
yes) sim_hw_p=yes;; yes) sim_hw_p=yes;;
no) sim_hw_p=no;; no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "[$1]" = "always"; then
AC_MSG_ERROR([Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support.])
fi
sim_hw_objs= sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -657,26 +665,14 @@ else
;; ;;
esac esac
AC_SUBST(SIM_DV_SOCKSER_O) AC_SUBST(SIM_DV_SOCKSER_O)
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi],[
if test "$sim_hw_p" != yes; then
if test "[$1]" = "always"; then
AC_MSG_ERROR([Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support.])
fi fi
sim_hw_objs= dnl Some devices require extra libraries.
sim_hw_cflags="-DWITH_HW=0" case " $hardware " in
sim_hw= *" cfi "*) AC_CHECK_LIB(m, log2);;
esac
fi fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi])
dnl Some devices require extra libraries.
case " $hardware " in
*" cfi "*) AC_CHECK_LIB(m, log2);;
esac
]) ])
AC_SUBST(sim_hw_cflags) AC_SUBST(sim_hw_cflags)
AC_SUBST(sim_hw_objs) AC_SUBST(sim_hw_objs)

4
sim/cris/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2012-06-15 Joel Brobecker <brobecker@adacore.com> 2012-06-15 Joel Brobecker <brobecker@adacore.com>
* config.in, configure: Regenerate. * config.in, configure: Regenerate.

67
sim/cris/configure vendored
View file

@ -604,6 +604,7 @@ cgen_breaks
cgen cgen
cgendir cgendir
CGEN_MAINT CGEN_MAINT
SIM_DV_SOCKSER_O
REPORT_BUGS_TEXI REPORT_BUGS_TEXI
REPORT_BUGS_TO REPORT_BUGS_TO
PKGVERSION PKGVERSION
@ -1420,7 +1421,8 @@ Optional Features:
--enable-sim-build-warnings --enable-sim-build-warnings
enable SIM specific build-time compiler warnings if enable SIM specific build-time compiler warnings if
gcc is used gcc is used
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
--enable-sim-default-model=model Specify default model to simulate. --enable-sim-default-model=model Specify default model to simulate.
--enable-sim-environment=environment Specify mixed, user, virtual or operating environment. --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.
--enable-sim-inline=inlines Specify which functions should be inlined. --enable-sim-inline=inlines Specify which functions should be inlined.
@ -12281,7 +12283,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12284 "configure" #line 12286 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12387,7 +12389,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12390 "configure" #line 12392 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13312,31 +13314,41 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; }
fi fi
if test x"no" = x"yes"; then if test x"no" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test ""; then if test ""; then
hardware="" hardware=""
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware rv cris" hardware="$hardware rv cris"
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "no" = "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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13351,24 +13363,24 @@ else
*) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";; *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
esac esac
done done
fi # mingw does not support sockser
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then SIM_DV_SOCKSER_O=""
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs" case ${host} in
fi *mingw*) ;;
else *) SIM_DV_SOCKSER_O="dv-sockser.o"
if test "$sim_hw_p" != yes; then cat >>confdefs.h <<_ACEOF
sim_hw_objs= #define HAVE_DV_SOCKSER 1
sim_hw_cflags="-DWITH_HW=0" _ACEOF
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in ;;
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5 esac
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13413,7 +13425,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
# The default model shouldn't matter as long as there's a BFD. # The default model shouldn't matter as long as there's a BFD.

4
sim/frv/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Fail if dv-sockser.o not available. * configure.ac: Fail if dv-sockser.o not available.

57
sim/frv/configure vendored
View file

@ -1420,7 +1420,8 @@ Optional Features:
--enable-sim-environment=environment Specify mixed, user, virtual or operating environment. --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.
--enable-cgen-maint=DIR build cgen generated files --enable-cgen-maint=DIR build cgen generated files
--enable-sim-trapdump Make unknown traps dump the registers --enable-sim-trapdump Make unknown traps dump the registers
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12277,7 +12278,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12280 "configure" #line 12281 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12383,7 +12384,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12386 "configure" #line 12387 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13314,30 +13315,40 @@ fi
if test x"always" != x"no"; then if test x"always" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test """"; then if test """"; then
hardware="""" hardware=""""
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware """ hardware="$hardware """
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "always" = "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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13365,28 +13376,11 @@ _ACEOF
;; ;;
esac esac
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
else
if test "$sim_hw_p" != yes; then
if test "always" = "always"; then
as_fn_error "Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support." "$LINENO" 5
fi fi
sim_hw_objs= case " $hardware " in
sim_hw_cflags="-DWITH_HW=0" *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13431,7 +13425,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
if test -z "$SIM_DV_SOCKSER_O"; then if test -z "$SIM_DV_SOCKSER_O"; then

4
sim/iq2000/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Fail if dv-sockser.o not available. * configure.ac: Fail if dv-sockser.o not available.

57
sim/iq2000/configure vendored
View file

@ -1419,7 +1419,8 @@ Optional Features:
--enable-sim-environment=environment Specify mixed, user, virtual or operating environment. --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.
--enable-sim-inline=inlines Specify which functions should be inlined. --enable-sim-inline=inlines Specify which functions should be inlined.
--enable-cgen-maint=DIR build cgen generated files --enable-cgen-maint=DIR build cgen generated files
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12276,7 +12277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12279 "configure" #line 12280 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12382,7 +12383,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12385 "configure" #line 12386 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13339,30 +13340,40 @@ fi
if test x"always" != x"no"; then if test x"always" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test """"; then if test """"; then
hardware="""" hardware=""""
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware """ hardware="$hardware """
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "always" = "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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13390,28 +13401,11 @@ _ACEOF
;; ;;
esac esac
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
else
if test "$sim_hw_p" != yes; then
if test "always" = "always"; then
as_fn_error "Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support." "$LINENO" 5
fi fi
sim_hw_objs= case " $hardware " in
sim_hw_cflags="-DWITH_HW=0" *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13456,7 +13450,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
if test -z "$SIM_DV_SOCKSER_O"; then if test -z "$SIM_DV_SOCKSER_O"; then

4
sim/lm32/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2012-06-15 Joel Brobecker <brobecker@adacore.com> 2012-06-15 Joel Brobecker <brobecker@adacore.com>
* config.in, configure: Regenerate. * config.in, configure: Regenerate.

67
sim/lm32/configure vendored
View file

@ -601,6 +601,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
LIBOBJS LIBOBJS
cgen_breaks cgen_breaks
SIM_DV_SOCKSER_O
cgen cgen
cgendir cgendir
CGEN_MAINT CGEN_MAINT
@ -1416,7 +1417,8 @@ Optional Features:
--enable-sim-default-model=model Specify default model to simulate. --enable-sim-default-model=model Specify default model to simulate.
--enable-sim-environment=environment Specify mixed, user, virtual or operating environment. --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.
--enable-cgen-maint=DIR build cgen generated files --enable-cgen-maint=DIR build cgen generated files
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12273,7 +12275,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12276 "configure" #line 12278 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12379,7 +12381,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12382 "configure" #line 12384 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13290,31 +13292,41 @@ fi
if test x"yes" = x"yes"; then if test x"yes" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test ""; then if test ""; then
hardware="" hardware=""
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware lm32cpu lm32timer lm32uart" hardware="$hardware lm32cpu lm32timer lm32uart"
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then 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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13329,24 +13341,24 @@ else
*) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";; *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
esac esac
done done
fi # mingw does not support sockser
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then SIM_DV_SOCKSER_O=""
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs" case ${host} in
fi *mingw*) ;;
else *) SIM_DV_SOCKSER_O="dv-sockser.o"
if test "$sim_hw_p" != yes; then cat >>confdefs.h <<_ACEOF
sim_hw_objs= #define HAVE_DV_SOCKSER 1
sim_hw_cflags="-DWITH_HW=0" _ACEOF
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in ;;
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5 esac
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13391,7 +13403,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi

4
sim/m32r/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Fail if dv-sockser.o not available. * configure.ac: Fail if dv-sockser.o not available.

57
sim/m32r/configure vendored
View file

@ -1421,7 +1421,8 @@ Optional Features:
--enable-sim-environment=environment Specify mixed, user, virtual or operating environment. --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.
--enable-sim-inline=inlines Specify which functions should be inlined. --enable-sim-inline=inlines Specify which functions should be inlined.
--enable-cgen-maint=DIR build cgen generated files --enable-cgen-maint=DIR build cgen generated files
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12278,7 +12279,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12281 "configure" #line 12282 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12384,7 +12385,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12387 "configure" #line 12388 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13354,30 +13355,40 @@ fi
if test x"always" != x"no"; then if test x"always" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test """"; then if test """"; then
hardware="""" hardware=""""
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware """ hardware="$hardware """
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "always" = "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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13405,28 +13416,11 @@ _ACEOF
;; ;;
esac esac
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
else
if test "$sim_hw_p" != yes; then
if test "always" = "always"; then
as_fn_error "Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support." "$LINENO" 5
fi fi
sim_hw_objs= case " $hardware " in
sim_hw_cflags="-DWITH_HW=0" *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13471,7 +13465,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
if test -z "$SIM_DV_SOCKSER_O"; then if test -z "$SIM_DV_SOCKSER_O"; then

4
sim/m68hc11/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Use $SIM_DV_SOCKSER_O. * configure.ac: Use $SIM_DV_SOCKSER_O.

69
sim/m68hc11/configure vendored
View file

@ -602,6 +602,7 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS LIBOBJS
cgen_breaks cgen_breaks
m68hc11_extra_objs m68hc11_extra_objs
SIM_DV_SOCKSER_O
REPORT_BUGS_TEXI REPORT_BUGS_TEXI
REPORT_BUGS_TO REPORT_BUGS_TO
PKGVERSION PKGVERSION
@ -1414,7 +1415,8 @@ Optional Features:
--enable-sim-build-warnings --enable-sim-build-warnings
enable SIM specific build-time compiler warnings if enable SIM specific build-time compiler warnings if
gcc is used gcc is used
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12271,7 +12273,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12274 "configure" #line 12276 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12377,7 +12379,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12380 "configure" #line 12382 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13319,7 +13321,6 @@ case "${target}" in
m68hc11-*-*|m6811-*-*) m68hc11-*-*|m6811-*-*)
hw_enabled=yes hw_enabled=yes
hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram" hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
m68hc11_extra_objs="dv-sockser.o"
SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1" SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1"
;; ;;
*) *)
@ -13327,31 +13328,41 @@ case "${target}" in
;; ;;
esac esac
if test x"$hw_enabled" = x"yes"; then if test x"$hw_enabled" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test "$hw_devices"; then if test "$hw_devices"; then
hardware="$hw_devices" hardware="$hw_devices"
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware $hw_extra_devices" hardware="$hardware $hw_extra_devices"
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "$hw_enabled" = "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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13366,24 +13377,24 @@ else
*) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";; *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
esac esac
done done
fi # mingw does not support sockser
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then SIM_DV_SOCKSER_O=""
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs" case ${host} in
fi *mingw*) ;;
else *) SIM_DV_SOCKSER_O="dv-sockser.o"
if test "$sim_hw_p" != yes; then cat >>confdefs.h <<_ACEOF
sim_hw_objs= #define HAVE_DV_SOCKSER 1
sim_hw_cflags="-DWITH_HW=0" _ACEOF
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in ;;
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5 esac
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13428,7 +13439,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
for ac_header in string.h strings.h stdlib.h stdlib.h fcntl.h for ac_header in string.h strings.h stdlib.h stdlib.h fcntl.h
@ -13446,6 +13458,7 @@ fi
done done
m68hc11_extra_objs="$SIM_DV_SOCKSER_O"

4
sim/mips/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Address use of dv-sockser.o. * configure.ac: Address use of dv-sockser.o.

57
sim/mips/configure vendored
View file

@ -1442,7 +1442,8 @@ Optional Features:
--enable-sim-bitsize=N Specify target bitsize (32 or 64). --enable-sim-bitsize=N Specify target bitsize (32 or 64).
--enable-sim-float Specify that the target processor has floating point hardware. --enable-sim-float Specify that the target processor has floating point hardware.
--enable-sim-smp=n Specify number of processors to configure for (default ${default_sim_smp}). --enable-sim-smp=n Specify number of processors to configure for (default ${default_sim_smp}).
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12301,7 +12302,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12304 "configure" #line 12305 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12407,7 +12408,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12410 "configure" #line 12411 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13911,30 +13912,40 @@ case "${target}" in
esac esac
if test x"$hw_enabled" != x"no"; then if test x"$hw_enabled" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test "$hw_devices"; then if test "$hw_devices"; then
hardware="$hw_devices" hardware="$hw_devices"
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware $hw_extra_devices" hardware="$hardware $hw_extra_devices"
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "$hw_enabled" = "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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13962,28 +13973,11 @@ _ACEOF
;; ;;
esac esac
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
else
if test "$sim_hw_p" != yes; then
if test "$hw_enabled" = "always"; then
as_fn_error "Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support." "$LINENO" 5
fi fi
sim_hw_objs= case " $hardware " in
sim_hw_cflags="-DWITH_HW=0" *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -14028,7 +14022,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
mips_extra_objs="$SIM_DV_SOCKSER_O" mips_extra_objs="$SIM_DV_SOCKSER_O"

4
sim/mn10300/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Fail if dv-sockser.o not available. * configure.ac: Fail if dv-sockser.o not available.

107
sim/mn10300/configure vendored
View file

@ -1420,7 +1420,8 @@ Optional Features:
--enable-sim-reserved-bits Specify whether to check reserved bits in instruction. --enable-sim-reserved-bits Specify whether to check reserved bits in instruction.
--enable-sim-bitsize=N Specify target bitsize (32 or 64). --enable-sim-bitsize=N Specify target bitsize (32 or 64).
--enable-sim-inline=inlines Specify which functions should be inlined. --enable-sim-inline=inlines Specify which functions should be inlined.
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12277,7 +12278,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12280 "configure" #line 12281 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12383,7 +12384,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12386 "configure" #line 12387 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13438,30 +13439,40 @@ fi
if test x"yes" != x"no"; then if test x"yes" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test ""; then if test ""; then
hardware="" hardware=""
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware mn103cpu mn103int mn103tim mn103ser mn103iop" hardware="$hardware mn103cpu mn103int mn103tim mn103ser mn103iop"
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then 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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13489,28 +13500,11 @@ _ACEOF
;; ;;
esac esac
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
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 fi
sim_hw_objs= case " $hardware " in
sim_hw_cflags="-DWITH_HW=0" *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13555,7 +13549,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
for ac_func in time chmod utime fork execve execv chown for ac_func in time chmod utime fork execve execv chown
@ -13588,30 +13583,40 @@ done
if test x"always" != x"no"; then if test x"always" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test """"; then if test """"; then
hardware="""" hardware=""""
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware """ hardware="$hardware """
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "always" = "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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13639,28 +13644,11 @@ _ACEOF
;; ;;
esac esac
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
else
if test "$sim_hw_p" != yes; then
if test "always" = "always"; then
as_fn_error "Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support." "$LINENO" 5
fi fi
sim_hw_objs= case " $hardware " in
sim_hw_cflags="-DWITH_HW=0" *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13705,7 +13693,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
if test -z "$SIM_DV_SOCKSER_O"; then if test -z "$SIM_DV_SOCKSER_O"; then

4
sim/sh64/ChangeLog
View file

@ -1,3 +1,7 @@
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Fail if dv-sockser.o not available. * configure.ac: Fail if dv-sockser.o not available.

57
sim/sh64/configure vendored
View file

@ -1419,7 +1419,8 @@ Optional Features:
--enable-sim-environment=environment Specify mixed, user, virtual or operating environment. --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.
--enable-sim-inline=inlines Specify which functions should be inlined. --enable-sim-inline=inlines Specify which functions should be inlined.
--enable-cgen-maint=DIR build cgen generated files --enable-cgen-maint=DIR build cgen generated files
--enable-sim-hardware=LIST Specify the hardware to be included in the build. --enable-sim-hardware=LIST
Specify the hardware to be included in the build.
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12276,7 +12277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12279 "configure" #line 12280 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12382,7 +12383,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12385 "configure" #line 12386 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13339,30 +13340,40 @@ fi
if test x"always" != x"no"; then if test x"always" != x"no"; then
sim_hw_p=yes enable_sim_hardware=yes
else else
sim_hw_p=no enable_sim_hardware=no
fi fi
if test """"; then if test """"; then
hardware="""" hardware=""""
else else
hardware="cfi core pal glue" hardware="cfi core pal glue"
fi fi
hardware="$hardware """ hardware="$hardware """
sim_hw_cflags="-DWITH_HW=1" sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware" sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# Check whether --enable-sim-hardware was given. # Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then : if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware; enableval=$enable_sim_hardware;
case "${enableval}" in fi
yes) sim_hw_p=yes;;
no) sim_hw_p=no;; case ${enable_sim_hardware} in
yes) sim_hw_p=yes;;
no) sim_hw_p=no;;
,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac esac
if test "$sim_hw_p" != yes; then if test "$sim_hw_p" != yes; then
if test "always" = "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_objs=
sim_hw_cflags="-DWITH_HW=0" sim_hw_cflags="-DWITH_HW=0"
sim_hw= sim_hw=
@ -13390,28 +13401,11 @@ _ACEOF
;; ;;
esac esac
fi if test x"$silent" != x"yes"; then
if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
else
if test "$sim_hw_p" != yes; then
if test "always" = "always"; then
as_fn_error "Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support." "$LINENO" 5
fi fi
sim_hw_objs= case " $hardware " in
sim_hw_cflags="-DWITH_HW=0" *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
sim_hw=
fi
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
case " $hardware " in
*" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
$as_echo_n "checking for log2 in -lm... " >&6; } $as_echo_n "checking for log2 in -lm... " >&6; }
if test "${ac_cv_lib_m_log2+set}" = set; then : if test "${ac_cv_lib_m_log2+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -13456,7 +13450,8 @@ _ACEOF
fi fi
;; ;;
esac esac
fi
if test -z "$SIM_DV_SOCKSER_O"; then if test -z "$SIM_DV_SOCKSER_O"; then