Rename ms1 to mt, part 1

21 years ago · 4970f871a7
40 changed files with 145 additions and 66 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
+	* configure.in: Replace ms1 arch with mt.
+	* configure: Rebuilt.
+
 2005-12-05  Paolo Bonzini  <bonzini@gnu.org>

 	Sync with gcc:
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@ -1,3 +1,15 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* Makefile.am (ALL_MACHINES, ALL_MACHINES_CFILES,
+	BFD32_BACKENDS, BFD32_BACKENDS_CFILES): Replace ms1 with mt.
+	(cpu_mt.lo, elf32-mt.lo): Update target and dependency names.
+	* Makefile.in: Rebuilt.
+	* config.bfd: Replace ms1 arch with mt.
+	* configure.in: Replace ms1 files with mt files.
+	* configure: Rebuilt.
+	* elf32-mt.c: Renamed from elf32-ms1.c.  Update include files.
+	* cpu-mt.c: Renamed from cpu-ms1.c.
+
 2005-12-12  Alan Modra  <amodra@bigpond.net.au>

 	* elf64-ppc.c (ppc64_elf_size_stubs): Don't consider non-ppc64 input.
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@ -89,7 +89,7 @@ ALL_MACHINES = \
 	cpu-mcore.lo \
 	cpu-mips.lo \
 	cpu-mmix.lo \
-	cpu-ms1.lo \
+	cpu-mt.lo \
 	cpu-msp430.lo \
 	cpu-or32.lo \
 	cpu-ns32k.lo \
@ -150,7 +150,7 @@ ALL_MACHINES_CFILES = \
 	cpu-mcore.c \
 	cpu-mips.c \
 	cpu-mmix.c \
-	cpu-ms1.c \
+	cpu-mt.c \
 	cpu-msp430.c \
 	cpu-or32.c \
 	cpu-ns32k.c \
@ -258,7 +258,7 @@ BFD32_BACKENDS = \
 	elf32-mcore.lo \
 	elfxx-mips.lo \
 	elf32-mips.lo \
-	elf32-ms1.lo \
+	elf32-mt.lo \
 	elf32-msp430.lo \
 	elf32-openrisc.lo \
 	elf32-or32.lo \
@ -429,7 +429,7 @@ BFD32_BACKENDS_CFILES = \
 	elf32-mcore.c \
 	elfxx-mips.c \
 	elf32-mips.c \
-	elf32-ms1.c \
+	elf32-mt.c \
 	elf32-msp430.c \
 	elf32-openrisc.c \
 	elf32-or32.c \
@ -1004,7 +1004,7 @@ cpu-maxq.lo: cpu-maxq.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-mcore.lo: cpu-mcore.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-mips.lo: cpu-mips.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-mmix.lo: cpu-mmix.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
-cpu-ms1.lo: cpu-ms1.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
+cpu-mt.lo: cpu-mt.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-msp430.lo: cpu-msp430.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-or32.lo: cpu-or32.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-ns32k.lo: cpu-ns32k.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
@ -1351,9 +1351,9 @@ elf32-mips.lo: elf32-mips.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
  $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \
  $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h $(INCDIR)/coff/external.h \
  ecoffswap.h elf32-target.h
-elf32-ms1.lo: elf32-ms1.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
+elf32-mt.lo: elf32-mt.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
  elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/ms1.h \
+  $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/mt.h \
  $(INCDIR)/elf/reloc-macros.h elf32-target.h
 elf32-msp430.lo: elf32-msp430.c $(INCDIR)/filenames.h \
  $(INCDIR)/libiberty.h $(INCDIR)/hashtab.h elf-bfd.h \
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@ -326,7 +326,7 @@ ALL_MACHINES = \
 	cpu-mcore.lo \
 	cpu-mips.lo \
 	cpu-mmix.lo \
-	cpu-ms1.lo \
+	cpu-mt.lo \
 	cpu-msp430.lo \
 	cpu-or32.lo \
 	cpu-ns32k.lo \
@ -387,7 +387,7 @@ ALL_MACHINES_CFILES = \
 	cpu-mcore.c \
 	cpu-mips.c \
 	cpu-mmix.c \
-	cpu-ms1.c \
+	cpu-mt.c \
 	cpu-msp430.c \
 	cpu-or32.c \
 	cpu-ns32k.c \
