Rename XL to JX, and remove sanitization.

5 files changed, 4 insertions, 96 deletions

diff --git a/gas/.Sanitize b/gas/.Sanitize
index a2f9f4f0..29b16b7 100644
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -107,30 +107,6 @@ Things-to-lose:
 
 Do-last:
 
-i960xl_files="ChangeLog ChangeLog.1"
-if ( echo $* | grep keep\-i960xl > /dev/null ) ; then
-	if [ -n "${verbose}" ] ; then
-		echo Keeping i960xl stuff in $i960xl_files.
-	fi
-else
-	if [ -n "${verbose}" ]; then
-		echo -n Cleaning i960xl in `pwd`:
-	fi
-	for f in $i960xl_files ; do
-		if [ -n "${verbose}" ] ; then
-			echo -n " " $f
-		fi
-		sed '/start\-sanitize\-i960xl/,/end\-sanitize\-i960xl/d' < $f > new
-		if [ -n "${safe}" ] ; then
-			mv $f .Recover
-		fi
-		mv new $f
-	done
-	if [ -n "${verbose}" ]; then
-		echo ""
-	fi
-fi
-
 rce_files="configure.in configure ChangeLog Makefile.in ChangeLog.1"
 
 if ( echo $* | grep keep\-rce > /dev/null ) ; then
diff --git a/gas/ChangeLog.1 b/gas/ChangeLog.1
index 43a1f0b..1177180 100644
--- a/gas/ChangeLog.1
+++ b/gas/ChangeLog.1
@@ -4956,12 +4956,10 @@ Tue Jul 26 18:21:24 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 	{R,F}{,L}{2,4}, M, SFR_OK, LIT_OK, FP_OK, REG_ALIGN, MEMOP, I_*):
 	Macros deleted.
 
-	start-sanitize-i960xl
-	* config/tc-i960.c (ARCH_XL): Define.
-	(arch_tab): Include XL.
-	(targ_has_sfr, targ_has_iclass): Handle XL.
-	(tc_headers_hook): Set flags to F_I960XL for i960XL.
-	end-sanitize-i960xl
+	* config/tc-i960.c (ARCH_JX): Define.
+	(arch_tab): Include JX.
+	(targ_has_sfr, targ_has_iclass): Handle JX.
+	(tc_headers_hook): Set flags to F_I960JX for i960JX.
 
 Fri Jul 15 15:36:51 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index e25270d..a24eb30 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -156,28 +156,4 @@ Things-to-lose:
 
 Do-last:
 
-i960xl_files=tc-i960.c
-if ( echo $* | grep keep\-i960xl > /dev/null ) ; then
-	if [ -n "${verbose}" ] ; then
-		echo Keeping i960xl stuff in $i960xl_files.
-	fi
-else
-	if [ -n "${verbose}" ]; then
-		echo -n Cleaning i960xl in `pwd`:
-	fi
-	for f in $i960xl_files ; do
-		if [ -n "${verbose}" ] ; then
-			echo -n " " $f
-		fi
-		grep -v XL < $f > new
-		if [ -n "${safe}" ] ; then
-			mv $f .Recover
-		fi
-		mv new $f
-	done
-	if [ -n "${verbose}" ]; then
-		echo ""
-	fi
-fi
-
 # End of file.
diff --git a/include/coff/.Sanitize b/include/coff/.Sanitize
index 72373e2..b84f971 100644
--- a/include/coff/.Sanitize
+++ b/include/coff/.Sanitize
@@ -56,25 +56,4 @@ Things-to-lose:
 
 Do-last:
 
-i960xl_files="ChangeLog i960.h"
-if ( echo $* | grep keep\-i960xl > /dev/null ) ; then
-	if [ -n "${verbose}" ] ; then
-		echo Keeping i960xl stuff in $i960xl_files.
-	fi
-else
-	if [ -n "${verbose}" ]; then
-		echo -n Cleaning i960xl in `pwd`:
-	fi
-	for f in $i960xl_files ; do
-		if [ -n "${verbose}" ] ; then
-			echo -n " " $f
-		fi
-		sed '/start\-sanitize\-i960xl/,/end\-sanitize\-i960xl/d' < $f > new
-		if [ -n "${safe}" ] ; then
-			mv $f .Recover
-		fi
-		mv new $f
-	done
-fi
-
 # End of file.
diff --git a/include/opcode/.Sanitize b/include/opcode/.Sanitize
index 818c72f..76b8d9f 100644
--- a/include/opcode/.Sanitize
+++ b/include/opcode/.Sanitize
@@ -58,27 +58,6 @@ Things-to-lose:
 
 Do-last:
 
-i960xl_files="ChangeLog i960.h"
-if ( echo $* | grep keep\-i960xl > /dev/null ) ; then
-	if [ -n "${verbose}" ] ; then
-		echo Keeping i960xl stuff in $i960xl_files.
-	fi
-else
-	if [ -n "${verbose}" ]; then
-		echo -n Cleaning i960xl in `pwd`:
-	fi
-	for f in $i960xl_files ; do
-		if [ -n "${verbose}" ] ; then
-			echo -n " " $f
-		fi
-		sed -e '/start\-sanitize\-i960xl/,/end\-sanitize\-i960xl/d' -e '/XL/d' < $f > new
-		if [ -n "${safe}" ] ; then
-			mv $f .Recover
-		fi
-		mv new $f
-	done
-fi
-
 arc_files="ChangeLog"
 if ( echo $* | grep keep\-arc > /dev/null ) ; then
 	for i in $arc_files ; do