4 files changed, 12 insertions, 35 deletions
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 40041b7de9c..654b681eb8e 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -499,24 +499,6 @@ m68k_handle_option (struct gcc_options *opts, struct gcc_options *opts_set,
     case OPT_mtune_:
       return m68k_find_selection (&m68k_tune_entry, all_microarchs, arg);
 
-    case OPT_m5200:
-      return m68k_find_selection (&m68k_cpu_entry, all_devices, "5206");
-
-    case OPT_m5206e:
-      return m68k_find_selection (&m68k_cpu_entry, all_devices, "5206e");
-
-    case OPT_m528x:
-      return m68k_find_selection (&m68k_cpu_entry, all_devices, "528x");
-
-    case OPT_m5307:
-      return m68k_find_selection (&m68k_cpu_entry, all_devices, "5307");
-
-    case OPT_m5407:
-      return m68k_find_selection (&m68k_cpu_entry, all_devices, "5407");
-
-    case OPT_mcfv4e:
-      return m68k_find_selection (&m68k_cpu_entry, all_devices, "547x");
-
     case OPT_m68000:
     case OPT_mc68000:
       return m68k_find_selection (&m68k_cpu_entry, all_devices, "68000");
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index 019a9e3703c..d2805f3b424 100644
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -31,9 +31,8 @@ along with GCC; see the file COPYING3.  If not see
 /* Handle --with-cpu default option from configure script.  */
 #define OPTION_DEFAULT_SPECS						\
   { "cpu",   "%{!mc68000:%{!m68000:%{!m68302:%{!m68010:%{!mc68020:%{!m68020:\
-%{!m68030:%{!m68040:%{!m68020-40:%{!m68020-60:%{!m68060:%{!mcpu32:\
-%{!m68332:%{!m5200:%{!m5206e:%{!m528x:%{!m5307:%{!m5407:%{!mcfv4e:\
-%{!mcpu=*:%{!march=*:-%(VALUE)}}}}}}}}}}}}}}}}}}}}}" },
+%{!m68030:%{!m68040:%{!m68020-40:%{!m68020-60:%{!m68060:%{!mcpu32:%{!m68332:\
+%{!mcpu=*:%{!march=*:-%(VALUE)}}}}}}}}}}}}}}}" },
 
 /* Pass flags to gas indicating which type of processor we have.  This
    can be simplified when we can rely on the assembler supporting .cpu
@@ -43,7 +42,7 @@ along with GCC; see the file COPYING3.  If not see
 %{m68851}%{mno-68851} %{m68881}%{mno-68881} %{msoft-float:-mno-float} \
 %{m68000}%{m68302}%{mc68000}%{m68010}%{m68020}%{mc68020}%{m68030}\
 %{m68040}%{m68020-40:-m68040}%{m68020-60:-m68040}\
-%{m68060}%{mcpu32}%{m68332}%{m5200}%{m5206e}%{m528x}%{m5307}%{m5407}%{mcfv4e}\
+%{m68060}%{mcpu32}%{m68332}\
 %{mcpu=*:-mcpu=%*}%{march=*:-march=%*}\
 "
 #define ASM_PCREL_SPEC "%{fPIC|fpic|mpcrel:--pcrel} \
diff --git a/gcc/config/m68k/m68k.opt b/gcc/config/m68k/m68k.opt
index d5aa9fa7698..d1a5e118251 100644
--- a/gcc/config/m68k/m68k.opt
+++ b/gcc/config/m68k/m68k.opt
@@ -1,6 +1,7 @@
 ; Options for the Motorola 68000 port of the compiler.
 
-; Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011
+; Free Software Foundation, Inc.
 ;
 ; This file is part of GCC.
 ;
@@ -19,23 +20,23 @@
 ; <http://www.gnu.org/licenses/>.
 
 m5200
-Target RejectNegative
+Target RejectNegative Alias(mcpu=, 5206)
 Generate code for a 520X
 
 m5206e
-Target RejectNegative
+Target RejectNegative Alias(mcpu=, 5206e)
 Generate code for a 5206e
 
 m528x
-Target RejectNegative
+Target RejectNegative Alias(mcpu=, 528x)
 Generate code for a 528x
 
 m5307
-Target RejectNegative
+Target RejectNegative Alias(mcpu=, 5307)
 Generate code for a 5307
 
 m5407
-Target RejectNegative
+Target RejectNegative Alias(mcpu=, 5407)
 Generate code for a 5407
 
 m68000
@@ -108,7 +109,7 @@ Target RejectNegative
 Generate code for a 68020
 
 mcfv4e
-Target RejectNegative
+Target RejectNegative Alias(mcpu=, 547x)
 Generate code for a ColdFire v4e
 
 mcpu=
diff --git a/gcc/config/m68k/t-mlibs b/gcc/config/m68k/t-mlibs
index dcf681c32d9..00fee73b7ea 100644
--- a/gcc/config/m68k/t-mlibs
+++ b/gcc/config/m68k/t-mlibs
@@ -1,6 +1,6 @@
 # multilibs  -*- mode:Makefile -*-
 #
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
@@ -73,11 +73,6 @@ MULTILIB_MATCHES += m68000=mcpu?68000 m68000=march?68000 m68000=mc68000 \
 endif
 
 ifneq ($(M68K_ARCH),m68k)
-# Map the legacy ColdFire options to the new ones.
-MULTILIB_MATCHES += mcpu?5206=m5200 mcpu?5206e=m5206e mcpu?5208=m528x \
-		    mcpu?5307=m5300 mcpu?5307=m5307 \
-		    mcpu?5407=m5400 mcpu?5407=m5407 \
-		    mcpu?5475=mcfv4e
 # Map -march=* options to the representative -mcpu=* option.
 MULTILIB_MATCHES += mcpu?5206e=march?isaa mcpu?5208=march?isaaplus \
 		    mcpu?5407=march?isab