Rename XL to JX, and remove sanitization.

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 5d0217b764bc71402458821da510cc7cc39eae6a..8bd22441796b78a8ba4aa3a6fa483ebdf963e890 100644 (file)
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -252,27 +252,6 @@ Things-to-lose:
 
 Do-last:
 
-i960xl_files="ChangeLog ChangeLog.2 archures.c bfd-in2.h cpu-i960.c coffcode.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' < $f > new
-               if [ -n "${safe}" ] ; then
-                       mv $f .Recover
-               fi
-               mv new $f
-       done
-fi
-
 rce_files="ChangeLog ChangeLog.2 Makefile.in archures.c bfd-in2.h config.bfd configure.in configure targets.c aoutx.h libaout.h"
 if ( echo $* | grep keep\-rce > /dev/null ) ; then
        for i in $rce_files ; do

diff --git a/bfd/ChangeLog.2 b/bfd/ChangeLog.2
index 7c008403af37899181c8bc4eb6c5d2656236cf99..63eca2d093a5cae52d09fc44a2dca1f21cfcb688 100644 (file)
--- a/bfd/ChangeLog.2
+++ b/bfd/ChangeLog.2
@@ -3724,20 +3724,18 @@ Tue Jul 26 17:38:01 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
        * coff-i960.c (howto_rellong, howto_iprmed, howto_optcall): Use
        HOWTO macro.
 
-       start-sanitize-i960xl
-       * cpu-i960.c (XL): Define as bfd_mach_i960_xl.
-       (scan_960_mach): Recognize xl machine.
-       (MAX_ARCH): Define to be XL.
-       (compatible): Add XL row to array.
-       (arch_info_struct): Add XL entry.
-
-       * archures.c (bfd_mach_i960_xl): New macro.
+       * cpu-i960.c (JX): Define as bfd_mach_i960_jx.
+       (scan_960_mach): Recognize jx machine.
+       (MAX_ARCH): Define to be JX.
+       (compatible): Add JX row to array.
+       (arch_info_struct): Add JX entry.
+
+       * archures.c (bfd_mach_i960_jx): New macro.
        * bfd-in2.h: Regenerated.
 
-       * coffcode.h (coff_set_arch_mach_hook): For F_I960XL, set machine
-       to bfd_mach_i960_xl.
-       (coff_set_flags): For bfd_mach_i960_xl, set F_I960XL.
-       end-sanitize-i960xl
+       * coffcode.h (coff_set_arch_mach_hook): For F_I960JX, set machine
+       to bfd_mach_i960_jx.
+       (coff_set_flags): For bfd_mach_i960_jx, set F_I960JX.
 
 Tue Jul 26 11:04:00 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 4e4aa8610f96c270a85e2e99c69ffdee2dfa7d50..cd3785a89fc4abb1f6e6423f06bd413eb0bded43 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1103,9 +1103,7 @@ enum bfd_architecture
 #define bfd_mach_i960_mc        4
 #define bfd_mach_i960_xa        5
 #define bfd_mach_i960_ca        6
-  /* start-sanitize-i960xl */
-#define bfd_mach_i960_xl        7
-  /* end-sanitize-i960xl */
+#define bfd_mach_i960_jx        7
 #define bfd_mach_i960_hx        8
 
   bfd_arch_a29k,       /* AMD 29000 */