removed v850 sanitization

Added v850/sim-main.h to list of files to keep after sanitization.

diff --git a/sim/.Sanitize b/sim/.Sanitize
index 593586ca12d6802ddf296ebbb63d01cc578a3152..6d4472ba8597d750edef07ff9be77e48a9b7c835 100644 (file)
--- a/sim/.Sanitize
+++ b/sim/.Sanitize
@@ -33,21 +33,6 @@ else
         lose_these_too="${tic80_files} ${lose_these_too}"
 fi
 
-v850_files="v850"
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-        keep_these_too="${v850_files} ${keep_these_too}"
-else
- if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-        keep_these_too="${v850_files} ${keep_these_too}"
- else
-  if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-        keep_these_too="${v850_files} ${keep_these_too}"
-  else
-        lose_these_too="${v850_files} ${lose_these_too}"
-  fi
- fi
-fi
-
 lose_these_too="${igen_files} ${lose_these_too}"
 
 # All files listed between the "Things-to-keep:" line and the
@@ -76,6 +61,7 @@ mn10300
 ppc
 sh
 w65
+v850
 z8k
 
 Things-to-lose:
@@ -140,22 +126,22 @@ else
 fi
 
 v850_files="configure configure.in ChangeLog"
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
         for i in $v850_files ; do
-                if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
+                if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
                         if [ -n "${verbose}" ] ; then
-                                echo Keeping v850 stuff in $i
+                                echo Keeping v850eq stuff in $i
                         fi
                 fi
         done
 else
         for i in $v850_files ; do
-                if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
+                if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
                         if [ -n "${verbose}" ] ; then
-                                echo Removing traces of \"v850\" from $i...
+                                echo Removing traces of \"v850eq\" from $i...
                         fi
                         cp $i new
-                        sed '/start\-sanitize\-v850/,/end-\sanitize\-v850/d' < $i > new
+                        sed '/start\-sanitize\-v850eq/,/end-\sanitize\-v850eq/d' < $i > new
                         if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
                                 if [ -n "${verbose}" ] ; then
                                         echo Caching $i in .Recover...
@@ -192,32 +178,6 @@ else
                 fi
         done
 fi
-if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-        for i in $v850_files ; do
-                if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
-                        if [ -n "${verbose}" ] ; then
-                                echo Keeping v850eq stuff in $i
-                        fi
-                fi
-        done
-else
-        for i in $v850_files ; do
-                if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
-                        if [ -n "${verbose}" ] ; then
-                                echo Removing traces of \"v850eq\" from $i...
-                        fi
-                        cp $i new
-                        sed '/start\-sanitize\-v850eq/,/end-\sanitize\-v850eq/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
 
 
 for i in * ; do

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 4d1d20b5007787eb9ebdf33fce8bf35ac863ea03..e5d2ec05be838e6a87118c0a4dde55308dc00ad0 100644 (file)
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -152,14 +152,12 @@ Thu Oct 17 12:50:08 1996  Doug Evans  <dje@canuck.cygnus.com>
        (--enable-sim): Add.
        * configure: Regenerated.
 
-start-sanitize-v850
 Fri Oct 11 21:13:43 1996  Jeffrey A Law  (law@cygnus.com)
 
        * configure.in: Only build the V850 simulator if
        we are using gcc.
        * configure: Rebuild.
 
-end-sanitize-v850
 Sun Sep  8 17:22:50 1996  Ian Lance Taylor  <ian@cygnus.com>
 
        * configure.in: Do build erc32 for DOS and Windows hosts.
@@ -177,12 +175,10 @@ Wed Sep  4 15:49:16 1996  Ian Lance Taylor  <ian@cygnus.com>
        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
 Thu Aug  1 17:08:41 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
        * configure.in (d10v-*-*): Added D10V simulator.

diff --git a/sim/configure b/sim/configure
index 1aea8939c7628a00c08961f8d19d6b5afbb62ced..dabbdb65f0793e806267ab92bf3ff47042af8dc3 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -1323,14 +1323,12 @@ case "${target}" in
        extra_subdirs="${extra_subdirs} igen"
        ;;
 # end-sanitize-tic80
-# start-sanitize-v850
   v850-*-*)
        # The V850 simulator can only be compiled by gcc.
        sim_target=v850
        extra_subdirs="${extra_subdirs} igen"
        only_if_gcc=yes
        ;;
-# end-sanitize-v850
 # start-sanitize-v850e
   v850e-*-*)
        # The V850 simulator can only be compiled by gcc.

diff --git a/sim/configure.in b/sim/configure.in
index 0d4e8003b9cce1de304f34dc0bf6f935e3bd77bb..417d3df2828cd62cab7799732a5c2957c7fba980 100644 (file)
--- a/sim/configure.in
+++ b/sim/configure.in
@@ -88,14 +88,12 @@ case "${target}" in
        extra_subdirs="${extra_subdirs} igen"
        ;;
 # end-sanitize-tic80
-# start-sanitize-v850
   v850-*-*)
        # The V850 simulator can only be compiled by gcc.
        sim_target=v850
        extra_subdirs="${extra_subdirs} igen"
        only_if_gcc=yes
        ;;
-# end-sanitize-v850
 # start-sanitize-v850e
   v850e-*-*)
        # The V850 simulator can only be compiled by gcc.

diff --git a/sim/v850/.Sanitize b/sim/v850/.Sanitize
index 2dc770b590865ffb9aec17656f7c1af6e359320e..5d25732fb886bcfca4a625f8f2bbfea334864d5f 100644 (file)
--- a/sim/v850/.Sanitize
+++ b/sim/v850/.Sanitize
@@ -32,6 +32,7 @@ v850_sim.h
 gencode.c
 interp.c
 simops.c
+sim-main.h
 
 Things-to-lose: