diff options
Diffstat (limited to 'sim/mips/configure.in')
-rw-r--r-- | sim/mips/configure.in | 237 |
1 files changed, 236 insertions, 1 deletions
diff --git a/sim/mips/configure.in b/sim/mips/configure.in index 6ceb6ef..68d6873 100644 --- a/sim/mips/configure.in +++ b/sim/mips/configure.in @@ -59,6 +59,7 @@ case "${target}" in # start-sanitize-r5900 mips64r59*-*-*) mips_endian=LITTLE_ENDIAN ;; # end-sanitize-r5900 + mips64el*-*-*) mips_endian=LITTLE_ENDIAN ;; mips64*-*-*) default_endian=BIG_ENDIAN ;; mips16*-*-*) default_endian=BIG_ENDIAN ;; mips*-*-*) default_endian=BIG_ENDIAN ;; @@ -79,6 +80,9 @@ case "${target}" in # start-sanitize-r5900 mips64r59*-*-*) mips_bitsize=64 ; mips_msb=63 ; mips_addr_bitsize=32;; # end-sanitize-r5900 +# start-sanitize-sky + mips64*-sky*-*) mips_bitsize=64 ; mips_msb=63 ; mips_addr_bitsize=32;; +# end-sanitize-sky mips64*-*-*) mips_bitsize=64 ; mips_msb=63 ;; mips16*-*-*) mips_bitsize=64 ; mips_msb=63 ;; mips*-*-*) mips_bitsize=32 ; mips_msb=31 ;; @@ -103,6 +107,9 @@ case "${target}" in # start-sanitize-r5900 mips64r59*-*-*) mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=32 ;; # end-sanitize-r5900 +# start-sanitize-sky + mips64*-sky*-*) mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=32 ;; +# end-sanitize-sky mips64*-*-*) mips_fpu=HARD_FLOATING_POINT ;; mips16*-*-*) mips_fpu=HARD_FLOATING_POINT ;; mips*-*-*) mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=32 ;; @@ -242,9 +249,13 @@ case "${target}" in # end-sanitize-tx3904 # start-sanitize-sky mips64r59*-sky-*) - mips_extra_objs="$mips_extra_objs "'$(SIM_SKY_OBJS)' + mips_extra_objs='$(SIM_SKY_OBJS)' SIM_SUBTARGET="-DTARGET_SKY -DWITH_DEVICES=1 -DDEVICE_INIT=1" ;; + mips64*-skyb-*) + mips_extra_objs='$(SIM_SKY_OBJS)' + SIM_SUBTARGET="-DTARGET_SKY -DTARGET_SKY_B -DWITH_DEVICES=1 -DDEVICE_INIT=1" + ;; # end-sanitize-sky *) mips_extra_objs="" @@ -254,6 +265,22 @@ SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices) AC_SUBST(mips_extra_objs) +# Choose simulator engine +case "${target}" in +# start-sanitize-sky + mips64r59*-sky-*) + mips_igen_engine="" + ;; + mips64*-skyb-*) + mips_igen_engine="" + ;; +# end-sanitize-sky + *) mips_igen_engine="engine.o" + ;; +esac +AC_SUBST(mips_igen_engine) + + AC_PATH_X mips_extra_libs="" # start-sanitize-sky @@ -264,9 +291,217 @@ AC_ARG_WITH(sim-gpu2, then SIM_SUBTARGET="${SIM_SUBTARGET} -DSKY_GPU2 -I${withval}/include" mips_extra_libs="-L${withval}/lib -lgpu2 -L${x_libraries} -lX11 -lXext" + WITH_GPU2="yes" ; export WITH_GPU2 + + # complex X/etc. detection; stolen shamelessly from tcl/tk/gdb configury. --angela + + #-------------------------------------------------------------------- + # Locate the X11 header files and the X11 library archive. Try + # the ac_path_x macro first, but if it doesn't find the X stuff + # (e.g. because there's no xmkmf program) then check through + # a list of possible directories. Under some conditions the + # autoconf macro will return an include directory that contains + # no include files, so double-check its result just to be safe. + #-------------------------------------------------------------------- + + AC_PATH_X + not_really_there="" + if test "$no_x" = ""; then + if test "$x_includes" = ""; then + AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes") + else + if test ! -r $x_includes/X11/Intrinsic.h; then + not_really_there="yes" + fi + fi + fi + if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then + AC_MSG_CHECKING(for X11 header files) + XINCLUDES="# no special path needed" + AC_TRY_CPP([#include <X11/Intrinsic.h>], , XINCLUDES="nope") + if test "$XINCLUDES" = nope; then + dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include" + for i in $dirs ; do + if test -r $i/X11/Intrinsic.h; then + AC_MSG_RESULT($i) + XINCLUDES=" -I$i" + break + fi + done + fi + else + if test "$x_includes" != ""; then + XINCLUDES=-I$x_includes + else + XINCLUDES="# no special path needed" + fi + fi + if test "$XINCLUDES" = nope; then + AC_MSG_RESULT(couldn't find any!) + XINCLUDES="# no include files found" + fi + + if test "$no_x" = yes; then + AC_MSG_CHECKING(for X11 libraries) + XLIBSW=nope + dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" + for i in $dirs ; do + if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then + AC_MSG_RESULT($i) + XLIBSW="-L$i -lX11" + x_libraries="$i" + break + fi + done + else + if test "$x_libraries" = ""; then + XLIBSW=-lX11 + else + XLIBSW="-L$x_libraries -lX11" + fi + fi + if test "$XLIBSW" = nope ; then + AC_CHECK_LIB(Xwindow, XCreateWindow, XLIBSW=-lXwindow) + fi + if test "$XLIBSW" = nope ; then + AC_MSG_RESULT(couldn't find any! Using -lX11.) + XLIBSW=-lX11 + fi + + #-------------------------------------------------------------------- + # Various manipulations on the search path used at runtime to + # find shared libraries: + # 1. If the X library binaries are in a non-standard directory, + # add the X library location into that search path. + # 2. On systems such as AIX and Ultrix that use "-L" as the + # search path option, colons cannot be used to separate + # directories from each other. Change colons to " -L". + # 3. Create two sets of search flags, one for use in cc lines + # and the other for when the linker is invoked directly. In + # the second case, '-Wl,' must be stripped off and commas must + # be replaced by spaces. + #-------------------------------------------------------------------- + + # + # CYGNUS LOCAL: statically link on Solaris, HPUX & SunOS so that + # we don't have problems with people not having libraries + # installed or not having LD_LIBRARY_PATH set. + # + + case "$host" in + # + # gdb linked statically w/ Solaris iff GCC and GNU ld are used, + # otherwise dynamic + # + sparc-sun-solaris2*) + sol_xlibsw= + if test "x$GCC" = "xyes" ; then + # This is probably the simplest way to test for GNU ld. + # It only works with relatively recent versions of GNU + # ld. + gld_text=`$CC -Wl,--version 2>&1 | sed 1q` + case "$gld_text" in + GNU* | *BFD*) + # Why do we link against libX11 twice? Because the + # Openwin X11 and Xext libraries are seriously broken. + sol_xlibsw="-Wl,-Bstatic $XLIBSW -lXext -lX11 -Wl,-Bdynamic" + ;; + esac + fi + if test -z "$sol_xlibsw"; then + if test "x$x_libraries" != "x"; then + XLIBSW="$XLIBSW -R$x_libraries" + fi + else + XLIBSW=$sol_xlibsw + suppress_enable_shared=yes + fi + ;; + # + # gdb linked statically w/ SunOS or HPUX + # + m68k-hp-hpux*|hppa*-hp-hpux*|sparc-sun-sunos*) + if test "x$x_libraries" != "x" ; + then + XLIBSW="$x_libraries/libX11.a" + else + XLIBSW="/usr/lib/libX11.a" + fi + suppress_enable_shared=yes + ;; + # + # default is to link dynamically + # + *) + ;; + esac + # + # END CYGNUS LOCAL + + + #-------------------------------------------------------------------- + # Check for the existence of various libraries. The order here + # is important, so that then end up in the right order in the + # command line generated by make. The -lsocket and -lnsl libraries + # require a couple of special tricks: + # 1. Use "connect" and "accept" to check for -lsocket, and + # "gethostbyname" to check for -lnsl. + # 2. Use each function name only once: can't redo a check because + # autoconf caches the results of the last check and won't redo it. + # 3. Use -lnsl and -lsocket only if they supply procedures that + # aren't already present in the normal libraries. This is because + # IRIX 5.2 has libraries, but they aren't needed and they're + # bogus: they goof up name resolution if used. + # 4. On some SVR4 systems, can't use -lsocket without -lnsl too. + # To get around this problem, check for both libraries together + # if -lsocket doesn't work by itself. + #-------------------------------------------------------------------- + + AC_CHECK_LIB(Xbsd, main, [SOCKLIBSW="$SOCKLIBSW -lXbsd"]) + + # CYGNUS LOCAL: Store any socket library(ies) in the cache, and don't + # mess up the cache values of the functions we check for. + AC_CACHE_CHECK([for socket libraries], sim_cv_lib_sockets, + [sim_cv_lib_sockets= + sim_checkBoth=0 + unset ac_cv_func_connect + AC_CHECK_FUNC(connect, sim_checkSocket=0, sim_checkSocket=1) + if test "$sim_checkSocket" = 1; then + unset ac_cv_func_connect + AC_CHECK_LIB(socket, main, sim_cv_lib_sockets="-lsocket", + sim_checkBoth=1) + fi + if test "$sim_checkBoth" = 1; then + sim_oldLibs=$SOCKLIBSW + SOCKLIBSW="$SOCKLIBSW -lsocket -lnsl" + unset ac_cv_func_accept + AC_CHECK_FUNC(accept, + [sim_checkNsl=0 + sim_cv_lib_sockets="-lsocket -lnsl"]) + unset ac_cv_func_accept + SOCKLIBSW=$sim_oldLibs + fi + unset ac_cv_func_gethostbyname + sim_oldLibs=$SOCKLIBSW + SOCKLIBSW="$SOCKLIBSW $sim_cv_lib_sockets" + AC_CHECK_FUNC(gethostbyname, , + [AC_CHECK_LIB(nsl, main, + [sim_cv_lib_sockets="$sim_cv_lib_sockets -lnsl"])]) + unset ac_cv_func_gethostbyname + SOCKLIBSW=$sim_oldSOCKLIBSW + ]) + test -z "$sim_cv_lib_sockets" || SOCKLIBSW="$SOCKLIBSW $sim_cv_lib_sockets" + + mips_extra_libs="-L${withval}/lib -lgpu2 -lm $XLIBSW $SOCKLIBSW" + cat > simConfig.sh << --EOF-- +mips_extra_libs="$mips_extra_libs" +--EOF-- + else AC_MSG_ERROR("Directory ${withval} does not exist."); fi])dnl + + # Enable target accurate FP library AC_ARG_WITH(sim-funit, [ --with-sim-funit=path Use target FP library under given directory], |