Rename ms1 arch to mt

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

Rename ms1 arch to mt

Nathan Sidwell
Hi,
this is the first part of a patch sequence to replace the 'ms1' architecture
name with 'mt'.  The ms1 name does not fit well with morphotech's future plans,
for instance the ms2 part for which I've been adding support.

This patch does all the file renaming and minimum other changes to keep the
whole thing building.  I've added an ms1 alias, so one can still continue to
configure as ms1.  This patch does not rename the cgenerated opcodes files, as
cgen seemed unhappy about the mixture of mt target name but bfd_ms1_arch_vec
name. Clearly this patch is a bit of a flag day, and I want to commit it before
I proceed with tidying up the symbol names.  Because diffs don't show file
renames well, this diff has been created through the use of symbolic links.  It
shows the changes to the file contents, you'll have to read the changelog to
determine the actual renaming.  For the binutils repository I intend to apply
the patch in two stages, one to rename the files and a subsequent one to apply
the patch.  For gcc I should be able to use the whizzy svn renaming feature.

This patch touches binutils, gdb, newlib, sid, gcc.  Please let me know which
bit(s) you're signing off on.  Also, if you'd let me know whether you want to
review further patches (which are going to be even more sed-like) in this
sequence, that'd be great.

nathan
--
Nathan Sidwell    ::   http://www.codesourcery.com   ::     CodeSourcery LLC
[hidden email]    ::     http://www.planetfall.pwp.blueyonder.co.uk


2005-12-07  Nathan Sidwell  <[hidden email]>

        * config.gcc (ms1): Replace with ...
        (mt): ... this.
        * config/ms1: Rename to ...
        * config/mt: ... here.  Rename ms1 files to mt.
        * config/mt/mt.c: Adjust gt-mt.h #include.
        * config/mt/t-mt (LIB1ASMSRCS, LIB2FUNCS_EXTRA): Adjust.
        (crti.o, crtn.o): Adjust file names.

        * config.sub: Replace ms1 with mt.  Allow ms1 as an alias.

Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc (revision 107821)
+++ gcc/config.gcc (working copy)
@@ -1585,9 +1585,9 @@ mn10300-*-*)
  use_collect2=no
  use_fixproto=yes
  ;;
-ms1-*-elf)
+mt-*-elf)
         tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-        tmake_file="${tmake_file} ms1/t-ms1"
+        tmake_file="${tmake_file} mt/t-mt"
         ;;
 ns32k-*-netbsdelf*)
  echo "GCC does not yet support the ${target} target"; exit 1
Index: gcc/config/ms1/ms1.md
===================================================================
--- gcc/config/ms1/ms1.md (revision 107821)
+++ gcc/config/ms1/ms1.md (working copy)
Index: gcc/config/ms1/ms1.c
===================================================================
--- gcc/config/ms1/ms1.c (revision 107821)
+++ gcc/config/ms1/ms1.c (working copy)
@@ -1986,4 +2495,4 @@ const struct attribute_spec ms1_attribut
 
 struct gcc_target targetm = TARGET_INITIALIZER;
 
-#include "gt-ms1.h"
+#include "gt-mt.h"
Index: gcc/config/ms1/t-ms1
===================================================================
--- gcc/config/ms1/t-ms1 (revision 107821)
+++ gcc/config/ms1/t-ms1 (working copy)
@@ -25,10 +25,10 @@ CROSS_LIBGCC1 =
 # Alternatively if assembler functions *are* needed then define the
 # entries below:
 # CROSS_LIBGCC1 = libgcc1-asm.a
-# LIB1ASMSRC    = ms1/lib1funcs.asm
+# LIB1ASMSRC    = mt/lib1funcs.asm
 # LIB1ASMFUNCS  = _udivsi3 etc...
 
-LIB2FUNCS_EXTRA = $(srcdir)/config/ms1/lib2extra-funcs.c
+LIB2FUNCS_EXTRA = $(srcdir)/config/mt/lib2extra-funcs.c
 
 # If any special flags are necessary when building libgcc2 put them here.
 #
@@ -49,11 +49,11 @@ dp-bit.c: $(srcdir)/config/fp-bit.c
  cat $(srcdir)/config/fp-bit.c > dp-bit.c
 
 # Assemble startup files.
-crti.o: $(srcdir)/config/ms1/crti.asm $(GCC_PASSES)
- $(GCC_FOR_TARGET) -c -o crti.o -x assembler $(srcdir)/config/ms1/crti.asm
+crti.o: $(srcdir)/config/mt/crti.asm $(GCC_PASSES)
+ $(GCC_FOR_TARGET) -c -o crti.o -x assembler $(srcdir)/config/mt/crti.asm
 
-crtn.o: $(srcdir)/config/ms1/crtn.asm $(GCC_PASSES)
- $(GCC_FOR_TARGET) -c -o crtn.o -x assembler $(srcdir)/config/ms1/crtn.asm
+crtn.o: $(srcdir)/config/mt/crtn.asm $(GCC_PASSES)
+ $(GCC_FOR_TARGET) -c -o crtn.o -x assembler $(srcdir)/config/mt/crtn.asm
 
 # Enable the following if multilibs are needed.
 # See gcc/genmultilib, gcc/gcc.texi and gcc/tm.texi for a
Index: gcc/config/ms1/ms1.h
===================================================================
--- gcc/config/ms1/ms1.h (revision 107821)
+++ gcc/config/ms1/ms1.h (working copy)
Index: gcc/config/ms1/ms1-protos.h
===================================================================
--- gcc/config/ms1/ms1-protos.h (revision 107821)
+++ gcc/config/ms1/ms1-protos.h (working copy)
Index: config.sub
===================================================================
--- config.sub (revision 107821)
+++ config.sub (working copy)
@@ -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-06'
 
 # 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

