diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7c9871a7e9..c9a9cd7894 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-19  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-m68k.c (select_control_regs): Handle situation where
+	architecture has not yet been selected.
+
 2002-09-18  Chris Demetriou  <cgd@broadcom.com>
 
 	* config/tc-mips.c (IS_SEXT_32BIT_NUM): Move closer to top of file.
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index d381ee38bc..4e23ced782 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -3950,6 +3950,11 @@ select_control_regs ()
   /* Note which set of "movec" control registers is available.  */
   switch (cpu_of_arch (current_architecture))
     {
+    case 0:
+      as_warn (_("architecture not yet selected: defaulting to 68020"));
+      control_regs = m68020_control_regs;
+      break;
+      
     case m68000:
       control_regs = m68000_control_regs;
       break;