[binutils-gdb] Use bool in binutils

Alan Modra amodra@sourceware.org
Wed Mar 31 00:36:09 GMT 2021


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=015dc7e1f8a971692a910e6cfc64faf9216e75c3

commit 015dc7e1f8a971692a910e6cfc64faf9216e75c3
Author: Alan Modra <amodra@gmail.com>
Date:   Wed Mar 31 10:39:37 2021 +1030

    Use bool in binutils
    
            * sysdep.h (POISON_BFD_BOOLEAN): Define.
            * addr2line.c, * ar.c, * arsup.c, * bfdtest2.c, * binemul.c,
            * binemul.h, * bucomm.c, * bucomm.h, * budbg.h, * coffgrok.c,
            * debug.c, * debug.h, * dlltool.c, * dwarf.c, * dwarf.h,
            * elfedit.c, * emul_aix.c, * mclex.c, * nm.c, * objcopy.c,
            * objdump.c, * od-macho.c, * prdbg.c, * rdcoff.c, * rddbg.c,
            * readelf.c, * rename.c, * stabs.c, * strings.c, * windint.h,
            * windmc.c, * windmc.h, * windres.c, * winduni.c,
            * wrstabs.c: Replace bfd_boolean with bool, FALSE with false,
            and TRUE with true throughout.

Diff:
---
 binutils/ChangeLog   |   13 +
 binutils/addr2line.c |   34 +-
 binutils/ar.c        |   70 +--
 binutils/arsup.c     |    8 +-
 binutils/bfdtest2.c  |    6 +-
 binutils/binemul.c   |   62 +--
 binutils/binemul.h   |   34 +-
 binutils/bucomm.c    |   10 +-
 binutils/bucomm.h    |    6 +-
 binutils/budbg.h     |   16 +-
 binutils/coffgrok.c  |    4 +-
 binutils/debug.c     |  388 ++++++-------
 binutils/debug.h     |  181 +++----
 binutils/dlltool.c   |   86 +--
 binutils/dwarf.c     |  360 ++++++------
 binutils/dwarf.h     |   32 +-
 binutils/elfedit.c   |    8 +-
 binutils/emul_aix.c  |   56 +-
 binutils/mclex.c     |   12 +-
 binutils/nm.c        |   52 +-
 binutils/objcopy.c   |  479 ++++++++--------
 binutils/objdump.c   |  410 +++++++-------
 binutils/od-macho.c  |   18 +-
 binutils/prdbg.c     |  853 +++++++++++++++--------------
 binutils/rdcoff.c    |  138 ++---
 binutils/rddbg.c     |   54 +-
 binutils/readelf.c   | 1477 +++++++++++++++++++++++++-------------------------
 binutils/rename.c    |    2 +-
 binutils/stabs.c     | 1012 +++++++++++++++++-----------------
 binutils/strings.c   |   70 +--
 binutils/sysdep.h    |    2 +
 binutils/windint.h   |    2 +-
 binutils/windmc.c    |    2 +-
 binutils/windmc.h    |    6 +-
 binutils/windres.c   |    6 +-
 binutils/winduni.c   |    2 +-
 binutils/wrstabs.c   |  514 +++++++++---------
 37 files changed, 3241 insertions(+), 3244 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index aa7d9d80722..f068a1ddcb6 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,16 @@
+2021-03-31  Alan Modra  <amodra@gmail.com>
+
+	* sysdep.h (POISON_BFD_BOOLEAN): Define.
+	* addr2line.c, * ar.c, * arsup.c, * bfdtest2.c, * binemul.c,
+	* binemul.h, * bucomm.c, * bucomm.h, * budbg.h, * coffgrok.c,
+	* debug.c, * debug.h, * dlltool.c, * dwarf.c, * dwarf.h,
+	* elfedit.c, * emul_aix.c, * mclex.c, * nm.c, * objcopy.c,
+	* objdump.c, * od-macho.c, * prdbg.c, * rdcoff.c, * rddbg.c,
+	* readelf.c, * rename.c, * stabs.c, * strings.c, * windint.h,
+	* windmc.c, * windmc.h, * windres.c, * winduni.c,
+	* wrstabs.c: Replace bfd_boolean with bool, FALSE with false,
+	and TRUE with true throughout.
+
 2021-03-31  Alan Modra  <amodra@gmail.com>
 
 	* coffdump.c: Include stdint.h in place of bfd_stdint.h.
diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index a211113470d..578c64adbd1 100644
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -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.  */
@@ -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
@@ -337,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);
@@ -455,13 +455,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;
@@ -484,13 +484,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':
@@ -501,7 +501,7 @@ main (int argc, char **argv)
 	  usage (stdout, 0);
 	  break;
 	case 'i':
-	  unwind_inlines = TRUE;
+	  unwind_inlines = true;
 	  break;
 	case 'j':
 	  section_name = optarg;
diff --git a/binutils/ar.c b/binutils/ar.c
index fb19b14fec5..71bbde65ed6 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -54,7 +54,7 @@ static void delete_members (bfd *, char **files_to_delete);
 
 static void move_members (bfd *, char **files_to_move);
 static void replace_members
-  (bfd *, char **files_to_replace, bfd_boolean quick);
+  (bfd *, char **files_to_replace, bool quick);
 static void print_descr (bfd * abfd);
 static void write_archive (bfd *);
 static int  ranlib_only (const char *archname);
@@ -124,19 +124,19 @@ get_pos_bfd (bfd **, enum pos, const char *);
 
 /* For extract/delete only.  If COUNTED_NAME_MODE is TRUE, we only
    extract the COUNTED_NAME_COUNTER instance of that name.  */
-static bfd_boolean counted_name_mode = 0;
+static bool counted_name_mode = 0;
 static int counted_name_counter = 0;
 
 /* Whether to truncate names of files stored in the archive.  */
-static bfd_boolean ar_truncate = FALSE;
+static bool ar_truncate = false;
 
 /* Whether to use a full file name match when searching an archive.
    This is convenient for archives created by the Microsoft lib
    program.  */
-static bfd_boolean full_pathname = FALSE;
+static bool full_pathname = false;
 
 /* Whether to create a "thin" archive (symbol index only -- no files).  */
-static bfd_boolean make_thin_archive = FALSE;
+static bool make_thin_archive = false;
 
 #define LIBDEPS	"__.LIBDEP"
 /* Text to store in the __.LIBDEP archive element for the linker to use.  */
@@ -215,7 +215,7 @@ map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count)
 
   for (; count > 0; files++, count--)
     {
-      bfd_boolean found = FALSE;
+      bool found = false;
 
       match_count = 0;
       for (head = arch->archive_next; head; head = head->archive_next)
@@ -257,7 +257,7 @@ map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count)
 		  continue;
 		}
 
-	      found = TRUE;
+	      found = true;
 	      function (head);
 	      head->archive_pass = 1;
 	      /* PR binutils/15796: Once a file has been matched, do not
@@ -275,7 +275,7 @@ map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count)
     }
 }
 
-bfd_boolean operation_alters_arch = FALSE;
+bool operation_alters_arch = false;
 
 static void
 usage (int help)
@@ -519,22 +519,22 @@ decode_options (int argc, char **argv)
 	  break;
         case 'd':
           operation = del;
-          operation_alters_arch = TRUE;
+          operation_alters_arch = true;
           break;
         case 'm':
           operation = move;
-          operation_alters_arch = TRUE;
+          operation_alters_arch = true;
           break;
         case 'p':
           operation = print_files;
           break;
         case 'q':
           operation = quick_append;
-          operation_alters_arch = TRUE;
+          operation_alters_arch = true;
           break;
         case 'r':
           operation = replace;
-          operation_alters_arch = TRUE;
+          operation_alters_arch = true;
           break;
         case 't':
           operation = print_table;
@@ -557,7 +557,7 @@ decode_options (int argc, char **argv)
           display_offsets = 1;
           break;
         case 'V':
-          show_version = TRUE;
+          show_version = true;
           break;
         case 's':
           write_armap = 1;
@@ -584,22 +584,22 @@ decode_options (int argc, char **argv)
           mri_mode = 1;
           break;
         case 'N':
-          counted_name_mode = TRUE;
+          counted_name_mode = true;
           break;
         case 'f':
-          ar_truncate = TRUE;
+          ar_truncate = true;
           break;
         case 'P':
-          full_pathname = TRUE;
+          full_pathname = true;
           break;
         case 'T':
-          make_thin_archive = TRUE;
+          make_thin_archive = true;
           break;
         case 'D':
-          deterministic = TRUE;
+          deterministic = true;
           break;
         case 'U':
-          deterministic = FALSE;
+          deterministic = false;
           break;
 	case OPTION_PLUGIN:
 #if BFD_SUPPORTS_PLUGINS
@@ -650,7 +650,7 @@ static void
 ranlib_main (int argc, char **argv)
 {
   int arg_index, status = 0;
-  bfd_boolean touch = FALSE;
+  bool touch = false;
   int c;
 
   while ((c = getopt_long (argc, argv, "DhHUvVt", long_options, NULL)) != EOF)
@@ -658,17 +658,17 @@ ranlib_main (int argc, char **argv)
       switch (c)
         {
 	case 'D':
-	  deterministic = TRUE;
+	  deterministic = true;
 	  break;
         case 'U':
-          deterministic = FALSE;
+          deterministic = false;
           break;
 	case 'h':
 	case 'H':
 	  show_help = 1;
 	  break;
 	case 't':
-	  touch = TRUE;
+	  touch = true;
 	  break;
 	case 'v':
 	case 'V':
@@ -1292,7 +1292,7 @@ write_archive (bfd *iarch)
     obfd->flags |= BFD_ARCHIVE_FULL_PATH;
 
   if (make_thin_archive || bfd_is_thin_archive (iarch))
-    bfd_set_thin_archive (obfd, TRUE);
+    bfd_set_thin_archive (obfd, true);
 
   if (!bfd_set_archive_head (obfd, contents_head))
     bfd_fatal (old_name);
@@ -1307,7 +1307,7 @@ write_archive (bfd *iarch)
   /* We don't care if this fails; we might be creating the archive.  */
   bfd_close (iarch);
 
-  if (smart_rename (new_name, old_name, tmpfd, NULL, FALSE) != 0)
+  if (smart_rename (new_name, old_name, tmpfd, NULL, false) != 0)
     xexit (1);
   free (old_name);
   free (new_name);
@@ -1357,8 +1357,8 @@ static void
 delete_members (bfd *arch, char **files_to_delete)
 {
   bfd **current_ptr_ptr;
-  bfd_boolean found;
-  bfd_boolean something_changed = FALSE;
+  bool found;
+  bool something_changed = false;
   int match_count;
 
   for (; *files_to_delete != NULL; ++files_to_delete)
@@ -1371,12 +1371,12 @@ delete_members (bfd *arch, char **files_to_delete)
 
       if (!strcmp (*files_to_delete, "__.SYMDEF"))
 	{
-	  arch->has_armap = FALSE;
+	  arch->has_armap = false;
 	  write_armap = -1;
 	  continue;
 	}
 
-      found = FALSE;
+      found = false;
       match_count = 0;
       current_ptr_ptr = &(arch->archive_next);
       while (*current_ptr_ptr)
@@ -1393,8 +1393,8 @@ delete_members (bfd *arch, char **files_to_delete)
 		}
 	      else
 		{
-		  found = TRUE;
-		  something_changed = TRUE;
+		  found = true;
+		  something_changed = true;
 		  if (verbose)
 		    printf ("d - %s\n",
 			    *files_to_delete);
@@ -1471,9 +1471,9 @@ move_members (bfd *arch, char **files_to_move)
 /* Ought to default to replacing in place, but this is existing practice!  */
 
 static void
-replace_members (bfd *arch, char **files_to_move, bfd_boolean quick)
+replace_members (bfd *arch, char **files_to_move, bool quick)
 {
-  bfd_boolean changed = FALSE;
+  bool changed = false;
   bfd **after_bfd;		/* New entries go after this one.  */
   bfd *current;
   bfd **current_ptr;
@@ -1493,7 +1493,7 @@ replace_members (bfd *arch, char **files_to_move, bfd_boolean quick)
 				normalize (bfd_get_filename (current), arch)) == 0
 		  && current->arelt_data != NULL)
 		{
-		  bfd_boolean replaced;
+		  bool replaced;
 		  if (newer_only)
 		    {
 		      struct stat fsbuf, asbuf;
@@ -1531,7 +1531,7 @@ replace_members (bfd *arch, char **files_to_move, bfd_boolean quick)
 		    {
 		      /* Snip out this entry from the chain.  */
 		      *current_ptr = (*current_ptr)->archive_next;
-		      changed = TRUE;
+		      changed = true;
 		    }
 
 		  goto next_file;
diff --git a/binutils/arsup.c b/binutils/arsup.c
index 9982484dbe0..5cf34e2c112 100644
--- a/binutils/arsup.c
+++ b/binutils/arsup.c
@@ -74,7 +74,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
 	 want to hack multiple references.  */
       for (ptr = list; ptr; ptr = ptr->next)
 	{
-	  bfd_boolean found = FALSE;
+	  bool found = false;
 	  bfd *prev = arch;
 
 	  for (head = arch->archive_next; head; head = head->archive_next)
@@ -82,7 +82,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
 	      if (bfd_get_filename (head) != NULL
 		  && FILENAME_CMP (ptr->name, bfd_get_filename (head)) == 0)
 		{
-		  found = TRUE;
+		  found = true;
 		  function (head, prev);
 		}
 	      prev = head;
@@ -98,7 +98,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
 static void
 ar_directory_doer (bfd *abfd, bfd *ignore ATTRIBUTE_UNUSED)
 {
-  print_arelt_descr(outfile, abfd, verbose, FALSE);
+  print_arelt_descr(outfile, abfd, verbose, false);
 }
 
 void
@@ -364,7 +364,7 @@ ar_save (void)
 	    }
 	}
 
-      smart_rename (temp_name, real_name, temp_fd, NULL, FALSE);
+      smart_rename (temp_name, real_name, temp_fd, NULL, false);
       obfd = 0;
       free (temp_name);
       free (real_name);
diff --git a/binutils/bfdtest2.c b/binutils/bfdtest2.c
index 48fcb511a1e..b33fc711430 100644
--- a/binutils/bfdtest2.c
+++ b/binutils/bfdtest2.c
@@ -53,13 +53,13 @@ iovec_stat (struct bfd *abfd ATTRIBUTE_UNUSED,
   return fstat (fileno ((FILE*) stream), sb);
 }
 
-static bfd_boolean
+static bool
 check_format_any (struct bfd *abfd, bfd_format format)
 {
   char** targets = NULL;
 
   if (bfd_check_format_matches (abfd, format, &targets))
-    return TRUE;
+    return true;
 
   if (targets)
     {
@@ -68,7 +68,7 @@ check_format_any (struct bfd *abfd, bfd_format format)
       return bfd_check_format (abfd, format);
     }
 
-  return FALSE;
+  return false;
 }
 
 int
diff --git a/binutils/binemul.c b/binutils/binemul.c
index 4c9c6692359..baa78f40e72 100644
--- a/binutils/binemul.c
+++ b/binutils/binemul.c
@@ -38,9 +38,9 @@ ar_emul_default_usage (FILE *fp)
   fprintf (fp, _("  No emulation specific options\n"));
 }
 
