s/boolean/bfd_boolean/ s/true/TRUE/ s/false/FALSE/. Simplify

comparisons of bfd_boolean vars with TRUE/FALSE.  Formatting.

1 files changed, 189 insertions, 185 deletions

diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index c1302ee..4e61388 100644
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
@@ -28,25 +28,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "coff/internal.h"
 #include "libcoff.h"
 
-static boolean coff_link_add_object_symbols
+static bfd_boolean coff_link_add_object_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean coff_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean coff_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean coff_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *));
-static char *dores_com PARAMS ((char *, bfd *, int));
-static char *get_name PARAMS ((char *, char **));
+static bfd_boolean coff_link_check_archive_element
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean coff_link_check_ar_symbols
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean coff_link_add_symbols
+  PARAMS ((bfd *, struct bfd_link_info *));
+static char *dores_com
+  PARAMS ((char *, bfd *, int));
+static char *get_name
+  PARAMS ((char *, char **));
 static int process_embedded_commands
   PARAMS ((bfd *, struct bfd_link_info *, bfd *));
-static void mark_relocs PARAMS ((struct coff_final_link_info *, bfd *));
+static void mark_relocs
+  PARAMS ((struct coff_final_link_info *, bfd *));
 
-/* Return true if SYM is a weak, external symbol.  */
+/* Return TRUE if SYM is a weak, external symbol.  */
 #define IS_WEAK_EXTERNAL(abfd, sym)			\
   ((sym).n_sclass == C_WEAKEXT				\
    || (obj_pe (abfd) && (sym).n_sclass == C_NT_WEAK))
 
-/* Return true if SYM is an external symbol.  */
+/* Return TRUE if SYM is an external symbol.  */
 #define IS_EXTERNAL(abfd, sym)				\
   ((sym).n_sclass == C_EXT || IS_WEAK_EXTERNAL (abfd, sym))
 
@@ -98,7 +102,7 @@ _bfd_coff_link_hash_newfunc (entry, table, string)
 
 /* Initialize a COFF linker hash table.  */
 
-boolean
+bfd_boolean
 _bfd_coff_link_hash_table_init (table, abfd, newfunc)
      struct coff_link_hash_table *table;
      bfd *abfd;
@@ -166,7 +170,7 @@ _bfd_coff_debug_merge_hash_newfunc (entry, table, string)
 /* Given a COFF BFD, add symbols to the global hash table as
    appropriate.  */
 
-boolean
+bfd_boolean
 _bfd_coff_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -180,28 +184,28 @@ _bfd_coff_link_add_symbols (abfd, info)
 	      (abfd, info, coff_link_check_archive_element));
     default:
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 }
 
 /* Add symbols from a COFF object file.  */
 
-static boolean
+static bfd_boolean
 coff_link_add_object_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   if (! _bfd_coff_get_external_symbols (abfd))
-    return false;
+    return FALSE;
   if (! coff_link_add_symbols (abfd, info))