2005-12-07  Nathan Sidwell  <[hidden email]>

        Rename ms1 to mt, part 1
        * config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
        * configure.in: Replace ms1 arch with mt.
        * configure: Rebuilt.

        * bfd/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.
        * bfd/Makefile.in: Rebuilt.
        * bfd/config/bfd: Replace ms1 arch with mt.
        * bfd/configure.in: Replace ms1 files with mt files.
        * bfd/configure: Rebuilt.
        * bfd/elf32-mt.c: Renamed from elf32-ms1.c.  Update include files.
       
        * binutils/Makefile.am: Replace ms1 files with mt files.
        * binutils/Makefile.in: Rebuilt.
        * binutils/readelf.c (elf/mt.h): Adjust #include.

        * gas/configure.in: Replace ms1 arch with mt arch.
        * gas/configure: Rebuilt.
        * gas/configure.tgt: Replace ms1 arch with mt arch.
        * gas/config/tc-mt.c: Renamed from tc-ms1.c: Update include files.

        * gas/doc/Makefile.am (CPU_DOCS): Replace ms1 files with mt files.
        * gas/doc/Makefile.in: Rebuilt.

        * gas/testsuite/gas/mt: Renamed from ms1 dir.  Update file names as
        needed.
        * gas/testsuite/gas/mt/errors.exp: Replace ms1 arch with mt arch.
        * gas/testsuite/gas/mt/mt.exp: Replace ms1 arch with mt arch.
        * gas/testsuite/gas/mt/relocs.exp: Replace ms1 arch with mt arch.

        * gdb/configure.tgt: Replace ms1 arch with mt arch.
        * gdb/config/mt: Renamed from ms1 dir.  Update file names as needed.
        * gdb/config/mt/mt.mt (TDEPFILES): Replace ms1 file with mt file.

        * ld/Makefile.am (ALL_EMULATIONS): Replace ms1 files with mt files.
        (eelf32mt.c): Update target name and dependencies.
        * ld/Makefile.in: Rebuilt.
        * ld/configure.tgt: Replace ms1 arch with mt arch.
        * ld/emulparams/elf32mt.sh: Renamed from elf32ms1.sh. Update
        comment.

        * libgloss/configure.in: Replace ms1 arch with mt arch.
        * libgloss/configure: Rebuilt.
        * libgloss/mt: Renamed from ms1 dir.

        * newlib/configure.host: Replace ms1 arch with mt arch.
        * newlib/libc/machine/mt: Renamed from ms1 dir.

        * opcodes/Makefile.am (CLEANFILES, CGEN_CPUS, MT_DEPS): Replace ms1
        with mt.
        * opcodes/Makefile.in: Rebuilt.
        * opcodes/configure.in: Replace ms1 files with mt files.
        * opcodes/configure: Rebuilt.

        * sid/component/cgen-cpu/mt: Renamed from ms1 dir.  Update file
        names as appropriate.
        * sid/component/cgen-cpu/mt/Makefile.am: Replace ms1 files with mt
        files.
        * sid/component/cgen-cpu/mt/Makefile.in: Rebuilt.

Index: config.sub
===================================================================
RCS file: /cvs/src/src/config.sub,v
retrieving revision 1.53
diff -c -3 -p -r1.53 config.sub
*** config.sub 14 Jul 2005 01:24:56 -0000 1.53
--- config.sub 7 Dec 2005 14:01:20 -0000
***************
*** 3,9 ****
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
! timestamp='2005-07-08'
 
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
--- 3,9 ----
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
! timestamp='2005-12-06'
 
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
*************** case $basic_machine in
*** 257,263 ****
  | mipsisa64sr71k | mipsisa64sr71kel \
  | mipstx39 | mipstx39el \
  | mn10200 | mn10300 \
! | ms1 \
  | msp430 \
  | ns16k | ns32k \
  | or32 \
--- 257,263 ----
  | mipsisa64sr71k | mipsisa64sr71kel \
  | mipstx39 | mipstx39el \
  | mn10200 | mn10300 \
! | mt \
  | msp430 \
  | ns16k | ns32k \
  | or32 \
*************** case $basic_machine in
*** 287,292 ****
--- 287,295 ----
  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.
*************** case $basic_machine in
*** 336,342 ****
  | mipsisa64sr71k-* | mipsisa64sr71kel-* \
  | mipstx39-* | mipstx39el-* \
  | mmix-* \
! | ms1-* \
  | msp430-* \
  | none-* | np1-* | ns16k-* | ns32k-* \
  | orion-* \
--- 339,345 ----
  | mipsisa64sr71k-* | mipsisa64sr71kel-* \
  | mipstx39-* | mipstx39el-* \
  | mmix-* \
! | mt-* \
  | msp430-* \
  | none-* | np1-* | ns16k-* | ns32k-* \
  | orion-* \
*************** case $basic_machine in
*** 696,701 ****
--- 699,707 ----
  basic_machine=i386-pc
  os=-msdos
  ;;
+ ms1-*)
+        basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
  mvs)
  basic_machine=i370-ibm
  os=-mvs
Index: configure
===================================================================
RCS file: /cvs/src/src/configure,v
retrieving revision 1.201
diff -c -3 -p -r1.201 configure
*** configure 17 Oct 2005 12:54:34 -0000 1.201
--- configure 7 Dec 2005 14:01:21 -0000
*************** case "${target}" in
*** 1475,1481 ****
    mn10300-*-*)
      noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
!   ms1-*-*)
      noconfigdirs="$noconfigdirs sim"
      ;;
    powerpc-*-aix*)
--- 1475,1481 ----
    mn10300-*-*)
      noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
!   mt-*-*)
      noconfigdirs="$noconfigdirs sim"
      ;;
    powerpc-*-aix*)
Index: configure.in
===================================================================
RCS file: /cvs/src/src/configure.in,v
retrieving revision 1.289
diff -c -3 -p -r1.289 configure.in
*** configure.in 17 Oct 2005 12:54:34 -0000 1.289
--- configure.in 7 Dec 2005 14:01:22 -0000
*************** case "${target}" in
*** 683,689 ****
    mn10300-*-*)
      noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
!   ms1-*-*)
      noconfigdirs="$noconfigdirs sim"
      ;;
    powerpc-*-aix*)
--- 683,689 ----
    mn10300-*-*)
      noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
!   mt-*-*)
      noconfigdirs="$noconfigdirs sim"
      ;;
    powerpc-*-aix*)
oIndex: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.167
diff -c -3 -p -r1.167 Makefile.am
*** bfd/Makefile.am 29 Oct 2005 23:47:42 -0000 1.167
--- bfd/Makefile.am 7 Dec 2005 14:01:45 -0000
*************** ALL_MACHINES = \
*** 89,95 ****
  cpu-mcore.lo \
  cpu-mips.lo \
  cpu-mmix.lo \
! cpu-ms1.lo \
  cpu-msp430.lo \
  cpu-or32.lo \
  cpu-ns32k.lo \
--- 89,95 ----
  cpu-mcore.lo \
  cpu-mips.lo \
  cpu-mmix.lo \
! cpu-mt.lo \
  cpu-msp430.lo \
  cpu-or32.lo \
  cpu-ns32k.lo \
*************** ALL_MACHINES_CFILES = \
*** 150,156 ****
  cpu-mcore.c \
  cpu-mips.c \
  cpu-mmix.c \
! cpu-ms1.c \
  cpu-msp430.c \
  cpu-or32.c \
  cpu-ns32k.c \
--- 150,156 ----
  cpu-mcore.c \
  cpu-mips.c \
  cpu-mmix.c \
! cpu-mt.c \
  cpu-msp430.c \
  cpu-or32.c \
  cpu-ns32k.c \
*************** BFD32_BACKENDS = \
*** 258,264 ****
  elf32-mcore.lo \
  elfxx-mips.lo \
  elf32-mips.lo \
! elf32-ms1.lo \
  elf32-msp430.lo \
  elf32-openrisc.lo \
  elf32-or32.lo \
--- 258,264 ----
  elf32-mcore.lo \
  elfxx-mips.lo \
  elf32-mips.lo \