-bfd_boolean
+bool
 ar_emul_append (bfd **after_bfd, char *file_name, const char *target,
-		bfd_boolean verbose, bfd_boolean flatten)
+		bool verbose, bool flatten)
 {
   bfd *new_bfd;
 
@@ -50,45 +50,45 @@ ar_emul_append (bfd **after_bfd, char *file_name, const char *target,
     return bin_dummy_emulation.ar_append (after_bfd, new_bfd,
 					  verbose, flatten);
 
-  return FALSE;
+  return false;
 }
 
-bfd_boolean
+bool
 ar_emul_append_bfd (bfd **after_bfd, bfd *new_bfd,
-		bfd_boolean verbose, bfd_boolean flatten)
+		bool verbose, bool flatten)
 {
   if (bin_dummy_emulation.ar_append)
     return bin_dummy_emulation.ar_append (after_bfd, new_bfd,
 					  verbose, flatten);
 
-  return FALSE;
+  return false;
 }
 
-static bfd_boolean
+static bool
 any_ok (bfd *new_bfd ATTRIBUTE_UNUSED)
 {
-  return TRUE;
+  return true;
 }
 
-bfd_boolean
+bool
 do_ar_emul_append (bfd **after_bfd, bfd *new_bfd,
-		   bfd_boolean verbose, bfd_boolean flatten,
-		   bfd_boolean (*check) (bfd *))
+		   bool verbose, bool flatten,
+		   bool (*check) (bfd *))
 {
   /* When flattening, add the members of an archive instead of the
      archive itself.  */
   if (flatten && bfd_check_format (new_bfd, bfd_archive))
     {
       bfd *elt;
-      bfd_boolean added = FALSE;
+      bool added = false;
 
       for (elt = bfd_openr_next_archived_file (new_bfd, NULL);
            elt;
            elt = bfd_openr_next_archived_file (new_bfd, elt))
         {
-          if (do_ar_emul_append (after_bfd, elt, verbose, TRUE, check))
+          if (do_ar_emul_append (after_bfd, elt, verbose, true, check))
             {
-              added = TRUE;
+              added = true;
               after_bfd = &((*after_bfd)->archive_next);
             }
         }
@@ -97,26 +97,26 @@ do_ar_emul_append (bfd **after_bfd, bfd *new_bfd,
     }
 
   if (!check (new_bfd))
-    return FALSE;
+    return false;
 
   AR_EMUL_APPEND_PRINT_VERBOSE (verbose, bfd_get_filename (new_bfd));
 
   new_bfd->archive_next = *after_bfd;
   *after_bfd = new_bfd;
 
-  return TRUE;
+  return true;
 }
 
-bfd_boolean
+bool
 ar_emul_default_append (bfd **after_bfd, bfd *new_bfd,
-			bfd_boolean verbose, bfd_boolean flatten)
+			bool verbose, bool flatten)
 {
   return do_ar_emul_append (after_bfd, new_bfd, verbose, flatten, any_ok);
 }
 
-bfd_boolean
+bool
 ar_emul_replace (bfd **after_bfd, char *file_name, const char *target,
-		 bfd_boolean verbose)
+		 bool verbose)
 {
   bfd *new_bfd;
 
@@ -127,43 +127,43 @@ ar_emul_replace (bfd **after_bfd, char *file_name, const char *target,
     return bin_dummy_emulation.ar_replace (after_bfd, new_bfd,
 					   verbose);
 
-  return FALSE;
+  return false;
 }
 
-bfd_boolean
+bool
 ar_emul_replace_bfd (bfd **after_bfd, bfd *new_bfd,
-		 bfd_boolean verbose)
+		 bool verbose)
 {
   if (bin_dummy_emulation.ar_replace)
     return bin_dummy_emulation.ar_replace (after_bfd, new_bfd,
 					   verbose);
 
-  return FALSE;
+  return false;
 }
 
-bfd_boolean
+bool
 ar_emul_default_replace (bfd **after_bfd, bfd *new_bfd,
-			 bfd_boolean verbose)
+			 bool verbose)
 {
   AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, bfd_get_filename (new_bfd));
 
   new_bfd->archive_next = *after_bfd;
   *after_bfd = new_bfd;
 
-  return TRUE;
+  return true;
 }
 
-bfd_boolean
+bool
 ar_emul_parse_arg (char *arg)
 {
   if (bin_dummy_emulation.ar_parse_arg)
     return bin_dummy_emulation.ar_parse_arg (arg);
 
-  return FALSE;
+  return false;
 }
 
-bfd_boolean
+bool
 ar_emul_default_parse_arg (char *arg ATTRIBUTE_UNUSED)
 {
-  return FALSE;
+  return false;
 }
diff --git a/binutils/binemul.h b/binutils/binemul.h
index c0d5db041ed..c15260fe97e 100644
--- a/binutils/binemul.h
+++ b/binutils/binemul.h
@@ -28,23 +28,15 @@
 
 extern void ar_emul_usage (FILE *);
 extern void ar_emul_default_usage (FILE *);
-extern bfd_boolean ar_emul_append (bfd **, char *, const char *,
-				   bfd_boolean, bfd_boolean);
-extern bfd_boolean ar_emul_append_bfd (bfd **, bfd *,
-				       bfd_boolean, bfd_boolean);
-extern bfd_boolean ar_emul_default_append (bfd **, bfd *,
-					   bfd_boolean, bfd_boolean);
-extern bfd_boolean do_ar_emul_append (bfd **, bfd *,
-				      bfd_boolean, bfd_boolean,
-				      bfd_boolean (*)(bfd *));
-extern bfd_boolean ar_emul_replace (bfd **, char *, const char *,
-				    bfd_boolean);
-extern bfd_boolean ar_emul_replace_bfd (bfd **, bfd *,
-					bfd_boolean);
-extern bfd_boolean ar_emul_default_replace (bfd **, bfd *,
-					    bfd_boolean);
-extern bfd_boolean ar_emul_parse_arg (char *);
-extern bfd_boolean ar_emul_default_parse_arg (char *);
+extern bool ar_emul_append (bfd **, char *, const char *, bool, bool);
+extern bool ar_emul_append_bfd (bfd **, bfd *, bool, bool);
+extern bool ar_emul_default_append (bfd **, bfd *, bool, bool);
+extern bool do_ar_emul_append (bfd **, bfd *, bool, bool, bool (*)(bfd *));
+extern bool ar_emul_replace (bfd **, char *, const char *, bool);
+extern bool ar_emul_replace_bfd (bfd **, bfd *, bool);
+extern bool ar_emul_default_replace (bfd **, bfd *, bool);
+extern bool ar_emul_parse_arg (char *);
+extern bool ar_emul_default_parse_arg (char *);
 
 /* Macros for common output.  */
 
@@ -64,10 +56,10 @@ extern bfd_boolean ar_emul_default_parse_arg (char *);
 typedef struct bin_emulation_xfer_struct
 {
   /* Print out the extra options.  */
-  void (* ar_usage) (FILE *fp);
-  bfd_boolean (* ar_append) (bfd **, bfd *, bfd_boolean, bfd_boolean);
-  bfd_boolean (* ar_replace) (bfd **, bfd *, bfd_boolean);
-  bfd_boolean (* ar_parse_arg) (char *);
+  void (*ar_usage) (FILE *fp);
+  bool (*ar_append) (bfd **, bfd *, bool, bool);
+  bool (*ar_replace) (bfd **, bfd *, bool);
+  bool (*ar_parse_arg) (char *);
 }
 bin_emulation_xfer_type;
 
diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index a834ab1170e..5a3eab62f98 100644
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -435,7 +435,7 @@ display_info (void)
    Mode       User\tGroup\tSize\tDate               Name */
 
 void
-print_arelt_descr (FILE *file, bfd *abfd, bfd_boolean verbose, bfd_boolean offsets)
+print_arelt_descr (FILE *file, bfd *abfd, bool verbose, bool offsets)
 {
   struct stat buf;
 
@@ -677,18 +677,18 @@ bfd_get_archive_filename (const bfd *abfd)
    is valid for writing.  For security reasons absolute paths
    and paths containing /../ are not allowed.  See PR 17533.  */
 
-bfd_boolean
+bool
 is_valid_archive_path (char const * pathname)
 {
   const char * n = pathname;
 
   if (IS_ABSOLUTE_PATH (n))
-    return FALSE;
+    return false;
 
   while (*n)
     {
       if (*n == '.' && *++n == '.' && ( ! *++n || IS_DIR_SEPARATOR (*n)))
-	return FALSE;
+	return false;
 
       while (*n && ! IS_DIR_SEPARATOR (*n))
 	n++;
@@ -696,5 +696,5 @@ is_valid_archive_path (char const * pathname)
 	n++;
     }
 
-  return TRUE;
+  return true;
 }
diff --git a/binutils/bucomm.h b/binutils/bucomm.h
index f1ae47fa1b5..78f61762cac 100644
--- a/binutils/bucomm.h
+++ b/binutils/bucomm.h
@@ -49,7 +49,7 @@ void list_supported_architectures (const char *, FILE *);
 
 int display_info (void);
 
-void print_arelt_descr (FILE *, bfd *, bfd_boolean, bfd_boolean);
+void print_arelt_descr (FILE *, bfd *, bool, bool);
 
 char *make_tempname (const char *, int *);
 char *make_tempdir (const char *);
@@ -58,7 +58,7 @@ bfd_vma parse_vma (const char *, const char *);
 
 off_t get_file_size (const char *);
 
-bfd_boolean is_valid_archive_path (char const *);
+bool is_valid_archive_path (char const *);
 
 extern char *program_name;
 
@@ -72,7 +72,7 @@ extern void print_version (const char *);
 extern void set_times (const char *, const struct stat *);
 
 extern int smart_rename (const char *, const char *, int,
-			 struct stat *, bfd_boolean);
+			 struct stat *, bool);
 
 
 /* In libiberty.  */
diff --git a/binutils/budbg.h b/binutils/budbg.h
index a88107aea72..a426a1f6178 100644
--- a/binutils/budbg.h
+++ b/binutils/budbg.h
@@ -24,28 +24,28 @@
 
 /* Routine used to read generic debugging information.  */
 
-extern void *read_debugging_info (bfd *, asymbol **, long, bfd_boolean);
+extern void *read_debugging_info (bfd *, asymbol **, long, bool);
 
 /* Routine used to print generic debugging information.  */
 
-extern bfd_boolean print_debugging_info
+extern bool print_debugging_info
   (FILE *, void *, bfd *, asymbol **,
-   char * (*) (struct bfd *, const char *, int), bfd_boolean);
+   char * (*) (struct bfd *, const char *, int), bool);
 
 /* Routines used to read and write stabs information.  */
 
-extern void *start_stab (void *, bfd *, bfd_boolean, asymbol **, long);
+extern void *start_stab (void *, bfd *, bool, asymbol **, long);
 
-extern bfd_boolean finish_stab (void *, void *);
+extern bool finish_stab (void *, void *);
 
