arc: Construct disassembler options dynamically

[deliverable/binutils-gdb.git] / binutils / addr2line.c

diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 817b125f634087c2fca2c45b6e9cacce19d3e9f6..5b02a67567bea56d54fcdf665183686f9022312a 100644 (file)
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -1,5 +1,5 @@
 /* addr2line.c -- convert addresses to line number and function name
-   Copyright (C) 1997-2018 Free Software Foundation, Inc.
+   Copyright (C) 1997-2021 Free Software Foundation, Inc.
    Contributed by Ulrich Lauther <Ulrich.Lauther@mchp.siemens.de>
 
    This file is part of GNU Binutils.
@@ -38,12 +38,12 @@
 #include "bucomm.h"
 #include "elf-bfd.h"
 
-static bfd_boolean unwind_inlines;     /* -i, unwind inlined functions. */
-static bfd_boolean with_addresses;     /* -a, show addresses.  */
-static bfd_boolean with_functions;     /* -f, show function names.  */
-static bfd_boolean do_demangle;                /* -C, demangle names.  */
-static bfd_boolean pretty_print;       /* -p, print on one line.  */
-static bfd_boolean base_names;         /* -s, strip directory names.  */
+static bool unwind_inlines;    /* -i, unwind inlined functions. */
+static bool with_addresses;    /* -a, show addresses.  */
+static bool with_functions;    /* -f, show function names.  */
+static bool do_demangle;       /* -C, demangle names.  */
+static bool pretty_print;      /* -p, print on one line.  */
+static bool base_names;                /* -s, strip directory names.  */
 
 /* Flags passed to the name demangler.  */
 static int demangle_flags = DMGL_PARAMS | DMGL_ANSI;
@@ -117,7 +117,7 @@ slurp_symtab (bfd *abfd)
 {
   long storage;
   long symcount;
-  bfd_boolean dynamic = FALSE;
+  bool dynamic = false;
 
   if ((bfd_get_file_flags (abfd) & HAS_SYMS) == 0)
     return;
@@ -126,7 +126,7 @@ slurp_symtab (bfd *abfd)
   if (storage == 0)
     {
       storage = bfd_get_dynamic_symtab_upper_bound (abfd);
-      dynamic = TRUE;
+      dynamic = true;
     }
   if (storage < 0)
     bfd_fatal (bfd_get_filename (abfd));
@@ -167,7 +167,7 @@ static const char *filename;
 static const char *functionname;
 static unsigned int line;
 static unsigned int discriminator;
-static bfd_boolean found;
+static bool found;
 
 /* Look for an address in a section.  This is called via
    bfd_map_over_sections.  */
@@ -182,14 +182,14 @@ find_address_in_section (bfd *abfd, asection *section,
   if (found)
     return;
 
-  if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0)
+  if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
     return;
 
-  vma = bfd_get_section_vma (abfd, section);
+  vma = bfd_section_vma (section);
   if (pc < vma)
     return;
 
-  size = bfd_get_section_size (section);
+  size = bfd_section_size (section);
   if (pc >= vma + size)
     return;
 
@@ -208,10 +208,10 @@ find_offset_in_section (bfd *abfd, asection *section)
   if (found)
     return;
 
-  if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0)
+  if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
     return;
 
-  size = bfd_get_section_size (section);
+  size = bfd_section_size (section);
   if (pc >= size)
     return;
 
@@ -267,7 +267,7 @@ translate_addresses (bfd *abfd, asection *section)
             printf ("\n");
         }
 
-      found = FALSE;
+      found = false;
       if (section)
        find_offset_in_section (abfd, section);
       else
@@ -314,8 +314,7 @@ translate_addresses (bfd *abfd, asection *section)
                   else
                     printf ("\n");
 
-                  if (alloc != NULL)
-                    free (alloc);
+                 free (alloc);
                 }
 
               if (base_names && filename != NULL)
@@ -338,7 +337,7 @@ translate_addresses (bfd *abfd, asection *section)
              else
                printf ("?\n");
               if (!unwind_inlines)
-                found = FALSE;
+                found = false;
               else
                 found = bfd_find_inliner_info (abfd, &filename, &functionname,
                                               &line);
@@ -410,11 +409,8 @@ process_file (const char *file_name, const char *section_name,
 
   translate_addresses (abfd, section);
 
-  if (syms != NULL)
-    {
-      free (syms);
-      syms = NULL;
-    }
+  free (syms);
+  syms = NULL;
 
   bfd_close (abfd);
 
@@ -429,12 +425,10 @@ main (int argc, char **argv)
   char *target;
   int c;
 
-#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);
 
@@ -459,13 +453,13 @@ main (int argc, char **argv)
        case 0:
          break;                /* We've been given a long option.  */
        case 'a':
-         with_addresses = TRUE;
+         with_addresses = true;
          break;
        case 'b':
          target = optarg;
          break;
        case 'C':
-         do_demangle = TRUE;
+         do_demangle = true;
          if (optarg != NULL)
            {
              enum demangling_styles style;
@@ -488,13 +482,13 @@ main (int argc, char **argv)
          file_name = optarg;
          break;
        case 's':
-         base_names = TRUE;
+         base_names = true;
          break;
        case 'f':
-         with_functions = TRUE;
+         with_functions = true;
          break;
         case 'p':
-          pretty_print = TRUE;
+          pretty_print = true;
           break;
        case 'v':
        case 'V':
@@ -505,7 +499,7 @@ main (int argc, char **argv)
          usage (stdout, 0);
          break;
        case 'i':
-         unwind_inlines = TRUE;
+         unwind_inlines = true;
          break;
        case 'j':
          section_name = optarg;