* config/mt/mt.c (mt_override_options): Require lower case

	architectures.  Revert accidental default to ms2.
	* config/mt/mt.h (ASM_SPEC, LIBSPEC, STARTFILE_SPEC,
	ENDFILE_SPEC): Require lower case architectures.  Revert default
	to ms2.

	* doc/invoke.texi (MT Options): Rename and update.
	* doc/md.texi (MorphoTech family): Rename and update.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108581 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 46d848d..3a79601 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2005-12-15  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * config/mt/mt.c (mt_override_options): Require lower case
+       architectures.  Revert accidental default to ms2.
+       * config/mt/mt.h (ASM_SPEC, LIBSPEC, STARTFILE_SPEC,
+       ENDFILE_SPEC): Require lower case architectures.  Revert default
+       to ms2.
+
+       * doc/invoke.texi (MT Options): Rename and update.
+       * doc/md.texi (MorphoTech family): Rename and update.
+
 2005-12-15  Olivier Hainque  <hainque@adacore.com>
 
        * stor-layout.c (layout_type): Don't complain about a too small

diff --git a/gcc/config/mt/mt.c b/gcc/config/mt/mt.c
index 6d7ca3c..7efd2f7 100644 (file)
--- a/gcc/config/mt/mt.c
+++ b/gcc/config/mt/mt.c
@@ -796,19 +796,19 @@ mt_override_options (void)
 {
   if (mt_cpu_string != NULL)
     {
-      if (!strcasecmp (mt_cpu_string, "MS1-64-001"))
+      if (!strcmp (mt_cpu_string, "ms1-64-001"))
        mt_cpu = PROCESSOR_MS1_64_001;
-      else if (!strcasecmp (mt_cpu_string, "MS1-16-002"))
+      else if (!strcmp (mt_cpu_string, "ms1-16-002"))
        mt_cpu = PROCESSOR_MS1_16_002;
-      else if  (!strcasecmp (mt_cpu_string, "MS1-16-003"))
+      else if  (!strcmp (mt_cpu_string, "ms1-16-003"))
        mt_cpu = PROCESSOR_MS1_16_003;
-      else if (!strcasecmp (mt_cpu_string, "MS2"))
+      else if (!strcmp (mt_cpu_string, "ms2"))
        mt_cpu = PROCESSOR_MS2;
       else
        error ("bad value (%s) for -march= switch", mt_cpu_string);
     }
   else
-    mt_cpu = PROCESSOR_MS2;
+    mt_cpu = PROCESSOR_MS1_16_002;
 
   if (flag_exceptions)
     {

diff --git a/gcc/config/mt/mt.h b/gcc/config/mt/mt.h
index 75d56f9..75bd0af 100644 (file)
--- a/gcc/config/mt/mt.h
+++ b/gcc/config/mt/mt.h
@@ -41,49 +41,37 @@ extern enum processor_type mt_cpu;
 /* A C string constant that tells the GCC driver program options to pass to
    the assembler.  */
 #undef  ASM_SPEC
-#define ASM_SPEC "%{march=*} %{!march=*: -march=ms2}"
+#define ASM_SPEC "%{march=*} %{!march=*: -march=ms1-16-002}"
 
 /* A string to pass to at the end of the command given to the linker.  */
 #undef  LIB_SPEC
 #define LIB_SPEC "--start-group -lc -lsim --end-group \
 %{msim: ; \
 march=ms1-64-001:-T 64-001.ld%s; \
-march=MS1-64-001:-T 64-001.ld%s; \
 march=ms1-16-002:-T 16-002.ld%s; \
-march=MS1-16-002:-T 16-002.ld%s; \
 march=ms1-16-003:-T 16-003.ld%s; \
-march=MS1-16-003:-T 16-003.ld%s; \
 march=ms2:-T ms2.ld%s; \
-march=MS2:-T ms2.ld%s; \
-        : -T ms2.ld}"
+        :-T ms1-16-002.ld}"
 
 /* A string to pass at the very beginning of the command given to the
    linker.  */
 #undef  STARTFILE_SPEC
 #define STARTFILE_SPEC "%{msim:crt0.o%s;\
 march=ms1-64-001:%{!mno-crt0:crt0-64-001.o%s} startup-64-001.o%s; \
-march=MS1-64-001:%{!mno-crt0:crt0-64-001.o%s} startup-64-001.o%s; \
 march=ms1-16-002:%{!mno-crt0:crt0-16-002.o%s} startup-16-002.o%s; \
-march=MS1-16-002:%{!mno-crt0:crt0-16-002.o%s} startup-16-002.o%s; \
 march=ms1-16-003:%{!mno-crt0:crt0-16-003.o%s} startup-16-003.o%s; \
-march=MS1-16-003:%{!mno-crt0:crt0-16-003.o%s} startup-16-003.o%s; \
 march=ms2:%{!mno-crt0:crt0-ms2.o%s} startup-ms2.o%s; \
-march=MS2:%{!mno-crt0:crt0-ms2.o%s} startup-ms2.o%s; \
-        :%{!mno-crt0:crt0-ms2.o%s} startup-ms2.o%s} \
+        :%{!mno-crt0:crt0-ms2.o%s} startup-16-002.o%s} \
 crti.o%s crtbegin.o%s"
 
 /* A string to pass at the end of the command given to the linker.  */
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "%{msim:exit.o%s; \
 march=ms1-64-001:exit-64-001.o%s; \
-march=MS1-64-001:exit-64-001.o%s; \
 march=ms1-16-002:exit-16-002.o%s; \
-march=MS1-16-002:exit-16-002.o%s; \
 march=ms1-16-003:exit-16-003.o%s; \
-march=MS1-16-003:exit-16-003.o%s; \
 march=ms2:exit-ms2.o%s; \
-march=MS2:exit-ms2.o%s; \
-        :exit-ms2.o%s} \
+        :exit-ms1-16-002.o%s} \
  crtend.o%s crtn.o%s"
 \f
 /* Run-time target specifications.  */

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 67a6749..198d265 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -618,8 +618,8 @@ Objective-C and Objective-C++ Dialects}.
 -mreturn-pointer-on-d0 @gol
 -mno-crt0  -mrelax}
 
