gas: sparc: fix collision of registers and pseudo-ops.

[deliverable/binutils-gdb.git] / gas / as.c

diff --git a/gas/as.c b/gas/as.c
index 14980b97c2c7be357f473a4838cee2fabf5924ac..badeac9bee329d9ab9f0e5580f98039b722fcd5e 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -569,7 +569,7 @@ parse_args (int * pargc, char *** pargv)
   old_argv = *pargv;
 
   /* Initialize a new argv that contains no options.  */
-  new_argv = (char **) xmalloc (sizeof (char *) * (old_argc + 1));
+  new_argv = XNEWVEC (char *, old_argc + 1);
   new_argv[0] = old_argv[0];
   new_argc = 1;
   new_argv[new_argc] = NULL;
@@ -621,7 +621,7 @@ parse_args (int * pargc, char *** pargv)
 
        case 1:                 /* File name.  */
          if (!strcmp (optarg, "-"))
-           optarg = "";
+           optarg = (char *) "";
          new_argv[new_argc++] = optarg;
          new_argv[new_argc] = NULL;
          break;
@@ -726,7 +726,7 @@ This program has absolutely no warranty.\n"));
              as_fatal (_("bad defsym; format is --defsym name=value"));
            *s++ = '\0';
            i = bfd_scan_vma (s, (const char **) NULL, 0);
-           n = (struct defsym_list *) xmalloc (sizeof *n);
+           n = XNEW (struct defsym_list);
            n->next = defsyms;
            n->name = optarg;
            n->value = i;
@@ -747,7 +747,7 @@ This program has absolutely no warranty.\n"));
                break;
              }
 
-           n = xmalloc (sizeof * n);
+           n = XNEW (struct itbl_file_list);
            n->next = itbl_files;
            n->name = optarg;
            itbl_files = n;
@@ -870,9 +870,9 @@ This program has absolutely no warranty.\n"));
 
        case OPTION_SIZE_CHECK:
          if (strcasecmp (optarg, "error") == 0)
-           flag_size_check = size_check_error;
+           flag_allow_nonconst_size = FALSE;
          else if (strcasecmp (optarg, "warning") == 0)
-           flag_size_check = size_check_warning;
+           flag_allow_nonconst_size = TRUE;
          else
            as_fatal (_("Invalid --size-check= option: `%s'"), optarg);
          break;