From 68867afb885883114787d9408d894e5603551fc7 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 4 Sep 1996 19:50:55 +0000 Subject: [PATCH] * configure.in: Only build the MIPS simulator if we are using gcc. * configure: Rebuild. --- sim/ChangeLog | 18 ++++++++ sim/configure | 114 ++++++++++++++++++++++++++++++++++++++++++----- sim/configure.in | 17 ++++--- 3 files changed, 134 insertions(+), 15 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index c6649530dd5..65af2abeeb8 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,21 @@ +Wed Sep 4 15:49:16 1996 Ian Lance Taylor + + * configure.in: Only build the MIPS simulator if we are using + gcc. + * configure: Rebuild. + +start-sanitize-v850 +Wed Aug 28 19:05:23 1996 Jeffrey A Law (law@cygnus.com) + + * configure.in (v850-*-*): Added V850 simulator. + +end-sanitize-v850 +start-sanitize-d10v +Thu Aug 1 17:08:41 1996 Martin M. Hunt + + * configure.in (d10v-*-*): Added D10V simulator. + +end-sanitize-d10v Wed Jun 26 12:33:57 1996 Jason Molenda (crash@godzilla.cygnus.co.jp) * Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir, diff --git a/sim/configure b/sim/configure index 10309368d97..cd997d12e7c 100755 --- a/sim/configure +++ b/sim/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.8 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.10 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -332,7 +332,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.8" + echo "configure generated by autoconf version 2.10" exit 0 ;; -with-* | --with-*) @@ -657,6 +657,65 @@ ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# ./install, which can be erroneously created by make from ./install.sh. +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +if test -z "$INSTALL"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + for ac_prog in ginstall installbsd scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + # OSF/1 installbsd also uses dspmsg, but is usable. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_save_ifs" + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi +fi +echo "$ac_t""$INSTALL" 1>&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + # Make sure we can run config.sub. if $ac_config_sub sun4 >/dev/null 2>&1; then : @@ -1010,7 +1069,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1090,11 +1149,11 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -1138,18 +1197,41 @@ fi case "${target}" in arm*-*-*) sim_target=arm ;; +# start-sanitize-d10v + d10v-*-*) sim_target=d10v ;; +# end-sanitize-d10v h8300*-*-*) sim_target=h8300 ;; h8500-*-*) sim_target=h8500 ;; - mips*-*-*) sim_target=mips ;; + mips*-*-*) + # The MIPS simulator can only be compiled + # by gcc. + if test "${GCC}" = "yes"; then + sim_target=mips + else + sim_target=none + fi + ;; sh*-*-*) sim_target=sh ;; - powerpc*-*-eabi*) if test x"$powerpc_sim" = x"yes"; then sim_target=ppc; fi ;; + powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | powerpc*-*-elf* ) + if test x"$powerpc_sim" = x"yes"; then sim_target=ppc; fi ;; +# start-sanitize-v850 + v850-*-*) sim_target=v850 ;; +# end-sanitize-v850 w65-*-*) sim_target=w65 ;; z8k*-*-*) sim_target=z8k ;; sparc*-*-*) case "${host}" in # don't build for non Unix systems *-*-go32) sim_target=none ;; *-*-winnt) sim_target=none ;; *-*-cygwin32) sim_target=none ;; - *) sim_target=erc32 ;; + *) + # The SPARC simulator can only be compiled + # by gcc. + if test "${GCC}" = "yes"; then + sim_target=erc32 + else + sim_target=none + fi + ;; esac ;; *) sim_target=none ;; esac @@ -1246,7 +1328,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.8" + echo "$CONFIG_STATUS generated by autoconf version 2.10" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1255,6 +1337,7 @@ do done ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -1287,6 +1370,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@CC@%$CC%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_DATA@%$INSTALL_DATA%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -1347,6 +1432,10 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then top_srcdir="$ac_dots$ac_given_srcdir" ;; esac + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac echo creating "$ac_file" rm -f "$ac_file" configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." @@ -1359,6 +1448,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g s%@top_srcdir@%$top_srcdir%g +s%@INSTALL@%$INSTALL%g " -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file fi; done rm -f conftest.subs @@ -1449,6 +1539,10 @@ if test "$no_recursion" != yes; then *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work. diff --git a/sim/configure.in b/sim/configure.in index b9eed90cf94..e3d7fc9f82a 100644 --- a/sim/configure.in +++ b/sim/configure.in @@ -50,13 +50,21 @@ case "${target}" in # end-sanitize-d10v h8300*-*-*) sim_target=h8300 ;; h8500-*-*) sim_target=h8500 ;; - mips*-*-*) sim_target=mips ;; + mips*-*-*) + # The MIPS simulator can only be compiled + # by gcc. + if test "${GCC}" = "yes"; then + sim_target=mips + else + sim_target=none + fi + ;; sh*-*-*) sim_target=sh ;; powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | powerpc*-*-elf* ) + if test x"$powerpc_sim" = x"yes"; then sim_target=ppc; fi ;; # start-sanitize-v850 v850-*-*) sim_target=v850 ;; # end-sanitize-v850 - if test x"$powerpc_sim" = x"yes"; then sim_target=ppc; fi ;; w65-*-*) sim_target=w65 ;; z8k*-*-*) sim_target=z8k ;; sparc*-*-*) case "${host}" in # don't build for non Unix systems @@ -65,12 +73,11 @@ case "${target}" in *-*-cygwin32) sim_target=none ;; *) # The SPARC simulator can only be compiled - # by gcc. Highly bogus, but just skip - # building it for now. + # by gcc. if test "${GCC}" = "yes"; then sim_target=erc32 else - sim_target=non + sim_target=none fi ;; esac ;; -- 2.30.2