-@emph{MS1 Options}
-@gccoptlist{-mno-crt0 -mmul -mbacc -msim @gol
+@emph{MT Options}
+@gccoptlist{-mno-crt0 -mbacc -msim @gol
 -march=@var{cpu-type} }
 
 @emph{PDP-11 Options}
@@ -7147,7 +7147,7 @@ platform.
 * MIPS Options::
 * MMIX Options::
 * MN10300 Options::
-* MS1 Options::
+* MT Options::
 * PDP-11 Options::
 * PowerPC Options::
 * RS/6000 and PowerPC Options::
@@ -10687,11 +10687,11 @@ has an effect when used on the command line for the final link step.
 This option makes symbolic debugging impossible.
 @end table
 
-@node MS1 Options
-@subsection MS1 Options
-@cindex MS1 options
+@node MT Options
+@subsection MT Options
+@cindex MT options
 
-These @option{-m} options are defined for Morpho MS1 architectures:
+These @option{-m} options are defined for Morpho MT architectures:
 
 @table @gcctabopt
 
@@ -10699,18 +10699,10 @@ These @option{-m} options are defined for Morpho MS1 architectures:
 @opindex march
 Generate code that will run on @var{cpu-type}, which is the name of a system
 representing a certain processor type.  Possible values for
-@var{cpu-type} are @samp{MS1-64-001}, @samp{MS1-16-002}, and
-@samp{MS1-16-003}.
+@var{cpu-type} are @samp{ms1-64-001}, @samp{ms1-16-002},
+@samp{ms1-16-003} and @samp{ms2}.
 
-When this option is not used, the default is @option{-march=MS1-16-003}.
-
-@item -mmul
-@opindex mmul
-Generate multiply instructions.
-
-@item -mno-mul
-@opindex mno-mul
-Do not generate multiply instructions.
+When this option is not used, the default is @option{-march=ms1-16-002}.
 
 @item -mbacc
 @opindex mbacc

diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
index 5933cc8..cce838d 100644 (file)
--- a/gcc/doc/md.texi
+++ b/gcc/doc/md.texi
@@ -1858,7 +1858,7 @@ Constant suitable as a 32-bit mask operand
 System V Release 4 small data area reference
 @end table
 
-@item MorphoRISC family---@file{ms1.h}
+@item MorphoTech family---@file{mt.h}
 @table @code
 @item I
 Constant for an arithmetic insn (16-bit signed integer).