rename flag_size_check to flag_allow_nonconst_size and make it a bool

This name describes what the variable means slightly better, and the enum with
two values that is only used for this one variable is kind of silly.

gas/ChangeLog:

2016-03-25  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>

	* as.c (parse_args): Adjust.
	* as.h (flag_size_check): Rename to flag_allow_nonconst_size.
	* config/obj-elf.c (elf_frob_symbol): Adjust.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 493d779a7c66effe512ccead58649d32dbff74c5..0ab27182a894629194fd40a32d80fee363edbe74 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-25  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+       * as.c (parse_args): Adjust.
+       * as.h (flag_size_check): Rename to flag_allow_nonconst_size.
+       * config/obj-elf.c (elf_frob_symbol): Adjust.
+
 2016-03-24  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
        * config/tc-sparc.c (sparc_ip): Remove the V9 restriction on ASR

diff --git a/gas/as.c b/gas/as.c
index 14980b97c2c7be357f473a4838cee2fabf5924ac..ad3d3a639126fa5fdd93f9aebca095f9b52c0f71 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -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;

diff --git a/gas/as.h b/gas/as.h
index 4e5601b536d0336d0097924483871fddae56fb1f..ba2fb7dd81eda8f6f64eefd9b132b8502713e1fa 100644 (file)
--- a/gas/as.h
+++ b/gas/as.h
@@ -585,12 +585,7 @@ COMMON const char *        found_comment_file;
 
 #if defined OBJ_ELF || defined OBJ_MAYBE_ELF
 /* If .size directive failure should be error or warning.  */
-COMMON enum
-  {
-    size_check_error = 0,
-    size_check_warning
-  }
-flag_size_check;
+COMMON int flag_allow_nonconst_size;
 
 /* If we should generate ELF common symbols with the STT_COMMON type.  */
 extern int flag_use_elf_stt_common;

diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index bacaca3f30a70c631d6fccc5d78df962928c8a8d..c7a4ee410faee8feb62d0485a0a77c36bb022303 100644 (file)
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -2165,7 +2165,7 @@ elf_frob_symbol (symbolS *symp, int *puntp)
        S_SET_SIZE (symp, size->X_add_number);
       else
        {
-         if (flag_size_check == size_check_error)
+         if (!flag_allow_nonconst_size)
            as_bad (_(".size expression for %s "
                      "does not evaluate to a constant"), S_GET_NAME (symp));
          else