-    return false;
+    return FALSE;
 
   if (! info->keep_memory)
     {
       if (! _bfd_coff_free_symbols (abfd))
-	return false;
+	return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 /* Check a single archive element to see if we need to include it in
@@ -209,47 +213,47 @@ coff_link_add_object_symbols (abfd, info)
    needed in the link or not.  This is called via
    _bfd_generic_link_add_archive_symbols.  */
 
-static boolean
+static bfd_boolean
 coff_link_check_archive_element (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
   if (! _bfd_coff_get_external_symbols (abfd))
-    return false;
+    return FALSE;
 
   if (! coff_link_check_ar_symbols (abfd, info, pneeded))
-    return false;
+    return FALSE;
 
   if (*pneeded)
     {
       if (! coff_link_add_symbols (abfd, info))
-	return false;
+	return FALSE;
     }
 
   if (! info->keep_memory || ! *pneeded)
     {
       if (! _bfd_coff_free_symbols (abfd))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Look through the symbols to see if this object file should be
    included in the link.  */
 
-static boolean
+static bfd_boolean
 coff_link_check_ar_symbols (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
   bfd_size_type symesz;
   bfd_byte *esym;
   bfd_byte *esym_end;
 
-  *pneeded = false;
+  *pneeded = FALSE;
 
   symesz = bfd_coff_symesz (abfd);
   esym = (bfd_byte *) obj_coff_external_syms (abfd);
@@ -274,8 +278,8 @@ coff_link_check_ar_symbols (abfd, info, pneeded)
 
 	  name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
 	  if (name == NULL)
-	    return false;
-	  h = bfd_link_hash_lookup (info->hash, name, false, false, true);
+	    return FALSE;
+	  h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
 
 	  /* auto import */
 	  if (!h && info->pei386_auto_import)
@@ -283,8 +287,8 @@ coff_link_check_ar_symbols (abfd, info, pneeded)
 	      if (!strncmp (name,"__imp_", 6))
 		{
 		  h =
-                    bfd_link_hash_lookup (info->hash, name + 6, false, false,
-                                          true);
+                    bfd_link_hash_lookup (info->hash, name + 6, FALSE, FALSE,
+                                          TRUE);
 		}
 	    }
 	  /* We are only interested in symbols that are currently
@@ -295,9 +299,9 @@ coff_link_check_ar_symbols (abfd, info, pneeded)
 	      && h->type == bfd_link_hash_undefined)
 	    {
 	      if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-		return false;
-	      *pneeded = true;
-	      return true;
+		return FALSE;
+	      *pneeded = TRUE;
+	      return TRUE;
 	    }
 	}
 
@@ -305,12 +309,12 @@ coff_link_check_ar_symbols (abfd, info, pneeded)
     }
 
   /* We do not need this object file.  */
-  return true;
+  return TRUE;
 }
 
 /* Add all the symbols from an object file to the hash table.  */
 
-static boolean
+static bfd_boolean
 coff_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -318,8 +322,8 @@ coff_link_add_symbols (abfd, info)
   unsigned int n_tmask = coff_data (abfd)->local_n_tmask;
   unsigned int n_btshft = coff_data (abfd)->local_n_btshft;
   unsigned int n_btmask = coff_data (abfd)->local_n_btmask;
-  boolean keep_syms;
-  boolean default_copy;
+  bfd_boolean keep_syms;
+  bfd_boolean default_copy;
   bfd_size_type symcount;
   struct coff_link_hash_entry **sym_hash;
   bfd_size_type symesz;
@@ -330,12 +334,12 @@ coff_link_add_symbols (abfd, info)
   /* Keep the symbols during this function, in case the linker needs
      to read the generic symbols in order to report an error message.  */
   keep_syms = obj_coff_keep_syms (abfd);
-  obj_coff_keep_syms (abfd) = true;
+  obj_coff_keep_syms (abfd) = TRUE;
 
   if (info->keep_memory)
-    default_copy = false;
+    default_copy = FALSE;
   else
-    default_copy = true;
+    default_copy = TRUE;
 
   symcount = obj_raw_syment_count (abfd);
 
@@ -355,7 +359,7 @@ coff_link_add_symbols (abfd, info)
     {
       struct internal_syment sym;
       enum coff_symbol_classification classification;
-      boolean copy;
+      bfd_boolean copy;
 
       bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym);
 
@@ -367,7 +371,7 @@ coff_link_add_symbols (abfd, info)
 	  flagword flags;
 	  asection *section;
 	  bfd_vma value;
-	  boolean addit;
+	  bfd_boolean addit;
 
 	  /* This symbol is externally visible.  */
 
@@ -380,7 +384,7 @@ coff_link_add_symbols (abfd, info)
 	  copy = default_copy;
 	  if (sym._n._n_n._n_zeroes != 0
 	      || sym._n._n_n._n_offset == 0)
-	    copy = true;
+	    copy = TRUE;
 
 	  value = sym.n_value;
 
@@ -415,7 +419,7 @@ coff_link_add_symbols (abfd, info)
 	  if (IS_WEAK_EXTERNAL (abfd, sym))
 	    flags = BSF_WEAK;
 
-	  addit = true;
+	  addit = TRUE;
 
 	  /* In the PE format, section symbols actually refer to the
              start of the output section.  We handle them specially
@@ -423,7 +427,7 @@ coff_link_add_symbols (abfd, info)
 	  if (obj_pe (abfd) && (flags & BSF_SECTION_SYM) != 0)
 	    {
 	      *sym_hash = coff_link_hash_lookup (coff_hash_table (info),
-						 name, false, copy, false);
+						 name, FALSE, copy, FALSE);
 	      if (*sym_hash != NULL)
 		{
 		  if (((*sym_hash)->coff_link_hash_flags
@@ -434,7 +438,7 @@ coff_link_add_symbols (abfd, info)
 		      ("Warning: symbol `%s' is both section and non-section",
 		       name);
 
-		  addit = false;
+		  addit = FALSE;
 		}
 	    }
 
@@ -469,20 +473,20 @@ coff_link_add_symbols (abfd, info)
 	    {
 	      if (*sym_hash == NULL)
 		*sym_hash = coff_link_hash_lookup (coff_hash_table (info),
-						   name, false, copy, false);
+						   name, FALSE, copy, FALSE);
 	      if (*sym_hash != NULL
 		  && (*sym_hash)->root.type == bfd_link_hash_defined
 		  && (*sym_hash)->root.u.def.section->comdat != NULL
 		  && strcmp ((*sym_hash)->root.u.def.section->comdat->name,
 			     section->comdat->name) == 0)
-		addit = false;
+		addit = FALSE;
 	    }
 
 	  if (addit)
 	    {
 	      if (! (bfd_coff_link_add_one_symbol
 		     (info, abfd, name, flags, section, value,
-		      (const char *) NULL, copy, false,
+		      (const char *) NULL, copy, FALSE,
 		      (struct bfd_link_hash_entry **) sym_hash)))
 		goto error_return;
 	    }
@@ -634,24 +638,24 @@ coff_link_add_symbols (abfd, info)
 
   obj_coff_keep_syms (abfd) = keep_syms;
 
-  return true;
+  return TRUE;
 
  error_return:
   obj_coff_keep_syms (abfd) = keep_syms;
-  return false;
+  return FALSE;
 }
 
 /* Do the final link step.  */
 
-boolean
+bfd_boolean
 _bfd_coff_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   bfd_size_type symesz;
   struct coff_final_link_info finfo;
-  boolean debug_merge_allocated;
-  boolean long_section_names;
+  bfd_boolean debug_merge_allocated;
+  bfd_boolean long_section_names;
   asection *o;
   struct bfd_link_order *p;
   bfd_size_type max_sym_count;
@@ -684,8 +688,8 @@ _bfd_coff_final_link (abfd, info)
   finfo.contents = NULL;
   finfo.external_relocs = NULL;
   finfo.internal_relocs = NULL;
-  finfo.global_to_static = false;
-  debug_merge_allocated = false;
+  finfo.global_to_static = FALSE;
+  debug_merge_allocated = FALSE;
 
   coff_data (abfd)->link_info = info;
 
@@ -695,7 +699,7 @@ _bfd_coff_final_link (abfd, info)
 
   if (! coff_debug_merge_hash_table_init (&finfo.debug_merge))
     goto error_return;
-  debug_merge_allocated = true;
+  debug_merge_allocated = TRUE;
 
   /* Compute the file positions for all the sections.  */
   if (! abfd->output_has_begun)
@@ -712,7 +716,7 @@ _bfd_coff_final_link (abfd, info)
   max_lineno_count = 0;
   max_reloc_count = 0;
 
-  long_section_names = false;
+  long_section_names = FALSE;
   for (o = abfd->sections; o != NULL; o = o->next)
     {
       o->reloc_count = 0;
@@ -729,7 +733,7 @@ _bfd_coff_final_link (abfd, info)
 		 link.  This will normally be every section.  We need
 		 to do this so that we can identify any sections which
 		 the linker has decided to not include.  */
-	      sec->linker_mark = true;
+	      sec->linker_mark = TRUE;
 
 	      if (info->strip == strip_none
 		  || info->strip == strip_some)
@@ -770,11 +774,11 @@ _bfd_coff_final_link (abfd, info)
              table.  This must correspond to the code in
              coff_write_object_contents which puts the string index
              into the s_name field of the section header.  That is why
-             we pass hash as false.  */
-	  if (_bfd_stringtab_add (finfo.strtab, o->name, false, false)
+             we pass hash as FALSE.  */
+	  if (_bfd_stringtab_add (finfo.strtab, o->name, FALSE, FALSE)
 	      == (bfd_size_type) -1)
 	    goto error_return;
-	  long_section_names = true;
+	  long_section_names = TRUE;
 	}
     }
 
@@ -861,7 +865,7 @@ _bfd_coff_final_link (abfd, info)
     {
       size_t sz;
 
-      sub->output_has_begun = false;
+      sub->output_has_begun = FALSE;
       sz = obj_raw_syment_count (sub);
       if (sz > max_sym_count)
 	max_sym_count = sz;
@@ -922,7 +926,7 @@ _bfd_coff_final_link (abfd, info)
 		{
 		  if (! _bfd_coff_link_input_bfd (&finfo, sub))
 		    goto error_return;
-		  sub->output_has_begun = true;
+		  sub->output_has_begun = TRUE;
 		}
 	    }
 	  else if (p->type == bfd_section_reloc_link_order
@@ -945,7 +949,7 @@ _bfd_coff_final_link (abfd, info)
   /* Free up the buffers used by _bfd_coff_link_input_bfd.  */
 
   coff_debug_merge_hash_table_free (&finfo.debug_merge);
-  debug_merge_allocated = false;
+  debug_merge_allocated = FALSE;
 
   if (finfo.internal_syms != NULL)
     {
@@ -998,7 +1002,7 @@ _bfd_coff_final_link (abfd, info)
       pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz;
       if (bfd_seek (abfd, pos, SEEK_SET) != 0
 	  || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz)
-	return false;
+	return FALSE;
     }
 
   /* If doing task linking (ld --task-link) then make a pass through the
@@ -1006,7 +1010,7 @@ _bfd_coff_final_link (abfd, info)
      static.  */
   if (info->task_link)
     {
-      finfo.failed = false;
+      finfo.failed = FALSE;
       coff_link_hash_traverse (coff_hash_table (info),
 			       _bfd_coff_write_task_globals,
 			       (PTR) &finfo);
@@ -1015,7 +1019,7 @@ _bfd_coff_final_link (abfd, info)
     }
 
   /* Write out the global symbols.  */
-  finfo.failed = false;
+  finfo.failed = FALSE;
   coff_link_hash_traverse (coff_hash_table (info),
 			   _bfd_coff_write_global_sym,
 			   (PTR) &finfo);
@@ -1094,7 +1098,7 @@ _bfd_coff_final_link (abfd, info)
   if (coff_hash_table (info)->stab_info != NULL)
     {
       if (! _bfd_write_stab_strings (abfd, &coff_hash_table (info)->stab_info))
-	return false;
+	return FALSE;
     }
 
   /* Write out the string table.  */
@@ -1104,7 +1108,7 @@ _bfd_coff_final_link (abfd, info)
 
       pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz;
       if (bfd_seek (abfd, pos, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
 #if STRING_SIZE_SIZE == 4
       H_PUT_32 (abfd,
@@ -1116,12 +1120,12 @@ _bfd_coff_final_link (abfd, info)
 
       if (bfd_bwrite (strbuf, (bfd_size_type) STRING_SIZE_SIZE, abfd)
 	  != STRING_SIZE_SIZE)
-	return false;
+	return FALSE;
 
       if (! _bfd_stringtab_emit (abfd, finfo.strtab))
-	return false;
+	return FALSE;
 
-      obj_coff_strings_written (abfd) = true;
+      obj_coff_strings_written (abfd) = TRUE;
     }
 
   _bfd_stringtab_free (finfo.strtab);
@@ -1130,7 +1134,7 @@ _bfd_coff_final_link (abfd, info)
      not try to write out the symbols.  */
   bfd_get_symcount (abfd) = 0;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (debug_merge_allocated)
@@ -1168,7 +1172,7 @@ _bfd_coff_final_link (abfd, info)
     free (finfo.internal_relocs);
   if (external_relocs != NULL)
     free (external_relocs);
-  return false;
+  return FALSE;
 }
 
 /* parse out a -heap <reserved>,<commit> line */
@@ -1328,7 +1332,7 @@ mark_relocs (finfo, input_bfd)
 
       /* Read in the relocs.  */
       internal_relocs = _bfd_coff_read_internal_relocs
-	(input_bfd, a, false,
+	(input_bfd, a, FALSE,
 	 finfo->external_relocs,
 	 finfo->info->relocateable,
 	 (finfo->info->relocateable
@@ -1357,7 +1361,7 @@ mark_relocs (finfo, input_bfd)
 /* Link an input file into the linker output file.  This function
    handles all the sections and relocations of the input file at once.  */
 
-boolean
+bfd_boolean
 _bfd_coff_link_input_bfd (finfo, input_bfd)
      struct coff_final_link_info *finfo;
      bfd *input_bfd;
@@ -1367,13 +1371,13 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 #if 0
   unsigned int n_btmask = coff_data (input_bfd)->local_n_btmask;
 #endif
-  boolean (*adjust_symndx) PARAMS ((bfd *, struct bfd_link_info *, bfd *,
-				    asection *, struct internal_reloc *,
-				    boolean *));
+  bfd_boolean (*adjust_symndx)
+    PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+	     struct internal_reloc *, bfd_boolean *));
   bfd *output_bfd;
   const char *strings;
   bfd_size_type syment_base;
-  boolean copy, hash;
+  bfd_boolean copy, hash;
   bfd_size_type isymesz;
   bfd_size_type osymesz;
   bfd_size_type linesz;
@@ -1397,15 +1401,15 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
   linesz = bfd_coff_linesz (input_bfd);
   BFD_ASSERT (linesz == bfd_coff_linesz (output_bfd));
 
-  copy = false;
+  copy = FALSE;
   if (! finfo->info->keep_memory)
-    copy = true;
-  hash = true;
+    copy = TRUE;
+  hash = TRUE;
   if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-    hash = false;
+    hash = FALSE;
 
   if (! _bfd_coff_get_external_symbols (input_bfd))
-    return false;
+    return FALSE;
 
   esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
   esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
@@ -1418,7 +1422,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
   if (coff_data (output_bfd)->pe)
     {
       if (! process_embedded_commands (output_bfd, finfo->info, input_bfd))
-	return false;
+	return FALSE;
     }
 
   /* If we are going to perform relocations and also strip/discard some symbols
@@ -1438,9 +1442,9 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
     {
       struct internal_syment isym;
       enum coff_symbol_classification classification;
-      boolean skip;
-      boolean global;
-      boolean dont_skip_symbol;
+      bfd_boolean skip;
+      bfd_boolean global;
+      bfd_boolean dont_skip_symbol;
       int add;
 
       bfd_coff_swap_sym_in (input_bfd, (PTR) esym, (PTR) isymp);
@@ -1476,17 +1480,17 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	  && finfo->info->relocateable)
 	dont_skip_symbol = *indexp;
       else
-	dont_skip_symbol = false;
+	dont_skip_symbol = FALSE;
 
       *indexp = -1;
 
-      skip = false;
-      global = false;
+      skip = FALSE;
+      global = FALSE;
       add = 1 + isym.n_numaux;
 
       /* If we are stripping all symbols, we want to skip this one.  */
       if (finfo->info->strip == strip_all && ! dont_skip_symbol)
-	skip = true;
+	skip = TRUE;
 
       if (! skip)
 	{
@@ -1501,22 +1505,22 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 		 end of the symbol table, so skip them for now.
 		 Locally defined function symbols, however, are an
 		 exception, and are not moved to the end.  */
-	      global = true;
+	      global = TRUE;
 	      if (! ISFCN (isym.n_type))
-		skip = true;
+		skip = TRUE;
 	      break;
 
 	    case COFF_SYMBOL_UNDEFINED:
 	      /* Undefined symbols are left for the end.  */
-	      global = true;
-	      skip = true;
+	      global = TRUE;
+	      skip = TRUE;
 	      break;
 
 	    case COFF_SYMBOL_LOCAL:
 	      /* This is a local symbol.  Skip it if we are discarding
                  local symbols.  */
 	      if (finfo->info->discard == discard_all && ! dont_skip_symbol)
-		skip = true;
+		skip = TRUE;
 	      break;
 	    }
 	}
@@ -1530,7 +1534,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
           && isym.n_numaux > 0)
         {
           if ((*secpp)->output_section == bfd_abs_section_ptr)
-            skip = true;
+            skip = TRUE;
         }
 #endif
 
@@ -1552,7 +1556,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 		      || isym.n_sclass == C_REGPARM
 		      || isym.n_sclass == C_FIELD
 		      || isym.n_sclass == C_EOS))))