! elf32-mt.lo \
  elf32-msp430.lo \
  elf32-openrisc.lo \
  elf32-or32.lo \
*************** BFD32_BACKENDS_CFILES = \
*** 429,435 ****
  elf32-mcore.c \
  elfxx-mips.c \
  elf32-mips.c \
! elf32-ms1.c \
  elf32-msp430.c \
  elf32-openrisc.c \
  elf32-or32.c \
--- 429,435 ----
  elf32-mcore.c \
  elfxx-mips.c \
  elf32-mips.c \
! elf32-mt.c \
  elf32-msp430.c \
  elf32-openrisc.c \
  elf32-or32.c \
*************** cpu-maxq.lo: cpu-maxq.c $(INCDIR)/filena
*** 1004,1010 ****
  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-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 \
--- 1004,1010 ----
  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-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 \
*************** elf32-mips.lo: elf32-mips.c $(INCDIR)/fi
*** 1351,1359 ****
    $(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 \
    elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
!   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/ms1.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 \
--- 1351,1359 ----
    $(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-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/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 \
Index: bfd/Makefile.in
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.in,v
retrieving revision 1.183
diff -c -3 -p -r1.183 Makefile.in
*** bfd/Makefile.in 29 Oct 2005 23:47:42 -0000 1.183
--- bfd/Makefile.in 7 Dec 2005 14:01:46 -0000
*************** ALL_MACHINES = \
*** 326,332 ****
  cpu-mcore.lo \
  cpu-mips.lo \
  cpu-mmix.lo \
! cpu-ms1.lo \
  cpu-msp430.lo \
  cpu-or32.lo \
  cpu-ns32k.lo \
--- 326,332 ----
  cpu-mcore.lo \
  cpu-mips.lo \
  cpu-mmix.lo \
! cpu-mt.lo \
  cpu-msp430.lo \
  cpu-or32.lo \
  cpu-ns32k.lo \
*************** ALL_MACHINES_CFILES = \
*** 387,393 ****
  cpu-mcore.c \
  cpu-mips.c \
  cpu-mmix.c \
! cpu-ms1.c \
  cpu-msp430.c \
  cpu-or32.c \
  cpu-ns32k.c \
--- 387,393 ----
  cpu-mcore.c \
  cpu-mips.c \
  cpu-mmix.c \
! cpu-mt.c \
  cpu-msp430.c \
  cpu-or32.c \
  cpu-ns32k.c \
*************** BFD32_BACKENDS = \
*** 496,502 ****
  elf32-mcore.lo \
  elfxx-mips.lo \
  elf32-mips.lo \
! elf32-ms1.lo \
  elf32-msp430.lo \
  elf32-openrisc.lo \
  elf32-or32.lo \
--- 496,502 ----
  elf32-mcore.lo \
  elfxx-mips.lo \
  elf32-mips.lo \
! elf32-mt.lo \
  elf32-msp430.lo \
  elf32-openrisc.lo \
  elf32-or32.lo \
*************** BFD32_BACKENDS_CFILES = \
*** 667,673 ****
  elf32-mcore.c \
  elfxx-mips.c \
  elf32-mips.c \
! elf32-ms1.c \
  elf32-msp430.c \
  elf32-openrisc.c \
  elf32-or32.c \
--- 667,673 ----
  elf32-mcore.c \
  elfxx-mips.c \
  elf32-mips.c \
! elf32-mt.c \
  elf32-msp430.c \
  elf32-openrisc.c \
  elf32-or32.c \
*************** cpu-maxq.lo: cpu-maxq.c $(INCDIR)/filena
*** 1571,1577 ****
  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-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 \
--- 1571,1577 ----
  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-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 \
*************** elf32-mips.lo: elf32-mips.c $(INCDIR)/fi
*** 1918,1926 ****
    $(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 \
    elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
!   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/ms1.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 \
--- 1918,1926 ----
    $(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-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/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 \
Index: bfd/config.bfd
===================================================================
RCS file: /cvs/src/src/bfd/config.bfd,v
retrieving revision 1.199
diff -c -3 -p -r1.199 config.bfd
*** bfd/config.bfd 25 Oct 2005 17:40:09 -0000 1.199
--- bfd/config.bfd 7 Dec 2005 14:02:00 -0000
*************** m68*) targ_archs=bfd_m68k_arch ;;
*** 87,92 ****
--- 87,93 ----
  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";;
*************** case "${targ}" in
*** 925,931 ****
      targ_underscore=yes
      ;;
 
!   ms1-*-elf)
      targ_defvec=bfd_elf32_ms1_vec
      ;;
 
--- 926,932 ----
      targ_underscore=yes
      ;;
 
!   mt-*-elf)
      targ_defvec=bfd_elf32_ms1_vec
      ;;
 
Index: bfd/configure
===================================================================
RCS file: /cvs/src/src/bfd/configure,v
retrieving revision 1.226
diff -c -3 -p -r1.226 configure
*** bfd/configure 7 Nov 2005 22:14:12 -0000 1.226
--- bfd/configure 7 Dec 2005 14:02:03 -0000
*************** do
*** 13022,13028 ****
      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_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 ;;
--- 13022,13028 ----
      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-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 ;;
*************** done
*** 13223,13229 ****
  # 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/`
 
  # Weed out duplicate .o files.
  f=""
--- 13223,13229 ----
  # Target architecture .o files.
  # A couple of CPUs use shorter file names to avoid problems on DOS
  # filesystems.
! 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=""
Index: bfd/configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.197
diff -c -3 -p -r1.197 configure.in
*** bfd/configure.in 3 Nov 2005 16:06:11 -0000 1.197
--- bfd/configure.in 7 Dec 2005 14:02:03 -0000
*************** do
*** 637,643 ****
      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_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 ;;
--- 637,643 ----
      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-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 ;;
*************** done
*** 836,842 ****
  # 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/`
 
  # Weed out duplicate .o files.
  f=""
--- 836,842 ----
  # Target architecture .o files.
  # A couple of CPUs use shorter file names to avoid problems on DOS
  # filesystems.
! 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=""
Index: bfd/elf32-ms1.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ms1.c,v
retrieving revision 1.3
diff -c -3 -p -r1.3 elf32-ms1.c
*** bfd/elf32-ms1.c 8 Nov 2005 11:15:11 -0000 1.3
--- bfd/elf32-ms1.c 7 Dec 2005 14:02:21 -0000
***************
*** 22,28 ****
  #include "sysdep.h"
  #include "libbfd.h"
  #include "elf-bfd.h"
! #include "elf/ms1.h"
 
  /* Prototypes.  */
  static reloc_howto_type * ms1_reloc_type_lookup
--- 22,28 ----
  #include "sysdep.h"
  #include "libbfd.h"
  #include "elf-bfd.h"
! #include "elf/mt.h"
 
  /* Prototypes.  */
  static reloc_howto_type * ms1_reloc_type_lookup
Index: binutils/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.am,v
retrieving revision 1.68
diff -c -3 -p -r1.68 Makefile.am
*** binutils/Makefile.am 30 Oct 2005 17:40:28 -0000 1.68
--- binutils/Makefile.am 7 Dec 2005 14:03:14 -0000
*************** readelf.o: readelf.c dwarf.h ../bfd/bfd.
*** 507,513 ****
    $(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/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 \
--- 507,513 ----
    $(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/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 \
Index: binutils/Makefile.in
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.in,v
retrieving revision 1.76
diff -c -3 -p -r1.76 Makefile.in
*** binutils/Makefile.in 30 Oct 2005 17:40:28 -0000 1.76
--- binutils/Makefile.in 7 Dec 2005 14:03:14 -0000
*************** readelf.o: readelf.c dwarf.h ../bfd/bfd.
*** 1250,1256 ****
    $(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/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 \
--- 1250,1256 ----
    $(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/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 \
Index: binutils/readelf.c
===================================================================
RCS file: /cvs/src/src/binutils/readelf.c,v
retrieving revision 1.324
diff -c -3 -p -r1.324 readelf.c
*** binutils/readelf.c 10 Oct 2005 18:42:11 -0000 1.324
--- binutils/readelf.c 7 Dec 2005 14:03:26 -0000
***************
*** 95,101 ****
  #include "elf/mmix.h"
  #include "elf/mn10200.h"
  #include "elf/mn10300.h"
! #include "elf/ms1.h"
  #include "elf/msp430.h"
  #include "elf/or32.h"
  #include "elf/pj.h"
--- 95,101 ----
  #include "elf/mmix.h"
  #include "elf/mn10200.h"
  #include "elf/mn10300.h"
! #include "elf/mt.h"
  #include "elf/msp430.h"
  #include "elf/or32.h"
  #include "elf/pj.h"
Index: gas/configure
===================================================================
RCS file: /cvs/src/src/gas/configure,v
retrieving revision 1.202
diff -c -3 -p -r1.202 configure
*** gas/configure 7 Nov 2005 22:17:59 -0000 1.202
--- gas/configure 7 Dec 2005 14:04:16 -0000
*************** _ACEOF
*** 4694,4700 ****
  fi
  ;;
 
!       ms1)
          using_cgen=yes
  ;;
 
--- 4694,4700 ----
  fi
  ;;
 
!       mt)
          using_cgen=yes
  ;;
 
*************** esac
*** 4812,4817 ****
--- 4812,4818 ----
  cgen_cpu_prefix=""
  if test $using_cgen = yes ; then
    case ${target_cpu} in
+     mt) cgen_cpu_prefix=ms1 ;;
      *) cgen_cpu_prefix=${target_cpu} ;;
    esac
 
Index: gas/configure.in
===================================================================
RCS file: /cvs/src/src/gas/configure.in,v
retrieving revision 1.182
diff -c -3 -p -r1.182 configure.in
*** gas/configure.in 30 Sep 2005 15:05:04 -0000 1.182
--- gas/configure.in 7 Dec 2005 14:04:16 -0000
*************** changequote([,])dnl
*** 321,327 ****
  fi
  ;;
 
!       ms1)
          using_cgen=yes
  ;;
 
