diff --git a/sim/.Sanitize b/sim/.Sanitize index 531d802c84..8f4de07b37 100644 --- a/sim/.Sanitize +++ b/sim/.Sanitize @@ -15,13 +15,6 @@ Do-first: -d30v_files="d30v" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - keep_these_too="${d30v_files} ${keep_these_too}" -else - lose_these_too="${d30v_files} ${lose_these_too}" -fi - tic80_files="tic80" if ( echo $* | grep keep\-tic80 > /dev/null ) ; then keep_these_too="${tic80_files} ${keep_these_too}" @@ -47,6 +40,7 @@ configure configure.in common d10v +d30v erc32 h8300 h8500 @@ -67,34 +61,6 @@ Things-to-lose: Do-last: -d30v_files="configure configure.in ChangeLog" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping d30v stuff in $i - fi - fi - done -else - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"d30v\" from $i... - fi - cp $i new - sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - tic80_files="configure configure.in ChangeLog" if ( echo $* | grep keep\-tic80 > /dev/null ) ; then for i in $tic80_files ; do diff --git a/sim/common/.Sanitize b/sim/common/.Sanitize index 2948748dc2..0b708c42f8 100644 --- a/sim/common/.Sanitize +++ b/sim/common/.Sanitize @@ -146,34 +146,6 @@ Things-to-lose: Do-last: -d30v_files="ChangeLog gennltvals.sh nltvals.def" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping d30v stuff in $i - fi - fi - done -else - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"d30v\" from $i... - fi - cp $i new - sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - cygnus_files="ChangeLog Make-common.in" if ( echo $* | grep keep\-cygnus > /dev/null ) ; then for i in $cygnus_files ; do diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index b7e25b7c8a..d13ef1610f 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1318,9 +1318,8 @@ Tue Nov 25 20:12:46 1997 Michael Meissner Tue Nov 25 00:12:38 1997 Doug Evans -start-sanitize-d30v * gennltvals.sh: Generate syscall values for d30v. -end-sanitize-d30v + * gennltvals.sh: Use libgloss/syscall.h for sparc. * nltvals.def: Regenerate. @@ -3121,9 +3120,7 @@ Wed Apr 2 15:06:28 1997 Doug Evans * Make-common.in (SIM_EXTRA_DEPS): New config var. (sim_main_headers): Define. (sim-*.o): Depend on $(SIM_EXTRA_DEPS). -start-sanitize-d30v (BUILT_SRC_FROM_COMMON): Move here from ../d30v/Makefile.in. -end-sanitize-d30v (clean): Use it. (sim-utils.o): Add rule for. * sim-utils.o: New file. diff --git a/sim/configure.in b/sim/configure.in index f098025a0d..7c9ae51f71 100644 --- a/sim/configure.in +++ b/sim/configure.in @@ -50,13 +50,11 @@ case "${target}" in arm*-*-*) sim_target=arm ;; thumb*-*-*) sim_target=arm ;; d10v-*-*) sim_target=d10v ;; -# start-sanitize-d30v d30v-*-*) sim_target=d30v only_if_gcc=yes extra_subdirs="${extra_subdirs} igen" ;; -# end-sanitize-d30v h8300*-*-*) sim_target=h8300 ;; h8500-*-*) sim_target=h8500 ;; m32r-*-*) sim_target=m32r ;; diff --git a/sim/testsuite/.Sanitize b/sim/testsuite/.Sanitize index e5850165e0..c3a26bd72c 100644 --- a/sim/testsuite/.Sanitize +++ b/sim/testsuite/.Sanitize @@ -15,13 +15,6 @@ Do-first: -d30v_files="d30v-elf" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - keep_these_too="${d30v_files} ${keep_these_too}" -else - lose_these_too="${d30v_files} ${lose_these_too}" -fi - r5900_files="mips64r5900-elf" if ( echo $* | grep keep\-r5900 > /dev/null ) ; then keep_these_too="${r5900_files} ${keep_these_too}" @@ -58,6 +51,7 @@ config configure configure.in d10v-elf +d30v-elf lib m32r-elf sim @@ -69,34 +63,6 @@ README Do-last: -d30v_files="configure configure.in ChangeLog Makefile.in" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping d30v stuff in $i - fi - fi - done -else - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"d30v\" from $i... - fi - cp $i new - sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - r5900_files="configure configure.in ChangeLog Makefile.in" if ( echo $* | grep keep\-r5900 > /dev/null ) ; then for i in $r5900_files ; do