-	skip = true;
+	skip = TRUE;
 
       /* If some symbols are stripped based on the name, work out the
 	 name and decide whether to skip this symbol.  */
@@ -1565,16 +1569,16 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 
 	  name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
 	  if (name == NULL)
-	    return false;
+	    return FALSE;
 
 	  if (! dont_skip_symbol
 	      && ((finfo->info->strip == strip_some
-		   && (bfd_hash_lookup (finfo->info->keep_hash, name, false,
-				    false) == NULL))
+		   && (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE,
+				    FALSE) == NULL))
 		   || (! global
 		       && finfo->info->discard == discard_l
 		       && bfd_is_local_label_name (input_bfd, name))))
-	    skip = true;
+	    skip = TRUE;
 	}
 
       /* If this is an enum, struct, or union tag, see if we have
@@ -1598,7 +1602,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 
 	  name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
 	  if (name == NULL)
-	    return false;
+	    return FALSE;
 
 	  /* Ignore fake names invented by compiler; treat them all as
              the same name.  */
@@ -1608,9 +1612,9 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	    name = "";
 
 	  mh = coff_debug_merge_hash_lookup (&finfo->debug_merge, name,
-					     true, true);
+					     TRUE, TRUE);
 	  if (mh == NULL)
-	    return false;
+	    return FALSE;
 
 	  /* Allocate memory to hold type information.  If this turns
              out to be a duplicate, we pass this address to
@@ -1618,7 +1622,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	  amt = sizeof (struct coff_debug_merge_type);
 	  mt = (struct coff_debug_merge_type *) bfd_alloc (input_bfd, amt);
 	  if (mt == NULL)
-	    return false;
+	    return FALSE;
 	  mt->class = isym.n_sclass;
 
 	  /* Pick up the aux entry, which points to the end of the tag
@@ -1646,17 +1650,17 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	      *epp = ((struct coff_debug_merge_element *)
 		      bfd_alloc (input_bfd, amt));
 	      if (*epp == NULL)
-		return false;
+		return FALSE;
 
 	      elename = _bfd_coff_internal_syment_name (input_bfd, islp,
 							elebuf);
 	      if (elename == NULL)
-		return false;
+		return FALSE;
 
 	      amt = strlen (elename) + 1;
 	      name_copy = (char *) bfd_alloc (input_bfd, amt);
 	      if (name_copy == NULL)
-		return false;
+		return FALSE;
 	      strcpy (name_copy, elename);
 
 	      (*epp)->name = name_copy;
@@ -1740,7 +1744,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 		  bfd_release (input_bfd, (PTR) mt);
 		  *indexp = mtl->indx;
 		  add = (eslend - esym) / isymesz;
-		  skip = true;
+		  skip = TRUE;
 		}
 	    }
 	}
@@ -1764,10 +1768,10 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	      name = _bfd_coff_internal_syment_name (input_bfd, &isym,
 						     (char *) NULL);
 	      if (name == NULL)
-		return false;
+		return FALSE;
 	      indx = _bfd_stringtab_add (finfo->strtab, name, hash, copy);
 	      if (indx == (bfd_size_type) -1)
-		return false;
+		return FALSE;
 	      isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
 	    }
 
@@ -1866,7 +1870,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 		      pos += finfo->last_file_index * osymesz;
 		      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
 			  || bfd_bwrite (outsym, osymesz, output_bfd) != osymesz)
-			return false;
+			return FALSE;
 		    }
 		}
 
@@ -1899,7 +1903,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 		  /* This can happen if there were errors earlier in
                      the link.  */
 		  bfd_set_error (bfd_error_bad_value);