-extern bfd_boolean parse_stab
+extern bool parse_stab
   (void *, void *, int, int, bfd_vma, const char *);
 
-extern bfd_boolean write_stabs_in_sections_debugging_info
+extern bool write_stabs_in_sections_debugging_info
   (bfd *, void *, bfd_byte **, bfd_size_type *, bfd_byte **, bfd_size_type *);
 
 /* Routine used to read COFF debugging information.  */
 
-extern bfd_boolean parse_coff (bfd *, asymbol **, long, void *);
+extern bool parse_coff (bfd *, asymbol **, long, void *);
 
 #endif
diff --git a/binutils/coffgrok.c b/binutils/coffgrok.c
index 7b8dcf61b56..e3882544b06 100644
--- a/binutils/coffgrok.c
+++ b/binutils/coffgrok.c
@@ -720,7 +720,7 @@ static struct coff_ofile *
 doit (void)
 {
   unsigned int i;
-  bfd_boolean infile = FALSE;
+  bool infile = false;
   struct coff_ofile *head =
     (struct coff_ofile *) xmalloc (sizeof (struct coff_ofile));
 
@@ -753,7 +753,7 @@ doit (void)
 	    if (infile)
 	      pop_scope ();
 	    else
-	      infile = TRUE;
+	      infile = true;
 
 	    push_scope (1);
 	    file_scope = n->scope = top_scope;
diff --git a/binutils/debug.c b/binutils/debug.c
index b49aef5c1a7..93887374d15 100644
--- a/binutils/debug.c
+++ b/binutils/debug.c
@@ -111,7 +111,7 @@ struct debug_type_s
       struct debug_indirect_type *kindirect;
       /* DEBUG_KIND_INT.  */
       /* Whether the integer is unsigned.  */
-      bfd_boolean kint;
+      bool kint;
       /* DEBUG_KIND_STRUCT, DEBUG_KIND_UNION, DEBUG_KIND_CLASS,
          DEBUG_KIND_UNION_CLASS.  */
       struct debug_class_type *kclass;
@@ -194,7 +194,7 @@ struct debug_function_type
   /* NULL terminated array of argument types.  */
   debug_type *arg_types;
   /* Whether the function takes a variable number of arguments.  */
-  bfd_boolean varargs;
+  bool varargs;
 };
 
 /* Information kept for a range.  */
@@ -222,7 +222,7 @@ struct debug_array_type
   /* Upper bound.  */
   bfd_signed_vma upper;
   /* Whether this array is really a string.  */
-  bfd_boolean stringp;
+  bool stringp;
 };
 
 /* Information kept for a set.  */
@@ -232,7 +232,7 @@ struct debug_set_type
   /* Base type.  */
   debug_type type;
   /* Whether this set is really a bitstring.  */
-  bfd_boolean bitstringp;
+  bool bitstringp;
 };
 
 /* Information kept for an offset type (a based pointer).  */
@@ -256,7 +256,7 @@ struct debug_method_type
   /* A NULL terminated array of argument types.  */
   debug_type *arg_types;
   /* Whether the method takes a variable number of arguments.  */
-  bfd_boolean varargs;
+  bool varargs;
 };
 
 /* Information kept for a named type.  */
@@ -280,7 +280,7 @@ struct debug_field_s
   /* Visibility of the field.  */
   enum debug_visibility visibility;
   /* Whether this is a static member.  */
-  bfd_boolean static_member;
+  bool static_member;
   union
     {
       /* If static_member is false.  */
@@ -308,7 +308,7 @@ struct debug_baseclass_s
   /* Bit position of the base class in the object.  */
   unsigned int bitpos;
   /* Whether the base class is virtual.  */
-  bfd_boolean is_virtual;
+  bool is_virtual;
   /* Visibility of the base class.  */
   enum debug_visibility visibility;
 };
@@ -335,9 +335,9 @@ struct debug_method_variant_s
   /* The visibility of the function.  */
   enum debug_visibility visibility;
   /* Whether the function is const.  */
-  bfd_boolean constp;
+  bool constp;
   /* Whether the function is volatile.  */
-  bfd_boolean volatilep;
+  bool volatilep;
   /* The offset to the function in the virtual function table.  */
   bfd_vma voffset;
   /* If voffset is VOFFSET_STATIC_METHOD, this is a static method.  */
@@ -565,28 +565,28 @@ static struct debug_type_s *debug_make_type
   (struct debug_handle *, enum debug_type_kind, unsigned int);
 static struct debug_type_s *debug_get_real_type
   (void *, debug_type, struct debug_type_real_list *);
-static bfd_boolean debug_write_name
+static bool debug_write_name
   (struct debug_handle *, const struct debug_write_fns *, void *,
    struct debug_name *);
-static bfd_boolean debug_write_type
+static bool debug_write_type
   (struct debug_handle *, const struct debug_write_fns *, void *,
    struct debug_type_s *, struct debug_name *);
-static bfd_boolean debug_write_class_type
+static bool debug_write_class_type
   (struct debug_handle *, const struct debug_write_fns *, void *,
    struct debug_type_s *, const char *);
-static bfd_boolean debug_write_function
+static bool debug_write_function
   (struct debug_handle *, const struct debug_write_fns *, void *,
    const char *, enum debug_object_linkage, struct debug_function *);
-static bfd_boolean debug_write_block
+static bool debug_write_block
   (struct debug_handle *, const struct debug_write_fns *, void *,
    struct debug_block *);
-static bfd_boolean debug_write_linenos
+static bool debug_write_linenos
   (struct debug_handle *, const struct debug_write_fns *, void *, bfd_vma);
-static bfd_boolean debug_set_class_id
+static bool debug_set_class_id
   (struct debug_handle *, const char *, struct debug_type_s *);
-static bfd_boolean debug_type_samep
+static bool debug_type_samep
   (struct debug_handle *, struct debug_type_s *, struct debug_type_s *);
-static bfd_boolean debug_class_type_samep
+static bool debug_class_type_samep
   (struct debug_handle *, struct debug_type_s *, struct debug_type_s *);
 
 /* Issue an error message.  */
@@ -671,7 +671,7 @@ debug_init (void)
 /* Set the source filename.  This implicitly starts a new compilation
    unit.  */
 
-bfd_boolean
+bool
 debug_set_filename (void *handle, const char *name)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -706,13 +706,13 @@ debug_set_filename (void *handle, const char *name)
   info->current_block = NULL;
   info->current_lineno = NULL;
 
-  return TRUE;
+  return true;
 }
 
 /* Change source files to the given file name.  This is used for
    include files in a single compilation unit.  */
 
-bfd_boolean
+bool
 debug_start_source (void *handle, const char *name)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -724,7 +724,7 @@ debug_start_source (void *handle, const char *name)
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_start_source: no debug_set_filename call"));
-      return FALSE;
+      return false;
     }
 
   for (f = info->current_unit->files; f != NULL; f = f->next)
@@ -732,7 +732,7 @@ debug_start_source (void *handle, const char *name)
       if (filename_cmp (f->filename, name) == 0)
 	{
 	  info->current_file = f;
-	  return TRUE;
+	  return true;
 	}
     }
 
@@ -749,7 +749,7 @@ debug_start_source (void *handle, const char *name)
 
   info->current_file = f;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a function definition.  This implicitly starts a function
@@ -760,9 +760,9 @@ debug_start_source (void *handle, const char *name)
    debug_record_parameter.  FIXME: There is no way to specify nested
    functions.  */
 
-bfd_boolean
+bool
 debug_record_function (void *handle, const char *name,
-		       debug_type return_type, bfd_boolean global,
+		       debug_type return_type, bool global,
 		       bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -773,12 +773,12 @@ debug_record_function (void *handle, const char *name,
   if (name == NULL)
     name = "";
   if (return_type == NULL)
-    return FALSE;
+    return false;
 
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_record_function: no debug_set_filename call"));
-      return FALSE;
+      return false;
     }
 
   f = (struct debug_function *) xmalloc (sizeof *f);
@@ -807,16 +807,16 @@ debug_record_function (void *handle, const char *name,
 			       ? DEBUG_LINKAGE_GLOBAL
 			       : DEBUG_LINKAGE_STATIC));
   if (n == NULL)
-    return FALSE;
+    return false;
 
   n->u.function = f;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a parameter for the current function.  */
 
-bfd_boolean
+bool
 debug_record_parameter (void *handle, const char *name, debug_type type,
 			enum debug_parm_kind kind, bfd_vma val)
 {
@@ -824,13 +824,13 @@ debug_record_parameter (void *handle, const char *name, debug_type type,
   struct debug_parameter *p, **pp;
 
   if (name == NULL || type == NULL)
-    return FALSE;
+    return false;
 
   if (info->current_unit == NULL
       || info->current_function == NULL)
     {
       debug_error (_("debug_record_parameter: no current function"));
-      return FALSE;
+      return false;
     }
 
   p = (struct debug_parameter *) xmalloc (sizeof *p);
@@ -847,12 +847,12 @@ debug_record_parameter (void *handle, const char *name, debug_type type,
     ;
   *pp = p;
 
-  return TRUE;
+  return true;
 }
 
 /* End a function.  FIXME: This should handle function nesting.  */
 
-bfd_boolean
+bool
 debug_end_function (void *handle, bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -862,13 +862,13 @@ debug_end_function (void *handle, bfd_vma addr)
       || info->current_function == NULL)
     {
       debug_error (_("debug_end_function: no current function"));
-      return FALSE;
+      return false;
     }
 
   if (info->current_block->parent != NULL)
     {
       debug_error (_("debug_end_function: some blocks were not closed"));
-      return FALSE;
+      return false;
     }
 
   info->current_block->end = addr;
@@ -876,7 +876,7 @@ debug_end_function (void *handle, bfd_vma addr)
   info->current_function = NULL;
   info->current_block = NULL;
 
-  return TRUE;
+  return true;
 }
 
 /* Start a block in a function.  All local information will be
@@ -884,7 +884,7 @@ debug_end_function (void *handle, bfd_vma addr)
    debug_start_block and debug_end_block may be nested.  The bfd_vma
    argument is the address at which this block starts.  */
 
-bfd_boolean
+bool
 debug_start_block (void *handle, bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -896,7 +896,7 @@ debug_start_block (void *handle, bfd_vma addr)
       || info->current_block == NULL)
     {
       debug_error (_("debug_start_block: no current block"));
-      return FALSE;
+      return false;
     }
 
   b = (struct debug_block *) xmalloc (sizeof *b);
@@ -915,14 +915,14 @@ debug_start_block (void *handle, bfd_vma addr)
 
   info->current_block = b;
 
-  return TRUE;
+  return true;
 }
 
 /* Finish a block in a function.  This matches the call to
    debug_start_block.  The argument is the address at which this block
    ends.  */
 
-bfd_boolean
+bool
 debug_end_block (void *handle, bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -932,27 +932,27 @@ debug_end_block (void *handle, bfd_vma addr)
       || info->current_block == NULL)
     {
       debug_error (_("debug_end_block: no current block"));
-      return FALSE;
+      return false;
     }
 
   parent = info->current_block->parent;
   if (parent == NULL)
     {
       debug_error (_("debug_end_block: attempt to close top level block"));
-      return FALSE;
+      return false;
     }
 
   info->current_block->end = addr;
 
   info->current_block = parent;
 
-  return TRUE;
+  return true;
 }
 
 /* Associate a line number in the current source file and function
    with a given address.  */
 
-bfd_boolean
+bool
 debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -962,7 +962,7 @@ debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_record_line: no current unit"));
-      return FALSE;
+      return false;
     }
 
   l = info->current_lineno;
@@ -974,7 +974,7 @@ debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)
 	    {
 	      l->linenos[i] = lineno;
 	      l->addrs[i] = addr;
-	      return TRUE;
+	      return true;
 	    }
 	}
     }
@@ -1003,77 +1003,77 @@ debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)
 
   info->current_lineno = l;
 
-  return TRUE;
+  return true;
 }
 
 /* Start a named common block.  This is a block of variables that may
    move in memory.  */
 
-bfd_boolean
+bool
 debug_start_common_block (void *handle ATTRIBUTE_UNUSED,
 			  const char *name ATTRIBUTE_UNUSED)
 {
   /* FIXME */
   debug_error (_("debug_start_common_block: not implemented"));
-  return FALSE;
+  return false;
 }
 
 /* End a named common block.  */
 
-bfd_boolean
+bool
 debug_end_common_block (void *handle ATTRIBUTE_UNUSED,
 			const char *name ATTRIBUTE_UNUSED)
 {
   /* FIXME */
   debug_error (_("debug_end_common_block: not implemented"));
-  return FALSE;
+  return false;
 }
 
 /* Record a named integer constant.  */
 
-bfd_boolean
+bool
 debug_record_int_const (void *handle, const char *name, bfd_vma val)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;
 
   if (name == NULL)
-    return FALSE;
+    return false;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_INT_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return FALSE;
+    return false;
 
   n->u.int_constant = val;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a named floating point constant.  */
 
-bfd_boolean
+bool
 debug_record_float_const (void *handle, const char *name, double val)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;
 
   if (name == NULL)