@ -496,7 +496,7 @@ BFD32_BACKENDS = \
 	elf32-mcore.lo \
 	elfxx-mips.lo \
 	elf32-mips.lo \
-	elf32-ms1.lo \
+	elf32-mt.lo \
 	elf32-msp430.lo \
 	elf32-openrisc.lo \
 	elf32-or32.lo \
@ -667,7 +667,7 @@ BFD32_BACKENDS_CFILES = \
 	elf32-mcore.c \
 	elfxx-mips.c \
 	elf32-mips.c \
-	elf32-ms1.c \
+	elf32-mt.c \
 	elf32-msp430.c \
 	elf32-openrisc.c \
 	elf32-or32.c \
@ -1571,7 +1571,7 @@ cpu-maxq.lo: cpu-maxq.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-mcore.lo: cpu-mcore.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-mips.lo: cpu-mips.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-mmix.lo: cpu-mmix.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
-cpu-ms1.lo: cpu-ms1.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
+cpu-mt.lo: cpu-mt.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-msp430.lo: cpu-msp430.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-or32.lo: cpu-or32.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
 cpu-ns32k.lo: cpu-ns32k.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
@ -1918,9 +1918,9 @@ elf32-mips.lo: elf32-mips.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
  $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \
  $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h $(INCDIR)/coff/external.h \
  ecoffswap.h elf32-target.h
-elf32-ms1.lo: elf32-ms1.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
+elf32-mt.lo: elf32-mt.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
  elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/ms1.h \
+  $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/mt.h \
  $(INCDIR)/elf/reloc-macros.h elf32-target.h
 elf32-msp430.lo: elf32-msp430.c $(INCDIR)/filenames.h \
  $(INCDIR)/libiberty.h $(INCDIR)/hashtab.h elf-bfd.h \
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@ -87,6 +87,7 @@ m68*)		 targ_archs=bfd_m68k_arch ;;
 m88*)		 targ_archs=bfd_m88k_arch ;;
 maxq*)		 targ_archs=bfd_maxq_arch ;;
 mips*)		 targ_archs=bfd_mips_arch ;;
+mt)		 targ_archs=bfd_ms1_arch ;;
 or32*)		 targ_archs=bfd_or32_arch ;;
 pdp11*)		 targ_archs=bfd_pdp11_arch ;;
 pj*)		 targ_archs="bfd_pj_arch bfd_i386_arch";;
@ -925,7 +926,7 @@ case "${targ}" in
    targ_underscore=yes
    ;;

-  ms1-*-elf)
+  mt-*-elf)
    targ_defvec=bfd_elf32_ms1_vec
    ;;

--- a/bfd/configure
+++ b/bfd/configure
@ -13022,7 +13022,7 @@ do
    bfd_elf32_mcore_little_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
    bfd_elf32_mn10200_vec)	tb="$tb elf-m10200.lo elf32.lo $elf" ;;
    bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
-    bfd_elf32_ms1_vec)          tb="$tb elf32-ms1.lo elf32.lo $elf" ;;
+    bfd_elf32_ms1_vec)          tb="$tb elf32-mt.lo elf32.lo $elf" ;;
    bfd_elf32_msp430_vec)	tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
    bfd_elf32_nbigmips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
    bfd_elf32_nlittlemips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
@ -13223,7 +13223,7 @@ done
 # Target architecture .o files.
 # A couple of CPUs use shorter file names to avoid problems on DOS
 # filesystems.
-ta=`echo $selarchs | sed -e s/bfd_/cpu-/g -e s/_arch/.lo/g -e s/mn10200/m10200/ -e s/mn10300/m10300/`
+ta=`echo $selarchs | sed -e s/_ms1_/_mt_/ -e s/bfd_/cpu-/g -e s/_arch/.lo/g -e s/mn10200/m10200/ -e s/mn10300/m10300/`

 # Weed out duplicate .o files.
 f=""
--- a/bfd/configure.in
+++ b/bfd/configure.in
@ -637,7 +637,7 @@ do
    bfd_elf32_mcore_little_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
    bfd_elf32_mn10200_vec)	tb="$tb elf-m10200.lo elf32.lo $elf" ;;
    bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