--- 321,327 ----
  fi
  ;;
 
!       mt)
          using_cgen=yes
  ;;
 
*************** esac
*** 433,438 ****
--- 433,439 ----
  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)
Index: gas/configure.tgt
===================================================================
RCS file: /cvs/src/src/gas/configure.tgt,v
retrieving revision 1.20
diff -c -3 -p -r1.20 configure.tgt
*** gas/configure.tgt 25 Oct 2005 17:40:17 -0000 1.20
--- gas/configure.tgt 7 Dec 2005 14:04:17 -0000
*************** case ${cpu} in
*** 53,59 ****
    maxq) cpu_type=maxq ;;
    mips*el) cpu_type=mips endian=little ;;
    mips*) cpu_type=mips endian=big ;;
!   ms1)                  cpu_type=ms1 endian=big ;;
    or32*) cpu_type=or32 endian=big ;;
    pjl*) cpu_type=pj endian=little ;;
    pj*) cpu_type=pj endian=big ;;
--- 53,59 ----
    maxq) cpu_type=maxq ;;
    mips*el) cpu_type=mips endian=little ;;
    mips*) cpu_type=mips 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 ;;
*************** case ${generic_target} in
*** 278,284 ****
    mn10300-*-linux*) fmt=elf em=linux ;;
    mn10300-*-*) fmt=elf ;;
 
!   ms1-*-elf) fmt=elf bfd_gas=yes ;;
 
    msp430-*-*) fmt=elf ;;
 
--- 278,284 ----
    mn10300-*-linux*) fmt=elf em=linux ;;
    mn10300-*-*) fmt=elf ;;
 
!   mt-*-elf) fmt=elf bfd_gas=yes ;;
 
    msp430-*-*) fmt=elf ;;
 
Index: gas/config/tc-ms1.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-ms1.c,v
retrieving revision 1.3
diff -c -3 -p -r1.3 tc-ms1.c
*** gas/config/tc-ms1.c 8 Nov 2005 11:15:12 -0000 1.3
--- gas/config/tc-ms1.c 7 Dec 2005 14:04:50 -0000
***************
*** 27,33 ****
  #include "opcodes/ms1-opc.h"
  #include "cgen.h"
  #include "elf/common.h"