-		  return false;
+		  return FALSE;
 		}
 	      h->indx = output_index;
 	    }
@@ -1995,13 +1999,13 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 			{
 			  strings = _bfd_coff_read_string_table (input_bfd);
 			  if (strings == NULL)
-			    return false;
+			    return FALSE;
 			}
 		      filename = strings + auxp->x_file.x_n.x_offset;
 		      indx = _bfd_stringtab_add (finfo->strtab, filename,
 						 hash, copy);
 		      if (indx == (bfd_size_type) -1)
-			return false;
+			return FALSE;
 		      auxp->x_file.x_n.x_offset = STRING_SIZE_SIZE + indx;
 		    }
 		}
@@ -2105,7 +2109,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 			      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
 				  || (bfd_bwrite (outsym, osymesz, output_bfd)
 				      != osymesz))
-				return false;
+				return FALSE;
 			    }
 			}
 
@@ -2151,7 +2155,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	  bfd_byte *eline;
 	  bfd_byte *elineend;
 	  bfd_byte *oeline;
-	  boolean skipping;
+	  bfd_boolean skipping;
 	  file_ptr pos;
 	  bfd_size_type amt;
 
@@ -2171,13 +2175,13 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	  if (bfd_seek (input_bfd, o->line_filepos, SEEK_SET) != 0
 	      || bfd_bread (finfo->linenos, linesz * o->lineno_count,
 			   input_bfd) != linesz * o->lineno_count)
