SH64/GAS: Fix a -Wwrite-strings build failure

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

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index ce5304d868e51caa6041664be7bfb1d19105aacf..25a0fa20ad896a30efc81a9a7e7b631009d446d3 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -961,6 +961,8 @@ static const arch_entry cpu_arch[] =
     CPU_MWAITX_FLAGS, 0, 0 },
   { STRING_COMMA_LEN (".ospke"), PROCESSOR_UNKNOWN,
     CPU_OSPKE_FLAGS, 0, 0 },
+  { STRING_COMMA_LEN (".rdpid"), PROCESSOR_UNKNOWN,
+    CPU_RDPID_FLAGS, 0, 0 },
 };
 
 #ifdef I386COFF
@@ -2511,7 +2513,7 @@ md_begin (void)
 
     /* Setup for loop.  */
     optab = i386_optab;
-    core_optab = (templates *) xmalloc (sizeof (templates));
+    core_optab = XNEW (templates);
     core_optab->start = optab;
 
     while (1)
@@ -2534,7 +2536,7 @@ md_begin (void)
              }
            if (optab->name == NULL)
              break;
-           core_optab = (templates *) xmalloc (sizeof (templates));
+           core_optab = XNEW (templates);
            core_optab->start = optab;
          }
       }
@@ -4575,7 +4577,9 @@ check_VecOperands (const insn_template *t)
            && i.op[op].disps->X_op == O_constant)
          {
            offsetT value = i.op[op].disps->X_add_number;
-           int vec_disp8_ok = fits_in_vec_disp8 (value);
+           int vec_disp8_ok
+             = (i.disp_encoding != disp_encoding_32bit
+                && fits_in_vec_disp8 (value));
            if (t->operand_types [op].bitfield.vec_disp8)
              {
                if (vec_disp8_ok)
@@ -7603,7 +7607,7 @@ lex_got (enum bfd_reloc_code_real *rel,
 
              /* Allocate and copy string.  The trailing NUL shouldn't
                 be necessary, but be safe.  */
-             tmpbuf = (char *) xmalloc (first + second + 2);
+             tmpbuf = XNEWVEC (char, first + second + 2);
              memcpy (tmpbuf, input_line_pointer, first);
              if (second != 0 && *past_reloc != ' ')
                /* Replace the relocation token with ' ', so that
@@ -7711,7 +7715,7 @@ lex_got (enum bfd_reloc_code_real *rel ATTRIBUTE_UNUSED,
 
              /* Allocate and copy string.  The trailing NUL shouldn't
                 be necessary, but be safe.  */
-             tmpbuf = (char *) xmalloc (first + second + 2);
+             tmpbuf = XNEWVEC (char, first + second + 2);
              memcpy (tmpbuf, input_line_pointer, first);
              if (second != 0 && *past_reloc != ' ')
                /* Replace the relocation token with ' ', so that
@@ -9793,7 +9797,7 @@ md_parse_option (int c, const char *arg)
        char *n, *t;
        const char *s;
 
-       n = (char *) xmalloc (strlen (i386_comment_chars) + 1);
+       n = XNEWVEC (char, strlen (i386_comment_chars) + 1);
        t = n;
        for (s = i386_comment_chars; *s != '\0'; s++)
          if (*s != '/')
@@ -10599,8 +10603,8 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp)
       code = BFD_RELOC_X86_64_GOTPC64;
     }
 
-  rel = (arelent *) xmalloc (sizeof (arelent));
-  rel->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+  rel = XNEW (arelent);
+  rel->sym_ptr_ptr = XNEW (asymbol *);
   *rel->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
 
   rel->address = fixp->fx_frag->fr_address + fixp->fx_where;