! #include "elf/ms1.h"
  #include "libbfd.h"
 
  /* Structure to hold all of the different components
--- 27,33 ----
  #include "opcodes/ms1-opc.h"
  #include "cgen.h"
  #include "elf/common.h"
! #include "elf/mt.h"
  #include "libbfd.h"
 
  /* Structure to hold all of the different components
Index: gas/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.am,v
retrieving revision 1.39
diff -c -3 -p -r1.39 Makefile.am
*** gas/doc/Makefile.am 8 Nov 2005 11:15:12 -0000 1.39
--- gas/doc/Makefile.am 7 Dec 2005 14:05:02 -0000
*************** CPU_DOCS = \
*** 42,48 ****
  c-m68k.texi \
  c-mips.texi \
  c-mmix.texi \
! c-ms1.texi \
  c-msp430.texi \
  c-ns32k.texi \
  c-pdp11.texi \
--- 42,48 ----
  c-m68k.texi \
  c-mips.texi \
  c-mmix.texi \
! c-mt.texi \
  c-msp430.texi \
  c-ns32k.texi \
  c-pdp11.texi \
Index: gas/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.in,v
retrieving revision 1.72
diff -c -3 -p -r1.72 Makefile.in
*** gas/doc/Makefile.in 8 Nov 2005 11:15:12 -0000 1.72
--- gas/doc/Makefile.in 7 Dec 2005 14:05:02 -0000
*************** CPU_DOCS = \
*** 234,240 ****
  c-m68k.texi \
  c-mips.texi \
  c-mmix.texi \
! c-ms1.texi \
  c-msp430.texi \
  c-ns32k.texi \
  c-pdp11.texi \
--- 234,240 ----
  c-m68k.texi \
  c-mips.texi \
  c-mmix.texi \
! c-mt.texi \
  c-msp430.texi \
  c-ns32k.texi \
  c-pdp11.texi \
Index: gas/testsuite/gas/ms1/errors.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/ms1/errors.exp,v
retrieving revision 1.2
diff -c -3 -p -r1.2 errors.exp
*** gas/testsuite/gas/ms1/errors.exp 8 Nov 2005 11:15:12 -0000 1.2
--- gas/testsuite/gas/ms1/errors.exp 7 Dec 2005 14:05:52 -0000
*************** proc mrisc1_error_test { file testname {
*** 27,33 ****
      }
  }
 
! if [istarget ms1-*-*] {
      foreach file [glob -nocomplain -- $srcdir/$subdir/bad*.s] {
  set file [file tail $file]
  switch -- $file {
--- 27,33 ----
      }
  }
 
! if [istarget mt-*-*] {
      foreach file [glob -nocomplain -- $srcdir/$subdir/bad*.s] {
  set file [file tail $file]
  switch -- $file {
Index: gas/testsuite/gas/ms1/ms1.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/ms1/ms1.exp,v
retrieving revision 1.2
diff -c -3 -p -r1.2 ms1.exp
*** gas/testsuite/gas/ms1/ms1.exp 8 Nov 2005 11:15:12 -0000 1.2
--- gas/testsuite/gas/ms1/ms1.exp 7 Dec 2005 14:05:52 -0000
***************
*** 1,6 ****
  # MRISC1 assembler testsuite.
 
! if [istarget ms1*-*-*] {
      #
      run_dump_test "allinsn"
      run_dump_test "misc"
--- 1,6 ----
  # MRISC1 assembler testsuite.
 
! if [istarget mt-*-*] {
      #
      run_dump_test "allinsn"
      run_dump_test "misc"
Index: gas/testsuite/gas/ms1/relocs.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/ms1/relocs.exp,v
retrieving revision 1.2
diff -c -3 -p -r1.2 relocs.exp
*** gas/testsuite/gas/ms1/relocs.exp 8 Nov 2005 11:15:12 -0000 1.2
--- gas/testsuite/gas/ms1/relocs.exp 7 Dec 2005 14:05:52 -0000
*************** proc regexp_test { file1 file2 test } {
*** 20,26 ****
 
 
  global srcdir subdir
! if [istarget ms1-*] {
      gas_test "relocs1.s" {-o relocs1.o} {} {assembling relocs1}
 
      #    gas_test "relocs2.s" {-o relocs2.o} {} {assembling relocs2}
--- 20,26 ----
 
 
  global srcdir subdir
! if [istarget mt-*] {
      gas_test "relocs1.s" {-o relocs1.o} {} {assembling relocs1}
 
      #    gas_test "relocs2.s" {-o relocs2.o} {} {assembling relocs2}
Index: gdb/configure.tgt
===================================================================
RCS file: /cvs/src/src/gdb/configure.tgt,v
retrieving revision 1.169
diff -c -3 -p -r1.169 configure.tgt
*** gdb/configure.tgt 15 Aug 2005 21:46:38 -0000 1.169
--- gdb/configure.tgt 7 Dec 2005 14:07:39 -0000
*************** m68hc11*|m6811*) gdb_target_cpu=m68hc11
*** 20,26 ****
  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 ;;
--- 20,25 ----
*************** mips*-*-*) gdb_target=embed ;;
*** 145,151 ****
 
  mn10300-*-*) gdb_target=mn10300 ;;
 
! ms1-*-*) gdb_target=ms1 ;;
 
  powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
  gdb_target=nbsd ;;
--- 144,150 ----
 
  mn10300-*-*) gdb_target=mn10300 ;;
 
! mt-*-*) gdb_target=mt ;;
 
  powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
  gdb_target=nbsd ;;
Index: gdb/config/ms1/ms1.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/ms1/ms1.mt,v
retrieving revision 1.1
diff -c -3 -p -r1.1 ms1.mt
*** gdb/config/ms1/ms1.mt 15 Aug 2005 21:46:38 -0000 1.1
--- gdb/config/ms1/ms1.mt 7 Dec 2005 14:08:45 -0000
***************
*** 1,2 ****
  # Target: Morpho Technologies ms1 processor
! TDEPFILES= ms1-tdep.o
--- 1,2 ----
  # Target: Morpho Technologies ms1 processor
! TDEPFILES= mt-tdep.o
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.194
diff -c -3 -p -r1.194 Makefile.am
*** ld/Makefile.am 30 Oct 2005 17:40:28 -0000 1.194
--- ld/Makefile.am 7 Dec 2005 14:10:15 -0000
*************** ALL_EMULATIONS = \
*** 173,179 ****
  eelf32m32c.o \
  eelf32mcore.o \
  eelf32mipswindiss.o \
! eelf32ms1.o \
  eelf32openrisc.o \
  eelf32ppc.o \
  eelf32ppc_fbsd.o \
--- 173,179 ----
  eelf32m32c.o \
  eelf32mcore.o \
  eelf32mipswindiss.o \
! eelf32mt.o \
  eelf32openrisc.o \
  eelf32ppc.o \
  eelf32ppc_fbsd.o \
*************** eelf32m32c.c: $(srcdir)/emulparams/elf32
*** 1556,1564 ****
    $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  ${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
! eelf32ms1.c: $(srcdir)/emulparams/elf32ms1.sh \
    $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
! ${GENSCRIPTS} elf32ms1 "$(tdir_ms1)"
 
  # We need this for automake to use YLWRAP.
  EXTRA_ld_new_SOURCES = deffilep.y
--- 1556,1564 ----
    $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  ${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
! eelf32mt.c: $(srcdir)/emulparams/elf32mt.sh \
    $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
! ${GENSCRIPTS} elf32mt "$(tdir_mt)"
 
  # We need this for automake to use YLWRAP.
  EXTRA_ld_new_SOURCES = deffilep.y
Index: ld/Makefile.in
===================================================================
RCS file: /cvs/src/src/ld/Makefile.in,v
retrieving revision 1.208
diff -c -3 -p -r1.208 Makefile.in
*** ld/Makefile.in 30 Oct 2005 17:40:28 -0000 1.208
--- ld/Makefile.in 7 Dec 2005 14:10:15 -0000
*************** ALL_EMULATIONS = \
*** 396,402 ****
  eelf32m32c.o \
  eelf32mcore.o \
  eelf32mipswindiss.o \
! eelf32ms1.o \
  eelf32openrisc.o \
  eelf32ppc.o \
  eelf32ppc_fbsd.o \
--- 396,402 ----
  eelf32m32c.o \
  eelf32mcore.o \
  eelf32mipswindiss.o \
! eelf32mt.o \
  eelf32openrisc.o \
  eelf32ppc.o \
  eelf32ppc_fbsd.o \
*************** eelf32m32c.c: $(srcdir)/emulparams/elf32
*** 2360,2368 ****
    $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  ${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
! eelf32ms1.c: $(srcdir)/emulparams/elf32ms1.sh \
    $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
! ${GENSCRIPTS} elf32ms1 "$(tdir_ms1)"
 
  # The generated emulation files mostly have the same dependencies.
  $(EMULATION_OFILES): ../bfd/bfd.h sysdep.h config.h $(INCDIR)/bfdlink.h \
--- 2360,2368 ----
    $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  ${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
! eelf32mt.c: $(srcdir)/emulparams/elf32mt.sh \
    $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
! ${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 \
Index: ld/configure.tgt
===================================================================
RCS file: /cvs/src/src/ld/configure.tgt,v
retrieving revision 1.179
diff -c -3 -p -r1.179 configure.tgt
*** ld/configure.tgt 25 Oct 2005 17:40:11 -0000 1.179
--- ld/configure.tgt 7 Dec 2005 14:10:18 -0000
*************** am33_2.0-*-linux*) targ_emul=elf32am33li
*** 345,351 ****
  mn10200-*-*) targ_emul=mn10200 ;;
  mn10300-*-*) targ_emul=mn10300
  ;;
! ms1-*elf)               targ_emul=elf32ms1
  ;;
  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"
--- 345,351 ----
  mn10200-*-*) targ_emul=mn10200 ;;
  mn10300-*-*) targ_emul=mn10300
  ;;
! 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"
Index: ld/emulparams/elf32ms1.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32ms1.sh,v
retrieving revision 1.1
diff -c -3 -p -r1.1 elf32ms1.sh
*** ld/emulparams/elf32ms1.sh 8 Jun 2005 13:03:24 -0000 1.1
--- ld/emulparams/elf32ms1.sh 7 Dec 2005 14:10:25 -0000
***************
*** 1,7 ****
  MACHINE=
  SCRIPT_NAME=elf
  OUTPUT_FORMAT="elf32-ms1"
! # See also `include/elf/ms1.h'
  TEXT_START_ADDR=0x2000
  ARCH=ms1
  ENTRY=_start
--- 1,7 ----
  MACHINE=
  SCRIPT_NAME=elf
  OUTPUT_FORMAT="elf32-ms1"
! # See also `include/elf/mt.h'
  TEXT_START_ADDR=0x2000
  ARCH=ms1
  ENTRY=_start
Index: libgloss/configure
===================================================================
RCS file: /cvs/src/src/libgloss/configure,v
retrieving revision 1.13
diff -c -3 -p -r1.13 configure
*** libgloss/configure 10 Aug 2005 20:29:33 -0000 1.13
--- libgloss/configure 7 Dec 2005 14:10:49 -0000
*************** case "${target}" in
*** 792,799 ****
    mcore-*-*)
  configdirs="${configdirs} mcore testsuite"
  ;;
!   ms1-*-*)
!         configdirs="${configdirs} ms1 testsuite";;
    xstormy16-*-*)
  configdirs="${configdirs} xstormy16 testsuite"
  ;;
--- 792,799 ----
    mcore-*-*)
  configdirs="${configdirs} mcore testsuite"
  ;;
!   mt-*-*)
!         configdirs="${configdirs} mt testsuite";;
    xstormy16-*-*)
  configdirs="${configdirs} xstormy16 testsuite"
  ;;
Index: libgloss/configure.in
===================================================================
RCS file: /cvs/src/src/libgloss/configure.in,v
retrieving revision 1.13
diff -c -3 -p -r1.13 configure.in
*** libgloss/configure.in 10 Aug 2005 20:29:33 -0000 1.13
--- libgloss/configure.in 7 Dec 2005 14:10:49 -0000
*************** case "${target}" in
*** 103,110 ****
    mcore-*-*)
  configdirs="${configdirs} mcore testsuite"
  ;;
!   ms1-*-*)
!         configdirs="${configdirs} ms1 testsuite";;
    xstormy16-*-*)
  configdirs="${configdirs} xstormy16 testsuite"
  ;;
--- 103,110 ----
    mcore-*-*)
  configdirs="${configdirs} mcore testsuite"
  ;;
!   mt-*-*)
!         configdirs="${configdirs} mt testsuite";;
    xstormy16-*-*)
  configdirs="${configdirs} xstormy16 testsuite"
  ;;
Index: newlib/configure.host
===================================================================
RCS file: /cvs/src/src/newlib/configure.host,v
retrieving revision 1.76
diff -c -3 -p -r1.76 configure.host
*** newlib/configure.host 31 Aug 2005 20:39:40 -0000 1.76
--- newlib/configure.host 7 Dec 2005 14:11:27 -0000
*************** case "${host_cpu}" in
*** 189,196 ****
  default_newlib_io_long_long="yes"
  machine_dir=mn10300
  ;;
!   ms1*)
!         machine_dir=ms1
          ;;
    or16)
  ;;
--- 189,196 ----
  default_newlib_io_long_long="yes"
  machine_dir=mn10300
  ;;
!   mt*)
!         machine_dir=mt
          ;;
    or16)
  ;;
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.92
diff -c -3 -p -r1.92 Makefile.am
*** opcodes/Makefile.am 30 Oct 2005 17:40:28 -0000 1.92
--- opcodes/Makefile.am 7 Dec 2005 14:14:31 -0000
*************** uninstall_libopcodes:
*** 376,382 ****
 
  CLEANFILES = \
  stamp-ip2k stamp-m32c stamp-m32r stamp-fr30 stamp-frv \
! stamp-openrisc stamp-iq2000 stamp-ms1 stamp-xstormy16 \
  libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2
 
 
--- 376,382 ----
 
  CLEANFILES = \
  stamp-ip2k stamp-m32c stamp-m32r stamp-fr30 stamp-frv \
! stamp-openrisc stamp-iq2000 stamp-mt stamp-xstormy16 \
  libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2
 
 
*************** CGENDEPS = \
*** 392,398 ****
  $(CGENDIR)/opc-opinst.scm \
  cgen-asm.in cgen-dis.in cgen-ibld.in
 
! CGEN_CPUS = fr30 frv ip2k m32c m32r ms1 openrisc xstormy16
 
  if CGEN_MAINT
  IP2K_DEPS = stamp-ip2k
--- 392,398 ----
  $(CGENDIR)/opc-opinst.scm \
  cgen-asm.in cgen-dis.in cgen-ibld.in
 
! CGEN_CPUS = fr30 frv ip2k m32c m32r mt openrisc xstormy16
 
  if CGEN_MAINT
  IP2K_DEPS = stamp-ip2k
*************** M32C_DEPS = stamp-m32c
*** 400,406 ****
  M32R_DEPS = stamp-m32r
  FR30_DEPS = stamp-fr30
  FRV_DEPS = stamp-frv
! MS1_DEPS = stamp-ms1
  OPENRISC_DEPS = stamp-openrisc
  IQ2000_DEPS = stamp-iq2000
  XSTORMY16_DEPS = stamp-xstormy16
--- 400,406 ----
  M32R_DEPS = stamp-m32r
  FR30_DEPS = stamp-fr30
  FRV_DEPS = stamp-frv
! MT_DEPS = stamp-mt
  OPENRISC_DEPS = stamp-openrisc
  IQ2000_DEPS = stamp-iq2000
  XSTORMY16_DEPS = stamp-xstormy16
*************** M32C_DEPS =
*** 410,416 ****
  M32R_DEPS =
  FR30_DEPS =
  FRV_DEPS =
! MS1_DEPS =
  OPENRISC_DEPS =
  IQ2000_DEPS =
  XSTORMY16_DEPS =
--- 410,416 ----
  M32R_DEPS =
  FR30_DEPS =
  FRV_DEPS =
! MT_DEPS =
  OPENRISC_DEPS =
  IQ2000_DEPS =
  XSTORMY16_DEPS =
*************** stamp-frv: $(CGENDEPS) $(srcdir)/../cpu/
*** 482,493 ****
  $(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)
  @true
! stamp-ms1: $(CGENDEPS) $(srcdir)/../cpu/ms1.cpu $(srcdir)/../cpu/ms1.opc
  $(MAKE) run-cgen arch=ms1 prefix=ms1 options= \
! archfile=$(srcdir)/../cpu/ms1.cpu \
! opcfile=$(srcdir)/../cpu/ms1.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
--- 482,493 ----
  $(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: $(MT_DEPS)
  @true
! stamp-mt: $(CGENDEPS) $(srcdir)/../cpu/mt.cpu $(srcdir)/../cpu/mt.opc
  $(MAKE) run-cgen arch=ms1 prefix=ms1 options= \
! 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
Index: opcodes/Makefile.in
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.in,v
retrieving revision 1.103
diff -c -3 -p -r1.103 Makefile.in
*** opcodes/Makefile.in 30 Oct 2005 17:40:28 -0000 1.103
--- opcodes/Makefile.in 7 Dec 2005 14:14:31 -0000
*************** noinst_LIBRARIES = libopcodes.a
*** 552,558 ****
  POTFILES = $(HFILES) $(CFILES)
  CLEANFILES = \
  stamp-ip2k stamp-m32c stamp-m32r stamp-fr30 stamp-frv \
! stamp-openrisc stamp-iq2000 stamp-ms1 stamp-xstormy16 \
  libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2
 
  CGENDIR = @cgendir@
--- 552,558 ----
  POTFILES = $(HFILES) $(CFILES)
  CLEANFILES = \
  stamp-ip2k stamp-m32c stamp-m32r stamp-fr30 stamp-frv \
! stamp-openrisc stamp-iq2000 stamp-mt stamp-xstormy16 \
  libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2
 
  CGENDIR = @cgendir@
*************** CGENDEPS = \
*** 566,572 ****
  $(CGENDIR)/opc-opinst.scm \
  cgen-asm.in cgen-dis.in cgen-ibld.in
 
! CGEN_CPUS = fr30 frv ip2k m32c m32r ms1 openrisc xstormy16
  @CGEN_MAINT_FALSE@IP2K_DEPS =
  @CGEN_MAINT_TRUE@IP2K_DEPS = stamp-ip2k
  @CGEN_MAINT_FALSE@M32C_DEPS =
--- 566,572 ----
  $(CGENDIR)/opc-opinst.scm \
  cgen-asm.in cgen-dis.in cgen-ibld.in
 
! 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 =
*************** CGEN_CPUS = fr30 frv ip2k m32c m32r ms1
*** 577,584 ****
  @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@OPENRISC_DEPS =
  @CGEN_MAINT_TRUE@OPENRISC_DEPS = stamp-openrisc
  @CGEN_MAINT_FALSE@IQ2000_DEPS =
--- 577,584 ----
  @CGEN_MAINT_TRUE@FR30_DEPS = stamp-fr30
  @CGEN_MAINT_FALSE@FRV_DEPS =
  @CGEN_MAINT_TRUE@FRV_DEPS = stamp-frv
! @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 =
*************** stamp-frv: $(CGENDEPS) $(srcdir)/../cpu/
*** 1024,1035 ****
  $(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)
  @true
! stamp-ms1: $(CGENDEPS) $(srcdir)/../cpu/ms1.cpu $(srcdir)/../cpu/ms1.opc
  $(MAKE) run-cgen arch=ms1 prefix=ms1 options= \
! archfile=$(srcdir)/../cpu/ms1.cpu \
! opcfile=$(srcdir)/../cpu/ms1.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
--- 1024,1035 ----
  $(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: $(MT_DEPS)
  @true
! stamp-mt: $(CGENDEPS) $(srcdir)/../cpu/mt.cpu $(srcdir)/../cpu/mt.opc
  $(MAKE) run-cgen arch=ms1 prefix=ms1 options= \
! 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
Index: opcodes/configure.in
===================================================================
RCS file: /cvs/src/src/opcodes/configure.in,v
retrieving revision 1.64
diff -c -3 -p -r1.64 configure.in
*** opcodes/configure.in 25 Oct 2005 17:40:16 -0000 1.64
--- opcodes/configure.in 7 Dec 2005 14:14:36 -0000
*************** if test x${all_targets} = xfalse ; then
*** 187,193 ****
  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_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 ;;
--- 187,193 ----
  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 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 ;;
? sid/component/cgen-cpu/ms1/t
Index: sid/component/cgen-cpu/ms1/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/ms1/Makefile.am,v
retrieving revision 1.1
diff -c -3 -p -r1.1 Makefile.am
*** sid/component/cgen-cpu/ms1/Makefile.am 15 Jun 2005 21:17:18 -0000 1.1
--- sid/component/cgen-cpu/ms1/Makefile.am 7 Dec 2005 14:53:27 -0000
***************
*** 3,19 ****
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
 
! noinst_LTLIBRARIES = libms1.la
 
  BFDINCLUDES =  -I../../../../bfd -I$(srcdir)/../../../../include
  INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I../../../include -I$(srcdir)/../../../include $(BFDINCLUDES)
  CXXFLAGS = $(TOP_CXXFLAGS)
 
! pkgdata_DATA = hw-cpu-ms1.txt
 
! libms1_la_SOURCES = ms1.cxx ms1-decode.cxx ms1-sem.cxx ms1-write.cxx
! libms1_la_LDFLAGS =
! libms1_la_LIBADD = ms1-asm.lo ms1-dis.lo ms1-opc.lo ms1-ibld.lo ms1-desc.lo
 
  OPCODES_COMPILE_FLAGS = -DHAVE_CONFIG_H \
  -I../../../../opcodes \
--- 3,19 ----
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
 
! noinst_LTLIBRARIES = libmt.la
 
  BFDINCLUDES =  -I../../../../bfd -I$(srcdir)/../../../../include
  INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I../../../include -I$(srcdir)/../../../include $(BFDINCLUDES)
  CXXFLAGS = $(TOP_CXXFLAGS)
 
! pkgdata_DATA = hw-cpu-mt.txt
 
! libmt_la_SOURCES = mt.cxx mt-decode.cxx mt-sem.cxx mt-write.cxx
! libmt_la_LDFLAGS =
! libmt_la_LIBADD = ms1-asm.lo ms1-dis.lo ms1-opc.lo ms1-ibld.lo ms1-desc.lo
 
  OPCODES_COMPILE_FLAGS = -DHAVE_CONFIG_H \
  -I../../../../opcodes \
*************** ms1-desc.lo: ../../../../opcodes/ms1-des
*** 43,56 ****
  cgendir = $(srcdir)/../../../../cgen
  CGENFLAGS = -v
 
! CGEN_ALL = cgen-ms1
  .PHONY: cgen-all $(CGEN_ALL)
  cgen-all: $(CGEN_ALL)
 
! cgen-ms1:
  $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \
  ms1 "with-scache" ms1 ms1 ms1-003 ms1 "ms1-" \
! $(srcdir)/../../../../cpu/ms1.cpu \
  "desc.h cpu.h decode.h decode.cxx write.cxx semantics.cxx defs.h"
 
  html_stylesheet=$(srcdir)/../../component_html.xsl
--- 43,56 ----
  cgendir = $(srcdir)/../../../../cgen
  CGENFLAGS = -v
 
! CGEN_ALL = cgen-mt
  .PHONY: cgen-all $(CGEN_ALL)
  cgen-all: $(CGEN_ALL)
 
! cgen-mt:
  $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \
  ms1 "with-scache" ms1 ms1 ms1-003 ms1 "ms1-" \
! $(srcdir)/../../../../cpu/mt.cpu \
  "desc.h cpu.h decode.h decode.cxx write.cxx semantics.cxx defs.h"
 
  html_stylesheet=$(srcdir)/../../component_html.xsl
Index: sid/component/cgen-cpu/ms1/Makefile.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/ms1/Makefile.in,v
retrieving revision 1.2
diff -c -3 -p -r1.2 Makefile.in
*** sid/component/cgen-cpu/ms1/Makefile.in 24 Jun 2005 18:28:32 -0000 1.2
--- sid/component/cgen-cpu/ms1/Makefile.in 7 Dec 2005 14:53:27 -0000
*************** sysconfdir = @sysconfdir@
*** 227,239 ****
  target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
! noinst_LTLIBRARIES = libms1.la
  BFDINCLUDES = -I../../../../bfd -I$(srcdir)/../../../../include
  INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I../../../include -I$(srcdir)/../../../include $(BFDINCLUDES)
! pkgdata_DATA = hw-cpu-ms1.txt
! libms1_la_SOURCES = ms1.cxx ms1-decode.cxx ms1-sem.cxx ms1-write.cxx
! libms1_la_LDFLAGS =
! libms1_la_LIBADD = ms1-asm.lo ms1-dis.lo ms1-opc.lo ms1-ibld.lo ms1-desc.lo
  OPCODES_COMPILE_FLAGS = -DHAVE_CONFIG_H \
  -I../../../../opcodes \
  -I../../../../bfd \
--- 227,239 ----
  target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
! noinst_LTLIBRARIES = libmt.la
  BFDINCLUDES = -I../../../../bfd -I$(srcdir)/../../../../include
  INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I../../../include -I$(srcdir)/../../../include $(BFDINCLUDES)
! pkgdata_DATA = hw-cpu-mt.txt
! libmt_la_SOURCES = mt.cxx mt-decode.cxx mt-sem.cxx mt-write.cxx
! libmt_la_LDFLAGS =
! libmt_la_LIBADD = ms1-asm.lo ms1-dis.lo ms1-opc.lo ms1-ibld.lo ms1-desc.lo
  OPCODES_COMPILE_FLAGS = -DHAVE_CONFIG_H \
  -I../../../../opcodes \
  -I../../../../bfd \
Reply | Threaded
Open this post in threaded view
|

Re: Rename ms1 arch to mt

Aldy Hernandez-2
Ok on the gcc bits.
Reply | Threaded
Open this post in threaded view
|

Re: Rename ms1 arch to mt

Daniel Jacobowitz-2
In reply to this post by Nathan Sidwell
On Wed, Dec 07, 2005 at 03:11:41PM +0000, Nathan Sidwell wrote:
> This patch touches binutils, gdb, newlib, sid, gcc.  Please let me know
> which bit(s) you're signing off on.  Also, if you'd let me know whether you
> want to review further patches (which are going to be even more sed-like)
> in this sequence, that'd be great.

It also touches config.sub/config.guess; have you sent this through
config-patches@?


--
Daniel Jacobowitz
CodeSourcery, LLC
Reply | Threaded
Open this post in threaded view
|

Re: Rename ms1 arch to mt

Dave Brolley-2
In reply to this post by Nathan Sidwell
Nathan Sidwell wrote:

> This patch does not rename the cgenerated opcodes files, as cgen
> seemed unhappy about the mixture of mt target name but
> bfd_ms1_arch_vec name. Clearly this patch is a bit of a flag day, and
> I want to commit it before I proceed with tidying up the symbol names.

Assuming that there will be a follow on patch which corrects the problem
above, this patch is ok for the SID and opcodes portions.

Dave

Reply | Threaded
Open this post in threaded view
|

Re: Rename ms1 arch to mt

Nathan Sidwell
Dave Brolley wrote:

> Nathan Sidwell wrote:
>
>> This patch does not rename the cgenerated opcodes files, as cgen
>> seemed unhappy about the mixture of mt target name but
>> bfd_ms1_arch_vec name. Clearly this patch is a bit of a flag day, and
>> I want to commit it before I proceed with tidying up the symbol names.
>
>
> Assuming that there will be a follow on patch which corrects the problem
> above, this patch is ok for the SID and opcodes portions.

yes, of course.  Sorry I wasn't clear about that.

nathan

--
Nathan Sidwell    ::   http://www.codesourcery.com   ::     CodeSourcery LLC
[hidden email]    ::     http://www.planetfall.pwp.blueyonder.co.uk

Reply | Threaded
Open this post in threaded view
|

Re: Rename ms1 arch to mt

Kevin Buettner
In reply to this post by Nathan Sidwell
On Wed, 07 Dec 2005 15:11:41 +0000
Nathan Sidwell <[hidden email]> wrote:
 
> This patch touches binutils, gdb, newlib, sid, gcc.  Please let me know which
> bit(s) you're signing off on.  Also, if you'd let me know whether you want to
> review further patches (which are going to be even more sed-like) in this
> sequence, that'd be great.

Okay on the gdb portion.

Follow on patches which deal with the ms1 -> mt renaming within gdb/
are preapproved, but do post all patches to gdb-patches@.

Kevin