-	    return false;
+	    return FALSE;
 
 	  offset = o->output_section->vma + o->output_offset - o->vma;
 	  eline = finfo->linenos;
 	  oeline = finfo->linenos;
 	  elineend = eline + linesz * o->lineno_count;
-	  skipping = false;
+	  skipping = FALSE;
 	  for (; eline < elineend; eline += linesz)
 	    {
 	      struct internal_lineno iline;
@@ -2203,7 +2207,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 			 with symbol #0) will fail.  We can't regain
 			 the space in the output file, but at least
 			 they're dense.  */
-		      skipping = true;
+		      skipping = TRUE;
 		    }
 		  else
 		    {
@@ -2243,7 +2247,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 						 is.n_numaux, auxptr);
 			}
 
-		      skipping = false;
+		      skipping = FALSE;
 		    }
 
 		  iline.l_addr.l_symndx = indx;
@@ -2262,7 +2266,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	  amt = oeline - finfo->linenos;
 	  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
 	      || bfd_bwrite (finfo->linenos, amt, output_bfd) != amt)
-	    return false;
+	    return FALSE;
 
 	  o->output_section->lineno_count += amt / linesz;
 	}
@@ -2292,7 +2296,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
       amt = outsym - finfo->outsyms;
       if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
 	  || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt)