-    return FALSE;
+    return false;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_FLOAT_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return FALSE;
+    return false;
 
   n->u.float_constant = val;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a typed constant with an integral value.  */
 
-bfd_boolean
+bool
 debug_record_typed_const (void *handle, const char *name, debug_type type,
 			  bfd_vma val)
 {
@@ -1082,12 +1082,12 @@ debug_record_typed_const (void *handle, const char *name, debug_type type,
   struct debug_typed_constant *tc;
 
   if (name == NULL || type == NULL)
-    return FALSE;
+    return false;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_TYPED_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return FALSE;
+    return false;
 
   tc = (struct debug_typed_constant *) xmalloc (sizeof *tc);
   memset (tc, 0, sizeof *tc);
@@ -1097,12 +1097,12 @@ debug_record_typed_const (void *handle, const char *name, debug_type type,
 
   n->u.typed_constant = tc;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a label.  */
 
-bfd_boolean
+bool
 debug_record_label (void *handle ATTRIBUTE_UNUSED,
 		    const char *name ATTRIBUTE_UNUSED,
 		    debug_type type ATTRIBUTE_UNUSED,
@@ -1110,12 +1110,12 @@ debug_record_label (void *handle ATTRIBUTE_UNUSED,
 {
   /* FIXME.  */
   debug_error (_("debug_record_label: not implemented"));
-  return FALSE;
+  return false;
 }
 
 /* Record a variable.  */
 
-bfd_boolean
+bool
 debug_record_variable (void *handle, const char *name, debug_type type,
 		       enum debug_var_kind kind, bfd_vma val)
 {
@@ -1126,13 +1126,13 @@ debug_record_variable (void *handle, const char *name, debug_type type,
   struct debug_variable *v;
 
   if (name == NULL || type == NULL)
-    return FALSE;
+    return false;
 
   if (info->current_unit == NULL
       || info->current_file == NULL)
     {
       debug_error (_("debug_record_variable: no current file"));
-      return FALSE;
+      return false;
     }
 
   if (kind == DEBUG_GLOBAL || kind == DEBUG_STATIC)
@@ -1154,7 +1154,7 @@ debug_record_variable (void *handle, const char *name, debug_type type,
 
   n = debug_add_to_namespace (info, nsp, name, DEBUG_OBJECT_VARIABLE, linkage);
   if (n == NULL)
-    return FALSE;
+    return false;
 
   v = (struct debug_variable *) xmalloc (sizeof *v);
   memset (v, 0, sizeof *v);
@@ -1165,7 +1165,7 @@ debug_record_variable (void *handle, const char *name, debug_type type,
 
   n->u.variable = v;
 
-  return TRUE;
+  return true;
 }
 
 /* Make a type with a given kind and size.  */
@@ -1224,7 +1224,7 @@ debug_make_void_type (void *handle)
    if the integer is unsigned.  */
 
 debug_type
-debug_make_int_type (void *handle, unsigned int size, bfd_boolean unsignedp)
+debug_make_int_type (void *handle, unsigned int size, bool unsignedp)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1275,7 +1275,7 @@ debug_make_complex_type (void *handle, unsigned int size)
    The fourth argument is a NULL terminated array of fields.  */
 
 debug_type
-debug_make_struct_type (void *handle, bfd_boolean structp, bfd_vma size,
+debug_make_struct_type (void *handle, bool structp, bfd_vma size,
 			debug_field *fields)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -1306,10 +1306,10 @@ debug_make_struct_type (void *handle, bfd_boolean structp, bfd_vma size,
    object has its own virtual function table.  */
 
 debug_type
-debug_make_object_type (void *handle, bfd_boolean structp, bfd_vma size,
+debug_make_object_type (void *handle, bool structp, bfd_vma size,
 			debug_field *fields, debug_baseclass *baseclasses,
 			debug_method *methods, debug_type vptrbase,
-			bfd_boolean ownvptr)
+			bool ownvptr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1393,7 +1393,7 @@ debug_make_pointer_type (void *handle, debug_type type)
 
 debug_type
 debug_make_function_type (void *handle, debug_type type,
-			  debug_type *arg_types, bfd_boolean varargs)
+			  debug_type *arg_types, bool varargs)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1476,7 +1476,7 @@ debug_make_range_type (void *handle, debug_type type, bfd_signed_vma lower,
 debug_type
 debug_make_array_type (void *handle, debug_type element_type,
 		       debug_type range_type, bfd_signed_vma lower,
-		       bfd_signed_vma upper, bfd_boolean stringp)
+		       bfd_signed_vma upper, bool stringp)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1508,7 +1508,7 @@ debug_make_array_type (void *handle, debug_type element_type,
    CHILL.  */
 
 debug_type
-debug_make_set_type (void *handle, debug_type type, bfd_boolean bitstringp)
+debug_make_set_type (void *handle, debug_type type, bool bitstringp)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1570,7 +1570,7 @@ debug_make_offset_type (void *handle, debug_type base_type,
 debug_type
 debug_make_method_type (void *handle, debug_type return_type,
 			debug_type domain_type, debug_type *arg_types,
-			bfd_boolean varargs)
+			bool varargs)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1678,7 +1678,7 @@ debug_make_undefined_tagged_type (void *handle, const char *name,
 
 debug_baseclass
 debug_make_baseclass (void *handle ATTRIBUTE_UNUSED, debug_type type,
-		      bfd_vma bitpos, bfd_boolean is_virtual,
+		      bfd_vma bitpos, bool is_virtual,
 		      enum debug_visibility visibility)
 {
   struct debug_baseclass_s *b;
@@ -1712,7 +1712,7 @@ debug_make_field (void *handle ATTRIBUTE_UNUSED, const char *name,
 
   f->name = name;
   f->type = type;
-  f->static_member = FALSE;
+  f->static_member = false;
   f->u.f.bitpos = bitpos;
   f->u.f.bitsize = bitsize;
   f->visibility = visibility;
@@ -1738,7 +1738,7 @@ debug_make_static_member (void *handle ATTRIBUTE_UNUSED, const char *name,
 
   f->name = name;
   f->type = type;
-  f->static_member = TRUE;
+  f->static_member = true;
   f->u.s.physname = physname;
   f->visibility = visibility;
 
@@ -1776,7 +1776,7 @@ debug_method_variant
 debug_make_method_variant (void *handle ATTRIBUTE_UNUSED,
 			   const char *physname, debug_type type,
 			   enum debug_visibility visibility,
-			   bfd_boolean constp, bfd_boolean volatilep,
+			   bool constp, bool volatilep,
 			   bfd_vma voffset, debug_type context)
 {
   struct debug_method_variant_s *m;
@@ -1803,7 +1803,7 @@ debug_method_variant
 debug_make_static_method_variant (void *handle ATTRIBUTE_UNUSED,
 				  const char *physname, debug_type type,
 				  enum debug_visibility visibility,
-				  bfd_boolean constp, bfd_boolean volatilep)
+				  bool constp, bool volatilep)
 {
   struct debug_method_variant_s *m;
 
@@ -1921,7 +1921,7 @@ debug_tag_type (void *handle, const char *name, debug_type type)
 
 /* Record the size of a given type.  */
 
-bfd_boolean
+bool
 debug_record_type_size (void *handle ATTRIBUTE_UNUSED, debug_type type,
 			unsigned int size)
 {
@@ -1931,7 +1931,7 @@ debug_record_type_size (void *handle ATTRIBUTE_UNUSED, debug_type type,
 
   type->size = size;
 
-  return TRUE;
+  return true;
 }
 
 /* Find a named type.  */
@@ -2163,7 +2163,7 @@ debug_get_return_type (void *handle, debug_type type)
 
 const debug_type *
 debug_get_parameter_types (void *handle, debug_type type,
-			   bfd_boolean *pvarargs)
+			   bool *pvarargs)
 {
   if (type == NULL)
     return NULL;
@@ -2303,7 +2303,7 @@ debug_get_field_physname (void *handle ATTRIBUTE_UNUSED, debug_field field)
 /* Write out the debugging information.  This is given a handle to
    debugging information, and a set of function pointers to call.  */
 
-bfd_boolean
+bool
 debug_write (void *handle, const struct debug_write_fns *fns, void *fhandle)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -2327,42 +2327,42 @@ debug_write (void *handle, const struct debug_write_fns *fns, void *fhandle)
   for (u = info->units; u != NULL; u = u->next)
     {
       struct debug_file *f;
-      bfd_boolean first_file;
+      bool first_file;
 
       info->current_write_lineno = u->linenos;
       info->current_write_lineno_index = 0;
 
       if (! (*fns->start_compilation_unit) (fhandle, u->files->filename))
-	return FALSE;
+	return false;
 
-      first_file = TRUE;
+      first_file = true;
       for (f = u->files; f != NULL; f = f->next)
 	{
 	  struct debug_name *n;
 
 	  if (first_file)
-	    first_file = FALSE;
+	    first_file = false;
 	  else if (! (*fns->start_source) (fhandle, f->filename))
-	    return FALSE;
+	    return false;
 
 	  if (f->globals != NULL)
 	    for (n = f->globals->list; n != NULL; n = n->next)
 	      if (! debug_write_name (info, fns, fhandle, n))
-		return FALSE;
+		return false;
 	}
 
       /* Output any line number information which hasn't already been
          handled.  */
       if (! debug_write_linenos (info, fns, fhandle, (bfd_vma) -1))
-	return FALSE;
+	return false;
     }
 
-  return TRUE;
+  return true;
 }
 
 /* Write out an element in a namespace.  */
 
-static bfd_boolean
+static bool
 debug_write_name (struct debug_handle *info,
 		  const struct debug_write_fns *fns, void *fhandle,
 		  struct debug_name *n)
@@ -2372,16 +2372,16 @@ debug_write_name (struct debug_handle *info,
     case DEBUG_OBJECT_TYPE:
       if (! debug_write_type (info, fns, fhandle, n->u.type, n)
 	  || ! (*fns->typdef) (fhandle, n->name))
-	return FALSE;
-      return TRUE;
+	return false;
+      return true;
     case DEBUG_OBJECT_TAG:
       if (! debug_write_type (info, fns, fhandle, n->u.tag, n))
-	return FALSE;
+	return false;
       return (*fns->tag) (fhandle, n->name);
     case DEBUG_OBJECT_VARIABLE:
       if (! debug_write_type (info, fns, fhandle, n->u.variable->type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->variable) (fhandle, n->name, n->u.variable->kind,
 			       n->u.variable->val);
     case DEBUG_OBJECT_FUNCTION:
@@ -2394,12 +2394,12 @@ debug_write_name (struct debug_handle *info,
     case DEBUG_OBJECT_TYPED_CONSTANT:
       if (! debug_write_type (info, fns, fhandle, n->u.typed_constant->type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->typed_constant) (fhandle, n->name,
 				     n->u.typed_constant->val);
     default:
       abort ();
-      return FALSE;
+      return false;
     }
   /*NOTREACHED*/
 }
@@ -2410,7 +2410,7 @@ debug_write_name (struct debug_handle *info,
    then the name argument is a tag from a DEBUG_KIND_TAGGED type which
    points to this one.  */
 
-static bfd_boolean
+static bool
 debug_write_type (struct debug_handle *info,
 		  const struct debug_write_fns *fns, void *fhandle,
 		  struct debug_type_s *type, struct debug_name *name)
@@ -2453,7 +2453,7 @@ debug_write_type (struct debug_handle *info,
 		  if (! debug_set_class_id (info,
 					    type->u.knamed->name->name,
 					    real))
-		    return FALSE;
+		    return false;
 		}
 	      id = real->u.kclass->id;
 	    }
@@ -2482,7 +2482,7 @@ debug_write_type (struct debug_handle *info,
     {
     case DEBUG_KIND_ILLEGAL:
       debug_error (_("debug_write_type: illegal type encountered"));
-      return FALSE;
+      return false;
     case DEBUG_KIND_INDIRECT:
       return debug_write_type (info, fns, fhandle, *type->u.kindirect->slot,
 			       name);
@@ -2503,7 +2503,7 @@ debug_write_type (struct debug_handle *info,
 	  if (type->u.kclass->id <= info->base_id)
 	    {
 	      if (! debug_set_class_id (info, tag, type))
-		return FALSE;
+		return false;
 	    }
 
 	  if (info->mark == type->u.kclass->mark)
@@ -2524,7 +2524,7 @@ debug_write_type (struct debug_handle *info,
 					: 0),
 				       type->kind == DEBUG_KIND_STRUCT,
 				       type->size))
-	return FALSE;
+	return false;
       if (type->u.kclass != NULL
 	  && type->u.kclass->fields != NULL)
 	{
@@ -2537,7 +2537,7 @@ debug_write_type (struct debug_handle *info,
 				      (struct debug_name *) NULL)
 		  || ! (*fns->struct_field) (fhandle, f->name, f->u.f.bitpos,
 					     f->u.f.bitsize, f->visibility))
-		return FALSE;
+		return false;
 	    }
 	}
       return (*fns->end_struct_type) (fhandle);
@@ -2553,13 +2553,13 @@ debug_write_type (struct debug_handle *info,
     case DEBUG_KIND_POINTER:
       if (! debug_write_type (info, fns, fhandle, type->u.kpointer,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->pointer_type) (fhandle);
     case DEBUG_KIND_FUNCTION:
       if (! debug_write_type (info, fns, fhandle,
 			      type->u.kfunction->return_type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       if (type->u.kfunction->arg_types == NULL)
 	is = -1;
       else
@@ -2568,19 +2568,19 @@ debug_write_type (struct debug_handle *info,
 	    if (! debug_write_type (info, fns, fhandle,
 				    type->u.kfunction->arg_types[is],
 				    (struct debug_name *) NULL))
-	      return FALSE;
+	      return false;
 	}
       return (*fns->function_type) (fhandle, is,
 				    type->u.kfunction->varargs);
     case DEBUG_KIND_REFERENCE:
       if (! debug_write_type (info, fns, fhandle, type->u.kreference,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->reference_type) (fhandle);
     case DEBUG_KIND_RANGE:
       if (! debug_write_type (info, fns, fhandle, type->u.krange->type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->range_type) (fhandle, type->u.krange->lower,
 				 type->u.krange->upper);
     case DEBUG_KIND_ARRAY:
@@ -2589,14 +2589,14 @@ debug_write_type (struct debug_handle *info,
 	  || ! debug_write_type (info, fns, fhandle,
 				 type->u.karray->range_type,
 				 (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->array_type) (fhandle, type->u.karray->lower,
 				 type->u.karray->upper,
 				 type->u.karray->stringp);
     case DEBUG_KIND_SET:
       if (! debug_write_type (info, fns, fhandle, type->u.kset->type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->set_type) (fhandle, type->u.kset->bitstringp);
     case DEBUG_KIND_OFFSET:
       if (! debug_write_type (info, fns, fhandle, type->u.koffset->base_type,
@@ -2604,13 +2604,13 @@ debug_write_type (struct debug_handle *info,
 	  || ! debug_write_type (info, fns, fhandle,
 				 type->u.koffset->target_type,
 				 (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->offset_type) (fhandle);
     case DEBUG_KIND_METHOD:
       if (! debug_write_type (info, fns, fhandle,
 			      type->u.kmethod->return_type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       if (type->u.kmethod->arg_types == NULL)
 	is = -1;
       else
@@ -2619,14 +2619,14 @@ debug_write_type (struct debug_handle *info,
 	    if (! debug_write_type (info, fns, fhandle,
 				    type->u.kmethod->arg_types[is],
 				    (struct debug_name *) NULL))
-	      return FALSE;
+	      return false;
 	}
       if (type->u.kmethod->domain_type != NULL)
 	{
 	  if (! debug_write_type (info, fns, fhandle,
 				  type->u.kmethod->domain_type,
 				  (struct debug_name *) NULL))
-	    return FALSE;
+	    return false;
 	}
       return (*fns->method_type) (fhandle,
 				  type->u.kmethod->domain_type != NULL,
@@ -2635,12 +2635,12 @@ debug_write_type (struct debug_handle *info,
     case DEBUG_KIND_CONST:
       if (! debug_write_type (info, fns, fhandle, type->u.kconst,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->const_type) (fhandle);
     case DEBUG_KIND_VOLATILE:
       if (! debug_write_type (info, fns, fhandle, type->u.kvolatile,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->volatile_type) (fhandle);
     case DEBUG_KIND_NAMED:
       return debug_write_type (info, fns, fhandle, type->u.knamed->type,
@@ -2650,13 +2650,13 @@ debug_write_type (struct debug_handle *info,
 			       type->u.knamed->name);
     default:
       abort ();
-      return FALSE;
+      return false;
     }
 }
 
 /* Write out a class type.  */
 
-static bfd_boolean
+static bool
 debug_write_class_type (struct debug_handle *info,
 			const struct debug_write_fns *fns, void *fhandle,
 			struct debug_type_s *type, const char *tag)
@@ -2675,7 +2675,7 @@ debug_write_class_type (struct debug_handle *info,
       if (type->u.kclass->id <= info->base_id)
 	{
 	  if (! debug_set_class_id (info, tag, type))
-	    return FALSE;
+	    return false;
 	}
 
       if (info->mark == type->u.kclass->mark)
@@ -2695,7 +2695,7 @@ debug_write_class_type (struct debug_handle *info,
 	{
 	  if (! debug_write_type (info, fns, fhandle, vptrbase,
 				  (struct debug_name *) NULL))
-	    return FALSE;
+	    return false;
 	}
     }
 
@@ -2704,7 +2704,7 @@ debug_write_class_type (struct debug_handle *info,
 				  type->size,
 				  vptrbase != NULL,
 				  vptrbase == type))
-    return FALSE;
+    return false;
 
   if (type->u.kclass != NULL)
     {
@@ -2717,19 +2717,19 @@ debug_write_class_type (struct debug_handle *info,
 	      f = type->u.kclass->fields[i];
 	      if (! debug_write_type (info, fns, fhandle, f->type,
 				      (struct debug_name *) NULL))
-		return FALSE;
+		return false;
 	      if (f->static_member)
 		{
 		  if (! (*fns->class_static_member) (fhandle, f->name,
 						     f->u.s.physname,
 						     f->visibility))
-		    return FALSE;
+		    return false;
 		}
 	      else
 		{
 		  if (! (*fns->struct_field) (fhandle, f->name, f->u.f.bitpos,
 					      f->u.f.bitsize, f->visibility))
-		    return FALSE;
+		    return false;
 		}
 	    }
 	}
@@ -2743,10 +2743,10 @@ debug_write_class_type (struct debug_handle *info,
 	      b = type->u.kclass->baseclasses[i];
 	      if (! debug_write_type (info, fns, fhandle, b->type,
 				      (struct debug_name *) NULL))
-		return FALSE;
+		return false;
 	      if (! (*fns->class_baseclass) (fhandle, b->bitpos, b->is_virtual,
 					     b->visibility))
-		return FALSE;
+		return false;
 	    }
 	}
 
@@ -2759,7 +2759,7 @@ debug_write_class_type (struct debug_handle *info,
 
 	      m = type->u.kclass->methods[i];
 	      if (! (*fns->class_start_method) (fhandle, m->name))
-		return FALSE;
+		return false;
 	      for (j = 0; m->variants[j] != NULL; j++)
 		{
 		  struct debug_method_variant_s *v;
@@ -2769,11 +2769,11 @@ debug_write_class_type (struct debug_handle *info,
 		    {
 		      if (! debug_write_type (info, fns, fhandle, v->context,
 					      (struct debug_name *) NULL))
-			return FALSE;
+			return false;
 		    }
 		  if (! debug_write_type (info, fns, fhandle, v->type,
 					  (struct debug_name *) NULL))
-		    return FALSE;
+		    return false;
 		  if (v->voffset != VOFFSET_STATIC_METHOD)
 		    {
 		      if (! (*fns->class_method_variant) (fhandle, v->physname,
@@ -2782,7 +2782,7 @@ debug_write_class_type (struct debug_handle *info,
 							  v->volatilep,
 							  v->voffset,
 							  v->context != NULL))
-			return FALSE;
+			return false;
 		    }
 		  else
 		    {
@@ -2791,11 +2791,11 @@ debug_write_class_type (struct debug_handle *info,
 								 v->visibility,
 								 v->constp,
 								 v->volatilep))
-			return FALSE;
+			return false;
 		    }
 		}
 	      if (! (*fns->class_end_method) (fhandle))
-		return FALSE;
+		return false;
 	    }
 	}
     }
@@ -2805,7 +2805,7 @@ debug_write_class_type (struct debug_handle *info,
 
 /* Write out information for a function.  */
 
-static bfd_boolean
+static bool
 debug_write_function (struct debug_handle *info,
 		      const struct debug_write_fns *fns, void *fhandle,
 		      const char *name, enum debug_object_linkage linkage,
@@ -2815,28 +2815,28 @@ debug_write_function (struct debug_handle *info,
   struct debug_block *b;
 
   if (! debug_write_linenos (info, fns, fhandle, function->blocks->start))
-    return FALSE;
+    return false;
 
   if (! debug_write_type (info, fns, fhandle, function->return_type,
 			  (struct debug_name *) NULL))
-    return FALSE;
+    return false;
 
   if (! (*fns->start_function) (fhandle, name,
 				linkage == DEBUG_LINKAGE_GLOBAL))
-    return FALSE;
+    return false;
 
   for (p = function->parameters; p != NULL; p = p->next)
     {
       if (! debug_write_type (info, fns, fhandle, p->type,
 			      (struct debug_name *) NULL)
 	  || ! (*fns->function_parameter) (fhandle, p->name, p->kind, p->val))
-	return FALSE;
+	return false;
     }
 
   for (b = function->blocks; b != NULL; b = b->next)
     {
       if (! debug_write_block (info, fns, fhandle, b))
-	return FALSE;
+	return false;
     }
 
   return (*fns->end_function) (fhandle);
@@ -2844,7 +2844,7 @@ debug_write_function (struct debug_handle *info,
 
 /* Write out information for a block.  */
 
-static bfd_boolean
+static bool
 debug_write_block (struct debug_handle *info,
 		   const struct debug_write_fns *fns, void *fhandle,
 		   struct debug_block *block)
@@ -2853,14 +2853,14 @@ debug_write_block (struct debug_handle *info,
   struct debug_block *b;
 
   if (! debug_write_linenos (info, fns, fhandle, block->start))
-    return FALSE;
+    return false;
 
   /* I can't see any point to writing out a block with no local
      variables, so we don't bother, except for the top level block.  */
   if (block->locals != NULL || block->parent == NULL)
     {
       if (! (*fns->start_block) (fhandle, block->start))
-	return FALSE;
+	return false;
     }
 
   if (block->locals != NULL)
@@ -2868,31 +2868,31 @@ debug_write_block (struct debug_handle *info,
       for (n = block->locals->list; n != NULL; n = n->next)
 	{
 	  if (! debug_write_name (info, fns, fhandle, n))
-	    return FALSE;
+	    return false;
 	}
     }
 
   for (b = block->children; b != NULL; b = b->next)
     {
       if (! debug_write_block (info, fns, fhandle, b))
-	return FALSE;
+	return false;
     }
 
   if (! debug_write_linenos (info, fns, fhandle, block->end))
-    return FALSE;
+    return false;
 
   if (block->locals != NULL || block->parent == NULL)
     {
       if (! (*fns->end_block) (fhandle, block->end))
-	return FALSE;
+	return false;
     }
 
-  return TRUE;
+  return true;
 }
 
 /* Write out line number information up to ADDRESS.  */
 
-static bfd_boolean
+static bool
 debug_write_linenos (struct debug_handle *info,
 		     const struct debug_write_fns *fns, void *fhandle,
 		     bfd_vma address)
@@ -2910,12 +2910,12 @@ debug_write_linenos (struct debug_handle *info,
 	    break;
 
 	  if (l->addrs[info->current_write_lineno_index] >= address)
-	    return TRUE;
+	    return true;
 
 	  if (! (*fns->lineno) (fhandle, l->file->filename,
 				l->linenos[info->current_write_lineno_index],
 				l->addrs[info->current_write_lineno_index]))
-	    return FALSE;
+	    return false;
 
 	  ++info->current_write_lineno_index;
 	}
@@ -2924,7 +2924,7 @@ debug_write_linenos (struct debug_handle *info,
       info->current_write_lineno_index = 0;
     }
 
-  return TRUE;
+  return true;
 }
 
 /* Get the ID number for a class.  If during the same call to
@@ -2932,7 +2932,7 @@ debug_write_linenos (struct debug_handle *info,
    name, we use the same ID.  This type of things happens because the
    same struct will be defined by multiple compilation units.  */
 
-static bfd_boolean
+static bool
 debug_set_class_id (struct debug_handle *info, const char *tag,
 		    struct debug_type_s *type)
 {
@@ -2947,7 +2947,7 @@ debug_set_class_id (struct debug_handle *info, const char *tag,
   c = type->u.kclass;
 
   if (c->id > info->base_id)
-    return TRUE;
+    return true;
 
   for (l = info->id_list; l != NULL; l = l->next)
     {
@@ -2970,7 +2970,7 @@ debug_set_class_id (struct debug_handle *info, const char *tag,
       if (debug_type_samep (info, l->type, type))
 	{
 	  c->id = l->type->u.kclass->id;
-	  return TRUE;
+	  return true;
 	}
     }
 
@@ -2988,40 +2988,40 @@ debug_set_class_id (struct debug_handle *info, const char *tag,
   l->next = info->id_list;
   info->id_list = l;
 
-  return TRUE;
+  return true;
 }
 
 /* See if two types are the same.  At this point, we don't care about
    tags and the like.  */
 
-static bfd_boolean
+static bool
 debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 		  struct debug_type_s *t2)
 {
   struct debug_type_compare_list *l;
   struct debug_type_compare_list top;
-  bfd_boolean ret;
+  bool ret;
 
   if (t1 == NULL)
     return t2 == NULL;
   if (t2 == NULL)
-    return FALSE;
+    return false;
 
   while (t1->kind == DEBUG_KIND_INDIRECT)
     {
       t1 = *t1->u.kindirect->slot;
       if (t1 == NULL)
-	return FALSE;
+	return false;
     }
   while (t2->kind == DEBUG_KIND_INDIRECT)
     {
       t2 = *t2->u.kindirect->slot;
       if (t2 == NULL)
-	return FALSE;
+	return false;
     }
 
   if (t1 == t2)
-    return TRUE;
+    return true;
 
   /* As a special case, permit a typedef to match a tag, since C++
      debugging output will sometimes add a typedef where C debugging
@@ -3035,7 +3035,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 
   if (t1->kind != t2->kind
       || t1->size != t2->size)
-    return FALSE;
+    return false;
 
   /* Get rid of the trivial cases first.  */
   switch (t1->kind)
@@ -3046,7 +3046,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
     case DEBUG_KIND_FLOAT:
     case DEBUG_KIND_COMPLEX:
     case DEBUG_KIND_BOOL:
-      return TRUE;
+      return true;
     case DEBUG_KIND_INT:
       return t1->u.kint == t2->u.kint;
     }
@@ -3058,7 +3058,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
   for (l = info->compare_list; l != NULL; l = l->next)
     {
       if (l->t1 == t1 && l->t2 == t2)
-	return TRUE;
+	return true;
     }
 
   top.t1 = t1;
@@ -3070,7 +3070,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
     {
     default:
       abort ();
-      ret = FALSE;
+      ret = false;
       break;
 
     case DEBUG_KIND_STRUCT:
@@ -3080,10 +3080,10 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
       if (t1->u.kclass == NULL)
 	ret = t2->u.kclass == NULL;
       else if (t2->u.kclass == NULL)
-	ret = FALSE;
+	ret = false;
       else if (t1->u.kclass->id > info->base_id
 	       && t1->u.kclass->id == t2->u.kclass->id)
-	ret = TRUE;
+	ret = true;
       else
 	ret = debug_class_type_samep (info, t1, t2);
       break;
@@ -3092,7 +3092,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
       if (t1->u.kenum == NULL)
 	ret = t2->u.kenum == NULL;
       else if (t2->u.kenum == NULL)
-	ret = FALSE;
+	ret = false;
       else
 	{
 	  const char **pn1, **pn2;
@@ -3127,9 +3127,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 				 t2->u.kfunction->return_type)
 	  || ((t1->u.kfunction->arg_types == NULL)
 	      != (t2->u.kfunction->arg_types == NULL)))
-	ret = FALSE;
+	ret = false;
       else if (t1->u.kfunction->arg_types == NULL)
-	ret = TRUE;
+	ret = true;
       else
 	{
 	  struct debug_type_s **a1, **a2;
@@ -3186,9 +3186,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 				 t2->u.kmethod->domain_type)
 	  || ((t1->u.kmethod->arg_types == NULL)
 	      != (t2->u.kmethod->arg_types == NULL)))
-	ret = FALSE;
+	ret = false;
       else if (t1->u.kmethod->arg_types == NULL)
-	ret = TRUE;
+	ret = true;
       else
 	{
 	  struct debug_type_s **a1, **a2;
@@ -3230,7 +3230,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 /* See if two classes are the same.  This is a subroutine of
    debug_type_samep.  */
 
-static bfd_boolean
+static bool
 debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 			struct debug_type_s *t2)
 {
@@ -3243,7 +3243,7 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
       || (c1->baseclasses == NULL) != (c2->baseclasses == NULL)
       || (c1->methods == NULL) != (c2->methods == NULL)
       || (c1->vptrbase == NULL) != (c2->vptrbase == NULL))
-    return FALSE;
+    return false;
 
   if (c1->fields != NULL)
     {
@@ -3260,17 +3260,17 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 	  if (f1->name[0] != f2->name[0]
 	      || f1->visibility != f2->visibility
 	      || f1->static_member != f2->static_member)
-	    return FALSE;
+	    return false;
 	  if (f1->static_member)
 	    {
 	      if (strcmp (f1->u.s.physname, f2->u.s.physname) != 0)
-		return FALSE;
+		return false;
 	    }
 	  else
 	    {
 	      if (f1->u.f.bitpos != f2->u.f.bitpos
 		  || f1->u.f.bitsize != f2->u.f.bitsize)
-		return FALSE;
+		return false;
 	    }
 	  /* We do the checks which require function calls last.  We
              don't require that the types of fields have the same
@@ -3284,16 +3284,16 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 							  f1->type, NULL),
 				     debug_get_real_type ((void *) info,
 							  f2->type, NULL)))
-	    return FALSE;
+	    return false;
 	}
       if (*pf1 != NULL || *pf2 != NULL)
-	return FALSE;
+	return false;
     }
 
   if (c1->vptrbase != NULL)
     {
       if (! debug_type_samep (info, c1->vptrbase, c2->vptrbase))
-	return FALSE;
+	return false;
     }
 
   if (c1->baseclasses != NULL)
@@ -3312,10 +3312,10 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 	      || b1->is_virtual != b2->is_virtual
 	      || b1->visibility != b2->visibility
 	      || ! debug_type_samep (info, b1->type, b2->type))
-	    return FALSE;
+	    return false;
 	}
       if (*pb1 != NULL || *pb2 != NULL)
-	return FALSE;
+	return false;
     }
 
   if (c1->methods != NULL)
@@ -3333,7 +3333,7 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 	  if (m1->name[0] != m2->name[0]
 	      || strcmp (m1->name, m2->name) != 0
 	      || (m1->variants == NULL) != (m2->variants == NULL))
-	    return FALSE;
+	    return false;
 	  if (m1->variants == NULL)
 	    {
 	      struct debug_method_variant_s **pv1, **pv2;
@@ -3354,21 +3354,21 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 		      || (v1->context == NULL) != (v2->context == NULL)
 		      || strcmp (v1->physname, v2->physname) != 0
 		      || ! debug_type_samep (info, v1->type, v2->type))
-		    return FALSE;
+		    return false;
 		  if (v1->context != NULL)
 		    {
 		      if (! debug_type_samep (info, v1->context,
 					      v2->context))
-			return FALSE;
+			return false;
 		    }
 		}
 	      if (*pv1 != NULL || *pv2 != NULL)
-		return FALSE;
+		return false;
 	    }
 	}
       if (*pm1 != NULL || *pm2 != NULL)
-	return FALSE;
+	return false;
     }
 
-  return TRUE;
+  return true;
 }
diff --git a/binutils/debug.h b/binutils/debug.h
index 3ca643e4c9c..bac616b93ee 100644
--- a/binutils/debug.h
+++ b/binutils/debug.h
@@ -169,45 +169,45 @@ struct debug_write_fns
 {
   /* This is called at the start of each new compilation unit with the
      name of the main file in the new unit.  */
-  bfd_boolean (*start_compilation_unit) (void *, const char *);
+  bool (*start_compilation_unit) (void *, const char *);
 
   /* This is called at the start of each source file within a
      compilation unit, before outputting any global information for
      that file.  The argument is the name of the file.  */
-  bfd_boolean (*start_source) (void *, const char *);
+  bool (*start_source) (void *, const char *);
 
   /* Each writer must keep a stack of types.  */
 
   /* Push an empty type onto the type stack.  This type can appear if
      there is a reference to a type which is never defined.  */
-  bfd_boolean (*empty_type) (void *);
+  bool (*empty_type) (void *);
 
   /* Push a void type onto the type stack.  */
-  bfd_boolean (*void_type) (void *);
+  bool (*void_type) (void *);
 
   /* Push an integer type onto the type stack, given the size and
      whether it is unsigned.  */
-  bfd_boolean (*int_type) (void *, unsigned int, bfd_boolean);
+  bool (*int_type) (void *, unsigned int, bool);
 
   /* Push a floating type onto the type stack, given the size.  */
-  bfd_boolean (*float_type) (void *, unsigned int);
+  bool (*float_type) (void *, unsigned int);
 
   /* Push a complex type onto the type stack, given the size.  */
-  bfd_boolean (*complex_type) (void *, unsigned int);
+  bool (*complex_type) (void *, unsigned int);
 
-  /* Push a bfd_boolean type onto the type stack, given the size.  */
-  bfd_boolean (*bool_type) (void *, unsigned int);
+  /* Push a bool type onto the type stack, given the size.  */
+  bool (*bool_type) (void *, unsigned int);
 
   /* Push an enum type onto the type stack, given the tag, a NULL
      terminated array of names and the associated values.  If there is
      no tag, the tag argument will be NULL.  If this is an undefined
      enum, the names and values arguments will be NULL.  */
-  bfd_boolean (*enum_type)
+  bool (*enum_type)
     (void *, const char *, const char **, bfd_signed_vma *);
 
   /* Pop the top type on the type stack, and push a pointer to that
      type onto the type stack.  */
-  bfd_boolean (*pointer_type) (void *);
+  bool (*pointer_type) (void *);
 
   /* Push a function type onto the type stack.  The second argument
      indicates the number of argument types that have been pushed onto
@@ -217,34 +217,34 @@ struct debug_write_fns
      function takes a variable number of arguments.  The return type
      of the function is pushed onto the type stack below the argument
      types, if any.  */
-  bfd_boolean (*function_type) (void *, int, bfd_boolean);
+  bool (*function_type) (void *, int, bool);
 
   /* Pop the top type on the type stack, and push a reference to that
      type onto the type stack.  */
-  bfd_boolean (*reference_type) (void *);
+  bool (*reference_type) (void *);
 
   /* Pop the top type on the type stack, and push a range of that type
      with the given lower and upper bounds onto the type stack.  */
-  bfd_boolean (*range_type) (void *, bfd_signed_vma, bfd_signed_vma);
+  bool (*range_type) (void *, bfd_signed_vma, bfd_signed_vma);
 
   /* Push an array type onto the type stack.  The top type on the type
      stack is the range, and the next type on the type stack is the
      element type.  These should be popped before the array type is
      pushed.  The arguments are the lower bound, the upper bound, and
      whether the array is a string.  */
-  bfd_boolean (*array_type)
-    (void *, bfd_signed_vma, bfd_signed_vma, bfd_boolean);
+  bool (*array_type)
+    (void *, bfd_signed_vma, bfd_signed_vma, bool);
 
   /* Pop the top type on the type stack, and push a set of that type
      onto the type stack.  The argument indicates whether this set is
      a bitstring.  */
-  bfd_boolean (*set_type) (void *, bfd_boolean);
+  bool (*set_type) (void *, bool);
 
   /* Push an offset type onto the type stack.  The top type on the
      type stack is the target type, and the next type on the type
      stack is the base type.  These should be popped before the offset
      type is pushed.  */
-  bfd_boolean (*offset_type) (void *);
+  bool (*offset_type) (void *);
 
   /* Push a method type onto the type stack.  If the second argument
      is TRUE, the top type on the stack is the class to which the
@@ -258,15 +258,15 @@ struct debug_write_fns
      type on the type stack below the domain and the argument types is
      the return type of the method.  All these types must be popped,
      and then the method type must be pushed.  */
-  bfd_boolean (*method_type) (void *, bfd_boolean, int, bfd_boolean);
+  bool (*method_type) (void *, bool, int, bool);
 
   /* Pop the top type off the type stack, and push a const qualified
      version of that type onto the type stack.  */
-  bfd_boolean (*const_type) (void *);
+  bool (*const_type) (void *);
 
   /* Pop the top type off the type stack, and push a volatile
      qualified version of that type onto the type stack.  */
-  bfd_boolean (*volatile_type) (void *);
+  bool (*volatile_type) (void *);
 
   /* Start building a struct.  This is followed by calls to the
      struct_field function, and finished by a call to the
@@ -277,18 +277,18 @@ struct debug_write_fns
      for a union.  The fifth argument is the size.  If this is an
      undefined struct or union, the size will be 0 and struct_field
      will not be called before end_struct_type is called.  */
-  bfd_boolean (*start_struct_type)
-    (void *, const char *, unsigned int, bfd_boolean, unsigned int);
+  bool (*start_struct_type)
+    (void *, const char *, unsigned int, bool, unsigned int);
 
   /* Add a field to the struct type currently being built.  The type
      of the field should be popped off the type stack.  The arguments
      are the name, the bit position, the bit size (may be zero if the
      field is not packed), and the visibility.  */
-  bfd_boolean (*struct_field)
+  bool (*struct_field)
     (void *, const char *, bfd_vma, bfd_vma, enum debug_visibility);
 
   /* Finish building a struct, and push it onto the type stack.  */
-  bfd_boolean (*end_struct_type) (void *);
+  bool (*end_struct_type) (void *);
 
   /* Start building a class.  This is followed by calls to several
      functions: struct_field, class_static_member, class_baseclass,
@@ -301,22 +301,21 @@ struct debug_write_fns
      found in the type itself, and is FALSE if the type of the object
      holding the virtual function table should be popped from the type
      stack.  */
-  bfd_boolean (*start_class_type)
-    (void *, const char *, unsigned int, bfd_boolean, unsigned int,
-     bfd_boolean, bfd_boolean);
+  bool (*start_class_type)
+    (void *, const char *, unsigned int, bool, unsigned int, bool, bool);
 
   /* Add a static member to the class currently being built.  The
      arguments are the field name, the physical name, and the
      visibility.  The type must be popped off the type stack.  */
-  bfd_boolean (*class_static_member)
+  bool (*class_static_member)
     (void *, const char *, const char *, enum debug_visibility);
 
   /* Add a baseclass to the class currently being built.  The type of
      the baseclass must be popped off the type stack.  The arguments
      are the bit position, whether the class is virtual, and the
      visibility.  */
-  bfd_boolean (*class_baseclass)
-    (void *, bfd_vma, bfd_boolean, enum debug_visibility);
+  bool (*class_baseclass)
+    (void *, bfd_vma, bool, enum debug_visibility);
 
   /* Start adding a method to the class currently being built.  This
      is followed by calls to class_method_variant and
@@ -324,7 +323,7 @@ struct debug_write_fns
      method which take different arguments.  The method is finished
      with a call to class_end_method.  The argument is the method
      name.  */
-  bfd_boolean (*class_start_method) (void *, const char *);
+  bool (*class_start_method) (void *, const char *);
 
   /* Describe a variant to the class method currently being built.
      The type of the variant must be popped off the type stack.  The
@@ -333,27 +332,25 @@ struct debug_write_fns
      const, whether the variant is volatile, the offset in the virtual
      function table, and whether the context is on the type stack
      (below the variant type).  */
-  bfd_boolean (*class_method_variant)
-    (void *, const char *, enum debug_visibility, bfd_boolean,
-     bfd_boolean, bfd_vma, bfd_boolean);
+  bool (*class_method_variant)
+    (void *, const char *, enum debug_visibility, bool, bool, bfd_vma, bool);
 
   /* Describe a static variant to the class method currently being
      built.  The arguments are the same as for class_method_variant,
      except that the last two arguments are omitted.  The type of the
      variant must be popped off the type stack.  */
-  bfd_boolean (*class_static_method_variant)
-    (void *, const char *, enum debug_visibility, bfd_boolean,
-     bfd_boolean);
+  bool (*class_static_method_variant)
+    (void *, const char *, enum debug_visibility, bool, bool);
 
   /* Finish describing a class method.  */
-  bfd_boolean (*class_end_method) (void *);
+  bool (*class_end_method) (void *);
 
   /* Finish describing a class, and push it onto the type stack.  */
-  bfd_boolean (*end_class_type) (void *);
+  bool (*end_class_type) (void *);
 
   /* Push a type on the stack which was given a name by an earlier
      call to typdef.  */
-  bfd_boolean (*typedef_type) (void *, const char *);
+  bool (*typedef_type) (void *, const char *);
 
   /* Push a tagged type on the stack which was defined earlier.  If
      the second argument is not NULL, the type was defined by a call
@@ -364,58 +361,58 @@ struct debug_write_fns
      for a struct (class) being defined, in between the call to
      start_struct_type (start_class_type) and the call to
      end_struct_type (end_class_type).  */
-  bfd_boolean (*tag_type)
+  bool (*tag_type)
     (void *, const char *, unsigned int, enum debug_type_kind);
 
   /* Pop the type stack, and typedef it to the given name.  */
-  bfd_boolean (*typdef) (void *, const char *);
+  bool (*typdef) (void *, const char *);
 
   /* Pop the type stack, and declare it as a tagged struct or union or
      enum or whatever.  The tag passed down here is redundant, since
      was also passed when enum_type, start_struct_type, or
      start_class_type was called.  */
-  bfd_boolean (*tag) (void *, const char *);
+  bool (*tag) (void *, const char *);
 
   /* This is called to record a named integer constant.  */
-  bfd_boolean (*int_constant) (void *, const char *, bfd_vma);
+  bool (*int_constant) (void *, const char *, bfd_vma);
 
   /* This is called to record a named floating point constant.  */
-  bfd_boolean (*float_constant) (void *, const char *, double);
+  bool (*float_constant) (void *, const char *, double);
 
   /* This is called to record a typed integer constant.  The type is
      popped off the type stack.  */
-  bfd_boolean (*typed_constant) (void *, const char *, bfd_vma);
+  bool (*typed_constant) (void *, const char *, bfd_vma);
 
   /* This is called to record a variable.  The type is popped off the
      type stack.  */
-  bfd_boolean (*variable)
+  bool (*variable)
     (void *, const char *, enum debug_var_kind, bfd_vma);
 
   /* Start writing out a function.  The return type must be popped off
-     the stack.  The bfd_boolean is TRUE if the function is global.  This
+     the stack.  The bool is TRUE if the function is global.  This
      is followed by calls to function_parameter, followed by block
      information.  */
-  bfd_boolean (*start_function) (void *, const char *, bfd_boolean);
+  bool (*start_function) (void *, const char *, bool);
 
   /* Record a function parameter for the current function.  The type
      must be popped off the stack.  */
-  bfd_boolean (*function_parameter)
+  bool (*function_parameter)
     (void *, const char *, enum debug_parm_kind, bfd_vma);
 
   /* Start writing out a block.  There is at least one top level block
      per function.  Blocks may be nested.  The argument is the
      starting address of the block.  */
-  bfd_boolean (*start_block) (void *, bfd_vma);
+  bool (*start_block) (void *, bfd_vma);
 
   /* Finish writing out a block.  The argument is the ending address
      of the block.  */
-  bfd_boolean (*end_block) (void *, bfd_vma);
+  bool (*end_block) (void *, bfd_vma);
 
   /* Finish writing out a function.  */
-  bfd_boolean (*end_function) (void *);
+  bool (*end_function) (void *);
 
   /* Record line number information for the current compilation unit.  */
-  bfd_boolean (*lineno) (void *, const char *, unsigned long, bfd_vma);
+  bool (*lineno) (void *, const char *, unsigned long, bfd_vma);
 };
 
 /* Exported functions.  */
@@ -433,81 +430,81 @@ extern void *debug_init (void);
 /* Set the source filename.  This implicitly starts a new compilation
    unit.  */
 
-extern bfd_boolean debug_set_filename (void *, const char *);
+extern bool debug_set_filename (void *, const char *);
 
 /* Change source files to the given file name.  This is used for
    include files in a single compilation unit.  */
 
-extern bfd_boolean debug_start_source (void *, const char *);
+extern bool debug_start_source (void *, const char *);
 
 /* Record a function definition.  This implicitly starts a function
    block.  The debug_type argument is the type of the return value.
-   The bfd_boolean indicates whether the function is globally visible.
+   The bool indicates whether the function is globally visible.
    The bfd_vma is the address of the start of the function.  Currently
    the parameter types are specified by calls to
    debug_record_parameter.  */
 
-extern bfd_boolean debug_record_function
-  (void *, const char *, debug_type, bfd_boolean, bfd_vma);
+extern bool debug_record_function
+  (void *, const char *, debug_type, bool, bfd_vma);
 
 /* Record a parameter for the current function.  */
 
-extern bfd_boolean debug_record_parameter
+extern bool debug_record_parameter
   (void *, const char *, debug_type, enum debug_parm_kind, bfd_vma);
 
 /* End a function definition.  The argument is the address where the
    function ends.  */
 
-extern bfd_boolean debug_end_function (void *, bfd_vma);
+extern bool debug_end_function (void *, bfd_vma);
 
 /* Start a block in a function.  All local information will be
    recorded in this block, until the matching call to debug_end_block.
    debug_start_block and debug_end_block may be nested.  The argument
    is the address at which this block starts.  */
 
-extern bfd_boolean debug_start_block (void *, bfd_vma);
+extern bool debug_start_block (void *, bfd_vma);
 
 /* Finish a block in a function.  This matches the call to
    debug_start_block.  The argument is the address at which this block
    ends.  */
 
-extern bfd_boolean debug_end_block (void *, bfd_vma);
+extern bool debug_end_block (void *, bfd_vma);
 
 /* Associate a line number in the current source file with a given
    address.  */
 
-extern bfd_boolean debug_record_line (void *, unsigned long, bfd_vma);
+extern bool debug_record_line (void *, unsigned long, bfd_vma);
 
 /* Start a named common block.  This is a block of variables that may
    move in memory.  */
 
-extern bfd_boolean debug_start_common_block (void *, const char *);
+extern bool debug_start_common_block (void *, const char *);
 
 /* End a named common block.  */
 
-extern bfd_boolean debug_end_common_block (void *, const char *);
+extern bool debug_end_common_block (void *, const char *);
 
 /* Record a named integer constant.  */
 
-extern bfd_boolean debug_record_int_const (void *, const char *, bfd_vma);
+extern bool debug_record_int_const (void *, const char *, bfd_vma);
 
 /* Record a named floating point constant.  */
 
-extern bfd_boolean debug_record_float_const (void *, const char *, double);
+extern bool debug_record_float_const (void *, const char *, double);
 
 /* Record a typed constant with an integral value.  */
 
-extern bfd_boolean debug_record_typed_const
+extern bool debug_record_typed_const
   (void *, const char *, debug_type, bfd_vma);
 
 /* Record a label.  */
 
-extern bfd_boolean debug_record_label
+extern bool debug_record_label
   (void *, const char *, debug_type, bfd_vma);
 
 /* Record a variable.  */
 
-extern bfd_boolean debug_record_variable
+extern bool debug_record_variable
   (void *, const char *, debug_type, enum debug_var_kind, bfd_vma);
 
 /* Make an indirect type.  The first argument is a pointer to the
@@ -524,10 +521,10 @@ extern debug_type debug_make_indirect_type
 
 extern debug_type debug_make_void_type (void *);
 
-/* Make an integer type of a given size.  The bfd_boolean argument is TRUE
+/* Make an integer type of a given size.  The bool argument is TRUE
    if the integer is unsigned.  */
 
-extern debug_type debug_make_int_type (void *, unsigned int, bfd_boolean);
+extern debug_type debug_make_int_type (void *, unsigned int, bool);
 
 /* Make a floating point type of a given size.  FIXME: On some
    platforms, like an Alpha, you probably need to be able to specify
@@ -548,18 +545,18 @@ extern debug_type debug_make_complex_type (void *, unsigned int);
    The fourth argument is a NULL terminated array of fields.  */
 
 extern debug_type debug_make_struct_type
-  (void *, bfd_boolean, bfd_vma, debug_field *);
+  (void *, bool, bfd_vma, debug_field *);
 
 /* Make an object type.  The first three arguments after the handle
    are the same as for debug_make_struct_type.  The next arguments are
    a NULL terminated array of base classes, a NULL terminated array of
    methods, the type of the object holding the virtual function table
-   if it is not this object, and a bfd_boolean which is TRUE if this
+   if it is not this object, and a bool which is TRUE if this
    object has its own virtual function table.  */
 
 extern debug_type debug_make_object_type
-  (void *, bfd_boolean, bfd_vma, debug_field *, debug_baseclass *,
-   debug_method *, debug_type, bfd_boolean);
+  (void *, bool, bfd_vma, debug_field *, debug_baseclass *,
+   debug_method *, debug_type, bool);
 
 /* Make an enumeration type.  The arguments are a null terminated
    array of strings, and an array of corresponding values.  */
@@ -578,7 +575,7 @@ extern debug_type debug_make_pointer_type (void *, debug_type);
    are unknown.  */
 
 extern debug_type debug_make_function_type
-  (void *, debug_type, debug_type *, bfd_boolean);
+  (void *, debug_type, debug_type *, bool);
 
 /* Make a reference to a given type.  */
 
@@ -598,13 +595,13 @@ extern debug_type debug_make_range_type
 
 extern debug_type debug_make_array_type
   (void *, debug_type, debug_type, bfd_signed_vma, bfd_signed_vma,
-   bfd_boolean);
+   bool);
 
 /* Make a set of a given type.  For example, a Pascal set type.  The
-   bfd_boolean argument is TRUE if this set is actually a bitstring, as in
+   bool argument is TRUE if this set is actually a bitstring, as in
    CHILL.  */
 
-extern debug_type debug_make_set_type (void *, debug_type, bfd_boolean);
+extern debug_type debug_make_set_type (void *, debug_type, bool);
 
 /* Make a type for a pointer which is relative to an object.  The
    second argument is the type of the object to which the pointer is
@@ -624,7 +621,7 @@ extern debug_type debug_make_offset_type (void *, debug_type, debug_type);
    the argument types from the mangled name.  */
 
 extern debug_type debug_make_method_type
-  (void *, debug_type, debug_type, debug_type *, bfd_boolean);
+  (void *, debug_type, debug_type, debug_type *, bool);
 
 /* Make a const qualified version of a given type.  */
 
@@ -647,7 +644,7 @@ extern debug_type debug_make_undefined_tagged_type
    class.  */
 
 extern debug_baseclass debug_make_baseclass
-  (void *, debug_type, bfd_vma, bfd_boolean, enum debug_visibility);
+  (void *, debug_type, bfd_vma, bool, enum debug_visibility);
 
 /* Make a field for a struct.  The second argument is the name.  The
    third argument is the type of the field.  The fourth argument is
@@ -685,16 +682,16 @@ extern debug_method debug_make_method
    function context.  */
 
 extern debug_method_variant debug_make_method_variant
-  (void *, const char *, debug_type, enum debug_visibility, bfd_boolean,
-   bfd_boolean, bfd_vma, debug_type);
+  (void *, const char *, debug_type, enum debug_visibility, bool,
+   bool, bfd_vma, debug_type);
 
 /* Make a static method argument.  The arguments are the same as for
    debug_make_method_variant, except that the last two are omitted
    since a static method can not also be virtual.  */
 
 extern debug_method_variant debug_make_static_method_variant
-  (void *, const char *, debug_type, enum debug_visibility, bfd_boolean,
-   bfd_boolean);
+  (void *, const char *, debug_type, enum debug_visibility, bool,
+   bool);
 
 /* Name a type.  This returns a new type with an attached name.  */
 
@@ -707,7 +704,7 @@ extern debug_type debug_tag_type (void *, const char *, debug_type);
 
 /* Record the size of a given type.  */
 
-extern bfd_boolean debug_record_type_size (void *, debug_type, unsigned int);
+extern bool debug_record_type_size (void *, debug_type, unsigned int);
 
 /* Find a named type.  */
 
@@ -738,11 +735,11 @@ extern debug_type debug_get_return_type (void *, debug_type);
    method type (actually, parameter types are not currently stored for
    function types).  This may be used to determine whether a method
    type is a stub method or not.  The last argument points to a
-   bfd_boolean which is set to TRUE if the function takes a variable
+   bool which is set to TRUE if the function takes a variable
    number of arguments.  */
 
 extern const debug_type *debug_get_parameter_types
-  (void *, debug_type, bfd_boolean *);
+  (void *, debug_type, bool *);
 
 /* Get the target type of a pointer or reference or const or volatile
    type.  */
@@ -786,7 +783,7 @@ extern const char *debug_get_field_physname (void *, debug_field);
    first void * is the debugging handle.  The second void * is a handle
    which is passed to the functions.  */
 
-extern bfd_boolean debug_write
+extern bool debug_write
   (void *, const struct debug_write_fns *, void *);
 
 #endif /* DEBUG_H */
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index b7fdebc66f8..b26c17852e3 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -355,7 +355,7 @@ static char *exp_name;
 static char *imp_name;
 static char *delayimp_name;
 static char *identify_imp_name;
-static bfd_boolean identify_strict;
+static bool identify_strict;
 
 /* Types used to implement a linked list of dllnames associated
    with the specified import lib. Used by the identify_* code.
@@ -376,14 +376,14 @@ typedef struct dll_name_list_t
 /* Types used to pass data to iterator functions.  */
 typedef struct symname_search_data_t
 {
-  const char * symname;
-  bfd_boolean  found;
+  const char *symname;
+  bool found;
 } symname_search_data_type;
 
 typedef struct identify_data_t
 {
-   dll_name_list_type * list;
-   bfd_boolean          ms_style_implib;
+   dll_name_list_type *list;
+   bool ms_style_implib;
 } identify_data_type;
 
 
@@ -403,23 +403,23 @@ static int dontdeltemps = 0;
 
 /* TRUE if we should export all symbols.  Otherwise, we only export
    symbols listed in .drectve sections or in the def file.  */
-static bfd_boolean export_all_symbols;
+static bool export_all_symbols;
 
 /* TRUE if we should exclude the symbols in DEFAULT_EXCLUDES when
    exporting all symbols.  */
-static bfd_boolean do_default_excludes = TRUE;
+static bool do_default_excludes = true;
 
-static bfd_boolean use_nul_prefixed_import_tables = FALSE;
+static bool use_nul_prefixed_import_tables = false;
 
 /* Default symbols to exclude when exporting all the symbols.  */
 static const char *default_excludes = "DllMain@12,DllEntryPoint@0,impure_ptr";
 
 /* TRUE if we should add __imp_<SYMBOL> to import libraries for backward
    compatibility to old Cygwin releases.  */
-static bfd_boolean create_compat_implib;
+static bool create_compat_implib;
 
 /* TRUE if we have to write PE+ import libraries.  */
-static bfd_boolean create_for_pep;
+static bool create_for_pep;
 
 static char *def_file;
 
@@ -611,7 +611,7 @@ struct mac
   int how_dljtab_roff1; /* Offset for the ind 32 reloc into idata 5.  */
   int how_dljtab_roff2; /* Offset for the ind 32 reloc into idata 5.  */
   int how_dljtab_roff3; /* Offset for the ind 32 reloc into idata 5.  */
-  bfd_boolean how_seh;
+  bool how_seh;
   const char *trampoline;
 };
 
@@ -625,7 +625,7 @@ mtable[] =
     ".global", ".space", ".align\t2",".align\t4", "-mapcs-32",
     "pe-arm-little", bfd_arch_arm,
     arm_jtab, sizeof (arm_jtab), 8,
-    0, 0, 0, 0, 0, FALSE, 0
+    0, 0, 0, 0, 0, false, 0
   }
   ,
   {
@@ -634,7 +634,7 @@ mtable[] =
     "jmp *", ".global", ".space", ".align\t2",".align\t4", "",
     "pe-i386",bfd_arch_i386,
     i386_jtab, sizeof (i386_jtab), 2,
-    i386_dljtab, sizeof (i386_dljtab), 2, 7, 12, FALSE, i386_trampoline
+    i386_dljtab, sizeof (i386_dljtab), 2, 7, 12, false, i386_trampoline
   }
   ,
   {
@@ -644,7 +644,7 @@ mtable[] =
     ".global", ".space", ".align\t2",".align\t4", "-mthumb-interwork",
     "pe-arm-little", bfd_arch_arm,
     thumb_jtab, sizeof (thumb_jtab), 12,
-    0, 0, 0, 0, 0, FALSE, 0
+    0, 0, 0, 0, 0, false, 0
   }
   ,
 #define MARM_INTERWORK 3
@@ -654,7 +654,7 @@ mtable[] =
     ".global", ".space", ".align\t2",".align\t4", "-mthumb-interwork",
     "pe-arm-little", bfd_arch_arm,
     arm_interwork_jtab, sizeof (arm_interwork_jtab), 12,
-    0, 0, 0, 0, 0, FALSE, 0
+    0, 0, 0, 0, 0, false, 0
   }
   ,
   {
@@ -664,7 +664,7 @@ mtable[] =
     ".global", ".space", ".align\t2",".align\t4", "",
     "pe-mcore-big", bfd_arch_mcore,
     mcore_be_jtab, sizeof (mcore_be_jtab), 8,
-    0, 0, 0, 0, 0, FALSE, 0
+    0, 0, 0, 0, 0, false, 0
   }
   ,
   {
@@ -674,7 +674,7 @@ mtable[] =
     ".global", ".space", ".align\t2",".align\t4", "-EL",
     "pe-mcore-little", bfd_arch_mcore,
     mcore_le_jtab, sizeof (mcore_le_jtab), 8,
-    0, 0, 0, 0, 0, FALSE, 0
+    0, 0, 0, 0, 0, false, 0
   }
   ,
   {
@@ -684,7 +684,7 @@ mtable[] =
     ".global", ".space", ".align\t2",".align\t4", "",
     "elf32-mcore-big", bfd_arch_mcore,
     mcore_be_jtab, sizeof (mcore_be_jtab), 8,
-    0, 0, 0, 0, 0, FALSE, 0
+    0, 0, 0, 0, 0, false, 0
   }
   ,
   {
@@ -694,7 +694,7 @@ mtable[] =
     ".global", ".space", ".align\t2",".align\t4", "-EL",
     "elf32-mcore-little", bfd_arch_mcore,
     mcore_le_jtab, sizeof (mcore_le_jtab), 8,
-    0, 0, 0, 0, 0, FALSE, 0
+    0, 0, 0, 0, 0, false, 0
   }
   ,
   {
@@ -704,7 +704,7 @@ mtable[] =
     ".global", ".space", ".align\t2",".align\t4", "-mapcs-32",
     "pe-arm-wince-little", bfd_arch_arm,
     arm_jtab, sizeof (arm_jtab), 8,
-    0, 0, 0, 0, 0, FALSE, 0
+    0, 0, 0, 0, 0, false, 0
   }
   ,
   {
@@ -713,7 +713,7 @@ mtable[] =
     "jmp *", ".global", ".space", ".align\t2",".align\t4", "",
     "pe-x86-64",bfd_arch_i386,
     i386_jtab, sizeof (i386_jtab), 2,
-    i386_x64_dljtab, sizeof (i386_x64_dljtab), 2, 9, 14, TRUE, i386_x64_trampoline
+    i386_x64_dljtab, sizeof (i386_x64_dljtab), 2, 9, 14, true, i386_x64_trampoline
   }
   ,
   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -762,7 +762,7 @@ static void run (const char *, char *);
 static void scan_drectve_symbols (bfd *);
 static void scan_filtered_symbols (bfd *, void *, long, unsigned int);
 static void add_excludes (const char *);
-static bfd_boolean match_exclude (const char *);
+static bool match_exclude (const char *);
 static void set_default_excludes (void);
 static long filter_symbols (bfd *, void *, long, unsigned int);
 static void scan_all_symbols (bfd *);
@@ -793,7 +793,7 @@ static void identify_dll_for_implib (void);
 static void identify_search_archive
   (bfd *, void (*) (bfd *, bfd *, void *),  void *);
 static void identify_search_member (bfd *, bfd *, void *);
-static bfd_boolean identify_process_section_p (asection *, bfd_boolean);
+static bool identify_process_section_p (asection *, bool);
 static void identify_search_section (bfd *, asection *, void *);
 static void identify_member_contains_symname (bfd *, bfd  *, void *);
 
@@ -1445,7 +1445,7 @@ scan_filtered_symbols (bfd *abfd, void *minisyms, long symcount,
       asymbol *sym;
       const char *symbol_name;
 
-      sym = bfd_minisymbol_to_symbol (abfd, FALSE, from, store);
+      sym = bfd_minisymbol_to_symbol (abfd, false, from, store);
       if (sym == NULL)
 	bfd_fatal (bfd_get_filename (abfd));
 
@@ -1504,15 +1504,15 @@ add_excludes (const char *new_excludes)
 
 /* See if STRING is on the list of symbols to exclude.  */
 
-static bfd_boolean
+static bool
 match_exclude (const char *string)
 {
   struct string_list *excl_item;
 
   for (excl_item = excludes; excl_item; excl_item = excl_item->next)
     if (strcmp (string, excl_item->string) == 0)
-      return TRUE;
-  return FALSE;
+      return true;
+  return false;
 }
 
 /* Add the default list of symbols to exclude.  */
@@ -1544,7 +1544,7 @@ filter_symbols (bfd *abfd, void *minisyms, long symcount, unsigned int size)
       int keep = 0;
       asymbol *sym;
 
-      sym = bfd_minisymbol_to_symbol (abfd, FALSE, (const void *) from, store);
+      sym = bfd_minisymbol_to_symbol (abfd, false, (const void *) from, store);
       if (sym == NULL)
 	bfd_fatal (bfd_get_filename (abfd));
 
@@ -1589,7 +1589,7 @@ scan_all_symbols (bfd *abfd)
       return;
     }
 
-  symcount = bfd_read_minisymbols (abfd, FALSE, &minisyms, &size);
+  symcount = bfd_read_minisymbols (abfd, false, &minisyms, &size);
   if (symcount < 0)
     bfd_fatal (bfd_get_filename (abfd));
 
@@ -3195,7 +3195,7 @@ identify_member_contains_symname (bfd  * abfd,
                    search_data->symname,
                    strlen (search_data->symname)) == 0)
 	{
-	  search_data->found = TRUE;
+	  search_data->found = true;
 	  break;
 	}
     }
@@ -3229,11 +3229,11 @@ identify_dll_for_implib (void)
 
   /* Initialize identify_data.  */
   identify_data.list = dll_name_list_create ();
-  identify_data.ms_style_implib = FALSE;
+  identify_data.ms_style_implib = false;
 
   /* Initialize search_data.  */
   search_data.symname = "__NULL_IMPORT_DESCRIPTOR";
-  search_data.found = FALSE;
+  search_data.found = false;
 
   if (bfd_init () != BFD_INIT_MAGIC)
     fatal (_("fatal error: libbfd ABI mismatch"));
@@ -3257,7 +3257,7 @@ identify_dll_for_implib (void)
 			   identify_member_contains_symname,
 			   (void *)(& search_data));
   if (search_data.found)
-    identify_data.ms_style_implib = TRUE;
+    identify_data.ms_style_implib = true;
 
   /* Rewind the bfd.  */
   if (! bfd_close (abfd))
@@ -3372,8 +3372,8 @@ identify_search_member (bfd  *abfd,
    By default, this is .idata$7 (.idata$6 if the import library is
    ms-style).  */
 
-static bfd_boolean
-identify_process_section_p (asection * section, bfd_boolean ms_style_implib)
+static bool
+identify_process_section_p (asection * section, bool ms_style_implib)
 {
   static const char * SECTION_NAME = ".idata$7";
   static const char * MS_SECTION_NAME = ".idata$6";
@@ -3382,8 +3382,8 @@ identify_process_section_p (asection * section, bfd_boolean [...]

[diff truncated at 100000 bytes]


More information about the Binutils-cvs mailing list