* config/tc-m68k.c (m68k_set_cpu, m68k_set_arch): Don't complain

	about overriding an earlier setting.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index bb8218292b26caa48519b4d7a216cee4a757159a..16ee4def211d47206d9aaf5ba9433af8d4d6732d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-08  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * config/tc-m68k.c (m68k_set_cpu, m68k_set_arch): Don't complain
+       about overriding an earlier setting.
+
 2008-07-07  Adam Nemet  <anemet@caviumnetworks.com>
 
        * config/tc-mips.c (NO_ISA_COP): New macro.

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 81e4cc7ecd1ed46e2f037c2aaf1873cb523fcdf5..9e969c3cb98721116390b125903bc1eb62d3a3df 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -7229,7 +7229,7 @@ m68k_lookup_cpu (const char *arg, const struct m68k_cpu *table,
   return 0;
 }
 
-/* Set the cpu, issuing errors if it is unrecognized, or invalid */
+/* Set the cpu, issuing errors if it is unrecognized.  */
 
 static int
 m68k_set_cpu (char const *name, int allow_m, int silent)
@@ -7244,18 +7244,11 @@ m68k_set_cpu (char const *name, int allow_m, int silent)
        as_bad (_("cpu `%s' unrecognized"), name);
       return 0;
     }
-      
-  if (selected_cpu && selected_cpu != cpu)
-    {
-      as_bad (_("already selected `%s' processor"),
-             selected_cpu->name);
-      return 0;
-    }
   selected_cpu = cpu;
   return 1;
 }
 
-/* Set the architecture, issuing errors if it is unrecognized, or invalid */
+/* Set the architecture, issuing errors if it is unrecognized.  */
 
 static int
 m68k_set_arch (char const *name, int allow_m, int silent)
@@ -7270,14 +7263,6 @@ m68k_set_arch (char const *name, int allow_m, int silent)
        as_bad (_("architecture `%s' unrecognized"), name);
       return 0;
     }
-      
-  if (selected_arch && selected_arch != arch)
-    {
-      as_bad (_("already selected `%s' architecture"),
-             selected_arch->name);
-      return 0;
-    }
-  
   selected_arch = arch;
   return 1;
 }