Rename r16 files to rce, and fix some more .Sanitize typos.

4 files changed, 22 insertions, 22 deletions

diff --git a/gas/.Sanitize b/gas/.Sanitize
index 26df3f4..a6e4825 100644
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -125,24 +125,24 @@ else
 	done
 fi
 
-r16_files = "configure.in"
+rce_files="configure.in"
 
-if ( echo $* | grep keep\-r16 > /dev/null ) ; then
-	for i in $r16_files ; do
-		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+if ( echo $* | grep keep\-rce > /dev/null ) ; then
+	for i in $rce_files ; do
+		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping r16 stuff in $i
+				echo Keeping rce stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $r16_files ; do
-		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+	for i in $rce_files ; do
+		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"r16\" from $i...
+				echo Removing traces of \"rce\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/d' < $i > new
+			sed '/start\-sanitize\-rce/,/end-\sanitize\-rce/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
diff --git a/gas/config/tc-r16.c b/gas/config/tc-rce.c
index 153274e..62698aa 100644
--- a/gas/config/tc-r16.c
+++ b/gas/config/tc-rce.c
@@ -1,4 +1,4 @@
-/* tc-r16.c -- Assemble code for the Experimental R16
+/* tc-rce.c -- Assemble code for the Experimental R16
 
    Copyright (C) 1993 Free Software Foundation.
 
@@ -28,7 +28,7 @@
 #include "bfd.h"
 #include "subsegs.h"
 #define DEFINE_TABLE
-#include "../opcodes/r16-opc.h"
+#include "../opcodes/rce-opc.h"
 #include <ctype.h>
 
 #if 1	/**** TEMP ****/
@@ -116,13 +116,13 @@ static struct hash_control *opcode_hash_control;	/* Opcode mnemonics */
 void
 md_begin ()
 {
-  r16_opcode_info *opcode;
+  rce_opcode_info *opcode;
   char *prev_name = "";
 
   opcode_hash_control = hash_new ();
 
   /* Insert unique names into hash table */
-  for (opcode = r16_table; opcode->name; opcode++)
+  for (opcode = rce_table; opcode->name; opcode++)
     {
       if (strcmp (prev_name, opcode->name))
 	{
@@ -272,7 +272,7 @@ char *str;
 {
     char *op_start;
     char *op_end;
-    r16_opcode_info *opcode;
+    rce_opcode_info *opcode;
     char *output;
     int nlen = 0;
     unsigned short inst;
@@ -298,7 +298,7 @@ char *str;
 	return;
     }
 
-    opcode = (r16_opcode_info *) hash_find (opcode_hash_control, name);
+    opcode = (rce_opcode_info *) hash_find (opcode_hash_control, name);
     if (opcode == NULL)
     {
 	as_bad ("unknown opcode \"%s\"", name);
diff --git a/gas/config/tc-r16.h b/gas/config/tc-rce.h
index 7e82378..98f779d 100644
--- a/gas/config/tc-r16.h
+++ b/gas/config/tc-rce.h
@@ -1,4 +1,4 @@
-/* This file is tc-r16.h
+/* This file is tc-rce.h
 
    Copyright (C) 1993 Free Software Foundation, Inc.
 
@@ -23,15 +23,15 @@
 
 #ifdef BFD_ASSEMBLER
 
-#define TARGET_ARCH	bfd_arch_r16
+#define TARGET_ARCH	bfd_arch_rce
 #define TARGET_BYTES_BIG_ENDIAN 1
 #ifdef OBJ_AOUT
-#define TARGET_FORMAT	"a.out-r16"
+#define TARGET_FORMAT	"a.out-rce"
 #endif
 
 #else /* ! BFD_ASSEMBLER */
 
-#define BFD_ARCH	bfd_arch_r16
+#define BFD_ARCH	bfd_arch_rce
 #define NO_RELOC	0
 #define RELOC_32	1234
 
diff --git a/gas/configure.in b/gas/configure.in
index 3098eec..dbbe8e7 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -150,9 +150,9 @@ case ${generic_target} in
 
   sh-*-coff)		obj_format=coff ;;
 
-# start-sanitize-r16
-  r16-*-aout)		obj_format=aout ;;
-# end-sanitize-r16
+# start-sanitize-rce
+  rce-*-aout)		obj_format=aout ;;
+# end-sanitize-rce
 
   ns32k-pc532-mach*)	obj_format=aout emulation=pc532 ;;
   ns32k-pc532-netbsd*)	obj_format=aout emulation=nbsd532 ;;