(print_operand_address): A patch for 2.5.8 ended up at the wrong place.

(print_operand_address): A patch for 2.5.8 ended up at the wrong
place.  Moved.

From-SVN: r7881

gcc/config/ns32k/ns32k.c

@@ -767,24 +767,10 @@ print_operand_address (file, addr)
 	if (base)
 	  fprintf (file, "(%s)", reg_names[REGNO (base)]);
 #ifdef BASE_REG_NEEDED
-  else 
-    {
-      /* Abs. addresses don't need a base (I think). */
-      if (GET_CODE (offset) != CONST_INT
-#ifndef PC_RELATIVE
-	  && GET_CODE (offset) != LABEL_REF
-	  && GET_CODE (offset) != SYMBOL_REF
-	  && GET_CODE (offset) != CONST
-	  && GET_CODE (offset) != PLUS
-#endif
-         )
-        {
-	  if (TARGET_SB)
+	else if (TARGET_SB)
 	  fprintf (file, "(sb)");
 	else
 	  abort ();
-        }
-    }
 #endif
 	fprintf (file, ")");
 	break;
@@ -799,12 +785,25 @@ print_operand_address (file, addr)
 	   || GET_CODE (offset) == PLUS)
     fprintf (file, "(pc)");
 #endif
-#ifdef BASE_REG_NEEDED		/* this is defined if the assembler always
-			   	   needs a base register */
-    else if (TARGET_SB)
+#ifdef BASE_REG_NEEDED
+  else 
+    {
+      /* Abs. addresses don't need a base (I think). */
+      if (GET_CODE (offset) != CONST_INT
+#ifndef PC_RELATIVE
+	  && GET_CODE (offset) != LABEL_REF
+	  && GET_CODE (offset) != SYMBOL_REF
+	  && GET_CODE (offset) != CONST
+	  && GET_CODE (offset) != PLUS
+#endif
+         )
+        {
+	  if (TARGET_SB)
 	    fprintf (file, "(sb)");
 	  else
 	    abort ();
+        }
+    }
 #endif
   /* now print index if we have one */
   if (indexexp)