-	return false;
+	return FALSE;
 
       BFD_ASSERT ((obj_raw_syment_count (output_bfd)
 		   + (outsym - finfo->outsyms) / osymesz)
@@ -2325,7 +2329,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 		bfd_archive_filename (input_bfd),
 		bfd_get_section_name (input_bfd, o)));
 	      bfd_set_error (bfd_error_no_contents);
-	      return false;
+	      return FALSE;
 	    }
 
 	  continue;
@@ -2338,7 +2342,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	{
 	  if (! bfd_get_section_contents (input_bfd, o, finfo->contents,
 					  (file_ptr) 0, o->_raw_size))
-	    return false;
+	    return FALSE;
 	  contents = finfo->contents;
 	}
 
@@ -2351,14 +2355,14 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	  /* Read in the relocs.  */
 	  target_index = o->output_section->target_index;
 	  internal_relocs = (_bfd_coff_read_internal_relocs
-			     (input_bfd, o, false, finfo->external_relocs,
+			     (input_bfd, o, FALSE, finfo->external_relocs,
 			      finfo->info->relocateable,
 			      (finfo->info->relocateable
 			       ? (finfo->section_info[target_index].relocs
 				  + o->output_section->reloc_count)
 			       : finfo->internal_relocs)));
 	  if (internal_relocs == NULL)
-	    return false;
+	    return FALSE;
 
 	  /* Call processor specific code to relocate the section
              contents.  */
@@ -2368,7 +2372,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 					   internal_relocs,
 					   finfo->internal_syms,
 					   finfo->sec_ptrs))