-    bfd_elf32_ms1_vec)          tb="$tb elf32-ms1.lo elf32.lo $elf" ;;
+    bfd_elf32_ms1_vec)          tb="$tb elf32-mt.lo elf32.lo $elf" ;;
    bfd_elf32_msp430_vec)	tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
    bfd_elf32_nbigmips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
    bfd_elf32_nlittlemips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
@ -836,7 +836,7 @@ done
 # Target architecture .o files.
 # A couple of CPUs use shorter file names to avoid problems on DOS
 # filesystems.
-ta=`echo $selarchs | sed -e s/bfd_/cpu-/g -e s/_arch/.lo/g -e s/mn10200/m10200/ -e s/mn10300/m10300/`
+ta=`echo $selarchs | sed -e s/_ms1_/_mt_/ -e s/bfd_/cpu-/g -e s/_arch/.lo/g -e s/mn10200/m10200/ -e s/mn10300/m10300/`

 # Weed out duplicate .o files.
 f=""
--- a/bfd/elf32-mt.c
+++ b/bfd/elf32-mt.c
@ -22,7 +22,7 @@
 #include "sysdep.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
-#include "elf/ms1.h"
+#include "elf/mt.h"

 /* Prototypes.  */
 static reloc_howto_type * ms1_reloc_type_lookup 
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@ -1,3 +1,9 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* Makefile.am: Replace ms1 files with mt files.
+	* Makefile.in: Rebuilt.
+	* readelf.c (elf/mt.h): Adjust #include.
+
 2005-11-30  Nick Clifton  <nickc@redhat.com>

 	* configure.in (ALL_LINGUAS): Add fi.
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@ -507,7 +507,7 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
  $(INCDIR)/elf/ip2k.h $(INCDIR)/elf/m32c.h $(INCDIR)/elf/m32r.h \
  $(INCDIR)/elf/m68k.h $(INCDIR)/elf/m68hc11.h $(INCDIR)/elf/mcore.h \
  $(INCDIR)/elf/mips.h $(INCDIR)/elf/mmix.h $(INCDIR)/elf/mn10200.h \
-  $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/ms1.h $(INCDIR)/elf/msp430.h \
+  $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/mt.h $(INCDIR)/elf/msp430.h \
  $(INCDIR)/elf/or32.h $(INCDIR)/elf/pj.h $(INCDIR)/elf/ppc.h \
  $(INCDIR)/elf/ppc64.h $(INCDIR)/elf/s390.h $(INCDIR)/elf/sh.h \
  $(INCDIR)/elf/sparc.h $(INCDIR)/elf/v850.h $(INCDIR)/elf/vax.h \
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@ -1250,7 +1250,7 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
  $(INCDIR)/elf/ip2k.h $(INCDIR)/elf/m32c.h $(INCDIR)/elf/m32r.h \
  $(INCDIR)/elf/m68k.h $(INCDIR)/elf/m68hc11.h $(INCDIR)/elf/mcore.h \
  $(INCDIR)/elf/mips.h $(INCDIR)/elf/mmix.h $(INCDIR)/elf/mn10200.h \
-  $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/ms1.h $(INCDIR)/elf/msp430.h \
+  $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/mt.h $(INCDIR)/elf/msp430.h \
  $(INCDIR)/elf/or32.h $(INCDIR)/elf/pj.h $(INCDIR)/elf/ppc.h \
  $(INCDIR)/elf/ppc64.h $(INCDIR)/elf/s390.h $(INCDIR)/elf/sh.h \
  $(INCDIR)/elf/sparc.h $(INCDIR)/elf/v850.h $(INCDIR)/elf/vax.h \
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@ -95,7 +95,7 @@
 #include "elf/mmix.h"
 #include "elf/mn10200.h"
 #include "elf/mn10300.h"
-#include "elf/ms1.h"
+#include "elf/mt.h"
 #include "elf/msp430.h"
 #include "elf/or32.h"
 #include "elf/pj.h"
--- a/config.sub
+++ b/config.sub
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2005-11-13'
+timestamp='2005-12-12'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -265,7 +265,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
 	| ns16k | ns32k \
 	| or32 \
@ -295,6 +295,9 @@ case $basic_machine in
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;

+        ms1)
+	    basic_machine=mt-unknown
+	    ;;
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@ -344,7 +347,7 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@ -704,6 +707,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+	        basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
--- a/2
+++ b/2
@ -1475,7 +1475,7 @@ case "${target}" in
  mn10300-*-*)
    noconfigdirs="$noconfigdirs ${libgcj}"
    ;;
