* config/tc-s390.c (init_default_arch): Make current_mode_mask

	dependent on s390_arch_size and current_cpu dependent on
	current_mode_mask.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c715e69d6878ce73032e22fbc037c42c1abf4766..ac7ca20625c9e6016a642385896f22b0ee0ef529 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-18  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+       * config/tc-s390.c (init_default_arch): Make current_mode_mask
+       dependent on s390_arch_size and current_cpu dependent on
+       current_mode_mask.
+
 2003-06-18  Svein E. Seldal  <Svein.Seldal@solidas.com>
 
        * configure.in: Add c4x as an architecture variant to tic4x.

diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 97edcc3b69b87d69bd08484b8228a54f98f13539..b0340b13e2744624bc529e76a3384dacf475f313 100644 (file)
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -327,22 +327,29 @@ init_default_arch ()
     {
       if (s390_arch_size == 0)
        s390_arch_size = 32;
-      if (current_mode_mask == 0)
-       current_mode_mask = 1 << S390_OPCODE_ESA;
-      if (current_cpu == -1U)
-       current_cpu = S390_OPCODE_G5;
     }
   else if (strcmp (default_arch, "s390x") == 0)
     {
       if (s390_arch_size == 0)
        s390_arch_size = 64;
-      if (current_mode_mask == 0)
-       current_mode_mask = 1 << S390_OPCODE_ZARCH;
-      if (current_cpu == -1U)
-       current_cpu = S390_OPCODE_Z900;
     }
   else
     as_fatal ("Invalid default architecture, broken assembler.");
+
+  if (current_mode_mask == 0)
+    {
+      if (s390_arch_size == 32)
+       current_mode_mask = 1 << S390_OPCODE_ESA;
+      else
+       current_mode_mask = 1 << S390_OPCODE_ZARCH;
+    }
+  if (current_cpu == -1U)
+    {
+      if (current_mode_mask == (1 << S390_OPCODE_ESA))
+       current_cpu = S390_OPCODE_G5;
+      else
+       current_cpu = S390_OPCODE_Z900;
+    }
 }
 
 /* Called by TARGET_FORMAT.  */