-	    return false;
+	    return FALSE;
 
 	  if (finfo->info->relocateable)
 	    {
@@ -2384,7 +2388,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 	      for (; irel < irelend; irel++, rel_hash++)
 		{
 		  struct coff_link_hash_entry *h;
-		  boolean adjusted;
+		  bfd_boolean adjusted;
 
 		  *rel_hash = NULL;
 
@@ -2400,7 +2404,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 		      if (! (*adjust_symndx) (output_bfd, finfo->info,
 					      input_bfd, o, irel,
 					      &adjusted))
-			return false;
+			return FALSE;
 		      if (adjusted)
 			continue;
 		    }
@@ -2446,12 +2450,12 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 			  name = (_bfd_coff_internal_syment_name
 				  (input_bfd, is, buf));
 			  if (name == NULL)
-			    return false;
+			    return FALSE;
 
 			  if (! ((*finfo->info->callbacks->unattached_reloc)
 				 (finfo->info, name, input_bfd, o,
 				  irel->r_vaddr)))
-			    return false;
+			    return FALSE;
 			}
 		    }
 		}
@@ -2468,29 +2472,29 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
 			       ? o->_cooked_size : o->_raw_size);
 	  if (! bfd_set_section_contents (output_bfd, o->output_section,
 					  contents, loc, amt))
-	    return false;
+	    return FALSE;
 	}
       else
 	{
 	  if (! (_bfd_write_section_stabs
 		 (output_bfd, &coff_hash_table (finfo->info)->stab_info,
 		  o, &secdata->stab_info, contents)))
-	    return false;
+	    return FALSE;
 	}
     }
 
   if (! finfo->info->keep_memory)
     {
       if (! _bfd_coff_free_symbols (input_bfd))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out a global symbol.  Called via coff_link_hash_traverse.  */
 
-boolean
+bfd_boolean
 _bfd_coff_write_global_sym (h, data)
      struct coff_link_hash_entry *h;
      PTR data;
@@ -2508,19 +2512,19 @@ _bfd_coff_write_global_sym (h, data)
     {
       h = (struct coff_link_hash_entry *) h->root.u.i.link;
       if (h->root.type == bfd_link_hash_new)
-	return true;
+	return TRUE;
     }
 
   if (h->indx >= 0)
-    return true;
+    return TRUE;
 
   if (h->indx != -2
       && (finfo->info->strip == strip_all
 	  || (finfo->info->strip == strip_some
 	      && (bfd_hash_lookup (finfo->info->keep_hash,
-				   h->root.root.string, false, false)
+				   h->root.root.string, FALSE, FALSE)
 		  == NULL))))
-    return true;
+    return TRUE;
 
   switch (h->root.type)
     {
@@ -2528,7 +2532,7 @@ _bfd_coff_write_global_sym (h, data)
     case bfd_link_hash_new:
     case bfd_link_hash_warning:
       abort ();
-      return false;
+      return FALSE;
 
     case bfd_link_hash_undefined:
     case bfd_link_hash_undefweak:
@@ -2560,25 +2564,25 @@ _bfd_coff_write_global_sym (h, data)
 
     case bfd_link_hash_indirect:
       /* Just ignore these.  They can't be handled anyhow.  */
-      return true;
+      return TRUE;
     }
 
   if (strlen (h->root.root.string) <= SYMNMLEN)
     strncpy (isym._n._n_name, h->root.root.string, SYMNMLEN);
   else
     {
-      boolean hash;
+      bfd_boolean hash;
       bfd_size_type indx;
 
-      hash = true;
+      hash = TRUE;
       if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-	hash = false;
+	hash = FALSE;
       indx = _bfd_stringtab_add (finfo->strtab, h->root.root.string, hash,
-				 false);
+				 FALSE);
       if (indx == (bfd_size_type) -1)
 	{
-	  finfo->failed = true;
-	  return false;
+	  finfo->failed = TRUE;
+	  return FALSE;
 	}
       isym._n._n_n._n_zeroes = 0;
       isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
@@ -2597,7 +2601,7 @@ _bfd_coff_write_global_sym (h, data)
   if (finfo->global_to_static)
     {
       if (! IS_EXTERNAL (output_bfd, isym))
-	return true;
+	return TRUE;
 
       isym.n_sclass = C_STAT;
     }
@@ -2621,8 +2625,8 @@ _bfd_coff_write_global_sym (h, data)
   if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
       || bfd_bwrite (finfo->outsyms, symesz, output_bfd) != symesz)
     {
-      finfo->failed = true;
-      return false;
+      finfo->failed = TRUE;
+      return FALSE;
     }
 
   h->indx = obj_raw_syment_count (output_bfd);
@@ -2691,27 +2695,27 @@ _bfd_coff_write_global_sym (h, data)
 			     (PTR) finfo->outsyms);
       if (bfd_bwrite (finfo->outsyms, symesz, output_bfd) != symesz)
 	{
-	  finfo->failed = true;
-	  return false;
+	  finfo->failed = TRUE;
+	  return FALSE;
 	}
       ++obj_raw_syment_count (output_bfd);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out task global symbols, converting them to statics.  Called
    via coff_link_hash_traverse.  Calls bfd_coff_write_global_sym to do
    the dirty work, if the symbol we are processing needs conversion.  */
 
