* compile.c (sim_load): Treat the H8/S like the H8/300H for now.

        * run.c (main): Treat the H8/S like the H8/300H for now.

More sanitize H8/S stuff.

diff --git a/sim/h8300/.Sanitize b/sim/h8300/.Sanitize
index 9e8ed06a08392a3af856df9ed6ec83c6d4710694..00d5f5bede49e067dba92e37efb07d083ce182f1 100644 (file)
--- a/sim/h8300/.Sanitize
+++ b/sim/h8300/.Sanitize
@@ -17,6 +17,33 @@
 
 Do-first:
 
+h8s_files="ChangeLog compile.c run.c"
+if ( echo $* | grep keep\-h8s > /dev/null ) ; then
+       for i in $h8s_files ; do
+               if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping h8s stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in $h8s_files ; do
+               if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"h8s\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-h8s/,/end-\sanitize\-h8s/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
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize

diff --git a/sim/h8300/run.c b/sim/h8300/run.c
index a8195694f04a762dac3eb367c6264a4a18ef39ac..f19488a0f81e52a529b6a33e9e33a72b71220c66 100644 (file)
--- a/sim/h8300/run.c
+++ b/sim/h8300/run.c
@@ -89,7 +89,11 @@ main (ac, av)
       exit (1);
     }
 
-  if (abfd->arch_info->mach == bfd_mach_h8300h)
+  if (abfd->arch_info->mach == bfd_mach_h8300h
+/* start-sanitize-h8s */
+      || abfd->arch_info->mach == bfd_mach_h8300s
+/* end-sanitize-h8s */
+      )
     set_h8300h (1);
 
   for (s = abfd->sections; s; s=s->next)