-  ms1-*-*)
+  mt-*-*)
    noconfigdirs="$noconfigdirs sim"
    ;;
  powerpc-*-aix*)
--- a/configure.in
+++ b/configure.in
@ -683,7 +683,7 @@ case "${target}" in
  mn10300-*-*)
    noconfigdirs="$noconfigdirs ${libgcj}"
    ;;
-  ms1-*-*)
+  mt-*-*)
    noconfigdirs="$noconfigdirs sim"
    ;;
  powerpc-*-aix*)
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@ -1,3 +1,8 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* mt.cpu: Rename from ms1.cpu.
+	* mt.opc: Rename from ms1.opc.
+
 2005-12-06  Hans-Peter Nilsson  <hp@axis.com>

 	* cris.cpu (simplecris-common-writable-specregs)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@ -1,3 +1,12 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* configure.in: Replace ms1 arch with mt arch.
+	* configure: Rebuilt.
+	* configure.tgt: Replace ms1 arch with mt arch.
+	* config/tc-mt.c: Renamed from tc-ms1.c: Update include files.
+	* doc/Makefile.am (CPU_DOCS): Replace ms1 files with mt files.
+	* doc/Makefile.in: Rebuilt.
+
 2005-12-07  Hans-Peter Nilsson  <hp@axis.com>

 	Change 32-bit-branch expansion for --pic.
--- a/gas/config/tc-mt.c
+++ b/gas/config/tc-mt.c
@ -27,7 +27,7 @@
 #include "opcodes/ms1-opc.h"
 #include "cgen.h"
 #include "elf/common.h"