-boolean
+bfd_boolean
 _bfd_coff_write_task_globals (h, data)
      struct coff_link_hash_entry *h;
      PTR data;
 {
   struct coff_final_link_info *finfo = (struct coff_final_link_info *) data;
-  boolean rtnval = true;
-  boolean save_global_to_static;
+  bfd_boolean rtnval = TRUE;
+  bfd_boolean save_global_to_static;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct coff_link_hash_entry *) h->root.u.i.link;
@@ -2723,7 +2727,7 @@ _bfd_coff_write_task_globals (h, data)
 	case bfd_link_hash_defined:
 	case bfd_link_hash_defweak:
 	  save_global_to_static = finfo->global_to_static;
-	  finfo->global_to_static = true;
+	  finfo->global_to_static = TRUE;
 	  rtnval = _bfd_coff_write_global_sym (h, data);
 	  finfo->global_to_static = save_global_to_static;
 	  break;
@@ -2736,7 +2740,7 @@ _bfd_coff_write_task_globals (h, data)
 
 /* Handle a link order which is supposed to generate a reloc.  */
 
-boolean
+bfd_boolean
 _bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
      bfd *output_bfd;
      struct coff_final_link_info *finfo;
@@ -2751,7 +2755,7 @@ _bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
   if (howto == NULL)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   if (link_order->u.reloc.p->addend != 0)
@@ -2759,13 +2763,13 @@ _bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
       bfd_size_type size;
       bfd_byte *buf;
       bfd_reloc_status_type rstat;
-      boolean ok;
+      bfd_boolean ok;
       file_ptr loc;
 
       size = bfd_get_reloc_size (howto);
       buf = (bfd_byte *) bfd_zmalloc (size);
       if (buf == NULL)
-	return false;
+	return FALSE;
 
       rstat = _bfd_relocate_contents (howto, output_bfd,
 				      (bfd_vma) link_order->u.reloc.p->addend,\
@@ -2788,7 +2792,7 @@ _bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
 		  (bfd *) NULL, (asection *) NULL, (bfd_vma) 0)))
 	    {
 	      free (buf);
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 	}
@@ -2797,7 +2801,7 @@ _bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
                                      loc, size);
       free (buf);
       if (! ok)
-	return false;
+	return FALSE;
     }
 
   /* Store the reloc information in the right place.  It will get
@@ -2830,7 +2834,7 @@ _bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
       h = ((struct coff_link_hash_entry *)
 	   bfd_wrapped_link_hash_lookup (output_bfd, finfo->info,
 					 link_order->u.reloc.p->u.name,
-					 false, false, true));
+					 FALSE, FALSE, TRUE));
       if (h != NULL)
 	{
 	  if (h->indx >= 0)
@@ -2849,7 +2853,7 @@ _bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
 	  if (! ((*finfo->info->callbacks->unattached_reloc)
 		 (finfo->info, link_order->u.reloc.p->u.name, (bfd *) NULL,
 		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
+	    return FALSE;
 	  irel->r_symndx = 0;
 	}
     }
@@ -2864,13 +2868,13 @@ _bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
 
   ++output_section->reloc_count;
 
-  return true;
+  return TRUE;
 }
 
 /* A basic reloc handling routine which may be used by processors with
    simple relocs.  */
 
-boolean
+bfd_boolean
 _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
 				    input_section, contents, relocs, syms,
 				    sections)
@@ -2911,7 +2915,7 @@ _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
 	  (*_bfd_error_handler)
 	    ("%s: illegal symbol index %ld in relocs",
 	     bfd_archive_filename (input_bfd), symndx);
-	  return false;
+	  return FALSE;
 	}
       else
 	{
@@ -2932,7 +2936,7 @@ _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
       howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
 				       sym, &addend);
       if (howto == NULL)
-	return false;
+	return FALSE;
 
       /* If we are doing a relocateable link, then we can just ignore
          a PC relative reloc that is pcrel_offset.  It will already
@@ -2987,8 +2991,8 @@ _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma, true)))
-		return false;
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
 	    }
 	}
 
@@ -3013,7 +3017,7 @@ _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
 		  != sizeof (long))
 		{
 		  bfd_set_error (bfd_error_system_call);
-		  return false;
+		  return FALSE;
 		}
 	    }
 	}
@@ -3035,7 +3039,7 @@ _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
 	     bfd_archive_filename (input_bfd),
 	     (unsigned long) rel->r_vaddr,
 	     bfd_get_section_name (input_bfd, input_section));
-	  return false;
+	  return FALSE;
 	case bfd_reloc_overflow:
 	  {
 	    const char *name;
@@ -3049,15 +3053,15 @@ _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
 	      {
 		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
 		if (name == NULL)
-		  return false;
+		  return FALSE;
 	      }
 
 	    if (! ((*info->callbacks->reloc_overflow)
 		   (info, name, howto->name, (bfd_vma) 0, input_bfd,
 		    input_section, rel->r_vaddr - input_section->vma)))
-	      return false;
+	      return FALSE;
 	  }
 	}
     }
-  return true;
+  return TRUE;
 }