x86: slightly simplify offset_in_range()

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

diff --git a/gas/as.c b/gas/as.c
index c2da78870efa98aae072a7dcbe3ae02289943ffd..7de8af246e1cfc702e6d5c74281adc8a581abe9a 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -1,5 +1,5 @@
 /* as.c - GAS main program.
-   Copyright (C) 1987-2020 Free Software Foundation, Inc.
+   Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -102,12 +102,13 @@ int verbose = 0;
    MD_AFTER_PARSE_ARGS.  */
 int flag_dwarf_cie_version = -1;
 
-/* The maximum level of DWARF DEBUG information we should manufacture.  */
-unsigned int dwarf_level = 4;
+/* The maximum level of DWARF DEBUG information we should manufacture.
+   This defaults to 3 unless overridden by a command line option.  */
+unsigned int dwarf_level = 3;
 
 #if defined OBJ_ELF || defined OBJ_MAYBE_ELF
 int flag_use_elf_stt_common = DEFAULT_GENERATE_ELF_STT_COMMON;
-bfd_boolean flag_generate_build_notes = DEFAULT_GENERATE_BUILD_NOTES;
+bool flag_generate_build_notes = DEFAULT_GENERATE_BUILD_NOTES;
 #endif
 
 /* Keep the output file.  */
@@ -157,7 +158,7 @@ select_emulation_mode (int argc, char **argv)
   const char *em = NULL;
 
   for (i = 1; i < argc; i++)
-    if (!strncmp ("--em", argv[i], 4))
+    if (startswith (argv[i], "--em"))
       break;
 
   if (i == argc)
@@ -345,10 +346,6 @@ Options:\n\
   fprintf (stream, _("\
   --gdwarf-sections       generate per-function section names for DWARF line information\n"));
   fprintf (stream, _("\
-  --hash-size=<value>     set the hash table size close to <value>\n"));
-  fprintf (stream, _("\
-  --help                  show this message and exit\n"));
-  fprintf (stream, _("\
   --target-help           show target specific options\n"));
   fprintf (stream, _("\
   -I DIR                  add DIR to search list for .include directives\n"));
@@ -371,10 +368,6 @@ Options:\n\
   fprintf (stream, _("\
   -R                      fold data section into text section\n"));
   fprintf (stream, _("\
-  --reduce-memory-overheads \n\
-                          prefer smaller memory use at the cost of longer\n\
-                          assembly times\n"));
-  fprintf (stream, _("\
   --statistics            print various measured statistics from execution\n"));
   fprintf (stream, _("\
   --strip-local-absolute  strip local absolute symbols\n"));
@@ -693,7 +686,7 @@ parse_args (int * pargc, char *** pargv)
        case OPTION_VERSION:
          /* This output is intended to follow the GNU standards document.  */
          printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
-         printf (_("Copyright (C) 2020 Free Software Foundation, Inc.\n"));
+         printf (_("Copyright (C) 2021 Free Software Foundation, Inc.\n"));
          printf (_("\
 This program is free software; you may redistribute it under the terms of\n\
 the GNU General Public License version 3 or later.\n\
@@ -823,6 +816,12 @@ This program has absolutely no warranty.\n"));
              && md_parse_option (optc, optarg))
            continue;
 
+         /* We end up here for any -gsomething-not-already-a-long-option.
+            give some useful feedback on not (yet) supported -gdwarfxxx
+            versions/sections/options.  */
+         if (startswith (old_argv[optind - 1], "-gdwarf"))
+           as_fatal (_("unknown DWARF option %s\n"), old_argv[optind - 1]);
+
          if (md_debug_format_selector)
            debug_type = md_debug_format_selector (& use_gnu_debug_info_extensions);
          else if (IS_ELF)
@@ -862,7 +861,7 @@ This program has absolutely no warranty.\n"));
          break;
 
        case OPTION_GDWARF_SECTIONS:
-         flag_dwarf_sections = TRUE;
+         flag_dwarf_sections = true;
          break;
 
         case OPTION_GDWARF_CIE_VERSION:
@@ -961,9 +960,9 @@ This program has absolutely no warranty.\n"));
 
        case OPTION_SIZE_CHECK:
          if (strcasecmp (optarg, "error") == 0)
-           flag_allow_nonconst_size = FALSE;
+           flag_allow_nonconst_size = false;
          else if (strcasecmp (optarg, "warning") == 0)
-           flag_allow_nonconst_size = TRUE;
+           flag_allow_nonconst_size = true;
          else
            as_fatal (_("Invalid --size-check= option: `%s'"), optarg);
          break;
@@ -984,9 +983,9 @@ This program has absolutely no warranty.\n"));
 
        case OPTION_ELF_BUILD_NOTES:
          if (strcasecmp (optarg, "no") == 0)
-           flag_generate_build_notes = FALSE;
+           flag_generate_build_notes = false;
          else if (strcasecmp (optarg, "yes") == 0)
-           flag_generate_build_notes = TRUE;
+           flag_generate_build_notes = true;
          else
            as_fatal (_("Invalid --generate-missing-build-notes option: `%s'"),
                      optarg);
@@ -1099,22 +1098,10 @@ This program has absolutely no warranty.\n"));
          break;
 
        case OPTION_REDUCE_MEMORY_OVERHEADS:
-         /* The only change we make at the moment is to reduce
-            the size of the hash tables that we use.  */
-         set_gas_hash_table_size (4051);
          break;
 
        case OPTION_HASH_TABLE_SIZE:
-         {
-           unsigned long new_size;
-
-            new_size = strtoul (optarg, NULL, 0);
-            if (new_size)
-              set_gas_hash_table_size (new_size);
-            else
-              as_fatal (_("--hash-size needs a numeric argument"));
-           break;
-         }
+         break;
        }
     }
 
@@ -1269,12 +1256,10 @@ main (int argc, char ** argv)
   start_time = get_run_time ();
   signal_init ();
 
-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+#ifdef HAVE_LC_MESSAGES
   setlocale (LC_MESSAGES, "");
 #endif
-#if defined (HAVE_SETLOCALE)
   setlocale (LC_CTYPE, "");
-#endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
@@ -1387,7 +1372,7 @@ main (int argc, char ** argv)
   dwarf2_init ();
 
   local_symbol_make (".gasversion.", absolute_section,
-                    BFD_VERSION / 10000UL, &predefined_address_frag);
+                    &predefined_address_frag, BFD_VERSION / 10000UL);
 
   /* Now that we have fully initialized, and have created the output
      file, define any symbols requested by --defsym command line
@@ -1397,8 +1382,8 @@ main (int argc, char ** argv)
       symbolS *sym;
       struct defsym_list *next;
 
-      sym = symbol_new (defsyms->name, absolute_section, defsyms->value,
-                       &zero_address_frag);
+      sym = symbol_new (defsyms->name, absolute_section,
+                       &zero_address_frag, defsyms->value);
       /* Make symbols defined on the command line volatile, so that they
         can be redefined inside a source file.  This makes this assembler's
         behaviour compatible with earlier versions, but it may not be