* elf32-m32c.c (ELF_MAXPAGESIZE): Change page size to 256 bytes.

[deliverable/binutils-gdb.git] / gas / config / tc-mips.c

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 21aedd9116e0bb5ef2feb07f912708f651fae7f6..145f8b62ea41a2bbd366c70dab3072b08af4634c 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -1063,7 +1063,7 @@ static void append_insn
 static void mips_no_prev_insn (void);
 static void macro_build (expressionS *, const char *, const char *, ...);
 static void mips16_macro_build
-  (expressionS *, const char *, const char *, va_list);
+  (expressionS *, const char *, const char *, va_list *);
 static void load_register (int, expressionS *, int);
 static void macro_start (void);
 static void macro_end (void);
@@ -3616,7 +3616,7 @@ macro_build (expressionS *ep, const char *name, const char *fmt, ...)
 
   if (mips_opts.mips16)
     {
-      mips16_macro_build (ep, name, fmt, args);
+      mips16_macro_build (ep, name, fmt, &args);
       va_end (args);
       return;
     }
@@ -3842,7 +3842,7 @@ macro_build (expressionS *ep, const char *name, const char *fmt, ...)
 
 static void
 mips16_macro_build (expressionS *ep, const char *name, const char *fmt,
-                   va_list args)
+                   va_list *args)
 {
   struct mips_opcode *mo;
   struct mips_cl_insn insn;
@@ -3878,20 +3878,20 @@ mips16_macro_build (expressionS *ep, const char *name, const char *fmt,
 
        case 'y':
        case 'w':
-         MIPS16_INSERT_OPERAND (RY, insn, va_arg (args, int));
+         MIPS16_INSERT_OPERAND (RY, insn, va_arg (*args, int));
          continue;
 
        case 'x':
        case 'v':
-         MIPS16_INSERT_OPERAND (RX, insn, va_arg (args, int));
+         MIPS16_INSERT_OPERAND (RX, insn, va_arg (*args, int));
          continue;
 
        case 'z':
-         MIPS16_INSERT_OPERAND (RZ, insn, va_arg (args, int));
+         MIPS16_INSERT_OPERAND (RZ, insn, va_arg (*args, int));
          continue;
 
        case 'Z':
-         MIPS16_INSERT_OPERAND (MOVE32Z, insn, va_arg (args, int));
+         MIPS16_INSERT_OPERAND (MOVE32Z, insn, va_arg (*args, int));
          continue;
 
        case '0':
@@ -3901,14 +3901,14 @@ mips16_macro_build (expressionS *ep, const char *name, const char *fmt,
          continue;
 
        case 'X':
-         MIPS16_INSERT_OPERAND (REGR32, insn, va_arg (args, int));
+         MIPS16_INSERT_OPERAND (REGR32, insn, va_arg (*args, int));
          continue;
 
        case 'Y':
          {
            int regno;
 
-           regno = va_arg (args, int);
+           regno = va_arg (*args, int);
            regno = ((regno & 7) << 2) | ((regno & 0x18) >> 3);
            MIPS16_INSERT_OPERAND (REG32R, insn, regno);
          }
@@ -3947,7 +3947,7 @@ mips16_macro_build (expressionS *ep, const char *name, const char *fmt,
          continue;
 
        case '6':
-         MIPS16_INSERT_OPERAND (IMM6, insn, va_arg (args, int));
+         MIPS16_INSERT_OPERAND (IMM6, insn, va_arg (*args, int));
          continue;
        }
 
@@ -6219,6 +6219,8 @@ macro (struct mips_cl_insn *ip)
                      /* Quiet this warning.  */
                      mips_cprestore_valid = 1;
                    }
+                 if (mips_opts.noreorder)
+                   macro_build (NULL, "nop", "");
                  expr1.X_add_number = mips_cprestore_offset;
                  macro_build_ldst_constoffset (&expr1, ADDRESS_LOAD_INSN,
                                                mips_gp_register,
@@ -9951,9 +9953,7 @@ do_msbd:
                    /* Set the argument to the current address in the
                       section.  */
                    offset_expr.X_op = O_symbol;
-                   offset_expr.X_add_symbol =
-                     symbol_new ("L0\001", now_seg,
-                                 (valueT) frag_now_fix (), frag_now);
+                   offset_expr.X_add_symbol = symbol_temp_new_now ();
                    offset_expr.X_add_number = 0;
 
                    /* Put the floating point number into the section.  */