-#include "elf/ms1.h"
+#include "elf/mt.h"
 #include "libbfd.h"

 /* Structure to hold all of the different components
--- a/gas/configure
+++ b/gas/configure
@ -4694,7 +4694,7 @@ _ACEOF
 	fi
 	;;

-      ms1)
+      mt)
        using_cgen=yes
 	;;

@ -4812,6 +4812,7 @@ esac
 cgen_cpu_prefix=""
 if test $using_cgen = yes ; then
  case ${target_cpu} in
+    mt) cgen_cpu_prefix=ms1 ;;
    *) cgen_cpu_prefix=${target_cpu} ;;
  esac

--- a/gas/configure.in
+++ b/gas/configure.in
@ -321,7 +321,7 @@ changequote([,])dnl
 	fi
 	;;

-      ms1)
+      mt)
        using_cgen=yes
 	;;

@ -433,6 +433,7 @@ esac
 cgen_cpu_prefix=""
 if test $using_cgen = yes ; then
  case ${target_cpu} in
+    mt) cgen_cpu_prefix=ms1 ;;
    *) cgen_cpu_prefix=${target_cpu} ;;
  esac
  AC_SUBST(cgen_cpu_prefix)
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@ -53,7 +53,7 @@ case ${cpu} in
  maxq)			cpu_type=maxq ;;
  mips*el)		cpu_type=mips endian=little ;;
  mips*)		cpu_type=mips endian=big ;;
-  ms1)                  cpu_type=ms1 endian=big ;;
+  mt)                   cpu_type=mt endian=big ;;
  or32*)		cpu_type=or32 endian=big ;;
  pjl*)			cpu_type=pj endian=little ;;
  pj*)			cpu_type=pj endian=big ;;
@ -278,7 +278,7 @@ case ${generic_target} in
  mn10300-*-linux*)			fmt=elf em=linux ;;
  mn10300-*-*)				fmt=elf ;;

-  ms1-*-elf)				fmt=elf bfd_gas=yes ;;
+  mt-*-elf)				fmt=elf bfd_gas=yes ;;

  msp430-*-*)				fmt=elf ;;

--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@ -43,7 +43,7 @@ CPU_DOCS = \
 	c-m68k.texi \
 	c-mips.texi \
 	c-mmix.texi \
-	c-ms1.texi \
+	c-mt.texi \
 	c-msp430.texi \
 	c-ns32k.texi \
 	c-pdp11.texi \
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@ -234,7 +234,7 @@ CPU_DOCS = \
 	c-m68k.texi \
 	c-mips.texi \
 	c-mmix.texi \
-	c-ms1.texi \
+	c-mt.texi \
 	c-msp430.texi \
 	c-ns32k.texi \
 	c-pdp11.texi \
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@ -1,3 +1,10 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* gas/mt: Renamed from ms1 dir.  Update file names as needed.
+	* gas/mt/errors.exp: Replace ms1 arch with mt arch.
+	* gas/mt/mt.exp: Replace ms1 arch with mt arch.
+	* gas/mt/relocs.exp: Replace ms1 arch with mt arch.
+
 2005-12-07  Hans-Peter Nilsson  <hp@axis.com>

 	* gas/cris/rd-bcnst-pic.d, gas/cris/rd-branch-pic.d,
--- a/gas/testsuite/gas/mt/errors.exp
+++ b/gas/testsuite/gas/mt/errors.exp
@ -27,7 +27,7 @@ proc mrisc1_error_test { file testname {warnpattern ""} } {
    }
 }

-if [istarget ms1-*-*] {
+if [istarget mt-*-*] {
    foreach file [glob -nocomplain -- $srcdir/$subdir/bad*.s] {
 	set file [file tail $file]
 	switch -- $file {
--- a/gas/testsuite/gas/mt/mt.exp
+++ b/gas/testsuite/gas/mt/mt.exp
@ -1,6 +1,6 @@
 # MRISC1 assembler testsuite.

-if [istarget ms1*-*-*] {
+if [istarget mt-*-*] {
    #
    run_dump_test "allinsn"
    run_dump_test "misc"
--- a/gas/testsuite/gas/mt/relocs.exp
+++ b/gas/testsuite/gas/mt/relocs.exp
@ -20,7 +20,7 @@ proc regexp_test { file1 file2 test } {


 global srcdir subdir
-if [istarget ms1-*] {
+if [istarget mt-*] {
    gas_test "relocs1.s" {-o relocs1.o} {} {assembling relocs1}

    #    gas_test "relocs2.s" {-o relocs2.o} {} {assembling relocs2}
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@ -1,3 +1,9 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* configure.tgt: Replace ms1 arch with mt arch.
+	* config/mt: Renamed from ms1 dir.  Update file names as needed.
+	* config/mt/mt.mt (TDEPFILES): Replace ms1 file with mt file.
+
 2005-12-09  Randolph Chung  <tausq@debian.org>

 	PR corefiles/2026
--- a/gdb/config/mt/mt.mt
+++ b/gdb/config/mt/mt.mt
@ -1,2 +1,2 @@
 # Target: Morpho Technologies ms1 processor
-TDEPFILES= ms1-tdep.o
+TDEPFILES= mt-tdep.o
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@ -20,7 +20,6 @@ m68hc11*|m6811*)	gdb_target_cpu=m68hc11 ;;
 m68*)			gdb_target_cpu=m68k ;;
 m88*)			gdb_target_cpu=m88k ;;
 mips*)			gdb_target_cpu=mips ;;
-ms1*)			gdb_target_cpu=ms1 ;;
 powerpc*)		gdb_target_cpu=powerpc ;;
 sparc*)			gdb_target_cpu=sparc ;;
 thumb*)			gdb_target_cpu=arm ;;
@ -145,7 +144,7 @@ mips*-*-*)		gdb_target=embed ;;

 mn10300-*-*)		gdb_target=mn10300 ;;

-ms1-*-*)		gdb_target=ms1 ;;
+mt-*-*)			gdb_target=mt ;;

 powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
 			gdb_target=nbsd ;;
--- a/include/ChangeLog
+++ b/include/ChangeLog
@ -1,3 +1,7 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf/mt.h: Renamed from ms1.h
+
 2005-12-10  Terry Laurenzo  <tlaurenzo@gmail.com>

 	PR java/9861
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@ -1,3 +1,12 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* Makefile.am (ALL_EMULATIONS): Replace ms1 files with mt files.
+	(eelf32mt.c): Update target name and dependencies.
+	* Makefile.in: Rebuilt.
+	* configure.tgt: Replace ms1 arch with mt arch.
+	* emulparams/elf32mt.sh: Renamed from elf32ms1.sh. Update
+	comment.
+
 2005-12-11  Bernhard Fischer  <aldot@gcc.gnu.org>

 	* scripttempl/armbpabi.sc: Fix typo in comment for .ctors.
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@ -173,7 +173,7 @@ ALL_EMULATIONS = \
 	eelf32m32c.o \
 	eelf32mcore.o \
 	eelf32mipswindiss.o \
-	eelf32ms1.o \
+	eelf32mt.o \
 	eelf32openrisc.o \
 	eelf32ppc.o \
 	eelf32ppc_fbsd.o \
@ -1556,9 +1556,9 @@ eelf32m32c.c: $(srcdir)/emulparams/elf32m32c.sh \
  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
-eelf32ms1.c: $(srcdir)/emulparams/elf32ms1.sh \
+eelf32mt.c: $(srcdir)/emulparams/elf32mt.sh \
  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ms1 "$(tdir_ms1)"
+	${GENSCRIPTS} elf32mt "$(tdir_mt)"

 # We need this for automake to use YLWRAP.
 EXTRA_ld_new_SOURCES = deffilep.y
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@ -396,7 +396,7 @@ ALL_EMULATIONS = \
 	eelf32m32c.o \
 	eelf32mcore.o \
 	eelf32mipswindiss.o \
-	eelf32ms1.o \
+	eelf32mt.o \
 	eelf32openrisc.o \
 	eelf32ppc.o \
 	eelf32ppc_fbsd.o \
@ -2360,9 +2360,9 @@ eelf32m32c.c: $(srcdir)/emulparams/elf32m32c.sh \
  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
-eelf32ms1.c: $(srcdir)/emulparams/elf32ms1.sh \
+eelf32mt.c: $(srcdir)/emulparams/elf32mt.sh \
  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ms1 "$(tdir_ms1)"
+	${GENSCRIPTS} elf32mt "$(tdir_mt)"

 # The generated emulation files mostly have the same dependencies.
 $(EMULATION_OFILES): ../bfd/bfd.h sysdep.h config.h $(INCDIR)/bfdlink.h \
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@ -345,7 +345,7 @@ am33_2.0-*-linux*)	targ_emul=elf32am33lin ;;
 mn10200-*-*)		targ_emul=mn10200 ;;
 mn10300-*-*)		targ_emul=mn10300
 			;;
-ms1-*elf)               targ_emul=elf32ms1
+mt-*elf)                targ_emul=elf32mt
 			;;
 msp430-*-*)             targ_emul=msp430x110
                        targ_extra_emuls="msp430x112 msp430x1101 msp430x1111 msp430x1121 msp430x1122 msp430x1132 msp430x122 msp430x123 msp430x1222 msp430x1232 msp430x133 msp430x135 msp430x1331 msp430x1351 msp430x147 msp430x148 msp430x149 msp430x155 msp430x156 msp430x157 msp430x167 msp430x168 msp430x169 msp430x1610 msp430x1611 msp430x1612 msp430x2101 msp430x2111 msp430x2121 msp430x2131 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x412 msp430x413 msp430x415 msp430x417 msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427 msp430xG437 msp430xG438 msp430xG439 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449"
--- a/ld/emulparams/elf32mt.sh
+++ b/ld/emulparams/elf32mt.sh
@ -1,7 +1,7 @@
 MACHINE=
 SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-ms1"
-# See also `include/elf/ms1.h'
+# See also `include/elf/mt.h'
 TEXT_START_ADDR=0x2000
 ARCH=ms1
 ENTRY=_start
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@ -1,3 +1,10 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* Makefile.am (CLEANFILES, CGEN_CPUS, MT_DEPS): Replace ms1 with mt.
+	* Makefile.in: Rebuilt.
+	* configure.in: Replace ms1 files with mt files.
+	* configure: Rebuilt.
+
 2005-12-08  Jan Beulich  <jbeulich@novell.com>

 	* i386-dis.c (MAXLEN): Reduce to architectural limit.
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@ -378,7 +378,7 @@ uninstall_libopcodes:

 CLEANFILES = \
 	stamp-ip2k stamp-m32c stamp-m32r stamp-fr30 stamp-frv \
-	stamp-openrisc stamp-iq2000 stamp-ms1 stamp-xstormy16 \
+	stamp-openrisc stamp-iq2000 stamp-mt stamp-xstormy16 \
 	libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2


@ -394,7 +394,7 @@ CGENDEPS = \
 	$(CGENDIR)/opc-opinst.scm \
 	cgen-asm.in cgen-dis.in cgen-ibld.in

-CGEN_CPUS = fr30 frv ip2k m32c m32r ms1 openrisc xstormy16
+CGEN_CPUS = fr30 frv ip2k m32c m32r mt openrisc xstormy16

 if CGEN_MAINT
 IP2K_DEPS = stamp-ip2k
@ -402,7 +402,7 @@ M32C_DEPS = stamp-m32c
 M32R_DEPS = stamp-m32r
 FR30_DEPS = stamp-fr30
 FRV_DEPS = stamp-frv
-MS1_DEPS = stamp-ms1
+MT_DEPS = stamp-mt
 OPENRISC_DEPS = stamp-openrisc
 IQ2000_DEPS = stamp-iq2000
 XSTORMY16_DEPS = stamp-xstormy16
@ -412,7 +412,7 @@ M32C_DEPS =
 M32R_DEPS =
 FR30_DEPS =
 FRV_DEPS =
-MS1_DEPS =
+MT_DEPS =
 OPENRISC_DEPS = 
 IQ2000_DEPS = 
 XSTORMY16_DEPS = 
@ -484,12 +484,12 @@ stamp-frv: $(CGENDEPS) $(srcdir)/../cpu/frv.cpu $(srcdir)/../cpu/frv.opc
 	$(MAKE) run-cgen arch=frv prefix=frv options= \
 		archfile=$(srcdir)/../cpu/frv.cpu opcfile=$(srcdir)/../cpu/frv.opc extrafiles=

-$(srcdir)/ms1-desc.h $(srcdir)/ms1-desc.c $(srcdir)/ms1-opc.h $(srcdir)/ms1-opc.c $(srcdir)/ms1-ibld.c $(srcdir)/ms1-asm.c $(srcdir)/ms1-dis.c: $(MS1_DEPS)
+$(srcdir)/ms1-desc.h $(srcdir)/ms1-desc.c $(srcdir)/ms1-opc.h $(srcdir)/ms1-opc.c $(srcdir)/ms1-ibld.c $(srcdir)/ms1-asm.c $(srcdir)/ms1-dis.c: $(MT_DEPS)
 	@true
-stamp-ms1: $(CGENDEPS) $(srcdir)/../cpu/ms1.cpu $(srcdir)/../cpu/ms1.opc
+stamp-mt: $(CGENDEPS) $(srcdir)/../cpu/mt.cpu $(srcdir)/../cpu/mt.opc
 	$(MAKE) run-cgen arch=ms1 prefix=ms1 options= \
-		archfile=$(srcdir)/../cpu/ms1.cpu \
-		opcfile=$(srcdir)/../cpu/ms1.opc extrafiles=
+		archfile=$(srcdir)/../cpu/mt.cpu \
+		opcfile=$(srcdir)/../cpu/mt.opc extrafiles=

 $(srcdir)/openrisc-desc.h $(srcdir)/openrisc-desc.c $(srcdir)/openrisc-opc.h $(srcdir)/openrisc-opc.c $(srcdir)/openrisc-ibld.c $(srcdir)/openrisc-asm.c $(srcdir)/openrisc-dis.c: $(OPENRISC_DEPS)
 	@true
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@ -554,7 +554,7 @@ noinst_LIBRARIES = libopcodes.a
 POTFILES = $(HFILES) $(CFILES)
 CLEANFILES = \
 	stamp-ip2k stamp-m32c stamp-m32r stamp-fr30 stamp-frv \
-	stamp-openrisc stamp-iq2000 stamp-ms1 stamp-xstormy16 \
+	stamp-openrisc stamp-iq2000 stamp-mt stamp-xstormy16 \
 	libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2

 CGENDIR = @cgendir@
@ -568,7 +568,7 @@ CGENDEPS = \
 	$(CGENDIR)/opc-opinst.scm \
 	cgen-asm.in cgen-dis.in cgen-ibld.in

-CGEN_CPUS = fr30 frv ip2k m32c m32r ms1 openrisc xstormy16
+CGEN_CPUS = fr30 frv ip2k m32c m32r mt openrisc xstormy16
@CGEN_MAINT_FALSE@IP2K_DEPS = 
@CGEN_MAINT_TRUE@IP2K_DEPS = stamp-ip2k
@CGEN_MAINT_FALSE@M32C_DEPS = 
@ -579,8 +579,8 @@ CGEN_CPUS = fr30 frv ip2k m32c m32r ms1 openrisc xstormy16
@CGEN_MAINT_TRUE@FR30_DEPS = stamp-fr30
@CGEN_MAINT_FALSE@FRV_DEPS = 
@CGEN_MAINT_TRUE@FRV_DEPS = stamp-frv
-@CGEN_MAINT_FALSE@MS1_DEPS = 
-@CGEN_MAINT_TRUE@MS1_DEPS = stamp-ms1
+@CGEN_MAINT_FALSE@MT_DEPS = 
+@CGEN_MAINT_TRUE@MT_DEPS = stamp-mt
@CGEN_MAINT_FALSE@OPENRISC_DEPS = 
@CGEN_MAINT_TRUE@OPENRISC_DEPS = stamp-openrisc
@CGEN_MAINT_FALSE@IQ2000_DEPS = 
@ -1026,12 +1026,12 @@ stamp-frv: $(CGENDEPS) $(srcdir)/../cpu/frv.cpu $(srcdir)/../cpu/frv.opc
 	$(MAKE) run-cgen arch=frv prefix=frv options= \
 		archfile=$(srcdir)/../cpu/frv.cpu opcfile=$(srcdir)/../cpu/frv.opc extrafiles=

-$(srcdir)/ms1-desc.h $(srcdir)/ms1-desc.c $(srcdir)/ms1-opc.h $(srcdir)/ms1-opc.c $(srcdir)/ms1-ibld.c $(srcdir)/ms1-asm.c $(srcdir)/ms1-dis.c: $(MS1_DEPS)
+$(srcdir)/ms1-desc.h $(srcdir)/ms1-desc.c $(srcdir)/ms1-opc.h $(srcdir)/ms1-opc.c $(srcdir)/ms1-ibld.c $(srcdir)/ms1-asm.c $(srcdir)/ms1-dis.c: $(MT_DEPS)
 	@true
-stamp-ms1: $(CGENDEPS) $(srcdir)/../cpu/ms1.cpu $(srcdir)/../cpu/ms1.opc
+stamp-mt: $(CGENDEPS) $(srcdir)/../cpu/mt.cpu $(srcdir)/../cpu/mt.opc
 	$(MAKE) run-cgen arch=ms1 prefix=ms1 options= \
-		archfile=$(srcdir)/../cpu/ms1.cpu \
-		opcfile=$(srcdir)/../cpu/ms1.opc extrafiles=
+		archfile=$(srcdir)/../cpu/mt.cpu \
+		opcfile=$(srcdir)/../cpu/mt.opc extrafiles=

 $(srcdir)/openrisc-desc.h $(srcdir)/openrisc-desc.c $(srcdir)/openrisc-opc.h $(srcdir)/openrisc-opc.c $(srcdir)/openrisc-ibld.c $(srcdir)/openrisc-asm.c $(srcdir)/openrisc-dis.c: $(OPENRISC_DEPS)
 	@true
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@ -187,7 +187,7 @@ if test x${all_targets} = xfalse ; then
 	bfd_mmix_arch)		ta="$ta mmix-dis.lo mmix-opc.lo" ;;
 	bfd_mn10200_arch)	ta="$ta m10200-dis.lo m10200-opc.lo" ;;
 	bfd_mn10300_arch)	ta="$ta m10300-dis.lo m10300-opc.lo" ;;
-	bfd_ms1_arch)		ta="$ta ms1-asm.lo ms1-desc.lo ms1-dis.lo ms1-ibld.lo ms1-opc.lo" using_cgen=yes ;;
+	bfd_ms1_arch)		ta="$ta mt-asm.lo ms1-desc.lo ms1-dis.lo ms1-ibld.lo ms1-opc.lo" using_cgen=yes ;;
 	bfd_msp430_arch)	ta="$ta msp430-dis.lo" ;;
 	bfd_ns32k_arch)		ta="$ta ns32k-dis.lo" ;;
 	bfd_openrisc_arch)	ta="$ta openrisc-asm.lo openrisc-desc.lo openrisc-dis.lo openrisc-ibld.lo openrisc-opc.lo" using_cgen=yes ;;