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

comparisons of bfd_boolean vars with TRUE/FALSE.  Formatting.

272 files changed, 19956 insertions, 19123 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1b349379d78..d4b1167370b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,64 @@
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (TRUE_FALSE_ALREADY_DEFINED, BFD_TRUE_FALSE): Delete.
+	(enum bfd_boolean, boolean): Delete.
+	(bfd_boolean): Typedef to an int.
+	(FALSE, TRUE): Define.
+	* aix386-core.c, aix5ppc-core.c, aout-adobe.c, aout-arm.c, aout-cris.c,
+	aout-encap.c, aout-ns32k.c, aout-target.h, aout-tic30.c, aoutf1.h,
+	aoutx.h, archive.c, archive64.c, archures.c, bfd-in.h, bfd.c, bfdwin.c,
+	binary.c, bout.c, cache.c, cisco-core.c, coff-a29k.c, coff-alpha.c,
+	coff-apollo.c, coff-arm.c, coff-aux.c, coff-h8300.c, coff-h8500.c,
+	coff-i386.c, coff-i860.c, coff-i960.c, coff-ia64.c, coff-m68k.c,
+	coff-m88k.c, coff-mcore.c, coff-mips.c, coff-or32.c, coff-ppc.c,
+	coff-rs6000.c, coff-sh.c, coff-sparc.c, coff-stgo32.c, coff-tic30.c,
+	coff-tic4x.c, coff-tic54x.c, coff-tic80.c, coff-w65.c, coff-we32k.c,
+	coff-z8k.c, coff64-rs6000.c, coffcode.h, coffgen.c, cofflink.c,
+	corefile.c, cpu-a29k.c, cpu-alpha.c, cpu-arc.c, cpu-arm.c, cpu-avr.c,
+	cpu-cris.c, cpu-d10v.c, cpu-d30v.c, cpu-dlx.c, cpu-fr30.c, cpu-frv.c,
+	cpu-h8300.c, cpu-h8500.c, cpu-hppa.c, cpu-i370.c, cpu-i386.c,
+	cpu-i860.c, cpu-i960.c, cpu-ia64.c, cpu-ip2k.c, cpu-m10200.c,
+	cpu-m10300.c, cpu-m32r.c, cpu-m68hc11.c, cpu-m68hc12.c, cpu-m68k.c,
+	cpu-m88k.c, cpu-mcore.c, cpu-mips.c, cpu-mmix.c, cpu-ns32k.c,
+	cpu-openrisc.c, cpu-or32.c, cpu-pdp11.c, cpu-pj.c, cpu-powerpc.c,
+	cpu-rs6000.c, cpu-s390.c, cpu-sh.c, cpu-sparc.c, cpu-tic30.c,
+	cpu-tic4x.c, cpu-tic54x.c, cpu-tic80.c, cpu-v850.c, cpu-vax.c,
+	cpu-w65.c, cpu-we32k.c, cpu-xstormy16.c, cpu-z8k.c, dwarf1.c,
+	dwarf2.c, ecoff.c, ecofflink.c, efi-app-ia32.c, efi-app-ia64.c,
+	elf-bfd.h, elf-eh-frame.c, elf-hppa.h, elf-m10200.c, elf-m10300.c,
+	elf-strtab.c, elf.c, elf32-arc.c, elf32-arm.h, elf32-avr.c,
+	elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c, elf32-fr30.c,
+	elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c, elf32-hppa.h,
+	elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
+	elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
+	elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
+	elf32-pj.c, elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-sh64-com.c,
+	elf32-sh64.c, elf32-sparc.c, elf32-v850.c, elf32-vax.c,
+	elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
+	elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-ppc.h, elf64-s390.c,
+	elf64-sh64.c, elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c,
+	elfarm-oabi.c, elfcode.h, elfcore.h, elflink.c, elflink.h,
+	elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c, elfxx-mips.h,
+	elfxx-target.h, format.c, freebsd.h, genlink.h, hash.c, hp300hpux.c,
+	hppabsd-core.c, hpux-core.c, i386aout.c, i386linux.c, i386lynx.c,
+	i386mach3.c, i386msdos.c, i386os9k.c, ieee.c, ihex.c, irix-core.c,
+	libaout.h, libbfd-in.h, libbfd.c, libcoff-in.h, libecoff.h, libieee.h,
+	libnlm.h, liboasys.h, libpei.h, libxcoff.h, linker.c, lynx-core.c,
+	m68klinux.c, m68klynx.c, mach-o.c, mach-o.h, merge.c, mipsbsd.c,
+	mmo.c, netbsd-core.c, netbsd.h, nlm.c, nlm32-alpha.c, nlm32-i386.c,
+	nlm32-ppc.c, nlm32-sparc.c, nlmcode.h, oasys.c, opncls.c, osf-core.c,
+	pc532-mach.c, pdp11.c, pe-arm.c, pe-i386.c, pe-mcore.c, pe-mips.c,
+	pe-sh.c, peXXigen.c, pef.c, pei-arm.c, pei-i386.c, pei-mcore.c,
+	pei-mips.c, pei-sh.c, peicode.h, ppcboot.c, ptrace-core.c, reloc.c,
+	reloc16.c, riscix.c, rs6000-core.c, sco5-core.c, section.c, simple.c,
+	som.c, som.h, sparclinux.c, sparclynx.c, srec.c, stabs.c, sunos.c,
+	syms.c, targets.c, tekhex.c, ticoff.h, trad-core.c, versados.c,	
+	vms-gsd.c, vms-hdr.c, vms-misc.c, vms-tir.c, vms.c, vms.h,
+	xcoff-target.h, xcofflink.c, xsym.c, xsym.h: Replace boolean with
+	bfd_boolean, true with TRUE, false with FALSE.  Simplify comparisons
+	of bfd_boolean vars with TRUE/FALSE.  Formatting.
+	* bfd-in2.h, libbfd.h, libcoff.h: Regenerate
+
 2002-11-28  Alan Modra  <amodra@bigpond.net.au>
 
 	* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
diff --git a/bfd/aix386-core.c b/bfd/aix386-core.c
index 591397e4a2e..7725b342652 100644
--- a/bfd/aix386-core.c
+++ b/bfd/aix386-core.c
@@ -204,13 +204,13 @@ aix386_core_file_failing_signal (abfd)
   return core_hdr (abfd)->cd_cursig;
 }
 
-static boolean
+static bfd_boolean
 aix386_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd;
      bfd *exec_bfd;
 {
   /* FIXME: We have no way of telling at this point.  */
-  return true;
+  return TRUE;
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
diff --git a/bfd/aix5ppc-core.c b/bfd/aix5ppc-core.c
index 9db4f5468c4..b0a9c5e715e 100644
--- a/bfd/aix5ppc-core.c
+++ b/bfd/aix5ppc-core.c
@@ -28,10 +28,14 @@
 #include "sysdep.h"
 #include "libbfd.h"
 
-const bfd_target * xcoff64_core_p PARAMS ((bfd *));
-boolean            xcoff64_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
-char *             xcoff64_core_file_failing_command PARAMS ((bfd *));
-int                xcoff64_core_file_failing_signal PARAMS ((bfd *));
+const bfd_target *xcoff64_core_p
+  PARAMS ((bfd *));
+bfd_boolean xcoff64_core_file_matches_executable_p
+  PARAMS ((bfd *, bfd *));
+char *xcoff64_core_file_failing_command
+  PARAMS ((bfd *));
+int xcoff64_core_file_failing_signal
+  PARAMS ((bfd *));
 
 /* Aix 5.1 system include file.  */
 
@@ -62,11 +66,11 @@ xcoff64_core_p (abfd)
   if (bfd_seek (abfd, 0, SEEK_SET) != 0)
     goto xcoff64_core_p_error;
 
-  if (sizeof (struct core_dumpxx) 
+  if (sizeof (struct core_dumpxx)
       != bfd_bread (&core, sizeof (struct core_dumpxx), abfd))
     goto xcoff64_core_p_error;
 
-  if (bfd_stat (abfd, &statbuf) < 0) 
+  if (bfd_stat (abfd, &statbuf) < 0)
     goto xcoff64_core_p_error;
 
   /* Sanity checks
@@ -82,24 +86,24 @@ xcoff64_core_p (abfd)
      See rs6000-core.c for comment on size of core
      If there isn't enough of a real core file, bail.  */
 
-  if ((CORE_VERSION_1 != (core.c_flag & CORE_VERSION_1)) 
-      || (0 != core.c_entries) 
-      || (! (IS_PROC64 (&core.c_u.U_proc))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_fdsinfox))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_loader))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_loader + core.c_lsize))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_thr))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_segregion))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_stack))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_stack + core.c_size))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_data))) 
-      || ((CHECK_FILE_OFFSET (statbuf, core.c_data + core.c_datasize))) 
-      || (! (core.c_flag & UBLOCK_VALID)) 
-      || (! (core.c_flag & LE_VALID))) 
+  if ((CORE_VERSION_1 != (core.c_flag & CORE_VERSION_1))
+      || (0 != core.c_entries)
+      || (! (IS_PROC64 (&core.c_u.U_proc)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_fdsinfox)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_loader)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_loader + core.c_lsize)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_thr)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_segregion)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_stack)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_stack + core.c_size)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_data)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_data + core.c_datasize)))
+      || (! (core.c_flag & UBLOCK_VALID))
+      || (! (core.c_flag & LE_VALID)))
     goto xcoff64_core_p_error;
 
   /* Check for trucated stack or general truncating.  */
-  if ((! (core.c_flag & USTACK_VALID)) 
+  if ((! (core.c_flag & USTACK_VALID))
       || (core.c_flag & CORE_TRUNC))
     {
       bfd_set_error (bfd_error_file_truncated);
@@ -109,7 +113,7 @@ xcoff64_core_p (abfd)
 
   new_core_hdr = (struct core_dumpxx *)
     bfd_zalloc (abfd, sizeof (struct core_dumpxx));
-  if (NULL == new_core_hdr) 
+  if (NULL == new_core_hdr)
     return return_value;
 
   memcpy (new_core_hdr, &core, sizeof (struct core_dumpxx));
@@ -117,7 +121,7 @@ xcoff64_core_p (abfd)
 
   /* .stack section.  */
   sec = bfd_make_section_anyway (abfd, ".stack");
-  if (NULL == sec) 
+  if (NULL == sec)
     return return_value;
 
   sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
@@ -127,7 +131,7 @@ xcoff64_core_p (abfd)
 
   /* .reg section for all registers.  */
   sec = bfd_make_section_anyway (abfd, ".reg");
-  if (NULL == sec) 
+  if (NULL == sec)
     return return_value;
 
   sec->flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY;
@@ -138,7 +142,7 @@ xcoff64_core_p (abfd)
 
   /* .ldinfo section.
      To actually find out how long this section is in this particular
-     core dump would require going down the whole list of struct 
+     core dump would require going down the whole list of struct
      ld_info's.   See if we can just fake it.  */
   sec = bfd_make_section_anyway (abfd, ".ldinfo");
   if (NULL == sec)
@@ -152,10 +156,10 @@ xcoff64_core_p (abfd)
   /* AIX 4 adds data sections from loaded objects to the core file,
      which can be found by examining ldinfo, and anonymously mmapped
      regions.  */
-  
+
   /* .data section from executable.  */
   sec = bfd_make_section_anyway (abfd, ".data");
-  if (NULL == sec) 
+  if (NULL == sec)
     return return_value;
 
   sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
@@ -165,20 +169,20 @@ xcoff64_core_p (abfd)
 
   /* .data sections from loaded objects.  */
   ld_offset = core.c_loader;
-	
-  while (1) 
+
+  while (1)
     {
-      if (bfd_seek (abfd, ld_offset, SEEK_SET) != 0) 
+      if (bfd_seek (abfd, ld_offset, SEEK_SET) != 0)
 	return return_value;
 
       if (sizeof (struct __ld_info64) !=
-	  bfd_bread (&ldinfo, sizeof (struct __ld_info64), abfd)) 
+	  bfd_bread (&ldinfo, sizeof (struct __ld_info64), abfd))
 	return return_value;
 
-      if (ldinfo.ldinfo_core) 
+      if (ldinfo.ldinfo_core)
 	{
 	  sec = bfd_make_section_anyway (abfd, ".data");
-	  if (NULL == sec) 
+	  if (NULL == sec)
 	    return return_value;
 
 	  sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
@@ -193,20 +197,20 @@ xcoff64_core_p (abfd)
     }
 
   /* .vmdata sections from anonymously mmapped regions.  */
-  if (core.c_vmregions) 
+  if (core.c_vmregions)
     {
-      if (bfd_seek (abfd, core.c_vmm, SEEK_SET) != 0) 
+      if (bfd_seek (abfd, core.c_vmm, SEEK_SET) != 0)
 	return return_value;
 
-      for (i = 0; i < core.c_vmregions; i++) 
+      for (i = 0; i < core.c_vmregions; i++)
 	if (sizeof (struct vm_infox) !=
-	    bfd_bread (&vminfo, sizeof (struct vm_infox), abfd)) 
+	    bfd_bread (&vminfo, sizeof (struct vm_infox), abfd))
 	  return return_value;
 
-      if (vminfo.vminfo_offset) 
+      if (vminfo.vminfo_offset)
 	{
 	  sec = bfd_make_section_anyway (abfd, ".vmdata");
-	  if (NULL == sec) 
+	  if (NULL == sec)
 	    return return_value;
 
 	  sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
@@ -217,17 +221,17 @@ xcoff64_core_p (abfd)
     }
 
   return_value = abfd->xvec;	/* This is garbage for now.  */
-	
+
  xcoff64_core_p_error:
-  if (bfd_get_error () != bfd_error_system_call) 
+  if (bfd_get_error () != bfd_error_system_call)
     bfd_set_error (bfd_error_wrong_format);
-  
+
   return return_value;
 }
 
-/* Return `true' if given core is from the given executable.  */
+/* Return `TRUE' if given core is from the given executable.  */
 
-boolean
+bfd_boolean
 xcoff64_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd;
      bfd *exec_bfd;
@@ -236,22 +240,22 @@ xcoff64_core_file_matches_executable_p (core_bfd, exec_bfd)
   char *path, *s;
   size_t alloc;
   const char *str1, *str2;
-  boolean return_value = false;
+  bfd_boolean return_value = FALSE;
 
   /* Get the header.  */
-  if (bfd_seek (core_bfd, 0, SEEK_SET) != 0) 
+  if (bfd_seek (core_bfd, 0, SEEK_SET) != 0)
     return return_value;
-	
+
   if (sizeof (struct core_dumpxx) !=
-      bfd_bread (&core, sizeof (struct core_dumpxx), core_bfd)) 
+      bfd_bread (&core, sizeof (struct core_dumpxx), core_bfd))
     return return_value;
 
-  if (bfd_seek (core_bfd, core.c_loader, SEEK_SET) != 0) 
+  if (bfd_seek (core_bfd, core.c_loader, SEEK_SET) != 0)
     return return_value;
 
   alloc = 100;
   path = bfd_malloc (alloc);
-  if (path == NULL) 
+  if (path == NULL)
     return return_value;
 
   s = path;
@@ -264,13 +268,13 @@ xcoff64_core_file_matches_executable_p (core_bfd, exec_bfd)
       if (*s == '\0')
 	break;
       ++s;
-      if (s == path + alloc) 
+      if (s == path + alloc)
 	{
 	  char *n;
 
 	  alloc *= 2;
 	  n = bfd_realloc (path, alloc);
-	  if (n == NULL) 
+	  if (n == NULL)
 	    goto xcoff64_core_file_matches_executable_p_end_1;
 
 	  s = n + (path - s);
@@ -285,8 +289,8 @@ xcoff64_core_file_matches_executable_p (core_bfd, exec_bfd)
   str1 = str1 != NULL ? str1 + 1 : path;
   str2 = str2 != NULL ? str2 + 1 : exec_bfd->filename;
 
-  if (strcmp (str1, str2) == 0) 
-    return_value = true;
+  if (strcmp (str1, str2) == 0)
+    return_value = TRUE;
 
  xcoff64_core_file_matches_executable_p_end_1:
   free (path);
@@ -300,7 +304,7 @@ xcoff64_core_file_failing_command (abfd)
   struct core_dumpxx *c = core_hdr (abfd);
   char *return_value = 0;
 
-  if (NULL != c) 
+  if (NULL != c)
     return_value = c->c_u.U_proc.pi_comm;
 
   return return_value;
@@ -313,7 +317,7 @@ xcoff64_core_file_failing_signal (abfd)
   struct core_dumpxx *c = core_hdr (abfd);
   int return_value = 0;
 
-  if (NULL != c) 
+  if (NULL != c)
     return_value = c->c_signo;
 
   return return_value;
@@ -321,10 +325,14 @@ xcoff64_core_file_failing_signal (abfd)
 
 #else /* AIX_5_CORE */
 
-const bfd_target * xcoff64_core_p PARAMS ((bfd *));
-boolean            xcoff64_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
-char *             xcoff64_core_file_failing_command PARAMS ((bfd *));
-int                xcoff64_core_file_failing_signal PARAMS ((bfd *));
+const bfd_target *xcoff64_core_p
+  PARAMS ((bfd *));
+bfd_boolean xcoff64_core_file_matches_executable_p
+  PARAMS ((bfd *, bfd *));
+char *xcoff64_core_file_failing_command
+  PARAMS ((bfd *));
+int xcoff64_core_file_failing_signal
+  PARAMS ((bfd *));
 
 const bfd_target *
 xcoff64_core_p (abfd)
@@ -334,12 +342,12 @@ xcoff64_core_p (abfd)
   return 0;
 }
 
-boolean
+bfd_boolean
 xcoff64_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd ATTRIBUTE_UNUSED;
      bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
 
 char *
diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c
index 11f1ca33241..b06465059c4 100644
--- a/bfd/aout-adobe.c
+++ b/bfd/aout-adobe.c
@@ -32,19 +32,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Forward decl.  */
 extern const bfd_target a_out_adobe_vec;
 
-static const bfd_target *aout_adobe_callback PARAMS ((bfd *));
-
-extern boolean aout_32_slurp_symbol_table PARAMS ((bfd *abfd));
-extern boolean aout_32_write_syms PARAMS ((bfd *));
-static void    aout_adobe_write_section PARAMS ((bfd *abfd, sec_ptr sect));
-static const bfd_target * aout_adobe_object_p PARAMS ((bfd *));
-static boolean aout_adobe_mkobject PARAMS ((bfd *));
-static boolean aout_adobe_write_object_contents PARAMS ((bfd *));
-static boolean aout_adobe_set_section_contents
+static const bfd_target *aout_adobe_callback
+  PARAMS ((bfd *));
+extern bfd_boolean aout_32_slurp_symbol_table
+  PARAMS ((bfd *abfd));
+extern bfd_boolean aout_32_write_syms
+  PARAMS ((bfd *));
+static void aout_adobe_write_section
+  PARAMS ((bfd *abfd, sec_ptr sect));
+static const bfd_target * aout_adobe_object_p
+  PARAMS ((bfd *));
+static bfd_boolean aout_adobe_mkobject
+  PARAMS ((bfd *));
+static bfd_boolean aout_adobe_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean aout_adobe_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean aout_adobe_set_arch_mach
+static bfd_boolean aout_adobe_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static int     aout_adobe_sizeof_headers PARAMS ((bfd *, boolean));
+static int     aout_adobe_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
 
 /* Swaps the information in an executable header taken from a raw byte
    stream memory image, into the internal exec_header structure.  */
@@ -271,7 +278,7 @@ struct bout_data_struct
     struct internal_exec e;
   };
 
-static boolean
+static bfd_boolean
 aout_adobe_mkobject (abfd)
      bfd *abfd;
 {
@@ -280,7 +287,7 @@ aout_adobe_mkobject (abfd)
 
   rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, amt);
   if (rawptr == NULL)
-    return false;
+    return FALSE;
 
   abfd->tdata.bout_data = rawptr;
   exec_hdr (abfd) = &rawptr->e;
@@ -291,10 +298,10 @@ aout_adobe_mkobject (abfd)
   adata (abfd).segment_size = 1; /* Not applicable.  */
   adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 aout_adobe_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -342,7 +349,7 @@ aout_adobe_write_object_contents (abfd)
   amt = EXEC_BYTES_SIZE;
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
       || bfd_bwrite ((PTR) &swapped_hdr, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Now write out the section information.  Text first, data next, rest
      afterward.  */
@@ -362,38 +369,38 @@ aout_adobe_write_object_contents (abfd)
   /* Write final `sentinel` section header (with type of 0).  */
   amt = sizeof (*sentinel);
   if (bfd_bwrite ((PTR) sentinel, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Now write out reloc info, followed by syms and strings.  */
   if (bfd_get_symcount (abfd) != 0)
     {
       if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
       if (! aout_32_write_syms (abfd))
-	return false;
+	return FALSE;
 
       if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*exec_hdr (abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
       for (sect = abfd->sections; sect; sect = sect->next)
 	if (sect->flags & SEC_CODE)
 	  if (!aout_32_squirt_out_relocs (abfd, sect))
-	    return false;
+	    return FALSE;
 
       if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*exec_hdr (abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
       for (sect = abfd->sections; sect; sect = sect->next)
 	if (sect->flags & SEC_DATA)
 	  if (!aout_32_squirt_out_relocs (abfd, sect))
-	    return false;
+	    return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 static void
@@ -404,7 +411,7 @@ aout_adobe_write_section (abfd, sect)
   /* FIXME XXX */
 }
 
-static boolean
+static bfd_boolean
 aout_adobe_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -457,34 +464,34 @@ aout_adobe_set_section_contents (abfd, section, location, offset, count)
   /* Regardless, once we know what we're doing, we might as well get
      going.  */
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   return bfd_bwrite ((PTR) location, count, abfd) == count;
 }
 
-static boolean
+static bfd_boolean
 aout_adobe_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
      unsigned long machine;
 {
   if (! bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
+    return FALSE;
 
   if (arch == bfd_arch_unknown
       || arch == bfd_arch_m68k)
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 static int
 aout_adobe_sizeof_headers (ignore_abfd, ignore)
      bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     boolean ignore ATTRIBUTE_UNUSED;
+     bfd_boolean ignore ATTRIBUTE_UNUSED;
 {
   return sizeof (struct internal_exec);
 }
diff --git a/bfd/aout-arm.c b/bfd/aout-arm.c
index b87e09cfccd..34a235a806a 100644
--- a/bfd/aout-arm.c
+++ b/bfd/aout-arm.c
@@ -1,5 +1,5 @@
 /* BFD back-end for raw ARM a.out binaries.
-   Copyright 1994, 1995, 1997, 1998, 1999, 2000, 2001
+   Copyright 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
 
@@ -54,7 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libaout.h"
 #include "aout/aout64.h"
 
-static boolean MY(write_object_contents)
+static bfd_boolean MY(write_object_contents)
   PARAMS ((bfd *));
 static bfd_reloc_status_type MY(fix_pcrel_26_done)
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
@@ -80,28 +80,28 @@ reloc_howto_type MY(howto_table)[] =
   {
     /* Type rs size bsz pcrel bitpos ovrf sf name part_inpl
        readmask setmask pcdone.  */
-    HOWTO (0, 0, 0, 8, false, 0, complain_overflow_bitfield, 0, "8", true,
-	   0x000000ff, 0x000000ff, false),
-    HOWTO (1, 0, 1, 16, false, 0, complain_overflow_bitfield, 0, "16", true,
-	   0x0000ffff, 0x0000ffff, false),
-    HOWTO (2, 0, 2, 32, false, 0, complain_overflow_bitfield, 0, "32", true,
-	   0xffffffff, 0xffffffff, false),
-    HOWTO (3, 2, 2, 26, true, 0, complain_overflow_signed, MY(fix_pcrel_26),
-	   "ARM26", true, 0x00ffffff, 0x00ffffff, true),
-    HOWTO (4, 0, 0, 8, true, 0, complain_overflow_signed, 0, "DISP8", true,
-	   0x000000ff, 0x000000ff, true),
-    HOWTO (5, 0, 1, 16, true, 0, complain_overflow_signed, 0, "DISP16", true,
-	   0x0000ffff, 0x0000ffff, true),
-    HOWTO (6, 0, 2, 32, true, 0, complain_overflow_signed, 0, "DISP32", true,
-	   0xffffffff, 0xffffffff, true),
-    HOWTO (7, 2, 2, 26, false, 0, complain_overflow_signed,
-	   MY(fix_pcrel_26_done), "ARM26D", true, 0x0, 0x0,
-	   false),
+    HOWTO (0, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, 0, "8", TRUE,
+	   0x000000ff, 0x000000ff, FALSE),
+    HOWTO (1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, 0, "16", TRUE,
+	   0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (2, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "32", TRUE,
+	   0xffffffff, 0xffffffff, FALSE),
+    HOWTO (3, 2, 2, 26, TRUE, 0, complain_overflow_signed, MY(fix_pcrel_26),
+	   "ARM26", TRUE, 0x00ffffff, 0x00ffffff, TRUE),
+    HOWTO (4, 0, 0, 8, TRUE, 0, complain_overflow_signed, 0, "DISP8", TRUE,
+	   0x000000ff, 0x000000ff, TRUE),
+    HOWTO (5, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "DISP16", TRUE,
+	   0x0000ffff, 0x0000ffff, TRUE),
+    HOWTO (6, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0, "DISP32", TRUE,
+	   0xffffffff, 0xffffffff, TRUE),
+    HOWTO (7, 2, 2, 26, FALSE, 0, complain_overflow_signed,
+	   MY(fix_pcrel_26_done), "ARM26D", TRUE, 0x0, 0x0,
+	   FALSE),
     EMPTY_HOWTO (-1),
-    HOWTO (9, 0, -1, 16, false, 0, complain_overflow_bitfield, 0, "NEG16", true,
-	   0x0000ffff, 0x0000ffff, false),
-    HOWTO (10, 0, -2, 32, false, 0, complain_overflow_bitfield, 0, "NEG32", true,
-	   0xffffffff, 0xffffffff, false)
+    HOWTO (9, 0, -1, 16, FALSE, 0, complain_overflow_bitfield, 0, "NEG16", TRUE,
+	   0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (10, 0, -2, 32, FALSE, 0, complain_overflow_bitfield, 0, "NEG32", TRUE,
+	   0xffffffff, 0xffffffff, FALSE)
   };
 
 #define RELOC_ARM_BITS_NEG_BIG      ((unsigned int) 0x08)
diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index 5c2f3452e5b..7027b173ca0 100644
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -1,5 +1,5 @@
 /* BFD backend for CRIS a.out binaries.
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
 
@@ -76,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define MY_exec_hdr_flags 1
 
 #define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *));
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *));
 
 /* Forward this, so we can use a pointer to it in PARAMS.  */
 struct reloc_ext_external;
@@ -92,7 +92,7 @@ static void MY(swap_ext_reloc_in) PARAMS ((bfd *, struct
 					   bfd_size_type));
 
 #define MY_set_sizes MY(set_sizes)
-static boolean MY(set_sizes) PARAMS ((bfd *));
+static bfd_boolean MY(set_sizes) PARAMS ((bfd *));
 
 /* To set back reloc_size to ext, we make MY(set_sizes) be called
    through this construct.  Note that MY_set_arch_mach is only called
@@ -121,7 +121,7 @@ static boolean MY(set_sizes) PARAMS ((bfd *));
 
 /* We need our own version to set header flags.  */
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -143,7 +143,7 @@ MY(write_object_contents) (abfd)
 
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 /* We need our own for these reasons:
@@ -279,7 +279,7 @@ MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
    "obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;", to avoid changing
    NAME (aout, set_arch_mach) in aoutx.  */
 
-static boolean
+static bfd_boolean
 MY(set_sizes) (abfd)
      bfd *abfd;
 {
@@ -297,7 +297,7 @@ MY(set_sizes) (abfd)
 
   obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
 
-  return true;
+  return TRUE;
 }
 
 /*
diff --git a/bfd/aout-encap.c b/bfd/aout-encap.c
index 84c46c60756..1a794ec978b 100644
--- a/bfd/aout-encap.c
+++ b/bfd/aout-encap.c
@@ -1,5 +1,5 @@
 /* BFD back-end for a.out files encapsulated with COFF headers.
-   Copyright 1990, 1991, 1994, 1995, 2000, 2001
+   Copyright 1990, 1991, 1994, 1995, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -123,7 +123,7 @@ encap_real_callback (abfd)
    Section contents have already been written.  We write the
    file header, symbols, and relocation.  */
 
-boolean
+bfd_boolean
 encap_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -230,7 +230,7 @@ encap_write_object_contents (abfd)
 
   text_size -= N_TXTOFF (outheader);
   WRITE_HEADERS(abfd, execp);
-  return true;
+  return TRUE;
 }
 
 #define MY_write_object_content encap_write_object_contents
diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c
index 8456e80d859..4809ffb89b3 100644
--- a/bfd/aout-ns32k.c
+++ b/bfd/aout-ns32k.c
@@ -35,7 +35,7 @@ MYNS(bfd_reloc_type_lookup)
   PARAMS((bfd *abfd AND
 	  bfd_reloc_code_real_type code));
 
-boolean
+bfd_boolean
 MYNS(write_object_contents)
   PARAMS((bfd *abfd));
 
@@ -100,58 +100,58 @@ reloc_howto_type MY(howto_table)[] =
   {
     /* type           rs   size bsz  pcrel bitpos ovrf                  sf name          part_inpl readmask setmask pcdone */
     /* ns32k immediate operands.  */
-    HOWTO (BFD_RELOC_NS32K_IMM_8, 0, 0, 8, false, 0, complain_overflow_signed,
+    HOWTO (BFD_RELOC_NS32K_IMM_8, 0, 0, 8, FALSE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_imm, "NS32K_IMM_8",
-	   true, 0x000000ff,0x000000ff, false),
-    HOWTO (BFD_RELOC_NS32K_IMM_16, 0, 1, 16, false, 0, complain_overflow_signed,
+	   TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_IMM_16, 0, 1, 16, FALSE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_imm,  "NS32K_IMM_16",
-	   true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (BFD_RELOC_NS32K_IMM_32, 0, 2, 32, false, 0, complain_overflow_signed,
+	   TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_IMM_32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_imm, "NS32K_IMM_32",
-	   true, 0xffffffff,0xffffffff, false),
-    HOWTO (BFD_RELOC_NS32K_IMM_8_PCREL, 0, 0, 8, true, 0, complain_overflow_signed,
+	   TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_IMM_8_PCREL, 0, 0, 8, TRUE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_8",
-	   true, 0x000000ff, 0x000000ff, false),
-    HOWTO (BFD_RELOC_NS32K_IMM_16_PCREL, 0, 1, 16, true, 0, complain_overflow_signed,
+	   TRUE, 0x000000ff, 0x000000ff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_IMM_16_PCREL, 0, 1, 16, TRUE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_16",
-	   true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (BFD_RELOC_NS32K_IMM_32_PCREL, 0, 2, 32, true, 0, complain_overflow_signed,
+	   TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_IMM_32_PCREL, 0, 2, 32, TRUE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_32",
-	   true, 0xffffffff,0xffffffff, false),
+	   TRUE, 0xffffffff,0xffffffff, FALSE),
 
     /* ns32k displacements.  */
-    HOWTO (BFD_RELOC_NS32K_DISP_8, 0, 0, 7, false, 0, complain_overflow_signed,
+    HOWTO (BFD_RELOC_NS32K_DISP_8, 0, 0, 7, FALSE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_disp, "NS32K_DISP_8",
-	   true, 0x000000ff,0x000000ff, false),
-    HOWTO (BFD_RELOC_NS32K_DISP_16, 0, 1, 14, false, 0, complain_overflow_signed,
+	   TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_DISP_16, 0, 1, 14, FALSE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_disp, "NS32K_DISP_16",
-	   true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO (BFD_RELOC_NS32K_DISP_32, 0, 2, 30, false, 0, complain_overflow_signed,
+	   TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_DISP_32, 0, 2, 30, FALSE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_disp, "NS32K_DISP_32",
-	   true, 0xffffffff, 0xffffffff, false),
-    HOWTO (BFD_RELOC_NS32K_DISP_8_PCREL, 0, 0, 7, true, 0, complain_overflow_signed,
+	   TRUE, 0xffffffff, 0xffffffff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_DISP_8_PCREL, 0, 0, 7, TRUE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_8",
-	   true, 0x000000ff,0x000000ff, false),
-    HOWTO (BFD_RELOC_NS32K_DISP_16_PCREL, 0, 1, 14, true, 0, complain_overflow_signed,
+	   TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_DISP_16_PCREL, 0, 1, 14, TRUE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_16",
-	   true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (BFD_RELOC_NS32K_DISP_32_PCREL, 0, 2, 30, true, 0, complain_overflow_signed,
+	   TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (BFD_RELOC_NS32K_DISP_32_PCREL, 0, 2, 30, TRUE, 0, complain_overflow_signed,
 	   _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_32",
-	   true, 0xffffffff,0xffffffff, false),
+	   TRUE, 0xffffffff,0xffffffff, FALSE),
 
     /* Normal 2's complement.  */
-    HOWTO (BFD_RELOC_8, 0, 0, 8, false, 0, complain_overflow_bitfield,0,
-	   "8", true, 0x000000ff,0x000000ff, false),
-    HOWTO (BFD_RELOC_16, 0, 1, 16, false, 0, complain_overflow_bitfield,0,
-	   "16", true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (BFD_RELOC_32, 0, 2, 32, false, 0, complain_overflow_bitfield,0,
-	   "32", true, 0xffffffff,0xffffffff, false),
-    HOWTO (BFD_RELOC_8_PCREL, 0, 0, 8, true, 0, complain_overflow_signed, 0,
-	   "PCREL_8", true, 0x000000ff,0x000000ff, false),
-    HOWTO (BFD_RELOC_16_PCREL, 0, 1, 16, true, 0, complain_overflow_signed, 0,
-	   "PCREL_16", true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (BFD_RELOC_32_PCREL, 0, 2, 32, true, 0, complain_overflow_signed, 0,
-	   "PCREL_32", true, 0xffffffff,0xffffffff, false),
+    HOWTO (BFD_RELOC_8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,0,
+	   "8", TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (BFD_RELOC_16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,0,
+	   "16", TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (BFD_RELOC_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,
+	   "32", TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (BFD_RELOC_8_PCREL, 0, 0, 8, TRUE, 0, complain_overflow_signed, 0,
+	   "PCREL_8", TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (BFD_RELOC_16_PCREL, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0,
+	   "PCREL_16", TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (BFD_RELOC_32_PCREL, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0,
+	   "PCREL_32", TRUE, 0xffffffff,0xffffffff, FALSE),
   };
 
 #define CTOR_TABLE_RELOC_HOWTO(BFD) (MY(howto_table) + 14)
diff --git a/bfd/aout-target.h b/bfd/aout-target.h
index b2acc090887..cc4a4f50df8 100644
--- a/bfd/aout-target.h
+++ b/bfd/aout-target.h
@@ -201,21 +201,21 @@ MY(object_p) (abfd)
 
 #ifndef MY_mkobject
 
-static boolean MY(mkobject) PARAMS ((bfd *));
+static bfd_boolean MY(mkobject) PARAMS ((bfd *));
 
-static boolean
+static bfd_boolean
 MY(mkobject) (abfd)
      bfd *abfd;
 {
   if (! NAME(aout,mkobject) (abfd))
-    return false;
+    return FALSE;
 #if 0 /* Sizes get set in set_sizes callback, later, after we know
 	 the architecture and machine.  */
   adata(abfd).page_size = TARGET_PAGE_SIZE;
   adata(abfd).segment_size = SEGMENT_SIZE;
   adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
 #endif
-  return true;
+  return TRUE;
 }
 #define MY_mkobject MY(mkobject)
 #endif
@@ -228,10 +228,10 @@ MY(mkobject) (abfd)
    section contents, and copy_private_bfd_data is not called until
    after the section contents have been set.  */
 
-static boolean MY_bfd_copy_private_section_data
+static bfd_boolean MY_bfd_copy_private_section_data
   PARAMS ((bfd *, asection *, bfd *, asection *));
 
-static boolean
+static bfd_boolean
 MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
      bfd *ibfd;
      asection *isec ATTRIBUTE_UNUSED;
@@ -241,7 +241,7 @@ MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
   if (bfd_get_flavour (ibfd) == bfd_target_aout_flavour
       && bfd_get_flavour (obfd) == bfd_target_aout_flavour)
     obj_aout_subformat (obfd) = obj_aout_subformat (ibfd);
-  return true;
+  return TRUE;
 }
 
 #endif
@@ -251,9 +251,9 @@ MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
    file header, symbols, and relocation.  */
 
 #ifndef MY_write_object_contents
-static boolean MY(write_object_contents) PARAMS ((bfd *));
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *));
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -264,16 +264,16 @@ MY(write_object_contents) (abfd)
 
   WRITE_HEADERS(abfd, execp);
 
-  return true;
+  return TRUE;
 }
 #define MY_write_object_contents MY(write_object_contents)
 #endif
 
 #ifndef MY_set_sizes
 
-static boolean MY(set_sizes) PARAMS ((bfd *));
+static bfd_boolean MY(set_sizes) PARAMS ((bfd *));
 
-static boolean
+static bfd_boolean
 MY(set_sizes) (abfd)
      bfd *abfd;
 {
@@ -287,7 +287,7 @@ MY(set_sizes) (abfd)
 #endif
 
   adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-  return true;
+  return TRUE;
 }
 #define MY_set_sizes MY(set_sizes)
 #endif
@@ -375,9 +375,9 @@ MY_final_link_callback (abfd, ptreloff, pdreloff, psymoff)
 /* Final link routine.  We need to use a call back to get the correct
    offsets in the output file.  */
 
-static boolean MY_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean MY_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *));
 
-static boolean
+static bfd_boolean
 MY_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c
index a39a5b1fb88..6d5f48ca42d 100644
--- a/bfd/aout-tic30.c
+++ b/bfd/aout-tic30.c
@@ -56,18 +56,23 @@ static bfd_reloc_status_type tic30_aout_relocate_contents
 static bfd_reloc_status_type tic30_aout_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma,
 	   bfd_vma, bfd_vma));
-static const bfd_target *tic30_aout_object_p PARAMS ((bfd *));
-static boolean tic30_aout_write_object_contents PARAMS ((bfd *));
-static boolean tic30_aout_set_sizes PARAMS ((bfd *));
-static const bfd_target * tic30_aout_callback PARAMS ((bfd *));
-static boolean MY_bfd_copy_private_section_data
+static const bfd_target *tic30_aout_object_p
+  PARAMS ((bfd *));
+static bfd_boolean tic30_aout_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean tic30_aout_set_sizes
+  PARAMS ((bfd *));
+static const bfd_target * tic30_aout_callback
+  PARAMS ((bfd *));
+static bfd_boolean MY_bfd_copy_private_section_data
   PARAMS ((bfd *, asection *, bfd *, asection *));
-static boolean MY_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean MY_bfd_final_link
+  PARAMS ((bfd *, struct bfd_link_info *));
 reloc_howto_type * tic30_aout_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 enum machine_type tic30_aout_machine_type
-  PARAMS ((enum bfd_architecture, unsigned long, boolean *));
-boolean tic30_aout_set_arch_mach
+  PARAMS ((enum bfd_architecture, unsigned long, bfd_boolean *));
+bfd_boolean tic30_aout_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
 
 #define MY_reloc_howto(BFD, REL, IN, EX, PC) \
@@ -146,16 +151,16 @@ static const struct aout_backend_data tic30_aout_backend_data =
 reloc_howto_type tic30_aout_howto_table[] =
   {
     EMPTY_HOWTO (-1),
-    HOWTO (1, 2, 1, 16, false, 0, 0, tic30_aout_fix_16,
-	   "16", false, 0x0000FFFF, 0x0000FFFF, false),
-    HOWTO (2, 2, 2, 24, false, 0, complain_overflow_bitfield, NULL,
-	   "24", false, 0x00FFFFFF, 0x00FFFFFF, false),
-    HOWTO (3, 18, 3, 24, false, 0, complain_overflow_bitfield, NULL,
-	   "LDP", false, 0x00FF0000, 0x000000FF, false),
-    HOWTO (4, 2, 4, 32, false, 0, complain_overflow_bitfield, tic30_aout_fix_32,
-	   "32", false, 0xFFFFFFFF, 0xFFFFFFFF, false),
-    HOWTO (5, 2, 1, 16, true, 0, complain_overflow_signed,
-	   tic30_aout_fix_pcrel_16, "PCREL", true, 0x0000FFFF, 0x0000FFFF, true),
+    HOWTO (1, 2, 1, 16, FALSE, 0, 0, tic30_aout_fix_16,
+	   "16", FALSE, 0x0000FFFF, 0x0000FFFF, FALSE),
+    HOWTO (2, 2, 2, 24, FALSE, 0, complain_overflow_bitfield, NULL,
+	   "24", FALSE, 0x00FFFFFF, 0x00FFFFFF, FALSE),
+    HOWTO (3, 18, 3, 24, FALSE, 0, complain_overflow_bitfield, NULL,
+	   "LDP", FALSE, 0x00FF0000, 0x000000FF, FALSE),
+    HOWTO (4, 2, 4, 32, FALSE, 0, complain_overflow_bitfield, tic30_aout_fix_32,
+	   "32", FALSE, 0xFFFFFFFF, 0xFFFFFFFF, FALSE),
+    HOWTO (5, 2, 1, 16, TRUE, 0, complain_overflow_signed,
+	   tic30_aout_fix_pcrel_16, "PCREL", TRUE, 0x0000FFFF, 0x0000FFFF, TRUE),
     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),
@@ -164,7 +169,7 @@ reloc_howto_type tic30_aout_howto_table[] =
   };
 
 extern reloc_howto_type *NAME (aout, reloc_type_lookup)
-     PARAMS ((bfd *, bfd_reloc_code_real_type));
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
 
 reloc_howto_type *
 tic30_aout_reloc_type_lookup (abfd, code)
@@ -420,7 +425,7 @@ tic30_aout_relocate_contents (howto, input_bfd, relocation, location)
      bfd_byte *location;
 {
   bfd_vma x;
-  boolean overflow;
+  bfd_boolean overflow;
 
   if (howto->size < 0)
     relocation = -relocation;
@@ -445,7 +450,7 @@ tic30_aout_relocate_contents (howto, input_bfd, relocation, location)
       break;
     }
 
-  overflow = false;
+  overflow = FALSE;
 
   if (howto->complain_on_overflow != complain_overflow_dont)
     {
@@ -491,14 +496,14 @@ tic30_aout_relocate_contents (howto, input_bfd, relocation, location)
 	    bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
 	    bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
 	    if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
-	      overflow = true;
+	      overflow = TRUE;
 	  }
 	  break;
 	case complain_overflow_unsigned:
 	  {
 	    bfd_vma reloc_unsigned_max = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
 	    if (check > reloc_unsigned_max)
-	      overflow = true;
+	      overflow = TRUE;
 	  }
 	  break;
 	case complain_overflow_bitfield:
@@ -507,7 +512,7 @@ tic30_aout_relocate_contents (howto, input_bfd, relocation, location)
 	    if ((check & ~reloc_bits) != 0
 		&& (((bfd_vma) signed_check & ~reloc_bits)
 		    != ((bfd_vma) -1 & ~reloc_bits)))
-	      overflow = true;
+	      overflow = TRUE;
 	  }
 	  break;
 	default:
@@ -607,7 +612,7 @@ tic30_aout_object_p (abfd)
    section contents, and copy_private_bfd_data is not called until
    after the section contents have been set.  */
 
-static boolean
+static bfd_boolean
 MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
      bfd *ibfd;
      asection *isec ATTRIBUTE_UNUSED;
@@ -616,14 +621,14 @@ MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
 {
   if (bfd_get_flavour (obfd) == bfd_target_aout_flavour)
     obj_aout_subformat (obfd) = obj_aout_subformat (ibfd);
-  return true;
+  return TRUE;
 }
 
 /* Write an object file.
    Section contents have already been written.  We write the
    file header, symbols, and relocation.  */
 
-static boolean
+static bfd_boolean
 tic30_aout_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -650,10 +655,10 @@ tic30_aout_write_object_contents (abfd)
       {
 	bfd_size_type amt;
 	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-	  return false;
+	  return FALSE;
 	amt = adata (abfd).exec_bytes_size;
 	if (bfd_bwrite ((PTR) &exec_bytes, amt, abfd) != amt)
-	  return false;
+	  return FALSE;
       }
 
     /* Now write out reloc info, followed by syms and strings.  */
@@ -661,27 +666,27 @@ tic30_aout_write_object_contents (abfd)
 	&& bfd_get_symcount (abfd) != 0)
       {
 	if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*execp)), SEEK_SET) != 0)
-	  return false;
+	  return FALSE;
 
 	if (!NAME (aout, write_syms) (abfd))
-	  return false;
+	  return FALSE;
       }
 
     if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*execp)), SEEK_SET) != 0)
-      return false;
+      return FALSE;
     if (!NAME (aout, squirt_out_relocs) (abfd, obj_textsec (abfd)))
-      return false;
+      return FALSE;
 
     if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*execp)), SEEK_SET) != 0)
-      return false;
+      return FALSE;
     if (!NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd)))
-      return false;
+      return FALSE;
   }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 tic30_aout_set_sizes (abfd)
      bfd *abfd;
 {
@@ -701,7 +706,7 @@ tic30_aout_set_sizes (abfd)
 
   adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
 
-  return true;
+  return TRUE;
 }
 
 #ifndef MY_final_link_callback
@@ -732,7 +737,7 @@ MY_final_link_callback (abfd, ptreloff, pdreloff, psymoff)
 /* Final link routine.  We need to use a call back to get the correct
    offsets in the output file.  */
 
-static boolean
+static bfd_boolean
 MY_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -800,40 +805,40 @@ enum machine_type
 tic30_aout_machine_type (arch, machine, unknown)
      enum bfd_architecture arch;
      unsigned long machine ATTRIBUTE_UNUSED;
-     boolean *unknown;
+     bfd_boolean *unknown;
 {
   enum machine_type arch_flags;
 
   arch_flags = M_UNKNOWN;
-  *unknown = true;
+  *unknown = TRUE;
 
   switch (arch)
     {
     case bfd_arch_tic30:
-      *unknown = false;
+      *unknown = FALSE;
       break;
     default:
       arch_flags = M_UNKNOWN;
     }
   if (arch_flags != M_UNKNOWN)
-    *unknown = false;
+    *unknown = FALSE;
   return arch_flags;
 }
 
-boolean
+bfd_boolean
 tic30_aout_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
      unsigned long machine;
 {
   if (!bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
+    return FALSE;
   if (arch != bfd_arch_unknown)
     {
-      boolean unknown;
+      bfd_boolean unknown;
       tic30_aout_machine_type (arch, machine, &unknown);
       if (unknown)
-	return false;
+	return FALSE;
     }
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
   return (*aout_backend_info (abfd)->set_sizes) (abfd);
diff --git a/bfd/aoutf1.h b/bfd/aoutf1.h
index 80d69d9135e..4d66d87bc87 100644
--- a/bfd/aoutf1.h
+++ b/bfd/aoutf1.h
@@ -75,15 +75,24 @@ The name put into the target vector.
 #define sunos_write_object_contents aout_32_sunos4_write_object_contents
 #endif
 
-static boolean sunos_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-static void sunos_set_arch_mach PARAMS ((bfd *, enum machine_type));
-static void choose_reloc_size PARAMS ((bfd *));
-static boolean sunos_write_object_contents PARAMS ((bfd *));
-static const bfd_target *sunos4_core_file_p PARAMS ((bfd *));
-static char *sunos4_core_file_failing_command PARAMS ((bfd *));
-static int sunos4_core_file_failing_signal PARAMS ((bfd *));
-static boolean sunos4_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
-static boolean sunos4_set_sizes PARAMS ((bfd *));
+static bfd_boolean sunos_merge_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static void sunos_set_arch_mach
+  PARAMS ((bfd *, enum machine_type));
+static void choose_reloc_size
+  PARAMS ((bfd *));
+static bfd_boolean sunos_write_object_contents
+  PARAMS ((bfd *));
+static const bfd_target *sunos4_core_file_p
+  PARAMS ((bfd *));
+static char *sunos4_core_file_failing_command
+  PARAMS ((bfd *));
+static int sunos4_core_file_failing_signal
+  PARAMS ((bfd *));
+static bfd_boolean sunos4_core_file_matches_executable_p
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean sunos4_set_sizes
+  PARAMS ((bfd *));
 
 /* Merge backend data into the output file.
    This is necessary on sparclet-aout where we want the resultant machine
@@ -91,13 +100,13 @@ static boolean sunos4_set_sizes PARAMS ((bfd *));
 
 #define MY_bfd_merge_private_bfd_data sunos_merge_private_bfd_data
 
-static boolean
+static bfd_boolean
 sunos_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd, *obfd;
 {
   if (bfd_get_flavour (ibfd) != bfd_target_aout_flavour
       || bfd_get_flavour (obfd) != bfd_target_aout_flavour)
-    return true;
+    return TRUE;
 
   if (bfd_get_arch (obfd) == bfd_arch_sparc)
     {
@@ -105,7 +114,7 @@ sunos_merge_private_bfd_data (ibfd, obfd)
 	bfd_set_arch_mach (obfd, bfd_arch_sparc, bfd_get_mach (ibfd));
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is either sunos_32_set_arch_mach or sunos_64_set_arch_mach,
@@ -207,7 +216,7 @@ choose_reloc_size (abfd)
    aout_64_sunos4_write_object_contents or
    aout_32_sunos4_write_object_contents, depending upon ARCH_SIZE.  */
 
-static boolean
+static bfd_boolean
 sunos_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -264,7 +273,7 @@ sunos_write_object_contents (abfd)
 
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 /* core files */
@@ -731,7 +740,7 @@ sunos4_core_file_failing_signal (abfd)
   return core_hdr (abfd)->hdr->c_signo;
 }
 
-static boolean
+static bfd_boolean
 sunos4_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd;
      bfd *exec_bfd;
@@ -739,12 +748,12 @@ sunos4_core_file_matches_executable_p (core_bfd, exec_bfd)
   if (core_bfd->xvec != exec_bfd->xvec)
     {
       bfd_set_error (bfd_error_system_call);
-      return false;
+      return FALSE;
     }
 
   /* Solaris core files do not include an aouthdr.  */
   if ((core_hdr (core_bfd)->hdr)->c_len == SOLARIS_BCP_CORE_LEN)
-    return true;
+    return TRUE;
 
   return (memcmp ((char *) &((core_hdr (core_bfd)->hdr)->c_aouthdr),
 		  (char *) exec_hdr (exec_bfd),
@@ -752,24 +761,24 @@ sunos4_core_file_matches_executable_p (core_bfd, exec_bfd)
 }
 
 #define MY_set_sizes sunos4_set_sizes
-static boolean
+static bfd_boolean
 sunos4_set_sizes (abfd)
      bfd *abfd;
 {
   switch (bfd_get_arch (abfd))
     {
     default:
-      return false;
+      return FALSE;
     case bfd_arch_sparc:
       adata (abfd).page_size = 0x2000;
       adata (abfd).segment_size = 0x2000;
       adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
+      return TRUE;
     case bfd_arch_m68k:
       adata (abfd).page_size = 0x2000;
       adata (abfd).segment_size = 0x20000;
       adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
+      return TRUE;
     }
 }
 
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 107772dfc32..9b87de9528b 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -131,14 +131,18 @@ DESCRIPTION
 #include "aout/stab_gnu.h"
 #include "aout/ar.h"
 
-static boolean aout_get_external_symbols PARAMS ((bfd *));
-static boolean translate_from_native_sym_flags
+static bfd_boolean aout_get_external_symbols
+  PARAMS ((bfd *));
+static bfd_boolean translate_from_native_sym_flags
   PARAMS ((bfd *, aout_symbol_type *));
-static boolean translate_to_native_sym_flags
+static bfd_boolean translate_to_native_sym_flags
   PARAMS ((bfd *, asymbol *, struct external_nlist *));
-static void adjust_o_magic PARAMS ((bfd *, struct internal_exec *));
-static void adjust_z_magic PARAMS ((bfd *, struct internal_exec *));
-static void adjust_n_magic PARAMS ((bfd *, struct internal_exec *));
+static void adjust_o_magic
+  PARAMS ((bfd *, struct internal_exec *));
+static void adjust_z_magic
+  PARAMS ((bfd *, struct internal_exec *));
+static void adjust_n_magic
+  PARAMS ((bfd *, struct internal_exec *));
 reloc_howto_type * NAME(aout,reloc_type_lookup)
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 
@@ -194,57 +198,57 @@ DESCRIPTION
 reloc_howto_type howto_table_ext[] =
 {
   /* type           rs   size bsz  pcrel bitpos ovrf                  sf name          part_inpl readmask setmask pcdone.  */
-  HOWTO(RELOC_8,      0,  0,  	8,  false, 0, complain_overflow_bitfield,0,"8",        false, 0,0x000000ff, false),
-  HOWTO(RELOC_16,     0,  1, 	16, false, 0, complain_overflow_bitfield,0,"16",       false, 0,0x0000ffff, false),
-  HOWTO(RELOC_32,     0,  2, 	32, false, 0, complain_overflow_bitfield,0,"32",       false, 0,0xffffffff, false),
-  HOWTO(RELOC_DISP8,  0,  0, 	8,  true,  0, complain_overflow_signed,0,"DISP8", 	false, 0,0x000000ff, false),
-  HOWTO(RELOC_DISP16, 0,  1, 	16, true,  0, complain_overflow_signed,0,"DISP16", 	false, 0,0x0000ffff, false),
-  HOWTO(RELOC_DISP32, 0,  2, 	32, true,  0, complain_overflow_signed,0,"DISP32", 	false, 0,0xffffffff, false),
-  HOWTO(RELOC_WDISP30,2,  2, 	30, true,  0, complain_overflow_signed,0,"WDISP30", 	false, 0,0x3fffffff, false),
-  HOWTO(RELOC_WDISP22,2,  2, 	22, true,  0, complain_overflow_signed,0,"WDISP22", 	false, 0,0x003fffff, false),
-  HOWTO(RELOC_HI22,   10, 2, 	22, false, 0, complain_overflow_bitfield,0,"HI22",	false, 0,0x003fffff, false),
-  HOWTO(RELOC_22,     0,  2, 	22, false, 0, complain_overflow_bitfield,0,"22",       false, 0,0x003fffff, false),
-  HOWTO(RELOC_13,     0,  2, 	13, false, 0, complain_overflow_bitfield,0,"13",       false, 0,0x00001fff, false),
-  HOWTO(RELOC_LO10,   0,  2, 	10, false, 0, complain_overflow_dont,0,"LO10",     false, 0,0x000003ff, false),
-  HOWTO(RELOC_SFA_BASE,0, 2, 	32, false, 0, complain_overflow_bitfield,0,"SFA_BASE", false, 0,0xffffffff, false),
-  HOWTO(RELOC_SFA_OFF13,0,2, 	32, false, 0, complain_overflow_bitfield,0,"SFA_OFF13",false, 0,0xffffffff, false),
-  HOWTO(RELOC_BASE10, 0,  2, 	10, false, 0, complain_overflow_dont,0,"BASE10",   false, 0,0x000003ff, false),
-  HOWTO(RELOC_BASE13, 0,  2,	13, false, 0, complain_overflow_signed,0,"BASE13",   false, 0,0x00001fff, false),
-  HOWTO(RELOC_BASE22, 10, 2,	22, false, 0, complain_overflow_bitfield,0,"BASE22",   false, 0,0x003fffff, false),
-  HOWTO(RELOC_PC10,   0,  2,	10, true,  0, complain_overflow_dont,0,"PC10",	false, 0,0x000003ff, true),
-  HOWTO(RELOC_PC22,   10,  2,	22, true,  0, complain_overflow_signed,0,"PC22", false, 0,0x003fffff, true),
-  HOWTO(RELOC_JMP_TBL,2,  2, 	30, true,  0, complain_overflow_signed,0,"JMP_TBL", 	false, 0,0x3fffffff, false),
-  HOWTO(RELOC_SEGOFF16,0, 2,	0,  false, 0, complain_overflow_bitfield,0,"SEGOFF16",	false, 0,0x00000000, false),
-  HOWTO(RELOC_GLOB_DAT,0, 2,	0,  false, 0, complain_overflow_bitfield,0,"GLOB_DAT",	false, 0,0x00000000, false),
-  HOWTO(RELOC_JMP_SLOT,0, 2,	0,  false, 0, complain_overflow_bitfield,0,"JMP_SLOT",	false, 0,0x00000000, false),
-  HOWTO(RELOC_RELATIVE,0, 2,	0,  false, 0, complain_overflow_bitfield,0,"RELATIVE",	false, 0,0x00000000, false),
-  HOWTO(0,  0, 0,    0,  false, 0, complain_overflow_dont, 0, "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(0,  0, 0,    0,  false, 0, complain_overflow_dont, 0, "R_SPARC_NONE",    false,0,0x00000000,true),
+  HOWTO(RELOC_8,      0,  0,  	8,  FALSE, 0, complain_overflow_bitfield,0,"8",        FALSE, 0,0x000000ff, FALSE),
+  HOWTO(RELOC_16,     0,  1, 	16, FALSE, 0, complain_overflow_bitfield,0,"16",       FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(RELOC_32,     0,  2, 	32, FALSE, 0, complain_overflow_bitfield,0,"32",       FALSE, 0,0xffffffff, FALSE),
+  HOWTO(RELOC_DISP8,  0,  0, 	8,  TRUE,  0, complain_overflow_signed,0,"DISP8", 	FALSE, 0,0x000000ff, FALSE),
+  HOWTO(RELOC_DISP16, 0,  1, 	16, TRUE,  0, complain_overflow_signed,0,"DISP16", 	FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(RELOC_DISP32, 0,  2, 	32, TRUE,  0, complain_overflow_signed,0,"DISP32", 	FALSE, 0,0xffffffff, FALSE),
+  HOWTO(RELOC_WDISP30,2,  2, 	30, TRUE,  0, complain_overflow_signed,0,"WDISP30", 	FALSE, 0,0x3fffffff, FALSE),
+  HOWTO(RELOC_WDISP22,2,  2, 	22, TRUE,  0, complain_overflow_signed,0,"WDISP22", 	FALSE, 0,0x003fffff, FALSE),
+  HOWTO(RELOC_HI22,   10, 2, 	22, FALSE, 0, complain_overflow_bitfield,0,"HI22",	FALSE, 0,0x003fffff, FALSE),
+  HOWTO(RELOC_22,     0,  2, 	22, FALSE, 0, complain_overflow_bitfield,0,"22",       FALSE, 0,0x003fffff, FALSE),
+  HOWTO(RELOC_13,     0,  2, 	13, FALSE, 0, complain_overflow_bitfield,0,"13",       FALSE, 0,0x00001fff, FALSE),
+  HOWTO(RELOC_LO10,   0,  2, 	10, FALSE, 0, complain_overflow_dont,0,"LO10",     FALSE, 0,0x000003ff, FALSE),
+  HOWTO(RELOC_SFA_BASE,0, 2, 	32, FALSE, 0, complain_overflow_bitfield,0,"SFA_BASE", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(RELOC_SFA_OFF13,0,2, 	32, FALSE, 0, complain_overflow_bitfield,0,"SFA_OFF13",FALSE, 0,0xffffffff, FALSE),
+  HOWTO(RELOC_BASE10, 0,  2, 	10, FALSE, 0, complain_overflow_dont,0,"BASE10",   FALSE, 0,0x000003ff, FALSE),
+  HOWTO(RELOC_BASE13, 0,  2,	13, FALSE, 0, complain_overflow_signed,0,"BASE13",   FALSE, 0,0x00001fff, FALSE),
+  HOWTO(RELOC_BASE22, 10, 2,	22, FALSE, 0, complain_overflow_bitfield,0,"BASE22",   FALSE, 0,0x003fffff, FALSE),
+  HOWTO(RELOC_PC10,   0,  2,	10, TRUE,  0, complain_overflow_dont,0,"PC10",	FALSE, 0,0x000003ff, TRUE),
+  HOWTO(RELOC_PC22,   10,  2,	22, TRUE,  0, complain_overflow_signed,0,"PC22", FALSE, 0,0x003fffff, TRUE),
+  HOWTO(RELOC_JMP_TBL,2,  2, 	30, TRUE,  0, complain_overflow_signed,0,"JMP_TBL", 	FALSE, 0,0x3fffffff, FALSE),
+  HOWTO(RELOC_SEGOFF16,0, 2,	0,  FALSE, 0, complain_overflow_bitfield,0,"SEGOFF16",	FALSE, 0,0x00000000, FALSE),
+  HOWTO(RELOC_GLOB_DAT,0, 2,	0,  FALSE, 0, complain_overflow_bitfield,0,"GLOB_DAT",	FALSE, 0,0x00000000, FALSE),
+  HOWTO(RELOC_JMP_SLOT,0, 2,	0,  FALSE, 0, complain_overflow_bitfield,0,"JMP_SLOT",	FALSE, 0,0x00000000, FALSE),
+  HOWTO(RELOC_RELATIVE,0, 2,	0,  FALSE, 0, complain_overflow_bitfield,0,"RELATIVE",	FALSE, 0,0x00000000, FALSE),
+  HOWTO(0,  0, 0,    0,  FALSE, 0, complain_overflow_dont, 0, "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(0,  0, 0,    0,  FALSE, 0, complain_overflow_dont, 0, "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
 #define RELOC_SPARC_REV32 RELOC_WDISP19
-  HOWTO(RELOC_SPARC_REV32,    0,  2, 	32, false, 0, complain_overflow_dont,0,"R_SPARC_REV32",       false, 0,0xffffffff, false),
+  HOWTO(RELOC_SPARC_REV32,    0,  2, 	32, FALSE, 0, complain_overflow_dont,0,"R_SPARC_REV32",       FALSE, 0,0xffffffff, FALSE),
 };
 
 /* Convert standard reloc records to "arelent" format (incl byte swap).  */
 
 reloc_howto_type howto_table_std[] = {
   /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone.  */
-HOWTO ( 0,	       0,  0,  	8,  false, 0, complain_overflow_bitfield,0,"8",		true, 0x000000ff,0x000000ff, false),
-HOWTO ( 1,	       0,  1, 	16, false, 0, complain_overflow_bitfield,0,"16",	true, 0x0000ffff,0x0000ffff, false),
-HOWTO ( 2,	       0,  2, 	32, false, 0, complain_overflow_bitfield,0,"32",	true, 0xffffffff,0xffffffff, false),
-HOWTO ( 3,	       0,  4, 	64, false, 0, complain_overflow_bitfield,0,"64",	true, 0xdeaddead,0xdeaddead, false),
-HOWTO ( 4,	       0,  0, 	8,  true,  0, complain_overflow_signed,  0,"DISP8",	true, 0x000000ff,0x000000ff, false),
-HOWTO ( 5,	       0,  1, 	16, true,  0, complain_overflow_signed,  0,"DISP16",	true, 0x0000ffff,0x0000ffff, false),
-HOWTO ( 6,	       0,  2, 	32, true,  0, complain_overflow_signed,  0,"DISP32",	true, 0xffffffff,0xffffffff, false),
-HOWTO ( 7,	       0,  4, 	64, true,  0, complain_overflow_signed,  0,"DISP64",	true, 0xfeedface,0xfeedface, false),
-HOWTO ( 8,	       0,  2,    0, false, 0, complain_overflow_bitfield,0,"GOT_REL",	false,         0,0x00000000, false),
-HOWTO ( 9,	       0,  1,   16, false, 0, complain_overflow_bitfield,0,"BASE16",	false,0xffffffff,0xffffffff, false),
-HOWTO (10,	       0,  2,   32, false, 0, complain_overflow_bitfield,0,"BASE32",	false,0xffffffff,0xffffffff, false),
+HOWTO ( 0,	       0,  0,  	8,  FALSE, 0, complain_overflow_bitfield,0,"8",		TRUE, 0x000000ff,0x000000ff, FALSE),
+HOWTO ( 1,	       0,  1, 	16, FALSE, 0, complain_overflow_bitfield,0,"16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+HOWTO ( 2,	       0,  2, 	32, FALSE, 0, complain_overflow_bitfield,0,"32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+HOWTO ( 3,	       0,  4, 	64, FALSE, 0, complain_overflow_bitfield,0,"64",	TRUE, 0xdeaddead,0xdeaddead, FALSE),
+HOWTO ( 4,	       0,  0, 	8,  TRUE,  0, complain_overflow_signed,  0,"DISP8",	TRUE, 0x000000ff,0x000000ff, FALSE),
+HOWTO ( 5,	       0,  1, 	16, TRUE,  0, complain_overflow_signed,  0,"DISP16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+HOWTO ( 6,	       0,  2, 	32, TRUE,  0, complain_overflow_signed,  0,"DISP32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+HOWTO ( 7,	       0,  4, 	64, TRUE,  0, complain_overflow_signed,  0,"DISP64",	TRUE, 0xfeedface,0xfeedface, FALSE),
+HOWTO ( 8,	       0,  2,    0, FALSE, 0, complain_overflow_bitfield,0,"GOT_REL",	FALSE,         0,0x00000000, FALSE),
+HOWTO ( 9,	       0,  1,   16, FALSE, 0, complain_overflow_bitfield,0,"BASE16",	FALSE,0xffffffff,0xffffffff, FALSE),
+HOWTO (10,	       0,  2,   32, FALSE, 0, complain_overflow_bitfield,0,"BASE32",	FALSE,0xffffffff,0xffffffff, FALSE),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
-  HOWTO (16,	       0,  2,	 0, false, 0, complain_overflow_bitfield,0,"JMP_TABLE", false,         0,0x00000000, false),
+  HOWTO (16,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"JMP_TABLE", FALSE,         0,0x00000000, FALSE),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
@@ -260,7 +264,7 @@ EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
-  HOWTO (32,	       0,  2,	 0, false, 0, complain_overflow_bitfield,0,"RELATIVE",  false,         0,0x00000000, false),
+  HOWTO (32,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"RELATIVE",  FALSE,         0,0x00000000, FALSE),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
@@ -268,7 +272,7 @@ EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
-  HOWTO (40,	       0,  2,	 0, false, 0, complain_overflow_bitfield,0,"BASEREL",   false,         0,0x00000000, false),
+  HOWTO (40,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"BASEREL",   FALSE,         0,0x00000000, FALSE),
 };
 
 #define TABLE_SIZE(TABLE)	(sizeof (TABLE) / sizeof (TABLE[0]))
@@ -419,20 +423,20 @@ NAME(aout,swap_exec_header_out) (abfd, execp, raw_bytes)
 
 /* Make all the section for an a.out file.  */
 
-boolean
+bfd_boolean
 NAME(aout,make_sections) (abfd)
      bfd *abfd;
 {
   if (obj_textsec (abfd) == (asection *) NULL
       && bfd_make_section (abfd, ".text") == (asection *) NULL)
-    return false;
+    return FALSE;
   if (obj_datasec (abfd) == (asection *) NULL
       && bfd_make_section (abfd, ".data") == (asection *) NULL)
-    return false;
+    return FALSE;
   if (obj_bsssec (abfd) == (asection *) NULL
       && bfd_make_section (abfd, ".bss") == (asection *) NULL)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /*
@@ -673,13 +677,13 @@ FUNCTION
 	aout_@var{size}_mkobject
 
 SYNOPSIS
-	boolean aout_@var{size}_mkobject, (bfd *abfd);
+	bfd_boolean aout_@var{size}_mkobject, (bfd *abfd);
 
 DESCRIPTION
 	Initialize BFD @var{abfd} for use with a.out files.
 */
 
-boolean
+bfd_boolean
 NAME(aout,mkobject) (abfd)
      bfd *abfd;
 {
@@ -690,7 +694,7 @@ NAME(aout,mkobject) (abfd)
 
   rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt);
   if (rawptr == NULL)
-    return false;
+    return FALSE;
 
   abfd->tdata.aout_data = rawptr;
   exec_hdr (abfd) = &(rawptr->e);
@@ -699,7 +703,7 @@ NAME(aout,mkobject) (abfd)
   obj_datasec (abfd) = (asection *) NULL;
   obj_bsssec (abfd) = (asection *) NULL;
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -725,12 +729,12 @@ enum machine_type
 NAME(aout,machine_type) (arch, machine, unknown)
      enum bfd_architecture arch;
      unsigned long machine;
-     boolean *unknown;
+     bfd_boolean *unknown;
 {
   enum machine_type arch_flags;
 
   arch_flags = M_UNKNOWN;
-  *unknown = true;
+  *unknown = TRUE;
 
   switch (arch)
     {
@@ -749,7 +753,7 @@ NAME(aout,machine_type) (arch, machine, unknown)
       switch (machine)
 	{
 	case 0:		      arch_flags = M_68010; break;
-	case bfd_mach_m68000: arch_flags = M_UNKNOWN; *unknown = false; break;
+	case bfd_mach_m68000: arch_flags = M_UNKNOWN; *unknown = FALSE; break;
 	case bfd_mach_m68010: arch_flags = M_68010; break;
 	case bfd_mach_m68020: arch_flags = M_68020; break;
 	default:	      arch_flags = M_UNKNOWN; break;
@@ -819,7 +823,7 @@ NAME(aout,machine_type) (arch, machine, unknown)
       break;
 
     case bfd_arch_vax:
-      *unknown = false;
+      *unknown = FALSE;
       break;
 
     case bfd_arch_cris:
@@ -832,7 +836,7 @@ NAME(aout,machine_type) (arch, machine, unknown)
     }
 
   if (arch_flags != M_UNKNOWN)
-    *unknown = false;
+    *unknown = FALSE;
 
   return arch_flags;
 }
@@ -842,7 +846,7 @@ FUNCTION
 	aout_@var{size}_set_arch_mach
 
 SYNOPSIS
-	boolean aout_@var{size}_set_arch_mach,
+	bfd_boolean aout_@var{size}_set_arch_mach,
 	 (bfd *,
 	  enum bfd_architecture arch,
 	  unsigned long machine));
@@ -853,22 +857,22 @@ DESCRIPTION
 	can support the architecture required.
 */
 
-boolean
+bfd_boolean
 NAME(aout,set_arch_mach) (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
      unsigned long machine;
 {
   if (! bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
+    return FALSE;
 
   if (arch != bfd_arch_unknown)
     {
-      boolean unknown;
+      bfd_boolean unknown;
 
       NAME(aout,machine_type) (arch, machine, &unknown);
       if (unknown)
-	return false;
+	return FALSE;
     }
 
   /* Determine the size of a relocation entry.  */
@@ -1116,7 +1120,7 @@ adjust_n_magic (abfd, execp)
   N_SET_MAGIC (*execp, NMAGIC);
 }
 
-boolean
+bfd_boolean
 NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end)
      bfd *abfd;
      bfd_size_type *text_size;
@@ -1125,10 +1129,10 @@ NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end)
   struct internal_exec *execp = exec_hdr (abfd);
 
   if (! NAME(aout,make_sections) (abfd))
-    return false;
+    return FALSE;
 
   if (adata (abfd).magic != undecided_magic)
-    return true;
+    return TRUE;
 
   obj_textsec (abfd)->_raw_size =
     align_power (obj_textsec (abfd)->_raw_size,
@@ -1205,7 +1209,7 @@ NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end)
 	   obj_bsssec (abfd)->vma, obj_bsssec (abfd)->_raw_size);
 #endif
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -1213,7 +1217,7 @@ FUNCTION
 	aout_@var{size}_new_section_hook
 
 SYNOPSIS
-        boolean aout_@var{size}_new_section_hook,
+        bfd_boolean aout_@var{size}_new_section_hook,
 	   (bfd *abfd,
 	    asection *newsect));
 
@@ -1221,7 +1225,7 @@ DESCRIPTION
 	Called by the BFD in response to a @code{bfd_make_section}
 	request.
 */
-boolean
+bfd_boolean
 NAME(aout,new_section_hook) (abfd, newsect)
      bfd *abfd;
      asection *newsect;
@@ -1235,29 +1239,29 @@ NAME(aout,new_section_hook) (abfd, newsect)
 	{
 	  obj_textsec (abfd)= newsect;
 	  newsect->target_index = N_TEXT;
-	  return true;
+	  return TRUE;
 	}
 
       if (obj_datasec (abfd) == NULL && !strcmp (newsect->name, ".data"))
 	{
 	  obj_datasec (abfd) = newsect;
 	  newsect->target_index = N_DATA;
-	  return true;
+	  return TRUE;
 	}
 
       if (obj_bsssec (abfd) == NULL && !strcmp (newsect->name, ".bss"))
 	{
 	  obj_bsssec (abfd) = newsect;
 	  newsect->target_index = N_BSS;
-	  return true;
+	  return TRUE;
 	}
     }
 
   /* We allow more than three sections internally.  */
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 NAME(aout,set_section_contents) (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -1271,13 +1275,13 @@ NAME(aout,set_section_contents) (abfd, section, location, offset, count)
   if (! abfd->output_has_begun)
     {
       if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
-	return false;
+	return FALSE;
     }
 
   if (section == obj_bsssec (abfd))
     {
       bfd_set_error (bfd_error_no_contents);
-      return false;
+      return FALSE;
     }
 
   if (section != obj_textsec (abfd)
@@ -1287,22 +1291,22 @@ NAME(aout,set_section_contents) (abfd, section, location, offset, count)
 	(_("%s: can not represent section `%s' in a.out object file format"),
 	 bfd_get_filename (abfd), bfd_get_section_name (abfd, section));
       bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
+      return FALSE;
     }
 
   if (count != 0)
     {
       if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
 	  || bfd_bwrite (location, count, abfd) != count)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Read the external symbols from an a.out file.  */
 
-static boolean
+static bfd_boolean
 aout_get_external_symbols (abfd)
      bfd *abfd;
 {
@@ -1317,8 +1321,8 @@ aout_get_external_symbols (abfd)
 #ifdef USE_MMAP
       if (! bfd_get_file_window (abfd, obj_sym_filepos (abfd),
 				 exec_hdr (abfd)->a_syms,
-				 &obj_aout_sym_window (abfd), true))
-	return false;
+				 &obj_aout_sym_window (abfd), TRUE))
+	return FALSE;
       syms = (struct external_nlist *) obj_aout_sym_window (abfd).data;
 #else
       /* We allocate using malloc to make the values easy to free
@@ -1327,14 +1331,14 @@ aout_get_external_symbols (abfd)
       syms = ((struct external_nlist *)
 	      bfd_malloc (count * EXTERNAL_NLIST_SIZE));
       if (syms == (struct external_nlist *) NULL && count != 0)
-	return false;
+	return FALSE;
 
       amt = exec_hdr (abfd)->a_syms;
       if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
 	  || bfd_bread (syms, amt, abfd) != amt)
 	{
 	  free (syms);
-	  return false;
+	  return FALSE;
 	}
 #endif
 
@@ -1353,18 +1357,18 @@ aout_get_external_symbols (abfd)
       /* Get the size of the strings.  */
       if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
 	  || bfd_bread ((PTR) string_chars, amt, abfd) != amt)
-	return false;
+	return FALSE;
       stringsize = GET_WORD (abfd, string_chars);
 
 #ifdef USE_MMAP
       if (! bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize,
-				 &obj_aout_string_window (abfd), true))
-	return false;
+				 &obj_aout_string_window (abfd), TRUE))
+	return FALSE;
       strings = (char *) obj_aout_string_window (abfd).data;
 #else
       strings = (char *) bfd_malloc (stringsize + 1);
       if (strings == NULL)
-	return false;
+	return FALSE;
 
       /* Skip space for the string count in the buffer for convenience
 	 when using indexes.  */
@@ -1372,7 +1376,7 @@ aout_get_external_symbols (abfd)
       if (bfd_bread (strings + BYTES_IN_WORD, amt, abfd) != amt)
 	{
 	  free (strings);
-	  return false;
+	  return FALSE;
 	}
 #endif
 
@@ -1385,7 +1389,7 @@ aout_get_external_symbols (abfd)
       obj_aout_external_string_size (abfd) = stringsize;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Translate an a.out symbol into a BFD symbol.  The desc, other, type
@@ -1393,7 +1397,7 @@ aout_get_external_symbols (abfd)
    nlist structure.  This function is responsible for setting
    symbol->flags and symbol->section, and adjusting symbol->value.  */
 
-static boolean
+static bfd_boolean
 translate_from_native_sym_flags (abfd, cache_ptr)
      bfd *abfd;
      aout_symbol_type *cache_ptr;
@@ -1430,7 +1434,7 @@ translate_from_native_sym_flags (abfd, cache_ptr)
       cache_ptr->symbol.section = sec;
       cache_ptr->symbol.value -= sec->vma;
 
-      return true;
+      return TRUE;
     }
 
   /* Get the default visibility.  This does not apply to all types, so
@@ -1519,18 +1523,18 @@ translate_from_native_sym_flags (abfd, cache_ptr)
 	    amt = strlen (cache_ptr->symbol.name) + 1;
 	    copy = bfd_alloc (abfd, amt);
 	    if (copy == NULL)
-	      return false;
+	      return FALSE;
 
 	    strcpy (copy, cache_ptr->symbol.name);
 	    section = bfd_make_section (abfd, copy);
 	    if (section == NULL)
-	      return false;
+	      return FALSE;
 	  }
 
 	amt = sizeof (arelent_chain);
 	reloc = (arelent_chain *) bfd_alloc (abfd, amt);
 	if (reloc == NULL)
-	  return false;
+	  return FALSE;
 
 	/* Build a relocation entry for the constructor.  */
 	switch (cache_ptr->type & N_TYPE)
@@ -1643,12 +1647,12 @@ translate_from_native_sym_flags (abfd, cache_ptr)
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the fields of SYM_POINTER according to CACHE_PTR.  */
 
-static boolean
+static bfd_boolean
 translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
      bfd *abfd;
      asymbol *cache_ptr;
@@ -1674,7 +1678,7 @@ translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
 	 bfd_get_filename (abfd),
 	 cache_ptr->name != NULL ? cache_ptr->name : _("*unknown*"));
       bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
+      return FALSE;
     }
 
   if (sec->output_section != NULL)
@@ -1703,7 +1707,7 @@ translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
 	(_("%s: can not represent section `%s' in a.out object file format"),
 	 bfd_get_filename (abfd), bfd_get_section_name (abfd, sec));
       bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
+      return FALSE;
     }
 
   /* Turn the symbol from section relative to absolute again.  */
@@ -1751,7 +1755,7 @@ translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
 
   PUT_WORD (abfd, value, sym_pointer->e_value);
 
-  return true;
+  return TRUE;
 }
 
 /* Native-level interface to symbols.  */
@@ -1771,7 +1775,7 @@ NAME(aout,make_empty_symbol) (abfd)
 
 /* Translate a set of internal symbols into external symbols.  */
 
-boolean
+bfd_boolean
 NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
      bfd *abfd;
      aout_symbol_type *in;
@@ -1779,7 +1783,7 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
      bfd_size_type count;
      char *str;
      bfd_size_type strsize;
-     boolean dynamic;
+     bfd_boolean dynamic;
 {
   struct external_nlist *ext_end;
 
@@ -1801,7 +1805,7 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
       else if (x < strsize)
 	in->symbol.name = str + x;
       else
-	return false;
+	return FALSE;
 
       in->symbol.value = GET_SWORD (abfd,  ext->e_value);
       in->desc = H_GET_16 (abfd, ext->e_desc);
@@ -1810,20 +1814,20 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
       in->symbol.udata.p = NULL;
 
       if (! translate_from_native_sym_flags (abfd, in))
-	return false;
+	return FALSE;
 
       if (dynamic)
 	in->symbol.flags |= BSF_DYNAMIC;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We read the symbols into a buffer, which is discarded when this
    function exits.  We read the strings into a buffer large enough to
    hold them all plus all the cached symbol entries.  */
 
-boolean
+bfd_boolean
 NAME(aout,slurp_symbol_table) (abfd)
      bfd *abfd;
 {
@@ -1833,18 +1837,18 @@ NAME(aout,slurp_symbol_table) (abfd)
 
   /* If there's no work to be done, don't do any.  */
   if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
-    return true;
+    return TRUE;
 
   old_external_syms = obj_aout_external_syms (abfd);
 
   if (! aout_get_external_symbols (abfd))
-    return false;
+    return FALSE;
 
   cached_size = obj_aout_external_sym_count (abfd);
   cached_size *= sizeof (aout_symbol_type);
   cached = (aout_symbol_type *) bfd_zmalloc (cached_size);
   if (cached == NULL && cached_size != 0)
-    return false;
+    return FALSE;
 
   /* Convert from external symbol information to internal.  */
   if (! (NAME(aout,translate_symbol_table)
@@ -1853,10 +1857,10 @@ NAME(aout,slurp_symbol_table) (abfd)
 	  obj_aout_external_sym_count (abfd),
 	  obj_aout_external_strings (abfd),
 	  obj_aout_external_string_size (abfd),
-	  false)))
+	  FALSE)))
     {
       free (cached);
-      return false;
+      return FALSE;
     }
 
   bfd_get_symcount (abfd) = obj_aout_external_sym_count (abfd);
@@ -1878,7 +1882,7 @@ NAME(aout,slurp_symbol_table) (abfd)
       obj_aout_external_syms (abfd) = NULL;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We use a hash table when writing out symbols so that we only write
@@ -1891,8 +1895,9 @@ NAME(aout,slurp_symbol_table) (abfd)
    if BFD_TRADITIONAL_FORMAT is set.  */
 
 static bfd_size_type add_to_stringtab
-  PARAMS ((bfd *, struct bfd_strtab_hash *, const char *, boolean));
-static boolean emit_stringtab PARAMS ((bfd *, struct bfd_strtab_hash *));
+  PARAMS ((bfd *, struct bfd_strtab_hash *, const char *, bfd_boolean));
+static bfd_boolean emit_stringtab
+  PARAMS ((bfd *, struct bfd_strtab_hash *));
 
 /* Get the index of a string in a strtab, adding it if it is not
    already present.  */
@@ -1902,9 +1907,9 @@ add_to_stringtab (abfd, tab, str, copy)
      bfd *abfd;
      struct bfd_strtab_hash *tab;
      const char *str;
-     boolean copy;
+     bfd_boolean copy;
 {
-  boolean hash;
+  bfd_boolean hash;
   bfd_size_type index;
 
   /* An index of 0 always means the empty string.  */
@@ -1913,9 +1918,9 @@ add_to_stringtab (abfd, tab, str, copy)
 
   /* Don't hash if BFD_TRADITIONAL_FORMAT is set, because SunOS dbx
      doesn't understand a hashed string table.  */
-  hash = true;
+  hash = TRUE;
   if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-    hash = false;
+    hash = FALSE;
 
   index = _bfd_stringtab_add (tab, str, hash, copy);
 
@@ -1932,7 +1937,7 @@ add_to_stringtab (abfd, tab, str, copy)
 /* Write out a strtab.  ABFD is already at the right location in the
    file.  */
 
-static boolean
+static bfd_boolean
 emit_stringtab (abfd, tab)
      register bfd *abfd;
      struct bfd_strtab_hash *tab;
@@ -1943,12 +1948,12 @@ emit_stringtab (abfd, tab)
   /* The string table starts with the size.  */
   PUT_WORD (abfd, _bfd_stringtab_size (tab) + BYTES_IN_WORD, buffer);
   if (bfd_bwrite ((PTR) buffer, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   return _bfd_stringtab_emit (abfd, tab);
 }
 
-boolean
+bfd_boolean
 NAME(aout,write_syms) (abfd)
      bfd *abfd;
 {
@@ -1958,7 +1963,7 @@ NAME(aout,write_syms) (abfd)
 
   strtab = _bfd_stringtab_init ();
   if (strtab == NULL)
-    return false;
+    return FALSE;
 
   for (count = 0; count < bfd_get_symcount (abfd); count++)
     {
@@ -1967,7 +1972,7 @@ NAME(aout,write_syms) (abfd)
       struct external_nlist nsp;
       bfd_size_type amt;
 
-      indx = add_to_stringtab (abfd, strtab, g->name, false);
+      indx = add_to_stringtab (abfd, strtab, g->name, FALSE);
       if (indx == (bfd_size_type) -1)
 	goto error_return;
       PUT_WORD (abfd, indx, (bfd_byte *) nsp.e_strx);
@@ -2002,11 +2007,11 @@ NAME(aout,write_syms) (abfd)
 
   _bfd_stringtab_free (strtab);
 
-  return true;
+  return TRUE;
 
 error_return:
   _bfd_stringtab_free (strtab);
-  return false;
+  return FALSE;
 }
 
 long
@@ -2370,7 +2375,7 @@ NAME(aout,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
 
 /* Read and swap the relocs for a section.  */
 
-boolean
+bfd_boolean
 NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
      bfd *abfd;
      sec_ptr asect;
@@ -2386,10 +2391,10 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
   bfd_size_type amt;
 
   if (asect->relocation)
-    return true;
+    return TRUE;
 
   if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
+    return TRUE;
 
   if (asect == obj_datasec (abfd))
     reloc_size = exec_hdr (abfd)->a_drsize;
@@ -2400,11 +2405,11 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
   else
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   each_size = obj_reloc_entry_size (abfd);
 
@@ -2413,20 +2418,20 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
   amt = count * sizeof (arelent);
   reloc_cache = (arelent *) bfd_zmalloc (amt);
   if (reloc_cache == NULL && count != 0)
-    return false;
+    return FALSE;
 
   relocs = bfd_malloc (reloc_size);
   if (relocs == NULL && reloc_size != 0)
     {
       free (reloc_cache);
-      return false;
+      return FALSE;
     }
 
   if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
     {
       free (relocs);
       free (reloc_cache);
-      return false;
+      return FALSE;
     }
 
   cache_ptr = reloc_cache;
@@ -2452,12 +2457,12 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
   asect->relocation = reloc_cache;
   asect->reloc_count = cache_ptr - reloc_cache;
 
-  return true;
+  return TRUE;
 }
 
 /* Write out a relocation section into an object file.  */
 
-boolean
+bfd_boolean
 NAME(aout,squirt_out_relocs) (abfd, section)
      bfd *abfd;
      asection *section;
@@ -2470,13 +2475,13 @@ NAME(aout,squirt_out_relocs) (abfd, section)
   bfd_size_type natsize;
 
   if (count == 0 || section->orelocation == NULL)
-    return true;
+    return TRUE;
 
   each_size = obj_reloc_entry_size (abfd);
   natsize = (bfd_size_type) each_size * count;
   native = (unsigned char *) bfd_zalloc (abfd, natsize);
   if (!native)
-    return false;
+    return FALSE;
 
   generic = section->orelocation;
 
@@ -2500,11 +2505,11 @@ NAME(aout,squirt_out_relocs) (abfd, section)
   if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
     {
       bfd_release (abfd, native);
-      return false;
+      return FALSE;
     }
   bfd_release (abfd, native);
 
-  return true;
+  return TRUE;
 }
 
 /* This is stupid.  This function should be a boolean predicate.  */
@@ -2681,7 +2686,7 @@ NAME(aout,print_symbol) (abfd, afile, symbol, how)
 long
 NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep)
      bfd *abfd;
-     boolean dynamic;
+     bfd_boolean dynamic;
      PTR *minisymsp;
      unsigned int *sizep;
 {
@@ -2717,7 +2722,7 @@ NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep)
 asymbol *
 NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
      bfd *abfd;
-     boolean dynamic;
+     bfd_boolean dynamic;
      const PTR minisym;
      asymbol *sym;
 {
@@ -2735,7 +2740,7 @@ NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
 	  (bfd_size_type) 1,
 	  obj_aout_external_strings (abfd),
 	  obj_aout_external_string_size (abfd),
-	  false)))
+	  FALSE)))
     return NULL;
 
   return sym;
@@ -2745,7 +2750,7 @@ NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
    and return the name of the source file and the line nearest to the
    wanted location.  */
 
-boolean
+bfd_boolean
 NAME(aout,find_nearest_line)
      (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)
      bfd *abfd;
@@ -2904,7 +2909,7 @@ NAME(aout,find_nearest_line)
       buf = (char *) bfd_malloc (filelen + funclen + 3);
       adata (abfd).line_buf = buf;
       if (buf == NULL)
-	return false;
+	return FALSE;
     }
 
   if (main_file_name != NULL)
@@ -2941,13 +2946,13 @@ NAME(aout,find_nearest_line)
       *functionname_ptr = buf;
     }
 
-  return true;
+  return TRUE;
 }
 
 int
 NAME(aout,sizeof_headers) (abfd, execable)
      bfd *abfd;
-     boolean execable ATTRIBUTE_UNUSED;
+     bfd_boolean execable ATTRIBUTE_UNUSED;
 {
   return adata (abfd).exec_bytes_size;
 }
@@ -2955,7 +2960,7 @@ NAME(aout,sizeof_headers) (abfd, execable)
 /* Free all information we have cached for this BFD.  We can always
    read it again later if we need it.  */
 
-boolean
+bfd_boolean
 NAME(aout,bfd_free_cached_info) (abfd)
      bfd *abfd;
 {
@@ -2963,7 +2968,7 @@ NAME(aout,bfd_free_cached_info) (abfd)
 
   if (bfd_get_format (abfd) != bfd_object
       || abfd->tdata.aout_data == NULL)
-    return true;
+    return TRUE;
 
 #define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; }
   BFCI_FREE (obj_aout_symbols (abfd));
@@ -2980,19 +2985,20 @@ NAME(aout,bfd_free_cached_info) (abfd)
     BFCI_FREE (o->relocation);
 #undef BFCI_FREE
 
-  return true;
+  return TRUE;
 }
 
 /* a.out link code.  */
 
-static boolean aout_link_add_object_symbols
+static bfd_boolean aout_link_add_object_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean aout_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean aout_link_free_symbols PARAMS ((bfd *));
-static boolean aout_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean aout_link_add_symbols
+static bfd_boolean aout_link_check_archive_element
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean aout_link_free_symbols
+  PARAMS ((bfd *));
+static bfd_boolean aout_link_check_ar_symbols
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded));
+static bfd_boolean aout_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Routine to create an entry in an a.out link hash table.  */
@@ -3020,7 +3026,7 @@ NAME(aout,link_hash_newfunc) (entry, table, string)
   if (ret)
     {
       /* Set local fields.  */
-      ret->written = false;
+      ret->written = FALSE;
       ret->indx = -1;
     }
 
@@ -3029,13 +3035,13 @@ NAME(aout,link_hash_newfunc) (entry, table, string)
 
 /* Initialize an a.out link hash table.  */
 
-boolean
+bfd_boolean
 NAME(aout,link_hash_table_init) (table, abfd, newfunc)
      struct aout_link_hash_table *table;
      bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
+     struct bfd_hash_entry *(*newfunc)
+       PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
+		const char *));
 {
   return _bfd_link_hash_table_init (&table->root, abfd, newfunc);
 }
@@ -3064,7 +3070,7 @@ NAME(aout,link_hash_table_create) (abfd)
 /* Given an a.out BFD, add symbols to the global hash table as
    appropriate.  */
 
-boolean
+bfd_boolean
 NAME(aout,link_add_symbols) (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3078,27 +3084,27 @@ NAME(aout,link_add_symbols) (abfd, info)
 	(abfd, info, aout_link_check_archive_element);
     default:
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 }
 
 /* Add symbols from an a.out object file.  */
 
-static boolean
+static bfd_boolean
 aout_link_add_object_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   if (! aout_get_external_symbols (abfd))
-    return false;
+    return FALSE;
   if (! aout_link_add_symbols (abfd, info))
-    return false;
+    return FALSE;
   if (! info->keep_memory)
     {
       if (! aout_link_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
@@ -3106,36 +3112,36 @@ aout_link_add_object_symbols (abfd, info)
    needed in the link or not.  This is called from
    _bfd_generic_link_add_archive_symbols.  */
 
-static boolean
+static bfd_boolean
 aout_link_check_archive_element (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
   if (! aout_get_external_symbols (abfd))
-    return false;
+    return FALSE;
 
   if (! aout_link_check_ar_symbols (abfd, info, pneeded))
-    return false;
+    return FALSE;
 
   if (*pneeded)
     {
       if (! aout_link_add_symbols (abfd, info))
-	return false;
+	return FALSE;
     }
 
   if (! info->keep_memory || ! *pneeded)
     {
       if (! aout_link_free_symbols (abfd))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Free up the internal symbols read from an a.out file.  */
 
-static boolean
+static bfd_boolean
 aout_link_free_symbols (abfd)
      bfd *abfd;
 {
@@ -3157,7 +3163,7 @@ aout_link_free_symbols (abfd)
 #endif
       obj_aout_external_strings (abfd) = (char *) NULL;
     }
-  return true;
+  return TRUE;
 }
 
 /* Look through the internal symbols to see if this object file should
@@ -3167,17 +3173,17 @@ aout_link_free_symbols (abfd)
    known symbol but we do not include the object file in the link
    (unless there is some other reason to include it).  */
 
-static boolean
+static bfd_boolean
 aout_link_check_ar_symbols (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
   register struct external_nlist *p;
   struct external_nlist *pend;
   char *strings;
 
-  *pneeded = false;
+  *pneeded = FALSE;
 
   /* Look through all the symbols.  */
   p = obj_aout_external_syms (abfd);
@@ -3207,7 +3213,7 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 	}
 
       name = strings + GET_WORD (abfd, p->e_strx);
-      h = bfd_link_hash_lookup (info->hash, name, false, false, true);
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
 
       /* We are only interested in symbols that are currently
 	 undefined or common.  */
@@ -3266,9 +3272,9 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 	    }
 
 	  if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-	    return false;
-	  *pneeded = true;
-	  return true;
+	    return FALSE;
+	  *pneeded = TRUE;
+	  return TRUE;
 	}
 
       if (type == (N_UNDF | N_EXT))
@@ -3295,9 +3301,9 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 		      if (! (*info->callbacks->add_archive_element) (info,
 								     abfd,
 								     name))
-			return false;
-		      *pneeded = true;
-		      return true;
+			return FALSE;
+		      *pneeded = TRUE;
+		      return TRUE;
 		    }
 		  /* Turn the current link symbol into a common
 		     symbol.  It is already on the undefs list.  */
@@ -3306,7 +3312,7 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 			      bfd_hash_allocate (&info->hash->table,
 				  sizeof (struct bfd_link_hash_common_entry)));
 		  if (h->u.c.p == NULL)
-		    return false;
+		    return FALSE;
 
 		  h->u.c.size = value;
 
@@ -3343,33 +3349,32 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 	  if (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;
 	    }
 	}
     }
 
   /* We do not need this object file.  */
-  return true;
+  return TRUE;
 }
 
 /* Add all symbols from an object file to the hash table.  */
 
-static boolean
+static bfd_boolean
 aout_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
-  boolean (*add_one_symbol) PARAMS ((struct bfd_link_info *, bfd *,
-				     const char *, flagword, asection *,
-				     bfd_vma, const char *, boolean,
-				     boolean,
-				     struct bfd_link_hash_entry **));
+  bfd_boolean (*add_one_symbol)
+    PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+	     bfd_vma, const char *, bfd_boolean, bfd_boolean,
+	     struct bfd_link_hash_entry **));
   struct external_nlist *syms;
   bfd_size_type sym_count;
   char *strings;
-  boolean copy;
+  bfd_boolean copy;
   struct aout_link_hash_entry **sym_hash;
   register struct external_nlist *p;
   struct external_nlist *pend;
@@ -3379,15 +3384,15 @@ aout_link_add_symbols (abfd, info)
   sym_count = obj_aout_external_sym_count (abfd);
   strings = obj_aout_external_strings (abfd);
   if (info->keep_memory)
-    copy = false;
+    copy = FALSE;
   else
-    copy = true;
+    copy = TRUE;
 
   if (aout_backend_info (abfd)->add_dynamic_symbols != NULL)
     {
       if (! ((*aout_backend_info (abfd)->add_dynamic_symbols)
 	     (abfd, info, &syms, &sym_count, &strings)))
-	return false;
+	return FALSE;
     }
 
   /* We keep a list of the linker hash table entries that correspond
@@ -3397,7 +3402,7 @@ aout_link_add_symbols (abfd, info)
   amt = sym_count * sizeof (struct aout_link_hash_entry *);
   sym_hash = (struct aout_link_hash_entry **) bfd_alloc (abfd, amt);
   if (sym_hash == NULL && sym_count != 0)
-    return false;
+    return FALSE;
   obj_aout_sym_hashes (abfd) = sym_hash;
 
   add_one_symbol = aout_backend_info (abfd)->add_one_symbol;
@@ -3543,9 +3548,9 @@ aout_link_add_symbols (abfd, info)
 	}
 
       if (! ((*add_one_symbol)
-	     (info, abfd, name, flags, section, value, string, copy, false,
+	     (info, abfd, name, flags, section, value, string, copy, FALSE,
 	      (struct bfd_link_hash_entry **) sym_hash)))
-	return false;
+	return FALSE;
 
       /* Restrict the maximum alignment of a common symbol based on
 	 the architecture, since a.out has no way to represent
@@ -3571,7 +3576,7 @@ aout_link_add_symbols (abfd, info)
 	++sym_hash;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* A hash table used for header files with N_BINCL entries.  */
@@ -3634,27 +3639,27 @@ struct aout_final_link_info
 
 static struct bfd_hash_entry *aout_link_includes_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean aout_link_input_bfd
+static bfd_boolean aout_link_input_bfd
   PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
-static boolean aout_link_write_symbols
+static bfd_boolean aout_link_write_symbols
   PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
-static boolean aout_link_write_other_symbol
+static bfd_boolean aout_link_write_other_symbol
   PARAMS ((struct aout_link_hash_entry *, PTR));
-static boolean aout_link_input_section
+static bfd_boolean aout_link_input_section
   PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
 	   asection *input_section, file_ptr *reloff_ptr,
 	   bfd_size_type rel_size));
-static boolean aout_link_input_section_std
+static bfd_boolean aout_link_input_section_std
   PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
 	   asection *input_section, struct reloc_std_external *,
 	   bfd_size_type rel_size, bfd_byte *contents));
-static boolean aout_link_input_section_ext
+static bfd_boolean aout_link_input_section_ext
   PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
 	   asection *input_section, struct reloc_ext_external *,
 	   bfd_size_type rel_size, bfd_byte *contents));
 static INLINE asection *aout_reloc_index_to_section
   PARAMS ((bfd *, int));
-static boolean aout_link_reloc_link_order
+static bfd_boolean aout_link_reloc_link_order
   PARAMS ((struct aout_final_link_info *, asection *,
 	   struct bfd_link_order *));
 
@@ -3697,14 +3702,14 @@ aout_link_includes_newfunc (entry, table, string)
    of bfd_link_order structures which list all the input sections for
    the output section.  */
 
-boolean
+bfd_boolean
 NAME(aout,final_link) (abfd, info, callback)
      bfd *abfd;
      struct bfd_link_info *info;
      void (*callback) PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
 {
   struct aout_final_link_info aout_info;
-  boolean includes_hash_initialized = false;
+  bfd_boolean includes_hash_initialized = FALSE;
   register bfd *sub;
   bfd_size_type trsize, drsize;
   bfd_size_type max_contents_size;
@@ -3714,7 +3719,7 @@ NAME(aout,final_link) (abfd, info, callback)
   file_ptr text_end;
   register struct bfd_link_order *p;
   asection *o;
-  boolean have_link_order_relocs;
+  bfd_boolean have_link_order_relocs;
 
   if (info->shared)
     abfd->flags |= DYNAMIC;
@@ -3730,7 +3735,7 @@ NAME(aout,final_link) (abfd, info, callback)
 			       aout_link_includes_newfunc,
 			       251))
     goto error_return;
-  includes_hash_initialized = true;
+  includes_hash_initialized = TRUE;
 
   /* Figure out the largest section size.  Also, if generating
      relocateable output, count the relocs.  */
@@ -3853,7 +3858,7 @@ NAME(aout,final_link) (abfd, info, callback)
     struct aout_link_hash_entry *h;
 
     h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
-			       false, false, false);
+			       FALSE, FALSE, FALSE);
     if (h != NULL)
       aout_link_write_other_symbol (h, &aout_info);
   }
@@ -3880,7 +3885,7 @@ NAME(aout,final_link) (abfd, info, callback)
      We use the output_has_begun field of the input BFDs to see
      whether we have already handled it.  */
   for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next)
-    sub->output_has_begun = false;
+    sub->output_has_begun = FALSE;
 
   /* Mark all sections which are to be included in the link.  This
      will normally be every section.  We need to do this so that we
@@ -3891,11 +3896,11 @@ NAME(aout,final_link) (abfd, info, callback)
       for (p = o->link_order_head; p != NULL; p = p->next)
 	{
 	  if (p->type == bfd_indirect_link_order)
-	    p->u.indirect.section->linker_mark = (unsigned int) true;
+	    p->u.indirect.section->linker_mark = TRUE;
 	}
     }
 
-  have_link_order_relocs = false;
+  have_link_order_relocs = FALSE;
   for (o = abfd->sections; o != (asection *) NULL; o = o->next)
     {
       for (p = o->link_order_head;
@@ -3913,14 +3918,14 @@ NAME(aout,final_link) (abfd, info, callback)
 		{
 		  if (! aout_link_input_bfd (&aout_info, input_bfd))
 		    goto error_return;
-		  input_bfd->output_has_begun = true;
+		  input_bfd->output_has_begun = TRUE;
 		}
 	    }
 	  else if (p->type == bfd_section_reloc_link_order
 		   || p->type == bfd_symbol_reloc_link_order)
 	    {
 	      /* These are handled below.  */
-	      have_link_order_relocs = true;
+	      have_link_order_relocs = TRUE;
 	    }
 	  else
 	    {
@@ -3980,7 +3985,7 @@ NAME(aout,final_link) (abfd, info, callback)
   if (includes_hash_initialized)
     {
       bfd_hash_table_free (&aout_info.includes.root);
-      includes_hash_initialized = false;
+      includes_hash_initialized = FALSE;
     }
 
   /* Finish up any dynamic linking we may be doing.  */
@@ -4019,7 +4024,7 @@ NAME(aout,final_link) (abfd, info, callback)
 	goto error_return;
     }
 
-  return true;
+  return TRUE;
 
  error_return:
   if (aout_info.contents != NULL)
@@ -4032,12 +4037,12 @@ NAME(aout,final_link) (abfd, info, callback)
     free (aout_info.output_syms);
   if (includes_hash_initialized)
     bfd_hash_table_free (&aout_info.includes.root);
-  return false;
+  return FALSE;
 }
 
 /* Link an a.out input BFD into the output file.  */
 
-static boolean
+static bfd_boolean
 aout_link_input_bfd (finfo, input_bfd)
      struct aout_final_link_info *finfo;
      bfd *input_bfd;
@@ -4055,16 +4060,16 @@ aout_link_input_bfd (finfo, input_bfd)
     }
 
   /* Get the symbols.  We probably have them already, unless
-     finfo->info->keep_memory is false.  */
+     finfo->info->keep_memory is FALSE.  */
   if (! aout_get_external_symbols (input_bfd))
-    return false;
+    return FALSE;
 
   sym_count = obj_aout_external_sym_count (input_bfd);
 
   /* Write out the symbols and get a map of the new indices.  The map
      is placed into finfo->symbol_map.  */
   if (! aout_link_write_symbols (finfo, input_bfd))
-    return false;
+    return FALSE;
 
   /* Relocate and write out the sections.  These functions use the
      symbol map created by aout_link_write_symbols.  The linker_mark
@@ -4076,7 +4081,7 @@ aout_link_input_bfd (finfo, input_bfd)
 				     obj_textsec (input_bfd),
 				     &finfo->treloff,
 				     exec_hdr (input_bfd)->a_trsize))
-	return false;
+	return FALSE;
     }
   if (obj_datasec (input_bfd)->linker_mark)
     {
@@ -4084,7 +4089,7 @@ aout_link_input_bfd (finfo, input_bfd)
 				     obj_datasec (input_bfd),
 				     &finfo->dreloff,
 				     exec_hdr (input_bfd)->a_drsize))
-	return false;
+	return FALSE;
     }
 
   /* If we are not keeping memory, we don't need the symbols any
@@ -4093,16 +4098,16 @@ aout_link_input_bfd (finfo, input_bfd)
   if (! finfo->info->keep_memory)
     {
       if (! aout_link_free_symbols (input_bfd))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust and write out the symbols for an a.out file.  Set the new
    symbol indices into a symbol_map.  */
 
-static boolean
+static bfd_boolean
 aout_link_write_symbols (finfo, input_bfd)
      struct aout_final_link_info *finfo;
      bfd *input_bfd;
@@ -4118,8 +4123,8 @@ aout_link_write_symbols (finfo, input_bfd)
   struct external_nlist *sym_end;
   struct aout_link_hash_entry **sym_hash;
   int *symbol_map;
-  boolean pass;
-  boolean skip_next;
+  bfd_boolean pass;
+  bfd_boolean skip_next;
 
   output_bfd = finfo->output_bfd;
   sym_count = obj_aout_external_sym_count (input_bfd);
@@ -4133,16 +4138,16 @@ aout_link_write_symbols (finfo, input_bfd)
   if (strip != strip_all
       && (strip != strip_some
 	  || bfd_hash_lookup (finfo->info->keep_hash, input_bfd->filename,
-			      false, false) != NULL)
+			      FALSE, FALSE) != NULL)
       && discard != discard_all)
     {
       H_PUT_8 (output_bfd, N_TEXT, outsym->e_type);
       H_PUT_8 (output_bfd, 0, outsym->e_other);
       H_PUT_16 (output_bfd, 0, outsym->e_desc);
       strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
-				       input_bfd->filename, false);
+				       input_bfd->filename, FALSE);
       if (strtab_index == (bfd_size_type) -1)
-	return false;
+	return FALSE;
       PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
       PUT_WORD (output_bfd,
 		(bfd_get_section_vma (output_bfd,
@@ -4153,8 +4158,8 @@ aout_link_write_symbols (finfo, input_bfd)
       ++outsym;
     }
 
-  pass = false;
-  skip_next = false;
+  pass = FALSE;
+  skip_next = FALSE;
   sym = obj_aout_external_syms (input_bfd);
   sym_end = sym + sym_count;
   sym_hash = obj_aout_sym_hashes (input_bfd);
@@ -4165,10 +4170,10 @@ aout_link_write_symbols (finfo, input_bfd)
       const char *name;
       int type;
       struct aout_link_hash_entry *h;
-      boolean skip;
+      bfd_boolean skip;
       asection *symsec;
       bfd_vma val = 0;
-      boolean copy;
+      bfd_boolean copy;
 
       /* We set *symbol_map to 0 above for all symbols.  If it has
          already been set to -1 for this symbol, it means that we are
@@ -4192,14 +4197,14 @@ aout_link_write_symbols (finfo, input_bfd)
 	  /* Pass this symbol through.  It is the target of an
 	     indirect or warning symbol.  */
 	  val = GET_WORD (input_bfd, sym->e_value);
-	  pass = false;
+	  pass = FALSE;
 	}
       else if (skip_next)
 	{
 	  /* Skip this symbol, which is the target of an indirect
 	     symbol that we have changed to no longer be an indirect
 	     symbol.  */
-	  skip_next = false;
+	  skip_next = FALSE;
 	  continue;
 	}
       else
@@ -4241,34 +4246,34 @@ aout_link_write_symbols (finfo, input_bfd)
 	    {
 	      if ((type & N_TYPE) == N_INDR
 		  || type == N_WARNING)
-		skip_next = true;
+		skip_next = TRUE;
 	      *symbol_map = h->indx;
 	      continue;
 	    }
 
 	  /* See if we are stripping this symbol.  */
-	  skip = false;
+	  skip = FALSE;
 	  switch (strip)
 	    {
 	    case strip_none:
 	      break;
 	    case strip_debugger:
 	      if ((type & N_STAB) != 0)
-		skip = true;
+		skip = TRUE;
 	      break;
 	    case strip_some:
-	      if (bfd_hash_lookup (finfo->info->keep_hash, name, false, false)
+	      if (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
 		  == NULL)
-		skip = true;
+		skip = TRUE;
 	      break;
 	    case strip_all:
-	      skip = true;
+	      skip = TRUE;
 	      break;
 	    }
 	  if (skip)
 	    {
 	      if (h != (struct aout_link_hash_entry *) NULL)
-		h->written = true;
+		h->written = TRUE;
 	      continue;
 	    }
 
@@ -4297,7 +4302,7 @@ aout_link_write_symbols (finfo, input_bfd)
 		 the indirect symbol was defined, we output it with
 		 the correct definition so the debugger will
 		 understand it.  */
-	      pass = true;
+	      pass = TRUE;
 	      val = GET_WORD (input_bfd, sym->e_value);
 	      symsec = NULL;
 	    }
@@ -4313,7 +4318,7 @@ aout_link_write_symbols (finfo, input_bfd)
 		 a case we do not want to output the next symbol,
 		 which is the target of the indirection.  */
 	      if ((type & N_TYPE) == N_INDR)
-		skip_next = true;
+		skip_next = TRUE;
 
 	      symsec = NULL;
 
@@ -4405,7 +4410,7 @@ aout_link_write_symbols (finfo, input_bfd)
 	     it is a local symbol see if we should discard it.  */
 	  if (h != (struct aout_link_hash_entry *) NULL)
 	    {
-	      h->written = true;
+	      h->written = TRUE;
 	      h->indx = obj_aout_external_sym_count (output_bfd);
 	    }
 	  else if ((type & N_TYPE) != N_SETT
@@ -4421,15 +4426,15 @@ aout_link_write_symbols (finfo, input_bfd)
 		case discard_l:
 		  if ((type & N_STAB) == 0
 		      && bfd_is_local_label_name (input_bfd, name))
-		    skip = true;
+		    skip = TRUE;
 		  break;
 		case discard_all:
-		  skip = true;
+		  skip = TRUE;
 		  break;
 		}
 	      if (skip)
 		{
-		  pass = false;
+		  pass = FALSE;
 		  continue;
 		}
 	    }
@@ -4485,11 +4490,11 @@ aout_link_write_symbols (finfo, input_bfd)
 	      /* If we have already included a header file with the
                  same value, then replace this one with an N_EXCL
                  symbol.  */
-	      copy = (boolean) (! finfo->info->keep_memory);
+	      copy = (bfd_boolean) (! finfo->info->keep_memory);
 	      incl_entry = aout_link_includes_lookup (&finfo->includes,
-						      name, true, copy);
+						      name, TRUE, copy);
 	      if (incl_entry == NULL)
-		return false;
+		return FALSE;
 	      for (t = incl_entry->totals; t != NULL; t = t->next)
 		if (t->total == val)
 		  break;
@@ -4501,7 +4506,7 @@ aout_link_write_symbols (finfo, input_bfd)
 		       bfd_hash_allocate (&finfo->includes.root,
 					  sizeof *t));
 		  if (t == NULL)
-		    return false;
+		    return FALSE;
 		  t->total = val;
 		  t->next = incl_entry->totals;
 		  incl_entry->totals = t;
@@ -4546,7 +4551,7 @@ aout_link_write_symbols (finfo, input_bfd)
       H_PUT_8 (output_bfd, type, outsym->e_type);
       H_PUT_8 (output_bfd, H_GET_8 (input_bfd, sym->e_other), outsym->e_other);
       H_PUT_16 (output_bfd, H_GET_16 (input_bfd, sym->e_desc), outsym->e_desc);
-      copy = false;
+      copy = FALSE;
       if (! finfo->info->keep_memory)
 	{
 	  /* name points into a string table which we are going to
@@ -4555,12 +4560,12 @@ aout_link_write_symbols (finfo, input_bfd)
 	  if (h != (struct aout_link_hash_entry *) NULL)
 	    name = h->root.root.string;
 	  else
-	    copy = true;
+	    copy = TRUE;
 	}
       strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
 				       name, copy);
       if (strtab_index == (bfd_size_type) -1)
-	return false;
+	return FALSE;
       PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
       PUT_WORD (output_bfd, val, outsym->e_value);
       *symbol_map = obj_aout_external_sym_count (output_bfd);
@@ -4574,22 +4579,22 @@ aout_link_write_symbols (finfo, input_bfd)
       bfd_size_type outsym_size;
 
       if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
-	return false;
+	return FALSE;
       outsym_size = outsym - finfo->output_syms;
       outsym_size *= EXTERNAL_NLIST_SIZE;
       if (bfd_bwrite ((PTR) finfo->output_syms, outsym_size, output_bfd)
 	  != outsym_size)
-	return false;
+	return FALSE;
       finfo->symoff += outsym_size;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out a symbol that was not associated with an a.out input
    object.  */
 
-static boolean
+static bfd_boolean
 aout_link_write_other_symbol (h, data)
      struct aout_link_hash_entry *h;
      PTR data;
@@ -4606,7 +4611,7 @@ aout_link_write_other_symbol (h, data)
     {
       h = (struct aout_link_hash_entry *) h->root.u.i.link;
       if (h->root.type == bfd_link_hash_new)
-	return true;
+	return TRUE;
     }
 
   output_bfd = finfo->output_bfd;
@@ -4622,17 +4627,17 @@ aout_link_write_other_symbol (h, data)
     }
 
   if (h->written)
-    return true;
+    return TRUE;
 
-  h->written = true;
+  h->written = TRUE;
 
   /* An indx of -2 means the symbol must be written.  */
   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) == NULL)))
-    return true;
+				  FALSE, FALSE) == NULL)))
+    return TRUE;
 
   switch (h->root.type)
     {
@@ -4640,11 +4645,11 @@ aout_link_write_other_symbol (h, data)
     case bfd_link_hash_warning:
       abort ();
       /* Avoid variable not initialized warnings.  */
-      return true;
+      return TRUE;
     case bfd_link_hash_new:
       /* This can happen for set symbols when sets are not being
          built.  */
-      return true;
+      return TRUE;
     case bfd_link_hash_undefined:
       type = N_UNDF | N_EXT;
       val = 0;
@@ -4681,14 +4686,14 @@ aout_link_write_other_symbol (h, data)
     case bfd_link_hash_indirect:
       /* We ignore these symbols, since the indirected symbol is
 	 already in the hash table.  */
-      return true;
+      return TRUE;
     }
 
   H_PUT_8 (output_bfd, type, outsym.e_type);
   H_PUT_8 (output_bfd, 0, outsym.e_other);
   H_PUT_16 (output_bfd, 0, outsym.e_desc);
   indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string,
-			   false);
+			   FALSE);
   if (indx == - (bfd_size_type) 1)
     {
       /* FIXME: No way to handle errors.  */
@@ -4709,12 +4714,12 @@ aout_link_write_other_symbol (h, data)
   h->indx = obj_aout_external_sym_count (output_bfd);
   ++obj_aout_external_sym_count (output_bfd);
 
-  return true;
+  return TRUE;
 }
 
 /* Link an a.out section into the output file.  */
 
-static boolean
+static bfd_boolean
 aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
 			 rel_size)
      struct aout_final_link_info *finfo;
@@ -4731,7 +4736,7 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
   if (! bfd_get_section_contents (input_bfd, input_section,
 				  (PTR) finfo->contents,
 				  (file_ptr) 0, input_size))
-    return false;
+    return FALSE;
 
   /* Read in the relocs if we haven't already done it.  */
   if (aout_section_data (input_section) != NULL
@@ -4744,7 +4749,7 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
 	{
 	  if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
 	      || bfd_bread (relocs, rel_size, input_bfd) != rel_size)
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -4754,14 +4759,14 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
       if (! aout_link_input_section_std (finfo, input_bfd, input_section,
 					 (struct reloc_std_external *) relocs,
 					 rel_size, finfo->contents))
-	return false;
+	return FALSE;
     }
   else
     {
       if (! aout_link_input_section_ext (finfo, input_bfd, input_section,
 					 (struct reloc_ext_external *) relocs,
 					 rel_size, finfo->contents))
-	return false;
+	return FALSE;
     }
 
   /* Write out the section contents.  */
@@ -4770,16 +4775,16 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
 				  (PTR) finfo->contents,
 				  (file_ptr) input_section->output_offset,
 				  input_size))
-    return false;
+    return FALSE;
 
   /* If we are producing relocateable output, the relocs were
      modified, and we now write them out.  */
   if (finfo->info->relocateable && rel_size > 0)
     {
       if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
-	return false;
+	return FALSE;
       if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size)
-	return false;
+	return FALSE;
       *reloff_ptr += rel_size;
 
       /* Assert that the relocs have not run into the symbols, and
@@ -4791,7 +4796,7 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
 			  <= obj_datasec (finfo->output_bfd)->rel_filepos)));
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Get the section corresponding to a reloc index.  */
@@ -4821,7 +4826,7 @@ aout_reloc_index_to_section (abfd, indx)
 
 /* Relocate an a.out section using standard a.out relocs.  */
 
-static boolean
+static bfd_boolean
 aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 			     rel_size, contents)
      struct aout_final_link_info *finfo;
@@ -4831,13 +4836,12 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
      bfd_size_type rel_size;
      bfd_byte *contents;
 {
-  boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *,
-					  bfd *, asection *,
-					  struct aout_link_hash_entry *,
-					  PTR, bfd_byte *, boolean *,
-					  bfd_vma *));
+  bfd_boolean (*check_dynamic_reloc)
+    PARAMS ((struct bfd_link_info *, bfd *, asection *,
+	     struct aout_link_hash_entry *, PTR, bfd_byte *, bfd_boolean *,
+	     bfd_vma *));
   bfd *output_bfd;
-  boolean relocateable;
+  bfd_boolean relocateable;
   struct external_nlist *syms;
   char *strings;
   struct aout_link_hash_entry **sym_hashes;
@@ -4979,10 +4983,10 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 			  if (h->indx < 0)
 			    {
 			      h->indx = -2;
-			      h->written = false;
+			      h->written = FALSE;
 			      if (! aout_link_write_other_symbol (h,
 								  (PTR) finfo))
-				return false;
+				return FALSE;
 			    }
 			  r_index = h->indx;
 			}
@@ -4995,7 +4999,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 			  if (! ((*finfo->info->callbacks->unattached_reloc)
 				 (finfo->info, name, input_bfd, input_section,
 				  r_addr)))
-			    return false;
+			    return FALSE;
 			  r_index = 0;
 			}
 		    }
@@ -5055,11 +5059,11 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 	}
       else
 	{
-	  boolean hundef;
+	  bfd_boolean hundef;
 
 	  /* We are generating an executable, and must do a full
 	     relocation.  */
-	  hundef = false;
+	  hundef = FALSE;
 
 	  if (r_extern)
 	    {
@@ -5078,7 +5082,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 		relocation = 0;
 	      else
 		{
-		  hundef = true;
+		  hundef = TRUE;
 		  relocation = 0;
 		}
 	    }
@@ -5096,12 +5100,12 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 
 	  if (check_dynamic_reloc != NULL)
 	    {
-	      boolean skip;
+	      bfd_boolean skip;
 
 	      if (! ((*check_dynamic_reloc)
 		     (finfo->info, input_bfd, input_section, h,
 		      (PTR) rel, contents, &skip, &relocation)))
-		return false;
+		return FALSE;
 	      if (skip)
 		continue;
 	    }
@@ -5119,8 +5123,8 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 		name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
 	      if (! ((*finfo->info->callbacks->undefined_symbol)
 		     (finfo->info, name, input_bfd, input_section,
-		     r_addr, true)))
-		return false;
+		     r_addr, TRUE)))
+		return FALSE;
 	    }
 
 	  r = MY_final_link_relocate (howto,
@@ -5155,19 +5159,19 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 		if (! ((*finfo->info->callbacks->reloc_overflow)
 		       (finfo->info, name, howto->name,
 			(bfd_vma) 0, input_bfd, input_section, r_addr)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate an a.out section using extended a.out relocs.  */
 
-static boolean
+static bfd_boolean
 aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 			     rel_size, contents)
      struct aout_final_link_info *finfo;
@@ -5177,13 +5181,12 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
      bfd_size_type rel_size;
      bfd_byte *contents;
 {
-  boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *,
-					  bfd *, asection *,
-					  struct aout_link_hash_entry *,
-					  PTR, bfd_byte *, boolean *,
-					  bfd_vma *));
+  bfd_boolean (*check_dynamic_reloc)
+    PARAMS ((struct bfd_link_info *, bfd *, asection *,
+	     struct aout_link_hash_entry *, PTR, bfd_byte *, bfd_boolean *,
+	     bfd_vma *));
   bfd *output_bfd;
-  boolean relocateable;
+  bfd_boolean relocateable;
   struct external_nlist *syms;
   char *strings;
   struct aout_link_hash_entry **sym_hashes;
@@ -5317,10 +5320,10 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 			  if (h->indx < 0)
 			    {
 			      h->indx = -2;
-			      h->written = false;
+			      h->written = FALSE;
 			      if (! aout_link_write_other_symbol (h,
 								  (PTR) finfo))
-				return false;
+				return FALSE;
 			    }
 			  r_index = h->indx;
 			}
@@ -5333,7 +5336,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 			  if (! ((*finfo->info->callbacks->unattached_reloc)
 				 (finfo->info, name, input_bfd, input_section,
 				  r_addr)))
-			    return false;
+			    return FALSE;
 			  r_index = 0;
 			}
 		    }
@@ -5398,12 +5401,12 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 	}
       else
 	{
-	  boolean hundef;
+	  bfd_boolean hundef;
 	  bfd_reloc_status_type r;
 
 	  /* We are generating an executable, and must do a full
 	     relocation.  */
-	  hundef = false;
+	  hundef = FALSE;
 
 	  if (r_extern)
 	    {
@@ -5422,7 +5425,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 		relocation = 0;
 	      else
 		{
-		  hundef = true;
+		  hundef = TRUE;
 		  relocation = 0;
 		}
 	    }
@@ -5495,12 +5498,12 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 
 	  if (check_dynamic_reloc != NULL)
 	    {
-	      boolean skip;
+	      bfd_boolean skip;
 
 	      if (! ((*check_dynamic_reloc)
 		     (finfo->info, input_bfd, input_section, h,
 		      (PTR) rel, contents, &skip, &relocation)))
-		return false;
+		return FALSE;
 	      if (skip)
 		continue;
 	    }
@@ -5522,8 +5525,8 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 		name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
 	      if (! ((*finfo->info->callbacks->undefined_symbol)
 		     (finfo->info, name, input_bfd, input_section,
-		     r_addr, true)))
-		return false;
+		     r_addr, TRUE)))
+		return FALSE;
 	    }
 
 	  if (r_type != (unsigned int) RELOC_SPARC_REV32)
@@ -5570,7 +5573,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 		    if (! ((*finfo->info->callbacks->reloc_overflow)
 			   (finfo->info, name, howto_table_ext[r_type].name,
 			    r_addend, input_bfd, input_section, r_addr)))
-		      return false;
+		      return FALSE;
 		  }
 		  break;
 		}
@@ -5578,12 +5581,12 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Handle a link order which is supposed to generate a reloc.  */
 
-static boolean
+static bfd_boolean
 aout_link_reloc_link_order (finfo, o, p)
      struct aout_final_link_info *finfo;
      asection *o;
@@ -5620,7 +5623,7 @@ aout_link_reloc_link_order (finfo, o, p)
       r_extern = 1;
       h = ((struct aout_link_hash_entry *)
 	   bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info,
-					 pr->u.name, false, false, true));
+					 pr->u.name, FALSE, FALSE, TRUE));
       if (h != (struct aout_link_hash_entry *) NULL
 	  && h->indx >= 0)
 	r_index = h->indx;
@@ -5631,9 +5634,9 @@ aout_link_reloc_link_order (finfo, o, p)
 	     here.  I don't think that will ever matter for a global
 	     symbol.  */
 	  h->indx = -2;
-	  h->written = false;
+	  h->written = FALSE;
 	  if (! aout_link_write_other_symbol (h, (PTR) finfo))
-	    return false;
+	    return FALSE;
 	  r_index = h->indx;
 	}
       else
@@ -5641,7 +5644,7 @@ aout_link_reloc_link_order (finfo, o, p)
 	  if (! ((*finfo->info->callbacks->unattached_reloc)
 		 (finfo->info, pr->u.name, (bfd *) NULL,
 		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
+	    return FALSE;
 	  r_index = 0;
 	}
     }
@@ -5650,7 +5653,7 @@ aout_link_reloc_link_order (finfo, o, p)
   if (howto == 0)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   if (o == obj_textsec (finfo->output_bfd))
@@ -5720,12 +5723,12 @@ aout_link_reloc_link_order (finfo, o, p)
 	  bfd_size_type size;
 	  bfd_reloc_status_type r;
 	  bfd_byte *buf;
-	  boolean ok;
+	  bfd_boolean ok;
 
 	  size = bfd_get_reloc_size (howto);
 	  buf = (bfd_byte *) bfd_zmalloc (size);
 	  if (buf == (bfd_byte *) NULL)
-	    return false;
+	    return FALSE;
 	  r = MY_relocate_contents (howto, finfo->output_bfd,
 				    (bfd_vma) pr->addend, buf);
 	  switch (r)
@@ -5746,7 +5749,7 @@ aout_link_reloc_link_order (finfo, o, p)
 		      (asection *) NULL, (bfd_vma) 0)))
 		{
 		  free (buf);
-		  return false;
+		  return FALSE;
 		}
 	      break;
 	    }
@@ -5754,7 +5757,7 @@ aout_link_reloc_link_order (finfo, o, p)
 					 (file_ptr) p->offset, size);
 	  free (buf);
 	  if (! ok)
-	    return false;
+	    return FALSE;
 	}
     }
   else
@@ -5793,7 +5796,7 @@ aout_link_reloc_link_order (finfo, o, p)
   amt = obj_reloc_entry_size (finfo->output_bfd);
   if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0
       || bfd_bwrite (rel_ptr, amt, finfo->output_bfd) != amt)
-    return false;
+    return FALSE;
 
   *reloff_ptr += obj_reloc_entry_size (finfo->output_bfd);
 
@@ -5804,5 +5807,5 @@ aout_link_reloc_link_order (finfo, o, p)
 		  || (*reloff_ptr
 		      <= obj_datasec (finfo->output_bfd)->rel_filepos)));
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/archive.c b/bfd/archive.c
index bfbd6de116c..ffb0bd4c875 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -160,17 +160,20 @@ struct ar_cache {
 #define arch_eltdata(bfd) ((struct areltdata *) ((bfd)->arelt_data))
 #define arch_hdr(bfd) ((struct ar_hdr *)arch_eltdata(bfd)->arch_header)
 
-static char *get_extended_arelt_filename PARAMS ((bfd *arch,
-						  const char *name));
-static boolean do_slurp_bsd_armap PARAMS ((bfd *abfd));
-static boolean do_slurp_coff_armap PARAMS ((bfd *abfd));
-boolean bfd_elf64_archive_slurp_armap PARAMS ((bfd *abfd));
-static const char *normalize PARAMS ((bfd *, const char *file));
-static struct areltdata *bfd_ar_hdr_from_filesystem PARAMS ((bfd *abfd,
-							     const char *,
-							     bfd *member));
+static char *get_extended_arelt_filename
+  PARAMS ((bfd *arch, const char *name));
+static bfd_boolean do_slurp_bsd_armap
+  PARAMS ((bfd *abfd));
+static bfd_boolean do_slurp_coff_armap
+  PARAMS ((bfd *abfd));
+bfd_boolean bfd_elf64_archive_slurp_armap
+  PARAMS ((bfd *abfd));
+static const char *normalize
+  PARAMS ((bfd *, const char *file));
+static struct areltdata *bfd_ar_hdr_from_filesystem
+  PARAMS ((bfd *abfd, const char *, bfd *member));
 
-boolean
+bfd_boolean
 _bfd_generic_mkarchive (abfd)
      bfd *abfd;
 {
@@ -178,7 +181,7 @@ _bfd_generic_mkarchive (abfd)
 
   abfd->tdata.aout_ar_data = (struct artdata *) bfd_zalloc (abfd, amt);
   if (bfd_ardata (abfd) == NULL)
-    return false;
+    return FALSE;
 
   bfd_ardata (abfd)->cache = NULL;
   bfd_ardata (abfd)->archive_head = NULL;
@@ -186,7 +189,7 @@ _bfd_generic_mkarchive (abfd)
   bfd_ardata (abfd)->extended_names = NULL;
   bfd_ardata (abfd)->tdata = NULL;
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -247,21 +250,21 @@ FUNCTION
 	bfd_set_archive_head
 
 SYNOPSIS
-	boolean bfd_set_archive_head(bfd *output, bfd *new_head);
+	bfd_boolean bfd_set_archive_head(bfd *output, bfd *new_head);
 
 DESCRIPTION
 	Set the head of the chain of
 	BFDs contained in the archive @var{output} to @var{new_head}.
 */
 
-boolean
+bfd_boolean
 bfd_set_archive_head (output_archive, new_head)
      bfd *output_archive;
      bfd *new_head;
 {
 
   output_archive->archive_head = new_head;
-  return true;
+  return TRUE;
 }
 
 bfd *
@@ -280,7 +283,7 @@ _bfd_look_for_bfd_in_cache (arch_bfd, filepos)
 }
 
 /* Kind of stupid to call cons for each one, but we don't do too many */
-boolean
+bfd_boolean
 _bfd_add_bfd_to_archive_cache (arch_bfd, filepos, new_elt)
      bfd *arch_bfd, *new_elt;
      file_ptr filepos;
@@ -289,7 +292,7 @@ _bfd_add_bfd_to_archive_cache (arch_bfd, filepos, new_elt)
 
   struct ar_cache *new_cache = (struct ar_cache *) bfd_zalloc (arch_bfd, amt);
   if (new_cache == NULL)
-    return false;
+    return FALSE;
 
   new_cache->ptr = filepos;
   new_cache->arelt = new_elt;
@@ -305,7 +308,7 @@ _bfd_add_bfd_to_archive_cache (arch_bfd, filepos, new_elt)
       current->next = new_cache;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The name begins with space.  Hence the rest of the name is an index into
@@ -664,10 +667,10 @@ bfd_generic_archive_p (abfd)
       first = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
       if (first != NULL)
 	{
-	  boolean fail;
+	  bfd_boolean fail;
 
-	  first->target_defaulted = false;
-	  fail = false;
+	  first->target_defaulted = FALSE;
+	  fail = FALSE;
 	  if (bfd_check_format (first, bfd_object)
 	      && first->xvec != abfd->xvec)
 	    {
@@ -707,9 +710,9 @@ bfd_generic_archive_p (abfd)
 /* The size of the string count.  */
 #define BSD_STRING_COUNT_SIZE 4
 
-/* Returns false on error, true otherwise */
+/* Returns FALSE on error, TRUE otherwise */
 
-static boolean
+static bfd_boolean
 do_slurp_bsd_armap (abfd)
      bfd *abfd;
 {
@@ -723,13 +726,13 @@ do_slurp_bsd_armap (abfd)
 
   mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
   if (mapdata == NULL)
-    return false;
+    return FALSE;
   parsed_size = mapdata->parsed_size;
   bfd_release (abfd, (PTR) mapdata);	/* Don't need it any more.  */
 
   raw_armap = (bfd_byte *) bfd_zalloc (abfd, parsed_size);
   if (raw_armap == (bfd_byte *) NULL)
-    return false;
+    return FALSE;
 
   if (bfd_bread ((PTR) raw_armap, parsed_size, abfd) != parsed_size)
     {
@@ -737,7 +740,7 @@ do_slurp_bsd_armap (abfd)
 	bfd_set_error (bfd_error_malformed_archive);
     byebye:
       bfd_release (abfd, (PTR) raw_armap);
-      return false;
+      return FALSE;
     }
 
   ardata->symdef_count = H_GET_32 (abfd, raw_armap) / BSD_SYMDEF_SIZE;
@@ -758,7 +761,7 @@ do_slurp_bsd_armap (abfd)
   amt = (bfd_size_type) ardata->symdef_count * sizeof (carsym);
   ardata->symdefs = (carsym *) bfd_alloc (abfd, amt);
   if (!ardata->symdefs)
-    return false;
+    return FALSE;
 
   for (counter = 0, set = ardata->symdefs;
        counter < ardata->symdef_count;
@@ -774,13 +777,13 @@ do_slurp_bsd_armap (abfd)
   /* FIXME, we should provide some way to free raw_ardata when
      we are done using the strings from it.  For now, it seems
      to be allocated on an objalloc anyway...  */
-  bfd_has_map (abfd) = true;
-  return true;
+  bfd_has_map (abfd) = TRUE;
+  return TRUE;
 }
 
-/* Returns false on error, true otherwise.  */
+/* Returns FALSE on error, TRUE otherwise.  */
 
-static boolean
+static bfd_boolean
 do_slurp_coff_armap (abfd)
      bfd *abfd;
 {
@@ -799,7 +802,7 @@ do_slurp_coff_armap (abfd)
 
   mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
   if (mapdata == NULL)
-    return false;
+    return FALSE;
   parsed_size = mapdata->parsed_size;
   bfd_release (abfd, (PTR) mapdata);	/* Don't need it any more.  */
 
@@ -807,7 +810,7 @@ do_slurp_coff_armap (abfd)
     {
       if (bfd_get_error () != bfd_error_system_call)
 	bfd_set_error (bfd_error_malformed_archive);
-      return false;
+      return FALSE;
     }
   /* It seems that all numeric information in a coff archive is always
      in big endian format, nomatter the host or target.  */
@@ -840,7 +843,7 @@ do_slurp_coff_armap (abfd)
 
   ardata->symdefs = (carsym *) bfd_zalloc (abfd, carsym_size + stringsize + 1);
   if (ardata->symdefs == NULL)
-    return false;
+    return FALSE;
   carsyms = ardata->symdefs;
   stringbase = ((char *) ardata->symdefs) + carsym_size;
 
@@ -872,7 +875,7 @@ do_slurp_coff_armap (abfd)
   /* Pad to an even boundary if you have to.  */
   ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
 
-  bfd_has_map (abfd) = true;
+  bfd_has_map (abfd) = TRUE;
   bfd_release (abfd, (PTR) raw_armap);
 
   /* Check for a second archive header (as used by PE).  */
@@ -893,19 +896,19 @@ do_slurp_coff_armap (abfd)
       }
   }
 
-  return true;
+  return TRUE;
 
 release_raw_armap:
   bfd_release (abfd, (PTR) raw_armap);
 release_symdefs:
   bfd_release (abfd, (PTR) (ardata)->symdefs);
-  return false;
+  return FALSE;
 }
 
 /* This routine can handle either coff-style or bsd-style armaps.
-   Returns false on error, true otherwise */
+   Returns FALSE on error, TRUE otherwise */
 
-boolean
+bfd_boolean
 bfd_slurp_armap (abfd)
      bfd *abfd;
 {
@@ -913,12 +916,12 @@ bfd_slurp_armap (abfd)
   int i = bfd_bread ((PTR) nextname, (bfd_size_type) 16, abfd);
 
   if (i == 0)
-    return true;
+    return TRUE;
   if (i != 16)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
-    return false;
+    return FALSE;
 
   if (!strncmp (nextname, "__.SYMDEF       ", 16)
       || !strncmp (nextname, "__.SYMDEF/      ", 16)) /* old Linux archives */
@@ -932,22 +935,22 @@ bfd_slurp_armap (abfd)
       return bfd_elf64_archive_slurp_armap (abfd);
 #else
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
 #endif
     }
 
-  bfd_has_map (abfd) = false;
-  return true;
+  bfd_has_map (abfd) = FALSE;
+  return TRUE;
 }
 
-/* Returns false on error, true otherwise */
+/* Returns FALSE on error, TRUE otherwise */
 /* flavor 2 of a bsd armap, similar to bfd_slurp_bsd_armap except the
    header is in a slightly different order and the map name is '/'.
    This flavour is used by hp300hpux.  */
 
 #define HPUX_SYMDEF_COUNT_SIZE 2
 
-boolean
+bfd_boolean
 bfd_slurp_bsd_armap_f2 (abfd)
      bfd *abfd;
 {
@@ -963,13 +966,13 @@ bfd_slurp_bsd_armap_f2 (abfd)
   int i = bfd_bread ((PTR) nextname, (bfd_size_type) 16, abfd);
 
   if (i == 0)
-    return true;
+    return TRUE;
   if (i != 16)
-    return false;
+    return FALSE;
 
   /* The archive has at least 16 bytes in it.  */
   if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
-    return false;
+    return FALSE;
 
   if (!strncmp (nextname, "__.SYMDEF       ", 16)
       || !strncmp (nextname, "__.SYMDEF/      ", 16)) /* old Linux archives */
@@ -977,13 +980,13 @@ bfd_slurp_bsd_armap_f2 (abfd)
 
   if (strncmp (nextname, "/               ", 16))
     {
-      bfd_has_map (abfd) = false;
-      return true;
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
     }
 
   mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
   if (mapdata == NULL)
-    return false;
+    return FALSE;
 
   amt = mapdata->parsed_size;
   raw_armap = (bfd_byte *) bfd_zalloc (abfd, amt);
@@ -991,7 +994,7 @@ bfd_slurp_bsd_armap_f2 (abfd)
     {
     byebye:
       bfd_release (abfd, (PTR) mapdata);
-      return false;
+      return FALSE;
     }
 
   if (bfd_bread ((PTR) raw_armap, amt, abfd) != amt)
@@ -1024,7 +1027,7 @@ bfd_slurp_bsd_armap_f2 (abfd)
   amt = (bfd_size_type) ardata->symdef_count * BSD_SYMDEF_SIZE;
   ardata->symdefs = (carsym *) bfd_alloc (abfd, amt);
   if (!ardata->symdefs)
-    return false;
+    return FALSE;
 
   for (counter = 0, set = ardata->symdefs;
        counter < ardata->symdef_count;
@@ -1040,8 +1043,8 @@ bfd_slurp_bsd_armap_f2 (abfd)
   /* FIXME, we should provide some way to free raw_ardata when
      we are done using the strings from it.  For now, it seems
      to be allocated on an objalloc anyway...  */
-  bfd_has_map (abfd) = true;
-  return true;
+  bfd_has_map (abfd) = TRUE;
+  return TRUE;
 }
 
 /** Extended name table.
@@ -1054,9 +1057,9 @@ bfd_slurp_bsd_armap_f2 (abfd)
   element>.  Index is the P.R. of an int (decimal).  Data General have
   extended the format by using the prefix // for the special element.  */
 
-/* Returns false on error, true otherwise.  */
+/* Returns FALSE on error, TRUE otherwise.  */
 
-boolean
+bfd_boolean
 _bfd_slurp_extended_name_table (abfd)
      bfd *abfd;
 {
@@ -1065,23 +1068,23 @@ _bfd_slurp_extended_name_table (abfd)
   bfd_size_type amt;
 
   /* FIXME:  Formatting sucks here, and in case of failure of BFD_READ,
-     we probably don't want to return true.  */
+     we probably don't want to return TRUE.  */
   bfd_seek (abfd, bfd_ardata (abfd)->first_file_filepos, SEEK_SET);
   if (bfd_bread ((PTR) nextname, (bfd_size_type) 16, abfd) == 16)
     {
       if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
-	return false;
+	return FALSE;
 
       if (strncmp (nextname, "ARFILENAMES/    ", 16) != 0 &&
 	  strncmp (nextname, "//              ", 16) != 0)
 	{
 	  bfd_ardata (abfd)->extended_names = NULL;
-	  return true;
+	  return TRUE;
 	}
 
       namedata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
       if (namedata == NULL)
-	return false;
+	return FALSE;
 
       amt = namedata->parsed_size;
       bfd_ardata (abfd)->extended_names = bfd_zalloc (abfd, amt);
@@ -1089,7 +1092,7 @@ _bfd_slurp_extended_name_table (abfd)
 	{
 	byebye:
 	  bfd_release (abfd, (PTR) namedata);
-	  return false;
+	  return FALSE;
 	}
 
       if (bfd_bread ((PTR) bfd_ardata (abfd)->extended_names, amt, abfd) != amt)
@@ -1129,7 +1132,7 @@ _bfd_slurp_extended_name_table (abfd)
       bfd_release (abfd, namedata);
 #endif
     }
-  return true;
+  return TRUE;
 }
 
 #ifdef VMS
@@ -1199,7 +1202,7 @@ normalize (abfd, file)
 
 /* Build a BFD style extended name table.  */
 
-boolean
+bfd_boolean
 _bfd_archive_bsd_construct_extended_name_table (abfd, tabloc, tablen, name)
      bfd *abfd;
      char **tabloc;
@@ -1207,12 +1210,12 @@ _bfd_archive_bsd_construct_extended_name_table (abfd, tabloc, tablen, name)
      const char **name;
 {
   *name = "ARFILENAMES/";
-  return _bfd_construct_extended_name_table (abfd, false, tabloc, tablen);
+  return _bfd_construct_extended_name_table (abfd, FALSE, tabloc, tablen);
 }
 
 /* Build an SVR4 style extended name table.  */
 
-boolean
+bfd_boolean
 _bfd_archive_coff_construct_extended_name_table (abfd, tabloc, tablen, name)
      bfd *abfd;
      char **tabloc;
@@ -1220,21 +1223,21 @@ _bfd_archive_coff_construct_extended_name_table (abfd, tabloc, tablen, name)
      const char **name;
 {
   *name = "//";
-  return _bfd_construct_extended_name_table (abfd, true, tabloc, tablen);
+  return _bfd_construct_extended_name_table (abfd, TRUE, tabloc, tablen);
 }
 
 /* Follows archive_head and produces an extended name table if
    necessary.  Returns (in tabloc) a pointer to an extended name
    table, and in tablen the length of the table.  If it makes an entry
    it clobbers the filename so that the element may be written without
-   further massage.  Returns true if it ran successfully, false if
+   further massage.  Returns TRUE if it ran successfully, FALSE if
    something went wrong.  A successful return may still involve a
    zero-length tablen!  */
 
-boolean
+bfd_boolean
 _bfd_construct_extended_name_table (abfd, trailing_slash, tabloc, tablen)
      bfd *abfd;
-     boolean trailing_slash;
+     bfd_boolean trailing_slash;
      char **tabloc;
      bfd_size_type *tablen;
 {
@@ -1253,7 +1256,7 @@ _bfd_construct_extended_name_table (abfd, trailing_slash, tabloc, tablen)
 
       normal = normalize (current, current->filename);
       if (normal == NULL)
-	return false;
+	return FALSE;
 
       thislen = strlen (normal);
 
@@ -1289,11 +1292,11 @@ _bfd_construct_extended_name_table (abfd, trailing_slash, tabloc, tablen)
     }
 
   if (total_namelen == 0)
-    return true;
+    return TRUE;
 
   *tabloc = bfd_zalloc (abfd, total_namelen);
   if (*tabloc == NULL)
-    return false;
+    return FALSE;
 
   *tablen = total_namelen;
   strptr = *tabloc;
@@ -1306,7 +1309,7 @@ _bfd_construct_extended_name_table (abfd, trailing_slash, tabloc, tablen)
 
       normal = normalize (current, current->filename);
       if (normal == NULL)
-	return false;
+	return FALSE;
 
       thislen = strlen (normal);
       if (thislen > maxname)
@@ -1341,7 +1344,7 @@ _bfd_construct_extended_name_table (abfd, trailing_slash, tabloc, tablen)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /** A couple of functions for creating ar_hdrs */
@@ -1458,7 +1461,8 @@ bfd_ar_hdr_from_filesystem (abfd, filename, member)
    a strong stomach to write this, and it does, but it takes even a
    stronger stomach to try to code around such a thing!  */
 
-struct ar_hdr *bfd_special_undocumented_glue PARAMS ((bfd *, const char *));
+struct ar_hdr *bfd_special_undocumented_glue
+  PARAMS ((bfd *, const char *));
 
 struct ar_hdr *
 bfd_special_undocumented_glue (abfd, filename)
@@ -1669,7 +1673,7 @@ bfd_gnu_truncate_arname (abfd, pathname, arhdr)
 
 /* The BFD is open for write and has its format set to bfd_archive.  */
 
-boolean
+bfd_boolean
 _bfd_write_archive_contents (arch)
      bfd *arch;
 {
@@ -1677,8 +1681,9 @@ _bfd_write_archive_contents (arch)
   char *etable = NULL;
   bfd_size_type elength = 0;
   const char *ename = NULL;
-  boolean makemap = bfd_has_map (arch);
-  boolean hasobjects = false;	/* If no .o's, don't bother to make a map.  */
+  bfd_boolean makemap = bfd_has_map (arch);
+  /* If no .o's, don't bother to make a map.  */
+  bfd_boolean hasobjects = FALSE;
   bfd_size_type wrote;
   unsigned int i;
   int tries;
@@ -1696,14 +1701,14 @@ _bfd_write_archive_contents (arch)
       if (bfd_write_p (current))
 	{
 	  bfd_set_error (bfd_error_invalid_operation);
-	  return false;
+	  return FALSE;
 	}
       if (!current->arelt_data)
 	{
 	  current->arelt_data =
 	    (PTR) bfd_ar_hdr_from_filesystem (arch, current->filename, current);
 	  if (!current->arelt_data)
-	    return false;
+	    return FALSE;
 
 	  /* Put in the file name.  */
 	  BFD_SEND (arch, _bfd_truncate_arname, (arch,
@@ -1718,28 +1723,28 @@ _bfd_write_archive_contents (arch)
 	      && ((bfd_get_file_flags (current) & HAS_SYMS))
 #endif
 	    )
-	    hasobjects = true;
+	    hasobjects = TRUE;
 	}
     }
 
   if (!BFD_SEND (arch, _bfd_construct_extended_name_table,
 		 (arch, &etable, &elength, &ename)))
-    return false;
+    return FALSE;
 
   if (bfd_seek (arch, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 #ifdef GNU960
   wrote = bfd_bwrite (BFD_GNU960_ARMAG (arch), (bfd_size_type) SARMAG, arch);
 #else
   wrote = bfd_bwrite (ARMAG, (bfd_size_type) SARMAG, arch);
 #endif
   if (wrote != SARMAG)
-    return false;
+    return FALSE;
 
   if (makemap && hasobjects)
     {
       if (! _bfd_compute_and_write_armap (arch, (unsigned int) elength))
-	return false;
+	return FALSE;
     }
 
   if (elength != 0)
@@ -1758,11 +1763,11 @@ _bfd_write_archive_contents (arch)
       if ((bfd_bwrite ((PTR) &hdr, (bfd_size_type) sizeof (struct ar_hdr), arch)
 	   != sizeof (struct ar_hdr))
 	  || bfd_bwrite (etable, elength, arch) != elength)
-	return false;
+	return FALSE;
       if ((elength % 2) == 1)
 	{
 	  if (bfd_bwrite ("\012", (bfd_size_type) 1, arch) != 1)
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -1775,9 +1780,9 @@ _bfd_write_archive_contents (arch)
       /* Write ar header.  */
       if (bfd_bwrite ((PTR) hdr, (bfd_size_type) sizeof (*hdr), arch)
 	  != sizeof (*hdr))
-	return false;
+	return FALSE;
       if (bfd_seek (current, (file_ptr) 0, SEEK_SET) != 0)
-	return false;
+	return FALSE;
       while (remaining)
 	{
 	  unsigned int amt = DEFAULT_BUFFERSIZE;
@@ -1788,16 +1793,16 @@ _bfd_write_archive_contents (arch)
 	    {
 	      if (bfd_get_error () != bfd_error_system_call)
 		bfd_set_error (bfd_error_malformed_archive);
-	      return false;
+	      return FALSE;
 	    }
 	  if (bfd_bwrite (buffer, (bfd_size_type) amt, arch) != amt)
-	    return false;
+	    return FALSE;
 	  remaining -= amt;
 	}
       if ((arelt_size (current) % 2) == 1)
 	{
 	  if (bfd_bwrite ("\012", (bfd_size_type) 1, arch) != 1)
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -1820,12 +1825,12 @@ _bfd_write_archive_contents (arch)
       while (++tries < 6);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Note that the namidx for the first symbol is 0.  */
 
-boolean
+bfd_boolean
 _bfd_compute_and_write_armap (arch, elength)
      bfd *arch;
      unsigned int elength;
@@ -1839,7 +1844,7 @@ _bfd_compute_and_write_armap (arch, elength)
   int stridx = 0;		/* string index */
   asymbol **syms = NULL;
   long syms_max = 0;
-  boolean ret;
+  bfd_boolean ret;
   bfd_size_type amt;
 
   /* Dunno if this is the best place for this info...  */
@@ -1968,10 +1973,10 @@ _bfd_compute_and_write_armap (arch, elength)
   if (first_name != NULL)
     bfd_release (arch, first_name);
 
-  return false;
+  return FALSE;
 }
 
-boolean
+bfd_boolean
 bsd_write_armap (arch, elength, map, orl_count, stridx)
      bfd *arch;
      unsigned int elength;
@@ -2012,10 +2017,10 @@ bsd_write_armap (arch, elength, map, orl_count, stridx)
       (((char *) (&hdr))[i]) = ' ';
   if (bfd_bwrite ((PTR) &hdr, (bfd_size_type) sizeof (struct ar_hdr), arch)
       != sizeof (struct ar_hdr))
-    return false;
+    return FALSE;
   H_PUT_32 (arch, ranlibsize, temp);
   if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), arch) != sizeof (temp))
-    return false;
+    return FALSE;
 
   for (count = 0; count < orl_count; count++)
     {
@@ -2037,19 +2042,19 @@ bsd_write_armap (arch, elength, map, orl_count, stridx)
       H_PUT_32 (arch, firstreal, buf + BSD_SYMDEF_OFFSET_SIZE);
       if (bfd_bwrite (buf, (bfd_size_type) BSD_SYMDEF_SIZE, arch)
 	  != BSD_SYMDEF_SIZE)
-	return false;
+	return FALSE;
     }
 
   /* Now write the strings themselves.  */
   H_PUT_32 (arch, stringsize, temp);
   if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), arch) != sizeof (temp))
-    return false;
+    return FALSE;
   for (count = 0; count < orl_count; count++)
     {
       size_t len = strlen (*map[count].name) + 1;
 
       if (bfd_bwrite (*map[count].name, (bfd_size_type) len, arch) != len)
-	return false;
+	return FALSE;
     }
 
   /* The spec sez this should be a newline.  But in order to be
@@ -2057,19 +2062,19 @@ bsd_write_armap (arch, elength, map, orl_count, stridx)
   if (padit)
     {
       if (bfd_bwrite ("", (bfd_size_type) 1, arch) != 1)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* At the end of archive file handling, update the timestamp in the
    file, so the linker will accept it.
 
-   Return true if the timestamp was OK, or an unusual problem happened.
-   Return false if we updated the timestamp.  */
+   Return TRUE if the timestamp was OK, or an unusual problem happened.
+   Return FALSE if we updated the timestamp.  */
 
-boolean
+bfd_boolean
 _bfd_archive_bsd_update_armap_timestamp (arch)
      bfd *arch;
 {
@@ -2085,11 +2090,11 @@ _bfd_archive_bsd_update_armap_timestamp (arch)
       bfd_perror (_("Reading archive file mod timestamp"));
 
       /* Can't read mod time for some reason.  */
-      return true;
+      return TRUE;
     }
   if (archstat.st_mtime <= bfd_ardata (arch)->armap_timestamp)
     /* OK by the linker's rules.  */
-    return true;
+    return TRUE;
 
   /* Update the timestamp.  */
   bfd_ardata (arch)->armap_timestamp = archstat.st_mtime + ARMAP_TIME_OFFSET;
@@ -2111,11 +2116,11 @@ _bfd_archive_bsd_update_armap_timestamp (arch)
       bfd_perror (_("Writing updated armap timestamp"));
 
       /* Some error while writing.  */
-      return true;
+      return TRUE;
     }
 
   /* We updated the timestamp successfully.  */
-  return false;
+  return FALSE;
 }
 
 /* A coff armap looks like :
@@ -2132,7 +2137,7 @@ _bfd_archive_bsd_update_armap_timestamp (arch)
    symbol name n-1
 */
 
-boolean
+bfd_boolean
 coff_write_armap (arch, elength, map, symbol_count, stridx)
      bfd *arch;
      unsigned int elength;
@@ -2179,10 +2184,10 @@ coff_write_armap (arch, elength, map, symbol_count, stridx)
 
   if (bfd_bwrite ((PTR) &hdr, (bfd_size_type) sizeof (struct ar_hdr), arch)
       != sizeof (struct ar_hdr))
-    return false;
+    return FALSE;
 
   if (!bfd_write_bigendian_4byte_int (arch, symbol_count))
-    return false;
+    return FALSE;
 
   /* Two passes, first write the file offsets for each symbol -
      remembering that each offset is on a two byte boundary.  */
@@ -2200,7 +2205,7 @@ coff_write_armap (arch, elength, map, symbol_count, stridx)
       while (count < symbol_count && map[count].u.abfd == current)
 	{
 	  if (!bfd_write_bigendian_4byte_int (arch, archive_member_file_ptr))
-	    return false;
+	    return FALSE;
 	  count++;
 	}
       /* Add size of this archive entry.  */
@@ -2217,7 +2222,7 @@ coff_write_armap (arch, elength, map, symbol_count, stridx)
       size_t len = strlen (*map[count].name) + 1;
 
       if (bfd_bwrite (*map[count].name, (bfd_size_type) len, arch) != len)
-	return false;
+	return FALSE;
     }
 
   /* The spec sez this should be a newline.  But in order to be
@@ -2225,8 +2230,8 @@ coff_write_armap (arch, elength, map, symbol_count, stridx)
   if (padit)
     {
       if (bfd_bwrite ("", (bfd_size_type) 1, arch) != 1)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/archive64.c b/bfd/archive64.c
index ea94c6ae86e..6267e68b3e2 100644
--- a/bfd/archive64.c
+++ b/bfd/archive64.c
@@ -1,5 +1,5 @@
 /* MIPS-specific support for 64-bit ELF
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Ian Lance Taylor, Cygnus Support
    Linker support added by Mark Mitchell, CodeSourcery, LLC.
@@ -31,13 +31,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Irix 6 defines a 64bit archive map format, so that they can
    have archives more than 4 GB in size.  */
 
-boolean bfd_elf64_archive_slurp_armap PARAMS ((bfd *));
-boolean bfd_elf64_archive_write_armap
+bfd_boolean bfd_elf64_archive_slurp_armap PARAMS ((bfd *));
+bfd_boolean bfd_elf64_archive_write_armap
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
 
 /* Read an Irix 6 armap.  */
 
-boolean
+bfd_boolean
 bfd_elf64_archive_slurp_armap (abfd)
      bfd *abfd;
 {
@@ -58,12 +58,12 @@ bfd_elf64_archive_slurp_armap (abfd)
   arhdrpos = bfd_tell (abfd);
   i = bfd_bread ((PTR) nextname, (bfd_size_type) 16, abfd);
   if (i == 0)
-    return true;
+    return TRUE;
   if (i != 16)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
-    return false;
+    return FALSE;
 
   /* Archives with traditional armaps are still permitted.  */
   if (strncmp (nextname, "/               ", 16) == 0)
@@ -71,13 +71,13 @@ bfd_elf64_archive_slurp_armap (abfd)
 
   if (strncmp (nextname, "/SYM64/         ", 16) != 0)
     {
-      bfd_has_map (abfd) = false;
-      return true;
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
     }
 
   mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
   if (mapdata == NULL)
-    return false;
+    return FALSE;
   parsed_size = mapdata->parsed_size;
   bfd_release (abfd, (PTR) mapdata);
 
@@ -85,7 +85,7 @@ bfd_elf64_archive_slurp_armap (abfd)
     {
       if (bfd_get_error () != bfd_error_system_call)
 	bfd_set_error (bfd_error_malformed_archive);
-      return false;
+      return FALSE;
     }
 
   nsymz = bfd_getb64 (int_buf);
@@ -97,7 +97,7 @@ bfd_elf64_archive_slurp_armap (abfd)
   amt = carsym_size + stringsize + 1;
   ardata->symdefs = (carsym *) bfd_zalloc (abfd, amt);
   if (ardata->symdefs == NULL)
-    return false;
+    return FALSE;
   carsyms = ardata->symdefs;
   stringbase = ((char *) ardata->symdefs) + carsym_size;
 
@@ -127,23 +127,23 @@ bfd_elf64_archive_slurp_armap (abfd)
   /* Pad to an even boundary if you have to.  */
   ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
 
-  bfd_has_map (abfd) = true;
+  bfd_has_map (abfd) = TRUE;
   bfd_release (abfd, raw_armap);
 
-  return true;
+  return TRUE;
 
 release_raw_armap:
   bfd_release (abfd, raw_armap);
 release_symdefs:
   bfd_release (abfd, ardata->symdefs);
-  return false;
+  return FALSE;
 }
 
 /* Write out an Irix 6 armap.  The Irix 6 tools are supposed to be
    able to handle ordinary ELF armaps, but at least on Irix 6.2 the
    linker crashes.  */
 
-boolean
+bfd_boolean
 bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
      bfd *arch;
      unsigned int elength;
@@ -189,11 +189,11 @@ bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
 
   if (bfd_bwrite ((PTR) &hdr, (bfd_size_type) sizeof (struct ar_hdr), arch)
       != sizeof (struct ar_hdr))
-    return false;
+    return FALSE;
 
   bfd_putb64 ((bfd_vma) symbol_count, buf);
   if (bfd_bwrite (buf, (bfd_size_type) 8, arch) != 8)
-    return false;
+    return FALSE;
 
   /* Two passes, first write the file offsets for each symbol -
      remembering that each offset is on a two byte boundary.  */
@@ -212,7 +212,7 @@ bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
 	{
 	  bfd_putb64 ((bfd_vma) archive_member_file_ptr, buf);
 	  if (bfd_bwrite (buf, (bfd_size_type) 8, arch) != 8)
-	    return false;
+	    return FALSE;
 	  count++;
 	}
       /* Add size of this archive entry */
@@ -229,7 +229,7 @@ bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
       size_t len = strlen (*map[count].name) + 1;
 
       if (bfd_bwrite (*map[count].name, (bfd_size_type) len, arch) != len)
-	return false;
+	return FALSE;
     }
 
   /* The spec says that this should be padded to an 8 byte boundary.
@@ -237,9 +237,9 @@ bfd_elf64_archive_write_armap (arch, elength, map, symbol_count, stridx)
   while (padding != 0)
     {
       if (bfd_bwrite ("", (bfd_size_type) 1, arch) != 1)
-	return false;
+	return FALSE;
       --padding;
     }
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/archures.c b/bfd/archures.c
index 485fef27401..583098a8ef4 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -306,15 +306,15 @@ DESCRIPTION
 .  const char *arch_name;
 .  const char *printable_name;
 .  unsigned int section_align_power;
-.  {* True if this is the default machine for the architecture.
+.  {* TRUE if this is the default machine for the architecture.
 .     The default arch should be the first entry for an arch so that
 .     all the entries for that arch can be accessed via <<next>>.  *}
-.  boolean the_default;
+.  bfd_boolean the_default;
 .  const struct bfd_arch_info * (*compatible)
 .	PARAMS ((const struct bfd_arch_info *a,
 .	         const struct bfd_arch_info *b));
 .
-.  boolean (*scan) PARAMS ((const struct bfd_arch_info *, const char *));
+.  bfd_boolean (*scan) PARAMS ((const struct bfd_arch_info *, const char *));
 .
 .  const struct bfd_arch_info *next;
 .}
@@ -585,7 +585,7 @@ DESCRIPTION
 */
 
 const bfd_arch_info_type bfd_default_arch_struct = {
-  32, 32, 8, bfd_arch_unknown, 0, "unknown", "unknown", 2, true,
+  32, 32, 8, bfd_arch_unknown, 0, "unknown", "unknown", 2, TRUE,
   bfd_default_compatible,
   bfd_default_scan,
   0,
@@ -615,7 +615,7 @@ INTERNAL_FUNCTION
 	bfd_default_set_arch_mach
 
 SYNOPSIS
-	boolean bfd_default_set_arch_mach(bfd *abfd,
+	bfd_boolean bfd_default_set_arch_mach(bfd *abfd,
 		enum bfd_architecture arch,
 		unsigned long mach);
 
@@ -626,7 +626,7 @@ DESCRIPTION
 	pointer.
 */
 
-boolean
+bfd_boolean
 bfd_default_set_arch_mach (abfd, arch, mach)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -634,11 +634,11 @@ bfd_default_set_arch_mach (abfd, arch, mach)
 {
   abfd->arch_info = bfd_lookup_arch (arch, mach);
   if (abfd->arch_info != NULL)
-    return true;
+    return TRUE;
 
   abfd->arch_info = &bfd_default_arch_struct;
   bfd_set_error (bfd_error_bad_value);
-  return false;
+  return FALSE;
 }
 
 /*
@@ -755,14 +755,14 @@ INTERNAL_FUNCTION
 	bfd_default_scan
 
 SYNOPSIS
-	boolean bfd_default_scan(const struct bfd_arch_info *info, const char *string);
+	bfd_boolean bfd_default_scan(const struct bfd_arch_info *info, const char *string);
 
 DESCRIPTION
 	The default function for working out whether this is an
 	architecture hit and a machine hit.
 */
 
-boolean
+bfd_boolean
 bfd_default_scan (info, string)
      const bfd_arch_info_type *info;
      const char *string;
@@ -777,11 +777,11 @@ bfd_default_scan (info, string)
      default architecture?  */
   if (strcasecmp (string, info->arch_name) == 0
       && info->the_default)
-    return true;
+    return TRUE;
 
   /* Exact match of the machine name (PRINTABLE_NAME)?  */
   if (strcasecmp (string, info->printable_name) == 0)
-    return true;
+    return TRUE;
 
   /* Given that printable_name contains no colon, attempt to match:
      ARCH_NAME [ ":" ] PRINTABLE_NAME?  */
@@ -795,13 +795,13 @@ bfd_default_scan (info, string)
 	    {
 	      if (strcasecmp (string + strlen_arch_name + 1,
 			      info->printable_name) == 0)
-		return true;
+		return TRUE;
 	    }
 	  else
 	    {
 	      if (strcasecmp (string + strlen_arch_name,
 			      info->printable_name) == 0)
-		return true;
+		return TRUE;
 	    }
 	}
     }
@@ -814,7 +814,7 @@ bfd_default_scan (info, string)
       if (strncasecmp (string, info->printable_name, colon_index) == 0
 	  && strcasecmp (string + colon_index,
 			 info->printable_name + colon_index + 1) == 0)
-	return true;
+	return TRUE;
     }
 
   /* Given that PRINTABLE_NAME has the form: <arch> ":" <mach>; Do not
@@ -957,16 +957,16 @@ bfd_default_scan (info, string)
       break;
 
     default:
-      return false;
+      return FALSE;
     }
 
   if (arch != info->arch)
-    return false;
+    return FALSE;
 
   if (number != info->mach)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /*
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index f41e3fbf69d..17570150e05 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -70,42 +70,27 @@ extern "C" {
 /* Forward declaration.  */
 typedef struct _bfd bfd;
 
-/* To squelch erroneous compiler warnings ("illegal pointer
-   combination") from the SVR3 compiler, we would like to typedef
-   boolean to int (it doesn't like functions which return boolean.
-   Making sure they are never implicitly declared to return int
-   doesn't seem to help).  But this file is not configured based on
-   the host.  */
-/* General rules: functions which are boolean return true on success
-   and false on failure (unless they're a predicate).   -- bfd.doc */
-/* I'm sure this is going to break something and someone is going to
-   force me to change it.  */
-/* typedef enum boolean {false, true} boolean; */
-/* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h>  -fnf */
-/* It gets worse if the host also defines a true/false enum... -sts */
-/* And even worse if your compiler has built-in boolean types... -law */
-/* And even worse if your compiler provides a stdbool.h that conflicts
-   with these definitions... gcc 2.95 and later do.  If so, it must
-   be included first.  -drow */
-#if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
-#define TRUE_FALSE_ALREADY_DEFINED
-#else
-#if defined (__bool_true_false_are_defined)
-/* We have <stdbool.h>.  */
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif
-#endif
-#ifdef MPW
-/* Pre-emptive strike - get the file with the enum.  */
-#include <Types.h>
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif /* MPW */
-#ifndef TRUE_FALSE_ALREADY_DEFINED
-typedef enum bfd_boolean {false, true} boolean;
-#define BFD_TRUE_FALSE
-#else
-/* Use enum names that will appear nowhere else.  */
-typedef enum bfd_boolean {bfd_fffalse, bfd_tttrue} boolean;
+/* Boolean type used in bfd.  Too many systems define their own
+   versions of "boolean" for us to safely typedef a "boolean" of
+   our own.  Using an enum for "bfd_boolean" has it's own set of
+   problems, with strange looking casts required to avoid warnings
+   on some older compilers.  Thus we just use an int.
+
+   General rule: functions which are bfd_boolean return TRUE on
+   success and FALSE on failure (unless they're a predicate).  */
+
+typedef int bfd_boolean;
+#undef FALSE
+#undef TRUE
+#define FALSE 0
+#define TRUE 1
+
+#if 0
+/* Poison.  */
+#undef false
+#undef true
+#define false dont_use_false_in_bfd
+#define true dont_use_true_in_bfd
 #endif
 
 /* Support for different sizes of target format ints and addresses.
@@ -186,8 +171,10 @@ typedef unsigned long bfd_size_type;
 typedef bfd_signed_vma file_ptr;
 typedef bfd_vma ufile_ptr;
 
-extern void bfd_sprintf_vma PARAMS ((bfd *, char *, bfd_vma));
-extern void bfd_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma));
+extern void bfd_sprintf_vma
+  PARAMS ((bfd *, char *, bfd_vma));
+extern void bfd_fprintf_vma
+  PARAMS ((bfd *, PTR, bfd_vma));
 
 #define printf_vma(x) fprintf_vma(stdout,x)
 #define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
@@ -263,7 +250,7 @@ bfd_format;
 /* This flag indicates that the BFD contents are actually cached in
    memory.  If this is set, iostream points to a bfd_in_memory struct.  */
 #define BFD_IN_MEMORY 0x800
- 
+
 /* The sections in this BFD specify a memory page.  */
 #define HAS_LOAD_PAGE 0x1000
 
@@ -345,9 +332,9 @@ typedef struct sec *sec_ptr;
 
 #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
 
-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = (unsigned int)true), true)
-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),true)
-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),true)
+#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
 
 typedef struct stat stat_type;
 
@@ -373,7 +360,8 @@ typedef struct _symbol_info
 
 /* Get the name of a stabs type code.  */
 
-extern const char *bfd_get_stab_name PARAMS ((int));
+extern const char *bfd_get_stab_name
+  PARAMS ((int));
 
 /* Hash table routines.  There is no way to free up a hash table.  */
 
@@ -406,23 +394,22 @@ struct bfd_hash_table
      built each of which calls the function in the superclass.  Thus
      each function should be written to allocate a new block of memory
      only if the argument is NULL.  */
-  struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-					     struct bfd_hash_table *,
-					     const char *));
+  struct bfd_hash_entry *(*newfunc)
+    PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
    /* An objalloc for this hash table.  This is a struct objalloc *,
      but we use PTR to avoid requiring the inclusion of objalloc.h.  */
   PTR memory;
 };
 
 /* Initialize a hash table.  */
-extern boolean bfd_hash_table_init
+extern bfd_boolean bfd_hash_table_init
   PARAMS ((struct bfd_hash_table *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
 				       const char *)));
 
 /* Initialize a hash table specifying a size.  */
-extern boolean bfd_hash_table_init_n
+extern bfd_boolean bfd_hash_table_init_n
   PARAMS ((struct bfd_hash_table *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
@@ -430,15 +417,16 @@ extern boolean bfd_hash_table_init_n
 	   unsigned int size));
 
 /* Free up a hash table.  */
-extern void bfd_hash_table_free PARAMS ((struct bfd_hash_table *));
+extern void bfd_hash_table_free
+  PARAMS ((struct bfd_hash_table *));
 
-/* Look up a string in a hash table.  If CREATE is true, a new entry
+/* Look up a string in a hash table.  If CREATE is TRUE, a new entry
    will be created for this string if one does not already exist.  The
-   COPY argument must be true if this routine should copy the string
+   COPY argument must be TRUE if this routine should copy the string
    into newly allocated memory when adding an entry.  */
 extern struct bfd_hash_entry *bfd_hash_lookup
-  PARAMS ((struct bfd_hash_table *, const char *, boolean create,
-	   boolean copy));
+  PARAMS ((struct bfd_hash_table *, const char *, bfd_boolean create,
+	   bfd_boolean copy));
 
 /* Replace an entry in a hash table.  */
 extern void bfd_hash_replace
@@ -451,16 +439,16 @@ extern struct bfd_hash_entry *bfd_hash_newfunc
 	   const char *));
 
 /* Grab some space for a hash table entry.  */
-extern PTR bfd_hash_allocate PARAMS ((struct bfd_hash_table *,
-				      unsigned int));
+extern PTR bfd_hash_allocate
+  PARAMS ((struct bfd_hash_table *, unsigned int));
 
 /* Traverse a hash table in a random order, calling a function on each
-   element.  If the function returns false, the traversal stops.  The
+   element.  If the function returns FALSE, the traversal stops.  The
    INFO argument is passed to the function.  */
-extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *,
-				       boolean (*) (struct bfd_hash_entry *,
-						    PTR),
-				       PTR info));
+extern void bfd_hash_traverse
+  PARAMS ((struct bfd_hash_table *,
+	   bfd_boolean (*) (struct bfd_hash_entry *, PTR),
+	   PTR info));
 
 #define COFF_SWAP_TABLE (PTR) &bfd_coff_std_swap_table
 
@@ -469,12 +457,18 @@ extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *,
 /* Direct I/O routines, for programs which know more about the object
    file than BFD does.  Use higher level routines if possible.  */
 
-extern bfd_size_type bfd_bread PARAMS ((PTR, bfd_size_type, bfd *));
-extern bfd_size_type bfd_bwrite PARAMS ((const PTR, bfd_size_type, bfd *));
-extern int bfd_seek PARAMS ((bfd *, file_ptr, int));
-extern ufile_ptr bfd_tell PARAMS ((bfd *));
-extern int bfd_flush PARAMS ((bfd *));
-extern int bfd_stat PARAMS ((bfd *, struct stat *));
+extern bfd_size_type bfd_bread
+  PARAMS ((PTR, bfd_size_type, bfd *));
+extern bfd_size_type bfd_bwrite
+  PARAMS ((const PTR, bfd_size_type, bfd *));
+extern int bfd_seek
+  PARAMS ((bfd *, file_ptr, int));
+extern ufile_ptr bfd_tell
+  PARAMS ((bfd *));
+extern int bfd_flush
+  PARAMS ((bfd *));
+extern int bfd_stat
+  PARAMS ((bfd *, struct stat *));
 
 /* Deprecated old routines.  */
 #if __GNUC__
@@ -529,40 +523,61 @@ extern void warn_deprecated
 
 #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
 
-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = (boolean) (bool)), true)
+#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
 
-extern boolean bfd_cache_close PARAMS ((bfd *abfd));
+extern bfd_boolean bfd_cache_close
+  PARAMS ((bfd *abfd));
 /* NB: This declaration should match the autogenerated one in libbfd.h.  */
 
-extern boolean bfd_record_phdr
-  PARAMS ((bfd *, unsigned long, boolean, flagword, boolean, bfd_vma,
-	   boolean, boolean, unsigned int, struct sec **));
+extern bfd_boolean bfd_record_phdr
+  PARAMS ((bfd *, unsigned long, bfd_boolean, flagword, bfd_boolean, bfd_vma,
+	   bfd_boolean, bfd_boolean, unsigned int, struct sec **));
 
 /* Byte swapping routines.  */
 
-bfd_vma		bfd_getb64	   PARAMS ((const unsigned char *));
-bfd_vma 	bfd_getl64	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_64 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_64 PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb32	   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl32	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_32 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_32 PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb16	   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl16	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_16 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_16 PARAMS ((const unsigned char *));
-void		bfd_putb64	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl64	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb32	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl32	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb16	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl16	   PARAMS ((bfd_vma, unsigned char *));
+bfd_vma		bfd_getb64
+  PARAMS ((const unsigned char *));
+bfd_vma 	bfd_getl64
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getb_signed_64
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getl_signed_64
+  PARAMS ((const unsigned char *));
+bfd_vma		bfd_getb32
+  PARAMS ((const unsigned char *));
+bfd_vma		bfd_getl32
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getb_signed_32
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getl_signed_32
+  PARAMS ((const unsigned char *));
+bfd_vma		bfd_getb16
+  PARAMS ((const unsigned char *));
+bfd_vma		bfd_getl16
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getb_signed_16
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getl_signed_16
+  PARAMS ((const unsigned char *));
+void		bfd_putb64
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putl64
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putb32
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putl32
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putb16
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putl16
+  PARAMS ((bfd_vma, unsigned char *));
 
 /* Byte swapping routines which take size and endiannes as arguments.  */
 
-bfd_vma         bfd_get_bits       PARAMS ((bfd_byte *, int, boolean));
-void            bfd_put_bits       PARAMS ((bfd_vma, bfd_byte *, int, boolean));
+bfd_vma         bfd_get_bits
+  PARAMS ((bfd_byte *, int, bfd_boolean));
+void            bfd_put_bits
+  PARAMS ((bfd_vma, bfd_byte *, int, bfd_boolean));
 
 /* Externally visible ECOFF routines.  */
 
@@ -575,9 +590,11 @@ struct bfd_link_info;
 struct bfd_link_hash_entry;
 struct bfd_elf_version_tree;
 #endif
-extern bfd_vma bfd_ecoff_get_gp_value PARAMS ((bfd * abfd));
-extern boolean bfd_ecoff_set_gp_value PARAMS ((bfd *abfd, bfd_vma gp_value));
-extern boolean bfd_ecoff_set_regmasks
+extern bfd_vma bfd_ecoff_get_gp_value
+  PARAMS ((bfd * abfd));
+extern bfd_boolean bfd_ecoff_set_gp_value
+  PARAMS ((bfd *abfd, bfd_vma gp_value));
+extern bfd_boolean bfd_ecoff_set_regmasks
   PARAMS ((bfd *abfd, unsigned long gprmask, unsigned long fprmask,
 	   unsigned long *cprmask));
 extern PTR bfd_ecoff_debug_init
@@ -588,39 +605,39 @@ extern void bfd_ecoff_debug_free
   PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
 	   const struct ecoff_debug_swap *output_swap,
 	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_accumulate
+extern bfd_boolean bfd_ecoff_debug_accumulate
   PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
 	   const struct ecoff_debug_swap *output_swap,
 	   bfd *input_bfd, struct ecoff_debug_info *input_debug,
 	   const struct ecoff_debug_swap *input_swap,
 	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_accumulate_other
+extern bfd_boolean bfd_ecoff_debug_accumulate_other
   PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
 	   const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
 	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_externals
+extern bfd_boolean bfd_ecoff_debug_externals
   PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap,
-	   boolean relocateable,
-	   boolean (*get_extr) (struct symbol_cache_entry *,
+	   bfd_boolean relocateable,
+	   bfd_boolean (*get_extr) (struct symbol_cache_entry *,
 				struct ecoff_extr *),
 	   void (*set_index) (struct symbol_cache_entry *,
 			      bfd_size_type)));
-extern boolean bfd_ecoff_debug_one_external
+extern bfd_boolean bfd_ecoff_debug_one_external
   PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap,
 	   const char *name, struct ecoff_extr *esym));
 extern bfd_size_type bfd_ecoff_debug_size
   PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap));
-extern boolean bfd_ecoff_write_debug
+extern bfd_boolean bfd_ecoff_write_debug
   PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap, file_ptr where));
-extern boolean bfd_ecoff_write_accumulated_debug
+extern bfd_boolean bfd_ecoff_write_accumulated_debug
   PARAMS ((PTR handle, bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap,
 	   struct bfd_link_info *info, file_ptr where));
-extern boolean bfd_mips_ecoff_create_embedded_relocs
+extern bfd_boolean bfd_mips_ecoff_create_embedded_relocs
   PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
 	   char **));
 
@@ -633,36 +650,40 @@ struct bfd_link_needed_list
   const char *name;
 };
 
-extern boolean bfd_elf32_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-extern boolean bfd_elf64_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
+extern bfd_boolean bfd_elf32_record_link_assignment
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, bfd_boolean));
+extern bfd_boolean bfd_elf64_record_link_assignment
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, bfd_boolean));
 extern struct bfd_link_needed_list *bfd_elf_get_needed_list
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf_get_bfd_needed_list
+extern bfd_boolean bfd_elf_get_bfd_needed_list
   PARAMS ((bfd *, struct bfd_link_needed_list **));
-extern boolean bfd_elf32_size_dynamic_sections
+extern bfd_boolean bfd_elf32_size_dynamic_sections
   PARAMS ((bfd *, const char *, const char *, const char *,
 	   const char * const *, struct bfd_link_info *, struct sec **,
 	   struct bfd_elf_version_tree *));
-extern boolean bfd_elf64_size_dynamic_sections
+extern bfd_boolean bfd_elf64_size_dynamic_sections
   PARAMS ((bfd *, const char *, const char *, const char *,
 	   const char * const *, struct bfd_link_info *, struct sec **,
 	   struct bfd_elf_version_tree *));
-extern void bfd_elf_set_dt_needed_name PARAMS ((bfd *, const char *));
-extern void bfd_elf_set_dt_needed_soname PARAMS ((bfd *, const char *));
-extern const char *bfd_elf_get_dt_soname PARAMS ((bfd *));
+extern void bfd_elf_set_dt_needed_name
+  PARAMS ((bfd *, const char *));
+extern void bfd_elf_set_dt_needed_soname
+  PARAMS ((bfd *, const char *));
+extern const char *bfd_elf_get_dt_soname
+  PARAMS ((bfd *));
 extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf32_discard_info
+extern bfd_boolean bfd_elf32_discard_info
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf64_discard_info
+extern bfd_boolean bfd_elf64_discard_info
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Return an upper bound on the number of bytes required to store a
    copy of ABFD's program header table entries.  Return -1 if an error
    occurs; bfd_get_error will return an appropriate code.  */
-extern long bfd_get_elf_phdr_upper_bound PARAMS ((bfd *abfd));
+extern long bfd_get_elf_phdr_upper_bound
+  PARAMS ((bfd *abfd));
 
 /* Copy ABFD's program header table entries to *PHDRS.  The entries
    will be stored as an array of Elf_Internal_Phdr structures, as
@@ -671,18 +692,21 @@ extern long bfd_get_elf_phdr_upper_bound PARAMS ((bfd *abfd));
 
    Return the number of program header table entries read, or -1 if an
    error occurs; bfd_get_error will return an appropriate code.  */
-extern int bfd_get_elf_phdrs PARAMS ((bfd *abfd, void *phdrs));
+extern int bfd_get_elf_phdrs
+  PARAMS ((bfd *abfd, void *phdrs));
 
 /* Return the arch_size field of an elf bfd, or -1 if not elf.  */
-extern int bfd_get_arch_size PARAMS ((bfd *));
+extern int bfd_get_arch_size
+  PARAMS ((bfd *));
 
-/* Return true if address "naturally" sign extends, or -1 if not elf.  */
-extern int bfd_get_sign_extend_vma PARAMS ((bfd *));
+/* Return TRUE if address "naturally" sign extends, or -1 if not elf.  */
+extern int bfd_get_sign_extend_vma
+  PARAMS ((bfd *));
 
-extern boolean bfd_m68k_elf32_create_embedded_relocs
+extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs
   PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
 	   char **));
-extern boolean bfd_mips_elf32_create_embedded_relocs
+extern bfd_boolean bfd_mips_elf32_create_embedded_relocs
   PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
 	   char **));
 
@@ -690,19 +714,19 @@ extern boolean bfd_mips_elf32_create_embedded_relocs
 
 extern struct bfd_link_needed_list *bfd_sunos_get_needed_list
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_sunos_record_link_assignment
+extern bfd_boolean bfd_sunos_record_link_assignment
   PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_sunos_size_dynamic_sections
+extern bfd_boolean bfd_sunos_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *, struct sec **, struct sec **,
 	   struct sec **));
 
 /* Linux shared library support routines for the linker.  */
 
-extern boolean bfd_i386linux_size_dynamic_sections
+extern bfd_boolean bfd_i386linux_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_m68klinux_size_dynamic_sections
+extern bfd_boolean bfd_m68klinux_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_sparclinux_size_dynamic_sections
+extern bfd_boolean bfd_sparclinux_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* mmap hacks */
@@ -725,34 +749,37 @@ typedef struct _bfd_window
 }
 bfd_window;
 
-extern void bfd_init_window PARAMS ((bfd_window *));
-extern void bfd_free_window PARAMS ((bfd_window *));
-extern boolean bfd_get_file_window
-  PARAMS ((bfd *, file_ptr, bfd_size_type, bfd_window *, boolean));
+extern void bfd_init_window
+  PARAMS ((bfd_window *));
+extern void bfd_free_window
+  PARAMS ((bfd_window *));
+extern bfd_boolean bfd_get_file_window
+  PARAMS ((bfd *, file_ptr, bfd_size_type, bfd_window *, bfd_boolean));
 
 /* XCOFF support routines for the linker.  */
 
-extern boolean bfd_xcoff_link_record_set
+extern bfd_boolean bfd_xcoff_link_record_set
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
 	   bfd_size_type));
-extern boolean bfd_xcoff_import_symbol
+extern bfd_boolean bfd_xcoff_import_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
 	   bfd_vma, const char *, const char *, const char *, unsigned int));
-extern boolean bfd_xcoff_export_symbol
+extern bfd_boolean bfd_xcoff_export_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *));
-extern boolean bfd_xcoff_link_count_reloc
+extern bfd_boolean bfd_xcoff_link_count_reloc
   PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_xcoff_record_link_assignment
+extern bfd_boolean bfd_xcoff_record_link_assignment
   PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_xcoff_size_dynamic_sections
+extern bfd_boolean bfd_xcoff_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *, const char *, const char *,
-	   unsigned long, unsigned long, unsigned long, boolean,
-	   int, boolean, boolean, struct sec **, boolean));
-extern boolean bfd_xcoff_link_generate_rtinit
-  PARAMS ((bfd *, const char *, const char *, boolean));
+	   unsigned long, unsigned long, unsigned long, bfd_boolean,
+	   int, bfd_boolean, bfd_boolean, struct sec **, bfd_boolean));
+extern bfd_boolean bfd_xcoff_link_generate_rtinit
+  PARAMS ((bfd *, const char *, const char *, bfd_boolean));
 
 /* XCOFF support routines for ar.  */
-extern boolean bfd_xcoff_ar_archive_set_magic PARAMS ((bfd *, char *));
+extern bfd_boolean bfd_xcoff_ar_archive_set_magic
+  PARAMS ((bfd *, char *));
 
 /* Externally visible COFF routines.  */
 
@@ -761,50 +788,50 @@ struct internal_syment;
 union internal_auxent;
 #endif
 
-extern boolean bfd_coff_get_syment
+extern bfd_boolean bfd_coff_get_syment
   PARAMS ((bfd *, struct symbol_cache_entry *, struct internal_syment *));
 
-extern boolean bfd_coff_get_auxent
+extern bfd_boolean bfd_coff_get_auxent
   PARAMS ((bfd *, struct symbol_cache_entry *, int, union internal_auxent *));
 
-extern boolean bfd_coff_set_symbol_class
+extern bfd_boolean bfd_coff_set_symbol_class
   PARAMS ((bfd *, struct symbol_cache_entry *, unsigned int));
 
-extern boolean bfd_m68k_coff_create_embedded_relocs
+extern bfd_boolean bfd_m68k_coff_create_embedded_relocs
   PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
 	   char **));
 
 /* ARM Interworking support.  Called from linker.  */
-extern boolean bfd_arm_allocate_interworking_sections
+extern bfd_boolean bfd_arm_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
 
-extern boolean bfd_arm_process_before_allocation
+extern bfd_boolean bfd_arm_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 
-extern boolean bfd_arm_get_bfd_for_interworking
+extern bfd_boolean bfd_arm_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* PE ARM Interworking support.  Called from linker.  */
-extern boolean bfd_arm_pe_allocate_interworking_sections
+extern bfd_boolean bfd_arm_pe_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
 
-extern boolean bfd_arm_pe_process_before_allocation
+extern bfd_boolean bfd_arm_pe_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 
-extern boolean bfd_arm_pe_get_bfd_for_interworking
+extern bfd_boolean bfd_arm_pe_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* ELF ARM Interworking support.  Called from linker.  */
-extern boolean bfd_elf32_arm_allocate_interworking_sections
+extern bfd_boolean bfd_elf32_arm_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
 
-extern boolean bfd_elf32_arm_process_before_allocation
+extern bfd_boolean bfd_elf32_arm_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 
-extern boolean bfd_elf32_arm_get_bfd_for_interworking
+extern bfd_boolean bfd_elf32_arm_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
 
-extern boolean bfd_elf32_arm_add_glue_sections_to_bfd
+extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* TI COFF load page support.  */
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index acb4b873ee3..cde91f178cb 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -77,42 +77,27 @@ extern "C" {
 /* Forward declaration.  */
 typedef struct _bfd bfd;
 
-/* To squelch erroneous compiler warnings ("illegal pointer
-   combination") from the SVR3 compiler, we would like to typedef
-   boolean to int (it doesn't like functions which return boolean.
-   Making sure they are never implicitly declared to return int
-   doesn't seem to help).  But this file is not configured based on
-   the host.  */
-/* General rules: functions which are boolean return true on success
-   and false on failure (unless they're a predicate).   -- bfd.doc */
-/* I'm sure this is going to break something and someone is going to
-   force me to change it.  */
-/* typedef enum boolean {false, true} boolean; */
-/* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h>  -fnf */
-/* It gets worse if the host also defines a true/false enum... -sts */
-/* And even worse if your compiler has built-in boolean types... -law */
-/* And even worse if your compiler provides a stdbool.h that conflicts
-   with these definitions... gcc 2.95 and later do.  If so, it must
-   be included first.  -drow */
-#if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
-#define TRUE_FALSE_ALREADY_DEFINED
-#else
-#if defined (__bool_true_false_are_defined)
-/* We have <stdbool.h>.  */
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif
-#endif
-#ifdef MPW
-/* Pre-emptive strike - get the file with the enum.  */
-#include <Types.h>
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif /* MPW */
-#ifndef TRUE_FALSE_ALREADY_DEFINED
-typedef enum bfd_boolean {false, true} boolean;
-#define BFD_TRUE_FALSE
-#else
-/* Use enum names that will appear nowhere else.  */
-typedef enum bfd_boolean {bfd_fffalse, bfd_tttrue} boolean;
+/* Boolean type used in bfd.  Too many systems define their own
+   versions of "boolean" for us to safely typedef a "boolean" of
+   our own.  Using an enum for "bfd_boolean" has it's own set of
+   problems, with strange looking casts required to avoid warnings
+   on some older compilers.  Thus we just use an int.
+
+   General rule: functions which are bfd_boolean return TRUE on
+   success and FALSE on failure (unless they're a predicate).  */
+
+typedef int bfd_boolean;
+#undef FALSE
+#undef TRUE
+#define FALSE 0
+#define TRUE 1
+
+#if 0
+/* Poison.  */
+#undef false
+#undef true
+#define false dont_use_false_in_bfd
+#define true dont_use_true_in_bfd
 #endif
 
 /* Support for different sizes of target format ints and addresses.
@@ -193,8 +178,10 @@ typedef unsigned long bfd_size_type;
 typedef bfd_signed_vma file_ptr;
 typedef bfd_vma ufile_ptr;
 
-extern void bfd_sprintf_vma PARAMS ((bfd *, char *, bfd_vma));
-extern void bfd_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma));
+extern void bfd_sprintf_vma
+  PARAMS ((bfd *, char *, bfd_vma));
+extern void bfd_fprintf_vma
+  PARAMS ((bfd *, PTR, bfd_vma));
 
 #define printf_vma(x) fprintf_vma(stdout,x)
 #define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
@@ -270,7 +257,7 @@ bfd_format;
 /* This flag indicates that the BFD contents are actually cached in
    memory.  If this is set, iostream points to a bfd_in_memory struct.  */
 #define BFD_IN_MEMORY 0x800
- 
+
 /* The sections in this BFD specify a memory page.  */
 #define HAS_LOAD_PAGE 0x1000
 
@@ -352,9 +339,9 @@ typedef struct sec *sec_ptr;
 
 #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
 
-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = (unsigned int)true), true)
-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),true)
-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),true)
+#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
 
 typedef struct stat stat_type;
 
@@ -380,7 +367,8 @@ typedef struct _symbol_info
 
 /* Get the name of a stabs type code.  */
 
-extern const char *bfd_get_stab_name PARAMS ((int));
+extern const char *bfd_get_stab_name
+  PARAMS ((int));
 
 /* Hash table routines.  There is no way to free up a hash table.  */
 
@@ -413,23 +401,22 @@ struct bfd_hash_table
      built each of which calls the function in the superclass.  Thus
      each function should be written to allocate a new block of memory
      only if the argument is NULL.  */
-  struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-					     struct bfd_hash_table *,
-					     const char *));
+  struct bfd_hash_entry *(*newfunc)
+    PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
    /* An objalloc for this hash table.  This is a struct objalloc *,
      but we use PTR to avoid requiring the inclusion of objalloc.h.  */
   PTR memory;
 };
 
 /* Initialize a hash table.  */
-extern boolean bfd_hash_table_init
+extern bfd_boolean bfd_hash_table_init
   PARAMS ((struct bfd_hash_table *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
 				       const char *)));
 
 /* Initialize a hash table specifying a size.  */
-extern boolean bfd_hash_table_init_n
+extern bfd_boolean bfd_hash_table_init_n
   PARAMS ((struct bfd_hash_table *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
@@ -437,15 +424,16 @@ extern boolean bfd_hash_table_init_n
 	   unsigned int size));
 
 /* Free up a hash table.  */
-extern void bfd_hash_table_free PARAMS ((struct bfd_hash_table *));
+extern void bfd_hash_table_free
+  PARAMS ((struct bfd_hash_table *));
 
-/* Look up a string in a hash table.  If CREATE is true, a new entry
+/* Look up a string in a hash table.  If CREATE is TRUE, a new entry
    will be created for this string if one does not already exist.  The
-   COPY argument must be true if this routine should copy the string
+   COPY argument must be TRUE if this routine should copy the string
    into newly allocated memory when adding an entry.  */
 extern struct bfd_hash_entry *bfd_hash_lookup
-  PARAMS ((struct bfd_hash_table *, const char *, boolean create,
-	   boolean copy));
+  PARAMS ((struct bfd_hash_table *, const char *, bfd_boolean create,
+	   bfd_boolean copy));
 
 /* Replace an entry in a hash table.  */
 extern void bfd_hash_replace
@@ -458,16 +446,16 @@ extern struct bfd_hash_entry *bfd_hash_newfunc
 	   const char *));
 
 /* Grab some space for a hash table entry.  */
-extern PTR bfd_hash_allocate PARAMS ((struct bfd_hash_table *,
-				      unsigned int));
+extern PTR bfd_hash_allocate
+  PARAMS ((struct bfd_hash_table *, unsigned int));
 
 /* Traverse a hash table in a random order, calling a function on each
-   element.  If the function returns false, the traversal stops.  The
+   element.  If the function returns FALSE, the traversal stops.  The
    INFO argument is passed to the function.  */
-extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *,
-				       boolean (*) (struct bfd_hash_entry *,
-						    PTR),
-				       PTR info));
+extern void bfd_hash_traverse
+  PARAMS ((struct bfd_hash_table *,
+	   bfd_boolean (*) (struct bfd_hash_entry *, PTR),
+	   PTR info));
 
 #define COFF_SWAP_TABLE (PTR) &bfd_coff_std_swap_table
 
@@ -476,12 +464,18 @@ extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *,
 /* Direct I/O routines, for programs which know more about the object
    file than BFD does.  Use higher level routines if possible.  */
 
-extern bfd_size_type bfd_bread PARAMS ((PTR, bfd_size_type, bfd *));
-extern bfd_size_type bfd_bwrite PARAMS ((const PTR, bfd_size_type, bfd *));
-extern int bfd_seek PARAMS ((bfd *, file_ptr, int));
-extern ufile_ptr bfd_tell PARAMS ((bfd *));
-extern int bfd_flush PARAMS ((bfd *));
-extern int bfd_stat PARAMS ((bfd *, struct stat *));
+extern bfd_size_type bfd_bread
+  PARAMS ((PTR, bfd_size_type, bfd *));
+extern bfd_size_type bfd_bwrite
+  PARAMS ((const PTR, bfd_size_type, bfd *));
+extern int bfd_seek
+  PARAMS ((bfd *, file_ptr, int));
+extern ufile_ptr bfd_tell
+  PARAMS ((bfd *));
+extern int bfd_flush
+  PARAMS ((bfd *));
+extern int bfd_stat
+  PARAMS ((bfd *, struct stat *));
 
 /* Deprecated old routines.  */
 #if __GNUC__
@@ -536,40 +530,61 @@ extern void warn_deprecated
 
 #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
 
-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = (boolean) (bool)), true)
+#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
 
-extern boolean bfd_cache_close PARAMS ((bfd *abfd));
+extern bfd_boolean bfd_cache_close
+  PARAMS ((bfd *abfd));
 /* NB: This declaration should match the autogenerated one in libbfd.h.  */
 
-extern boolean bfd_record_phdr
-  PARAMS ((bfd *, unsigned long, boolean, flagword, boolean, bfd_vma,
-	   boolean, boolean, unsigned int, struct sec **));
+extern bfd_boolean bfd_record_phdr
+  PARAMS ((bfd *, unsigned long, bfd_boolean, flagword, bfd_boolean, bfd_vma,
+	   bfd_boolean, bfd_boolean, unsigned int, struct sec **));
 
 /* Byte swapping routines.  */
 
-bfd_vma		bfd_getb64	   PARAMS ((const unsigned char *));
-bfd_vma 	bfd_getl64	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_64 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_64 PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb32	   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl32	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_32 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_32 PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb16	   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl16	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_16 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_16 PARAMS ((const unsigned char *));
-void		bfd_putb64	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl64	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb32	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl32	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb16	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl16	   PARAMS ((bfd_vma, unsigned char *));
+bfd_vma		bfd_getb64
+  PARAMS ((const unsigned char *));
+bfd_vma 	bfd_getl64
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getb_signed_64
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getl_signed_64
+  PARAMS ((const unsigned char *));
+bfd_vma		bfd_getb32
+  PARAMS ((const unsigned char *));
+bfd_vma		bfd_getl32
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getb_signed_32
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getl_signed_32
+  PARAMS ((const unsigned char *));
+bfd_vma		bfd_getb16
+  PARAMS ((const unsigned char *));
+bfd_vma		bfd_getl16
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getb_signed_16
+  PARAMS ((const unsigned char *));
+bfd_signed_vma	bfd_getl_signed_16
+  PARAMS ((const unsigned char *));
+void		bfd_putb64
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putl64
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putb32
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putl32
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putb16
+  PARAMS ((bfd_vma, unsigned char *));
+void		bfd_putl16
+  PARAMS ((bfd_vma, unsigned char *));
 
 /* Byte swapping routines which take size and endiannes as arguments.  */
 
-bfd_vma         bfd_get_bits       PARAMS ((bfd_byte *, int, boolean));
-void            bfd_put_bits       PARAMS ((bfd_vma, bfd_byte *, int, boolean));
+bfd_vma         bfd_get_bits
+  PARAMS ((bfd_byte *, int, bfd_boolean));
+void            bfd_put_bits
+  PARAMS ((bfd_vma, bfd_byte *, int, bfd_boolean));
 
 /* Externally visible ECOFF routines.  */
 
@@ -582,9 +597,11 @@ struct bfd_link_info;
 struct bfd_link_hash_entry;
 struct bfd_elf_version_tree;
 #endif
-extern bfd_vma bfd_ecoff_get_gp_value PARAMS ((bfd * abfd));
-extern boolean bfd_ecoff_set_gp_value PARAMS ((bfd *abfd, bfd_vma gp_value));
-extern boolean bfd_ecoff_set_regmasks
+extern bfd_vma bfd_ecoff_get_gp_value
+  PARAMS ((bfd * abfd));
+extern bfd_boolean bfd_ecoff_set_gp_value
+  PARAMS ((bfd *abfd, bfd_vma gp_value));
+extern bfd_boolean bfd_ecoff_set_regmasks
   PARAMS ((bfd *abfd, unsigned long gprmask, unsigned long fprmask,
 	   unsigned long *cprmask));
 extern PTR bfd_ecoff_debug_init
@@ -595,39 +612,39 @@ extern void bfd_ecoff_debug_free
   PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
 	   const struct ecoff_debug_swap *output_swap,
 	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_accumulate
+extern bfd_boolean bfd_ecoff_debug_accumulate
   PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
 	   const struct ecoff_debug_swap *output_swap,
 	   bfd *input_bfd, struct ecoff_debug_info *input_debug,
 	   const struct ecoff_debug_swap *input_swap,
 	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_accumulate_other
+extern bfd_boolean bfd_ecoff_debug_accumulate_other
   PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
 	   const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
 	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_externals
+extern bfd_boolean bfd_ecoff_debug_externals
   PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap,
-	   boolean relocateable,
-	   boolean (*get_extr) (struct symbol_cache_entry *,
+	   bfd_boolean relocateable,
+	   bfd_boolean (*get_extr) (struct symbol_cache_entry *,
 				struct ecoff_extr *),
 	   void (*set_index) (struct symbol_cache_entry *,
 			      bfd_size_type)));
-extern boolean bfd_ecoff_debug_one_external
+extern bfd_boolean bfd_ecoff_debug_one_external
   PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap,
 	   const char *name, struct ecoff_extr *esym));
 extern bfd_size_type bfd_ecoff_debug_size
   PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap));
-extern boolean bfd_ecoff_write_debug
+extern bfd_boolean bfd_ecoff_write_debug
   PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap, file_ptr where));
-extern boolean bfd_ecoff_write_accumulated_debug
+extern bfd_boolean bfd_ecoff_write_accumulated_debug
   PARAMS ((PTR handle, bfd *abfd, struct ecoff_debug_info *debug,
 	   const struct ecoff_debug_swap *swap,
 	   struct bfd_link_info *info, file_ptr where));
-extern boolean bfd_mips_ecoff_create_embedded_relocs
+extern bfd_boolean bfd_mips_ecoff_create_embedded_relocs
   PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
 	   char **));
 
@@ -640,36 +657,40 @@ struct bfd_link_needed_list
   const char *name;
 };
 
-extern boolean bfd_elf32_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-extern boolean bfd_elf64_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
+extern bfd_boolean bfd_elf32_record_link_assignment
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, bfd_boolean));
+extern bfd_boolean bfd_elf64_record_link_assignment
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, bfd_boolean));
 extern struct bfd_link_needed_list *bfd_elf_get_needed_list
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf_get_bfd_needed_list
+extern bfd_boolean bfd_elf_get_bfd_needed_list
   PARAMS ((bfd *, struct bfd_link_needed_list **));
-extern boolean bfd_elf32_size_dynamic_sections
+extern bfd_boolean bfd_elf32_size_dynamic_sections
   PARAMS ((bfd *, const char *, const char *, const char *,
 	   const char * const *, struct bfd_link_info *, struct sec **,
 	   struct bfd_elf_version_tree *));
-extern boolean bfd_elf64_size_dynamic_sections
+extern bfd_boolean bfd_elf64_size_dynamic_sections
   PARAMS ((bfd *, const char *, const char *, const char *,
 	   const char * const *, struct bfd_link_info *, struct sec **,
 	   struct bfd_elf_version_tree *));
-extern void bfd_elf_set_dt_needed_name PARAMS ((bfd *, const char *));
-extern void bfd_elf_set_dt_needed_soname PARAMS ((bfd *, const char *));
-extern const char *bfd_elf_get_dt_soname PARAMS ((bfd *));
+extern void bfd_elf_set_dt_needed_name
+  PARAMS ((bfd *, const char *));
+extern void bfd_elf_set_dt_needed_soname
+  PARAMS ((bfd *, const char *));
+extern const char *bfd_elf_get_dt_soname
+  PARAMS ((bfd *));
 extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf32_discard_info
+extern bfd_boolean bfd_elf32_discard_info
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf64_discard_info
+extern bfd_boolean bfd_elf64_discard_info
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Return an upper bound on the number of bytes required to store a
    copy of ABFD's program header table entries.  Return -1 if an error
    occurs; bfd_get_error will return an appropriate code.  */
-extern long bfd_get_elf_phdr_upper_bound PARAMS ((bfd *abfd));
+extern long bfd_get_elf_phdr_upper_bound
+  PARAMS ((bfd *abfd));
 
 /* Copy ABFD's program header table entries to *PHDRS.  The entries
    will be stored as an array of Elf_Internal_Phdr structures, as
@@ -678,18 +699,21 @@ extern long bfd_get_elf_phdr_upper_bound PARAMS ((bfd *abfd));
 
    Return the number of program header table entries read, or -1 if an
    error occurs; bfd_get_error will return an appropriate code.  */
-extern int bfd_get_elf_phdrs PARAMS ((bfd *abfd, void *phdrs));
+extern int bfd_get_elf_phdrs
+  PARAMS ((bfd *abfd, void *phdrs));
 
 /* Return the arch_size field of an elf bfd, or -1 if not elf.  */
-extern int bfd_get_arch_size PARAMS ((bfd *));
+extern int bfd_get_arch_size
+  PARAMS ((bfd *));
 
-/* Return true if address "naturally" sign extends, or -1 if not elf.  */
-extern int bfd_get_sign_extend_vma PARAMS ((bfd *));
+/* Return TRUE if address "naturally" sign extends, or -1 if not elf.  */
+extern int bfd_get_sign_extend_vma
+  PARAMS ((bfd *));
 
-extern boolean bfd_m68k_elf32_create_embedded_relocs
+extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs
   PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
 	   char **));
-extern boolean bfd_mips_elf32_create_embedded_relocs
+extern bfd_boolean bfd_mips_elf32_create_embedded_relocs
   PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
 	   char **));
 
@@ -697,19 +721,19 @@ extern boolean bfd_mips_elf32_create_embedded_relocs
 
 extern struct bfd_link_needed_list *bfd_sunos_get_needed_list
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_sunos_record_link_assignment
+extern bfd_boolean bfd_sunos_record_link_assignment
   PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_sunos_size_dynamic_sections
+extern bfd_boolean bfd_sunos_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *, struct sec **, struct sec **,
 	   struct sec **));
 
 /* Linux shared library support routines for the linker.  */
 
-extern boolean bfd_i386linux_size_dynamic_sections
+extern bfd_boolean bfd_i386linux_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_m68klinux_size_dynamic_sections
+extern bfd_boolean bfd_m68klinux_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_sparclinux_size_dynamic_sections
+extern bfd_boolean bfd_sparclinux_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* mmap hacks */
@@ -732,34 +756,37 @@ typedef struct _bfd_window
 }
 bfd_window;
 
-extern void bfd_init_window PARAMS ((bfd_window *));
-extern void bfd_free_window PARAMS ((bfd_window *));
-extern boolean bfd_get_file_window
-  PARAMS ((bfd *, file_ptr, bfd_size_type, bfd_window *, boolean));
+extern void bfd_init_window
+  PARAMS ((bfd_window *));
+extern void bfd_free_window
+  PARAMS ((bfd_window *));
+extern bfd_boolean bfd_get_file_window
+  PARAMS ((bfd *, file_ptr, bfd_size_type, bfd_window *, bfd_boolean));
 
 /* XCOFF support routines for the linker.  */
 
-extern boolean bfd_xcoff_link_record_set
+extern bfd_boolean bfd_xcoff_link_record_set
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
 	   bfd_size_type));
-extern boolean bfd_xcoff_import_symbol
+extern bfd_boolean bfd_xcoff_import_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
 	   bfd_vma, const char *, const char *, const char *, unsigned int));
-extern boolean bfd_xcoff_export_symbol
+extern bfd_boolean bfd_xcoff_export_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *));
-extern boolean bfd_xcoff_link_count_reloc
+extern bfd_boolean bfd_xcoff_link_count_reloc
   PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_xcoff_record_link_assignment
+extern bfd_boolean bfd_xcoff_record_link_assignment
   PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_xcoff_size_dynamic_sections
+extern bfd_boolean bfd_xcoff_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *, const char *, const char *,
-	   unsigned long, unsigned long, unsigned long, boolean,
-	   int, boolean, boolean, struct sec **, boolean));
-extern boolean bfd_xcoff_link_generate_rtinit
-  PARAMS ((bfd *, const char *, const char *, boolean));
+	   unsigned long, unsigned long, unsigned long, bfd_boolean,
+	   int, bfd_boolean, bfd_boolean, struct sec **, bfd_boolean));
+extern bfd_boolean bfd_xcoff_link_generate_rtinit
+  PARAMS ((bfd *, const char *, const char *, bfd_boolean));
 
 /* XCOFF support routines for ar.  */
-extern boolean bfd_xcoff_ar_archive_set_magic PARAMS ((bfd *, char *));
+extern bfd_boolean bfd_xcoff_ar_archive_set_magic
+  PARAMS ((bfd *, char *));
 
 /* Externally visible COFF routines.  */
 
@@ -768,50 +795,50 @@ struct internal_syment;
 union internal_auxent;
 #endif
 
-extern boolean bfd_coff_get_syment
+extern bfd_boolean bfd_coff_get_syment
   PARAMS ((bfd *, struct symbol_cache_entry *, struct internal_syment *));
 
-extern boolean bfd_coff_get_auxent
+extern bfd_boolean bfd_coff_get_auxent
   PARAMS ((bfd *, struct symbol_cache_entry *, int, union internal_auxent *));
 
-extern boolean bfd_coff_set_symbol_class
+extern bfd_boolean bfd_coff_set_symbol_class
   PARAMS ((bfd *, struct symbol_cache_entry *, unsigned int));
 
-extern boolean bfd_m68k_coff_create_embedded_relocs
+extern bfd_boolean bfd_m68k_coff_create_embedded_relocs
   PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
 	   char **));
 
 /* ARM Interworking support.  Called from linker.  */
-extern boolean bfd_arm_allocate_interworking_sections
+extern bfd_boolean bfd_arm_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
 
-extern boolean bfd_arm_process_before_allocation
+extern bfd_boolean bfd_arm_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 
-extern boolean bfd_arm_get_bfd_for_interworking
+extern bfd_boolean bfd_arm_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* PE ARM Interworking support.  Called from linker.  */
-extern boolean bfd_arm_pe_allocate_interworking_sections
+extern bfd_boolean bfd_arm_pe_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
 
-extern boolean bfd_arm_pe_process_before_allocation
+extern bfd_boolean bfd_arm_pe_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 
-extern boolean bfd_arm_pe_get_bfd_for_interworking
+extern bfd_boolean bfd_arm_pe_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* ELF ARM Interworking support.  Called from linker.  */
-extern boolean bfd_elf32_arm_allocate_interworking_sections
+extern bfd_boolean bfd_elf32_arm_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
 
-extern boolean bfd_elf32_arm_process_before_allocation
+extern bfd_boolean bfd_elf32_arm_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 
-extern boolean bfd_elf32_arm_get_bfd_for_interworking
+extern bfd_boolean bfd_elf32_arm_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
 
-extern boolean bfd_elf32_arm_add_glue_sections_to_bfd
+extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* TI COFF load page support.  */
@@ -838,19 +865,19 @@ bfd_openstreamr PARAMS ((const char *, const char *, PTR));
 bfd *
 bfd_openw PARAMS ((const char *filename, const char *target));
 
-boolean
+bfd_boolean
 bfd_close PARAMS ((bfd *abfd));
 
-boolean
+bfd_boolean
 bfd_close_all_done PARAMS ((bfd *));
 
 bfd *
 bfd_create PARAMS ((const char *filename, bfd *templ));
 
-boolean
+bfd_boolean
 bfd_make_writable PARAMS ((bfd *abfd));
 
-boolean
+bfd_boolean
 bfd_make_readable PARAMS ((bfd *abfd));
 
 /* Extracted from libbfd.c.  */
@@ -1430,7 +1457,7 @@ bfd_make_section_anyway PARAMS ((bfd *abfd, const char *name));
 asection *
 bfd_make_section PARAMS ((bfd *, const char *name));
 
-boolean
+bfd_boolean
 bfd_set_section_flags PARAMS ((bfd *abfd, asection *sec, flagword flags));
 
 void
@@ -1440,20 +1467,20 @@ bfd_map_over_sections PARAMS ((bfd *abfd,
     PTR obj),
     PTR obj));
 
-boolean
+bfd_boolean
 bfd_set_section_size PARAMS ((bfd *abfd, asection *sec, bfd_size_type val));
 
-boolean
+bfd_boolean
 bfd_set_section_contents PARAMS ((bfd *abfd, asection *section,
     PTR data, file_ptr offset,
     bfd_size_type count));
 
-boolean
+bfd_boolean
 bfd_get_section_contents PARAMS ((bfd *abfd, asection *section,
     PTR location, file_ptr offset,
     bfd_size_type count));
 
-boolean
+bfd_boolean
 bfd_copy_private_section_data PARAMS ((bfd *ibfd, asection *isec,
     bfd *obfd, asection *osec));
 
@@ -1463,7 +1490,7 @@ bfd_copy_private_section_data PARAMS ((bfd *ibfd, asection *isec,
 void
 _bfd_strip_section_from_output PARAMS ((struct bfd_link_info *info, asection *section));
 
-boolean
+bfd_boolean
 bfd_generic_discard_group PARAMS ((bfd *abfd, asection *group));
 
 /* Extracted from archures.c.  */
@@ -1696,15 +1723,15 @@ typedef struct bfd_arch_info
   const char *arch_name;
   const char *printable_name;
   unsigned int section_align_power;
-  /* True if this is the default machine for the architecture.
+  /* TRUE if this is the default machine for the architecture.
      The default arch should be the first entry for an arch so that
      all the entries for that arch can be accessed via <<next>>.  */
-  boolean the_default;
+  bfd_boolean the_default;
   const struct bfd_arch_info * (*compatible)
        PARAMS ((const struct bfd_arch_info *a,
                 const struct bfd_arch_info *b));
 
-  boolean (*scan) PARAMS ((const struct bfd_arch_info *, const char *));
+  bfd_boolean (*scan) PARAMS ((const struct bfd_arch_info *, const char *));
 
   const struct bfd_arch_info *next;
 }
@@ -1852,7 +1879,7 @@ struct reloc_howto_struct
       data section of the addend.  The relocation function will
       subtract from the relocation value the address of the location
       being relocated.  */
-  boolean pc_relative;
+  bfd_boolean pc_relative;
 
   /*  The bit position of the reloc value in the destination.
       The relocated value is left shifted by this amount.  */
@@ -1888,7 +1915,7 @@ struct reloc_howto_struct
      USE_REL targets set this field to TRUE.  Why this is so is peculiar
      to each particular target.  For relocs that aren't used in partial
      links (e.g. GOT stuff) it doesn't matter what this is set to.  */
-  boolean partial_inplace;
+  bfd_boolean partial_inplace;
 
   /* The src_mask selects which parts of the read in data
      are to be used in the relocation sum.  E.g., if this was an 8 bit
@@ -1911,18 +1938,18 @@ struct reloc_howto_struct
      be made just by adding in an ordinary offset (e.g., sun3 a.out).
      Some formats leave the displacement part of an instruction
      empty (e.g., m88k bcs); this flag signals the fact.  */
-  boolean pcrel_offset;
+  bfd_boolean pcrel_offset;
 };
 
 #define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
   { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC }
 #define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \
   HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \
-         NAME, false, 0, 0, IN)
+         NAME, FALSE, 0, 0, IN)
 
 #define EMPTY_HOWTO(C) \
-  HOWTO ((C), 0, 0, 0, false, 0, complain_overflow_dont, NULL, \
-         NULL, false, 0, 0, false)
+  HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
+         NULL, FALSE, 0, 0, FALSE)
 
 #define HOWTO_PREPARE(relocation, symbol)               \
   {                                                     \
@@ -2179,7 +2206,7 @@ GP register.  */
   BFD_RELOC_ALPHA_GPREL_LO16,
 
 /* Like BFD_RELOC_23_PCREL_S2, except that the source and target must
-share a common GP, and the target address is adjusted for 
+share a common GP, and the target address is adjusted for
 STO_ALPHA_STD_GPLOAD.  */
   BFD_RELOC_ALPHA_BRSGP,
 
@@ -3352,10 +3379,10 @@ asymbol;
 #define bfd_get_symtab_upper_bound(abfd) \
      BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
 
-boolean
+bfd_boolean
 bfd_is_local_label PARAMS ((bfd *abfd, asymbol *sym));
 
-boolean
+bfd_boolean
 bfd_is_local_label_name PARAMS ((bfd *abfd, const char *name));
 
 #define bfd_is_local_label_name(abfd, name) \
@@ -3365,7 +3392,7 @@ bfd_is_local_label_name PARAMS ((bfd *abfd, const char *name));
      BFD_SEND (abfd, _bfd_canonicalize_symtab,\
                   (abfd, location))
 
-boolean
+bfd_boolean
 bfd_set_symtab PARAMS ((bfd *abfd, asymbol **location, unsigned int count));
 
 void
@@ -3383,13 +3410,13 @@ _bfd_generic_make_empty_symbol PARAMS ((bfd *));
 int
 bfd_decode_symclass PARAMS ((asymbol *symbol));
 
-boolean
+bfd_boolean
 bfd_is_undefined_symclass PARAMS ((int symclass));
 
 void
 bfd_symbol_info PARAMS ((asymbol *symbol, symbol_info *ret));
 
-boolean
+bfd_boolean
 bfd_copy_private_symbol_data PARAMS ((bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym));
 
 #define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
@@ -3416,12 +3443,12 @@ struct _bfd
 
   /* Is the file descriptor being cached?  That is, can it be closed as
      needed, and re-opened when accessed later?  */
-  boolean cacheable;
+  bfd_boolean cacheable;
 
   /* Marks whether there was a default target specified when the
      BFD was opened. This is used to select which matching algorithm
      to use to choose the back end.  */
-  boolean target_defaulted;
+  bfd_boolean target_defaulted;
 
   /* The caching routines use these to maintain a
      least-recently-used list of BFDs.  */
@@ -3432,13 +3459,13 @@ struct _bfd
   ufile_ptr where;
 
   /* ... and here: (``once'' means at least once).  */
-  boolean opened_once;
+  bfd_boolean opened_once;
 
   /* Set if we have a locally maintained mtime value, rather than
      getting it from the file each time.  */
-  boolean mtime_set;
+  bfd_boolean mtime_set;
 
-  /* File modified time, if mtime_set is true.  */
+  /* File modified time, if mtime_set is TRUE.  */
   long mtime;
 
   /* Reserved for an unimplemented file locking extension.  */
@@ -3467,7 +3494,7 @@ struct _bfd
 
   /* Remember when output has begun, to stop strange things
      from happening.  */
-  boolean output_has_begun;
+  bfd_boolean output_has_begun;
 
   /* A hash table for section names.  */
   struct bfd_hash_table section_htab;
@@ -3502,7 +3529,7 @@ struct _bfd
   struct _bfd *my_archive;     /* The containing archive BFD.  */
   struct _bfd *next;           /* The next BFD in the archive.  */
   struct _bfd *archive_head;   /* The first BFD in the archive.  */
-  boolean has_armap;
+  bfd_boolean has_armap;
 
   /* A chain of BFD structures involved in a link.  */
   struct _bfd *link_next;
@@ -3624,7 +3651,7 @@ bfd_canonicalize_reloc PARAMS ((bfd *abfd,
 void
 bfd_set_reloc PARAMS ((bfd *abfd, asection *sec, arelent **rel, unsigned int count));
 
-boolean
+bfd_boolean
 bfd_set_file_flags PARAMS ((bfd *abfd, flagword flags));
 
 int
@@ -3633,7 +3660,7 @@ bfd_get_arch_size PARAMS ((bfd *abfd));
 int
 bfd_get_sign_extend_vma PARAMS ((bfd *abfd));
 
-boolean
+bfd_boolean
 bfd_set_start_address PARAMS ((bfd *abfd, bfd_vma vma));
 
 unsigned int
@@ -3645,19 +3672,19 @@ bfd_set_gp_size PARAMS ((bfd *abfd, unsigned int i));
 bfd_vma
 bfd_scan_vma PARAMS ((const char *string, const char **end, int base));
 
-boolean
+bfd_boolean
 bfd_copy_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd));
 
 #define bfd_copy_private_bfd_data(ibfd, obfd) \
      BFD_SEND (obfd, _bfd_copy_private_bfd_data, \
                (ibfd, obfd))
-boolean
+bfd_boolean
 bfd_merge_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd));
 
 #define bfd_merge_private_bfd_data(ibfd, obfd) \
      BFD_SEND (obfd, _bfd_merge_private_bfd_data, \
                (ibfd, obfd))
-boolean
+bfd_boolean
 bfd_set_private_flags PARAMS ((bfd *abfd, flagword flags));
 
 #define bfd_set_private_flags(abfd, flags) \
@@ -3737,9 +3764,9 @@ bfd_set_private_flags PARAMS ((bfd *abfd, flagword flags));
 extern bfd_byte *bfd_get_relocated_section_contents
        PARAMS ((bfd *, struct bfd_link_info *,
                  struct bfd_link_order *, bfd_byte *,
-                 boolean, asymbol **));
+                 bfd_boolean, asymbol **));
 
-boolean
+bfd_boolean
 bfd_alt_mach_code PARAMS ((bfd *abfd, int alternative));
 
 struct bfd_preserve
@@ -3754,7 +3781,7 @@ struct bfd_preserve
   struct bfd_hash_table section_htab;
 };
 
-boolean
+bfd_boolean
 bfd_preserve_save PARAMS ((bfd *, struct bfd_preserve *));
 
 void
@@ -3767,7 +3794,7 @@ bfd_preserve_finish PARAMS ((bfd *, struct bfd_preserve *));
 symindex
 bfd_get_next_mapent PARAMS ((bfd *abfd, symindex previous, carsym **sym));
 
-boolean
+bfd_boolean
 bfd_set_archive_head PARAMS ((bfd *output, bfd *new_head));
 
 bfd *
@@ -3780,7 +3807,7 @@ bfd_core_file_failing_command PARAMS ((bfd *abfd));
 int
 bfd_core_file_failing_signal PARAMS ((bfd *abfd));
 
-boolean
+bfd_boolean
 core_file_matches_executable_p PARAMS ((bfd *core_bfd, bfd *exec_bfd));
 
 /* Extracted from targets.c.  */
@@ -3901,10 +3928,10 @@ typedef struct bfd_target
   const struct bfd_target *(*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));
 
   /* Set the format of a file being written.  */
-  boolean  (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
+  bfd_boolean (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
 
   /* Write cached information into a file being written, at <<bfd_close>>.  */
-  boolean  (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
+  bfd_boolean (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
 
 
   /* Generic entry points.  */
@@ -3916,15 +3943,15 @@ CONCAT2 (NAME,_get_section_contents), \
 CONCAT2 (NAME,_get_section_contents_in_window)
 
   /* Called when the BFD is being closed to do any necessary cleanup.  */
-  boolean  (*_close_and_cleanup) PARAMS ((bfd *));
+  bfd_boolean (*_close_and_cleanup) PARAMS ((bfd *));
   /* Ask the BFD to free all cached information.  */
-  boolean  (*_bfd_free_cached_info) PARAMS ((bfd *));
+  bfd_boolean (*_bfd_free_cached_info) PARAMS ((bfd *));
   /* Called when a new section is created.  */
-  boolean  (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
+  bfd_boolean (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
   /* Read the contents of a section.  */
-  boolean  (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-                                                 file_ptr, bfd_size_type));
-  boolean  (*_bfd_get_section_contents_in_window)
+  bfd_boolean (*_bfd_get_section_contents)
+    PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+  bfd_boolean (*_bfd_get_section_contents_in_window)
     PARAMS ((bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type));
 
   /* Entry points to copy private data.  */
@@ -3937,32 +3964,32 @@ CONCAT2 (NAME,_bfd_set_private_flags), \
 CONCAT2 (NAME,_bfd_print_private_bfd_data) \
   /* Called to copy BFD general private data from one object file
      to another.  */
-  boolean  (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
+  bfd_boolean (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
   /* Called to merge BFD general private data from one object file
      to a common output file when linking.  */
-  boolean  (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
+  bfd_boolean (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
   /* Called to copy BFD private section data from one object file
      to another.  */
-  boolean  (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
-                                                      bfd *, sec_ptr));
+  bfd_boolean (*_bfd_copy_private_section_data)
+    PARAMS ((bfd *, sec_ptr, bfd *, sec_ptr));
   /* Called to copy BFD private symbol data from one symbol
      to another.  */
-  boolean  (*_bfd_copy_private_symbol_data) PARAMS ((bfd *, asymbol *,
-                                                     bfd *, asymbol *));
+  bfd_boolean (*_bfd_copy_private_symbol_data)
+    PARAMS ((bfd *, asymbol *, bfd *, asymbol *));
   /* Called to set private backend flags.  */
-  boolean  (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
+  bfd_boolean (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
 
   /* Called to print private BFD data.  */
-  boolean  (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
+  bfd_boolean (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
 
   /* Core file entry points.  */
 #define BFD_JUMP_TABLE_CORE(NAME) \
 CONCAT2 (NAME,_core_file_failing_command), \
 CONCAT2 (NAME,_core_file_failing_signal), \
 CONCAT2 (NAME,_core_file_matches_executable_p)
-  char *   (*_core_file_failing_command) PARAMS ((bfd *));
-  int      (*_core_file_failing_signal) PARAMS ((bfd *));
-  boolean  (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));
+  char *      (*_core_file_failing_command) PARAMS ((bfd *));
+  int         (*_core_file_failing_signal) PARAMS ((bfd *));
+  bfd_boolean (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));
 
   /* Archive entry points.  */
 #define BFD_JUMP_TABLE_ARCHIVE(NAME) \
@@ -3976,19 +4003,19 @@ CONCAT2 (NAME,_openr_next_archived_file), \
 CONCAT2 (NAME,_get_elt_at_index), \
 CONCAT2 (NAME,_generic_stat_arch_elt), \
 CONCAT2 (NAME,_update_armap_timestamp)
-  boolean  (*_bfd_slurp_armap) PARAMS ((bfd *));
-  boolean  (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
-  boolean  (*_bfd_construct_extended_name_table)
+  bfd_boolean (*_bfd_slurp_armap) PARAMS ((bfd *));
+  bfd_boolean (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
+  bfd_boolean (*_bfd_construct_extended_name_table)
     PARAMS ((bfd *, char **, bfd_size_type *, const char **));
-  void     (*_bfd_truncate_arname) PARAMS ((bfd *, const char *, char *));
-  boolean  (*write_armap)
+  void        (*_bfd_truncate_arname) PARAMS ((bfd *, const char *, char *));
+  bfd_boolean (*write_armap)
     PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-  PTR      (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
-  bfd *    (*openr_next_archived_file) PARAMS ((bfd *, bfd *));
+  PTR         (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
+  bfd *       (*openr_next_archived_file) PARAMS ((bfd *, bfd *));
 #define bfd_get_elt_at_index(b,i) BFD_SEND(b, _bfd_get_elt_at_index, (b,i))
-  bfd *    (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex));
-  int      (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
-  boolean  (*_bfd_update_armap_timestamp) PARAMS ((bfd *));
+  bfd *       (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex));
+  int         (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
+  bfd_boolean (*_bfd_update_armap_timestamp) PARAMS ((bfd *));
 
   /* Entry points used for symbols.  */
 #define BFD_JUMP_TABLE_SYMBOLS(NAME) \
@@ -4003,59 +4030,57 @@ CONCAT2 (NAME,_find_nearest_line), \
 CONCAT2 (NAME,_bfd_make_debug_symbol), \
 CONCAT2 (NAME,_read_minisymbols), \
 CONCAT2 (NAME,_minisymbol_to_symbol)
-  long     (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *));
-  long     (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
+  long        (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *));
+  long        (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
                                                 struct symbol_cache_entry **));
   struct symbol_cache_entry *
-           (*_bfd_make_empty_symbol) PARAMS ((bfd *));
-  void     (*_bfd_print_symbol) PARAMS ((bfd *, PTR,
-                                         struct symbol_cache_entry *,
-                                         bfd_print_symbol_type));
+              (*_bfd_make_empty_symbol) PARAMS ((bfd *));
+  void        (*_bfd_print_symbol)
+    PARAMS ((bfd *, PTR, struct symbol_cache_entry *, bfd_print_symbol_type));
 #define bfd_print_symbol(b,p,s,e) BFD_SEND(b, _bfd_print_symbol, (b,p,s,e))
-  void     (*_bfd_get_symbol_info) PARAMS ((bfd *,
-                                            struct symbol_cache_entry *,
-                                            symbol_info *));
+  void        (*_bfd_get_symbol_info)
+    PARAMS ((bfd *, struct symbol_cache_entry *, symbol_info *));
 #define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))
-  boolean  (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));
+  bfd_boolean (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));
 
-  alent *  (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
-  boolean  (*_bfd_find_nearest_line)
+  alent *     (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
+  bfd_boolean (*_bfd_find_nearest_line)
     PARAMS ((bfd *, struct sec *, struct symbol_cache_entry **, bfd_vma,
              const char **, const char **, unsigned int *));
  /* Back-door to allow format-aware applications to create debug symbols
     while using BFD for everything else.  Currently used by the assembler
     when creating COFF files.  */
-  asymbol *(*_bfd_make_debug_symbol) PARAMS ((bfd *, void *,
-                                              unsigned long size));
+  asymbol *   (*_bfd_make_debug_symbol)
+    PARAMS ((bfd *, void *, unsigned long size));
 #define bfd_read_minisymbols(b, d, m, s) \
   BFD_SEND (b, _read_minisymbols, (b, d, m, s))
-  long     (*_read_minisymbols) PARAMS ((bfd *, boolean, PTR *,
-                                         unsigned int *));
+  long        (*_read_minisymbols)
+    PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *));
 #define bfd_minisymbol_to_symbol(b, d, m, f) \
   BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
-  asymbol *(*_minisymbol_to_symbol) PARAMS ((bfd *, boolean, const PTR,
-                                             asymbol *));
+  asymbol *   (*_minisymbol_to_symbol)
+    PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *));
 
   /* Routines for relocs.  */
 #define BFD_JUMP_TABLE_RELOCS(NAME) \
 CONCAT2 (NAME,_get_reloc_upper_bound), \
 CONCAT2 (NAME,_canonicalize_reloc), \
 CONCAT2 (NAME,_bfd_reloc_type_lookup)
-  long     (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
-  long     (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
-                                               struct symbol_cache_entry **));
+  long        (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
+  long        (*_bfd_canonicalize_reloc)
+    PARAMS ((bfd *, sec_ptr, arelent **, struct symbol_cache_entry **));
   /* See documentation on reloc types.  */
   reloc_howto_type *
-           (*reloc_type_lookup) PARAMS ((bfd *, bfd_reloc_code_real_type));
+              (*reloc_type_lookup) PARAMS ((bfd *, bfd_reloc_code_real_type));
 
   /* Routines used when writing an object file.  */
 #define BFD_JUMP_TABLE_WRITE(NAME) \
 CONCAT2 (NAME,_set_arch_mach), \
 CONCAT2 (NAME,_set_section_contents)
-  boolean  (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
-                                          unsigned long));
-  boolean  (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-                                                 file_ptr, bfd_size_type));
+  bfd_boolean (*_bfd_set_arch_mach)
+    PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+  bfd_boolean (*_bfd_set_section_contents)
+    PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
 
   /* Routines used by the linker.  */
 #define BFD_JUMP_TABLE_LINK(NAME) \
@@ -4071,42 +4096,46 @@ CONCAT2 (NAME,_bfd_link_split_section), \
 CONCAT2 (NAME,_bfd_gc_sections), \
 CONCAT2 (NAME,_bfd_merge_sections), \
 CONCAT2 (NAME,_bfd_discard_group)
-  int      (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
-  bfd_byte *(*_bfd_get_relocated_section_contents)
+  int         (*_bfd_sizeof_headers) PARAMS ((bfd *, bfd_boolean));
+  bfd_byte *  (*_bfd_get_relocated_section_contents)
     PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-             bfd_byte *, boolean, struct symbol_cache_entry **));
+             bfd_byte *, bfd_boolean, struct symbol_cache_entry **));
 
-  boolean  (*_bfd_relax_section)
-    PARAMS ((bfd *, struct sec *, struct bfd_link_info *, boolean *));
+  bfd_boolean (*_bfd_relax_section)
+    PARAMS ((bfd *, struct sec *, struct bfd_link_info *, bfd_boolean *));
 
   /* Create a hash table for the linker.  Different backends store
      different information in this table.  */
-  struct bfd_link_hash_table *(*_bfd_link_hash_table_create) PARAMS ((bfd *));
+  struct bfd_link_hash_table *
+              (*_bfd_link_hash_table_create) PARAMS ((bfd *));
 
   /* Release the memory associated with the linker hash table.  */
-  void (*_bfd_link_hash_table_free) PARAMS ((struct bfd_link_hash_table *));
+  void        (*_bfd_link_hash_table_free)
+    PARAMS ((struct bfd_link_hash_table *));
 
   /* Add symbols from this object file into the hash table.  */
-  boolean  (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
+  bfd_boolean (*_bfd_link_add_symbols)
+    PARAMS ((bfd *, struct bfd_link_info *));
 
   /* Indicate that we are only retrieving symbol values from this section.  */
-  void     (*_bfd_link_just_syms) PARAMS ((asection *, struct bfd_link_info *));
+  void        (*_bfd_link_just_syms)
+    PARAMS ((asection *, struct bfd_link_info *));
 
   /* Do a link based on the link_order structures attached to each
      section of the BFD.  */
-  boolean  (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
+  bfd_boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
 
   /* Should this section be split up into smaller pieces during linking.  */
-  boolean  (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
+  bfd_boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
 
   /* Remove sections that are not referenced from the output.  */
-  boolean  (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
+  bfd_boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
 
   /* Attempt to merge SEC_MERGE sections.  */
-  boolean  (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
+  bfd_boolean (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
 
   /* Discard members of a group.  */
-  boolean  (*_bfd_discard_group) PARAMS ((bfd *, struct sec *));
+  bfd_boolean (*_bfd_discard_group) PARAMS ((bfd *, struct sec *));
 
   /* Routines to handle dynamic symbols and relocs.  */
 #define BFD_JUMP_TABLE_DYNAMIC(NAME) \
@@ -4115,14 +4144,14 @@ CONCAT2 (NAME,_canonicalize_dynamic_symtab), \
 CONCAT2 (NAME,_get_dynamic_reloc_upper_bound), \
 CONCAT2 (NAME,_canonicalize_dynamic_reloc)
   /* Get the amount of memory required to hold the dynamic symbols.  */
-  long     (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
+  long        (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
   /* Read in the dynamic symbols.  */
-  long     (*_bfd_canonicalize_dynamic_symtab)
+  long        (*_bfd_canonicalize_dynamic_symtab)
     PARAMS ((bfd *, struct symbol_cache_entry **));
   /* Get the amount of memory required to hold the dynamic relocs.  */
-  long     (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
+  long        (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
   /* Read in the dynamic relocs.  */
-  long     (*_bfd_canonicalize_dynamic_reloc)
+  long        (*_bfd_canonicalize_dynamic_reloc)
     PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
 
   /* Opposite endian version of this target.  */
@@ -4134,7 +4163,7 @@ CONCAT2 (NAME,_canonicalize_dynamic_reloc)
 
 } bfd_target;
 
-boolean
+bfd_boolean
 bfd_set_default_target PARAMS ((const char *name));
 
 const bfd_target *
@@ -4147,20 +4176,20 @@ const bfd_target *
 bfd_search_for_target PARAMS ((int (* search_func) (const bfd_target *, void *), void *));
 
 /* Extracted from format.c.  */
-boolean
+bfd_boolean
 bfd_check_format PARAMS ((bfd *abfd, bfd_format format));
 
-boolean
+bfd_boolean
 bfd_check_format_matches PARAMS ((bfd *abfd, bfd_format format, char ***matching));
 
-boolean
+bfd_boolean
 bfd_set_format PARAMS ((bfd *abfd, bfd_format format));
 
 const char *
 bfd_format_string PARAMS ((bfd_format format));
 
 /* Extracted from linker.c.  */
-boolean
+bfd_boolean
 bfd_link_split_section PARAMS ((bfd *abfd, asection *sec));
 
 #define bfd_link_split_section(abfd, sec) \
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 28b7185ecc0..f9051c0d585 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -53,12 +53,12 @@ CODE_FRAGMENT
 .
 .  {* Is the file descriptor being cached?  That is, can it be closed as
 .     needed, and re-opened when accessed later?  *}
-.  boolean cacheable;
+.  bfd_boolean cacheable;
 .
 .  {* Marks whether there was a default target specified when the
 .     BFD was opened. This is used to select which matching algorithm
 .     to use to choose the back end.  *}
-.  boolean target_defaulted;
+.  bfd_boolean target_defaulted;
 .
 .  {* The caching routines use these to maintain a
 .     least-recently-used list of BFDs.  *}
@@ -69,13 +69,13 @@ CODE_FRAGMENT
 .  ufile_ptr where;
 .
 .  {* ... and here: (``once'' means at least once).  *}
-.  boolean opened_once;
+.  bfd_boolean opened_once;
 .
 .  {* Set if we have a locally maintained mtime value, rather than
 .     getting it from the file each time.  *}
-.  boolean mtime_set;
+.  bfd_boolean mtime_set;
 .
-.  {* File modified time, if mtime_set is true.  *}
+.  {* File modified time, if mtime_set is TRUE.  *}
 .  long mtime;
 .
 .  {* Reserved for an unimplemented file locking extension.  *}
@@ -104,7 +104,7 @@ CODE_FRAGMENT
 .
 .  {* Remember when output has begun, to stop strange things
 .     from happening.  *}
-.  boolean output_has_begun;
+.  bfd_boolean output_has_begun;
 .
 .  {* A hash table for section names.  *}
 .  struct bfd_hash_table section_htab;
@@ -139,7 +139,7 @@ CODE_FRAGMENT
 .  struct _bfd *my_archive;     {* The containing archive BFD.  *}
 .  struct _bfd *next;           {* The next BFD in the archive.  *}
 .  struct _bfd *archive_head;   {* The first BFD in the archive.  *}
-.  boolean has_armap;
+.  bfd_boolean has_armap;
 .
 .  {* A chain of BFD structures involved in a link.  *}
 .  struct _bfd *link_next;
@@ -659,7 +659,7 @@ FUNCTION
 	bfd_set_file_flags
 
 SYNOPSIS
-	boolean bfd_set_file_flags(bfd *abfd, flagword flags);
+	bfd_boolean bfd_set_file_flags(bfd *abfd, flagword flags);
 
 DESCRIPTION
 	Set the flag word in the BFD @var{abfd} to the value @var{flags}.
@@ -674,7 +674,7 @@ DESCRIPTION
 
 */
 
-boolean
+bfd_boolean
 bfd_set_file_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -682,23 +682,23 @@ bfd_set_file_flags (abfd, flags)
   if (abfd->format != bfd_object)
     {
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
   if (bfd_read_p (abfd))
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   bfd_get_file_flags (abfd) = flags;
   if ((flags & bfd_applicable_file_flags (abfd)) != flags)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 void
@@ -810,22 +810,22 @@ FUNCTION
 	bfd_set_start_address
 
 SYNOPSIS
- 	boolean bfd_set_start_address(bfd *abfd, bfd_vma vma);
+ 	bfd_boolean bfd_set_start_address(bfd *abfd, bfd_vma vma);
 
 DESCRIPTION
 	Make @var{vma} the entry point of output BFD @var{abfd}.
 
 RETURNS
-	Returns <<true>> on success, <<false>> otherwise.
+	Returns <<TRUE>> on success, <<FALSE>> otherwise.
 */
 
-boolean
+bfd_boolean
 bfd_set_start_address (abfd, vma)
      bfd *abfd;
      bfd_vma vma;
 {
   abfd->start_address = vma;
-  return true;
+  return TRUE;
 }
 
 /*
@@ -1013,11 +1013,11 @@ FUNCTION
 	bfd_copy_private_bfd_data
 
 SYNOPSIS
-	boolean bfd_copy_private_bfd_data(bfd *ibfd, bfd *obfd);
+	bfd_boolean bfd_copy_private_bfd_data(bfd *ibfd, bfd *obfd);
 
 DESCRIPTION
 	Copy private BFD information from the BFD @var{ibfd} to the
-	the BFD @var{obfd}.  Return <<true>> on success, <<false>> on error.
+	the BFD @var{obfd}.  Return <<TRUE>> on success, <<FALSE>> on error.
 	Possible error returns are:
 
 	o <<bfd_error_no_memory>> -
@@ -1034,12 +1034,12 @@ FUNCTION
 	bfd_merge_private_bfd_data
 
 SYNOPSIS
-	boolean bfd_merge_private_bfd_data(bfd *ibfd, bfd *obfd);
+	bfd_boolean bfd_merge_private_bfd_data(bfd *ibfd, bfd *obfd);
 
 DESCRIPTION
 	Merge private BFD information from the BFD @var{ibfd} to the
-	the output file BFD @var{obfd} when linking.  Return <<true>>
-	on success, <<false>> on error.  Possible error returns are:
+	the output file BFD @var{obfd} when linking.  Return <<TRUE>>
+	on success, <<FALSE>> on error.  Possible error returns are:
 
 	o <<bfd_error_no_memory>> -
 	Not enough memory exists to create private data for @var{obfd}.
@@ -1055,11 +1055,11 @@ FUNCTION
 	bfd_set_private_flags
 
 SYNOPSIS
-	boolean bfd_set_private_flags(bfd *abfd, flagword flags);
+	bfd_boolean bfd_set_private_flags(bfd *abfd, flagword flags);
 
 DESCRIPTION
 	Set private BFD flag information in the BFD @var{abfd}.
-	Return <<true>> on success, <<false>> on error.  Possible error
+	Return <<TRUE>> on success, <<FALSE>> on error.  Possible error
 	returns are:
 
 	o <<bfd_error_no_memory>> -
@@ -1152,7 +1152,7 @@ DESCRIPTION
 .extern bfd_byte *bfd_get_relocated_section_contents
 .	PARAMS ((bfd *, struct bfd_link_info *,
 .		  struct bfd_link_order *, bfd_byte *,
-.		  boolean, asymbol **));
+.		  bfd_boolean, asymbol **));
 .
 
 */
@@ -1164,12 +1164,12 @@ bfd_get_relocated_section_contents (abfd, link_info, link_order, data,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   bfd *abfd2;
   bfd_byte *(*fn) PARAMS ((bfd *, struct bfd_link_info *,
-			   struct bfd_link_order *, bfd_byte *, boolean,
+			   struct bfd_link_order *, bfd_byte *, bfd_boolean,
 			   asymbol **));
 
   if (link_order->type == bfd_indirect_link_order)
@@ -1188,17 +1188,17 @@ bfd_get_relocated_section_contents (abfd, link_info, link_order, data,
 
 /* Record information about an ELF program header.  */
 
-boolean
+bfd_boolean
 bfd_record_phdr (abfd, type, flags_valid, flags, at_valid, at,
 		 includes_filehdr, includes_phdrs, count, secs)
      bfd *abfd;
      unsigned long type;
-     boolean flags_valid;
+     bfd_boolean flags_valid;
      flagword flags;
-     boolean at_valid;
+     bfd_boolean at_valid;
      bfd_vma at;
-     boolean includes_filehdr;
-     boolean includes_phdrs;
+     bfd_boolean includes_filehdr;
+     bfd_boolean includes_phdrs;
      unsigned int count;
      asection **secs;
 {
@@ -1206,13 +1206,13 @@ bfd_record_phdr (abfd, type, flags_valid, flags, at_valid, at,
   bfd_size_type amt;
 
   if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   amt = sizeof (struct elf_segment_map);
   amt += ((bfd_size_type) count - 1) * sizeof (asection *);
   m = (struct elf_segment_map *) bfd_alloc (abfd, amt);
   if (m == NULL)
-    return false;
+    return FALSE;
 
   m->next = NULL;
   m->p_type = type;
@@ -1230,7 +1230,7 @@ bfd_record_phdr (abfd, type, flags_valid, flags, at_valid, at,
     ;
   *pm = m;
 
-  return true;
+  return TRUE;
 }
 
 void
@@ -1262,7 +1262,7 @@ FUNCTION
 	bfd_alt_mach_code
 
 SYNOPSIS
-	boolean bfd_alt_mach_code(bfd *abfd, int alternative);
+	bfd_boolean bfd_alt_mach_code(bfd *abfd, int alternative);
 
 DESCRIPTION
 
@@ -1273,7 +1273,7 @@ DESCRIPTION
 	machine codes.
 */
 
-boolean
+bfd_boolean
 bfd_alt_mach_code (abfd, alternative)
      bfd *abfd;
      int alternative;
@@ -1291,25 +1291,25 @@ bfd_alt_mach_code (abfd, alternative)
 	case 1:
 	  code = get_elf_backend_data (abfd)->elf_machine_alt1;
 	  if (code == 0)
-	    return false;
+	    return FALSE;
 	  break;
 
 	case 2:
 	  code = get_elf_backend_data (abfd)->elf_machine_alt2;
 	  if (code == 0)
-	    return false;
+	    return FALSE;
 	  break;
 
 	default:
-	  return false;
+	  return FALSE;
 	}
 
       elf_elfheader (abfd)->e_machine = code;
 
-      return true;
+      return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
 
 /*
@@ -1334,7 +1334,7 @@ FUNCTION
 	bfd_preserve_save
 
 SYNOPSIS
-	boolean bfd_preserve_save (bfd *, struct bfd_preserve *);
+	bfd_boolean bfd_preserve_save (bfd *, struct bfd_preserve *);
 
 DESCRIPTION
 	When testing an object for compatibility with a particular
@@ -1349,7 +1349,7 @@ DESCRIPTION
 
 */
 
-boolean
+bfd_boolean
 bfd_preserve_save (abfd, preserve)
      bfd *abfd;
      struct bfd_preserve *preserve;
@@ -1363,7 +1363,7 @@ bfd_preserve_save (abfd, preserve)
   preserve->section_htab = abfd->section_htab;
 
   if (! bfd_hash_table_init (&abfd->section_htab, bfd_section_hash_newfunc))
-    return false;
+    return FALSE;
 
   abfd->tdata.any = NULL;
   abfd->arch_info = &bfd_default_arch_struct;
@@ -1372,7 +1372,7 @@ bfd_preserve_save (abfd, preserve)
   abfd->section_tail = &abfd->sections;
   abfd->section_count = 0;
 
-  return true;
+  return TRUE;
 }
 
 /*
diff --git a/bfd/bfdwin.c b/bfd/bfdwin.c
index 49654588fff..442a8a4905b 100644
--- a/bfd/bfdwin.c
+++ b/bfd/bfdwin.c
@@ -107,13 +107,13 @@ bfd_free_window (windowp)
 
 static int ok_to_map = 1;
 
-boolean
+bfd_boolean
 bfd_get_file_window (abfd, offset, size, windowp, writable)
      bfd *abfd;
      file_ptr offset;
      bfd_size_type size;
      bfd_window *windowp;
-     boolean writable;
+     bfd_boolean writable;
 {
   static size_t pagesize;
   bfd_window_internal *i = windowp->i;
@@ -137,7 +137,7 @@ bfd_get_file_window (abfd, offset, size, windowp, writable)
 	   bfd_zmalloc ((bfd_size_type) sizeof (bfd_window_internal)));
       windowp->i = i;
       if (i == 0)
-	return false;
+	return FALSE;
       i->data = 0;
     }
 #ifdef HAVE_MMAP
@@ -189,7 +189,7 @@ bfd_get_file_window (abfd, offset, size, windowp, writable)
 	  windowp->data = 0;
 	  if (debug_windows)
 	    fprintf (stderr, "\t\tmmap failed!\n");
-	  return false;
+	  return FALSE;
 	}
       if (debug_windows)
 	fprintf (stderr, "\n\tmapped %ld at %p, offset is %ld\n",
@@ -198,7 +198,7 @@ bfd_get_file_window (abfd, offset, size, windowp, writable)
       windowp->data = (PTR) ((bfd_byte *) i->data + offset2);
       windowp->size = size;
       i->mapped = 1;
-      return true;
+      return TRUE;
     }
   else if (debug_windows)
     {
@@ -229,14 +229,14 @@ bfd_get_file_window (abfd, offset, size, windowp, writable)
   if (i->data == NULL)
     {
       if (size_to_alloc == 0)
-	return true;
-      return false;
+	return TRUE;
+      return FALSE;
     }
   if (bfd_seek (abfd, offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   i->size = bfd_bread (i->data, size, abfd);
   if (i->size != size)
-    return false;
+    return FALSE;
   i->mapped = 0;
 #ifdef HAVE_MPROTECT
   if (!writable)
@@ -249,7 +249,7 @@ bfd_get_file_window (abfd, offset, size, windowp, writable)
 #endif
   windowp->data = i->data;
   windowp->size = i->size;
-  return true;
+  return TRUE;
 }
 
 #endif /* USE_MMAP */
diff --git a/bfd/binary.c b/bfd/binary.c
index 7bddabf5fa8..a27eb95f599 100644
--- a/bfd/binary.c
+++ b/bfd/binary.c
@@ -41,17 +41,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    a start symbol, an end symbol, and an absolute length symbol.  */
 #define BIN_SYMS 3
 
-static boolean binary_mkobject PARAMS ((bfd *));
+static bfd_boolean binary_mkobject PARAMS ((bfd *));
 static const bfd_target *binary_object_p PARAMS ((bfd *));
-static boolean binary_get_section_contents
+static bfd_boolean binary_get_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
 static long binary_get_symtab_upper_bound PARAMS ((bfd *));
 static char *mangle_name PARAMS ((bfd *, char *));
 static long binary_get_symtab PARAMS ((bfd *, asymbol **));
 static void binary_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static boolean binary_set_section_contents
+static bfd_boolean binary_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static int binary_sizeof_headers PARAMS ((bfd *, boolean));
+static int binary_sizeof_headers PARAMS ((bfd *, bfd_boolean));
 
 /* Set by external programs - specifies the BFD architecture
    to use when creating binary BFDs.  */
@@ -59,11 +59,11 @@ enum bfd_architecture bfd_external_binary_architecture = bfd_arch_unknown;
 
 /* Create a binary object.  Invoked via bfd_set_format.  */
 
-static boolean
+static bfd_boolean
 binary_mkobject (abfd)
      bfd *abfd ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Any file may be considered to be a binary file, provided the target
@@ -119,7 +119,7 @@ binary_object_p (abfd)
 
 /* Get contents of the only section.  */
 
-static boolean
+static bfd_boolean
 binary_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section ATTRIBUTE_UNUSED;
@@ -129,8 +129,8 @@ binary_get_section_contents (abfd, section, location, offset, count)
 {
   if (bfd_seek (abfd, offset, SEEK_SET) != 0
       || bfd_bread (location, count, abfd) != count)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Return the amount of memory needed to read the symbol table.  */
@@ -185,7 +185,7 @@ binary_get_symtab (abfd, alocation)
 
   syms = (asymbol *) bfd_alloc (abfd, amt);
   if (syms == NULL)
-    return (long) false;
+    return 0;
 
   /* Start symbol.  */
   syms[0].the_bfd = abfd;
@@ -250,7 +250,7 @@ binary_get_symbol_info (ignore_abfd, symbol, ret)
 
 /* Write section contents of a binary file.  */
 
-static boolean
+static bfd_boolean
 binary_set_section_contents (abfd, sec, data, offset, size)
      bfd *abfd;
      asection *sec;
@@ -259,18 +259,18 @@ binary_set_section_contents (abfd, sec, data, offset, size)
      bfd_size_type size;
 {
   if (size == 0)
-    return true;
+    return TRUE;
 
   if (! abfd->output_has_begun)
     {
-      boolean found_low;
+      bfd_boolean found_low;
       bfd_vma low;
       asection *s;
 
       /* The lowest section LMA sets the virtual address of the start
          of the file.  We use this to set the file position of all the
          sections.  */
-      found_low = false;
+      found_low = FALSE;
       low = 0;
       for (s = abfd->sections; s != NULL; s = s->next)
 	if (((s->flags
@@ -280,7 +280,7 @@ binary_set_section_contents (abfd, sec, data, offset, size)
 	    && (! found_low || s->lma < low))
 	  {
 	    low = s->lma;
-	    found_low = true;
+	    found_low = TRUE;
 	  }
 
       for (s = abfd->sections; s != NULL; s = s->next)
@@ -308,16 +308,16 @@ binary_set_section_contents (abfd, sec, data, offset, size)
 	       (unsigned long) s->filepos);
 	}
 
-      abfd->output_has_begun = true;
+      abfd->output_has_begun = TRUE;
     }
 
   /* We don't want to output anything for a section that is neither
      loaded nor allocated.  The contents of such a section are not
      meaningful in the binary format.  */
   if ((sec->flags & (SEC_LOAD | SEC_ALLOC)) == 0)
-    return true;
+    return TRUE;
   if ((sec->flags & SEC_NEVER_LOAD) != 0)
-    return true;
+    return TRUE;
 
   return _bfd_generic_set_section_contents (abfd, sec, data, offset, size);
 }
@@ -327,7 +327,7 @@ binary_set_section_contents (abfd, sec, data, offset, size)
 static int
 binary_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
diff --git a/bfd/bout.c b/bfd/bout.c
index 37afbb9423e..b839929c38f 100644
--- a/bfd/bout.c
+++ b/bfd/bout.c
@@ -30,30 +30,59 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "aout/stab_gnu.h"
 #include "libaout.h"		/* BFD a.out internal data structures.  */
 
-static int                   aligncode PARAMS ((bfd *abfd, asection *input_section, arelent *r, unsigned int shrink));
-static void                  perform_slip PARAMS ((bfd *abfd, unsigned int slip, asection *input_section, bfd_vma value));
-static boolean               b_out_squirt_out_relocs PARAMS ((bfd *abfd, asection *section));
-static const bfd_target *    b_out_callback PARAMS ((bfd *));
-static bfd_reloc_status_type calljx_callback PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR src, PTR dst, asection *));
-static bfd_reloc_status_type callj_callback PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR data, unsigned int srcidx, unsigned int dstidx, asection *, boolean));
-static bfd_vma               get_value PARAMS ((arelent *, struct bfd_link_info *, asection *));
-static int                   abs32code PARAMS ((bfd *, asection *, arelent *, unsigned int, struct bfd_link_info *));
-static boolean               b_out_bfd_relax_section PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static bfd_byte *            b_out_bfd_get_relocated_section_contents  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, bfd_byte *, boolean, asymbol **));
-static int                   b_out_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean               b_out_set_arch_mach PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean               b_out_set_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static long                  b_out_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-static long                  b_out_canonicalize_reloc PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
-static boolean               b_out_slurp_reloc_table PARAMS ((bfd *, sec_ptr, asymbol **));
-static reloc_howto_type *    b_out_bfd_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
-static boolean               b_out_write_object_contents PARAMS ((bfd *));
-static int                   b_out_symbol_cmp PARAMS ((const void *, const void *));
-static boolean               b_out_mkobject PARAMS ((bfd *));
-static const bfd_target *    b_out_object_p PARAMS ((bfd *));
-
-void bout_swap_exec_header_in  PARAMS ((bfd *, struct external_exec *, struct internal_exec *));
-void bout_swap_exec_header_out PARAMS ((bfd *, struct internal_exec *, struct external_exec *));
+static int aligncode
+  PARAMS ((bfd *abfd, asection *input_section, arelent *r,
+	   unsigned int shrink));
+static void perform_slip
+  PARAMS ((bfd *abfd, unsigned int slip, asection *input_section,
+	   bfd_vma value));
+static bfd_boolean b_out_squirt_out_relocs
+  PARAMS ((bfd *abfd, asection *section));
+static const bfd_target *b_out_callback
+  PARAMS ((bfd *));
+static bfd_reloc_status_type calljx_callback
+  PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR src, PTR dst,
+	   asection *));
+static bfd_reloc_status_type callj_callback
+  PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR data,
+	   unsigned int srcidx, unsigned int dstidx, asection *, bfd_boolean));
+static bfd_vma get_value
+  PARAMS ((arelent *, struct bfd_link_info *, asection *));
+static int abs32code
+  PARAMS ((bfd *, asection *, arelent *, unsigned int,
+	   struct bfd_link_info *));
+static bfd_boolean b_out_bfd_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_byte *b_out_bfd_get_relocated_section_contents
+  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, bfd_byte *,
+	   bfd_boolean, asymbol **));
+static int b_out_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean b_out_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static bfd_boolean b_out_set_section_contents
+  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
+static long b_out_get_reloc_upper_bound
+  PARAMS ((bfd *, sec_ptr));
+static long b_out_canonicalize_reloc
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+static bfd_boolean b_out_slurp_reloc_table
+  PARAMS ((bfd *, sec_ptr, asymbol **));
+static reloc_howto_type *b_out_bfd_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static bfd_boolean b_out_write_object_contents
+  PARAMS ((bfd *));
+static int b_out_symbol_cmp
+  PARAMS ((const void *, const void *));
+static bfd_boolean b_out_mkobject
+  PARAMS ((bfd *));
+static const bfd_target *b_out_object_p
+  PARAMS ((bfd *));
+
+void bout_swap_exec_header_in
+  PARAMS ((bfd *, struct external_exec *, struct internal_exec *));
+void bout_swap_exec_header_out
+  PARAMS ((bfd *, struct internal_exec *, struct external_exec *));
 
 /* Swaps the information in an executable header taken from a raw byte
    stream memory image, into the internal exec_header structure.  */
@@ -201,7 +230,7 @@ struct bout_data_struct
     struct internal_exec e;
   };
 
-static boolean
+static bfd_boolean
 b_out_mkobject (abfd)
      bfd *abfd;
 {
@@ -210,7 +239,7 @@ b_out_mkobject (abfd)
 
   rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, amt);
   if (rawptr == NULL)
-    return false;
+    return FALSE;
 
   abfd->tdata.bout_data = rawptr;
   exec_hdr (abfd) = &rawptr->e;
@@ -219,7 +248,7 @@ b_out_mkobject (abfd)
   obj_datasec (abfd) = (asection *) NULL;
   obj_bsssec (abfd) = (asection *) NULL;
 
-  return true;
+  return TRUE;
 }
 
 static int
@@ -253,7 +282,7 @@ b_out_symbol_cmp (a_ptr, b_ptr)
   return 0;
 }
 
-static boolean
+static bfd_boolean
 b_out_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -261,7 +290,7 @@ b_out_write_object_contents (abfd)
   bfd_size_type amt;
 
   if (! aout_32_make_sections (abfd))
-    return false;
+    return FALSE;
 
   exec_hdr (abfd)->a_info = BMAGIC;
 
@@ -287,7 +316,7 @@ b_out_write_object_contents (abfd)
   amt = EXEC_BYTES_SIZE;
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
       || bfd_bwrite ((PTR) &swapped_hdr, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Now write out reloc info, followed by syms and strings */
   if (bfd_get_symcount (abfd) != 0)
@@ -319,23 +348,25 @@ b_out_write_object_contents (abfd)
       /* Back to your regularly scheduled program.  */
       if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*exec_hdr(abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
       if (! aout_32_write_syms (abfd))
-	return false;
+	return FALSE;
 
       if (bfd_seek (abfd, (file_ptr) (N_TROFF(*exec_hdr(abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
-      if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd))) return false;
+      if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd)))
+	return FALSE;
       if (bfd_seek (abfd, (file_ptr) (N_DROFF(*exec_hdr(abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
-      if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd))) return false;
+      if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd)))
+	return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 /* Some reloc hackery.  */
@@ -400,7 +431,7 @@ callj_callback (abfd, link_info, reloc_entry,  data, srcidx, dstidx,
      unsigned int srcidx;
      unsigned int dstidx;
      asection *input_section;
-     boolean shrinking;
+     bfd_boolean shrinking;
 {
   int word = bfd_get_32 (abfd, (bfd_byte *) data + srcidx);
   asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr);
@@ -467,33 +498,33 @@ callj_callback (abfd, link_info, reloc_entry,  data, srcidx, dstidx,
 #define ALIGNER 10
 #define ALIGNDONE 11
 static reloc_howto_type howto_reloc_callj =
-HOWTO(CALLJ, 0, 2, 24, true, 0, complain_overflow_signed, 0,"callj", true, 0x00ffffff, 0x00ffffff,false);
+HOWTO(CALLJ, 0, 2, 24, TRUE, 0, complain_overflow_signed, 0,"callj", TRUE, 0x00ffffff, 0x00ffffff,FALSE);
 static  reloc_howto_type howto_reloc_abs32 =
-HOWTO(ABS32, 0, 2, 32, false, 0, complain_overflow_bitfield,0,"abs32", true, 0xffffffff,0xffffffff,false);
+HOWTO(ABS32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,"abs32", TRUE, 0xffffffff,0xffffffff,FALSE);
 static reloc_howto_type howto_reloc_pcrel24 =
-HOWTO(PCREL24, 0, 2, 24, true, 0, complain_overflow_signed,0,"pcrel24", true, 0x00ffffff,0x00ffffff,false);
+HOWTO(PCREL24, 0, 2, 24, TRUE, 0, complain_overflow_signed,0,"pcrel24", TRUE, 0x00ffffff,0x00ffffff,FALSE);
 
 static reloc_howto_type howto_reloc_pcrel13 =
-HOWTO(PCREL13, 0, 2, 13, true, 0, complain_overflow_signed,0,"pcrel13", true, 0x00001fff,0x00001fff,false);
+HOWTO(PCREL13, 0, 2, 13, TRUE, 0, complain_overflow_signed,0,"pcrel13", TRUE, 0x00001fff,0x00001fff,FALSE);
 
 static reloc_howto_type howto_reloc_abs32codeshrunk =
-HOWTO(ABS32CODE_SHRUNK, 0, 2, 24, true, 0, complain_overflow_signed, 0,"callx->callj", true, 0x00ffffff, 0x00ffffff,false);
+HOWTO(ABS32CODE_SHRUNK, 0, 2, 24, TRUE, 0, complain_overflow_signed, 0,"callx->callj", TRUE, 0x00ffffff, 0x00ffffff,FALSE);
 
 static  reloc_howto_type howto_reloc_abs32code =
-HOWTO(ABS32CODE, 0, 2, 32, false, 0, complain_overflow_bitfield,0,"callx", true, 0xffffffff,0xffffffff,false);
+HOWTO(ABS32CODE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,"callx", TRUE, 0xffffffff,0xffffffff,FALSE);
 
 static reloc_howto_type howto_align_table[] = {
-  HOWTO (ALIGNER, 0, 0x1, 0, false, 0, complain_overflow_dont, 0, "align16", false, 0, 0, false),
-  HOWTO (ALIGNER, 0, 0x3, 0, false, 0, complain_overflow_dont, 0, "align32", false, 0, 0, false),
-  HOWTO (ALIGNER, 0, 0x7, 0, false, 0, complain_overflow_dont, 0, "align64", false, 0, 0, false),
-  HOWTO (ALIGNER, 0, 0xf, 0, false, 0, complain_overflow_dont, 0, "align128", false, 0, 0, false),
+  HOWTO (ALIGNER, 0, 0x1, 0, FALSE, 0, complain_overflow_dont, 0, "align16", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNER, 0, 0x3, 0, FALSE, 0, complain_overflow_dont, 0, "align32", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNER, 0, 0x7, 0, FALSE, 0, complain_overflow_dont, 0, "align64", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNER, 0, 0xf, 0, FALSE, 0, complain_overflow_dont, 0, "align128", FALSE, 0, 0, FALSE),
 };
 
 static reloc_howto_type howto_done_align_table[] = {
-  HOWTO (ALIGNDONE, 0x1, 0x1, 0, false, 0, complain_overflow_dont, 0, "donealign16", false, 0, 0, false),
-  HOWTO (ALIGNDONE, 0x3, 0x3, 0, false, 0, complain_overflow_dont, 0, "donealign32", false, 0, 0, false),
-  HOWTO (ALIGNDONE, 0x7, 0x7, 0, false, 0, complain_overflow_dont, 0, "donealign64", false, 0, 0, false),
-  HOWTO (ALIGNDONE, 0xf, 0xf, 0, false, 0, complain_overflow_dont, 0, "donealign128", false, 0, 0, false),
+  HOWTO (ALIGNDONE, 0x1, 0x1, 0, FALSE, 0, complain_overflow_dont, 0, "donealign16", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNDONE, 0x3, 0x3, 0, FALSE, 0, complain_overflow_dont, 0, "donealign32", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNDONE, 0x7, 0x7, 0, FALSE, 0, complain_overflow_dont, 0, "donealign64", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNDONE, 0xf, 0xf, 0, FALSE, 0, complain_overflow_dont, 0, "donealign128", FALSE, 0, 0, FALSE),
 };
 
 static reloc_howto_type *
@@ -517,7 +548,7 @@ b_out_bfd_reloc_type_lookup (abfd, code)
 
 /* Allocate enough room for all the reloc entries, plus pointers to them all.  */
 
-static boolean
+static bfd_boolean
 b_out_slurp_reloc_table (abfd, asect, symbols)
      bfd *abfd;
      sec_ptr asect;
@@ -536,10 +567,10 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
   arelent *reloc_cache;
 
   if (asect->relocation)
-    return true;
+    return TRUE;
 
   if (!aout_32_slurp_symbol_table (abfd))
-    return false;
+    return FALSE;
 
   if (asect == obj_datasec (abfd))
     {
@@ -560,16 +591,16 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
     }
 
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 
  doit:
   if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   count = reloc_size / sizeof (struct relocation_info);
 
   relocs = (struct relocation_info *) bfd_malloc (reloc_size);
   if (!relocs && reloc_size != 0)
-    return false;
+    return FALSE;
 
   amt = ((bfd_size_type) count + 1) * sizeof (arelent);
   reloc_cache = (arelent *) bfd_malloc (amt);
@@ -577,7 +608,7 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
     {
       if (relocs != NULL)
 	free (relocs);
-      return false;
+      return FALSE;
     }
 
   if (bfd_bread ((PTR) relocs, reloc_size, abfd) != reloc_size)
@@ -585,7 +616,7 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
       free (reloc_cache);
       if (relocs != NULL)
 	free (relocs);
-      return false;
+      return FALSE;
     }
 
   if (bfd_header_big_endian (abfd))
@@ -740,10 +771,10 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
   asect->relocation = reloc_cache;
   asect->reloc_count = count;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 b_out_squirt_out_relocs (abfd, section)
      bfd *abfd;
      asection *section;
@@ -759,13 +790,13 @@ b_out_squirt_out_relocs (abfd, section)
   int extern_mask, pcrel_mask, len_2, callj_mask;
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   generic = section->orelocation;
   natsize = (bfd_size_type) count * sizeof (struct relocation_info);
   native = ((struct relocation_info *) bfd_malloc (natsize));
   if (!native && natsize != 0)
-    return false;
+    return FALSE;
 
   if (bfd_header_big_endian (abfd))
     {
@@ -870,12 +901,12 @@ b_out_squirt_out_relocs (abfd, section)
   if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
     {
       free ((PTR)native);
-      return false;
+      return FALSE;
     }
 
   free ((PTR)native);
 
-  return true;
+  return TRUE;
 }
 
 /* This is stupid.  This function should be a boolean predicate.  */
@@ -948,7 +979,7 @@ b_out_get_reloc_upper_bound (abfd, asect)
 }
 
 
-static boolean
+static bfd_boolean
 b_out_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -960,7 +991,7 @@ b_out_set_section_contents (abfd, section, location, offset, count)
     {
       /* Set by bfd.c handler.  */
       if (! aout_32_make_sections (abfd))
-	return false;
+	return FALSE;
 
       obj_textsec (abfd)->filepos = sizeof (struct internal_exec);
       obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos
@@ -969,15 +1000,15 @@ b_out_set_section_contents (abfd, section, location, offset, count)
 
   /* Regardless, once we know what we're doing, we might as well get going.  */
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   return bfd_bwrite ((PTR) location, count, abfd) == count;
 }
 
-static boolean
+static bfd_boolean
 b_out_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -986,7 +1017,7 @@ b_out_set_arch_mach (abfd, arch, machine)
   bfd_default_set_arch_mach(abfd, arch, machine);
 
   if (arch == bfd_arch_unknown)	/* Unknown machine arch is OK.  */
-    return true;
+    return TRUE;
 
   if (arch == bfd_arch_i960)	/* i960 default is OK.  */
     switch (machine)
@@ -1000,18 +1031,18 @@ b_out_set_arch_mach (abfd, arch, machine)
       case bfd_mach_i960_jx:
       case bfd_mach_i960_hx:
       case 0:
-	return true;
+	return TRUE;
       default:
-	return false;
+	return FALSE;
       }
 
-  return false;
+  return FALSE;
 }
 
 static int
 b_out_sizeof_headers (ignore_abfd, ignore)
      bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     boolean ignore ATTRIBUTE_UNUSED;
+     bfd_boolean ignore ATTRIBUTE_UNUSED;
 {
   return sizeof (struct internal_exec);
 }
@@ -1040,7 +1071,7 @@ get_value (reloc, link_info, input_section)
 	 generic symbols.  */
       h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info,
 					bfd_asymbol_name (symbol),
-					false, false, true);
+					FALSE, FALSE, TRUE);
       if (h != (struct bfd_link_hash_entry *) NULL
 	  && (h->type == bfd_link_hash_defined
 	      || h->type == bfd_link_hash_defweak))
@@ -1053,7 +1084,7 @@ get_value (reloc, link_info, input_section)
 	  if (! ((*link_info->callbacks->undefined_symbol)
 		 (link_info, bfd_asymbol_name (symbol),
 		  input_section->owner, input_section, reloc->address,
-		  true)))
+		  TRUE)))
 	    abort ();
 	  value = 0;
 	}
@@ -1192,12 +1223,12 @@ aligncode (abfd, input_section, r, shrink)
   return shrink;
 }
 
-static boolean
+static bfd_boolean
 b_out_bfd_relax_section (abfd, i, link_info, again)
      bfd *abfd;
      asection *i;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   /* Get enough memory to hold the stuff.  */
   bfd *input_bfd = i->owner;
@@ -1208,11 +1239,11 @@ b_out_bfd_relax_section (abfd, i, link_info, again)
 					       input_section);
 
   if (reloc_size < 0)
-    return false;
+    return FALSE;
 
   /* We only run this relaxation once.  It might work to run it
      multiple times, but it hasn't been tested.  */
-  *again = false;
+  *again = FALSE;
 
   if (reloc_size)
     {
@@ -1258,11 +1289,11 @@ b_out_bfd_relax_section (abfd, i, link_info, again)
 
   if (reloc_vector != NULL)
     free (reloc_vector);
-  return true;
+  return TRUE;
  error_return:
   if (reloc_vector != NULL)
     free (reloc_vector);
-  return false;
+  return FALSE;
 }
 
 static bfd_byte *
@@ -1272,7 +1303,7 @@ b_out_bfd_get_relocated_section_contents (output_bfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   /* Get enough memory to hold the stuff.  */
@@ -1300,11 +1331,11 @@ b_out_bfd_get_relocated_section_contents (output_bfd, link_info, link_order,
   input_section->reloc_done = 1;
 
   /* Read in the section.  */
-  BFD_ASSERT (true == bfd_get_section_contents (input_bfd,
-						input_section,
-						data,
-						(bfd_vma) 0,
-						input_section->_raw_size));
+  BFD_ASSERT (bfd_get_section_contents (input_bfd,
+					input_section,
+					data,
+					(bfd_vma) 0,
+					input_section->_raw_size));
 
   reloc_count = bfd_canonicalize_reloc (input_bfd,
 					input_section,
@@ -1366,7 +1397,7 @@ b_out_bfd_get_relocated_section_contents (output_bfd, link_info, link_order,
 		case CALLJ:
 		  callj_callback (input_bfd, link_info, reloc, data,
 				  src_address, dst_address, input_section,
-				  false);
+				  FALSE);
 		  src_address += 4;
 		  dst_address += 4;
 		  break;
@@ -1383,7 +1414,7 @@ b_out_bfd_get_relocated_section_contents (output_bfd, link_info, link_order,
 		     callj will reach, so do the right thing.  */
 		  callj_callback (input_bfd, link_info, reloc, data,
 				  src_address + 4, dst_address, input_section,
-				  true);
+				  TRUE);
 		  dst_address += 4;
 		  src_address += 8;
 		  break;
diff --git a/bfd/cache.c b/bfd/cache.c
index df01a1f990a..98a1c72e884 100644
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -42,8 +42,8 @@ SECTION
 
 static void insert PARAMS ((bfd *));
 static void snip PARAMS ((bfd *));
-static boolean close_one PARAMS ((void));
-static boolean bfd_cache_delete PARAMS ((bfd *));
+static bfd_boolean close_one PARAMS ((void));
+static bfd_boolean bfd_cache_delete PARAMS ((bfd *));
 
 /*
 INTERNAL_FUNCTION
@@ -133,7 +133,7 @@ snip (abfd)
 /* We need to open a new file, and the cache is full.  Find the least
    recently used cacheable BFD and close it.  */
 
-static boolean
+static bfd_boolean
 close_one ()
 {
   register bfd *kill;
@@ -157,7 +157,7 @@ close_one ()
   if (kill == NULL)
     {
       /* There are no open cacheable BFD's.  */
-      return true;
+      return TRUE;
     }
 
   kill->where = ftell ((FILE *) kill->iostream);
@@ -167,17 +167,17 @@ close_one ()
 
 /* Close a BFD and remove it from the cache.  */
 
-static boolean
+static bfd_boolean
 bfd_cache_delete (abfd)
      bfd *abfd;
 {
-  boolean ret;
+  bfd_boolean ret;
 
   if (fclose ((FILE *) abfd->iostream) == 0)
-    ret = true;
+    ret = TRUE;
   else
     {
-      ret = false;
+      ret = FALSE;
       bfd_set_error (bfd_error_system_call);
     }
 
@@ -194,13 +194,13 @@ INTERNAL_FUNCTION
 	bfd_cache_init
 
 SYNOPSIS
-	boolean bfd_cache_init (bfd *abfd);
+	bfd_boolean bfd_cache_init (bfd *abfd);
 
 DESCRIPTION
 	Add a newly opened BFD to the cache.
 */
 
-boolean
+bfd_boolean
 bfd_cache_init (abfd)
      bfd *abfd;
 {
@@ -208,11 +208,11 @@ bfd_cache_init (abfd)
   if (open_files >= BFD_CACHE_MAX_OPEN)
     {
       if (! close_one ())
-	return false;
+	return FALSE;
     }
   insert (abfd);
   ++open_files;
-  return true;
+  return TRUE;
 }
 
 /*
@@ -220,24 +220,24 @@ INTERNAL_FUNCTION
 	bfd_cache_close
 
 SYNOPSIS
-	boolean bfd_cache_close (bfd *abfd);
+	bfd_boolean bfd_cache_close (bfd *abfd);
 
 DESCRIPTION
 	Remove the BFD @var{abfd} from the cache. If the attached file is open,
 	then close it too.
 
 RETURNS
-	<<false>> is returned if closing the file fails, <<true>> is
+	<<FALSE>> is returned if closing the file fails, <<TRUE>> is
 	returned if all is well.
 */
 
-boolean
+bfd_boolean
 bfd_cache_close (abfd)
      bfd *abfd;
 {
   if (abfd->iostream == NULL
       || (abfd->flags & BFD_IN_MEMORY) != 0)
-    return true;
+    return TRUE;
 
   return bfd_cache_delete (abfd);
 }
@@ -261,7 +261,7 @@ FILE *
 bfd_open_file (abfd)
      bfd *abfd;
 {
-  abfd->cacheable = true;	/* Allow it to be closed later.  */
+  abfd->cacheable = TRUE;	/* Allow it to be closed later.  */
 
   if (open_files >= BFD_CACHE_MAX_OPEN)
     {
@@ -312,7 +312,7 @@ bfd_open_file (abfd)
 	    unlink (abfd->filename);
 #endif
 	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WUB);
-	  abfd->opened_once = true;
+	  abfd->opened_once = TRUE;
 	}
       break;
     }
diff --git a/bfd/cisco-core.c b/bfd/cisco-core.c
index db87466ff31..6b3a71b0ab3 100644
--- a/bfd/cisco-core.c
+++ b/bfd/cisco-core.c
@@ -75,7 +75,7 @@ static const bfd_target *cisco_core_file_validate PARAMS ((bfd *, int));
 static const bfd_target *cisco_core_file_p PARAMS ((bfd *));
 char *cisco_core_file_failing_command PARAMS ((bfd *));
 int cisco_core_file_failing_signal PARAMS ((bfd *));
-boolean cisco_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
+bfd_boolean cisco_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
 
 /* Examine the file for a crash info struct at the offset given by
    CRASH_INFO_LOC.  */
@@ -318,12 +318,12 @@ cisco_core_file_failing_signal (abfd)
   return abfd->tdata.cisco_core_data->sig;
 }
 
-boolean
+bfd_boolean
 cisco_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd ATTRIBUTE_UNUSED;
      bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 extern const bfd_target cisco_core_little_vec;
diff --git a/bfd/coff-a29k.c b/bfd/coff-a29k.c
index 7c921ca387f..fd547315fea 100644
--- a/bfd/coff-a29k.c
+++ b/bfd/coff-a29k.c
@@ -31,12 +31,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 static long get_symbol_value PARAMS ((asymbol *));
 static bfd_reloc_status_type a29k_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean coff_a29k_relocate_section
+static bfd_boolean coff_a29k_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
-static boolean coff_a29k_adjust_symndx
+static bfd_boolean coff_a29k_adjust_symndx
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-	   struct internal_reloc *, boolean *));
+	   struct internal_reloc *, bfd_boolean *));
 static void reloc_processing
   PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
 
@@ -82,7 +82,7 @@ a29k_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 {
   /* The consth relocation comes in two parts, we have to remember
      the state between calls, in these variables.  */
-  static boolean part1_consth_active = false;
+  static bfd_boolean part1_consth_active = FALSE;
   static unsigned long part1_consth_value;
   unsigned long insn;
   unsigned long sym_value;
@@ -107,7 +107,7 @@ a29k_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
       /* Keep the state machine happy in case we're called again.  */
       if (r_type == R_IHIHALF)
 	{
-	  part1_consth_active = true;
+	  part1_consth_active = TRUE;
 	  part1_consth_value  = 0;
 	}
       return bfd_reloc_undefined;
@@ -115,7 +115,7 @@ a29k_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 
   if ((part1_consth_active) && (r_type != R_IHCONST))
     {
-      part1_consth_active = false;
+      part1_consth_active = FALSE;
       *error_message = (char *) _("Missing IHCONST");
 
       return bfd_reloc_dangerous;
@@ -167,7 +167,7 @@ a29k_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
       insn = bfd_get_32 (abfd, hit_data);
       /* consth, part 1
 	 Just get the symbol value that is referenced.  */
-      part1_consth_active = true;
+      part1_consth_active = TRUE;
       part1_consth_value = sym_value + reloc_entry->addend;
       /* Don't modify insn until R_IHCONST.  */
       break;
@@ -186,7 +186,7 @@ a29k_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
       unsigned_value += part1_consth_value;
       unsigned_value = unsigned_value >> 16;
       insn = INSERT_HWORD(insn, unsigned_value);
-      part1_consth_active = false;
+      part1_consth_active = FALSE;
       bfd_put_32 (abfd, (bfd_vma) insn, hit_data);
       break;
     case R_BYTE:
@@ -219,7 +219,7 @@ a29k_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 /*FIXME: I'm not real sure about this table.  */
 static reloc_howto_type howto_table[] =
   {
-    {R_ABS,     0, 3, 32, false, 0, complain_overflow_bitfield,a29k_reloc,"ABS",     true, 0xffffffff,0xffffffff, false},
+    {R_ABS,     0, 3, 32, FALSE, 0, complain_overflow_bitfield,a29k_reloc,"ABS",     TRUE, 0xffffffff,0xffffffff, FALSE},
     EMPTY_HOWTO (1),
     EMPTY_HOWTO (2),
     EMPTY_HOWTO (3),
@@ -243,14 +243,14 @@ static reloc_howto_type howto_table[] =
     EMPTY_HOWTO (21),
     EMPTY_HOWTO (22),
     EMPTY_HOWTO (23),
-    {R_IREL,    0, 3, 32, true,  0, complain_overflow_signed,a29k_reloc,"IREL",    true, 0xffffffff,0xffffffff, false},
-    {R_IABS,    0, 3, 32, false, 0, complain_overflow_bitfield, a29k_reloc,"IABS",    true, 0xffffffff,0xffffffff, false},
-    {R_ILOHALF, 0, 3, 16, true,  0, complain_overflow_signed, a29k_reloc,"ILOHALF", true, 0x0000ffff,0x0000ffff, false},
-    {R_IHIHALF, 0, 3, 16, true,  16, complain_overflow_signed, a29k_reloc,"IHIHALF", true, 0xffff0000,0xffff0000, false},
-    {R_IHCONST, 0, 3, 16, true,  0, complain_overflow_signed, a29k_reloc,"IHCONST", true, 0xffff0000,0xffff0000, false},
-    {R_BYTE,    0, 0, 8, false, 0, complain_overflow_bitfield, a29k_reloc,"BYTE",    true, 0x000000ff,0x000000ff, false},
-    {R_HWORD,   0, 1, 16, false, 0, complain_overflow_bitfield, a29k_reloc,"HWORD",   true, 0x0000ffff,0x0000ffff, false},
-    {R_WORD,    0, 2, 32, false, 0, complain_overflow_bitfield, a29k_reloc,"WORD",    true, 0xffffffff,0xffffffff, false},
+    {R_IREL,    0, 3, 32, TRUE,  0, complain_overflow_signed,a29k_reloc,"IREL",    TRUE, 0xffffffff,0xffffffff, FALSE},
+    {R_IABS,    0, 3, 32, FALSE, 0, complain_overflow_bitfield, a29k_reloc,"IABS",    TRUE, 0xffffffff,0xffffffff, FALSE},
+    {R_ILOHALF, 0, 3, 16, TRUE,  0, complain_overflow_signed, a29k_reloc,"ILOHALF", TRUE, 0x0000ffff,0x0000ffff, FALSE},
+    {R_IHIHALF, 0, 3, 16, TRUE,  16, complain_overflow_signed, a29k_reloc,"IHIHALF", TRUE, 0xffff0000,0xffff0000, FALSE},
+    {R_IHCONST, 0, 3, 16, TRUE,  0, complain_overflow_signed, a29k_reloc,"IHCONST", TRUE, 0xffff0000,0xffff0000, FALSE},
+    {R_BYTE,    0, 0, 8, FALSE, 0, complain_overflow_bitfield, a29k_reloc,"BYTE",    TRUE, 0x000000ff,0x000000ff, FALSE},
+    {R_HWORD,   0, 1, 16, FALSE, 0, complain_overflow_bitfield, a29k_reloc,"HWORD",   TRUE, 0x0000ffff,0x0000ffff, FALSE},
+    {R_WORD,    0, 2, 32, FALSE, 0, complain_overflow_bitfield, a29k_reloc,"WORD",    TRUE, 0xffffffff,0xffffffff, FALSE},
   };
 
 #define BADMAG(x) A29KBADMAG(x)
@@ -310,7 +310,7 @@ reloc_processing (relent,reloc, symbols, abfd, section)
 
 /* The reloc processing routine for the optimized COFF linker.  */
 
-static boolean
+static bfd_boolean
 coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 			    contents, relocs, syms, sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -324,16 +324,16 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 {
   struct internal_reloc *rel;
   struct internal_reloc *relend;
-  boolean hihalf;
+  bfd_boolean hihalf;
   bfd_vma hihalf_val;
 
   /* If we are performing a relocateable link, we don't need to do a
      thing.  The caller will take care of adjusting the reloc
      addresses and symbol indices.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
-  hihalf = false;
+  hihalf = FALSE;
   hihalf_val = 0;
 
   rel = relocs;
@@ -346,7 +346,7 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
       struct internal_syment *sym;
       asection *sec;
       bfd_vma val;
-      boolean overflow;
+      bfd_boolean overflow;
       unsigned long insn;
       long signed_value;
       unsigned long unsigned_value;
@@ -397,8 +397,8 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 		{
 		  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;
 		}
 	    }
 
@@ -407,18 +407,18 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_dangerous)
 		     (info, _("missing IHCONST reloc"), input_bfd,
 		      input_section, rel->r_vaddr - input_section->vma)))
-		return false;
-	      hihalf = false;
+		return FALSE;
+	      hihalf = FALSE;
 	    }
 	}
 
-      overflow = false;
+      overflow = FALSE;
 
       switch (rel->r_type)
 	{
 	default:
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 
 	case R_IREL:
 	  insn = bfd_get_32 (input_bfd, loc);
@@ -465,7 +465,7 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 			       + (rel->r_vaddr - input_section->vma));
 	      if (signed_value > 0x1ffff || signed_value < - 0x20000)
 		{
-		  overflow = true;
+		  overflow = TRUE;
 		  signed_value = 0;
 		}
 	    }
@@ -487,7 +487,7 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	case R_IHIHALF:
 	  /* Save the value for the R_IHCONST reloc.  */
-	  hihalf = true;
+	  hihalf = TRUE;
 	  hihalf_val = val;
 	  break;
 
@@ -497,7 +497,7 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_dangerous)
 		     (info, _("missing IHIHALF reloc"), input_bfd,
 		      input_section, rel->r_vaddr - input_section->vma)))
-		return false;
+		return FALSE;
 	      hihalf_val = 0;
 	    }
 
@@ -507,7 +507,7 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 	  insn = INSERT_HWORD (insn, unsigned_value);
 	  bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
 
-	  hihalf = false;
+	  hihalf = FALSE;
 
 	  break;
 
@@ -517,7 +517,7 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 	  rstat = _bfd_relocate_contents (howto_table + rel->r_type,
 					  input_bfd, val, loc);
 	  if (rstat == bfd_reloc_overflow)
-	    overflow = true;
+	    overflow = TRUE;
 	  else if (rstat != bfd_reloc_ok)
 	    abort ();
 	  break;
@@ -548,11 +548,11 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 		 (info, name, howto_table[rel->r_type].name, (bfd_vma) 0,
 		  input_bfd, input_section,
 		  rel->r_vaddr - input_section->vma)))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 #define coff_relocate_section coff_a29k_relocate_section
@@ -560,20 +560,20 @@ coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
 /* We don't want to change the symndx of a R_IHCONST reloc, since it
    is actually an addend, not a symbol index at all.  */
 
-static boolean
+static bfd_boolean
 coff_a29k_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
      bfd *obfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      bfd *ibfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
      struct internal_reloc *irel;
-     boolean *adjustedp;
+     bfd_boolean *adjustedp;
 {
   if (irel->r_type == R_IHCONST)
-    *adjustedp = true;
+    *adjustedp = TRUE;
   else
-    *adjustedp = false;
-  return true;
+    *adjustedp = FALSE;
+  return TRUE;
 }
 
 #define coff_adjust_symndx coff_a29k_adjust_symndx
diff --git a/bfd/coff-alpha.c b/bfd/coff-alpha.c
index 6d5ac17eea3..14e0ee15c5e 100644
--- a/bfd/coff-alpha.c
+++ b/bfd/coff-alpha.c
@@ -35,36 +35,40 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Prototypes for static functions.  */
 
-static const bfd_target *alpha_ecoff_object_p PARAMS ((bfd *));
-static boolean alpha_ecoff_bad_format_hook PARAMS ((bfd *abfd, PTR filehdr));
-static PTR alpha_ecoff_mkobject_hook PARAMS ((bfd *, PTR filehdr, PTR aouthdr));
-static void alpha_ecoff_swap_reloc_in PARAMS ((bfd *, PTR,
-					      struct internal_reloc *));
-static void alpha_ecoff_swap_reloc_out PARAMS ((bfd *,
-					       const struct internal_reloc *,
-					       PTR));
-static void alpha_adjust_reloc_in PARAMS ((bfd *,
-					   const struct internal_reloc *,
-					   arelent *));
-static void alpha_adjust_reloc_out PARAMS ((bfd *, const arelent *,
-					    struct internal_reloc *));
+static const bfd_target *alpha_ecoff_object_p
+  PARAMS ((bfd *));
+static bfd_boolean alpha_ecoff_bad_format_hook
+  PARAMS ((bfd *abfd, PTR filehdr));
+static PTR alpha_ecoff_mkobject_hook
+  PARAMS ((bfd *, PTR filehdr, PTR aouthdr));
+static void alpha_ecoff_swap_reloc_in
+  PARAMS ((bfd *, PTR, struct internal_reloc *));
+static void alpha_ecoff_swap_reloc_out
+  PARAMS ((bfd *, const struct internal_reloc *, PTR));
+static void alpha_adjust_reloc_in
+  PARAMS ((bfd *, const struct internal_reloc *, arelent *));
+static void alpha_adjust_reloc_out
+  PARAMS ((bfd *, const arelent *, struct internal_reloc *));
 static reloc_howto_type *alpha_bfd_reloc_type_lookup
- PARAMS ((bfd *, bfd_reloc_code_real_type));
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
 static bfd_byte *alpha_ecoff_get_relocated_section_contents
   PARAMS ((bfd *abfd, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *data, boolean relocateable, asymbol **symbols));
+	   bfd_byte *data, bfd_boolean relocateable, asymbol **symbols));
 static bfd_vma alpha_convert_external_reloc
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, struct external_reloc *,
 	   struct ecoff_link_hash_entry *));
-static boolean alpha_relocate_section PARAMS ((bfd *, struct bfd_link_info *,
-					       bfd *, asection *,
-					       bfd_byte *, PTR));
-static boolean alpha_adjust_headers
+static bfd_boolean alpha_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, PTR));
+static bfd_boolean alpha_adjust_headers
   PARAMS ((bfd *, struct internal_filehdr *, struct internal_aouthdr *));
-static PTR alpha_ecoff_read_ar_hdr PARAMS ((bfd *));
-static bfd *alpha_ecoff_get_elt_at_filepos PARAMS ((bfd *, file_ptr));
-static bfd *alpha_ecoff_openr_next_archived_file PARAMS ((bfd *, bfd *));
-static bfd *alpha_ecoff_get_elt_at_index PARAMS ((bfd *, symindex));
+static PTR alpha_ecoff_read_ar_hdr
+  PARAMS ((bfd *));
+static bfd *alpha_ecoff_get_elt_at_filepos
+  PARAMS ((bfd *, file_ptr));
+static bfd *alpha_ecoff_openr_next_archived_file
+  PARAMS ((bfd *, bfd *));
+static bfd *alpha_ecoff_get_elt_at_index
+  PARAMS ((bfd *, symindex));
 
 /* ECOFF has COFF sections, but the debugging information is stored in
    a completely different format.  ECOFF targets use some of the
@@ -122,9 +126,8 @@ static bfd *alpha_ecoff_get_elt_at_index PARAMS ((bfd *, symindex));
 
 /* How to process the various reloc types.  */
 
-static bfd_reloc_status_type
-reloc_nil PARAMS ((bfd *, arelent *, asymbol *, PTR,
-		   asection *, bfd *, char **));
+static bfd_reloc_status_type reloc_nil
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 
 static bfd_reloc_status_type
 reloc_nil (abfd, reloc, sym, data, sec, output_bfd, error_message)
@@ -152,45 +155,45 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "IGNORE",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 32 bit reference to a symbol.  */
   HOWTO (ALPHA_R_REFLONG,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "REFLONG",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit reference to a symbol.  */
   HOWTO (ALPHA_R_REFQUAD,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "REFQUAD",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit GP relative offset.  This is just like REFLONG except
      that when the value is used the value of the gp register will be
@@ -199,15 +202,15 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPREL32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used for an instruction that refers to memory off the GP
      register.  The offset is 16 bits of the 32 bit instruction.  This
@@ -216,15 +219,15 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "LITERAL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* This reloc only appears immediately following a LITERAL reloc.
      It identifies a use of the literal.  It seems that the linker can
@@ -239,15 +242,15 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "LITUSE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Load the gp register.  This is always used for a ldah instruction
      which loads the upper 16 bits of the gp register.  The next reloc
@@ -264,15 +267,15 @@ static reloc_howto_type alpha_howto_table[] =
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "GPDISP",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 21 bit branch.  The native assembler generates these for
      branches within the text segment, and also fills in the PC
@@ -281,90 +284,90 @@ static reloc_howto_type alpha_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 21,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "BRADDR",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x1fffff,		/* src_mask */
 	 0x1fffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A hint for a jump to a register.  */
   HOWTO (ALPHA_R_HINT,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 14,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "HINT",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x3fff,		/* src_mask */
 	 0x3fff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Push a value on the reloc evaluation stack.  */
   HOWTO (ALPHA_R_OP_PUSH,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "OP_PUSH",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Store the value from the stack at the given address.  Store it in
      a bitfield of size r_size starting at bit position r_offset.  */
@@ -372,15 +375,15 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "OP_STORE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Subtract the reloc address from the value on the top of the
      relocation stack.  */
@@ -388,15 +391,15 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "OP_PSUB",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Shift the value on the top of the relocation stack right by the
      given value.  */
@@ -404,30 +407,30 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "OP_PRSHIFT",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Adjust the GP value for a new range in the object file.  */
   HOWTO (ALPHA_R_GPVALUE,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPVALUE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false)			/* pcrel_offset */
+	 FALSE)			/* pcrel_offset */
 };
 
 /* Recognize an Alpha ECOFF file.  */
@@ -471,7 +474,7 @@ alpha_ecoff_object_p (abfd)
 
 /* See whether the magic number matches.  */
 
-static boolean
+static bfd_boolean
 alpha_ecoff_bad_format_hook (abfd, filehdr)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR filehdr;
@@ -479,9 +482,9 @@ alpha_ecoff_bad_format_hook (abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   if (ALPHA_ECOFF_BADMAG (*internal_f))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* This is a hook called by coff_real_object_p to create any backend
@@ -755,7 +758,7 @@ alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   bfd *input_bfd = link_order->u.indirect.section->owner;
@@ -765,7 +768,7 @@ alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
   long reloc_count;
   bfd *output_bfd = relocateable ? abfd : (bfd *) NULL;
   bfd_vma gp;
-  boolean gp_undefined;
+  bfd_boolean gp_undefined;
   bfd_vma stack[RELOC_STACKSIZE];
   int tos = 0;
 
@@ -781,7 +784,7 @@ alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
 
   /* The section size is not going to change.  */
   input_section->_cooked_size = input_section->_raw_size;
-  input_section->reloc_done = true;
+  input_section->reloc_done = TRUE;
 
   reloc_count = bfd_canonicalize_reloc (input_bfd, input_section,
 					reloc_vector, symbols);
@@ -791,7 +794,7 @@ alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
     goto successful_return;
 
   /* Get the GP value for the output BFD.  */
-  gp_undefined = false;
+  gp_undefined = FALSE;
   gp = _bfd_get_gp_value (abfd);
   if (gp == 0)
     {
@@ -819,11 +822,11 @@ alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
 	{
 	  struct bfd_link_hash_entry *h;
 
-	  h = bfd_link_hash_lookup (link_info->hash, "_gp", false, false,
-				    true);
+	  h = bfd_link_hash_lookup (link_info->hash, "_gp", FALSE, FALSE,
+				    TRUE);
 	  if (h == (struct bfd_link_hash_entry *) NULL
 	      || h->type != bfd_link_hash_defined)
-	    gp_undefined = true;
+	    gp_undefined = TRUE;
 	  else
 	    {
 	      gp = (h->u.def.value
@@ -1111,7 +1114,7 @@ alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
 	case ALPHA_R_GPVALUE:
 	  /* I really don't know if this does the right thing.  */
 	  gp = rel->addend;
-	  gp_undefined = false;
+	  gp_undefined = FALSE;
 	  break;
 
 	default:
@@ -1134,7 +1137,7 @@ alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
 	    case bfd_reloc_undefined:
 	      if (! ((*link_info->callbacks->undefined_symbol)
 		     (link_info, bfd_asymbol_name (*rel->sym_ptr_ptr),
-		      input_bfd, input_section, rel->address, true)))
+		      input_bfd, input_section, rel->address, TRUE)))
 		goto error_return;
 	      break;
 	    case bfd_reloc_dangerous:
@@ -1365,7 +1368,7 @@ alpha_convert_external_reloc (output_bfd, info, input_bfd, ext_rel, h)
    quite similar to get_relocated_section_contents.  Perhaps they
    could be combined somehow.  */
 
-static boolean
+static bfd_boolean
 alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 			contents, external_relocs)
      bfd *output_bfd;
@@ -1378,7 +1381,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
   asection **symndx_to_section, *lita_sec;
   struct ecoff_link_hash_entry **sym_hashes;
   bfd_vma gp;
-  boolean gp_undefined;
+  bfd_boolean gp_undefined;
   bfd_vma stack[RELOC_STACKSIZE];
   int tos = 0;
   struct external_reloc *ext_rel;
@@ -1394,7 +1397,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
       amt = NUM_RELOC_SECTIONS * sizeof (asection *);
       symndx_to_section = (asection **) bfd_alloc (input_bfd, amt);
       if (!symndx_to_section)
-	return false;
+	return FALSE;
 
       symndx_to_section[RELOC_SECTION_NONE] = NULL;
       symndx_to_section[RELOC_SECTION_TEXT] =
@@ -1485,7 +1488,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 					       _("using multiple gp values"),
 					       (char *) NULL, output_bfd,
 					       (asection *) NULL, (bfd_vma) 0);
-		  ecoff_data (output_bfd)->issued_multiple_gp_warning = true;
+		  ecoff_data (output_bfd)->issued_multiple_gp_warning = TRUE;
 		}
 	      if (lita_vma < gp - 0x8000)
 		gp = lita_vma + lita_size - 0x8000;
@@ -1515,9 +1518,9 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
       int r_extern;
       int r_offset;
       int r_size;
-      boolean relocatep;
-      boolean adjust_addrp;
-      boolean gp_usedp;
+      bfd_boolean relocatep;
+      bfd_boolean adjust_addrp;
+      bfd_boolean gp_usedp;
       bfd_vma addend;
 
       r_vaddr = H_GET_64 (input_bfd, ext_rel->r_vaddr);
@@ -1532,9 +1535,9 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
       r_size = ((ext_rel->r_bits[3] & RELOC_BITS3_SIZE_LITTLE)
 		>> RELOC_BITS3_SIZE_SH_LITTLE);
 
-      relocatep = false;
-      adjust_addrp = true;
-      gp_usedp = false;
+      relocatep = FALSE;
+      adjust_addrp = TRUE;
+      gp_usedp = FALSE;
       addend = 0;
 
       switch (r_type)
@@ -1552,13 +1555,13 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 	  if (info->relocateable)
 	    H_PUT_64 (input_bfd, input_section->output_offset + r_vaddr,
 		      ext_rel->r_vaddr);
-	  adjust_addrp = false;
+	  adjust_addrp = FALSE;
 	  break;
 
 	case ALPHA_R_REFLONG:
 	case ALPHA_R_REFQUAD:
 	case ALPHA_R_HINT:
-	  relocatep = true;
+	  relocatep = TRUE;
 	  break;
 
 	case ALPHA_R_BRADDR:
@@ -1567,7 +1570,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 	case ALPHA_R_SREL64:
 	  if (r_extern)
 	    addend += - (r_vaddr + 4);
-	  relocatep = true;
+	  relocatep = TRUE;
 	  break;
 
 	case ALPHA_R_GPREL32:
@@ -1575,9 +1578,9 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 	     bit offset from the current GP value.  We must adjust it
 	     by the different between the original GP value and the
 	     current GP value.  */
-	  relocatep = true;
+	  relocatep = TRUE;
 	  addend = ecoff_data (input_bfd)->gp - gp;
-	  gp_usedp = true;
+	  gp_usedp = TRUE;
 	  break;
 
 	case ALPHA_R_LITERAL:
@@ -1608,9 +1611,9 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 			|| ((insn >> 26) & 0x3f) == 0x28);
 	  }
 
-	  relocatep = true;
+	  relocatep = TRUE;
 	  addend = ecoff_data (input_bfd)->gp - gp;
-	  gp_usedp = true;
+	  gp_usedp = TRUE;
 	  break;
 
 	case ALPHA_R_LITUSE:
@@ -1674,7 +1677,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 	    bfd_put_32 (input_bfd, (bfd_vma) insn2,
 			contents + r_vaddr - input_section->vma + r_symndx);
 
-	    gp_usedp = true;
+	    gp_usedp = TRUE;
 	  }
 	  break;
 
@@ -1717,8 +1720,8 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 			 relocated.  */
 		      if (! ((*info->callbacks->undefined_symbol)
 			     (info, h->root.root.string, input_bfd,
-			      input_section, (bfd_vma) 0, true)))
-			return false;
+			      input_section, (bfd_vma) 0, TRUE)))
+			return FALSE;
 		      addend = 0;
 		    }
 		}
@@ -1734,7 +1737,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		      if (! ((*info->callbacks->unattached_reloc)
 			     (info, h->root.root.string, input_bfd,
 			      input_section, (bfd_vma) 0)))
-			return false;
+			return FALSE;
 		    }
 
 		  addend = alpha_convert_external_reloc (output_bfd, info,
@@ -1774,7 +1777,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		}
 	    }
 
-	  adjust_addrp = false;
+	  adjust_addrp = FALSE;
 	  break;
 
 	case ALPHA_R_OP_STORE:
@@ -1811,7 +1814,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 	case ALPHA_R_GPVALUE:
 	  /* I really don't know if this does the right thing.  */
 	  gp = ecoff_data (input_bfd)->gp + r_symndx;
-	  gp_undefined = false;
+	  gp_undefined = FALSE;
 	  break;
 	}
 
@@ -1861,7 +1864,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		      if (! ((*info->callbacks->unattached_reloc)
 			     (info, h->root.root.string, input_bfd,
 			      input_section, r_vaddr - input_section->vma)))
-			return false;
+			return FALSE;
 		    }
 
 		  relocation = alpha_convert_external_reloc (output_bfd,
@@ -1918,8 +1921,8 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		      if (! ((*info->callbacks->undefined_symbol)
 			     (info, h->root.root.string, input_bfd,
 			      input_section,
-			      r_vaddr - input_section->vma, true)))
-			return false;
+			      r_vaddr - input_section->vma, TRUE)))
+			return FALSE;
 		      relocation = 0;
 		    }
 		}
@@ -1965,7 +1968,7 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 			   (info, name, alpha_howto_table[r_type].name,
 			    (bfd_vma) 0, input_bfd, input_section,
 			    r_vaddr - input_section->vma)))
-		      return false;
+		      return FALSE;
 		  }
 		  break;
 		}
@@ -1988,24 +1991,24 @@ alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 	  if (! ((*info->callbacks->reloc_dangerous)
 		 (info, _("GP relative relocation used when GP not defined"),
 		  input_bfd, input_section, r_vaddr - input_section->vma)))
-	    return false;
+	    return FALSE;
 	  /* Only give the error once per link.  */
 	  gp = 4;
 	  _bfd_set_gp_value (output_bfd, gp);
-	  gp_undefined = false;
+	  gp_undefined = FALSE;
 	}
     }
 
   if (tos != 0)
     abort ();
 
-  return true;
+  return TRUE;
 }
 
 /* Do final adjustments to the filehdr and the aouthdr.  This routine
    sets the dynamic bits in the file header.  */
 
-static boolean
+static bfd_boolean
 alpha_adjust_headers (abfd, fhdr, ahdr)
      bfd *abfd;
      struct internal_filehdr *fhdr;
@@ -2015,7 +2018,7 @@ alpha_adjust_headers (abfd, fhdr, ahdr)
     fhdr->f_flags |= F_ALPHA_CALL_SHARED;
   else if ((abfd->flags & DYNAMIC) != 0)
     fhdr->f_flags |= F_ALPHA_SHARABLE;
-  return true;
+  return TRUE;
 }
 
 /* Archive handling.  In OSF/1 (or Digital Unix) v3.2, Digital
@@ -2185,7 +2188,7 @@ alpha_ecoff_get_elt_at_filepos (archive, filepos)
   bim->size = size;
   bim->buffer = buf;
 
-  nbfd->mtime_set = true;
+  nbfd->mtime_set = TRUE;
   nbfd->mtime = strtol (hdr->ar_date, (char **) NULL, 10);
 
   nbfd->flags |= BFD_IN_MEMORY;
@@ -2262,7 +2265,7 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data =
     (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* reloc_out */
     alpha_ecoff_swap_filehdr_out, alpha_ecoff_swap_aouthdr_out,
     alpha_ecoff_swap_scnhdr_out,
-    FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, FILNMLEN, true, false, 4, false, 2,
+    FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, FILNMLEN, TRUE, FALSE, 4, FALSE, 2,
     alpha_ecoff_swap_filehdr_in, alpha_ecoff_swap_aouthdr_in,
     alpha_ecoff_swap_scnhdr_in, NULL,
     alpha_ecoff_bad_format_hook, _bfd_ecoff_set_arch_mach_hook,
@@ -2278,10 +2281,10 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data =
   /* The page boundary used to align sections in a demand-paged
      executable file.  E.g., 0x1000.  */
   0x2000,
-  /* True if the .rdata section is part of the text segment, as on the
-     Alpha.  False if .rdata is part of the data segment, as on the
+  /* TRUE if the .rdata section is part of the text segment, as on the
+     Alpha.  FALSE if .rdata is part of the data segment, as on the
      MIPS.  */
-  true,
+  TRUE,
   /* Bitsize of constructor entries.  */
   64,
   /* Reloc to use for constructor entries.  */
diff --git a/bfd/coff-apollo.c b/bfd/coff-apollo.c
index e8abcb7c6fb..d7b921260bb 100644
--- a/bfd/coff-apollo.c
+++ b/bfd/coff-apollo.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Apollo 68000 COFF binaries.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1999, 2000, 2001
+   Copyright 1990, 1991, 1992, 1993, 1994, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    By Troy Rollo (troy@cbme.unsw.edu.au)
    Based on m68k standard COFF version Written by Cygnus Support.
@@ -34,13 +34,13 @@ extern reloc_howto_type apollocoff_howto_table[];
 #else
 reloc_howto_type apollocoff_howto_table[] =
   {
-    HOWTO (R_RELBYTE,	       0,  0,  	8,  false, 0, complain_overflow_bitfield, 0, "8",	true, 0x000000ff,0x000000ff, false),
-    HOWTO (R_RELWORD,	       0,  1, 	16, false, 0, complain_overflow_bitfield, 0, "16",	true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (R_RELLONG,	       0,  2, 	32, false, 0, complain_overflow_bitfield, 0, "32",	true, 0xffffffff,0xffffffff, false),
-    HOWTO (R_PCRBYTE,	       0,  0, 	8,  true,  0, complain_overflow_signed,   0, "DISP8",   true, 0x000000ff,0x000000ff, false),
-    HOWTO (R_PCRWORD,	       0,  1, 	16, true,  0, complain_overflow_signed,   0, "DISP16",  true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (R_PCRLONG,	       0,  2, 	32, true,  0, complain_overflow_signed,   0, "DISP32",  true, 0xffffffff,0xffffffff, false),
-    HOWTO (R_RELLONG_NEG,      0,  -2, 	32, false, 0, complain_overflow_bitfield, 0, "-32",	true, 0xffffffff,0xffffffff, false),
+    HOWTO (R_RELBYTE,	       0,  0,  	8,  FALSE, 0, complain_overflow_bitfield, 0, "8",	TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (R_RELWORD,	       0,  1, 	16, FALSE, 0, complain_overflow_bitfield, 0, "16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (R_RELLONG,	       0,  2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (R_PCRBYTE,	       0,  0, 	8,  TRUE,  0, complain_overflow_signed,   0, "DISP8",   TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (R_PCRWORD,	       0,  1, 	16, TRUE,  0, complain_overflow_signed,   0, "DISP16",  TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (R_PCRLONG,	       0,  2, 	32, TRUE,  0, complain_overflow_signed,   0, "DISP32",  TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (R_RELLONG_NEG,      0,  -2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "-32",	TRUE, 0xffffffff,0xffffffff, FALSE),
   };
 #endif /* not ONLY_DECLARE_RELOCS */
 
diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index 25256a8b7bb..ce711d1c4ce 100644
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -80,7 +80,7 @@ typedef unsigned long int insn32;
 typedef unsigned short int insn16;
 
      /* Forward declarations for stupid compilers.  */
-static boolean coff_arm_relocate_section
+static bfd_boolean coff_arm_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
            struct internal_reloc *, struct internal_syment *, asection **));
 static bfd_reloc_status_type aoutarm_fix_pcrel_26_done
@@ -99,9 +99,9 @@ static bfd_reloc_status_type coff_thumb_pcrel_12
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type coff_arm_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean coff_arm_adjust_symndx
+static bfd_boolean coff_arm_adjust_symndx
   PARAMS ((bfd *, struct bfd_link_info *, bfd *,
-	   asection *, struct internal_reloc *,	boolean *));
+	   asection *, struct internal_reloc *,	bfd_boolean *));
 static reloc_howto_type * coff_arm_rtype_to_howto
   PARAMS ((bfd *, asection *, struct internal_reloc *,
 	   struct coff_link_hash_entry *, struct internal_syment *,
@@ -125,19 +125,19 @@ static void record_thumb_to_arm_glue
   PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
 #endif
 #endif
-static boolean coff_arm_merge_private_bfd_data
+static bfd_boolean coff_arm_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean coff_arm_print_private_bfd_data
+static bfd_boolean coff_arm_print_private_bfd_data
   PARAMS ((bfd *, PTR));
-static boolean _bfd_coff_arm_set_private_flags
+static bfd_boolean _bfd_coff_arm_set_private_flags
   PARAMS ((bfd *, flagword));
-static boolean coff_arm_copy_private_bfd_data
+static bfd_boolean coff_arm_copy_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean coff_arm_is_local_label_name
+static bfd_boolean coff_arm_is_local_label_name
   PARAMS ((bfd *, const char *));
-static boolean coff_arm_link_output_has_begun
+static bfd_boolean coff_arm_link_output_has_begun
   PARAMS ((bfd *, struct coff_final_link_info *));
-static boolean coff_arm_final_link_postscript
+static bfd_boolean coff_arm_final_link_postscript
   PARAMS ((bfd *, struct coff_final_link_info *));
 static void arm_emit_base_file_entry
   PARAMS ((struct bfd_link_info *, bfd *, asection *, bfd_vma));
@@ -224,7 +224,7 @@ coff_arm_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 #endif
 
 #ifndef PCRELOFFSET
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 #endif
 
 /* These most certainly belong somewhere else. Just had to get rid of
@@ -269,12 +269,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   0,
 	   2,
 	   32,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_32",
-	   true,
+	   TRUE,
 	   0xffffffff,
 	   0xffffffff,
 	   PCRELOFFSET),
@@ -282,12 +282,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   0,
 	   2,
 	   32,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_RVA32",
-	   true,
+	   TRUE,
 	   0xffffffff,
 	   0xffffffff,
 	   PCRELOFFSET),
@@ -295,12 +295,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   2,
 	   2,
 	   24,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   aoutarm_fix_pcrel_26 ,
 	   "ARM_26",
-	   false,
+	   FALSE,
 	   0x00ffffff,
 	   0x00ffffff,
 	   PCRELOFFSET),
@@ -308,12 +308,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   1,
 	   1,
 	   11,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   coff_thumb_pcrel_12 ,
 	   "ARM_THUMB12",
-	   false,
+	   FALSE,
 	   0x000007ff,
 	   0x000007ff,
 	   PCRELOFFSET),
@@ -321,15 +321,15 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   2,
 	   2,
 	   24,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_dont,
 	   aoutarm_fix_pcrel_26_done,
 	   "ARM_26D",
-	   true,
+	   TRUE,
 	   0x00ffffff,
 	   0x0,
-	   false),
+	   FALSE),
     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),
@@ -342,12 +342,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   0,
 	   1,
 	   16,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_16",
-	   true,
+	   TRUE,
 	   0x0000ffff,
 	   0x0000ffff,
 	   PCRELOFFSET),
@@ -355,26 +355,26 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   0,
 	   2,
 	   32,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_32",
-	   true,
+	   TRUE,
 	   0xffffffff,
 	   0xffffffff,
 	   PCRELOFFSET),
 #else /* not ARM_WINCE */
-    HOWTO (ARM_8,			/* type */
+    HOWTO (ARM_8,		/* type */
 	   0,			/* rightshift */
 	   0,			/* size */
 	   8,			/* bitsize */
-	   false,			/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_bitfield, /* complain_on_overflow */
-	   coff_arm_reloc,		/* special_function */
+	   coff_arm_reloc,	/* special_function */
 	   "ARM_8",		/* name */
-	   true,			/* partial_inplace */
+	   TRUE,		/* partial_inplace */
 	   0x000000ff,		/* src_mask */
 	   0x000000ff,		/* dst_mask */
 	   PCRELOFFSET		/* pcrel_offset */),
@@ -382,12 +382,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   0,
 	   1,
 	   16,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_16",
-	   true,
+	   TRUE,
 	   0x0000ffff,
 	   0x0000ffff,
 	   PCRELOFFSET),
@@ -395,12 +395,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   0,
 	   2,
 	   32,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_32",
-	   true,
+	   TRUE,
 	   0xffffffff,
 	   0xffffffff,
 	   PCRELOFFSET),
@@ -408,12 +408,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   2,
 	   2,
 	   24,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   aoutarm_fix_pcrel_26 ,
 	   "ARM_26",
-	   false,
+	   FALSE,
 	   0x00ffffff,
 	   0x00ffffff,
 	   PCRELOFFSET),
@@ -421,92 +421,92 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   0,
 	   0,
 	   8,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   coff_arm_reloc,
 	   "ARM_DISP8",
-	   true,
+	   TRUE,
 	   0x000000ff,
 	   0x000000ff,
-	   true),
+	   TRUE),
     HOWTO (ARM_DISP16,
 	   0,
 	   1,
 	   16,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   coff_arm_reloc,
 	   "ARM_DISP16",
-	   true,
+	   TRUE,
 	   0x0000ffff,
 	   0x0000ffff,
-	   true),
+	   TRUE),
     HOWTO (ARM_DISP32,
 	   0,
 	   2,
 	   32,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   coff_arm_reloc,
 	   "ARM_DISP32",
-	   true,
+	   TRUE,
 	   0xffffffff,
 	   0xffffffff,
-	   true),
+	   TRUE),
     HOWTO (ARM_26D,
 	   2,
 	   2,
 	   24,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_dont,
 	   aoutarm_fix_pcrel_26_done,
 	   "ARM_26D",
-	   true,
+	   TRUE,
 	   0x00ffffff,
 	   0x0,
-	   false),
+	   FALSE),
     /* 8 is unused */
     EMPTY_HOWTO (-1),
     HOWTO (ARM_NEG16,
 	   0,
 	   -1,
 	   16,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_NEG16",
-	   true,
+	   TRUE,
 	   0x0000ffff,
 	   0x0000ffff,
-	   false),
+	   FALSE),
     HOWTO (ARM_NEG32,
 	   0,
 	   -2,
 	   32,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_NEG32",
-	   true,
+	   TRUE,
 	   0xffffffff,
 	   0xffffffff,
-	   false),
+	   FALSE),
     HOWTO (ARM_RVA32,
 	   0,
 	   2,
 	   32,
-	   false,
+	   FALSE,
 	   0,
 	   complain_overflow_bitfield,
 	   coff_arm_reloc,
 	   "ARM_RVA32",
-	   true,
+	   TRUE,
 	   0xffffffff,
 	   0xffffffff,
 	   PCRELOFFSET),
@@ -514,12 +514,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   1,
 	   1,
 	   8,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   coff_thumb_pcrel_9 ,
 	   "ARM_THUMB9",
-	   false,
+	   FALSE,
 	   0x000000ff,
 	   0x000000ff,
 	   PCRELOFFSET),
@@ -527,12 +527,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   1,
 	   1,
 	   11,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   coff_thumb_pcrel_12 ,
 	   "ARM_THUMB12",
-	   false,
+	   FALSE,
 	   0x000007ff,
 	   0x000007ff,
 	   PCRELOFFSET),
@@ -540,12 +540,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 	   1,
 	   2,
 	   22,
-	   true,
+	   TRUE,
 	   0,
 	   complain_overflow_signed,
 	   coff_thumb_pcrel_23 ,
 	   "ARM_THUMB23",
-	   false,
+	   FALSE,
 	   0x07ff07ff,
 	   0x07ff07ff,
 	   PCRELOFFSET)
@@ -555,11 +555,11 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 #define NUM_RELOCS NUM_ELEM (aoutarm_std_reloc_howto)
 
 #ifdef COFF_WITH_PE
-static boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
-/* Return true if this relocation should
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+/* Return TRUE if this relocation should
    appear in the output .reloc section.  */
 
-static boolean
+static bfd_boolean
 in_reloc_p (abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type * howto;
@@ -1059,7 +1059,7 @@ find_thumb_glue (info, name, input_bfd)
   sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
 
   myh = coff_link_hash_lookup
-    (coff_hash_table (info), tmp_name, false, false, true);
+    (coff_hash_table (info), tmp_name, FALSE, FALSE, TRUE);
 
   if (myh == NULL)
     /* xgettext:c-format */
@@ -1089,7 +1089,7 @@ find_arm_glue (info, name, input_bfd)
   sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
 
   myh = coff_link_hash_lookup
-    (coff_hash_table (info), tmp_name, false, false, true);
+    (coff_hash_table (info), tmp_name, FALSE, FALSE, TRUE);
 
   if (myh == NULL)
     /* xgettext:c-format */
@@ -1188,7 +1188,7 @@ static const insn32 t2a6_bx_insn    = 0xe12fff1e;
    ARM/Thumb builds.  It is only the code marked THUMBEXTENSION that
    is different from the original.  */
 
-static boolean
+static bfd_boolean
 coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                            contents, relocs, syms, sections)
      bfd *output_bfd;
@@ -1244,7 +1244,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
       howto = coff_rtype_to_howto (input_bfd, input_section, rel, h,
 				       sym, &addend);
       if (howto == NULL)
-	return false;
+	return FALSE;
 
       /* The relocation_section function will skip pcrel_offset relocs
          when doing a relocateable link.  However, we want to convert
@@ -1264,15 +1264,15 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
     	       2,
     	       2,
     	       24,
-    	       true,
+    	       TRUE,
     	       0,
     	       complain_overflow_signed,
     	       aoutarm_fix_pcrel_26 ,
     	       "ARM_26",
-    	       false,
+    	       FALSE,
     	       0x00ffffff,
     	       0x00ffffff,
-    	       false);
+    	       FALSE);
 
           addend -= rel->r_vaddr - input_section->vma;
           howto = &fake_arm26_reloc;
@@ -1365,7 +1365,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 
 		      myh = find_arm_glue (info, name, input_bfd);
 		      if (myh == NULL)
-			return false;
+			return FALSE;
 
 		      globals = coff_arm_hash_table (info);
 
@@ -1458,7 +1458,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 
 		      myh = find_thumb_glue (info, name, input_bfd);
 		      if (myh == NULL)
-			return false;
+			return FALSE;
 
 		      globals = coff_arm_hash_table (info);
 
@@ -1596,8 +1596,8 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      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;
 	    }
 	}
 
@@ -1631,18 +1631,18 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 	    rstat = bfd_reloc_outofrange;
           else
             {
-              bfd_vma         relocation       = val + addend;
-	      int             size             = bfd_get_reloc_size (howto);
-	      boolean         overflow         = false;
-	      bfd_byte *      location         = contents + address;
-	      bfd_vma         x                = bfd_get_32 (input_bfd, location);
-	      bfd_vma         src_mask         = 0x007FFFFE;
-	      bfd_signed_vma  reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
-	      bfd_signed_vma  reloc_signed_min = ~reloc_signed_max;
-	      bfd_vma         check;
-	      bfd_signed_vma  signed_check;
-	      bfd_vma         add;
-	      bfd_signed_vma  signed_add;
+              bfd_vma relocation = val + addend;
+	      int size = bfd_get_reloc_size (howto);
+	      bfd_boolean overflow = FALSE;
+	      bfd_byte *location = contents + address;
+	      bfd_vma x = bfd_get_32 (input_bfd, location);
+	      bfd_vma src_mask = 0x007FFFFE;
+	      bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+	      bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
+	      bfd_vma check;
+	      bfd_signed_vma signed_check;
+	      bfd_vma add;
+	      bfd_signed_vma signed_add;
 
 	      BFD_ASSERT (size == 4);
 
@@ -1699,7 +1699,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 	      /* Assumes two's complement.  */
 	      if (   signed_check > reloc_signed_max
 		  || signed_check < reloc_signed_min)
-		overflow = true;
+		overflow = TRUE;
 
 	      /* Put the relocation into the correct bits.
 		 For a BLX instruction, make sure that the relocation is rounded up
@@ -1746,13 +1746,13 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 	  /* Determine if we need to set the bottom bit of a relocated address
 	     because the address is the address of a Thumb code symbol.  */
 
-	  int patchit = false;
+	  int patchit = FALSE;
 
 	  if (h != NULL
 	      && (   h->class == C_THUMBSTATFUNC
 		  || h->class == C_THUMBEXTFUNC))
 	    {
-	      patchit = true;
+	      patchit = TRUE;
 	    }
 	  else if (sym != NULL
 		   && sym->n_scnum > N_UNDEF)
@@ -1761,7 +1761,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	      if (   sym->n_sclass == C_THUMBSTATFUNC
 		  || sym->n_sclass == C_THUMBEXTFUNC)
-		patchit = true;
+		patchit = TRUE;
 	    }
 
 	  if (patchit)
@@ -1786,7 +1786,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 	     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;
@@ -1800,23 +1800,23 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 	      {
 		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;
 }
 
 #ifndef COFF_IMAGE_WITH_PE
 
-boolean
+bfd_boolean
 bfd_arm_allocate_interworking_sections (info)
      struct bfd_link_info * info;
 {
@@ -1869,7 +1869,7 @@ bfd_arm_allocate_interworking_sections (info)
       s->contents = foo;
     }
 
-  return true;
+  return TRUE;
 }
 
 static void
@@ -1904,7 +1904,7 @@ record_arm_to_thumb_glue (info, h)
   sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
 
   myh = coff_link_hash_lookup
-    (coff_hash_table (info), tmp_name, false, false, true);
+    (coff_hash_table (info), tmp_name, FALSE, FALSE, TRUE);
 
   if (myh != NULL)
     {
@@ -1919,7 +1919,7 @@ record_arm_to_thumb_glue (info, h)
   bh = NULL;
   val = globals->arm_glue_size + 1;
   bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
-				BSF_GLOBAL, s, val, NULL, true, false, &bh);
+				BSF_GLOBAL, s, val, NULL, TRUE, FALSE, &bh);
 
   free (tmp_name);
 
@@ -1961,7 +1961,7 @@ record_thumb_to_arm_glue (info, h)
   sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
 
   myh = coff_link_hash_lookup
-    (coff_hash_table (info), tmp_name, false, false, true);
+    (coff_hash_table (info), tmp_name, FALSE, FALSE, TRUE);
 
   if (myh != NULL)
     {
@@ -1972,7 +1972,7 @@ record_thumb_to_arm_glue (info, h)
   bh = NULL;
   val = globals->thumb_glue_size + 1;
   bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
-				BSF_GLOBAL, s, val, NULL, true, false, &bh);
+				BSF_GLOBAL, s, val, NULL, TRUE, FALSE, &bh);
 
   /* If we mark it 'thumb', the disassembler will do a better job.  */
   myh = (struct coff_link_hash_entry *) bh;
@@ -1995,7 +1995,7 @@ record_thumb_to_arm_glue (info, h)
   bh = NULL;
   val = globals->thumb_glue_size + (globals->support_old_code ? 8 : 4);
   bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
-				BSF_LOCAL, s, val, NULL, true, false, &bh);
+				BSF_LOCAL, s, val, NULL, TRUE, FALSE, &bh);
 
   free (tmp_name);
 
@@ -2009,7 +2009,7 @@ record_thumb_to_arm_glue (info, h)
    This function is called from the linker scripts in ld/emultempl/
    {armcoff/pe}.em  */
 
-boolean
+bfd_boolean
 bfd_arm_get_bfd_for_interworking (abfd, info)
      bfd * 		    abfd;
      struct bfd_link_info * info;
@@ -2021,14 +2021,14 @@ bfd_arm_get_bfd_for_interworking (abfd, info)
   /* If we are only performing a partial link do not bother
      getting a bfd to hold the glue.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   globals = coff_arm_hash_table (info);
 
   BFD_ASSERT (globals != NULL);
 
   if (globals->bfd_of_glue_owner != NULL)
-    return true;
+    return TRUE;
 
   sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
 
@@ -2041,7 +2041,7 @@ bfd_arm_get_bfd_for_interworking (abfd, info)
       if (sec == NULL
 	  || ! bfd_set_section_flags (abfd, sec, flags)
 	  || ! bfd_set_section_alignment (abfd, sec, 2))
-	return false;
+	return FALSE;
     }
 
   sec = bfd_get_section_by_name (abfd, THUMB2ARM_GLUE_SECTION_NAME);
@@ -2055,16 +2055,16 @@ bfd_arm_get_bfd_for_interworking (abfd, info)
       if (sec == NULL
 	  || ! bfd_set_section_flags (abfd, sec, flags)
 	  || ! bfd_set_section_alignment (abfd, sec, 2))
-	return false;
+	return FALSE;
     }
 
   /* Save the bfd for later use.  */
   globals->bfd_of_glue_owner = abfd;
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 bfd_arm_process_before_allocation (abfd, info, support_old_code)
      bfd *                   abfd;
      struct bfd_link_info *  info;
@@ -2076,7 +2076,7 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
   /* If we are only performing a partial link do not bother
      to construct any glue.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   /* Here we have a bfd that is to be included on the link.  We have a hook
      to do reloc rummaging, before section sizes are nailed down.  */
@@ -2094,7 +2094,7 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
   sec = abfd->sections;
 
   if (sec == NULL)
-    return true;
+    return TRUE;
 
   for (; sec != NULL; sec = sec->next)
     {
@@ -2178,7 +2178,7 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 #endif /* ! defined (COFF_IMAGE_WITH_PE) */
@@ -2198,14 +2198,14 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
 /* When doing a relocateable link, we want to convert ARM26 relocs
    into ARM26D relocs.  */
 
-static boolean
+static bfd_boolean
 coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
      bfd *obfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      bfd *ibfd;
      asection *sec;
      struct internal_reloc *irel;
-     boolean *adjustedp;
+     bfd_boolean *adjustedp;
 {
   if (irel->r_type == 3)
     {
@@ -2218,8 +2218,8 @@ coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
 	  && h->root.u.def.section->output_section == sec->output_section)
 	irel->r_type = 7;
     }
-  *adjustedp = false;
-  return true;
+  *adjustedp = FALSE;
+  return TRUE;
 }
 
 /* Called when merging the private data areas of two BFDs.
@@ -2227,7 +2227,7 @@ coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
    attempting to merge binaries compiled for different ARM
    targets, eg different CPUs or differents APCS's.     */
 
-static boolean
+static bfd_boolean
 coff_arm_merge_private_bfd_data (ibfd, obfd)
      bfd *   ibfd;
      bfd *   obfd;
@@ -2235,14 +2235,14 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
   BFD_ASSERT (ibfd != NULL && obfd != NULL);
 
   if (ibfd == obfd)
-    return true;
+    return TRUE;
 
   /* If the two formats are different we cannot merge anything.
      This is not an error, since it is permissable to change the
      input and output formats.  */
   if (   ibfd->xvec->flavour != bfd_target_coff_flavour
       || obfd->xvec->flavour != bfd_target_coff_flavour)
-    return true;
+    return TRUE;
 
   /* Verify that the APCS is the same for the two BFDs */
   if (APCS_SET (ibfd))
@@ -2260,7 +2260,7 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 		 );
 
 	      bfd_set_error (bfd_error_wrong_format);
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (APCS_FLOAT_FLAG (obfd) != APCS_FLOAT_FLAG (ibfd))
@@ -2278,7 +2278,7 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 				  bfd_get_filename (obfd));
 
 	      bfd_set_error (bfd_error_wrong_format);
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (PIC_FLAG (obfd) != PIC_FLAG (ibfd))
@@ -2295,7 +2295,7 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 				  bfd_get_filename (obfd));
 
 	      bfd_set_error (bfd_error_wrong_format);
-	      return false;
+	      return FALSE;
 	    }
 	}
       else
@@ -2334,12 +2334,12 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Display the flags field.  */
 
-static boolean
+static bfd_boolean
 coff_arm_print_private_bfd_data (abfd, ptr)
      bfd *   abfd;
      PTR     ptr;
@@ -2376,7 +2376,7 @@ coff_arm_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
 
 /* Copies the given flags into the coff_tdata.flags field.
@@ -2386,7 +2386,7 @@ coff_arm_print_private_bfd_data (abfd, ptr)
    Note: Although this function is static, it is explicitly
    called from both coffcode.h and peicode.h.  */
 
-static boolean
+static bfd_boolean
 _bfd_coff_arm_set_private_flags (abfd, flags)
 	bfd *	   abfd;
 	flagword   flags;
@@ -2404,7 +2404,7 @@ _bfd_coff_arm_set_private_flags (abfd, flags)
 	  || (APCS_FLOAT_FLAG (abfd) != (flags & F_APCS_FLOAT))
 	  || (PIC_FLAG        (abfd) != (flags & F_PIC))
 	  ))
-    return false;
+    return FALSE;
 
   flag |= (flags & (F_APCS_FLOAT | F_PIC));
 
@@ -2431,13 +2431,13 @@ _bfd_coff_arm_set_private_flags (abfd, flags)
 
   SET_INTERWORK_FLAG (abfd, flag);
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the important parts of the target specific data
    from one instance of a BFD to another.  */
 
-static boolean
+static bfd_boolean
 coff_arm_copy_private_bfd_data (src, dest)
      bfd *  src;
      bfd *  dest;
@@ -2445,12 +2445,12 @@ coff_arm_copy_private_bfd_data (src, dest)
   BFD_ASSERT (src != NULL && dest != NULL);
 
   if (src == dest)
-    return true;
+    return TRUE;
 
   /* If the destination is not in the same format as the source, do not do
      the copy.  */
   if (src->xvec != dest->xvec)
-    return true;
+    return TRUE;
 
   /* copy the flags field */
   if (APCS_SET (src))
@@ -2459,13 +2459,13 @@ coff_arm_copy_private_bfd_data (src, dest)
 	{
 	  /* If the src and dest have different APCS flag bits set, fail.  */
 	  if (APCS_26_FLAG (dest) != APCS_26_FLAG (src))
-	    return false;
+	    return FALSE;
 
 	  if (APCS_FLOAT_FLAG (dest) != APCS_FLOAT_FLAG (src))
-	    return false;
+	    return FALSE;
 
 	  if (PIC_FLAG (dest) != PIC_FLAG (src))
-	    return false;
+	    return FALSE;
 	}
       else
 	SET_APCS_FLAGS (dest, APCS_26_FLAG (src) | APCS_FLOAT_FLAG (src)
@@ -2498,7 +2498,7 @@ Warning: Clearing the interworking flag of %s because non-interworking code in %
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Note:  the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
@@ -2513,7 +2513,7 @@ Warning: Clearing the interworking flag of %s because non-interworking code in %
       non-local.
    b) Allow other prefixes than ".", e.g. an empty prefix would cause all
       labels of the form Lxxx to be stripped.  */
-static boolean
+static bfd_boolean
 coff_arm_is_local_label_name (abfd, name)
      bfd *        abfd ATTRIBUTE_UNUSED;
      const char * name;
@@ -2522,7 +2522,7 @@ coff_arm_is_local_label_name (abfd, name)
   if (USER_LABEL_PREFIX[0] != 0)
     {
       if (strncmp (name, USER_LABEL_PREFIX, strlen (USER_LABEL_PREFIX)) == 0)
-	return false;
+	return FALSE;
     }
 #endif
 
@@ -2535,7 +2535,7 @@ coff_arm_is_local_label_name (abfd, name)
       size_t len = strlen (LOCAL_LABEL_PREFIX);
 
       if (strncmp (name, LOCAL_LABEL_PREFIX, len) != 0)
-	return false;
+	return FALSE;
 
       /* Perform the checks below for the rest of the name.  */
       name += len;
@@ -2553,7 +2553,7 @@ coff_arm_is_local_label_name (abfd, name)
 
    krk@cygnus.com  */
 
-static boolean
+static bfd_boolean
 coff_arm_link_output_has_begun (sub, info)
      bfd * sub;
      struct coff_final_link_info * info;
@@ -2562,7 +2562,7 @@ coff_arm_link_output_has_begun (sub, info)
 	  || sub == coff_arm_hash_table (info->info)->bfd_of_glue_owner);
 }
 
-static boolean
+static bfd_boolean
 coff_arm_final_link_postscript (abfd, pfinfo)
      bfd * abfd ATTRIBUTE_UNUSED;
      struct coff_final_link_info * pfinfo;
@@ -2576,12 +2576,12 @@ coff_arm_final_link_postscript (abfd, pfinfo)
   if (globals->bfd_of_glue_owner != NULL)
     {
       if (! _bfd_coff_link_input_bfd (pfinfo, globals->bfd_of_glue_owner))
-	return false;
+	return FALSE;
 
-      globals->bfd_of_glue_owner->output_has_begun = true;
+      globals->bfd_of_glue_owner->output_has_begun = TRUE;
     }
 
-  return true;
+  return TRUE;
 }
 
 #include "coffcode.h"
diff --git a/bfd/coff-aux.c b/bfd/coff-aux.c
index 53822f04ed7..4d7cde55571 100644
--- a/bfd/coff-aux.c
+++ b/bfd/coff-aux.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Apple M68K COFF A/UX 3.x files.
-   Copyright 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
    Written by Richard Henderson <rth@tamu.edu>.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -40,9 +40,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 
-static boolean coff_m68k_aux_link_add_one_symbol
+static bfd_boolean coff_m68k_aux_link_add_one_symbol
   PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
-           asection *, bfd_vma, const char *, boolean, boolean,
+           asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
            struct bfd_link_hash_entry **));
 
 #define coff_link_add_one_symbol coff_m68k_aux_link_add_one_symbol
@@ -56,7 +56,7 @@ static boolean coff_m68k_aux_link_add_one_symbol
    shared libraries work here, but can work if you are careful with
    what you include in the shared object.  */
 
-static boolean
+static bfd_boolean
 coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
 				   string, copy, collect, hashp)
      struct bfd_link_info *info;
@@ -66,8 +66,8 @@ coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
      asection *section;
      bfd_vma value;
      const char *string;
-     boolean copy;
-     boolean collect;
+     bfd_boolean copy;
+     bfd_boolean collect;
      struct bfd_link_hash_entry **hashp;
 {
   struct bfd_link_hash_entry *h;
@@ -86,21 +86,21 @@ coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
 	}
       else
 	{
-	  h = bfd_link_hash_lookup (info->hash, name, true, copy, false);
+	  h = bfd_link_hash_lookup (info->hash, name, TRUE, copy, FALSE);
 	  if (h == NULL)
 	    {
 	      if (hashp != NULL)
 		*hashp = NULL;
-	      return false;
+	      return FALSE;
 	    }
 	}
 
       if (info->notice_hash != (struct bfd_hash_table *) NULL
-	  && (bfd_hash_lookup (info->notice_hash, name, false, false)
+	  && (bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE)
 	      != (struct bfd_hash_entry *) NULL))
 	{
 	  if (! (*info->callbacks->notice) (info, name, abfd, section, value))
-	    return false;
+	    return FALSE;
 	}
 
       if (hashp != (struct bfd_link_hash_entry **) NULL)
@@ -121,10 +121,10 @@ coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
 	    {
 	      h->u.def.section = section;
 	      h->u.def.value = value;
-	      return true;
+	      return TRUE;
 	    }
 	  else if (bfd_is_abs_section (section) && !bfd_is_abs_section (msec))
-	    return true;
+	    return TRUE;
 	}
     }
 
diff --git a/bfd/coff-h8300.c b/bfd/coff-h8300.c
index c83015e4efb..d571e189827 100644
--- a/bfd/coff-h8300.c
+++ b/bfd/coff-h8300.c
@@ -62,21 +62,31 @@ static struct bfd_hash_entry *
 funcvec_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 
-static boolean
+static bfd_boolean
 funcvec_hash_table_init
   PARAMS ((struct funcvec_hash_table *, bfd *,
-           struct bfd_hash_entry *(*) PARAMS ((struct bfd_hash_entry *,
-                                               struct bfd_hash_table *,
-                                               const char *))));
-
-static bfd_reloc_status_type special PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static int select_reloc PARAMS ((reloc_howto_type *));
-static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
-static void reloc_processing PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
-static boolean h8300_symbol_address_p PARAMS ((bfd *, asection *, bfd_vma));
-static int h8300_reloc16_estimate PARAMS ((bfd *, asection *, arelent *, unsigned int, struct bfd_link_info *));
-static void h8300_reloc16_extra_cases PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *, bfd_byte *, unsigned int *, unsigned int *));
-static boolean h8300_bfd_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *));
+           struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+				       struct bfd_hash_table *,
+				       const char *)));
+
+static bfd_reloc_status_type special
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static int select_reloc
+  PARAMS ((reloc_howto_type *));
+static void rtype2howto
+  PARAMS ((arelent *, struct internal_reloc *));
+static void reloc_processing
+  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+static bfd_boolean h8300_symbol_address_p
+  PARAMS ((bfd *, asection *, bfd_vma));
+static int h8300_reloc16_estimate
+  PARAMS ((bfd *, asection *, arelent *, unsigned int,
+    struct bfd_link_info *));
+static void h8300_reloc16_extra_cases
+  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
+    bfd_byte *, unsigned int *, unsigned int *));
+static bfd_boolean h8300_bfd_link_add_symbols
+  PARAMS ((bfd *, struct bfd_link_info *));
 
 /* To lookup a value in the function vector hash table.  */
 #define funcvec_hash_lookup(table, string, create, copy) \
@@ -159,13 +169,13 @@ funcvec_hash_newfunc (entry, gen_table, string)
 
 /* Initialize the function vector hash table.  */
 
-static boolean
+static bfd_boolean
 funcvec_hash_table_init (table, abfd, newfunc)
      struct funcvec_hash_table *table;
      bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
+     struct bfd_hash_entry *(*newfunc)
+       PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
+		const char *));
 {
   /* Initialize our local fields, then call the generic initialization
      routine.  */
@@ -232,37 +242,37 @@ special (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 }
 
 static reloc_howto_type howto_table[] = {
-  HOWTO (R_RELBYTE, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "8", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_RELWORD, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "16", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG, 0, 2, 32, false, 0, complain_overflow_bitfield, special, "32", false, 0xffffffff, 0xffffffff, false),
-  HOWTO (R_PCRBYTE, 0, 0, 8, true, 0, complain_overflow_signed, special, "DISP8", false, 0x000000ff, 0x000000ff, true),
-  HOWTO (R_PCRWORD, 0, 1, 16, true, 0, complain_overflow_signed, special, "DISP16", false, 0x0000ffff, 0x0000ffff, true),
-  HOWTO (R_PCRLONG, 0, 2, 32, true, 0, complain_overflow_signed, special, "DISP32", false, 0xffffffff, 0xffffffff, true),
-  HOWTO (R_MOV16B1, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "relaxable mov.b:16", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_MOV16B2, 0, 1, 8, false, 0, complain_overflow_bitfield, special, "relaxed mov.b:16", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_JMP1, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "16/pcrel", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_JMP2, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "pcrecl/16", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_JMPL1, 0, 2, 32, false, 0, complain_overflow_bitfield, special, "24/pcrell", false, 0x00ffffff, 0x00ffffff, false),
-  HOWTO (R_JMPL2, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "pc8/24", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_MOV24B1, 0, 1, 32, false, 0, complain_overflow_bitfield, special, "relaxable mov.b:24", false, 0xffffffff, 0xffffffff, false),
-  HOWTO (R_MOV24B2, 0, 1, 8, false, 0, complain_overflow_bitfield, special, "relaxed mov.b:24", false, 0x0000ffff, 0x0000ffff, false),
+  HOWTO (R_RELBYTE, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "8", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_RELWORD, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "16", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, special, "32", FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_PCRBYTE, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "DISP8", FALSE, 0x000000ff, 0x000000ff, TRUE),
+  HOWTO (R_PCRWORD, 0, 1, 16, TRUE, 0, complain_overflow_signed, special, "DISP16", FALSE, 0x0000ffff, 0x0000ffff, TRUE),
+  HOWTO (R_PCRLONG, 0, 2, 32, TRUE, 0, complain_overflow_signed, special, "DISP32", FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO (R_MOV16B1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "relaxable mov.b:16", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_MOV16B2, 0, 1, 8, FALSE, 0, complain_overflow_bitfield, special, "relaxed mov.b:16", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_JMP1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "16/pcrel", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_JMP2, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "pcrecl/16", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_JMPL1, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, special, "24/pcrell", FALSE, 0x00ffffff, 0x00ffffff, FALSE),
+  HOWTO (R_JMPL2, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "pc8/24", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_MOV24B1, 0, 1, 32, FALSE, 0, complain_overflow_bitfield, special, "relaxable mov.b:24", FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_MOV24B2, 0, 1, 8, FALSE, 0, complain_overflow_bitfield, special, "relaxed mov.b:24", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
 
   /* An indirect reference to a function.  This causes the function's address
      to be added to the function vector in lo-mem and puts the address of
      the function vector's entry in the jsr instruction.  */
-  HOWTO (R_MEM_INDIRECT, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "8/indirect", false, 0x000000ff, 0x000000ff, false),
+  HOWTO (R_MEM_INDIRECT, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "8/indirect", FALSE, 0x000000ff, 0x000000ff, FALSE),
 
   /* Internal reloc for relaxing.  This is created when a 16bit pc-relative
      branch is turned into an 8bit pc-relative branch.  */
-  HOWTO (R_PCRWORD_B, 0, 0, 8, true, 0, complain_overflow_bitfield, special, "relaxed bCC:16", false, 0x000000ff, 0x000000ff, false),
+  HOWTO (R_PCRWORD_B, 0, 0, 8, TRUE, 0, complain_overflow_bitfield, special, "relaxed bCC:16", FALSE, 0x000000ff, 0x000000ff, FALSE),
 
-  HOWTO (R_MOVL1, 0, 2, 32, false, 0, complain_overflow_bitfield,special, "32/24 relaxable move", false, 0xffffffff, 0xffffffff, false),
+  HOWTO (R_MOVL1, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,special, "32/24 relaxable move", FALSE, 0xffffffff, 0xffffffff, FALSE),
 
-  HOWTO (R_MOVL2, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "32/24 relaxed move", false, 0x0000ffff, 0x0000ffff, false),
+  HOWTO (R_MOVL2, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "32/24 relaxed move", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
 
-  HOWTO (R_BCC_INV, 0, 0, 8, true, 0, complain_overflow_signed, special, "DISP8 inverted", false, 0x000000ff, 0x000000ff, true),
+  HOWTO (R_BCC_INV, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "DISP8 inverted", FALSE, 0x000000ff, 0x000000ff, TRUE),
 
-  HOWTO (R_JMP_DEL, 0, 0, 8, true, 0, complain_overflow_signed, special, "Deleted jump", false, 0x000000ff, 0x000000ff, true),
+  HOWTO (R_JMP_DEL, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "Deleted jump", FALSE, 0x000000ff, 0x000000ff, TRUE),
 };
 
 /* Turn a howto into a reloc number.  */
@@ -401,7 +411,7 @@ reloc_processing (relent, reloc, symbols, abfd, section)
 #endif
 }
 
-static boolean
+static bfd_boolean
 h8300_symbol_address_p (abfd, input_section, address)
      bfd *abfd;
      asection *input_section;
@@ -421,10 +431,10 @@ h8300_symbol_address_p (abfd, input_section, address)
 	  && (input_section->output_section->vma
 	      + input_section->output_offset
 	      + p->value) == address)
-	return true;
+	return TRUE;
       s++;
     }
-  return false;
+  return FALSE;
 }
 
 /* If RELOC represents a relaxable instruction/reloc, change it into
@@ -505,7 +515,7 @@ h8300_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
 
 	     Only perform this optimisation for jumps (code 0x5a) not
 	     subroutine calls, as otherwise it could transform:
-	     
+
 	     	             mov.w   r0,r0
 	     	             beq     .L1
 	           	     jsr     @_bar
@@ -516,7 +526,7 @@ h8300_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
 	     	             bne     _bar
 	     	             rts
 	     	      _bar:  rts
-	     
+
 	     which changes the call (jsr) into a branch (bne).  */
 	  if (code == 0x5a
 	      && gap <= 126
@@ -1131,7 +1141,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 	  }
 
 	ftab = h8300_coff_hash_table (link_info)->funcvec_hash_table;
-	h = funcvec_hash_lookup (ftab, name, false, false);
+	h = funcvec_hash_lookup (ftab, name, FALSE, FALSE);
 
 	/* This shouldn't ever happen.  If it does that means we've got
 	   data corruption of some kind.  Aborting seems like a reasonable
@@ -1196,7 +1206,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
    from this BFD to the bfd linker hash table.  It may add a few
    selected static symbols to the bfd linker hash table.  */
 
-static boolean
+static bfd_boolean
 h8300_bfd_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1222,21 +1232,21 @@ h8300_bfd_link_add_symbols (abfd, info)
 	  || ! bfd_set_section_flags (abfd,
 				      h8300_coff_hash_table(info)->vectors_sec,
 				      flags))
-	return false;
+	return FALSE;
 
       /* Also create the vector hash table.  */
       amt = sizeof (struct funcvec_hash_table);
       funcvec_hash_table = (struct funcvec_hash_table *) bfd_alloc (abfd, amt);
 
       if (!funcvec_hash_table)
-	return false;
+	return FALSE;
 
       /* And initialize the funcvec hash table.  */
       if (!funcvec_hash_table_init (funcvec_hash_table, abfd,
 				    funcvec_hash_newfunc))
 	{
 	  bfd_release (abfd, funcvec_hash_table);
-	  return false;
+	  return FALSE;
 	}
 
       /* Store away a pointer to the funcvec hash table.  */
@@ -1264,7 +1274,7 @@ h8300_bfd_link_add_symbols (abfd, info)
 
       relocs = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
       if (!relocs)
-	return false;
+	return FALSE;
 
       /* The symbols should have been read in by _bfd_generic link_add_symbols
 	 call abovec, so we can cheat and use the pointer to them that was
@@ -1313,17 +1323,17 @@ h8300_bfd_link_add_symbols (abfd, info)
 
 	      /* Look this symbol up in the function vector hash table.  */
 	      ftab = h8300_coff_hash_table (info)->funcvec_hash_table;
-	      h = funcvec_hash_lookup (ftab, name, false, false);
+	      h = funcvec_hash_lookup (ftab, name, FALSE, FALSE);
 
 	      /* If this symbol isn't already in the hash table, add
 		 it and bump up the size of the hash table.  */
 	      if (h == NULL)
 		{
-		  h = funcvec_hash_lookup (ftab, name, true, true);
+		  h = funcvec_hash_lookup (ftab, name, TRUE, TRUE);
 		  if (h == NULL)
 		    {
 		      free (relocs);
-		      return false;
+		      return FALSE;
 		    }
 
 		  /* Bump the size of the vectors section.  Each vector
@@ -1354,7 +1364,7 @@ h8300_bfd_link_add_symbols (abfd, info)
       sec->contents = bfd_malloc (sec->_raw_size);
     }
 
-  return true;
+  return TRUE;
 }
 
 #define coff_reloc16_extra_cases h8300_reloc16_extra_cases
diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c
index 05a84015bff..c54d977f26b 100644
--- a/bfd/coff-h8500.c
+++ b/bfd/coff-h8500.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Hitachi H8/500 COFF binaries.
-   Copyright 1993, 1994, 1995, 1997, 1999, 2000, 2001
+   Copyright 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by Cygnus Support.
    Written by Steve Chamberlain, <sac@cygnus.com>.
@@ -36,38 +36,38 @@ static void extra_case       PARAMS ((bfd *, struct bfd_link_info *, struct bfd_
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
 
 static reloc_howto_type r_imm8 =
-HOWTO (R_H8500_IMM8, 0, 1, 8, false, 0,
-       complain_overflow_bitfield, 0, "r_imm8", true, 0x000000ff, 0x000000ff, false);
+HOWTO (R_H8500_IMM8, 0, 1, 8, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm8", TRUE, 0x000000ff, 0x000000ff, FALSE);
 
 static reloc_howto_type r_imm16 =
-HOWTO (R_H8500_IMM16, 0, 1, 16, false, 0,
-       complain_overflow_bitfield, 0, "r_imm16", true, 0x0000ffff, 0x0000ffff, false);
+HOWTO (R_H8500_IMM16, 0, 1, 16, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm16", TRUE, 0x0000ffff, 0x0000ffff, FALSE);
 
 static reloc_howto_type r_imm24 =
-HOWTO (R_H8500_IMM24, 0, 1, 24, false, 0,
-       complain_overflow_bitfield, 0, "r_imm24", true, 0x00ffffff, 0x00ffffff, false);
+HOWTO (R_H8500_IMM24, 0, 1, 24, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm24", TRUE, 0x00ffffff, 0x00ffffff, FALSE);
 
 static reloc_howto_type r_imm32 =
-HOWTO (R_H8500_IMM32, 0, 1, 32, false, 0,
-       complain_overflow_bitfield, 0, "r_imm32", true, 0xffffffff, 0xffffffff, false);
+HOWTO (R_H8500_IMM32, 0, 1, 32, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm32", TRUE, 0xffffffff, 0xffffffff, FALSE);
 
 static reloc_howto_type r_high8 =
-HOWTO (R_H8500_HIGH8, 0, 1, 8, false, 0,
-       complain_overflow_dont, 0, "r_high8", true, 0x000000ff, 0x000000ff, false);
+HOWTO (R_H8500_HIGH8, 0, 1, 8, FALSE, 0,
+       complain_overflow_dont, 0, "r_high8", TRUE, 0x000000ff, 0x000000ff, FALSE);
 
 static reloc_howto_type r_low16 =
-HOWTO (R_H8500_LOW16, 0, 1, 16, false, 0,
-       complain_overflow_dont, 0, "r_low16", true, 0x0000ffff, 0x0000ffff, false);
+HOWTO (R_H8500_LOW16, 0, 1, 16, FALSE, 0,
+       complain_overflow_dont, 0, "r_low16", TRUE, 0x0000ffff, 0x0000ffff, FALSE);
 
 static reloc_howto_type r_pcrel8 =
-HOWTO (R_H8500_PCREL8, 0, 1, 8, true, 0, complain_overflow_signed, 0, "r_pcrel8", true, 0, 0, true);
+HOWTO (R_H8500_PCREL8, 0, 1, 8, TRUE, 0, complain_overflow_signed, 0, "r_pcrel8", TRUE, 0, 0, TRUE);
 
 static reloc_howto_type r_pcrel16 =
-HOWTO (R_H8500_PCREL16, 0, 1, 16, true, 0, complain_overflow_signed, 0, "r_pcrel16", true, 0, 0, true);
+HOWTO (R_H8500_PCREL16, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "r_pcrel16", TRUE, 0, 0, TRUE);
 
 static reloc_howto_type r_high16 =
-HOWTO (R_H8500_HIGH16, 0, 1, 8, false, 0,
-       complain_overflow_dont, 0, "r_high16", true, 0x000ffff, 0x0000ffff, false);
+HOWTO (R_H8500_HIGH16, 0, 1, 8, FALSE, 0,
+       complain_overflow_dont, 0, "r_high16", TRUE, 0x000ffff, 0x0000ffff, FALSE);
 
 /* Turn a howto into a reloc number.  */
 
diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c
index dbeaef1535e..f083ae15a0f 100644
--- a/bfd/coff-i386.c
+++ b/bfd/coff-i386.c
@@ -179,12 +179,12 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 }
 
 #ifdef COFF_WITH_PE
-/* Return true if this relocation should appear in the output .reloc
+/* Return TRUE if this relocation should appear in the output .reloc
    section.  */
 
-static boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
 
-static boolean in_reloc_p (abfd, howto)
+static bfd_boolean in_reloc_p (abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type *howto;
 {
@@ -193,7 +193,7 @@ static boolean in_reloc_p (abfd, howto)
 #endif /* COFF_WITH_PE */
 
 #ifndef PCRELOFFSET
-#define PCRELOFFSET false
+#define PCRELOFFSET FALSE
 #endif
 
 static reloc_howto_type howto_table[] =
@@ -208,29 +208,29 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i386_reloc,	/* special_function */
 	 "dir32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
   /* PE IMAGE_REL_I386_DIR32NB relocation (7).	*/
   HOWTO (R_IMAGEBASE,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i386_reloc,	/* special_function */
 	 "rva32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   EMPTY_HOWTO (010),
   EMPTY_HOWTO (011),
   EMPTY_HOWTO (012),
@@ -243,12 +243,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i386_reloc,	/* special_function */
 	 "8",			/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -257,12 +257,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i386_reloc,	/* special_function */
 	 "16",			/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -271,12 +271,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i386_reloc,	/* special_function */
 	 "32",			/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -285,12 +285,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 coff_i386_reloc,	/* special_function */
 	 "DISP8",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -299,12 +299,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 coff_i386_reloc,	/* special_function */
 	 "DISP16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -313,12 +313,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 coff_i386_reloc,	/* special_function */
 	 "DISP32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
 	 PCRELOFFSET)		/* pcrel_offset */
@@ -388,11 +388,11 @@ static reloc_howto_type howto_table[] =
    and the regular routine is that we don't want to do anything for a
    relocateable link.  */
 
-static boolean coff_pe_i386_relocate_section
+static bfd_boolean coff_pe_i386_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 
-static boolean
+static bfd_boolean
 coff_pe_i386_relocate_section (output_bfd, info, input_bfd,
 			       input_section, contents, relocs, syms,
 			       sections)
@@ -406,7 +406,7 @@ coff_pe_i386_relocate_section (output_bfd, info, input_bfd,
      asection **sections;
 {
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   return _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
 					     input_section, contents,
@@ -539,15 +539,16 @@ coff_i386_reloc_type_lookup (abfd, code)
    a leading dot for local labels, so if TARGET_UNDERSCORE is defined
    we treat all symbols starting with L as local.  */
 
-static boolean coff_i386_is_local_label_name PARAMS ((bfd *, const char *));
+static bfd_boolean coff_i386_is_local_label_name
+  PARAMS ((bfd *, const char *));
 
-static boolean
+static bfd_boolean
 coff_i386_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == 'L')
-    return true;
+    return TRUE;
 
   return _bfd_coff_is_local_label_name (abfd, name);
 }
diff --git a/bfd/coff-i860.c b/bfd/coff-i860.c
index 1355d49d582..767692dc61e 100644
--- a/bfd/coff-i860.c
+++ b/bfd/coff-i860.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Intel 860 COFF files.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Created mostly by substituting "860" for "386" in coff-i386.c
    Harry Dolan <dolan@ssd.intel.com>, October 1995
@@ -136,7 +136,7 @@ coff_i860_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 }
 
 #ifndef PCRELOFFSET
-#define PCRELOFFSET false
+#define PCRELOFFSET FALSE
 #endif
 
 static reloc_howto_type howto_table[] =
@@ -151,29 +151,29 @@ static reloc_howto_type howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i860_reloc,       /* special_function */
 	 "dir32",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 true),                /* pcrel_offset */
+	 TRUE),                /* pcrel_offset */
   /* {7}, */
   HOWTO (R_IMAGEBASE,            /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i860_reloc,       /* special_function */
 	 "rva32",	           /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
   EMPTY_HOWTO (010),
   EMPTY_HOWTO (011),
   EMPTY_HOWTO (012),
@@ -185,12 +185,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i860_reloc,	/* special_function */
 	 "8",			/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -198,12 +198,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i860_reloc,	/* special_function */
 	 "16",			/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -211,12 +211,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_i860_reloc,	/* special_function */
 	 "32",			/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -224,12 +224,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 coff_i860_reloc,	/* special_function */
 	 "DISP8",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -237,12 +237,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 coff_i860_reloc,	/* special_function */
 	 "DISP16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 PCRELOFFSET),		/* pcrel_offset */
@@ -250,12 +250,12 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 coff_i860_reloc,	/* special_function */
 	 "DISP32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
 	 PCRELOFFSET)		/* pcrel_offset */
diff --git a/bfd/coff-i960.c b/bfd/coff-i960.c
index d8948be6fa0..eee6718a5ef 100644
--- a/bfd/coff-i960.c
+++ b/bfd/coff-i960.c
@@ -1,6 +1,6 @@
 /* BFD back-end for Intel 960 COFF files.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001,
+   2002 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -29,21 +29,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "coff/internal.h"
 #include "libcoff.h"		/* to allow easier abstraction-breaking */
 
-static boolean coff_i960_is_local_label_name PARAMS ((bfd *, const char *));
+static bfd_boolean coff_i960_is_local_label_name
+  PARAMS ((bfd *, const char *));
 static bfd_reloc_status_type optcall_callback
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type coff_i960_relocate
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static reloc_howto_type *coff_i960_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-static boolean coff_i960_start_final_link
+static bfd_boolean coff_i960_start_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean coff_i960_relocate_section
+static bfd_boolean coff_i960_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
-static boolean coff_i960_adjust_symndx
+static bfd_boolean coff_i960_adjust_symndx
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-	   struct internal_reloc *, boolean *));
+	   struct internal_reloc *, bfd_boolean *));
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
 #define COFF_ALIGN_IN_SECTION_HEADER 1
@@ -59,7 +60,7 @@ static boolean coff_i960_adjust_symndx
 
 /* This set of local label names is taken from gas.  */
 
-static boolean
+static bfd_boolean
 coff_i960_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -266,15 +267,15 @@ coff_i960_relocate (abfd, reloc_entry, symbol, data, input_section,
 }
 
 static reloc_howto_type howto_rellong =
-  HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,false, 0,
-	 complain_overflow_bitfield, coff_i960_relocate,"rellong", true,
+  HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,FALSE, 0,
+	 complain_overflow_bitfield, coff_i960_relocate,"rellong", TRUE,
 	 0xffffffff, 0xffffffff, 0);
 static reloc_howto_type howto_iprmed =
-  HOWTO (R_IPRMED, 0, 2, 24,true,0, complain_overflow_signed,
-	 coff_i960_relocate, "iprmed ", true, 0x00ffffff, 0x00ffffff, 0);
+  HOWTO (R_IPRMED, 0, 2, 24,TRUE,0, complain_overflow_signed,
+	 coff_i960_relocate, "iprmed ", TRUE, 0x00ffffff, 0x00ffffff, 0);
 static reloc_howto_type howto_optcall =
-  HOWTO (R_OPTCALL, 0,2,24,true,0, complain_overflow_signed,
-	 optcall_callback, "optcall", true, 0x00ffffff, 0x00ffffff, 0);
+  HOWTO (R_OPTCALL, 0,2,24,TRUE,0, complain_overflow_signed,
+	 optcall_callback, "optcall", TRUE, 0x00ffffff, 0x00ffffff, 0);
 
 static reloc_howto_type *
 coff_i960_reloc_type_lookup (abfd, code)
@@ -318,7 +319,7 @@ coff_i960_reloc_type_lookup (abfd, code)
    called at the start of the linking process, and it creates the
    necessary symbols.  */
 
-static boolean
+static bfd_boolean
 coff_i960_start_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -328,14 +329,14 @@ coff_i960_start_final_link (abfd, info)
   bfd_byte *esym;
 
   if (! info->relocateable)
-    return true;
+    return TRUE;
 
   esym = (bfd_byte *) bfd_malloc (symesz);
   if (esym == NULL)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   for (o = abfd->sections; o != NULL; o = o->next)
     {
@@ -353,7 +354,7 @@ coff_i960_start_final_link (abfd, info)
       if (bfd_bwrite (esym, symesz, abfd) != symesz)
 	{
 	  free (esym);
-	  return false;
+	  return FALSE;
 	}
 
       obj_raw_syment_count (abfd) += 1;
@@ -361,12 +362,12 @@ coff_i960_start_final_link (abfd, info)
 
   free (esym);
 
-  return true;
+  return TRUE;
 }
 
 /* The reloc processing routine for the optimized COFF linker.  */
 
-static boolean
+static bfd_boolean
 coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
 			    contents, relocs, syms, sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -392,7 +393,7 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
       bfd_vma val;
       reloc_howto_type *howto;
       bfd_reloc_status_type rstat = bfd_reloc_ok;
-      boolean done;
+      bfd_boolean done;
 
       symndx = rel->r_symndx;
 
@@ -419,7 +420,7 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
 	case 27: howto = &howto_optcall; break;
 	default:
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       val = 0;
@@ -458,12 +459,12 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      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;
 	    }
 	}
 
-      done = false;
+      done = FALSE;
 
       if (howto->type == R_OPTCALL && ! info->relocateable && symndx != -1)
 	{
@@ -485,7 +486,7 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
 		      _("uncertain calling convention for non-COFF symbol"),
 		      input_bfd, input_section,
 		      rel->r_vaddr - input_section->vma)))
-		return false;
+		return FALSE;
 	      break;
 	    case C_LEAFSTAT:
 	    case C_LEAFEXT:
@@ -521,7 +522,7 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
 		bfd_put_32 (input_bfd,
 			    (bfd_vma) word,
 			    contents + (rel->r_vaddr - input_section->vma));
-		done = true;
+		done = TRUE;
 	      }
 	      break;
 	    case C_SCALL:
@@ -559,47 +560,47 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
 	      {
 		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;
 }
 
 /* Adjust the symbol index of any reloc against a global symbol to
    instead be a reloc against the internal symbol we created specially
    for the section.  */
 
-static boolean
+static bfd_boolean
 coff_i960_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
      bfd *obfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      bfd *ibfd;
      asection *sec ATTRIBUTE_UNUSED;
      struct internal_reloc *irel;
-     boolean *adjustedp;
+     bfd_boolean *adjustedp;
 {
   struct coff_link_hash_entry *h;
 
-  *adjustedp = false;
+  *adjustedp = FALSE;
 
   h = obj_coff_sym_hashes (ibfd)[irel->r_symndx];
   if (h == NULL
       || (h->root.type != bfd_link_hash_defined
 	  && h->root.type != bfd_link_hash_defweak))
-    return true;
+    return TRUE;
 
   irel->r_symndx = h->root.u.def.section->output_section->target_index - 1;
-  *adjustedp = true;
+  *adjustedp = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 #define coff_bfd_is_local_label_name coff_i960_is_local_label_name
diff --git a/bfd/coff-ia64.c b/bfd/coff-ia64.c
index 76d1bf6cc5e..2b5b557ddbb 100644
--- a/bfd/coff-ia64.c
+++ b/bfd/coff-ia64.c
@@ -1,5 +1,5 @@
 /* BFD back-end for HP/Intel IA-64 COFF files.
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -49,17 +49,17 @@ static reloc_howto_type howto_table[] =
 	    (cache_ptr)->howto = howto_table + (dst)->r_type;
 
 #ifdef COFF_WITH_PE
-/* Return true if this relocation should
+/* Return TRUE if this relocation should
    appear in the output .reloc section.  */
 
-static boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
 
-static boolean
+static bfd_boolean
 in_reloc_p(abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type *howto ATTRIBUTE_UNUSED;
 {
-  return 0;			/* We don't do relocs for now...  */
+  return FALSE;			/* We don't do relocs for now...  */
 }
 #endif
 
diff --git a/bfd/coff-m68k.c b/bfd/coff-m68k.c
index 397d98378d7..c2c1c295c86 100644
--- a/bfd/coff-m68k.c
+++ b/bfd/coff-m68k.c
@@ -1,6 +1,6 @@
 /* BFD back-end for Motorola 68000 COFF binaries.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999,
-   2000, 2001
+   2000, 2001, 2002
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -67,19 +67,20 @@ static reloc_howto_type *m68kcoff_common_addend_rtype_to_howto
 #define RELOC_SPECIAL_FN m68kcoff_common_addend_special_fn
 #endif
 
-static boolean m68k_coff_is_local_label_name PARAMS ((bfd *, const char *));
+static bfd_boolean m68k_coff_is_local_label_name
+  PARAMS ((bfd *, const char *));
 
 /* On the delta, a symbol starting with L% is local.  We won't see
    such a symbol on other platforms, so it should be safe to always
    consider it local here.  */
 
-static boolean
+static bfd_boolean
 m68k_coff_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == 'L' && name[1] == '%')
-    return true;
+    return TRUE;
 
   return _bfd_coff_is_local_label_name (abfd, name);
 }
@@ -100,13 +101,13 @@ static
 #endif
 reloc_howto_type m68kcoff_howto_table[] =
   {
-    HOWTO (R_RELBYTE,	       0,  0,  	8,  false, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "8",	true, 0x000000ff,0x000000ff, false),
-    HOWTO (R_RELWORD,	       0,  1, 	16, false, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "16",	true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (R_RELLONG,	       0,  2, 	32, false, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "32",	true, 0xffffffff,0xffffffff, false),
-    HOWTO (R_PCRBYTE,	       0,  0, 	8,  true,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP8",    true, 0x000000ff,0x000000ff, false),
-    HOWTO (R_PCRWORD,	       0,  1, 	16, true,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP16",   true, 0x0000ffff,0x0000ffff, false),
-    HOWTO (R_PCRLONG,	       0,  2, 	32, true,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP32",   true, 0xffffffff,0xffffffff, false),
-    HOWTO (R_RELLONG_NEG,      0, -2, 	32, false, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "-32",	true, 0xffffffff,0xffffffff, false),
+    HOWTO (R_RELBYTE,	       0,  0,  	8,  FALSE, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "8",	TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (R_RELWORD,	       0,  1, 	16, FALSE, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (R_RELLONG,	       0,  2, 	32, FALSE, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (R_PCRBYTE,	       0,  0, 	8,  TRUE,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP8",    TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (R_PCRWORD,	       0,  1, 	16, TRUE,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP16",   TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (R_PCRLONG,	       0,  2, 	32, TRUE,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP32",   TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (R_RELLONG_NEG,      0, -2, 	32, FALSE, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "-32",	TRUE, 0xffffffff,0xffffffff, FALSE),
   };
 #endif /* not ONLY_DECLARE_RELOCS */
 
@@ -430,7 +431,7 @@ m68kcoff_common_addend_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
    after the add_symbols entry point has been called for all the
    objects, and before the final_link entry point is called.  */
 
-boolean
+bfd_boolean
 bfd_m68k_coff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -449,19 +450,19 @@ bfd_m68k_coff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
   *errmsg = NULL;
 
   if (datasec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   extsyms = obj_coff_external_syms (abfd);
   symesz = bfd_coff_symesz (abfd);
 
-  irel = _bfd_coff_read_internal_relocs (abfd, datasec, true, NULL, false,
+  irel = _bfd_coff_read_internal_relocs (abfd, datasec, TRUE, NULL, FALSE,
 					 NULL);
   irelend = irel + datasec->reloc_count;
 
   amt = (bfd_size_type) datasec->reloc_count * 12;
   relsec->contents = (bfd_byte *) bfd_alloc (abfd, amt);
   if (relsec->contents == NULL)
-    return false;
+    return FALSE;
 
   p = relsec->contents;
 
@@ -480,7 +481,7 @@ bfd_m68k_coff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
 	{
 	  *errmsg = _("unsupported reloc type");
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       if (irel->r_symndx == -1)
@@ -512,7 +513,7 @@ bfd_m68k_coff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
 	strncpy (p + 4, targetsec->output_section->name, 8);
     }
 
-  return true;
+  return TRUE;
 }
 #endif /* neither ONLY_DECLARE_RELOCS not STATIC_RELOCS  */
 
diff --git a/bfd/coff-m88k.c b/bfd/coff-m88k.c
index 05c47cc9d0b..f2d7ecc353f 100644
--- a/bfd/coff-m88k.c
+++ b/bfd/coff-m88k.c
@@ -1,6 +1,6 @@
 /* BFD back-end for Motorola 88000 COFF "Binary Compatability Standard" files.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
-   2001
+   2001, 2002
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "coff/internal.h"
 #include "libcoff.h"
 
-static boolean m88k_is_local_label_name PARAMS ((bfd *, const char *));
+static bfd_boolean m88k_is_local_label_name PARAMS ((bfd *, const char *));
 static bfd_reloc_status_type m88k_special_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
@@ -44,7 +44,7 @@ static void reloc_processing
 
 #define coff_bfd_is_local_label_name m88k_is_local_label_name
 
-static boolean
+static bfd_boolean
 m88k_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -152,85 +152,85 @@ static reloc_howto_type howto_table[] =
 	 02,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 true,				/* pc_relative */
+	 TRUE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_signed,	/* complain_on_overflow */
 	 m88k_special_reloc,		/* special_function */
 	 "PCR16L",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x0000ffff,			/* src_mask */
 	 0x0000ffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 
   HOWTO (R_PCR26L,			/* type */
 	 02,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 26,				/* bitsize */
-	 true,				/* pc_relative */
+	 TRUE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_signed,	/* complain_on_overflow */
 	 m88k_special_reloc,		/* special_function */
 	 "PCR26L",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x03ffffff,			/* src_mask */
 	 0x03ffffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 
   HOWTO (R_VRT16,			/* type */
 	 00,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 m88k_special_reloc,		/* special_function */
 	 "VRT16",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x0000ffff,			/* src_mask */
 	 0x0000ffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 
   HOWTO (R_HVRT16,			/* type */
 	 16,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m88k_special_reloc,		/* special_function */
 	 "HVRT16",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x0000ffff,			/* src_mask */
 	 0x0000ffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 
   HOWTO (R_LVRT16,			/* type */
 	 00,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m88k_special_reloc,		/* special_function */
 	 "LVRT16",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x0000ffff,			/* src_mask */
 	 0x0000ffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 
   HOWTO (R_VRT32,			/* type */
 	 00,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 32,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 m88k_special_reloc,		/* special_function */
 	 "VRT32",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffffffff,			/* src_mask */
 	 0xffffffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 };
 
 /* Code to turn an external r_type into a pointer to an entry in the
diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c
index 783ee57aa36..7847bb751b5 100644
--- a/bfd/coff-mcore.c
+++ b/bfd/coff-mcore.c
@@ -37,25 +37,26 @@ Boston, MA 02111-1307, USA.  */
 
 /* This file is compiled more than once, but we only compile the
    final_link routine once.  */
-extern boolean mcore_bfd_coff_final_link
+extern bfd_boolean mcore_bfd_coff_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 #if 0
-static struct bfd_link_hash_table * coff_mcore_link_hash_table_create
+static struct bfd_link_hash_table *coff_mcore_link_hash_table_create
   PARAMS ((bfd *));
 #endif
-static bfd_reloc_status_type        mcore_coff_unsupported_reloc
+static bfd_reloc_status_type mcore_coff_unsupported_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean                      coff_mcore_relocate_section
+static bfd_boolean coff_mcore_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
-static reloc_howto_type *           mcore_coff_reloc_type_lookup
+static reloc_howto_type *mcore_coff_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-static reloc_howto_type *           coff_mcore_rtype_to_howto
+static reloc_howto_type *coff_mcore_rtype_to_howto
   PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
+	   struct coff_link_hash_entry *, struct internal_syment *,
+	   bfd_vma *));
 static void mcore_emit_base_file_entry
   PARAMS ((struct bfd_link_info *, bfd *, asection *, bfd_vma));
-static boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
 
 /* The NT loader points the toc register to &toc + 32768, in order to
    use the complete range of a 16-bit displacement. We have to adjust
@@ -77,29 +78,29 @@ static reloc_howto_type mcore_coff_howto_table[] =
 	 0,	                 /* rightshift */
 	 0,	                 /* size (0 = byte, 1 = short, 2 = long) */
 	 0,	                 /* bitsize */
-	 false,	                 /* pc_relative */
+	 FALSE,	                 /* pc_relative */
 	 0,	                 /* bitpos */
 	 complain_overflow_dont, /* dont complain_on_overflow */
 	 NULL,		         /* special_function */
 	 "ABSOLUTE",             /* name */
-	 false,	                 /* partial_inplace */
+	 FALSE,	                 /* partial_inplace */
 	 0x00,	 	         /* src_mask */
 	 0x00,        		 /* dst_mask */
-	 false),                 /* pcrel_offset */
+	 FALSE),                 /* pcrel_offset */
 
   HOWTO (IMAGE_REL_MCORE_ADDR32,/* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 NULL,		        /* special_function */
 	 "ADDR32",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* 8 bits + 2 zero bits; jmpi/jsri/lrw instructions.
      Should not appear in object files.  */
@@ -107,15 +108,15 @@ static reloc_howto_type mcore_coff_howto_table[] =
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mcore_coff_unsupported_reloc, /* special_function */
 	 "IMM8BY4",             /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* bsr/bt/bf/br instructions; 11 bits + 1 zero bit
      Span 2k instructions == 4k bytes.
@@ -124,45 +125,45 @@ static reloc_howto_type mcore_coff_howto_table[] =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 11,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 NULL,	                /* special_function */
 	 "IMM11BY2",            /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0,			/* src_mask */
 	 0x7ff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 4 bits + 1 zero bit; 'loopt' instruction only; unsupported.  */
   HOWTO (IMAGE_REL_MCORE_PCREL_IMM4BY2,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 4,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mcore_coff_unsupported_reloc, /* special_function */
 	 "IMM4BY2",              /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 32-bit pc-relative. Eventually this will help support PIC code.  */
   HOWTO (IMAGE_REL_MCORE_PCREL_32,/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 NULL,	                /* special_function */
 	 "PCREL_32",	        /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Like PCREL_IMM11BY2, this relocation indicates that there is a
      'jsri' at the specified address. There is a separate relocation
@@ -175,29 +176,29 @@ static reloc_howto_type mcore_coff_howto_table[] =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 11,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 NULL,	                /* special_function */
 	 "JSR_IMM11BY2",        /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0,			/* src_mask */
 	 0x7ff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (IMAGE_REL_MCORE_RVA,   /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 NULL,                  /* special_function */
 	 "MCORE_RVA",           /* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true)			/* pcrel_offset */
+	 TRUE)			/* pcrel_offset */
 };
 
 /* Extend the coff_link_hash_table structure with a few M*Core specific fields.
@@ -358,10 +359,10 @@ coff_mcore_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
   return howto;
 }
 
-/* Return true if this relocation should appear in the output .reloc section.
+/* Return TRUE if this relocation should appear in the output .reloc section.
    This function is referenced in pe_mkobject in peicode.h.  */
 
-static boolean
+static bfd_boolean
 in_reloc_p (abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type * howto;
@@ -370,7 +371,7 @@ in_reloc_p (abfd, howto)
 }
 
 /* The reloc processing routine for the optimized COFF linker.  */
-static boolean
+static bfd_boolean
 coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, syms, sections)
      bfd * output_bfd;
@@ -384,14 +385,14 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
 {
   struct internal_reloc * rel;
   struct internal_reloc * relend;
-  boolean hihalf;
+  bfd_boolean hihalf;
   bfd_vma hihalf_val;
 
   /* If we are performing a relocateable link, we don't need to do a
      thing.  The caller will take care of adjusting the reloc
      addresses and symbol indices.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   /* Check if we have the same endianess */
   if (   input_bfd->xvec->byteorder != output_bfd->xvec->byteorder
@@ -404,10 +405,10 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
          bfd_big_endian (output_bfd) ? _("big endian") : _("little endian"));
 
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
-  hihalf = false;
+  hihalf = FALSE;
   hihalf_val = 0;
 
   rel = relocs;
@@ -446,7 +447,7 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
       howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
 				       sym, & addend);
       if (howto == NULL)
-	return false;
+	return FALSE;
 
       val = 0;
 
@@ -492,8 +493,8 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      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;
 	    }
 
 	  my_name = h->root.root.string;
@@ -508,7 +509,7 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
 	  _bfd_error_handler (_("%s: unsupported relocation type 0x%02x"),
 			      bfd_archive_filename (input_bfd), r_type);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 
 	case IMAGE_REL_MCORE_ABSOLUTE:
 	  fprintf (stderr,
@@ -560,11 +561,11 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
 		 (info, my_name, howto->name,
 		  (bfd_vma) 0, input_bfd,
 		  input_section, rel->r_vaddr - input_section->vma)))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Tailor coffcode.h -- macro heaven.  */
diff --git a/bfd/coff-mips.c b/bfd/coff-mips.c
index 69fcc69aa68..6bb1b9f3ab9 100644
--- a/bfd/coff-mips.c
+++ b/bfd/coff-mips.c
@@ -35,85 +35,50 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Prototypes for static functions.  */
 
-static boolean mips_ecoff_bad_format_hook PARAMS ((bfd *abfd, PTR filehdr));
-static void mips_ecoff_swap_reloc_in PARAMS ((bfd *, PTR,
-					      struct internal_reloc *));
-static void mips_ecoff_swap_reloc_out PARAMS ((bfd *,
-					       const struct internal_reloc *,
-					       PTR));
-static void mips_adjust_reloc_in PARAMS ((bfd *,
-					  const struct internal_reloc *,
-					  arelent *));
-static void mips_adjust_reloc_out PARAMS ((bfd *, const arelent *,
-					   struct internal_reloc *));
-static bfd_reloc_status_type mips_generic_reloc PARAMS ((bfd *abfd,
-							 arelent *reloc,
-							 asymbol *symbol,
-							 PTR data,
-							 asection *section,
-							 bfd *output_bfd,
-							 char **error));
-static bfd_reloc_status_type mips_refhi_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_reflo_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_gprel_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_relhi_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_rello_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_switch_reloc PARAMS ((bfd *abfd,
-							arelent *reloc,
-							asymbol *symbol,
-							PTR data,
-							asection *section,
-							bfd *output_bfd,
-							char **error));
-static void mips_relocate_hi PARAMS ((struct internal_reloc *refhi,
-				      struct internal_reloc *reflo,
-				      bfd *input_bfd,
-				      asection *input_section,
-				      bfd_byte *contents,
-				      size_t adjust,
-				      bfd_vma relocation,
-				      boolean pcrel));
-static boolean mips_relocate_section PARAMS ((bfd *, struct bfd_link_info *,
-					      bfd *, asection *,
-					      bfd_byte *, PTR));
-static boolean mips_read_relocs PARAMS ((bfd *, asection *));
-static boolean mips_relax_section PARAMS ((bfd *, asection *,
-					   struct bfd_link_info *,
-					   boolean *));
-static boolean mips_relax_pcrel16 PARAMS ((struct bfd_link_info *, bfd *,
-					   asection *,
-					   struct ecoff_link_hash_entry *,
-					   bfd_byte *, bfd_vma));
+static bfd_boolean mips_ecoff_bad_format_hook
+  PARAMS ((bfd *abfd, PTR filehdr));
+static void mips_ecoff_swap_reloc_in
+  PARAMS ((bfd *, PTR, struct internal_reloc *));
+static void mips_ecoff_swap_reloc_out
+  PARAMS ((bfd *, const struct internal_reloc *, PTR));
+static void mips_adjust_reloc_in
+  PARAMS ((bfd *, const struct internal_reloc *, arelent *));
+static void mips_adjust_reloc_out
+  PARAMS ((bfd *, const arelent *, struct internal_reloc *));
+static bfd_reloc_status_type mips_generic_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_refhi_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_reflo_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_gprel_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_relhi_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_rello_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_switch_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static void mips_relocate_hi
+  PARAMS ((struct internal_reloc *refhi, struct internal_reloc *reflo,
+	   bfd *input_bfd, asection *input_section, bfd_byte *contents,
+	   size_t adjust, bfd_vma relocation, bfd_boolean pcrel));
+static bfd_boolean mips_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, PTR));
+static bfd_boolean mips_read_relocs
+  PARAMS ((bfd *, asection *));
+static bfd_boolean mips_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean mips_relax_pcrel16
+  PARAMS ((struct bfd_link_info *, bfd *, asection *,
+	   struct ecoff_link_hash_entry *, bfd_byte *, bfd_vma));
 static reloc_howto_type *mips_bfd_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 
@@ -152,52 +117,52 @@ static reloc_howto_type mips_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "IGNORE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit reference to a symbol, normally from a data section.  */
   HOWTO (MIPS_R_REFHALF,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_generic_reloc,	/* special_function */
 	 "REFHALF",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit reference to a symbol, normally from a data section.  */
   HOWTO (MIPS_R_REFWORD,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_generic_reloc,	/* special_function */
 	 "REFWORD",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 26 bit absolute jump address.  */
   HOWTO (MIPS_R_JMPADDR,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 			/* This needs complex overflow
@@ -205,10 +170,10 @@ static reloc_howto_type mips_howto_table[] =
 				   bits must match the PC.  */
 	 mips_generic_reloc,	/* special_function */
 	 "JMPADDR",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The high 16 bits of a symbol value.  Handled by the function
      mips_refhi_reloc.  */
@@ -216,30 +181,30 @@ static reloc_howto_type mips_howto_table[] =
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_refhi_reloc,	/* special_function */
 	 "REFHI",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The low 16 bits of a symbol value.  */
   HOWTO (MIPS_R_REFLO,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_reflo_reloc,	/* special_function */
 	 "REFLO",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A reference to an offset from the gp register.  Handled by the
      function mips_gprel_reloc.  */
@@ -247,15 +212,15 @@ static reloc_howto_type mips_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_gprel_reloc,	/* special_function */
 	 "GPREL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A reference to a literal using an offset from the gp register.
      Handled by the function mips_gprel_reloc.  */
@@ -263,15 +228,15 @@ static reloc_howto_type mips_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_gprel_reloc,	/* special_function */
 	 "LITERAL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (8),
   EMPTY_HOWTO (9),
@@ -286,15 +251,15 @@ static reloc_howto_type mips_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_generic_reloc,	/* special_function */
 	 "PCREL16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* This reloc is a Cygnus extension used when generating position
      independent code for embedded systems.  It represents the high 16
@@ -307,15 +272,15 @@ static reloc_howto_type mips_howto_table[] =
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_relhi_reloc,	/* special_function */
 	 "RELHI",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* This reloc is a Cygnus extension used when generating position
      independent code for embedded systems.  It represents the low 16
@@ -324,15 +289,15 @@ static reloc_howto_type mips_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_rello_reloc,	/* special_function */
 	 "RELLO",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   EMPTY_HOWTO (15),
   EMPTY_HOWTO (16),
@@ -352,15 +317,15 @@ static reloc_howto_type mips_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_switch_reloc,	/* special_function */
 	 "SWITCH",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true)			/* pcrel_offset */
+	 TRUE)			/* pcrel_offset */
 };
 
 #define MIPS_HOWTO_COUNT \
@@ -384,7 +349,7 @@ static reloc_howto_type mips_howto_table[] =
 
 /* See whether the magic number matches.  */
 
-static boolean
+static bfd_boolean
 mips_ecoff_bad_format_hook (abfd, filehdr)
      bfd *abfd;
      PTR filehdr;
@@ -395,7 +360,7 @@ mips_ecoff_bad_format_hook (abfd, filehdr)
     {
     case MIPS_MAGIC_1:
       /* I don't know what endianness this implies.  */
-      return true;
+      return TRUE;
 
     case MIPS_MAGIC_BIG:
     case MIPS_MAGIC_BIG2:
@@ -408,7 +373,7 @@ mips_ecoff_bad_format_hook (abfd, filehdr)
       return bfd_little_endian (abfd);
 
     default:
-      return false;
+      return FALSE;
     }
 }
 
@@ -793,7 +758,7 @@ mips_gprel_reloc (abfd,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_vma gp;
   bfd_vma relocation;
   unsigned long val;
@@ -812,10 +777,10 @@ mips_gprel_reloc (abfd,
     }
 
   if (output_bfd != (bfd *) NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1185,7 +1150,7 @@ mips_relocate_hi (refhi, reflo, input_bfd, input_section, contents, adjust,
      bfd_byte *contents;
      size_t adjust;
      bfd_vma relocation;
-     boolean pcrel;
+     bfd_boolean pcrel;
 {
   unsigned long insn;
   unsigned long val;
@@ -1229,7 +1194,7 @@ mips_relocate_hi (refhi, reflo, input_bfd, input_section, contents, adjust,
 
 /* Relocate a section while linking a MIPS ECOFF file.  */
 
-static boolean
+static bfd_boolean
 mips_relocate_section (output_bfd, info, input_bfd, input_section,
 		       contents, external_relocs)
      bfd *output_bfd;
@@ -1242,13 +1207,13 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
   asection **symndx_to_section;
   struct ecoff_link_hash_entry **sym_hashes;
   bfd_vma gp;
-  boolean gp_undefined;
+  bfd_boolean gp_undefined;
   size_t adjust;
   long *offsets;
   struct external_reloc *ext_rel;
   struct external_reloc *ext_rel_end;
   unsigned int i;
-  boolean got_lo;
+  bfd_boolean got_lo;
   struct internal_reloc lo_int_rel;
   bfd_size_type amt;
 
@@ -1264,7 +1229,7 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
       amt = NUM_RELOC_SECTIONS * sizeof (asection *);
       symndx_to_section = (asection **) bfd_alloc (input_bfd, amt);
       if (!symndx_to_section)
-	return false;
+	return FALSE;
 
       symndx_to_section[RELOC_SECTION_NONE] = NULL;
       symndx_to_section[RELOC_SECTION_TEXT] =
@@ -1299,11 +1264,11 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
 
   gp = _bfd_get_gp_value (output_bfd);
   if (gp == 0)
-    gp_undefined = true;
+    gp_undefined = TRUE;
   else
-    gp_undefined = false;
+    gp_undefined = FALSE;
 
-  got_lo = false;
+  got_lo = FALSE;
 
   adjust = 0;
 
@@ -1317,7 +1282,7 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
   for (i = 0; ext_rel < ext_rel_end; ext_rel++, i++)
     {
       struct internal_reloc int_rel;
-      boolean use_lo = false;
+      bfd_boolean use_lo = FALSE;
       bfd_vma addend;
       reloc_howto_type *howto;
       struct ecoff_link_hash_entry *h = NULL;
@@ -1330,7 +1295,7 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
       else
 	{
 	  int_rel = lo_int_rel;
-	  got_lo = false;
+	  got_lo = FALSE;
 	}
 
       BFD_ASSERT (int_rel.r_type
@@ -1365,9 +1330,9 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
 	      && int_rel.r_extern == lo_int_rel.r_extern
 	      && int_rel.r_symndx == lo_int_rel.r_symndx)
 	    {
-	      use_lo = true;
+	      use_lo = TRUE;
 	      if (lo_ext_rel == ext_rel + 1)
-		got_lo = true;
+		got_lo = TRUE;
 	    }
 	}
 
@@ -1432,11 +1397,11 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
 		     (info, _("GP relative relocation used when GP not defined"),
 		      input_bfd, input_section,
 		      int_rel.r_vaddr - input_section->vma)))
-		return false;
+		return FALSE;
 	      /* Only give the error once per link.  */
 	      gp = 4;
 	      _bfd_set_gp_value (output_bfd, gp);
-	      gp_undefined = false;
+	      gp_undefined = FALSE;
 	    }
 	  if (! int_rel.r_extern)
 	    {
@@ -1511,7 +1476,7 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
 					 + (int_rel.r_vaddr
 					    - input_section->vma)
 					 + adjust)))
-		return false;
+		return FALSE;
 
 	      /* We must adjust everything else up a notch.  */
 	      adjust += PCREL16_EXPANSION_ADJUSTMENT;
@@ -1694,7 +1659,7 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
 			     (info, h->root.root.string, input_bfd,
 			      input_section,
 			      int_rel.r_vaddr - input_section->vma)))
-			return false;
+			return FALSE;
 		      int_rel.r_symndx = 0;
 		    }
 		  relocation = 0;
@@ -1778,8 +1743,8 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
 		  if (! ((*info->callbacks->undefined_symbol)
 			 (info, h->root.root.string, input_bfd,
 			  input_section,
-			  int_rel.r_vaddr - input_section->vma, true)))
-		    return false;
+			  int_rel.r_vaddr - input_section->vma, TRUE)))
+		    return FALSE;
 		  relocation = 0;
 		}
 	    }
@@ -1860,19 +1825,19 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
 		       (info, name, howto->name, (bfd_vma) 0,
 			input_bfd, input_section,
 			int_rel.r_vaddr - input_section->vma)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Read in the relocs for a section.  */
 
-static boolean
+static bfd_boolean
 mips_read_relocs (abfd, sec)
      bfd *abfd;
      asection *sec;
@@ -1886,7 +1851,7 @@ mips_read_relocs (abfd, sec)
       amt = sizeof (struct ecoff_section_tdata);
       sec->used_by_bfd = (PTR) bfd_alloc (abfd, amt);
       if (sec->used_by_bfd == NULL)
-	return false;
+	return FALSE;
 
       section_tdata = ecoff_section_data (abfd, sec);
       section_tdata->external_relocs = NULL;
@@ -1900,14 +1865,14 @@ mips_read_relocs (abfd, sec)
       amt *= sec->reloc_count;
       section_tdata->external_relocs = (PTR) bfd_alloc (abfd, amt);
       if (section_tdata->external_relocs == NULL && amt != 0)
-	return false;
+	return FALSE;
 
       if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0
 	  || bfd_bread (section_tdata->external_relocs, amt, abfd) != amt)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Relax a section when linking a MIPS ECOFF file.  This is used for
@@ -1934,12 +1899,12 @@ mips_read_relocs (abfd, sec)
    routine and the mips_relocate_section routine is the table of
    offsets.  */
 
-static boolean
+static bfd_boolean
 mips_relax_section (abfd, sec, info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *info;
-     boolean *again;
+     bfd_boolean *again;
 {
   struct ecoff_section_tdata *section_tdata;
   bfd_byte *contents = NULL;
@@ -1949,21 +1914,21 @@ mips_relax_section (abfd, sec, info, again)
   unsigned int i;
 
   /* Assume we are not going to need another pass.  */
-  *again = false;
+  *again = FALSE;
 
   /* If we are not generating an ECOFF file, this is much too
      confusing to deal with.  */
   if (info->hash->creator->flavour != bfd_get_flavour (abfd))
-    return true;
+    return TRUE;
 
   /* If there are no relocs, there is nothing to do.  */
   if (sec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   /* We are only interested in PC relative relocs, and why would there
      ever be one from anything but the .text section?  */
   if (strcmp (bfd_get_section_name (abfd, sec), ".text") != 0)
-    return true;
+    return TRUE;
 
   /* Read in the relocs, if we haven't already got them.  */
   section_tdata = ecoff_section_data (abfd, sec);
@@ -2108,7 +2073,7 @@ mips_relax_section (abfd, sec, info, again)
 	 symbols in the object file following this location.  */
 
       sec->_cooked_size += PCREL16_EXPANSION_ADJUSTMENT;
-      *again = true;
+      *again = TRUE;
 
       if (offsets == (long *) NULL)
 	{
@@ -2306,12 +2271,12 @@ mips_relax_section (abfd, sec, info, again)
   if (contents != (bfd_byte *) NULL && ! info->keep_memory)
     free (contents);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (contents != (bfd_byte *) NULL && ! info->keep_memory)
     free (contents);
-  return false;
+  return FALSE;
 }
 
 /* This routine is called from mips_relocate_section when a PC
@@ -2319,7 +2284,7 @@ mips_relax_section (abfd, sec, info, again)
    It handles all the details of the expansion, including resolving
    the reloc.  */
 
-static boolean
+static bfd_boolean
 mips_relax_pcrel16 (info, input_bfd, input_section, h, location, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      bfd *input_bfd;
@@ -2356,7 +2321,7 @@ mips_relax_pcrel16 (info, input_bfd, input_section, h, location, address)
   bfd_put_32 (input_bfd,
 	      (bfd_vma) 0x0020f809, location + 16); /* jalr $at */
 
-  return true;
+  return TRUE;
 }
 
 /* Given a .sdata section and a .rel.sdata in-memory section, store
@@ -2368,7 +2333,7 @@ mips_relax_pcrel16 (info, input_bfd, input_section, h, location, address)
    function presumes that the object was compiled using
    -membedded-pic.  */
 
-boolean
+bfd_boolean
 bfd_mips_ecoff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2388,17 +2353,17 @@ bfd_mips_ecoff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
   *errmsg = NULL;
 
   if (datasec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   sym_hashes = ecoff_data (abfd)->sym_hashes;
 
   if (! mips_read_relocs (abfd, datasec))
-    return false;
+    return FALSE;
 
   amt = (bfd_size_type) datasec->reloc_count * 4;
   relsec->contents = (bfd_byte *) bfd_alloc (abfd, amt);
   if (relsec->contents == NULL)
-    return false;
+    return FALSE;
 
   p = relsec->contents;
 
@@ -2408,7 +2373,7 @@ bfd_mips_ecoff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
   for (; ext_rel < ext_rel_end; ext_rel++, p += 4)
     {
       struct internal_reloc int_rel;
-      boolean text_relative;
+      bfd_boolean text_relative;
 
       mips_ecoff_swap_reloc_in (abfd, (PTR) ext_rel, &int_rel);
 
@@ -2428,7 +2393,7 @@ bfd_mips_ecoff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
 	{
 	  *errmsg = _("unsupported reloc type");
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       if (int_rel.r_extern)
@@ -2444,28 +2409,28 @@ bfd_mips_ecoff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
 	  if ((h->root.type == bfd_link_hash_defined
 	       || h->root.type == bfd_link_hash_defweak)
 	      && (h->root.u.def.section->flags & SEC_CODE) != 0)
-	    text_relative = true;
+	    text_relative = TRUE;
 	  else
-	    text_relative = false;
+	    text_relative = FALSE;
 	}
       else
 	{
 	  switch (int_rel.r_symndx)
 	    {
 	    case RELOC_SECTION_TEXT:
-	      text_relative = true;
+	      text_relative = TRUE;
 	      break;
 	    case RELOC_SECTION_SDATA:
 	    case RELOC_SECTION_SBSS:
 	    case RELOC_SECTION_LIT8:
-	      text_relative = false;
+	      text_relative = FALSE;
 	      break;
 	    default:
 	      /* No other sections should appear in -membedded-pic
                  code.  */
 	      *errmsg = _("reloc against unsupported section");
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	}
 
@@ -2473,7 +2438,7 @@ bfd_mips_ecoff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
 	{
 	  *errmsg = _("reloc not properly aligned");
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       bfd_put_32 (abfd,
@@ -2482,7 +2447,7 @@ bfd_mips_ecoff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
 		  p);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is the ECOFF backend structure.  The backend field of the
@@ -2501,7 +2466,7 @@ static const struct ecoff_backend_data mips_ecoff_backend_data =
     (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* reloc_out */
     mips_ecoff_swap_filehdr_out, mips_ecoff_swap_aouthdr_out,
     mips_ecoff_swap_scnhdr_out,
-    FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, FILNMLEN, true, false, 4, false, 2,
+    FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, FILNMLEN, TRUE, FALSE, 4, FALSE, 2,
     mips_ecoff_swap_filehdr_in, mips_ecoff_swap_aouthdr_in,
     mips_ecoff_swap_scnhdr_in, NULL,
     mips_ecoff_bad_format_hook, _bfd_ecoff_set_arch_mach_hook,
@@ -2517,10 +2482,10 @@ static const struct ecoff_backend_data mips_ecoff_backend_data =
   /* The page boundary used to align sections in a demand-paged
      executable file.  E.g., 0x1000.  */
   0x1000,
-  /* True if the .rdata section is part of the text segment, as on the
-     Alpha.  False if .rdata is part of the data segment, as on the
+  /* TRUE if the .rdata section is part of the text segment, as on the
+     Alpha.  FALSE if .rdata is part of the data segment, as on the
      MIPS.  */
-  false,
+  FALSE,
   /* Bitsize of constructor entries.  */
   32,
   /* Reloc to use for constructor entries.  */
diff --git a/bfd/coff-or32.c b/bfd/coff-or32.c
index c82b9af68f1..6bec813e13f 100644
--- a/bfd/coff-or32.c
+++ b/bfd/coff-or32.c
@@ -27,11 +27,18 @@
 #include "coff/internal.h"
 #include "libcoff.h"
 
-static long                   get_symbol_value           PARAMS ((asymbol *));
-static bfd_reloc_status_type  or32_reloc                 PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean                coff_or32_relocate_section PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, struct internal_reloc *, struct internal_syment *, asection **));
-static boolean                coff_or32_adjust_symndx    PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, struct internal_reloc *, boolean *));
-static void                   reloc_processing           PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+static long get_symbol_value
+  PARAMS ((asymbol *));
+static bfd_reloc_status_type or32_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_boolean coff_or32_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   struct internal_reloc *, struct internal_syment *, asection **));
+static bfd_boolean coff_or32_adjust_symndx
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+	   struct internal_reloc *, bfd_boolean *));
+static void reloc_processing
+  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
 
@@ -52,14 +59,14 @@ static void                   reloc_processing           PARAMS ((arelent *, str
 /* Provided the symbol, returns the value reffed.  */
 
 static long
-get_symbol_value (symbol)       
+get_symbol_value (symbol)
      asymbol *symbol;
-{                                             
+{
   long relocation = 0;
 
   if (bfd_is_com_section (symbol->section))
-    relocation = 0;                           
-  else 
+    relocation = 0;
+  else
     relocation = symbol->value +
       symbol->section->output_section->vma +
       symbol->section->output_offset;
@@ -82,7 +89,7 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 {
   /* The consth relocation comes in two parts, we have to remember
      the state between calls, in these variables.  */
-  static boolean part1_consth_active = false;
+  static bfd_boolean part1_consth_active = FALSE;
   static unsigned long part1_consth_value;
 
   unsigned long insn;
@@ -93,10 +100,10 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 
   unsigned long addr = reloc_entry->address ;   /*+ input_section->vma*/
   bfd_byte *hit_data =addr + (bfd_byte *)(data);
-  
+
   r_type = reloc_entry->howto->type;
 
-  if (output_bfd) 
+  if (output_bfd)
     {
       /* Partial linking - do nothing.  */
       reloc_entry->address += input_section->output_offset;
@@ -107,18 +114,18 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
       && bfd_is_und_section (symbol_in->section))
     {
       /* Keep the state machine happy in case we're called again.  */
-      if (r_type == R_IHIHALF) 
+      if (r_type == R_IHIHALF)
         {
-          part1_consth_active = true;
+          part1_consth_active = TRUE;
           part1_consth_value  = 0;
         }
 
       return bfd_reloc_undefined;
     }
 
-  if ((part1_consth_active) && (r_type != R_IHCONST)) 
+  if ((part1_consth_active) && (r_type != R_IHCONST))
     {
-      part1_consth_active = false;
+      part1_consth_active = FALSE;
       *error_message = (char *) "Missing IHCONST";
 
       return bfd_reloc_dangerous;
@@ -126,10 +133,10 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 
   sym_value = get_symbol_value (symbol_in);
 
-  switch (r_type) 
+  switch (r_type)
     {
-    case R_IREL:  
-      insn = bfd_get_32(abfd, hit_data); 
+    case R_IREL:
+      insn = bfd_get_32(abfd, hit_data);
 
       /* Take the value in the field and sign extend it.  */
       signed_value = EXTRACT_JUMPTARG (insn);
@@ -146,8 +153,8 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
         {                     /* Absolute jmp/call.  */
           insn |= (1<<24);    /* Make it absolute.  */
           /* FIXME: Should we change r_type to R_IABS.  */
-        } 
-      else 
+        }
+      else
 #endif
         {
           /* Relative jmp/call, so subtract from the value the
@@ -155,39 +162,39 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
           signed_value -= (reloc_entry->address
                            + input_section->output_section->vma
                            + input_section->output_offset);
-          if (signed_value > 0x7ffffff || signed_value < -0x8000000) 
+          if (signed_value > 0x7ffffff || signed_value < -0x8000000)
             return bfd_reloc_overflow;
         }
       signed_value >>= 2;
       insn = INSERT_JUMPTARG (insn, signed_value);
-      bfd_put_32 (abfd, insn, hit_data); 
+      bfd_put_32 (abfd, insn, hit_data);
       break;
 
-    case R_ILOHALF: 
-      insn = bfd_get_32 (abfd, hit_data); 
+    case R_ILOHALF:
+      insn = bfd_get_32 (abfd, hit_data);
       unsigned_value = EXTRACT_HWORD (insn);
       unsigned_value +=  sym_value + reloc_entry->addend;
       insn = INSERT_HWORD (insn, unsigned_value);
-      bfd_put_32 (abfd, insn, hit_data); 
+      bfd_put_32 (abfd, insn, hit_data);
       break;
 
     case R_IHIHALF:
-      insn = bfd_get_32 (abfd, hit_data); 
+      insn = bfd_get_32 (abfd, hit_data);
 
-      /* consth, part 1 
+      /* consth, part 1
          Just get the symbol value that is referenced.  */
-      part1_consth_active = true;
+      part1_consth_active = TRUE;
       part1_consth_value = sym_value + reloc_entry->addend;
 
       /* Don't modify insn until R_IHCONST.  */
       break;
 
-    case R_IHCONST: 
-      insn = bfd_get_32 (abfd, hit_data); 
+    case R_IHCONST:
+      insn = bfd_get_32 (abfd, hit_data);
 
-      /* consth, part 2 
+      /* consth, part 2
          Now relocate the reference.  */
-      if (! part1_consth_active) 
+      if (! part1_consth_active)
         {
           *error_message = (char *) "Missing IHIHALF";
           return bfd_reloc_dangerous;
@@ -199,29 +206,29 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
       unsigned_value += part1_consth_value;
       unsigned_value = unsigned_value >> 16;
       insn = INSERT_HWORD (insn, unsigned_value);
-      part1_consth_active = false;
-      bfd_put_32 (abfd, insn, hit_data); 
+      part1_consth_active = FALSE;
+      bfd_put_32 (abfd, insn, hit_data);
       break;
 
     case R_BYTE:
-      insn = bfd_get_8 (abfd, hit_data); 
-      unsigned_value = insn + sym_value + reloc_entry->addend;  
+      insn = bfd_get_8 (abfd, hit_data);
+      unsigned_value = insn + sym_value + reloc_entry->addend;
       if (unsigned_value & 0xffffff00)
         return bfd_reloc_overflow;
-      bfd_put_8 (abfd, unsigned_value, hit_data); 
+      bfd_put_8 (abfd, unsigned_value, hit_data);
       break;
 
     case R_HWORD:
-      insn = bfd_get_16 (abfd, hit_data); 
-      unsigned_value = insn + sym_value + reloc_entry->addend;  
+      insn = bfd_get_16 (abfd, hit_data);
+      unsigned_value = insn + sym_value + reloc_entry->addend;
       if (unsigned_value & 0xffff0000)
         return bfd_reloc_overflow;
-      bfd_put_16 (abfd, insn, hit_data); 
+      bfd_put_16 (abfd, insn, hit_data);
       break;
 
     case R_WORD:
-      insn = bfd_get_32 (abfd, hit_data); 
-      insn += sym_value + reloc_entry->addend;  
+      insn = bfd_get_32 (abfd, hit_data);
+      insn += sym_value + reloc_entry->addend;
       bfd_put_32 (abfd, insn, hit_data);
       break;
 
@@ -242,14 +249,14 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
                complain_on_overflow
               special_function
                 relocation name
-                     partial_inplace 
+                     partial_inplace
                       src_mask
 */
 
 /* FIXME: I'm not real sure about this table.  */
-static reloc_howto_type howto_table[] = 
+static reloc_howto_type howto_table[] =
 {
-  { R_ABS,      0, 3, 32, false,  0, complain_overflow_bitfield,  or32_reloc, "ABS",     true, 0xffffffff,0xffffffff, false },
+  { R_ABS,      0, 3, 32, FALSE,  0, complain_overflow_bitfield,  or32_reloc, "ABS",     TRUE, 0xffffffff,0xffffffff, FALSE },
     EMPTY_HOWTO (1),
     EMPTY_HOWTO (2),
     EMPTY_HOWTO (3),
@@ -273,14 +280,14 @@ static reloc_howto_type howto_table[] =
     EMPTY_HOWTO (21),
     EMPTY_HOWTO (22),
     EMPTY_HOWTO (23),
-  { R_IREL,     0, 3, 32, true,   0, complain_overflow_signed,    or32_reloc, "IREL",    true, 0xffffffff,0xffffffff, false },
-  { R_IABS,     0, 3, 32, false,  0, complain_overflow_bitfield,  or32_reloc, "IABS",    true, 0xffffffff,0xffffffff, false },
-  { R_ILOHALF,  0, 3, 16, true,   0, complain_overflow_signed,    or32_reloc, "ILOHALF", true, 0x0000ffff,0x0000ffff, false },
-  { R_IHIHALF,  0, 3, 16, true,   16,complain_overflow_signed,    or32_reloc, "IHIHALF", true, 0xffff0000,0xffff0000, false },
-  { R_IHCONST,  0, 3, 16, true,   0, complain_overflow_signed,    or32_reloc, "IHCONST", true, 0xffff0000,0xffff0000, false },
-  { R_BYTE,     0, 0, 8,  false,  0, complain_overflow_bitfield,  or32_reloc, "BYTE",    true, 0x000000ff,0x000000ff, false },
-  { R_HWORD,    0, 1, 16, false,  0, complain_overflow_bitfield,  or32_reloc, "HWORD",   true, 0x0000ffff,0x0000ffff, false },
-  { R_WORD,     0, 2, 32, false,  0, complain_overflow_bitfield,  or32_reloc, "WORD",    true, 0xffffffff,0xffffffff, false },
+  { R_IREL,     0, 3, 32, TRUE,   0, complain_overflow_signed,    or32_reloc, "IREL",    TRUE, 0xffffffff,0xffffffff, FALSE },
+  { R_IABS,     0, 3, 32, FALSE,  0, complain_overflow_bitfield,  or32_reloc, "IABS",    TRUE, 0xffffffff,0xffffffff, FALSE },
+  { R_ILOHALF,  0, 3, 16, TRUE,   0, complain_overflow_signed,    or32_reloc, "ILOHALF", TRUE, 0x0000ffff,0x0000ffff, FALSE },
+  { R_IHIHALF,  0, 3, 16, TRUE,   16,complain_overflow_signed,    or32_reloc, "IHIHALF", TRUE, 0xffff0000,0xffff0000, FALSE },
+  { R_IHCONST,  0, 3, 16, TRUE,   0, complain_overflow_signed,    or32_reloc, "IHCONST", TRUE, 0xffff0000,0xffff0000, FALSE },
+  { R_BYTE,     0, 0, 8,  FALSE,  0, complain_overflow_bitfield,  or32_reloc, "BYTE",    TRUE, 0x000000ff,0x000000ff, FALSE },
+  { R_HWORD,    0, 1, 16, FALSE,  0, complain_overflow_bitfield,  or32_reloc, "HWORD",   TRUE, 0x0000ffff,0x0000ffff, FALSE },
+  { R_WORD,     0, 2, 32, FALSE,  0, complain_overflow_bitfield,  or32_reloc, "WORD",    TRUE, 0xffffffff,0xffffffff, FALSE },
 };
 
 #define BADMAG(x) OR32BADMAG (x)
@@ -298,11 +305,11 @@ reloc_processing (relent,reloc, symbols, abfd, section)
 {
   static bfd_vma ihihalf_vaddr = (bfd_vma) -1;
 
-  relent->address = reloc->r_vaddr;   
+  relent->address = reloc->r_vaddr;
   relent->howto = howto_table + reloc->r_type;
 
-  if (reloc->r_type == R_IHCONST) 
-    {   
+  if (reloc->r_type == R_IHCONST)
+    {
       /* The address of an R_IHCONST should always be the address of
 	 the immediately preceding R_IHIHALF.  relocs generated by gas
 	 are correct, but relocs generated by High C are different (I
@@ -336,7 +343,7 @@ reloc_processing (relent,reloc, symbols, abfd, section)
 
 /* The reloc processing routine for the optimized COFF linker.  */
 
-static boolean
+static bfd_boolean
 coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
                             contents, relocs, syms, sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -350,16 +357,16 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
 {
   struct internal_reloc *rel;
   struct internal_reloc *relend;
-  boolean hihalf;
+  bfd_boolean hihalf;
   bfd_vma hihalf_val;
 
   /* If we are performing a relocateable link, we don't need to do a
      thing.  The caller will take care of adjusting the reloc
      addresses and symbol indices.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
-  hihalf = false;
+  hihalf = FALSE;
   hihalf_val = 0;
 
   rel = relocs;
@@ -373,7 +380,7 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
       struct internal_syment *sym;
       asection *sec;
       bfd_vma val;
-      boolean overflow;
+      bfd_boolean overflow;
       unsigned long insn;
       long signed_value;
       unsigned long unsigned_value;
@@ -424,8 +431,8 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
                 {
                   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;
                 }
             }
 
@@ -434,18 +441,18 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
               if (! ((*info->callbacks->reloc_dangerous)
                      (info, "missing IHCONST reloc", input_bfd,
                       input_section, rel->r_vaddr - input_section->vma)))
-                return false;
-              hihalf = false;
+                return FALSE;
+              hihalf = FALSE;
             }
         }
 
-      overflow = false;
+      overflow = FALSE;
 
       switch (rel->r_type)
         {
         default:
           bfd_set_error (bfd_error_bad_value);
-          return false;
+          return FALSE;
 
         case R_IREL:
           insn = bfd_get_32 (input_bfd, loc);
@@ -473,7 +480,7 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
                                + (rel->r_vaddr - input_section->vma));
               if (signed_value > 0x7ffffff || signed_value < - 0x8000000)
                 {
-                  overflow = true;
+                  overflow = TRUE;
                   signed_value = 0;
                 }
             }
@@ -495,7 +502,7 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
 
         case R_IHIHALF:
           /* Save the value for the R_IHCONST reloc.  */
-          hihalf = true;
+          hihalf = TRUE;
           hihalf_val = val;
           break;
 
@@ -505,7 +512,7 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
               if (! ((*info->callbacks->reloc_dangerous)
                      (info, "missing IHIHALF reloc", input_bfd,
                       input_section, rel->r_vaddr - input_section->vma)))
-                return false;
+                return FALSE;
               hihalf_val = 0;
             }
 
@@ -515,7 +522,7 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
           insn = INSERT_HWORD (insn, unsigned_value);
           bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
 
-          hihalf = false;
+          hihalf = FALSE;
           break;
 
         case R_BYTE:
@@ -524,7 +531,7 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
           rstat = _bfd_relocate_contents (howto_table + rel->r_type,
                                           input_bfd, val, loc);
           if (rstat == bfd_reloc_overflow)
-            overflow = true;
+            overflow = TRUE;
           else if (rstat != bfd_reloc_ok)
             abort ();
           break;
@@ -555,11 +562,11 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
                  (info, name, howto_table[rel->r_type].name, (bfd_vma) 0,
                   input_bfd, input_section,
                   rel->r_vaddr - input_section->vma)))
-            return false;
+            return FALSE;
         }
-    }   
+    }
 
-  return true;
+  return TRUE;
 }
 
 #define coff_relocate_section coff_or32_relocate_section
@@ -567,20 +574,20 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
 /* We don't want to change the symndx of a R_IHCONST reloc, since it
    is actually an addend, not a symbol index at all.  */
 
-static boolean
+static bfd_boolean
 coff_or32_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
      bfd *obfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      bfd *ibfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
      struct internal_reloc *irel;
-     boolean *adjustedp;
+     bfd_boolean *adjustedp;
 {
   if (irel->r_type == R_IHCONST)
-    *adjustedp = true;
+    *adjustedp = TRUE;
   else
-    *adjustedp = false;
-  return true;
+    *adjustedp = FALSE;
+  return TRUE;
 }
 
 #define coff_adjust_symndx coff_or32_adjust_symndx
@@ -599,7 +606,7 @@ const bfd_target or32coff_big_vec =
    HAS_SYMS   | HAS_LOCALS | WP_TEXT),
 
   (SEC_HAS_CONTENTS | SEC_ALLOC | /* Section flags.  */
-   SEC_LOAD | SEC_RELOC | 
+   SEC_LOAD | SEC_RELOC |
    SEC_READONLY ),
   '_',        /* Leading underscore.  */
   '/',        /* ar_pad_char.  */
@@ -615,7 +622,7 @@ const bfd_target or32coff_big_vec =
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,
 
-  { 
+  {
     _bfd_dummy_target,
     coff_object_p,
     bfd_generic_archive_p,
@@ -643,7 +650,7 @@ const bfd_target or32coff_big_vec =
   BFD_JUMP_TABLE_WRITE (coff),
   BFD_JUMP_TABLE_LINK (coff),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-   
+
  /* Alternative_target.  */
 #ifdef TARGET_LITTLE_SYM
   & TARGET_LITTLE_SYM,
diff --git a/bfd/coff-ppc.c b/bfd/coff-ppc.c
index 4f8b15e177e..f0c82a6dfa3 100644
--- a/bfd/coff-ppc.c
+++ b/bfd/coff-ppc.c
@@ -54,7 +54,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* This file is compiled more than once, but we only compile the
    final_link routine once.  */
-extern boolean ppc_bfd_coff_final_link
+extern bfd_boolean ppc_bfd_coff_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 extern void dump_toc PARAMS ((PTR));
 
@@ -128,14 +128,14 @@ struct ppc_coff_link_hash_table
 static struct bfd_hash_entry *ppc_coff_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
 	   const char *));
-static boolean ppc_coff_link_hash_table_init
+static bfd_boolean ppc_coff_link_hash_table_init
   PARAMS ((struct ppc_coff_link_hash_table *, bfd *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
 				       const char *)));
 static struct bfd_link_hash_table *ppc_coff_link_hash_table_create
   PARAMS ((bfd *));
-static boolean coff_ppc_relocate_section
+static bfd_boolean coff_ppc_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 static reloc_howto_type *coff_ppc_rtype_to_howto
@@ -184,7 +184,7 @@ ppc_coff_link_hash_newfunc (entry, table, string)
 
 /* Initialize a PE linker hash table.  */
 
-static boolean
+static bfd_boolean
 ppc_coff_link_hash_table_init (table, abfd, newfunc)
      struct ppc_coff_link_hash_table *table;
      bfd *abfd;
@@ -385,7 +385,7 @@ static bfd_reloc_status_type ppc_imglue_reloc PARAMS ((bfd *abfd,
 						       bfd *output_bfd,
 						       char **error));
 
-static boolean in_reloc_p PARAMS((bfd *abfd, reloc_howto_type *howto));
+static bfd_boolean in_reloc_p PARAMS((bfd *abfd, reloc_howto_type *howto));
 
 /* FIXME: It'll take a while to get through all of these. I only need a few to
    get us started, so those I'll make sure work. Those marked FIXME are either
@@ -433,15 +433,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                 /* rightshift */
 	 0,	                 /* size (0 = byte, 1 = short, 2 = long) */
 	 0,	                 /* bitsize */
-	 false,	                 /* pc_relative */
+	 FALSE,	                 /* pc_relative */
 	 0,	                 /* bitpos */
 	 complain_overflow_dont, /* dont complain_on_overflow */
 	 0,		         /* special_function */
 	 "ABSOLUTE",             /* name */
-	 false,	                 /* partial_inplace */
+	 FALSE,	                 /* partial_inplace */
 	 0x00,	 	         /* src_mask */
 	 0x00,        		 /* dst_mask */
-	 false),                 /* pcrel_offset */
+	 FALSE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_ADDR64 0x0001  64-bit address */
   /* Unused: */
@@ -449,15 +449,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	0,	                 /* rightshift */
 	3,	                 /* size (0 = byte, 1 = short, 2 = long) */
 	64,	                 /* bitsize */
-	false,	                 /* pc_relative */
+	FALSE,	                 /* pc_relative */
 	0,	                 /* bitpos */
 	complain_overflow_bitfield, 	 /* complain_on_overflow */
 	0,		         /* special_function */
 	"ADDR64",               /* name */
-	true,	                 /* partial_inplace */
+	TRUE,	                 /* partial_inplace */
 	MINUS_ONE,	 	 /* src_mask */
 	MINUS_ONE,        	 /* dst_mask */
-	false),                 /* pcrel_offset */
+	FALSE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_ADDR32 0x0002  32-bit address */
   /* Used: */
@@ -465,15 +465,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "ADDR32",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_ADDR24 0x0003  26-bit address, shifted left 2 (branch absolute) */
   /* the LI field is in bit 6 through bit 29 is 24 bits, + 2 for the shift */
@@ -484,15 +484,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 26,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "ADDR24",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0x07fffffc,	        /* src_mask */
 	 0x07fffffc,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_ADDR16 0x0004  16-bit address */
   /* Used: */
@@ -500,15 +500,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "ADDR16",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_ADDR14 0x0005 */
   /*  16-bit address, shifted left 2 (load doubleword) */
@@ -518,15 +518,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 1,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "ADDR16",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_REL24 0x0006 */
   /*   26-bit PC-relative offset, shifted left 2 (branch relative) */
@@ -535,15 +535,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 26,	                /* bitsize */
-	 true,	                /* pc_relative */
+	 TRUE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "REL24",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0x3fffffc,	        /* src_mask */
 	 0x3fffffc,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_REL14 0x0007 */
   /*   16-bit PC-relative offset, shifted left 2 (br cond relative) */
@@ -554,15 +554,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 1,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "ADDR16",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 true),                 /* pcrel_offset */
+	 TRUE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_TOCREL16 0x0008 */
   /*   16-bit offset from TOC base */
@@ -571,15 +571,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc_toc16_reloc,       /* special_function */
 	 "TOCREL16",            /* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_TOCREL14 0x0009 */
   /*   16-bit offset from TOC base, shifted left 2 (load doubleword) */
@@ -588,15 +588,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 1,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "TOCREL14",            /* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_ADDR32NB 0x000A */
   /*   32-bit addr w/ image base */
@@ -605,15 +605,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,                     /* special_function */
 	 "ADDR32NB",            /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                 /* pcrel_offset */
+	 FALSE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_SECREL 0x000B */
   /*   va of containing section (as in an image sectionhdr) */
@@ -622,15 +622,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc_secrel_reloc,      /* special_function */
 	 "SECREL",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 true),                 /* pcrel_offset */
+	 TRUE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_SECTION 0x000C */
   /*   sectionheader number */
@@ -639,15 +639,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc_section_reloc,     /* special_function */
 	 "SECTION",             /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 true),                 /* pcrel_offset */
+	 TRUE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_IFGLUE 0x000D */
   /*   substitute TOC restore instruction iff symbol is glue code */
@@ -656,15 +656,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "IFGLUE",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_IMGLUE 0x000E */
   /*   symbol is glue code; virtual address is TOC restore instruction */
@@ -673,15 +673,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc_imglue_reloc,      /* special_function */
 	 "IMGLUE",              /* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                 /* pcrel_offset */
+	 FALSE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_SECREL16 0x000F */
   /*   va of containing section (limited to 16 bits) */
@@ -690,15 +690,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "SECREL16",            /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 true),                 /* pcrel_offset */
+	 TRUE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_REFHI             0x0010 */
   /* Unused: */
@@ -706,15 +706,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc_refhi_reloc,	/* special_function */
 	 "REFHI",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                 /* pcrel_offset */
+	 FALSE),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_REFLO             0x0011 */
   /* Unused: */
@@ -722,15 +722,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc_refhi_reloc,	/* special_function */
 	 "REFLO",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_PAIR              0x0012 */
   /* Unused: */
@@ -738,15 +738,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc_pair_reloc,        /* special_function */
 	 "PAIR",                /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_TOCREL16_DEFN 0x0013 */
   /*   16-bit offset from TOC base, without causing a definition */
@@ -755,15 +755,15 @@ static reloc_howto_type ppc_coff_howto_table[] =
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,                     /* special_function */
 	 "TOCREL16, TOCDEFN",   /* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
 };
 
@@ -884,13 +884,13 @@ record_toc (toc_section, our_toc_offset, cat, name)
 
 #ifdef COFF_IMAGE_WITH_PE
 
-static boolean ppc_record_toc_entry
+static bfd_boolean ppc_record_toc_entry
   PARAMS ((bfd *, struct bfd_link_info *, asection *, int, enum toc_type));
 static void ppc_mark_symbol_as_glue
   PARAMS ((bfd *, int, struct internal_reloc *));
 
 /* record a toc offset against a symbol */
-static boolean
+static bfd_boolean
 ppc_record_toc_entry(abfd, info, sec, sym, toc_kind)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -922,7 +922,7 @@ ppc_record_toc_entry(abfd, info, sec, sym, toc_kind)
 	  amt = (bfd_size_type) obj_raw_syment_count (abfd) * sizeof (int);
 	  local_syms = (int *) bfd_zalloc (abfd, amt);
 	  if (local_syms == 0)
-	    return false;
+	    return FALSE;
 	  obj_coff_local_toc_table (abfd) = local_syms;
 	  for (i = 0; i < obj_raw_syment_count (abfd); ++i)
 	    {
@@ -940,7 +940,7 @@ ppc_record_toc_entry(abfd, info, sec, sym, toc_kind)
 	    {
 	      (*_bfd_error_handler) (_("TOC overflow"));
 	      bfd_set_error (bfd_error_file_too_big);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
@@ -960,12 +960,12 @@ ppc_record_toc_entry(abfd, info, sec, sym, toc_kind)
 	    {
 	      (*_bfd_error_handler) (_("TOC overflow"));
 	      bfd_set_error (bfd_error_file_too_big);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* record a toc offset against a symbol */
@@ -989,10 +989,10 @@ ppc_mark_symbol_as_glue(abfd, sym, rel)
 
 #endif /* COFF_IMAGE_WITH_PE */
 
-/* Return true if this relocation should
+/* Return TRUE if this relocation should
    appear in the output .reloc section.  */
 
-static boolean in_reloc_p(abfd, howto)
+static bfd_boolean in_reloc_p(abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type *howto;
 {
@@ -1030,7 +1030,7 @@ pe_ppc_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 {
   /* the consth relocation comes in two parts, we have to remember
      the state between calls, in these variables */
-  static boolean part1_consth_active = false;
+  static bfd_boolean part1_consth_active = FALSE;
   static unsigned long part1_consth_value;
 
   unsigned long sym_value;
@@ -1052,7 +1052,7 @@ pe_ppc_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
       /* Keep the state machine happy in case we're called again */
       if (r_type == IMAGE_REL_PPC_REFHI)
 	{
-	  part1_consth_active = true;
+	  part1_consth_active = TRUE;
 	  part1_consth_value  = 0;
 	}
       return(bfd_reloc_undefined);
@@ -1060,7 +1060,7 @@ pe_ppc_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 
   if ((part1_consth_active) && (r_type != IMAGE_REL_PPC_PAIR))
     {
-      part1_consth_active = false;
+      part1_consth_active = FALSE;
       *error_message = (char *) _("Missing PAIR");
       return(bfd_reloc_dangerous);
     }
@@ -1074,7 +1074,7 @@ pe_ppc_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
 
 /* The reloc processing routine for the optimized COFF linker.  */
 
-static boolean
+static bfd_boolean
 coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, syms, sections)
      bfd *output_bfd;
@@ -1088,7 +1088,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 {
   struct internal_reloc *rel;
   struct internal_reloc *relend;
-  boolean hihalf;
+  bfd_boolean hihalf;
   bfd_vma hihalf_val;
   asection *toc_section = 0;
   bfd_vma relocation;
@@ -1098,9 +1098,9 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
      thing.  The caller will take care of adjusting the reloc
      addresses and symbol indices.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
-  hihalf = false;
+  hihalf = FALSE;
   hihalf_val = 0;
 
   rel = relocs;
@@ -1182,8 +1182,8 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.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;
 	    }
 	}
 
@@ -1197,7 +1197,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 	    (_("%s: unsupported relocation type 0x%02x"),
 	     bfd_archive_filename (input_bfd), r_type);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	case IMAGE_REL_PPC_TOCREL16:
 	  {
 	    bfd_signed_vma our_toc_offset;
@@ -1224,7 +1224,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 	     *  the 1 bit to tell us if we've written this particular toc
 	     *  entry out.
 	     */
-	    fixit = false;
+	    fixit = FALSE;
 	    if (h == 0)
 	      { /* it is a file local symbol */
 		int *local_toc_table;
@@ -1254,7 +1254,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 			       toc_section->contents + our_toc_offset);
 
 		    MARK_AS_WRITTEN(local_toc_table[symndx]);
-		    fixit = true;
+		    fixit = TRUE;
 		  }
 	      }
 	    else
@@ -1291,7 +1291,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 			   bfd_archive_filename (input_bfd), name,
 			   (unsigned long) our_toc_offset);
 			bfd_set_error (bfd_error_bad_value);
-			return false;
+			return FALSE;
 		      }
 
 		    record_toc (toc_section, our_toc_offset, pub,
@@ -1317,7 +1317,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 		    MARK_AS_WRITTEN(h->toc_offset);
 		    /* The tricky part is that this is the address that */
 		    /* needs a .reloc entry for it */
-		    fixit = true;
+		    fixit = TRUE;
 		  }
 	      }
 
@@ -1348,7 +1348,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 		   bfd_archive_filename (input_bfd),
 		   (unsigned long) toc_section->_raw_size);
 		bfd_set_error (bfd_error_bad_value);
-		return false;
+		return FALSE;
 	      }
 
 	    /* Now we know the relocation for this toc reference */
@@ -1423,7 +1423,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (_("%s: Out of order IMGLUE reloc for %s"),
 	       bfd_archive_filename (input_bfd), my_name);
 	    bfd_set_error (bfd_error_bad_value);
-	    return false;
+	    return FALSE;
 	  }
 
 	case IMAGE_REL_PPC_ADDR32NB:
@@ -1438,7 +1438,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 		struct coff_link_hash_entry *myh;
 		myh = coff_link_hash_lookup (coff_hash_table (info),
 					     "__idata5_magic__",
-					     false, false, true);
+					     FALSE, FALSE, TRUE);
 		first_thunk_address = myh->root.u.def.value +
 		  sec->output_section->vma +
 		    sec->output_offset -
@@ -1447,12 +1447,12 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 		idata5offset = myh->root.u.def.value;
 		myh = coff_link_hash_lookup (coff_hash_table (info),
 					     "__idata6_magic__",
-					     false, false, true);
+					     FALSE, FALSE, TRUE);
 
 		thunk_size = myh->root.u.def.value - idata5offset;
 		myh = coff_link_hash_lookup (coff_hash_table (info),
 					     "__idata4_magic__",
-					     false, false, true);
+					     FALSE, FALSE, TRUE);
 		import_table_size = myh->root.u.def.value;
 	      }
 
@@ -1479,7 +1479,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 
 		    myh = coff_link_hash_lookup (coff_hash_table (info),
 						 target,
-						 false, false, true);
+						 FALSE, FALSE, TRUE);
 		    if (myh == 0)
 		      {
 			/* Missing magic cookies. Something is very wrong.  */
@@ -1493,7 +1493,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 			int idata5offset;
 			myh = coff_link_hash_lookup (coff_hash_table (info),
 						     "__idata5_magic__",
-						     false, false, true);
+						     FALSE, FALSE, TRUE);
 			first_thunk_address = myh->root.u.def.value +
 			  sec->output_section->vma +
 			    sec->output_offset -
@@ -1502,12 +1502,12 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 			idata5offset = myh->root.u.def.value;
 			myh = coff_link_hash_lookup (coff_hash_table (info),
 						     "__idata6_magic__",
-						     false, false, true);
+						     FALSE, FALSE, TRUE);
 
 			thunk_size = myh->root.u.def.value - idata5offset;
 			myh = coff_link_hash_lookup (coff_hash_table (info),
 						     "__idata4_magic__",
-						     false, false, true);
+						     FALSE, FALSE, TRUE);
 			import_table_size = myh->root.u.def.value;
 		      }
 		  }
@@ -1596,14 +1596,14 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 		    (bfd_vma) 0, input_bfd,
 		    input_section, rel->r_vaddr - input_section->vma)))
 	      {
-		return false;
+		return FALSE;
 	      }
 	  }
 	}
 
     }
 
-  return true;
+  return TRUE;
 }
 
 #ifdef COFF_IMAGE_WITH_PE
@@ -1677,7 +1677,7 @@ dump_toc (vfile)
   fprintf (file, "\n");
 }
 
-boolean
+bfd_boolean
 ppc_allocate_toc_section (info)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
 {
@@ -1687,7 +1687,7 @@ ppc_allocate_toc_section (info)
   static char test_char = '1';
 
   if ( global_toc_size == 0 ) /* FIXME: does this get me in trouble? */
-    return true;
+    return TRUE;
 
   if (bfd_of_toc_owner == 0)
     {
@@ -1709,10 +1709,10 @@ ppc_allocate_toc_section (info)
   s->_raw_size = s->_cooked_size = global_toc_size;
   s->contents = foo;
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 ppc_process_before_allocation (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1730,7 +1730,7 @@ ppc_process_before_allocation (abfd, info)
 
   if (sec == 0)
     {
-      return true;
+      return TRUE;
     }
 
   for (; sec != 0; sec = sec->next)
@@ -1749,7 +1749,7 @@ ppc_process_before_allocation (abfd, info)
       {
 	unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
 	unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
-	boolean ok = true;
+	bfd_boolean ok = TRUE;
 
 	DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
 
@@ -1762,7 +1762,7 @@ ppc_process_before_allocation (abfd, info)
 	      ok = ppc_record_toc_entry(abfd, info, sec,
 					rel->r_symndx, default_toc);
 	    if (!ok)
-	      return false;
+	      return FALSE;
 	    break;
 	  case IMAGE_REL_PPC_IMGLUE:
 	    ppc_mark_symbol_as_glue(abfd, rel->r_symndx, rel);
@@ -1773,7 +1773,7 @@ ppc_process_before_allocation (abfd, info)
       }
   }
 
-  return true;
+  return TRUE;
 }
 
 #endif
@@ -2278,17 +2278,17 @@ ppc_coff_swap_sym_in_hook (abfd, ext1, in1)
 
 #ifndef COFF_IMAGE_WITH_PE
 
-static boolean ppc_do_last PARAMS ((bfd *));
+static bfd_boolean ppc_do_last PARAMS ((bfd *));
 static bfd *ppc_get_last PARAMS ((void));
 
-static boolean
+static bfd_boolean
 ppc_do_last (abfd)
      bfd *abfd;
 {
   if (abfd == bfd_of_toc_owner)
-    return true;
+    return TRUE;
   else
-    return false;
+    return FALSE;
 }
 
 static bfd *
@@ -2311,14 +2311,14 @@ ppc_get_last()
 
 /* Do the final link step.  */
 
-boolean
+bfd_boolean
 ppc_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;
+  bfd_boolean debug_merge_allocated;
   asection *o;
   struct bfd_link_order *p;
   bfd_size_type max_sym_count;
@@ -2351,7 +2351,7 @@ ppc_bfd_coff_final_link (abfd, info)
   finfo.contents = NULL;
   finfo.external_relocs = NULL;
   finfo.internal_relocs = NULL;
-  debug_merge_allocated = false;
+  debug_merge_allocated = FALSE;
 
   coff_data (abfd)->link_info = info;
 
@@ -2361,13 +2361,13 @@ ppc_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)
     {
       if (! bfd_coff_compute_section_file_positions (abfd))
-	return false;
+	return FALSE;
     }
 
   /* Count the line numbers and relocation entries required for the
@@ -2395,7 +2395,7 @@ ppc_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)
@@ -2509,7 +2509,7 @@ ppc_bfd_coff_final_link (abfd, info)
     {
       bfd_size_type 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;
@@ -2575,7 +2575,7 @@ ppc_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
@@ -2600,14 +2600,14 @@ ppc_bfd_coff_final_link (abfd, info)
 	if (! _bfd_coff_link_input_bfd (&finfo, last_one))
 	  goto error_return;
       }
-    last_one->output_has_begun = true;
+    last_one->output_has_begun = TRUE;
   }
 #endif
 
   /* 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)
     {
@@ -2659,11 +2659,11 @@ ppc_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;
     }
 
   /* 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);
   if (finfo.failed)
@@ -2740,7 +2740,7 @@ ppc_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.  */
@@ -2750,7 +2750,7 @@ ppc_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,
@@ -2762,10 +2762,10 @@ ppc_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;
     }
 
   _bfd_stringtab_free (finfo.strtab);
@@ -2774,7 +2774,7 @@ ppc_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)
@@ -2812,7 +2812,7 @@ ppc_bfd_coff_final_link (abfd, info)
     free (finfo.internal_relocs);
   if (external_relocs != NULL)
     free (external_relocs);
-  return false;
+  return FALSE;
 }
 #endif
 
diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
index ebed7438433..87b80b6a894 100644
--- a/bfd/coff-rs6000.c
+++ b/bfd/coff-rs6000.c
@@ -36,29 +36,46 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libcoff.h"
 #include "libxcoff.h"
 
-extern boolean _bfd_xcoff_mkobject PARAMS ((bfd *));
-extern boolean _bfd_xcoff_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-extern boolean _bfd_xcoff_is_local_label_name PARAMS ((bfd *, const char *));
+extern bfd_boolean _bfd_xcoff_mkobject
+  PARAMS ((bfd *));
+extern bfd_boolean _bfd_xcoff_copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+extern bfd_boolean _bfd_xcoff_is_local_label_name
+  PARAMS ((bfd *, const char *));
 extern reloc_howto_type *_bfd_xcoff_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-extern boolean _bfd_xcoff_slurp_armap PARAMS ((bfd *));
-extern const bfd_target *_bfd_xcoff_archive_p PARAMS ((bfd *));
-extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *));
-extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *));
-extern int _bfd_xcoff_stat_arch_elt PARAMS ((bfd *, struct stat *));
-extern boolean _bfd_xcoff_write_armap
+extern bfd_boolean _bfd_xcoff_slurp_armap
+  PARAMS ((bfd *));
+extern const bfd_target *_bfd_xcoff_archive_p
+  PARAMS ((bfd *));
+extern PTR _bfd_xcoff_read_ar_hdr
+  PARAMS ((bfd *));
+extern bfd *_bfd_xcoff_openr_next_archived_file
+  PARAMS ((bfd *, bfd *));
+extern int _bfd_xcoff_stat_arch_elt
+  PARAMS ((bfd *, struct stat *));
+extern bfd_boolean _bfd_xcoff_write_armap
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *));
-extern int _bfd_xcoff_sizeof_headers PARAMS ((bfd *, boolean));
-extern void _bfd_xcoff_swap_sym_in PARAMS ((bfd *, PTR, PTR));
-extern unsigned int _bfd_xcoff_swap_sym_out PARAMS ((bfd *, PTR, PTR));
-extern void _bfd_xcoff_swap_aux_in PARAMS ((bfd *, PTR, int, int, int, int, PTR));
-extern unsigned int _bfd_xcoff_swap_aux_out PARAMS ((bfd *, PTR, int, int, int, int, PTR));
-static void xcoff_swap_reloc_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int xcoff_swap_reloc_out PARAMS ((bfd *, PTR, PTR));
+extern bfd_boolean _bfd_xcoff_write_archive_contents
+  PARAMS ((bfd *));
+extern int _bfd_xcoff_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+extern void _bfd_xcoff_swap_sym_in
+  PARAMS ((bfd *, PTR, PTR));
+extern unsigned int _bfd_xcoff_swap_sym_out
+  PARAMS ((bfd *, PTR, PTR));
+extern void _bfd_xcoff_swap_aux_in
+  PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+extern unsigned int _bfd_xcoff_swap_aux_out
+  PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+static void xcoff_swap_reloc_in
+  PARAMS ((bfd *, PTR, PTR));
+static unsigned int xcoff_swap_reloc_out
+  PARAMS ((bfd *, PTR, PTR));
 
 /* Forward declare xcoff_rtype2howto for coffcode.h macro.  */
-void xcoff_rtype2howto PARAMS ((arelent *, struct internal_reloc *));
+void xcoff_rtype2howto
+  PARAMS ((arelent *, struct internal_reloc *));
 
 /* coffcode.h needs these to be defined.  */
 #define RS6000COFF_C 1
@@ -82,11 +99,14 @@ void xcoff_rtype2howto PARAMS ((arelent *, struct internal_reloc *));
 #define coff_bfd_is_local_label_name _bfd_xcoff_is_local_label_name
 #define coff_bfd_reloc_type_lookup _bfd_xcoff_reloc_type_lookup
 #ifdef AIX_CORE
-extern const bfd_target * rs6000coff_core_p PARAMS ((bfd *abfd));
-extern boolean rs6000coff_core_file_matches_executable_p
+extern const bfd_target * rs6000coff_core_p
+  PARAMS ((bfd *abfd));
+extern bfd_boolean rs6000coff_core_file_matches_executable_p
   PARAMS ((bfd *cbfd, bfd *ebfd));
-extern char *rs6000coff_core_file_failing_command PARAMS ((bfd *abfd));
-extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd));
+extern char *rs6000coff_core_file_failing_command
+  PARAMS ((bfd *abfd));
+extern int rs6000coff_core_file_failing_signal
+  PARAMS ((bfd *abfd));
 #define CORE_FILE_P rs6000coff_core_p
 #define coff_core_file_failing_command \
   rs6000coff_core_file_failing_command
@@ -115,13 +135,16 @@ extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd));
 
 /* The main body of code is in coffcode.h.  */
 
-static const char *normalize_filename PARAMS ((bfd *));
-static boolean xcoff_write_armap_old
+static const char *normalize_filename
+  PARAMS ((bfd *));
+static bfd_boolean xcoff_write_armap_old
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-static boolean xcoff_write_armap_big
+static bfd_boolean xcoff_write_armap_big
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-static boolean xcoff_write_archive_contents_old PARAMS ((bfd *));
-static boolean xcoff_write_archive_contents_big PARAMS ((bfd *));
+static bfd_boolean xcoff_write_archive_contents_old
+  PARAMS ((bfd *));
+static bfd_boolean xcoff_write_archive_contents_big
+  PARAMS ((bfd *));
 static void xcoff_swap_ldhdr_in
   PARAMS ((bfd *, const PTR, struct internal_ldhdr *));
 static void xcoff_swap_ldhdr_out
@@ -134,39 +157,45 @@ static void xcoff_swap_ldrel_in
   PARAMS ((bfd *, const PTR, struct internal_ldrel *));
 static void xcoff_swap_ldrel_out
   PARAMS ((bfd *, const struct internal_ldrel *, PTR));
-static boolean xcoff_ppc_relocate_section
+static bfd_boolean xcoff_ppc_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
-static boolean _bfd_xcoff_put_ldsymbol_name
+static bfd_boolean _bfd_xcoff_put_ldsymbol_name
   PARAMS ((bfd *, struct xcoff_loader_info *, struct internal_ldsym *,
 	   const char *));
 static asection *xcoff_create_csect_from_smclas
   PARAMS ((bfd *, union internal_auxent *, const char *));
-static boolean xcoff_is_lineno_count_overflow PARAMS ((bfd *, bfd_vma));
-static boolean xcoff_is_reloc_count_overflow PARAMS ((bfd *, bfd_vma));
+static bfd_boolean xcoff_is_lineno_count_overflow
+  PARAMS ((bfd *, bfd_vma));
+static bfd_boolean xcoff_is_reloc_count_overflow
+  PARAMS ((bfd *, bfd_vma));
 static bfd_vma xcoff_loader_symbol_offset
   PARAMS ((bfd *, struct internal_ldhdr *));
 static bfd_vma xcoff_loader_reloc_offset
   PARAMS ((bfd *, struct internal_ldhdr *));
-static boolean xcoff_generate_rtinit
-  PARAMS ((bfd *, const char *, const char *, boolean));
-static boolean do_pad PARAMS ((bfd *, unsigned int));
-static boolean do_copy PARAMS ((bfd *, bfd *));
-static boolean do_shared_object_padding PARAMS ((bfd *, bfd *, ufile_ptr *, int));
+static bfd_boolean xcoff_generate_rtinit
+  PARAMS ((bfd *, const char *, const char *, bfd_boolean));
+static bfd_boolean do_pad
+  PARAMS ((bfd *, unsigned int));
+static bfd_boolean do_copy
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean do_shared_object_padding
+  PARAMS ((bfd *, bfd *, ufile_ptr *, int));
 
 /* Relocation functions */
-static boolean xcoff_reloc_type_br PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+static bfd_boolean xcoff_reloc_type_br
+  PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
 
-static boolean xcoff_complain_overflow_dont_func
+static bfd_boolean xcoff_complain_overflow_dont_func
   PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS));
-static boolean xcoff_complain_overflow_bitfield_func
+static bfd_boolean xcoff_complain_overflow_bitfield_func
   PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS));
-static boolean xcoff_complain_overflow_signed_func
+static bfd_boolean xcoff_complain_overflow_signed_func
   PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS));
-static boolean xcoff_complain_overflow_unsigned_func
+static bfd_boolean xcoff_complain_overflow_unsigned_func
   PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS));
 
-boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
+bfd_boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
   PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)) =
 {
   xcoff_reloc_type_pos,	 /* R_POS   (0x00) */
@@ -199,7 +228,7 @@ boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
   xcoff_reloc_type_ba,	 /* R_RBRC  (0x1b) */
 };
 
-boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW])
+bfd_boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW])
   PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS)) =
 {
   xcoff_complain_overflow_dont_func,
@@ -211,7 +240,7 @@ boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW])
 /* We use our own tdata type.  Its first field is the COFF tdata type,
    so the COFF routines are compatible.  */
 
-boolean
+bfd_boolean
 _bfd_xcoff_mkobject (abfd)
      bfd *abfd;
 {
@@ -220,7 +249,7 @@ _bfd_xcoff_mkobject (abfd)
 
   abfd->tdata.xcoff_obj_data = (struct xcoff_tdata *) bfd_zalloc (abfd, amt);
   if (abfd->tdata.xcoff_obj_data == NULL)
-    return false;
+    return FALSE;
   coff = coff_data (abfd);
   coff->symbols = (coff_symbol_type *) NULL;
   coff->conversion_table = (unsigned int *) NULL;
@@ -239,12 +268,12 @@ _bfd_xcoff_mkobject (abfd)
   /* text section alignment is different than the default */
   bfd_xcoff_text_align_power (abfd) = 2;
 
-  return true;
+  return TRUE;
 }
 
 /* Copy XCOFF data from one BFD to another.  */
 
-boolean
+bfd_boolean
 _bfd_xcoff_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -253,7 +282,7 @@ _bfd_xcoff_copy_private_bfd_data (ibfd, obfd)
   asection *sec;
 
   if (ibfd->xvec != obfd->xvec)
-    return true;
+    return TRUE;
   ix = xcoff_data (ibfd);
   ox = xcoff_data (obfd);
   ox->full_aouthdr = ix->full_aouthdr;
@@ -284,7 +313,7 @@ _bfd_xcoff_copy_private_bfd_data (ibfd, obfd)
   ox->cputype = ix->cputype;
   ox->maxdata = ix->maxdata;
   ox->maxstack = ix->maxstack;
-  return true;
+  return TRUE;
 }
 
 /* I don't think XCOFF really has a notion of local labels based on
@@ -292,12 +321,12 @@ _bfd_xcoff_copy_private_bfd_data (ibfd, obfd)
    The AIX native linker does not have a -X option, and it ignores the
    -x option.  */
 
-boolean
+bfd_boolean
 _bfd_xcoff_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
 
 void
@@ -468,7 +497,8 @@ _bfd_xcoff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
 }
 
 
-unsigned int _bfd_xcoff_swap_aux_out PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+unsigned int _bfd_xcoff_swap_aux_out
+  PARAMS ((bfd *, PTR, int, int, int, int, PTR));
 
 unsigned int
 _bfd_xcoff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
@@ -582,105 +612,105 @@ reloc_howto_type xcoff_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_POS",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit relocation, but store negative value.  */
   HOWTO (R_NEG,			/* type */
 	 0,			/* rightshift */
 	 -2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_NEG",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit PC relative relocation.  */
   HOWTO (R_REL,			/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_REL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit TOC relative relocation.  */
   HOWTO (R_TOC,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_TOC",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* I don't really know what this is.  */
   HOWTO (R_RTB,			/* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RTB",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* External TOC relative symbol.  */
   HOWTO (R_GL,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_GL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Local TOC relative symbol.	 */
   HOWTO (R_TCL,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_TCL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (7),
 
@@ -689,15 +719,15 @@ reloc_howto_type xcoff_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_BA_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03fffffc,		/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (9),
 
@@ -706,15 +736,15 @@ reloc_howto_type xcoff_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_BR",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03fffffc,		/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (0xb),
 
@@ -723,30 +753,30 @@ reloc_howto_type xcoff_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Load address.  */
   HOWTO (R_RLA,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RLA",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (0xe),
 
@@ -755,15 +785,15 @@ reloc_howto_type xcoff_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_REF",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (0x10),
   EMPTY_HOWTO (0x11),
@@ -773,195 +803,195 @@ reloc_howto_type xcoff_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_TRL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* TOC relative load address.  */
   HOWTO (R_TRLA,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_TRLA",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable relative branch.  */
   HOWTO (R_RRTBI,		 /* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RRTBI",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable absolute branch.  */
   HOWTO (R_RRTBA,		 /* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RRTBA",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable call absolute indirect.  */
   HOWTO (R_CAI,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_CAI",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable call relative.  */
   HOWTO (R_CREL,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_CREL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (R_RBA,			/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBA",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03fffffc,		/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (R_RBAC,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBAC",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch relative.  */
   HOWTO (R_RBR,			/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBR_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03fffffc,		/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (R_RBRC,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBRC",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit Non modifiable absolute branch.  */
   HOWTO (R_BA,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_BA_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xfffc,		/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch relative.  */
   HOWTO (R_RBR,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBR_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch relative.  */
   HOWTO (R_RBA,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBA_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 };
 
@@ -1069,19 +1099,19 @@ _bfd_xcoff_reloc_type_lookup (abfd, code)
 
 /* Set the magic for archive.  */
 
-boolean
+bfd_boolean
 bfd_xcoff_ar_archive_set_magic (abfd, magic)
      bfd *abfd ATTRIBUTE_UNUSED;
      char *magic ATTRIBUTE_UNUSED;
 {
   /* Not supported yet.  */
-  return false;
+  return FALSE;
  /* bfd_xcoff_archive_set_magic (abfd, magic); */
 }
 
 /* Read in the armap of an XCOFF archive.  */
 
-boolean
+bfd_boolean
 _bfd_xcoff_slurp_armap (abfd)
      bfd *abfd;
 {
@@ -1095,8 +1125,8 @@ _bfd_xcoff_slurp_armap (abfd)
 
   if (xcoff_ardata (abfd) == NULL)
     {
-      bfd_has_map (abfd) = false;
-      return true;
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
     }
 
   if (! xcoff_big_format_p (abfd))
@@ -1107,32 +1137,32 @@ _bfd_xcoff_slurp_armap (abfd)
       off = strtol (xcoff_ardata (abfd)->symoff, (char **) NULL, 10);
       if (off == 0)
 	{
-	  bfd_has_map (abfd) = false;
-	  return true;
+	  bfd_has_map (abfd) = FALSE;
+	  return TRUE;
 	}
 
       if (bfd_seek (abfd, off, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       /* The symbol table starts with a normal archive header.  */
       if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
 	  != SIZEOF_AR_HDR)
-	return false;
+	return FALSE;
 
       /* Skip the name (normally empty).  */
       namlen = strtol (hdr.namlen, (char **) NULL, 10);
       off = ((namlen + 1) & ~ (size_t) 1) + SXCOFFARFMAG;
       if (bfd_seek (abfd, off, SEEK_CUR) != 0)
-	return false;
+	return FALSE;
 
       sz = strtol (hdr.size, (char **) NULL, 10);
 
       /* Read in the entire symbol table.  */
       contents = (bfd_byte *) bfd_alloc (abfd, sz);
       if (contents == NULL)
-	return false;
+	return FALSE;
       if (bfd_bread ((PTR) contents, sz, abfd) != sz)
-	return false;
+	return FALSE;
 
       /* The symbol table starts with a four byte count.  */
       c = H_GET_32 (abfd, contents);
@@ -1140,13 +1170,13 @@ _bfd_xcoff_slurp_armap (abfd)
       if (c * 4 >= sz)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       bfd_ardata (abfd)->symdefs =
 	((carsym *) bfd_alloc (abfd, c * sizeof (carsym)));
       if (bfd_ardata (abfd)->symdefs == NULL)
-	return false;
+	return FALSE;
 
       /* After the count comes a list of four byte file offsets.  */
       for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 4;
@@ -1162,23 +1192,23 @@ _bfd_xcoff_slurp_armap (abfd)
       off = strtol (xcoff_ardata_big (abfd)->symoff, (char **) NULL, 10);
       if (off == 0)
 	{
-	  bfd_has_map (abfd) = false;
-	  return true;
+	  bfd_has_map (abfd) = FALSE;
+	  return TRUE;
 	}
 
       if (bfd_seek (abfd, off, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       /* The symbol table starts with a normal archive header.  */
       if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
 	  != SIZEOF_AR_HDR_BIG)
-	return false;
+	return FALSE;
 
       /* Skip the name (normally empty).  */
       namlen = strtol (hdr.namlen, (char **) NULL, 10);
       off = ((namlen + 1) & ~ (size_t) 1) + SXCOFFARFMAG;
       if (bfd_seek (abfd, off, SEEK_CUR) != 0)
-	return false;
+	return FALSE;
 
       /* XXX This actually has to be a call to strtoll (at least on 32-bit
 	 machines) since the field width is 20 and there numbers with more
@@ -1188,9 +1218,9 @@ _bfd_xcoff_slurp_armap (abfd)
       /* Read in the entire symbol table.  */
       contents = (bfd_byte *) bfd_alloc (abfd, sz);
       if (contents == NULL)
-	return false;
+	return FALSE;
       if (bfd_bread ((PTR) contents, sz, abfd) != sz)
-	return false;
+	return FALSE;
 
       /* The symbol table starts with an eight byte count.  */
       c = H_GET_64 (abfd, contents);
@@ -1198,13 +1228,13 @@ _bfd_xcoff_slurp_armap (abfd)
       if (c * 8 >= sz)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       bfd_ardata (abfd)->symdefs =
 	((carsym *) bfd_alloc (abfd, c * sizeof (carsym)));
       if (bfd_ardata (abfd)->symdefs == NULL)
-	return false;
+	return FALSE;
 
       /* After the count comes a list of eight byte file offsets.  */
       for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 8;
@@ -1222,15 +1252,15 @@ _bfd_xcoff_slurp_armap (abfd)
       if (p >= cend)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       arsym->name = (char *) p;
     }
 
   bfd_ardata (abfd)->symdef_count = c;
-  bfd_has_map (abfd) = true;
+  bfd_has_map (abfd) = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* See if this is an XCOFF archive.  */
@@ -1546,7 +1576,7 @@ normalize_filename (abfd)
 /* Write out an XCOFF armap.  */
 
 /*ARGSUSED*/
-static boolean
+static bfd_boolean
 xcoff_write_armap_old (abfd, elength, map, orl_count, stridx)
      bfd *abfd;
      unsigned int elength ATTRIBUTE_UNUSED;
@@ -1580,11 +1610,11 @@ xcoff_write_armap_old (abfd, elength, map, orl_count, stridx)
       != SIZEOF_AR_HDR
       || (bfd_bwrite (XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
 	  != SXCOFFARFMAG))
-    return false;
+    return FALSE;
 
   H_PUT_32 (abfd, orl_count, buf);
   if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
-    return false;
+    return FALSE;
 
   sub = abfd->archive_head;
   fileoff = SIZEOF_AR_FILE_HDR;
@@ -1597,7 +1627,7 @@ xcoff_write_armap_old (abfd, elength, map, orl_count, stridx)
 	{
 	  H_PUT_32 (abfd, fileoff, buf);
 	  if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
-	    return false;
+	    return FALSE;
 	  ++i;
 	}
       namlen = strlen (normalize_filename (sub));
@@ -1618,7 +1648,7 @@ xcoff_write_armap_old (abfd, elength, map, orl_count, stridx)
       name = *map[i].name;
       namlen = strlen (name);
       if (bfd_bwrite (name, (bfd_size_type) (namlen + 1), abfd) != namlen + 1)
-	return false;
+	return FALSE;
     }
 
   if ((stridx & 1) != 0)
@@ -1627,10 +1657,10 @@ xcoff_write_armap_old (abfd, elength, map, orl_count, stridx)
 
       b = '\0';
       if (bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 static char buff20[XCOFFARMAGBIG_ELEMENT_SIZE + 1];
@@ -1659,7 +1689,7 @@ static char buff20[XCOFFARMAGBIG_ELEMENT_SIZE + 1];
   memcpy (buff20, (d), 20), \
   (v) = bfd_scan_vma (buff20, (const char **) NULL, 10)
 
-static boolean
+static bfd_boolean
 do_pad (abfd, number)
      bfd *abfd;
      unsigned int number;
@@ -1668,16 +1698,16 @@ do_pad (abfd, number)
 
   /* Limit pad to <= 4096.  */
   if (number > 4096)
-    return false;
+    return FALSE;
 
   while (number--)
     if (bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
-      return false;
+      return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 do_copy (out_bfd, in_bfd)
      bfd *out_bfd;
      bfd *in_bfd;
@@ -1686,7 +1716,7 @@ do_copy (out_bfd, in_bfd)
   bfd_byte buffer[DEFAULT_BUFFERSIZE];
 
   if (bfd_seek (in_bfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   remaining = arelt_size (in_bfd);
 
@@ -1694,7 +1724,7 @@ do_copy (out_bfd, in_bfd)
     {
       if (bfd_bread (buffer, DEFAULT_BUFFERSIZE, in_bfd) != DEFAULT_BUFFERSIZE
 	  || bfd_bwrite (buffer, DEFAULT_BUFFERSIZE, out_bfd) != DEFAULT_BUFFERSIZE)
-	return false;
+	return FALSE;
 
       remaining -= DEFAULT_BUFFERSIZE;
     }
@@ -1703,13 +1733,13 @@ do_copy (out_bfd, in_bfd)
     {
       if (bfd_bread (buffer, remaining, in_bfd) != remaining
 	  || bfd_bwrite (buffer, remaining, out_bfd) != remaining)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 do_shared_object_padding (out_bfd, in_bfd, offset, ar_header_size)
      bfd *out_bfd;
      bfd *in_bfd;
@@ -1729,15 +1759,15 @@ do_shared_object_padding (out_bfd, in_bfd, offset, ar_header_size)
       pad -= (*offset + ar_header_size) & (pad - 1);
 
       if (! do_pad (out_bfd, pad))
-	return false;
+	return FALSE;
 
       *offset += pad;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 xcoff_write_armap_big (abfd, elength, map, orl_count, stridx)
      bfd *abfd;
      unsigned int elength ATTRIBUTE_UNUSED;
@@ -1834,7 +1864,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx)
       symbol_table = NULL;
       symbol_table = (bfd_byte *) bfd_zmalloc (symbol_table_size);
       if (symbol_table == NULL)
-	return false;
+	return FALSE;
 
       hdr = (struct xcoff_ar_hdr_big *) symbol_table;
 
@@ -1937,7 +1967,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx)
       symbol_table = NULL;
       symbol_table = (bfd_byte *) bfd_zmalloc (symbol_table_size);
       if (symbol_table == NULL)
-	return false;
+	return FALSE;
 
       hdr = (struct xcoff_ar_hdr_big *) symbol_table;
 
@@ -2017,10 +2047,10 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx)
   else
     PRINT20 (fhdr->symoff64, 0);
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 _bfd_xcoff_write_armap (abfd, elength, map, orl_count, stridx)
      bfd *abfd;
      unsigned int elength ATTRIBUTE_UNUSED;
@@ -2037,7 +2067,7 @@ _bfd_xcoff_write_armap (abfd, elength, map, orl_count, stridx)
 /* Write out an XCOFF archive.  We always write an entire archive,
    rather than fussing with the freelist and so forth.  */
 
-static boolean
+static bfd_boolean
 xcoff_write_archive_contents_old (abfd)
      bfd *abfd;
 {
@@ -2045,8 +2075,8 @@ xcoff_write_archive_contents_old (abfd)
   bfd_size_type count;
   bfd_size_type total_namlen;
   file_ptr *offsets;
-  boolean makemap;
-  boolean hasobjects;
+  bfd_boolean makemap;
+  bfd_boolean hasobjects;
   ufile_ptr prevoff, nextoff;
   bfd *sub;
   size_t i;
@@ -2069,13 +2099,13 @@ xcoff_write_archive_contents_old (abfd)
     }
   offsets = (file_ptr *) bfd_alloc (abfd, count * sizeof (file_ptr));
   if (offsets == NULL)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, (file_ptr) SIZEOF_AR_FILE_HDR, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   makemap = bfd_has_map (abfd);
-  hasobjects = false;
+  hasobjects = FALSE;
   prevoff = 0;
   nextoff = SIZEOF_AR_FILE_HDR;
   for (sub = abfd->archive_head, i = 0; sub != NULL; sub = sub->next, i++)
@@ -2088,7 +2118,7 @@ xcoff_write_archive_contents_old (abfd)
       if (makemap && ! hasobjects)
 	{
 	  if (bfd_check_format (sub, bfd_object))
-	    hasobjects = true;
+	    hasobjects = TRUE;
 	}
 
       name = normalize_filename (sub);
@@ -2108,7 +2138,7 @@ xcoff_write_archive_contents_old (abfd)
 	  if (stat (bfd_get_filename (sub), &s) != 0)
 	    {
 	      bfd_set_error (bfd_error_system_call);
-	      return false;
+	      return FALSE;
 	    }
 
 	  sprintf (ahdrp->size, "%ld", (long) s.st_size);
@@ -2122,7 +2152,7 @@ xcoff_write_archive_contents_old (abfd)
 	      size = sizeof (struct areltdata);
 	      sub->arelt_data = bfd_alloc (sub, size);
 	      if (sub->arelt_data == NULL)
-		return false;
+		return FALSE;
 	    }
 
 	  arch_eltdata (sub)->parsed_size = s.st_size;
@@ -2157,19 +2187,19 @@ xcoff_write_archive_contents_old (abfd)
 
       if ((bfd_bwrite ((PTR) ahdrp, (bfd_size_type) SIZEOF_AR_HDR, abfd)
 	   != SIZEOF_AR_HDR)
-	  || (bfd_bwrite ((PTR) name, namlen, abfd) != namlen)
-	  || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
-	      != SXCOFFARFMAG))
-	return false;
+	  || bfd_bwrite ((PTR) name, namlen, abfd) != namlen
+	  || bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG,
+			 abfd) != SXCOFFARFMAG)
+	return FALSE;
 
       if (bfd_seek (sub, (file_ptr) 0, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       if (! do_copy (abfd, sub))
-	return false;
+	return FALSE;
 
       if (! do_pad (abfd, size & 1))
-	return false;
+	return FALSE;
     }
 
   sprintf (fhdr.lastmemoff, "%ld", (long) prevoff);
@@ -2213,18 +2243,18 @@ xcoff_write_archive_contents_old (abfd)
        != SIZEOF_AR_HDR)
       || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
 	  != SXCOFFARFMAG))
-    return false;
+    return FALSE;
 
   sprintf (decbuf, "%-12ld", (long) count);
   if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) XCOFFARMAG_ELEMENT_SIZE, abfd)
       != XCOFFARMAG_ELEMENT_SIZE)
-    return false;
+    return FALSE;
   for (i = 0; i < (size_t) count; i++)
     {
       sprintf (decbuf, "%-12ld", (long) offsets[i]);
       if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) XCOFFARMAG_ELEMENT_SIZE,
 		      abfd) != XCOFFARMAG_ELEMENT_SIZE)
-	return false;
+	return FALSE;
     }
   for (sub = abfd->archive_head; sub != NULL; sub = sub->next)
     {
@@ -2234,11 +2264,11 @@ xcoff_write_archive_contents_old (abfd)
       name = normalize_filename (sub);
       namlen = strlen (name);
       if (bfd_bwrite ((PTR) name, namlen + 1, abfd) != namlen + 1)
-	return false;
+	return FALSE;
     }
 
   if (! do_pad (abfd, size & 1))
-    return false;
+    return FALSE;
 
   /* Write out the armap, if appropriate.  */
   if (! makemap || ! hasobjects)
@@ -2249,7 +2279,7 @@ xcoff_write_archive_contents_old (abfd)
       sprintf (fhdr.symoff, "%ld", (long) nextoff);
       bfd_ardata (abfd)->tdata = (PTR) &fhdr;
       if (! _bfd_compute_and_write_armap (abfd, 0))
-	return false;
+	return FALSE;
     }
 
   /* Write out the archive file header.  */
@@ -2262,12 +2292,12 @@ xcoff_write_archive_contents_old (abfd)
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
       || (bfd_bwrite ((PTR) &fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR, abfd)
 	  != SIZEOF_AR_FILE_HDR))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 xcoff_write_archive_contents_big (abfd)
      bfd *abfd;
 {
@@ -2275,8 +2305,8 @@ xcoff_write_archive_contents_big (abfd)
   bfd_size_type count;
   bfd_size_type total_namlen;
   file_ptr *offsets;
-  boolean makemap;
-  boolean hasobjects;
+  bfd_boolean makemap;
+  bfd_boolean hasobjects;
   ufile_ptr prevoff, nextoff;
   bfd *current_bfd;
   size_t i;
@@ -2289,11 +2319,11 @@ xcoff_write_archive_contents_big (abfd)
   memcpy (fhdr.magic, XCOFFARMAGBIG, SXCOFFARMAG);
 
   if (bfd_seek (abfd, (file_ptr) SIZEOF_AR_FILE_HDR_BIG, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   /* Calculate count and total_namlen.  */
   makemap = bfd_has_map (abfd);
-  hasobjects = false;
+  hasobjects = FALSE;
   for (current_bfd = abfd->archive_head, count = 0, total_namlen = 0;
        current_bfd != NULL;
        current_bfd = current_bfd->next, count++)
@@ -2303,7 +2333,7 @@ xcoff_write_archive_contents_big (abfd)
       if (makemap
 	  && ! hasobjects
 	  && bfd_check_format (current_bfd, bfd_object))
-	hasobjects = true;
+	hasobjects = TRUE;
     }
 
   offsets = NULL;
@@ -2311,7 +2341,7 @@ xcoff_write_archive_contents_big (abfd)
     {
       offsets = (file_ptr *) bfd_malloc (count * sizeof (file_ptr));
       if (offsets == NULL)
-	return false;
+	return FALSE;
     }
 
   prevoff = 0;
@@ -2344,7 +2374,7 @@ xcoff_write_archive_contents_big (abfd)
 	  if (stat (bfd_get_filename (current_bfd), &s) != 0)
 	    {
 	      bfd_set_error (bfd_error_system_call);
-	      return false;
+	      return FALSE;
 	    }
 
 	  PRINT20 (ahdrp->size, s.st_size);
@@ -2358,7 +2388,7 @@ xcoff_write_archive_contents_big (abfd)
 	      size = sizeof (struct areltdata);
 	      current_bfd->arelt_data = bfd_alloc (current_bfd, size);
 	      if (current_bfd->arelt_data == NULL)
-		return false;
+		return FALSE;
 	    }
 
 	  arch_eltdata (current_bfd)->parsed_size = s.st_size;
@@ -2385,7 +2415,7 @@ xcoff_write_archive_contents_big (abfd)
       if (! do_shared_object_padding (abfd, current_bfd, & nextoff,
 				      SIZEOF_AR_HDR_BIG + namlen
 				      + SXCOFFARFMAG))
-	return false;
+	return FALSE;
 
       offsets[i] = nextoff;
 
@@ -2399,16 +2429,16 @@ xcoff_write_archive_contents_big (abfd)
 	  || bfd_bwrite ((PTR) name, (bfd_size_type) namlen, abfd) != namlen
 	  || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG,
 			  abfd) != SXCOFFARFMAG))
-	return false;
+	return FALSE;
 
       if (bfd_seek (current_bfd, (file_ptr) 0, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       if (! do_copy (abfd, current_bfd))
-	return false;
+	return FALSE;
 
       if (! do_pad (abfd, size & 1))
-	return false;
+	return FALSE;
     }
 
   if (count)
@@ -2450,7 +2480,7 @@ xcoff_write_archive_contents_big (abfd)
   member_table = NULL;
   member_table = (bfd_byte *) bfd_zmalloc (member_table_size);
   if (member_table == NULL)
-    return false;
+    return FALSE;
 
   hdr = (struct xcoff_ar_hdr_big *) member_table;
 
@@ -2498,7 +2528,7 @@ xcoff_write_archive_contents_big (abfd)
     }
 
   if (bfd_bwrite (member_table, member_table_size, abfd) != member_table_size)
-    return false;
+    return FALSE;
 
   free (member_table);
   member_table = NULL;
@@ -2521,7 +2551,7 @@ xcoff_write_archive_contents_big (abfd)
 
       bfd_ardata (abfd)->tdata = (PTR) &fhdr;
       if (! _bfd_compute_and_write_armap (abfd, 0))
-	return false;
+	return FALSE;
     }
 
   /* Write out the archive file header.  */
@@ -2529,12 +2559,12 @@ xcoff_write_archive_contents_big (abfd)
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
       || (bfd_bwrite ((PTR) &fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR_BIG,
 		      abfd) != SIZEOF_AR_FILE_HDR_BIG))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 _bfd_xcoff_write_archive_contents (abfd)
      bfd *abfd;
 {
@@ -2550,7 +2580,7 @@ _bfd_xcoff_write_archive_contents (abfd)
 int
 _bfd_xcoff_sizeof_headers (abfd, reloc)
      bfd *abfd;
-     boolean reloc ATTRIBUTE_UNUSED;
+     bfd_boolean reloc ATTRIBUTE_UNUSED;
 {
   int size;
 
@@ -2725,7 +2755,7 @@ xcoff_swap_ldrel_out (abfd, src, d)
 }
 
 
-boolean
+bfd_boolean
 xcoff_reloc_type_noop (input_bfd, input_section, output_bfd, rel, sym, howto,
 		       val, addend, relocation, contents)
      bfd *input_bfd ATTRIBUTE_UNUSED;
@@ -2739,10 +2769,10 @@ xcoff_reloc_type_noop (input_bfd, input_section, output_bfd, rel, sym, howto,
      bfd_vma *relocation ATTRIBUTE_UNUSED;
      bfd_byte *contents ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 xcoff_reloc_type_fail (input_bfd, input_section, output_bfd, rel, sym, howto,
 		       val, addend, relocation, contents)
      bfd *input_bfd;
@@ -2760,10 +2790,10 @@ xcoff_reloc_type_fail (input_bfd, input_section, output_bfd, rel, sym, howto,
     (_("%s: unsupported relocation type 0x%02x"),
      bfd_get_filename (input_bfd), (unsigned int) rel->r_type);
   bfd_set_error (bfd_error_bad_value);
-  return false;
+  return FALSE;
 }
 
-boolean
+bfd_boolean
 xcoff_reloc_type_pos (input_bfd, input_section, output_bfd, rel, sym, howto,
 		      val, addend, relocation, contents)
      bfd *input_bfd ATTRIBUTE_UNUSED;
@@ -2778,10 +2808,10 @@ xcoff_reloc_type_pos (input_bfd, input_section, output_bfd, rel, sym, howto,
      bfd_byte *contents ATTRIBUTE_UNUSED;
 {
   *relocation = val + addend;
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 xcoff_reloc_type_neg (input_bfd, input_section, output_bfd, rel, sym, howto,
 		      val, addend, relocation, contents)
      bfd *input_bfd ATTRIBUTE_UNUSED;
@@ -2796,10 +2826,10 @@ xcoff_reloc_type_neg (input_bfd, input_section, output_bfd, rel, sym, howto,
      bfd_byte *contents ATTRIBUTE_UNUSED;
 {
   *relocation = addend - val;
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 xcoff_reloc_type_rel (input_bfd, input_section, output_bfd, rel, sym, howto,
 		      val, addend, relocation, contents)
      bfd *input_bfd ATTRIBUTE_UNUSED;
@@ -2813,7 +2843,7 @@ xcoff_reloc_type_rel (input_bfd, input_section, output_bfd, rel, sym, howto,
      bfd_vma *relocation;
      bfd_byte *contents ATTRIBUTE_UNUSED;
 {
-  howto->pc_relative = true;
+  howto->pc_relative = TRUE;
 
   /* A PC relative reloc includes the section address.  */
   addend += input_section->vma;
@@ -2821,10 +2851,10 @@ xcoff_reloc_type_rel (input_bfd, input_section, output_bfd, rel, sym, howto,
   *relocation = val + addend;
   *relocation -= (input_section->output_section->vma
 		  + input_section->output_offset);
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 xcoff_reloc_type_toc (input_bfd, input_section, output_bfd, rel, sym, howto,
 		      val, addend, relocation, contents)
      bfd *input_bfd;
@@ -2841,7 +2871,7 @@ xcoff_reloc_type_toc (input_bfd, input_section, output_bfd, rel, sym, howto,
   struct xcoff_link_hash_entry *h;
 
   if (0 > rel->r_symndx)
-    return false;
+    return FALSE;
 
   h = obj_xcoff_sym_hashes (input_bfd)[rel->r_symndx];
 
@@ -2854,7 +2884,7 @@ xcoff_reloc_type_toc (input_bfd, input_section, output_bfd, rel, sym, howto,
 	     bfd_get_filename (input_bfd), rel->r_vaddr,
 	     h->root.root.string);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       BFD_ASSERT ((h->flags & XCOFF_SET_TOC) == 0);
@@ -2864,10 +2894,10 @@ xcoff_reloc_type_toc (input_bfd, input_section, output_bfd, rel, sym, howto,
 
   *relocation = ((val - xcoff_data (output_bfd)->toc)
 		 - (sym->n_value - xcoff_data (input_bfd)->toc));
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 xcoff_reloc_type_ba (input_bfd, input_section, output_bfd, rel, sym, howto,
 		     val, addend, relocation, contents)
      bfd *input_bfd ATTRIBUTE_UNUSED;
@@ -2886,10 +2916,10 @@ xcoff_reloc_type_ba (input_bfd, input_section, output_bfd, rel, sym, howto,
 
   *relocation = val + addend;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 xcoff_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto,
 		     val, addend, relocation, contents)
      bfd *input_bfd;
@@ -2906,7 +2936,7 @@ xcoff_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto,
   struct xcoff_link_hash_entry *h;
 
   if (0 > rel->r_symndx)
-    return false;
+    return FALSE;
 
   h = obj_xcoff_sym_hashes (input_bfd)[rel->r_symndx];
 
@@ -2956,7 +2986,7 @@ xcoff_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto,
       howto->complain_on_overflow = complain_overflow_dont;
     }
 
-  howto->pc_relative = true;
+  howto->pc_relative = TRUE;
   howto->src_mask &= ~3;
   howto->dst_mask = howto->src_mask;
 
@@ -2966,10 +2996,10 @@ xcoff_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto,
   *relocation = val + addend;
   *relocation -= (input_section->output_section->vma
 		  + input_section->output_offset);
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 xcoff_reloc_type_crel (input_bfd, input_section, output_bfd, rel, sym, howto,
 		       val, addend, relocation, contents)
      bfd *input_bfd ATTRIBUTE_UNUSED;
@@ -2983,7 +3013,7 @@ xcoff_reloc_type_crel (input_bfd, input_section, output_bfd, rel, sym, howto,
      bfd_vma *relocation;
      bfd_byte *contents ATTRIBUTE_UNUSED;
 {
-  howto->pc_relative = true;
+  howto->pc_relative = TRUE;
   howto->src_mask &= ~3;
   howto->dst_mask = howto->src_mask;
 
@@ -2993,20 +3023,20 @@ xcoff_reloc_type_crel (input_bfd, input_section, output_bfd, rel, sym, howto,
   *relocation = val + addend;
   *relocation -= (input_section->output_section->vma
 		  + input_section->output_offset);
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 xcoff_complain_overflow_dont_func (input_bfd, val, relocation, howto)
      bfd *input_bfd ATTRIBUTE_UNUSED;
      bfd_vma val ATTRIBUTE_UNUSED;
      bfd_vma relocation ATTRIBUTE_UNUSED;
      struct reloc_howto_struct *howto ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
 
-static boolean
+static bfd_boolean
 xcoff_complain_overflow_bitfield_func (input_bfd, val, relocation, howto)
      bfd *input_bfd;
      bfd_vma val;
@@ -3054,7 +3084,7 @@ xcoff_complain_overflow_bitfield_func (input_bfd, val, relocation, howto)
 	 ones, we are OK, assuming a signed bitfield.  */
       ss = (signmask << howto->rightshift) - 1;
       if ((ss | relocation) != ~ (bfd_vma) 0)
-	return true;
+	return TRUE;
       a &= fieldmask;
     }
 
@@ -3067,7 +3097,7 @@ xcoff_complain_overflow_bitfield_func (input_bfd, val, relocation, howto)
      away from the location at which it is linked.  */
   if (howto->bitsize + howto->rightshift
       == bfd_arch_bits_per_address (input_bfd))
-    return false;
+    return FALSE;
 
   sum = a + b;
   if (sum < a || (sum & ~ fieldmask) != 0)
@@ -3076,13 +3106,13 @@ xcoff_complain_overflow_bitfield_func (input_bfd, val, relocation, howto)
 	 for signed operands again.  Here is the overflow test
 	 is as for complain_overflow_signed.  */
       if (((~ (a ^ b)) & (a ^ sum)) & signmask)
-	return true;
+	return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
 
-static boolean
+static bfd_boolean
 xcoff_complain_overflow_signed_func (input_bfd, val, relocation, howto)
      bfd *input_bfd;
      bfd_vma val;
@@ -3109,7 +3139,7 @@ xcoff_complain_overflow_signed_func (input_bfd, val, relocation, howto)
   signmask = ~ (fieldmask >> 1);
   ss = a & signmask;
   if (ss != 0 && ss != ((addrmask >> howto->rightshift) & signmask))
-    return true;
+    return TRUE;
 
   /* We only need this next bit of code if the sign bit of B
      is below the sign bit of A.  This would only happen if
@@ -3139,12 +3169,12 @@ xcoff_complain_overflow_signed_func (input_bfd, val, relocation, howto)
   */
   signmask = (fieldmask >> 1) + 1;
   if (((~ (a ^ b)) & (a ^ sum)) & signmask)
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
-static boolean
+static bfd_boolean
 xcoff_complain_overflow_unsigned_func (input_bfd, val, relocation, howto)
      bfd *input_bfd;
      bfd_vma val;
@@ -3178,9 +3208,9 @@ xcoff_complain_overflow_unsigned_func (input_bfd, val, relocation, howto)
   b = (b & addrmask) >> howto->bitpos;
   sum = (a + b) & addrmask;
   if ((a | b | sum) & ~ fieldmask)
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* This is the relocation function for the RS/6000/POWER/PowerPC.
@@ -3296,7 +3326,7 @@ xcoff_complain_overflow_unsigned_func (input_bfd, val, relocation, howto)
    this is the same as R_POS.
 */
 
-boolean
+bfd_boolean
 xcoff_ppc_relocate_section (output_bfd, info, input_bfd,
 			    input_section, contents, relocs, syms,
 			    sections)
@@ -3338,16 +3368,16 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd,
       howto.rightshift = 0;
       howto.bitsize = (rel->r_size & 0x1f) + 1;
       howto.size = howto.bitsize > 16 ? 2 : 1;
-      howto.pc_relative = false;
+      howto.pc_relative = FALSE;
       howto.bitpos = 0;
       howto.complain_on_overflow = (rel->r_size & 0x80
 				    ? complain_overflow_signed
 				    : complain_overflow_bitfield);
       howto.special_function = NULL;
       howto.name = "internal";
-      howto.partial_inplace = true;
+      howto.partial_inplace = TRUE;
       howto.src_mask = howto.dst_mask = N_ONES (howto.bitsize);
-      howto.pcrel_offset = false;
+      howto.pcrel_offset = FALSE;
 
       /* symbol */
       val = 0;
@@ -3400,8 +3430,8 @@ xcoff_ppc_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;
 
 		  /* Don't try to process the reloc.  It can't help, and
 		     it may generate another error.  */
@@ -3414,7 +3444,7 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd,
 	  || !((*xcoff_calculate_relocation[rel->r_type])
 	       (input_bfd, input_section, output_bfd, rel, sym, &howto, val,
 		addend, &relocation, contents)))
-	return false;
+	return FALSE;
 
       /* address */
       address = rel->r_vaddr - input_section->vma;
@@ -3466,7 +3496,7 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd,
 	  if (! ((*info->callbacks->reloc_overflow)
 		 (info, name, reloc_type_name, (bfd_vma) 0, input_bfd,
 		  input_section, rel->r_vaddr - input_section->vma)))
-	    return false;
+	    return FALSE;
 	}
 
       /* Add RELOCATION to the right bits of VALUE_TO_RELOCATE.  */
@@ -3481,10 +3511,10 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd,
 	bfd_put_32 (input_bfd, value_to_relocate, location);
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 _bfd_xcoff_put_ldsymbol_name (abfd, ldinfo, ldsym, name)
      bfd *abfd ATTRIBUTE_UNUSED;
 	 struct xcoff_loader_info *ldinfo;
@@ -3513,8 +3543,8 @@ _bfd_xcoff_put_ldsymbol_name (abfd, ldinfo, ldsym, name)
 			bfd_realloc ((PTR) ldinfo->strings, newalc));
 	  if (newstrings == NULL)
 	    {
-	      ldinfo->failed = true;
-	      return false;
+	      ldinfo->failed = TRUE;
+	      return FALSE;
 	    }
 	  ldinfo->string_alc = newalc;
 	  ldinfo->strings = newstrings;
@@ -3528,10 +3558,10 @@ _bfd_xcoff_put_ldsymbol_name (abfd, ldinfo, ldsym, name)
       ldinfo->string_size += len + 3;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 _bfd_xcoff_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab,
 			    struct internal_syment *sym,
 			    const char *name)
@@ -3542,19 +3572,19 @@ _bfd_xcoff_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab,
     }
   else
     {
-      boolean hash;
+      bfd_boolean hash;
       bfd_size_type indx;
 
-      hash = true;
+      hash = TRUE;
       if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-	hash = false;
-      indx = _bfd_stringtab_add (strtab, name, hash, false);
+	hash = FALSE;
+      indx = _bfd_stringtab_add (strtab, name, hash, FALSE);
       if (indx == (bfd_size_type) -1)
-	return false;
+	return FALSE;
       sym->_n._n_n._n_zeroes = 0;
       sym->_n._n_n._n_offset = STRING_SIZE_SIZE + indx;
     }
-  return true;
+  return TRUE;
 }
 
 static asection *
@@ -3591,26 +3621,26 @@ xcoff_create_csect_from_smclas (abfd, aux, symbol_name)
   return return_value;
 }
 
-static boolean
+static bfd_boolean
 xcoff_is_lineno_count_overflow (abfd, value)
     bfd *abfd ATTRIBUTE_UNUSED;
 	bfd_vma value;
 {
   if (0xffff <= value)
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
-static boolean
+static bfd_boolean
 xcoff_is_reloc_count_overflow (abfd, value)
     bfd *abfd ATTRIBUTE_UNUSED;
 	bfd_vma value;
 {
   if (0xffff <= value)
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 static bfd_vma
@@ -3629,12 +3659,12 @@ xcoff_loader_reloc_offset (abfd, ldhdr)
   return bfd_xcoff_ldhdrsz (abfd) + ldhdr->l_nsyms * bfd_xcoff_ldsymsz (abfd);
 }
 
-static boolean
+static bfd_boolean
 xcoff_generate_rtinit  (abfd, init, fini, rtld)
      bfd *abfd;
      const char *init;
      const char *fini;
-     boolean rtld;
+     bfd_boolean rtld;
 {
   bfd_byte filehdr_ext[FILHSZ];
   bfd_byte scnhdr_ext[SCNHSZ];
@@ -3657,7 +3687,7 @@ xcoff_generate_rtinit  (abfd, init, fini, rtld)
   char *rtld_name = "__rtld";
 
   if (! bfd_xcoff_rtinit_size (abfd))
-    return false;
+    return FALSE;
 
   initsz = (init == NULL ? 0 : 1 + strlen (init));
   finisz = (fini == NULL ? 0 : 1 + strlen (fini));
@@ -3712,7 +3742,7 @@ xcoff_generate_rtinit  (abfd, init, fini, rtld)
   data_buffer = NULL;
   data_buffer = (bfd_byte *) bfd_zmalloc (data_buffer_size);
   if (data_buffer == NULL)
-    return false;
+    return FALSE;
 
   if (initsz)
     {
@@ -3748,7 +3778,7 @@ xcoff_generate_rtinit  (abfd, init, fini, rtld)
       string_table_size += 4;
       string_table = (bfd_byte *) bfd_zmalloc (string_table_size);
       if (string_table == NULL)
-	return false;
+	return FALSE;
 
       val = string_table_size;
       bfd_h_put_32 (abfd, val, &string_table[0]);
@@ -3909,7 +3939,7 @@ xcoff_generate_rtinit  (abfd, init, fini, rtld)
   free (data_buffer);
   data_buffer = NULL;
 
-  return true;
+  return TRUE;
 }
 
 
@@ -3918,15 +3948,15 @@ HOWTO (0,			/* type */
        0,			/* rightshift */
        2,			/* size (0 = byte, 1 = short, 2 = long) */
        32,			/* bitsize */
-       false,			/* pc_relative */
+       FALSE,			/* pc_relative */
        0,			/* bitpos */
        complain_overflow_bitfield, /* complain_on_overflow */
        0,			/* special_function */
        "R_POS",			/* name */
-       true,			/* partial_inplace */
+       TRUE,			/* partial_inplace */
        0xffffffff,		/* src_mask */
        0xffffffff,		/* dst_mask */
-       false);			/* pcrel_offset */
+       FALSE);			/* pcrel_offset */
 
 /*  glink
 
@@ -3968,10 +3998,10 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data =
       RELSZ,
       LINESZ,
       FILNMLEN,
-      true,			/* _bfd_coff_long_filenames */
-      false,			/* _bfd_coff_long_section_names */
+      TRUE,			/* _bfd_coff_long_filenames */
+      FALSE,			/* _bfd_coff_long_section_names */
       3,			/* _bfd_coff_default_section_alignment_power */
-      false,			/* _bfd_coff_force_symnames_in_strings */
+      FALSE,			/* _bfd_coff_force_symnames_in_strings */
       2,			/* _bfd_coff_debug_string_prefix_length */
       coff_swap_filehdr_in,
       coff_swap_aouthdr_in,
@@ -4110,11 +4140,11 @@ const bfd_target rs6000coff_vec =
 
     /* Copy */
     _bfd_xcoff_copy_private_bfd_data,
-    ((boolean (*) (bfd *, bfd *)) bfd_true),
-    ((boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
-    ((boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
-    ((boolean (*) (bfd *, flagword)) bfd_true),
-    ((boolean (*) (bfd *, void * )) bfd_true),
+    ((bfd_boolean (*) (bfd *, bfd *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, flagword)) bfd_true),
+    ((bfd_boolean (*) (bfd *, void * )) bfd_true),
 
     /* Core */
     coff_core_file_failing_command,
@@ -4124,7 +4154,7 @@ const bfd_target rs6000coff_vec =
     /* Archive */
     _bfd_xcoff_slurp_armap,
     bfd_false,
-    ((boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
+    ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
     bfd_dont_truncate_arname,
     _bfd_xcoff_write_armap,
     _bfd_xcoff_read_ar_hdr,
@@ -4210,10 +4240,10 @@ static const struct xcoff_backend_data_rec bfd_pmac_xcoff_backend_data =
       RELSZ,
       LINESZ,
       FILNMLEN,
-      true,			/* _bfd_coff_long_filenames */
-      false,			/* _bfd_coff_long_section_names */
+      TRUE,			/* _bfd_coff_long_filenames */
+      FALSE,			/* _bfd_coff_long_section_names */
       3,			/* _bfd_coff_default_section_alignment_power */
-      false,			/* _bfd_coff_force_symnames_in_strings */
+      FALSE,			/* _bfd_coff_force_symnames_in_strings */
       2,			/* _bfd_coff_debug_string_prefix_length */
       coff_swap_filehdr_in,
       coff_swap_aouthdr_in,
@@ -4352,11 +4382,11 @@ const bfd_target pmac_xcoff_vec =
 
     /* Copy */
     _bfd_xcoff_copy_private_bfd_data,
-    ((boolean (*) (bfd *, bfd *)) bfd_true),
-    ((boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
-    ((boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
-    ((boolean (*) (bfd *, flagword)) bfd_true),
-    ((boolean (*) (bfd *, void * )) bfd_true),
+    ((bfd_boolean (*) (bfd *, bfd *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, flagword)) bfd_true),
+    ((bfd_boolean (*) (bfd *, void * )) bfd_true),
 
     /* Core */
     coff_core_file_failing_command,
@@ -4366,7 +4396,7 @@ const bfd_target pmac_xcoff_vec =
     /* Archive */
     _bfd_xcoff_slurp_armap,
     bfd_false,
-    ((boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
+    ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
     bfd_dont_truncate_arname,
     _bfd_xcoff_write_armap,
     _bfd_xcoff_read_ar_hdr,
diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c
index d1dc4fdbcf7..8a4723fb064 100644
--- a/bfd/coff-sh.c
+++ b/bfd/coff-sh.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Hitachi Super-H COFF binaries.
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by Cygnus Support.
    Written by Steve Chamberlain, <sac@cygnus.com>.
@@ -33,10 +33,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "coff/pe.h"
 
 #ifndef COFF_IMAGE_WITH_PE
-static boolean sh_align_load_span
+static bfd_boolean sh_align_load_span
   PARAMS ((bfd *, asection *, bfd_byte *,
-	   boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
-	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, boolean *));
+	   bfd_boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
+	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *));
 
 #define _bfd_sh_align_load_span sh_align_load_span
 #endif
@@ -48,23 +48,24 @@ static boolean sh_align_load_span
 static bfd_reloc_status_type sh_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static long get_symbol_value PARAMS ((asymbol *));
-static boolean sh_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static boolean sh_relax_delete_bytes
+static bfd_boolean sh_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean sh_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, int));
 #ifndef COFF_IMAGE_WITH_PE
 static const struct sh_opcode *sh_insn_info PARAMS ((unsigned int));
 #endif
-static boolean sh_align_loads
-  PARAMS ((bfd *, asection *, struct internal_reloc *, bfd_byte *, boolean *));
-static boolean sh_swap_insns
+static bfd_boolean sh_align_loads
+  PARAMS ((bfd *, asection *, struct internal_reloc *, bfd_byte *,
+	   bfd_boolean *));
+static bfd_boolean sh_swap_insns
   PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
-static boolean sh_relocate_section
+static bfd_boolean sh_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 static bfd_byte *sh_coff_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
+	   bfd_byte *, bfd_boolean, asymbol **));
 static reloc_howto_type * sh_coff_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
 
 #ifdef COFF_WITH_PE
@@ -84,10 +85,10 @@ static reloc_howto_type * sh_coff_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_co
 #define COFF_LONG_FILENAMES
 
 #ifdef COFF_WITH_PE
-static boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
-/* Return true if this relocation should
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+/* Return TRUE if this relocation should
    appear in the output .reloc section.  */
-static boolean in_reloc_p (abfd, howto)
+static bfd_boolean in_reloc_p (abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type * howto;
 {
@@ -107,15 +108,15 @@ static reloc_howto_type sh_coff_howtos[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_imm32ce",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #else
   EMPTY_HOWTO (2),
 #endif
@@ -131,15 +132,15 @@ static reloc_howto_type sh_coff_howtos[] =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_pcdisp8by2",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   EMPTY_HOWTO (11), /* R_SH_PCDISP8 */
 
@@ -147,15 +148,15 @@ static reloc_howto_type sh_coff_howtos[] =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_pcdisp12by2",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xfff,			/* src_mask */
 	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   EMPTY_HOWTO (13),
 
@@ -163,15 +164,15 @@ static reloc_howto_type sh_coff_howtos[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_imm32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (15),
 #ifdef COFF_WITH_PE
@@ -179,15 +180,15 @@ static reloc_howto_type sh_coff_howtos[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,       	/* special_function */
 	 "rva32",	        /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 #else
   EMPTY_HOWTO (16), /* R_SH_IMM8 */
 #endif
@@ -201,169 +202,169 @@ static reloc_howto_type sh_coff_howtos[] =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_pcrelimm8by2",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_SH_PCRELIMM8BY4,	/* type */
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_pcrelimm8by4",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_SH_IMM16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_imm16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_SWITCH16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_switch16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_SWITCH32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_switch32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_USES,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_uses",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_COUNT,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_count",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_ALIGN,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_align",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_CODE,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_code",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_DATA,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_data",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_LABEL,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_label",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_SWITCH8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_reloc,		/* special_function */
 	 "r_switch8",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 false)			/* pcrel_offset */
+	 FALSE)			/* pcrel_offset */
 };
 
 #define SH_COFF_HOWTO_COUNT (sizeof sh_coff_howtos / sizeof sh_coff_howtos[0])
@@ -689,26 +690,26 @@ sh_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
    align load and store instructions on four byte boundaries if we
    can, by swapping them with one of the adjacent instructions.  */
 
-static boolean
+static bfd_boolean
 sh_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   struct internal_reloc *internal_relocs;
   struct internal_reloc *free_relocs = NULL;
-  boolean have_code;
+  bfd_boolean have_code;
   struct internal_reloc *irel, *irelend;
   bfd_byte *contents = NULL;
   bfd_byte *free_contents = NULL;
 
-  *again = false;
+  *again = FALSE;
 
   if (link_info->relocateable
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -717,14 +718,14 @@ sh_relax_section (abfd, sec, link_info, again)
 
   internal_relocs = (_bfd_coff_read_internal_relocs
 		     (abfd, sec, link_info->keep_memory,
-		      (bfd_byte *) NULL, false,
+		      (bfd_byte *) NULL, FALSE,
 		      (struct internal_reloc *) NULL));
   if (internal_relocs == NULL)
     goto error_return;
   if (! link_info->keep_memory)
     free_relocs = internal_relocs;
 
-  have_code = false;
+  have_code = FALSE;
 
   irelend = internal_relocs + sec->reloc_count;
   for (irel = internal_relocs; irel < irelend; irel++)
@@ -736,7 +737,7 @@ sh_relax_section (abfd, sec, link_info, again)
       bfd_signed_vma foff;
 
       if (irel->r_type == R_SH_CODE)
-	have_code = true;
+	have_code = TRUE;
 
       if (irel->r_type != R_SH_USES)
 	continue;
@@ -902,14 +903,14 @@ sh_relax_section (abfd, sec, link_info, again)
 	}
 
       coff_section_data (abfd, sec)->relocs = internal_relocs;
-      coff_section_data (abfd, sec)->keep_relocs = true;
+      coff_section_data (abfd, sec)->keep_relocs = TRUE;
       free_relocs = NULL;
 
       coff_section_data (abfd, sec)->contents = contents;
-      coff_section_data (abfd, sec)->keep_contents = true;
+      coff_section_data (abfd, sec)->keep_contents = TRUE;
       free_contents = NULL;
 
-      obj_coff_keep_syms (abfd) = true;
+      obj_coff_keep_syms (abfd) = TRUE;
 
       /* Replace the jsr with a bsr.  */
 
@@ -965,7 +966,7 @@ sh_relax_section (abfd, sec, link_info, again)
       /* That will change things, so, just in case it permits some
          other function call to come within range, we should relax
          again.  Note that this is not required, and it may be slow.  */
-      *again = true;
+      *again = TRUE;
 
       /* Now check whether we got a COUNT reloc.  */
       if (irelcount >= irelend)
@@ -1005,7 +1006,7 @@ sh_relax_section (abfd, sec, link_info, again)
      byte boundaries.  */
   if (have_code)
     {
-      boolean swapped;
+      bfd_boolean swapped;
 
       /* Get the section contents.  */
       if (contents == NULL)
@@ -1040,14 +1041,14 @@ sh_relax_section (abfd, sec, link_info, again)
 	    }
 
 	  coff_section_data (abfd, sec)->relocs = internal_relocs;
-	  coff_section_data (abfd, sec)->keep_relocs = true;
+	  coff_section_data (abfd, sec)->keep_relocs = TRUE;
 	  free_relocs = NULL;
 
 	  coff_section_data (abfd, sec)->contents = contents;
-	  coff_section_data (abfd, sec)->keep_contents = true;
+	  coff_section_data (abfd, sec)->keep_contents = TRUE;
 	  free_contents = NULL;
 
-	  obj_coff_keep_syms (abfd) = true;
+	  obj_coff_keep_syms (abfd) = TRUE;
 	}
     }
 
@@ -1076,19 +1077,19 @@ sh_relax_section (abfd, sec, link_info, again)
 	}
     }
 
-  return true;
+  return TRUE;
 
  error_return:
   if (free_relocs != NULL)
     free (free_relocs);
   if (free_contents != NULL)
     free (free_contents);
-  return false;
+  return FALSE;
 }
 
 /* Delete some bytes from a section while relaxing.  */
 
-static boolean
+static bfd_boolean
 sh_relax_delete_bytes (abfd, sec, addr, count)
      bfd *abfd;
      asection *sec;
@@ -1151,7 +1152,7 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
       struct internal_syment sym;
       int off, adjust, oinsn;
       bfd_signed_vma voff = 0;
-      boolean overflow;
+      bfd_boolean overflow;
 
       /* Get the new reloc address.  */
       nraddr = irel->r_vaddr - sec->vma;
@@ -1313,7 +1314,7 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
       if (adjust != 0)
 	{
 	  oinsn = insn;
-	  overflow = false;
+	  overflow = FALSE;
 	  switch (irel->r_type)
 	    {
 	    default:
@@ -1324,14 +1325,14 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
 	    case R_SH_PCRELIMM8BY2:
 	      insn += adjust / 2;
 	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
 	      break;
 
 	    case R_SH_PCDISP:
 	      insn += adjust / 2;
 	      if ((oinsn & 0xf000) != (insn & 0xf000))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
 	      break;
 
@@ -1345,21 +1346,21 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
 		    ++insn;
 		}
 	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
 	      break;
 
 	    case R_SH_SWITCH8:
 	      voff += adjust;
 	      if (voff < 0 || voff >= 0xff)
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_8 (abfd, (bfd_vma) voff, contents + nraddr);
 	      break;
 
 	    case R_SH_SWITCH16:
 	      voff += adjust;
 	      if (voff < - 0x8000 || voff >= 0x8000)
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_signed_16 (abfd, (bfd_vma) voff, contents + nraddr);
 	      break;
 
@@ -1379,7 +1380,7 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
 	       ("%s: 0x%lx: fatal: reloc overflow while relaxing",
 		bfd_archive_filename (abfd), (unsigned long) irel->r_vaddr));
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	}
 
@@ -1401,13 +1402,13 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
 	continue;
 
       /* We always cache the relocs.  Perhaps, if info->keep_memory is
-         false, we should free them, if we are permitted to, when we
+         FALSE, we should free them, if we are permitted to, when we
          leave sh_coff_relax_section.  */
       internal_relocs = (_bfd_coff_read_internal_relocs
-			 (abfd, o, true, (bfd_byte *) NULL, false,
+			 (abfd, o, TRUE, (bfd_byte *) NULL, FALSE,
 			  (struct internal_reloc *) NULL));
       if (internal_relocs == NULL)
-	return false;
+	return FALSE;
 
       ocontents = NULL;
       irelscanend = internal_relocs + o->reloc_count;
@@ -1443,16 +1444,16 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
 		  else
 		    {
 		      /* We always cache the section contents.
-                         Perhaps, if info->keep_memory is false, we
+                         Perhaps, if info->keep_memory is FALSE, we
                          should free them, if we are permitted to,
                          when we leave sh_coff_relax_section.  */
 		      ocontents = (bfd_byte *) bfd_malloc (o->_raw_size);
 		      if (ocontents == NULL)
-			return false;
+			return FALSE;
 		      if (! bfd_get_section_contents (abfd, o, ocontents,
 						      (file_ptr) 0,
 						      o->_raw_size))
-			return false;
+			return FALSE;
 		      coff_section_data (abfd, o)->contents = ocontents;
 		    }
 		}
@@ -1463,7 +1464,7 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
 		bfd_put_32 (abfd, val - count,
 			    ocontents + irelscan->r_vaddr - o->vma);
 
-	      coff_section_data (abfd, o)->keep_contents = true;
+	      coff_section_data (abfd, o)->keep_contents = TRUE;
 	    }
 	}
     }
@@ -1479,7 +1480,7 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
        ("%s: fatal: generic symbols retrieved before relaxing",
 	bfd_archive_filename (abfd)));
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   /* Adjust all the symbols.  */
@@ -1532,7 +1533,7 @@ sh_relax_delete_bytes (abfd, sec, addr, count)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is yet another version of the SH opcode table, used to rapidly
@@ -1647,22 +1648,22 @@ struct sh_opcode
 #define SETSAS_REG(x) USESAS_REG (x)
 
 #ifndef COFF_IMAGE_WITH_PE
-static boolean sh_insn_uses_reg
+static bfd_boolean sh_insn_uses_reg
   PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
-static boolean sh_insn_sets_reg
+static bfd_boolean sh_insn_sets_reg
   PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
-static boolean sh_insn_uses_or_sets_reg
+static bfd_boolean sh_insn_uses_or_sets_reg
   PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
-static boolean sh_insn_uses_freg
+static bfd_boolean sh_insn_uses_freg
   PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
-static boolean sh_insn_sets_freg
+static bfd_boolean sh_insn_sets_freg
   PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
-static boolean sh_insn_uses_or_sets_freg
+static bfd_boolean sh_insn_uses_or_sets_freg
   PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
-static boolean sh_insns_conflict
+static bfd_boolean sh_insns_conflict
   PARAMS ((unsigned int, const struct sh_opcode *, unsigned int,
 	   const struct sh_opcode *));
-static boolean sh_load_use
+static bfd_boolean sh_load_use
   PARAMS ((unsigned int, const struct sh_opcode *, unsigned int,
 	   const struct sh_opcode *));
 #endif
@@ -2166,21 +2167,21 @@ sh_insn_info (insn)
 
 /* See whether an instruction uses or sets a general purpose register */
 
-static boolean
+static bfd_boolean
 sh_insn_uses_or_sets_reg (insn, op, reg)
      unsigned int insn;
      const struct sh_opcode *op;
      unsigned int reg;
 {
   if (sh_insn_uses_reg (insn, op, reg))
-    return true;
+    return TRUE;
 
   return sh_insn_sets_reg (insn, op, reg);
 }
 
 /* See whether an instruction uses a general purpose register.  */
 
-static boolean
+static bfd_boolean
 sh_insn_uses_reg (insn, op, reg)
      unsigned int insn;
      const struct sh_opcode *op;
@@ -2192,24 +2193,24 @@ sh_insn_uses_reg (insn, op, reg)
 
   if ((f & USES1) != 0
       && USES1_REG (insn) == reg)
-    return true;
+    return TRUE;
   if ((f & USES2) != 0
       && USES2_REG (insn) == reg)
-    return true;
+    return TRUE;
   if ((f & USESR0) != 0
       && reg == 0)
-    return true;
+    return TRUE;
   if ((f & USESAS) && reg == USESAS_REG (insn))
-    return true;
+    return TRUE;
   if ((f & USESR8) && reg == 8)
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* See whether an instruction sets a general purpose register.  */
 
-static boolean
+static bfd_boolean
 sh_insn_sets_reg (insn, op, reg)
      unsigned int insn;
      const struct sh_opcode *op;
@@ -2221,36 +2222,36 @@ sh_insn_sets_reg (insn, op, reg)
 
   if ((f & SETS1) != 0
       && SETS1_REG (insn) == reg)
-    return true;
+    return TRUE;
   if ((f & SETS2) != 0
       && SETS2_REG (insn) == reg)
-    return true;
+    return TRUE;
   if ((f & SETSR0) != 0
       && reg == 0)
-    return true;
+    return TRUE;
   if ((f & SETSAS) && reg == SETSAS_REG (insn))
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* See whether an instruction uses or sets a floating point register */
 
-static boolean
+static bfd_boolean
 sh_insn_uses_or_sets_freg (insn, op, reg)
      unsigned int insn;
      const struct sh_opcode *op;
      unsigned int reg;
 {
   if (sh_insn_uses_freg (insn, op, reg))
-    return true;
+    return TRUE;
 
   return sh_insn_sets_freg (insn, op, reg);
 }
 
 /* See whether an instruction uses a floating point register.  */
 
-static boolean
+static bfd_boolean
 sh_insn_uses_freg (insn, op, freg)
      unsigned int insn;
      const struct sh_opcode *op;
@@ -2271,20 +2272,20 @@ sh_insn_uses_freg (insn, op, freg)
 
   if ((f & USESF1) != 0
       && (USESF1_REG (insn) & 0xe) == (freg & 0xe))
-    return true;
+    return TRUE;
   if ((f & USESF2) != 0
       && (USESF2_REG (insn) & 0xe) == (freg & 0xe))
-    return true;
+    return TRUE;
   if ((f & USESF0) != 0
       && freg == 0)
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* See whether an instruction sets a floating point register.  */
 
-static boolean
+static bfd_boolean
 sh_insn_sets_freg (insn, op, freg)
      unsigned int insn;
      const struct sh_opcode *op;
@@ -2305,17 +2306,17 @@ sh_insn_sets_freg (insn, op, freg)
 
   if ((f & SETSF1) != 0
       && (SETSF1_REG (insn) & 0xe) == (freg & 0xe))
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* See whether instructions I1 and I2 conflict, assuming I1 comes
    before I2.  OP1 and OP2 are the corresponding sh_opcode structures.
-   This should return true if there is a conflict, or false if the
+   This should return TRUE if there is a conflict, or FALSE if the
    instructions can be swapped safely.  */
 
-static boolean
+static bfd_boolean
 sh_insns_conflict (i1, op1, i2, op2)
      unsigned int i1;
      const struct sh_opcode *op1;
@@ -2331,57 +2332,57 @@ sh_insns_conflict (i1, op1, i2, op2)
      FIXME: shouldn't test raw opcodes here.  */
   if (((i1 & 0xf0ff) == 0x4066 && (i2 & 0xf000) == 0xf000)
       || ((i2 & 0xf0ff) == 0x4066 && (i1 & 0xf000) == 0xf000))
-    return true;
+    return TRUE;
 
   if ((f1 & (BRANCH | DELAY)) != 0
       || (f2 & (BRANCH | DELAY)) != 0)
-    return true;
+    return TRUE;
 
   if (((f1 | f2) & SETSSP)
       && (f1 & (SETSSP | USESSP))
       && (f2 & (SETSSP | USESSP)))
-    return true;
+    return TRUE;
 
   if ((f1 & SETS1) != 0
       && sh_insn_uses_or_sets_reg (i2, op2, SETS1_REG (i1)))
-    return true;
+    return TRUE;
   if ((f1 & SETS2) != 0
       && sh_insn_uses_or_sets_reg (i2, op2, SETS2_REG (i1)))
-    return true;
+    return TRUE;
   if ((f1 & SETSR0) != 0
       && sh_insn_uses_or_sets_reg (i2, op2, 0))
-    return true;
+    return TRUE;
   if ((f1 & SETSAS)
       && sh_insn_uses_or_sets_reg (i2, op2, SETSAS_REG (i1)))
-    return true;
+    return TRUE;
   if ((f1 & SETSF1) != 0
       && sh_insn_uses_or_sets_freg (i2, op2, SETSF1_REG (i1)))
-    return true;
+    return TRUE;
 
   if ((f2 & SETS1) != 0
       && sh_insn_uses_or_sets_reg (i1, op1, SETS1_REG (i2)))
-    return true;
+    return TRUE;
   if ((f2 & SETS2) != 0
       && sh_insn_uses_or_sets_reg (i1, op1, SETS2_REG (i2)))
-    return true;
+    return TRUE;
   if ((f2 & SETSR0) != 0
       && sh_insn_uses_or_sets_reg (i1, op1, 0))
-    return true;
+    return TRUE;
   if ((f2 & SETSAS)
       && sh_insn_uses_or_sets_reg (i1, op1, SETSAS_REG (i2)))
-    return true;
+    return TRUE;
   if ((f2 & SETSF1) != 0
       && sh_insn_uses_or_sets_freg (i1, op1, SETSF1_REG (i2)))
-    return true;
+    return TRUE;
 
   /* The instructions do not conflict.  */
-  return false;
+  return FALSE;
 }
 
 /* I1 is a load instruction, and I2 is some other instruction.  Return
-   true if I1 loads a register which I2 uses.  */
+   TRUE if I1 loads a register which I2 uses.  */
 
-static boolean
+static bfd_boolean
 sh_load_use (i1, op1, i2, op2)
      unsigned int i1;
      const struct sh_opcode *op1;
@@ -2393,7 +2394,7 @@ sh_load_use (i1, op1, i2, op2)
   f1 = op1->flags;
 
   if ((f1 & LOAD) == 0)
-    return false;
+    return FALSE;
 
   /* If both SETS1 and SETSSP are set, that means a load to a special
      register using postincrement addressing mode, which we don't care
@@ -2401,17 +2402,17 @@ sh_load_use (i1, op1, i2, op2)
   if ((f1 & SETS1) != 0
       && (f1 & SETSSP) == 0
       && sh_insn_uses_reg (i2, op2, (i1 & 0x0f00) >> 8))
-    return true;
+    return TRUE;
 
   if ((f1 & SETSR0) != 0
       && sh_insn_uses_reg (i2, op2, 0))
-    return true;
+    return TRUE;
 
   if ((f1 & SETSF1) != 0
       && sh_insn_uses_freg (i2, op2, (i1 & 0x0f00) >> 8))
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* Try to align loads and stores within a span of memory.  This is
@@ -2422,24 +2423,24 @@ sh_load_use (i1, op1, i2, op2)
    passed to SWAP.  PLABEL is a pointer to the current label in a
    sorted list of labels; LABEL_END is the end of the list.  START and
    STOP are the range of memory to examine.  If a swap is made,
-   *PSWAPPED is set to true.  */
+   *PSWAPPED is set to TRUE.  */
 
 #ifdef COFF_WITH_PE
 static
 #endif
-boolean
+bfd_boolean
 _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
 			 plabel, label_end, start, stop, pswapped)
      bfd *abfd;
      asection *sec;
      bfd_byte *contents;
-     boolean (*swap) PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
+     bfd_boolean (*swap) PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
      PTR relocs;
      bfd_vma **plabel;
      bfd_vma *label_end;
      bfd_vma start;
      bfd_vma stop;
-     boolean *pswapped;
+     bfd_boolean *pswapped;
 {
   int dsp = (abfd->arch_info->mach == bfd_mach_sh_dsp
 	     || abfd->arch_info->mach == bfd_mach_sh3_dsp);
@@ -2449,7 +2450,7 @@ _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
      desirable.  In fact, it is counter-productive, since it interferes
      with the schedules generated by the compiler.  */
   if (abfd->arch_info->mach == bfd_mach_sh4)
-    return true;
+    return TRUE;
 
   /* If we are linking sh[3]-dsp code, swap the FPU instructions for DSP
      instructions.  */
@@ -2523,14 +2524,14 @@ _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
 	  && (prev_op->flags & (LOAD | STORE)) == 0
 	  && ! sh_insns_conflict (prev_insn, prev_op, insn, op))
 	{
-	  boolean ok;
+	  bfd_boolean ok;
 
 	  /* The load/store instruction does not have a label, and
 	     there is a previous instruction; PREV_INSN is not
 	     itself a load/store instruction, and PREV_INSN and
 	     INSN do not conflict.  */
 
-	  ok = true;
+	  ok = TRUE;
 
 	  if (i >= start + 4)
 	    {
@@ -2545,7 +2546,7 @@ _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
 		 can not swap.  */
 	      if (prev2_op == NULL
 		  || (prev2_op->flags & DELAY) != 0)
-		ok = false;
+		ok = FALSE;
 
 	      /* If the instruction before PREV_INSN is a load,
 		 and it sets a register which INSN uses, then
@@ -2555,14 +2556,14 @@ _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
 	      if (ok
 		  && (prev2_op->flags & LOAD) != 0
 		  && sh_load_use (prev2_insn, prev2_op, insn, op))
-		ok = false;
+		ok = FALSE;
 	    }
 
 	  if (ok)
 	    {
 	      if (! (*swap) (abfd, sec, relocs, contents, i - 2))
-		return false;
-	      *pswapped = true;
+		return FALSE;
+	      *pswapped = TRUE;
 	      continue;
 	    }
 	}
@@ -2584,12 +2585,12 @@ _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
 	      && (next_op->flags & (LOAD | STORE)) == 0
 	      && ! sh_insns_conflict (insn, op, next_insn, next_op))
 	    {
-	      boolean ok;
+	      bfd_boolean ok;
 
 	      /* NEXT_INSN is not itself a load/store instruction,
 		 and it does not conflict with INSN.  */
 
-	      ok = true;
+	      ok = TRUE;
 
 	      /* If PREV_INSN is a load, and it sets a register
 		 which NEXT_INSN uses, then putting NEXT_INSN
@@ -2598,7 +2599,7 @@ _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
 	      if (prev_op != NULL
 		  && (prev_op->flags & LOAD) != 0
 		  && sh_load_use (prev_insn, prev_op, next_insn, next_op))
-		ok = false;
+		ok = FALSE;
 
 	      /* If INSN is a load, and it sets a register which
 		 the insn after NEXT_INSN uses, then doing the
@@ -2620,21 +2621,21 @@ _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
 		  next2_op = sh_insn_info (next2_insn);
 		  if ((next2_op->flags & (LOAD | STORE)) == 0
 		      && sh_load_use (insn, op, next2_insn, next2_op))
-		    ok = false;
+		    ok = FALSE;
 		}
 
 	      if (ok)
 		{
 		  if (! (*swap) (abfd, sec, relocs, contents, i))
-		    return false;
-		  *pswapped = true;
+		    return FALSE;
+		  *pswapped = TRUE;
 		  continue;
 		}
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 #endif /* not COFF_IMAGE_WITH_PE */
 
@@ -2643,20 +2644,20 @@ _bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
    this is desirable.  This sets *PSWAPPED if some instruction was
    swapped.  */
 
-static boolean
+static bfd_boolean
 sh_align_loads (abfd, sec, internal_relocs, contents, pswapped)
      bfd *abfd;
      asection *sec;
      struct internal_reloc *internal_relocs;
      bfd_byte *contents;
-     boolean *pswapped;
+     bfd_boolean *pswapped;
 {
   struct internal_reloc *irel, *irelend;
   bfd_vma *labels = NULL;
   bfd_vma *label, *label_end;
   bfd_size_type amt;
 
-  *pswapped = false;
+  *pswapped = FALSE;
 
   irelend = internal_relocs + sec->reloc_count;
 
@@ -2706,17 +2707,17 @@ sh_align_loads (abfd, sec, internal_relocs, contents, pswapped)
 
   free (labels);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (labels != NULL)
     free (labels);
-  return false;
+  return FALSE;
 }
 
 /* Swap two SH instructions.  */
 
-static boolean
+static bfd_boolean
 sh_swap_insns (abfd, sec, relocs, contents, addr)
      bfd *abfd;
      asection *sec;
@@ -2784,10 +2785,10 @@ sh_swap_insns (abfd, sec, relocs, contents, addr)
 	{
 	  bfd_byte *loc;
 	  unsigned short insn, oinsn;
-	  boolean overflow;
+	  bfd_boolean overflow;
 
 	  loc = contents + irel->r_vaddr - sec->vma;
-	  overflow = false;
+	  overflow = FALSE;
 	  switch (type)
 	    {
 	    default:
@@ -2799,7 +2800,7 @@ sh_swap_insns (abfd, sec, relocs, contents, addr)
 	      oinsn = insn;
 	      insn += add / 2;
 	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, loc);
 	      break;
 
@@ -2808,7 +2809,7 @@ sh_swap_insns (abfd, sec, relocs, contents, addr)
 	      oinsn = insn;
 	      insn += add / 2;
 	      if ((oinsn & 0xf000) != (insn & 0xf000))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, loc);
 	      break;
 
@@ -2825,7 +2826,7 @@ sh_swap_insns (abfd, sec, relocs, contents, addr)
 		  oinsn = insn;
 		  insn += add / 2;
 		  if ((oinsn & 0xff00) != (insn & 0xff00))
-		    overflow = true;
+		    overflow = TRUE;
 		  bfd_put_16 (abfd, (bfd_vma) insn, loc);
 		}
 
@@ -2838,18 +2839,18 @@ sh_swap_insns (abfd, sec, relocs, contents, addr)
 	       ("%s: 0x%lx: fatal: reloc overflow while relaxing",
 		bfd_archive_filename (abfd), (unsigned long) irel->r_vaddr));
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is a modification of _bfd_coff_generic_relocate_section, which
    will handle SH relaxing.  */
 
-static boolean
+static bfd_boolean
 sh_relocate_section (output_bfd, info, input_bfd, input_section, contents,
 		     relocs, syms, sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -2902,7 +2903,7 @@ sh_relocate_section (output_bfd, info, input_bfd, input_section, contents,
 		("%s: illegal symbol index %ld in relocs",
 		 bfd_archive_filename (input_bfd), symndx);
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  h = obj_coff_sym_hashes (input_bfd)[symndx];
 	  sym = syms + symndx;
@@ -2924,7 +2925,7 @@ sh_relocate_section (output_bfd, info, input_bfd, input_section, contents,
       if (howto == NULL)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
 #ifdef COFF_WITH_PE
@@ -2972,8 +2973,8 @@ sh_relocate_section (output_bfd, info, input_bfd, input_section, contents,
 	    {
 	      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;
 	    }
 	}
 
@@ -3010,12 +3011,12 @@ sh_relocate_section (output_bfd, info, input_bfd, input_section, contents,
 	    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;
 }
 
 /* This is a version of bfd_generic_get_relocated_section_contents
@@ -3028,7 +3029,7 @@ sh_coff_get_relocated_section_contents (output_bfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   asection *input_section = link_order->u.indirect.section;
@@ -3063,8 +3064,8 @@ sh_coff_get_relocated_section_contents (output_bfd, link_info, link_order,
 	goto error_return;
 
       internal_relocs = (_bfd_coff_read_internal_relocs
-			 (input_bfd, input_section, false, (bfd_byte *) NULL,
-			  false, (struct internal_reloc *) NULL));
+			 (input_bfd, input_section, FALSE, (bfd_byte *) NULL,
+			  FALSE, (struct internal_reloc *) NULL));
       if (internal_relocs == NULL)
 	goto error_return;
 
@@ -3154,7 +3155,7 @@ CREATE_LITTLE_COFF_TARGET_VEC (TARGET_SYM, TARGET_SHL_NAME, BFD_IS_RELAXABLE,
 
 #ifndef TARGET_SHL_SYM
 static const bfd_target * coff_small_object_p PARAMS ((bfd *));
-static boolean coff_small_new_section_hook PARAMS ((bfd *, asection *));
+static bfd_boolean coff_small_new_section_hook PARAMS ((bfd *, asection *));
 /* Some people want versions of the SH COFF target which do not align
    to 16 byte boundaries.  We implement that by adding a couple of new
    target vectors.  These are just like the ones above, but they
@@ -3183,20 +3184,20 @@ coff_small_object_p (abfd)
 
 /* Set the section alignment for the small versions.  */
 
-static boolean
+static bfd_boolean
 coff_small_new_section_hook (abfd, section)
      bfd *abfd;
      asection *section;
 {
   if (! coff_new_section_hook (abfd, section))
-    return false;
+    return FALSE;
 
   /* We must align to at least a four byte boundary, because longword
      accesses must be on a four byte boundary.  */
   if (section->alignment_power == COFF_DEFAULT_SECTION_ALIGNMENT_POWER)
     section->alignment_power = 2;
 
-  return true;
+  return TRUE;
 }
 
 /* This is copied from bfd_coff_std_swap_table so that we can change
@@ -3211,20 +3212,20 @@ static const bfd_coff_backend_data bfd_coff_small_swap_table =
   coff_swap_scnhdr_out,
   FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_LONG_SECTION_NAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
   2,
 #ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_DEBUG_STRING_WIDE_PREFIX
   4,
diff --git a/bfd/coff-sparc.c b/bfd/coff-sparc.c
index 35c23df521f..4053a6d5f4b 100644
--- a/bfd/coff-sparc.c
+++ b/bfd/coff-sparc.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Sparc COFF files.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -103,30 +103,30 @@ bfd_coff_generic_reloc (abfd, reloc_entry, symbol, data, input_section,
 
 static reloc_howto_type coff_sparc_howto_table[] =
 {
-  HOWTO(R_SPARC_NONE,    0,0, 0,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_8,       0,0, 8,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_8",       false,0,0x000000ff,true),
-  HOWTO(R_SPARC_16,      0,1,16,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_16",      false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_32,      0,2,32,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_32",      false,0,0xffffffff,true),
-  HOWTO(R_SPARC_DISP8,   0,0, 8,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP8",   false,0,0x000000ff,true),
-  HOWTO(R_SPARC_DISP16,  0,1,16,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP16",  false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_DISP32,  0,2,32,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP32",  false,0,0x00ffffff,true),
-  HOWTO(R_SPARC_WDISP30, 2,2,30,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_WDISP30", false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_WDISP22, 2,2,22,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_WDISP22", false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HI22,   10,2,22,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_HI22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_22,      0,2,22,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_22",      false,0,0x003fffff,true),
-  HOWTO(R_SPARC_13,      0,2,13,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_13",      false,0,0x00001fff,true),
-  HOWTO(R_SPARC_LO10,    0,2,10,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_LO10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT10,   0,2,10,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT10",   false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT13,   0,2,13,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT13",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_GOT22,  10,2,22,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT22",   false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC10,    0,2,10,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_PC10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC22,    0,2,22,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_PC22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WPLT30,  0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_WPLT30",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_COPY,    0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_COPY",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_GLOB_DAT,0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_GLOB_DAT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_JMP_SLOT,0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_JMP_SLOT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_RELATIVE,0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_RELATIVE",false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA32,    0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_UA32",    false,0,0x00000000,true),
+  HOWTO(R_SPARC_NONE,    0,0, 0,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_8,       0,0, 8,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_8",       FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_16,      0,1,16,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_16",      FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_32,      0,2,32,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_32",      FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_DISP8,   0,0, 8,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP8",   FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_DISP16,  0,1,16,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP16",  FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_DISP32,  0,2,32,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP32",  FALSE,0,0x00ffffff,TRUE),
+  HOWTO(R_SPARC_WDISP30, 2,2,30,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_WDISP30", FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_WDISP22, 2,2,22,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_WDISP22", FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_HI22,   10,2,22,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_HI22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_22,      0,2,22,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_22",      FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_13,      0,2,13,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_13",      FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_LO10,    0,2,10,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_LO10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT10,   0,2,10,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT10",   FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT13,   0,2,13,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT13",   FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_GOT22,  10,2,22,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT22",   FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC10,    0,2,10,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_PC10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_PC22,    0,2,22,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_PC22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_WPLT30,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_WPLT30",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_COPY,    0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_COPY",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_GLOB_DAT,0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_GLOB_DAT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_JMP_SLOT,0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_JMP_SLOT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_RELATIVE,0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_RELATIVE",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_UA32,    0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_UA32",    FALSE,0,0x00000000,TRUE),
 };
 
 struct coff_reloc_map {
diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
index 5c80b11b5d3..c4264ca3811 100644
--- a/bfd/coff-stgo32.c
+++ b/bfd/coff-stgo32.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub).
-   Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Written by Robert Hoehne.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -93,7 +93,7 @@ create_go32_stub PARAMS ((bfd *));
 #define COFF_ADJUST_AUX_OUT_PRE adjust_aux_out_pre
 #define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
 
-static boolean
+static bfd_boolean
   go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
 
 #define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
@@ -392,22 +392,22 @@ stub_end:
 /* If ibfd was a stubbed coff image, copy the stub from that bfd
    to the new obfd.  */
 
-static boolean
+static bfd_boolean
 go32_stubbed_coff_bfd_copy_private_bfd_data  (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   /* Check if both are the same targets.  */
   if (ibfd->xvec != obfd->xvec)
-    return true;
+    return TRUE;
 
   /* Check if both have a valid stub.  */
   if (bfd_coff_go32stub (ibfd) == NULL
       || bfd_coff_go32stub (obfd) == NULL)
-    return true;
+    return TRUE;
 
   /* Now copy the stub.  */
   memcpy (bfd_coff_go32stub (obfd), bfd_coff_go32stub (ibfd), STUBSIZE);
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/coff-tic30.c b/bfd/coff-tic30.c
index a3bbc4c8d23..ef2f3dceed4 100644
--- a/bfd/coff-tic30.c
+++ b/bfd/coff-tic30.c
@@ -1,5 +1,5 @@
 /* BFD back-end for TMS320C30 coff binaries.
-   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -37,16 +37,16 @@ reloc_howto_type * tic30_coff_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_r
 
 reloc_howto_type tic30_coff_howto_table[] =
   {
-    HOWTO (R_TIC30_ABS16, 2, 1, 16, false, 0, 0, NULL,
-	   "16", false, 0x0000FFFF, 0x0000FFFF, false),
-    HOWTO (R_TIC30_ABS24, 2, 2, 24, false, 8, complain_overflow_bitfield, NULL,
-	   "24", false, 0xFFFFFF00, 0xFFFFFF00, false),
-    HOWTO (R_TIC30_LDP, 18, 0, 24, false, 0, complain_overflow_bitfield, NULL,
-	   "LDP", false, 0x00FF0000, 0x000000FF, false),
-    HOWTO (R_TIC30_ABS32, 2, 2, 32, false, 0, complain_overflow_bitfield, NULL,
-	   "32", false, 0xFFFFFFFF, 0xFFFFFFFF, false),
-    HOWTO (R_TIC30_PC16, 2, 1, 16, true, 0, complain_overflow_signed, NULL,
-	   "PCREL", false, 0x0000FFFF, 0x0000FFFF, false),
+    HOWTO (R_TIC30_ABS16, 2, 1, 16, FALSE, 0, 0, NULL,
+	   "16", FALSE, 0x0000FFFF, 0x0000FFFF, FALSE),
+    HOWTO (R_TIC30_ABS24, 2, 2, 24, FALSE, 8, complain_overflow_bitfield, NULL,
+	   "24", FALSE, 0xFFFFFF00, 0xFFFFFF00, FALSE),
+    HOWTO (R_TIC30_LDP, 18, 0, 24, FALSE, 0, complain_overflow_bitfield, NULL,
+	   "LDP", FALSE, 0x00FF0000, 0x000000FF, FALSE),
+    HOWTO (R_TIC30_ABS32, 2, 2, 32, FALSE, 0, complain_overflow_bitfield, NULL,
+	   "32", FALSE, 0xFFFFFFFF, 0xFFFFFFFF, FALSE),
+    HOWTO (R_TIC30_PC16, 2, 1, 16, TRUE, 0, complain_overflow_signed, NULL,
+	   "PCREL", FALSE, 0x0000FFFF, 0x0000FFFF, FALSE),
     EMPTY_HOWTO (-1)
   };
 
diff --git a/bfd/coff-tic4x.c b/bfd/coff-tic4x.c
index 8afd04a614d..3062b9f86f7 100644
--- a/bfd/coff-tic4x.c
+++ b/bfd/coff-tic4x.c
@@ -31,11 +31,11 @@
 #undef  F_LSYMS
 #define	F_LSYMS		F_LSYMS_TICOFF
 
-static boolean ticoff0_bad_format_hook
+static bfd_boolean ticoff0_bad_format_hook
     PARAMS ((bfd *, PTR ));
-static boolean ticoff1_bad_format_hook
+static bfd_boolean ticoff1_bad_format_hook
     PARAMS ((bfd *, PTR ));
-static boolean ticoff_bfd_is_local_label_name
+static bfd_boolean ticoff_bfd_is_local_label_name
     PARAMS ((bfd *, const char *));
 static bfd_reloc_status_type tic4x_relocation
     PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char ** ));
@@ -49,7 +49,7 @@ static void tic4x_reloc_processing
     PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection * ));
 
 
-static boolean
+static bfd_boolean
 ticoff0_bad_format_hook (abfd, filehdr)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR filehdr;
@@ -57,12 +57,12 @@ ticoff0_bad_format_hook (abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   if (COFF0_BADMAG (*internal_f))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 ticoff1_bad_format_hook (abfd, filehdr)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR filehdr;
@@ -70,21 +70,21 @@ ticoff1_bad_format_hook (abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   if (COFF1_BADMAG (*internal_f))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Replace the stock _bfd_coff_is_local_label_name to recognize TI COFF local
    labels.  */
-static boolean 
+static bfd_boolean
 ticoff_bfd_is_local_label_name (abfd, name)
   bfd *abfd ATTRIBUTE_UNUSED;
   const char *name;
 {
   if (TICOFF_LOCAL_LABEL_P(name))
-    return true;
-  return false;
+    return TRUE;
+  return FALSE;
 }
 
 #define coff_bfd_is_local_label_name ticoff_bfd_is_local_label_name
@@ -100,7 +100,7 @@ ticoff_bfd_is_local_label_name (abfd, name)
 #include "coffcode.h"
 
 static bfd_reloc_status_type
-tic4x_relocation (abfd, reloc_entry, symbol, data, input_section, 
+tic4x_relocation (abfd, reloc_entry, symbol, data, input_section,
 		  output_bfd, error_message)
   bfd *abfd ATTRIBUTE_UNUSED;
   arelent *reloc_entry;
@@ -109,7 +109,7 @@ tic4x_relocation (abfd, reloc_entry, symbol, data, input_section,
   asection *input_section;
   bfd *output_bfd;
   char **error_message ATTRIBUTE_UNUSED;
-{  
+{
   if (output_bfd != (bfd *) NULL)
     {
       /* This is a partial relocation, and we want to apply the
@@ -121,22 +121,22 @@ tic4x_relocation (abfd, reloc_entry, symbol, data, input_section,
   return bfd_reloc_continue;
 }
 
-reloc_howto_type tic4x_howto_table[] = 
+reloc_howto_type tic4x_howto_table[] =
 {
-    HOWTO(R_RELWORD,	 0,  2, 16, false, 0, complain_overflow_signed,   tic4x_relocation, "RELWORD",   true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO(R_REL24,	 0,  2, 24, false, 0, complain_overflow_bitfield, tic4x_relocation, "REL24",     true, 0x00ffffff, 0x00ffffff, false),
-    HOWTO(R_RELLONG,	 0,  2, 32, false, 0, complain_overflow_dont,     tic4x_relocation, "RELLONG",   true, 0xffffffff, 0xffffffff, false),
-    HOWTO(R_PCRWORD,	 0,  2, 16, true,  0, complain_overflow_signed,   tic4x_relocation, "PCRWORD",   true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO(R_PCR24,	 0,  2, 24, true,  0, complain_overflow_signed,   tic4x_relocation, "PCR24",     true, 0x00ffffff, 0x00ffffff, false),
-    HOWTO(R_PARTLS16,	 0,  2, 16, false, 0, complain_overflow_dont,     tic4x_relocation, "PARTLS16",  true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO(R_PARTMS8,	16,  2, 16, false, 0, complain_overflow_dont,     tic4x_relocation, "PARTMS8",   true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO(R_RELWORD,	 0,  2, 16, false, 0, complain_overflow_signed,   tic4x_relocation, "ARELWORD",  true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO(R_REL24,	 0,  2, 24, false, 0, complain_overflow_signed,   tic4x_relocation, "AREL24",    true, 0x00ffffff, 0x00ffffff, false),
-    HOWTO(R_RELLONG,	 0,  2, 32, false, 0, complain_overflow_signed,   tic4x_relocation, "ARELLONG",  true, 0xffffffff, 0xffffffff, false),
-    HOWTO(R_PCRWORD,	 0,  2, 16, true,  0, complain_overflow_signed,   tic4x_relocation, "APCRWORD",  true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO(R_PCR24,	 0,  2, 24, true,  0, complain_overflow_signed,   tic4x_relocation, "APCR24",    true, 0x00ffffff, 0x00ffffff, false),
-    HOWTO(R_PARTLS16,	 0,  2, 16, false, 0, complain_overflow_dont,     tic4x_relocation, "APARTLS16", true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO(R_PARTMS8,	16,  2, 16, false, 0, complain_overflow_dont,     tic4x_relocation, "APARTMS8",  true, 0x0000ffff, 0x0000ffff, false),
+    HOWTO(R_RELWORD,	 0,  2, 16, FALSE, 0, complain_overflow_signed,   tic4x_relocation, "RELWORD",   TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_REL24,	 0,  2, 24, FALSE, 0, complain_overflow_bitfield, tic4x_relocation, "REL24",     TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO(R_RELLONG,	 0,  2, 32, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "RELLONG",   TRUE, 0xffffffff, 0xffffffff, FALSE),
+    HOWTO(R_PCRWORD,	 0,  2, 16, TRUE,  0, complain_overflow_signed,   tic4x_relocation, "PCRWORD",   TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_PCR24,	 0,  2, 24, TRUE,  0, complain_overflow_signed,   tic4x_relocation, "PCR24",     TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO(R_PARTLS16,	 0,  2, 16, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "PARTLS16",  TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_PARTMS8,	16,  2, 16, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "PARTMS8",   TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_RELWORD,	 0,  2, 16, FALSE, 0, complain_overflow_signed,   tic4x_relocation, "ARELWORD",  TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_REL24,	 0,  2, 24, FALSE, 0, complain_overflow_signed,   tic4x_relocation, "AREL24",    TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO(R_RELLONG,	 0,  2, 32, FALSE, 0, complain_overflow_signed,   tic4x_relocation, "ARELLONG",  TRUE, 0xffffffff, 0xffffffff, FALSE),
+    HOWTO(R_PCRWORD,	 0,  2, 16, TRUE,  0, complain_overflow_signed,   tic4x_relocation, "APCRWORD",  TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_PCR24,	 0,  2, 24, TRUE,  0, complain_overflow_signed,   tic4x_relocation, "APCR24",    TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO(R_PARTLS16,	 0,  2, 16, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "APARTLS16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_PARTMS8,	16,  2, 16, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "APARTMS8",  TRUE, 0x0000ffff, 0x0000ffff, FALSE),
 };
 #define HOWTO_SIZE (sizeof(tic4x_howto_table) / sizeof(tic4x_howto_table[0]))
 
@@ -153,7 +153,7 @@ tic4x_coff_reloc_type_lookup (abfd, code)
 {
   unsigned int type;
   unsigned int i;
-    
+
   switch (code)
     {
     case BFD_RELOC_32:		type = R_RELLONG; break;
@@ -166,7 +166,7 @@ tic4x_coff_reloc_type_lookup (abfd, code)
     default:
       return NULL;
     }
-    
+
   for (i = 0; i < HOWTO_SIZE; i++)
     {
       if (tic4x_howto_table[i].type == type)
@@ -238,7 +238,7 @@ tic4x_reloc_processing (relent, reloc, symbols, abfd, section)
   asymbol *ptr;
 
   relent->address = reloc->r_vaddr;
-  
+
   if (reloc->r_symndx != -1)
     {
       if (reloc->r_symndx < 0 || reloc->r_symndx >= obj_conv_table_size (abfd))
@@ -261,26 +261,26 @@ tic4x_reloc_processing (relent, reloc, symbols, abfd, section)
       relent->sym_ptr_ptr = section->symbol_ptr_ptr;
       ptr = *(relent->sym_ptr_ptr);
     }
-  
+
   /* The symbols definitions that we have read in have been relocated
      as if their sections started at 0.  But the offsets refering to
      the symbols in the raw data have not been modified, so we have to
      have a negative addend to compensate.
-     
+
      Note that symbols which used to be common must be left alone.  */
-  
+
   /* Calculate any reloc addend by looking at the symbol.  */
   CALC_ADDEND (abfd, ptr, *reloc, relent);
-  
+
   relent->address -= section->vma;
   /* !!     relent->section = (asection *) NULL;  */
-  
+
   /* Fill in the relent->howto field from reloc->r_type.  */
   tic4x_lookup_howto (relent, reloc);
 }
 
 
-static const bfd_coff_backend_data ticoff0_swap_table = 
+static const bfd_coff_backend_data ticoff0_swap_table =
 {
   coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
   coff_SWAP_aux_out, coff_SWAP_sym_out,
@@ -289,19 +289,19 @@ static const bfd_coff_backend_data ticoff0_swap_table =
   coff_SWAP_scnhdr_out,
   FILHSZ_V0, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ_V0, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_LONG_SECTION_NAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_DEBUG_STRING_WIDE_PREFIX
   4,
@@ -321,7 +321,7 @@ static const bfd_coff_backend_data ticoff0_swap_table =
 };
 
 /* COFF1 differs in section header size.  */
-static const bfd_coff_backend_data ticoff1_swap_table = 
+static const bfd_coff_backend_data ticoff1_swap_table =
 {
   coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
   coff_SWAP_aux_out, coff_SWAP_sym_out,
@@ -330,19 +330,19 @@ static const bfd_coff_backend_data ticoff1_swap_table =
   coff_SWAP_scnhdr_out,
   FILHSZ, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_LONG_SECTION_NAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_DEBUG_STRING_WIDE_PREFIX
   4,
diff --git a/bfd/coff-tic54x.c b/bfd/coff-tic54x.c
index 5f36f0a446d..cf7227c8261 100644
--- a/bfd/coff-tic54x.c
+++ b/bfd/coff-tic54x.c
@@ -1,5 +1,5 @@
 /* BFD back-end for TMS320C54X coff binaries.
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Timothy Wall (twall@cygnus.com)
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -30,19 +30,32 @@
 #undef  F_LSYMS
 #define	F_LSYMS		F_LSYMS_TICOFF
 
-static void                  tic54x_reloc_processing        PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
-static bfd_reloc_status_type tic54x_relocation              PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean               tic54x_set_section_contents    PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
-static reloc_howto_type *    coff_tic54x_rtype_to_howto     PARAMS ((bfd *, asection *, struct internal_reloc *,  struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
-static bfd_vma               tic54x_getl32                  PARAMS ((const bfd_byte *));
-static void                  tic54x_putl32                  PARAMS ((bfd_vma, bfd_byte *));
-static bfd_signed_vma        tic54x_getl_signed_32          PARAMS ((const bfd_byte *));
-static boolean               tic54x_set_arch_mach           PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static reloc_howto_type *    tic54x_coff_reloc_type_lookup  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void                  tic54x_lookup_howto            PARAMS ((arelent *, struct internal_reloc *));
-static boolean               ticoff0_bad_format_hook        PARAMS ((bfd *, PTR));
-static boolean               ticoff1_bad_format_hook        PARAMS ((bfd *, PTR));
-static boolean               ticoff_bfd_is_local_label_name PARAMS ((bfd *, const char *));
+static void tic54x_reloc_processing
+  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+static bfd_reloc_status_type tic54x_relocation
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_boolean tic54x_set_section_contents
+  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+static reloc_howto_type *coff_tic54x_rtype_to_howto
+  PARAMS ((bfd *, asection *, struct internal_reloc *, struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
+static bfd_vma tic54x_getl32
+  PARAMS ((const bfd_byte *));
+static void tic54x_putl32
+  PARAMS ((bfd_vma, bfd_byte *));
+static bfd_signed_vma tic54x_getl_signed_32
+  PARAMS ((const bfd_byte *));
+static bfd_boolean tic54x_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static reloc_howto_type * tic54x_coff_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void tic54x_lookup_howto
+  PARAMS ((arelent *, struct internal_reloc *));
+static bfd_boolean ticoff0_bad_format_hook
+  PARAMS ((bfd *, PTR));
+static bfd_boolean ticoff1_bad_format_hook
+  PARAMS ((bfd *, PTR));
+static bfd_boolean ticoff_bfd_is_local_label_name
+  PARAMS ((bfd *, const char *));
 
 /* 32-bit operations
    The octet order is screwy.  words are LSB first (LS octet, actually), but
@@ -125,7 +138,7 @@ bfd_ticoff_get_section_load_page (sect)
 /* Set the architecture appropriately.  Allow unkown architectures
    (e.g. binary).  */
 
-static boolean
+static bfd_boolean
 tic54x_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -135,7 +148,7 @@ tic54x_set_arch_mach (abfd, arch, machine)
     arch = bfd_arch_tic54x;
 
   else if (arch != bfd_arch_tic54x)
-    return false;
+    return FALSE;
 
   return bfd_default_set_arch_mach (abfd, arch, machine);
 }
@@ -170,59 +183,59 @@ reloc_howto_type tic54x_howto_table[] =
 
     /* NORMAL BANK */
     /* 16-bit direct reference to symbol's address.  */
-    HOWTO (R_RELWORD,0,1,16,false,0,complain_overflow_dont,
-	   tic54x_relocation,"REL16",false,0xFFFF,0xFFFF,false),
+    HOWTO (R_RELWORD,0,1,16,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"REL16",FALSE,0xFFFF,0xFFFF,FALSE),
 
     /* 7 LSBs of an address */
-    HOWTO (R_PARTLS7,0,1,7,false,0,complain_overflow_dont,
-	   tic54x_relocation,"LS7",false,0x007F,0x007F,false),
+    HOWTO (R_PARTLS7,0,1,7,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"LS7",FALSE,0x007F,0x007F,FALSE),
 
     /* 9 MSBs of an address */
     /* TI assembler doesn't shift its encoding, and is thus incompatible */
-    HOWTO (R_PARTMS9,7,1,9,false,0,complain_overflow_dont,
-	   tic54x_relocation,"MS9",false,0x01FF,0x01FF,false),
+    HOWTO (R_PARTMS9,7,1,9,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"MS9",FALSE,0x01FF,0x01FF,FALSE),
 
     /* 23-bit relocation */
-    HOWTO (R_EXTWORD,0,2,23,false,0,complain_overflow_dont,
-	   tic54x_relocation,"RELEXT",false,0x7FFFFF,0x7FFFFF,false),
+    HOWTO (R_EXTWORD,0,2,23,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"RELEXT",FALSE,0x7FFFFF,0x7FFFFF,FALSE),
 
     /* 16 bits of 23-bit extended address */
-    HOWTO (R_EXTWORD16,0,1,16,false,0,complain_overflow_dont,
-	   tic54x_relocation,"RELEXT16",false,0x7FFFFF,0x7FFFFF,false),
+    HOWTO (R_EXTWORD16,0,1,16,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"RELEXT16",FALSE,0x7FFFFF,0x7FFFFF,FALSE),
 
     /* upper 7 bits of 23-bit extended address */
-    HOWTO (R_EXTWORDMS7,16,1,7,false,0,complain_overflow_dont,
-	   tic54x_relocation,"RELEXTMS7",false,0x7F,0x7F,false),
+    HOWTO (R_EXTWORDMS7,16,1,7,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"RELEXTMS7",FALSE,0x7F,0x7F,FALSE),
 
     /* ABSOLUTE BANK */
     /* 16-bit direct reference to symbol's address, absolute */
-    HOWTO (R_RELWORD,0,1,16,false,0,complain_overflow_dont,
-	   tic54x_relocation,"AREL16",false,0xFFFF,0xFFFF,false),
+    HOWTO (R_RELWORD,0,1,16,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"AREL16",FALSE,0xFFFF,0xFFFF,FALSE),
 
     /* 7 LSBs of an address, absolute */
-    HOWTO (R_PARTLS7,0,1,7,false,0,complain_overflow_dont,
-	   tic54x_relocation,"ALS7",false,0x007F,0x007F,false),
+    HOWTO (R_PARTLS7,0,1,7,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"ALS7",FALSE,0x007F,0x007F,FALSE),
 
     /* 9 MSBs of an address, absolute */
     /* TI assembler doesn't shift its encoding, and is thus incompatible */
-    HOWTO (R_PARTMS9,7,1,9,false,0,complain_overflow_dont,
-	   tic54x_relocation,"AMS9",false,0x01FF,0x01FF,false),
+    HOWTO (R_PARTMS9,7,1,9,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"AMS9",FALSE,0x01FF,0x01FF,FALSE),
 
     /* 23-bit direct reference, absolute */
-    HOWTO (R_EXTWORD,0,2,23,false,0,complain_overflow_dont,
-	   tic54x_relocation,"ARELEXT",false,0x7FFFFF,0x7FFFFF,false),
+    HOWTO (R_EXTWORD,0,2,23,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"ARELEXT",FALSE,0x7FFFFF,0x7FFFFF,FALSE),
 
     /* 16 bits of 23-bit extended address, absolute */
-    HOWTO (R_EXTWORD16,0,1,16,false,0,complain_overflow_dont,
-	   tic54x_relocation,"ARELEXT16",false,0x7FFFFF,0x7FFFFF,false),
+    HOWTO (R_EXTWORD16,0,1,16,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"ARELEXT16",FALSE,0x7FFFFF,0x7FFFFF,FALSE),
 
     /* upper 7 bits of 23-bit extended address, absolute */
-    HOWTO (R_EXTWORDMS7,16,1,7,false,0,complain_overflow_dont,
-	   tic54x_relocation,"ARELEXTMS7",false,0x7F,0x7F,false),
+    HOWTO (R_EXTWORDMS7,16,1,7,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"ARELEXTMS7",FALSE,0x7F,0x7F,FALSE),
 
     /* 32-bit relocation exclusively for stabs */
-    HOWTO (R_RELLONG,0,2,32,false,0,complain_overflow_dont,
-	   tic54x_relocation,"STAB",false,0xFFFFFFFF,0xFFFFFFFF,false),
+    HOWTO (R_RELLONG,0,2,32,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"STAB",FALSE,0xFFFFFFFF,0xFFFFFFFF,FALSE),
   };
 
 #define coff_bfd_reloc_type_lookup tic54x_coff_reloc_type_lookup
@@ -310,7 +323,7 @@ coff_tic54x_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
   return genrel.howto;
 }
 
-static boolean
+static bfd_boolean
 ticoff0_bad_format_hook (abfd, filehdr)
      bfd * abfd ATTRIBUTE_UNUSED;
      PTR filehdr;
@@ -318,12 +331,12 @@ ticoff0_bad_format_hook (abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   if (COFF0_BADMAG (*internal_f))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 ticoff1_bad_format_hook (abfd, filehdr)
      bfd * abfd ATTRIBUTE_UNUSED;
      PTR filehdr;
@@ -331,22 +344,22 @@ ticoff1_bad_format_hook (abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   if (COFF1_BADMAG (*internal_f))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Replace the stock _bfd_coff_is_local_label_name to recognize TI COFF local
    labels.  */
 
-static boolean
+static bfd_boolean
 ticoff_bfd_is_local_label_name (abfd, name)
   bfd *abfd ATTRIBUTE_UNUSED;
   const char *name;
 {
   if (TICOFF_LOCAL_LABEL_P(name))
-    return true;
-  return false;
+    return TRUE;
+  return FALSE;
 }
 
 #define coff_bfd_is_local_label_name ticoff_bfd_is_local_label_name
@@ -358,7 +371,7 @@ ticoff_bfd_is_local_label_name (abfd, name)
 #define BADMAG(x) COFF2_BADMAG(x)
 #include "coffcode.h"
 
-static boolean
+static bfd_boolean
 tic54x_set_section_contents (abfd, section, location, offset, bytes_to_do)
      bfd *abfd;
      sec_ptr section;
@@ -432,19 +445,19 @@ static const bfd_coff_backend_data ticoff0_swap_table =
     coff_SWAP_scnhdr_out,
     FILHSZ_V0, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ_V0, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
-    true,
+    TRUE,
 #else
-    false,
+    FALSE,
 #endif
 #ifdef COFF_LONG_SECTION_NAMES
-    true,
+    TRUE,
 #else
-    false,
+    FALSE,
 #endif
 #ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
-    true,
+    TRUE,
 #else
-    false,
+    FALSE,
 #endif
 #ifdef COFF_DEBUG_STRING_WIDE_PREFIX
     4,
@@ -473,20 +486,20 @@ static const bfd_coff_backend_data ticoff1_swap_table =
     coff_SWAP_scnhdr_out,
     FILHSZ, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
-    true,
+    TRUE,
 #else
-    false,
+    FALSE,
 #endif
 #ifdef COFF_LONG_SECTION_NAMES
-    true,
+    TRUE,
 #else
-    false,
+    FALSE,
 #endif
     COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
 #ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
-    true,
+    TRUE,
 #else
-    false,
+    FALSE,
 #endif
 #ifdef COFF_DEBUG_STRING_WIDE_PREFIX
     4,
diff --git a/bfd/coff-tic80.c b/bfd/coff-tic80.c
index de69ecbab6a..4185e7b18d8 100644
--- a/bfd/coff-tic80.c
+++ b/bfd/coff-tic80.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Texas Instruments TMS320C80 Multimedia Video Processor (MVP).
-   Copyright 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    Written by Fred Fish (fnf@cygnus.com)
 
@@ -48,7 +48,7 @@ static bfd_reloc_status_type glob16_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type local16_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean coff_tic80_relocate_section
+static bfd_boolean coff_tic80_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 static reloc_howto_type * coff_tic80_rtype_to_howto
@@ -63,295 +63,295 @@ static reloc_howto_type tic80_howto_table[] =
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 32,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "RELLONG",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0xffffffff,			/* src_mask */
 	 0xffffffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_MPPCR,			/* type */
 	 2,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 32,				/* bitsize */
-	 true,				/* pc_relative */
+	 TRUE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_signed,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "MPPCR",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0xffffffff,			/* src_mask */
 	 0xffffffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 
   HOWTO (R_ABS,				/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 32,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "ABS",				/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0xffffffff,			/* src_mask */
 	 0xffffffff,			/* dst_mask */
-	 false),				/* pcrel_offset */
+	 FALSE),				/* pcrel_offset */
 
   HOWTO (R_PPBASE,			/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 32,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 ppbase_reloc,			/* special_function */
 	 "PPBASE",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0xffffffff,			/* src_mask */
 	 0xffffffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPLBASE,			/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 32,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 ppbase_reloc,			/* special_function */
 	 "PPLBASE",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0xffffffff,			/* src_mask */
 	 0xffffffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PP15,			/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 6,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 glob15_reloc,			/* special_function */
 	 "PP15",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x1ffc0,			/* src_mask */
 	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PP15W,			/* type */
 	 2,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 6,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 glob15_reloc,			/* special_function */
 	 "PP15W",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x1ffc0,			/* src_mask */
 	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PP15H,			/* type */
 	 1,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 6,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 glob15_reloc,			/* special_function */
 	 "PP15H",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x1ffc0,			/* src_mask */
 	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PP16B,			/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 6,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 glob16_reloc,			/* special_function */
 	 "PP16B",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x3ffc0,			/* src_mask */
 	 0x3ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPL15,			/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "PPL15",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x7fff,			/* src_mask */
 	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPL15W,			/* type */
 	 2,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "PPL15W",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x7fff,			/* src_mask */
 	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPL15H,			/* type */
 	 1,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "PPL15H",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x7fff,			/* src_mask */
 	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPL16B,			/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 local16_reloc,			/* special_function */
 	 "PPL16B",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPN15,			/* type */
 	 0,				/* rightshift */
 	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 6,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 glob15_reloc,			/* special_function */
 	 "PPN15",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x1ffc0,			/* src_mask */
 	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPN15W,			/* type */
 	 2,				/* rightshift */
 	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 6,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 glob15_reloc,			/* special_function */
 	 "PPN15W",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x1ffc0,			/* src_mask */
 	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPN15H,			/* type */
 	 1,				/* rightshift */
 	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 6,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 glob15_reloc,			/* special_function */
 	 "PPN15H",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x1ffc0,			/* src_mask */
 	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPN16B,			/* type */
 	 0,				/* rightshift */
 	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 6,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 glob16_reloc,			/* special_function */
 	 "PPN16B",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x3ffc0,			/* src_mask */
 	 0x3ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPLN15,			/* type */
 	 0,				/* rightshift */
 	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "PPLN15",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x7fff,			/* src_mask */
 	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPLN15W,			/* type */
 	 2,				/* rightshift */
 	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "PPLN15W",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x7fff,			/* src_mask */
 	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPLN15H,			/* type */
 	 1,				/* rightshift */
 	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 NULL,				/* special_function */
 	 "PPLN15H",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0x7fff,			/* src_mask */
 	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   HOWTO (R_PPLN16B,			/* type */
 	 0,				/* rightshift */
 	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 15,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 local16_reloc,			/* special_function */
 	 "PPLN16B",			/* name */
-	 true,				/* partial_inplace */
+	 TRUE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false)				/* pcrel_offset */
+	 FALSE)				/* pcrel_offset */
 };
 
 /* Special relocation functions, used when the output file is not
@@ -485,7 +485,7 @@ coff_tic80_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
 /* We need a special relocation routine to handle the PP relocs.  Most
    of this is a copy of _bfd_coff_generic_relocate_section.  */
 
-static boolean
+static bfd_boolean
 coff_tic80_relocate_section (output_bfd, info, input_bfd,
 			     input_section, contents, relocs, syms,
 			     sections)
@@ -540,7 +540,7 @@ coff_tic80_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;
 
       val = 0;
 
@@ -580,8 +580,8 @@ coff_tic80_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;
 	    }
 	}
 
@@ -687,7 +687,7 @@ coff_tic80_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;
@@ -701,17 +701,17 @@ coff_tic80_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;
 }
 
 #define TIC80COFF 1		/* Customize coffcode.h */
diff --git a/bfd/coff-w65.c b/bfd/coff-w65.c
index 774d270d22b..093764a0da0 100644
--- a/bfd/coff-w65.c
+++ b/bfd/coff-w65.c
@@ -1,5 +1,6 @@
 /* BFD back-end for WDC 65816 COFF binaries.
-   Copyright 1995, 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
    Written by Steve Chamberlain, <sac@cygnus.com>.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -35,16 +36,16 @@ static void w65_reloc16_extra_cases PARAMS ((bfd *,struct bfd_link_info *, struc
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
 static reloc_howto_type howto_table[] =
   {
-    HOWTO (R_W65_ABS8,    0,  0, 8,  false, 0, complain_overflow_bitfield, 0, "abs8", true, 0x000000ff, 0x000000ff, false),
-    HOWTO (R_W65_ABS16,   1,  0, 16, false, 0, complain_overflow_bitfield, 0, "abs16", true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO (R_W65_ABS24,   0,  2, 32, false, 0, complain_overflow_bitfield, 0, "abs24", true, 0x00ffffff, 0x00ffffff, false),
-    HOWTO (R_W65_ABS8S8,  0,  0, 8,  false, 0, complain_overflow_bitfield, 0, ">abs8", true, 0x000000ff, 0x000000ff, false),
-    HOWTO (R_W65_ABS8S16, 0,  0, 8,  false, 0, complain_overflow_bitfield, 0, "^abs8", true, 0x000000ff, 0x000000ff, false),
-    HOWTO (R_W65_ABS16S8, 1,  0, 16, false, 0, complain_overflow_bitfield, 0, ">abs16", true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO (R_W65_ABS16S16,1,  0, 16, false, 0, complain_overflow_bitfield, 0, "^abs16", true, 0x0000ffff, 0x0000ffff, false),
-    HOWTO (R_W65_PCR8,    0,  0, 8,  false, 0, complain_overflow_bitfield, 0, "pcrel8", true, 0x000000ff, 0x000000ff, true),
-    HOWTO (R_W65_PCR16,   1,  0, 16, false, 0, complain_overflow_bitfield, 0, "pcrel16", true, 0x0000ffff, 0x0000ffff, true),
-    HOWTO (R_W65_DP,      0,  0, 8,  false, 0, complain_overflow_bitfield, 0, "dp", true, 0x000000ff, 0x000000ff, false),
+    HOWTO (R_W65_ABS8,    0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, "abs8", TRUE, 0x000000ff, 0x000000ff, FALSE),
+    HOWTO (R_W65_ABS16,   1,  0, 16, FALSE, 0, complain_overflow_bitfield, 0, "abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (R_W65_ABS24,   0,  2, 32, FALSE, 0, complain_overflow_bitfield, 0, "abs24", TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO (R_W65_ABS8S8,  0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, ">abs8", TRUE, 0x000000ff, 0x000000ff, FALSE),
+    HOWTO (R_W65_ABS8S16, 0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, "^abs8", TRUE, 0x000000ff, 0x000000ff, FALSE),
+    HOWTO (R_W65_ABS16S8, 1,  0, 16, FALSE, 0, complain_overflow_bitfield, 0, ">abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (R_W65_ABS16S16,1,  0, 16, FALSE, 0, complain_overflow_bitfield, 0, "^abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (R_W65_PCR8,    0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, "pcrel8", TRUE, 0x000000ff, 0x000000ff, TRUE),
+    HOWTO (R_W65_PCR16,   1,  0, 16, FALSE, 0, complain_overflow_bitfield, 0, "pcrel16", TRUE, 0x0000ffff, 0x0000ffff, TRUE),
+    HOWTO (R_W65_DP,      0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, "dp", TRUE, 0x000000ff, 0x000000ff, FALSE),
   };
 
 /* Turn a howto into a reloc number.  */
diff --git a/bfd/coff-we32k.c b/bfd/coff-we32k.c
index 5f77b5e6a97..fb674a95806 100644
--- a/bfd/coff-we32k.c
+++ b/bfd/coff-we32k.c
@@ -1,5 +1,6 @@
 /* BFD back-end for we32k COFF files.
-   Copyright 1992, 1993, 1994, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 1999, 2000, 2002
+   Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@cs.widener.edu).
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -35,7 +36,7 @@ static reloc_howto_type howto_table[] =
     EMPTY_HOWTO (3),
     EMPTY_HOWTO (4),
     EMPTY_HOWTO (5),
-  HOWTO(R_DIR32,	       0,  2, 	32, false, 0,complain_overflow_bitfield, 0, "dir32",	true, 0xffffffff,0xffffffff, false),
+  HOWTO(R_DIR32,	       0,  2, 	32, FALSE, 0,complain_overflow_bitfield, 0, "dir32",	TRUE, 0xffffffff,0xffffffff, FALSE),
     EMPTY_HOWTO (7),
     EMPTY_HOWTO (010),
     EMPTY_HOWTO (011),
@@ -44,12 +45,12 @@ static reloc_howto_type howto_table[] =
     EMPTY_HOWTO (014),
     EMPTY_HOWTO (015),
     EMPTY_HOWTO (016),
-  HOWTO(R_RELBYTE,	       0,  0,  	8,  false, 0, complain_overflow_bitfield, 0, "8",	true, 0x000000ff,0x000000ff, false),
-  HOWTO(R_RELWORD,	       0,  1, 	16, false, 0, complain_overflow_bitfield, 0, "16",	true, 0x0000ffff,0x0000ffff, false),
-  HOWTO(R_RELLONG,	       0,  2, 	32, false, 0, complain_overflow_bitfield, 0, "32",	true, 0xffffffff,0xffffffff, false),
-  HOWTO(R_PCRBYTE,	       0,  0, 	8,  true,  0, complain_overflow_signed, 0, "DISP8",    true, 0x000000ff,0x000000ff, false),
-  HOWTO(R_PCRWORD,	       0,  1, 	16, true,  0, complain_overflow_signed, 0, "DISP16",   true, 0x0000ffff,0x0000ffff, false),
-  HOWTO(R_PCRLONG,	       0,  2, 	32, true,  0, complain_overflow_signed, 0, "DISP32",   true, 0xffffffff,0xffffffff, false),
+  HOWTO(R_RELBYTE,	       0,  0,  	8,  FALSE, 0, complain_overflow_bitfield, 0, "8",	TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO(R_RELWORD,	       0,  1, 	16, FALSE, 0, complain_overflow_bitfield, 0, "16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO(R_RELLONG,	       0,  2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+  HOWTO(R_PCRBYTE,	       0,  0, 	8,  TRUE,  0, complain_overflow_signed, 0, "DISP8",    TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO(R_PCRWORD,	       0,  1, 	16, TRUE,  0, complain_overflow_signed, 0, "DISP16",   TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO(R_PCRLONG,	       0,  2, 	32, TRUE,  0, complain_overflow_signed, 0, "DISP32",   TRUE, 0xffffffff,0xffffffff, FALSE),
 };
 
 /* Turn a howto into a reloc  nunmber */
diff --git a/bfd/coff-z8k.c b/bfd/coff-z8k.c
index c1d6a88fbbb..068cfac7b6b 100644
--- a/bfd/coff-z8k.c
+++ b/bfd/coff-z8k.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Zilog Z800n COFF binaries.
-   Copyright 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001
+   Copyright 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by Cygnus Support.
    Written by Steve Chamberlain, <sac@cygnus.com>.
@@ -36,40 +36,40 @@ static int coff_z8k_select_reloc PARAMS ((reloc_howto_type *));
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
 
 static reloc_howto_type r_imm32 =
-HOWTO (R_IMM32, 0, 2, 32, false, 0,
-       complain_overflow_bitfield, 0, "r_imm32", true, 0xffffffff,
-       0xffffffff, false);
+HOWTO (R_IMM32, 0, 2, 32, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm32", TRUE, 0xffffffff,
+       0xffffffff, FALSE);
 
 static reloc_howto_type r_imm4l =
-HOWTO (R_IMM4L, 0, 0, 4, false, 0,
-       complain_overflow_bitfield, 0, "r_imm4l", true, 0xf, 0xf, false);
+HOWTO (R_IMM4L, 0, 0, 4, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm4l", TRUE, 0xf, 0xf, FALSE);
 
 static reloc_howto_type r_da =
-HOWTO (R_IMM16, 0, 1, 16, false, 0,
-       complain_overflow_bitfield, 0, "r_da", true, 0x0000ffff, 0x0000ffff,
-       false);
+HOWTO (R_IMM16, 0, 1, 16, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_da", TRUE, 0x0000ffff, 0x0000ffff,
+       FALSE);
 
 static reloc_howto_type r_imm8 =
-HOWTO (R_IMM8, 0, 0, 8, false, 0,
-       complain_overflow_bitfield, 0, "r_imm8", true, 0x000000ff, 0x000000ff,
-       false);
+HOWTO (R_IMM8, 0, 0, 8, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm8", TRUE, 0x000000ff, 0x000000ff,
+       FALSE);
 
 static reloc_howto_type r_rel16 =
-HOWTO (R_REL16, 0, 1, 16, false, 0,
-       complain_overflow_bitfield, 0, "r_rel16", true, 0x0000ffff, 0x0000ffff,
-       true);
+HOWTO (R_REL16, 0, 1, 16, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_rel16", TRUE, 0x0000ffff, 0x0000ffff,
+       TRUE);
 
 static reloc_howto_type r_jr =
-HOWTO (R_JR, 0, 0, 8, true, 0, complain_overflow_signed, 0,
-       "r_jr", true, 0, 0, true);
+HOWTO (R_JR, 0, 0, 8, TRUE, 0, complain_overflow_signed, 0,
+       "r_jr", TRUE, 0, 0, TRUE);
 
 static reloc_howto_type r_disp7 =
-HOWTO (R_DISP7, 0, 0, 7, true, 0, complain_overflow_bitfield, 0,
-       "r_disp7", true, 0, 0, true);
+HOWTO (R_DISP7, 0, 0, 7, TRUE, 0, complain_overflow_bitfield, 0,
+       "r_disp7", TRUE, 0, 0, TRUE);
 
 static reloc_howto_type r_callr =
-HOWTO (R_CALLR, 0, 1, 12, true, 0, complain_overflow_signed, 0,
-       "r_callr", true, 0xfff, 0xfff, true);
+HOWTO (R_CALLR, 0, 1, 12, TRUE, 0, complain_overflow_signed, 0,
+       "r_callr", TRUE, 0xfff, 0xfff, TRUE);
 
 /* Turn a howto into a reloc number */
 
diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c
index 61553bea81a..c4b56223df3 100644
--- a/bfd/coff64-rs6000.c
+++ b/bfd/coff64-rs6000.c
@@ -82,39 +82,56 @@
 #define coff_SWAP_lineno_in _bfd_xcoff64_swap_lineno_in
 #define coff_SWAP_lineno_out _bfd_xcoff64_swap_lineno_out
 
-static void _bfd_xcoff64_swap_lineno_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int _bfd_xcoff64_swap_lineno_out PARAMS ((bfd *, PTR, PTR));
-static boolean _bfd_xcoff64_put_symbol_name
+static void _bfd_xcoff64_swap_lineno_in
+  PARAMS ((bfd *, PTR, PTR));
+static unsigned int _bfd_xcoff64_swap_lineno_out
+  PARAMS ((bfd *, PTR, PTR));
+static bfd_boolean _bfd_xcoff64_put_symbol_name
   PARAMS ((bfd *, struct bfd_strtab_hash *, struct internal_syment *,
 	   const char *));
-static boolean _bfd_xcoff64_put_ldsymbol_name
+static bfd_boolean _bfd_xcoff64_put_ldsymbol_name
   PARAMS ((bfd *, struct xcoff_loader_info *, struct internal_ldsym *,
 	   const char *));
-static void _bfd_xcoff64_swap_sym_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int _bfd_xcoff64_swap_sym_out PARAMS ((bfd *, PTR, PTR));
+static void _bfd_xcoff64_swap_sym_in
+  PARAMS ((bfd *, PTR, PTR));
+static unsigned int _bfd_xcoff64_swap_sym_out
+  PARAMS ((bfd *, PTR, PTR));
 static void _bfd_xcoff64_swap_aux_in
   PARAMS ((bfd *, PTR, int, int, int, int, PTR));
 static unsigned int _bfd_xcoff64_swap_aux_out
   PARAMS ((bfd *, PTR, int, int, int, int, PTR));
-static void xcoff64_swap_reloc_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int xcoff64_swap_reloc_out PARAMS ((bfd *, PTR, PTR));
-extern boolean _bfd_xcoff_mkobject PARAMS ((bfd *));
-extern boolean _bfd_xcoff_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-extern boolean _bfd_xcoff_is_local_label_name PARAMS ((bfd *, const char *));
+static void xcoff64_swap_reloc_in
+  PARAMS ((bfd *, PTR, PTR));
+static unsigned int xcoff64_swap_reloc_out
+  PARAMS ((bfd *, PTR, PTR));
+extern bfd_boolean _bfd_xcoff_mkobject
+  PARAMS ((bfd *));
+extern bfd_boolean _bfd_xcoff_copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+extern bfd_boolean _bfd_xcoff_is_local_label_name
+  PARAMS ((bfd *, const char *));
 extern void xcoff64_rtype2howto
   PARAMS ((arelent *, struct internal_reloc *));
 extern reloc_howto_type * xcoff64_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-extern boolean _bfd_xcoff_slurp_armap PARAMS ((bfd *));
-extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *));
-extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *));
-extern int _bfd_xcoff_stat_arch_elt PARAMS ((bfd *, struct stat *));
-extern boolean _bfd_xcoff_write_armap
+extern bfd_boolean _bfd_xcoff_slurp_armap
+  PARAMS ((bfd *));
+extern PTR _bfd_xcoff_read_ar_hdr
+  PARAMS ((bfd *));
+extern bfd *_bfd_xcoff_openr_next_archived_file
+  PARAMS ((bfd *, bfd *));
+extern int _bfd_xcoff_stat_arch_elt
+  PARAMS ((bfd *, struct stat *));
+extern bfd_boolean _bfd_xcoff_write_armap
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *));
-extern int _bfd_xcoff_sizeof_headers PARAMS ((bfd *, boolean));
-extern void _bfd_xcoff_swap_sym_in PARAMS ((bfd *, PTR, PTR));
-extern unsigned int _bfd_xcoff_swap_sym_out PARAMS ((bfd *, PTR, PTR));
+extern bfd_boolean _bfd_xcoff_write_archive_contents
+  PARAMS ((bfd *));
+extern int _bfd_xcoff_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+extern void _bfd_xcoff_swap_sym_in
+  PARAMS ((bfd *, PTR, PTR));
+extern unsigned int _bfd_xcoff_swap_sym_out
+  PARAMS ((bfd *, PTR, PTR));
 extern void _bfd_xcoff_swap_aux_in
   PARAMS ((bfd *, PTR, int, int, int, int, PTR));
 extern unsigned int _bfd_xcoff_swap_aux_out
@@ -131,31 +148,40 @@ static void xcoff64_swap_ldrel_in
   PARAMS ((bfd *, const PTR, struct internal_ldrel *));
 static void xcoff64_swap_ldrel_out
   PARAMS ((bfd *, const struct internal_ldrel *, PTR d));
-static boolean xcoff64_write_object_contents PARAMS ((bfd *));
-static boolean xcoff64_ppc_relocate_section
+static bfd_boolean xcoff64_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean xcoff64_ppc_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *,
 	   asection **));
-static boolean xcoff64_slurp_armap PARAMS ((bfd *));
-static const bfd_target *xcoff64_archive_p PARAMS ((bfd *));
-static bfd *xcoff64_openr_next_archived_file PARAMS ((bfd *, bfd *));
-static int xcoff64_sizeof_headers PARAMS ((bfd *, boolean));
+static bfd_boolean xcoff64_slurp_armap
+  PARAMS ((bfd *));
+static const bfd_target *xcoff64_archive_p
+  PARAMS ((bfd *));
+static bfd *xcoff64_openr_next_archived_file
+  PARAMS ((bfd *, bfd *));
+static int xcoff64_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
 static asection *xcoff64_create_csect_from_smclas
   PARAMS ((bfd *, union internal_auxent *, const char *));
-static boolean xcoff64_is_lineno_count_overflow PARAMS ((bfd *, bfd_vma));
-static boolean xcoff64_is_reloc_count_overflow PARAMS ((bfd *, bfd_vma));
+static bfd_boolean xcoff64_is_lineno_count_overflow
+  PARAMS ((bfd *, bfd_vma));
+static bfd_boolean xcoff64_is_reloc_count_overflow
+  PARAMS ((bfd *, bfd_vma));
 static bfd_vma xcoff64_loader_symbol_offset
   PARAMS ((bfd *, struct internal_ldhdr *));
 static bfd_vma xcoff64_loader_reloc_offset
   PARAMS ((bfd *, struct internal_ldhdr *));
-static boolean xcoff64_generate_rtinit
-  PARAMS ((bfd *, const char *, const char *, boolean));
-static boolean xcoff64_bad_format_hook PARAMS ((bfd *, PTR ));
+static bfd_boolean xcoff64_generate_rtinit
+  PARAMS ((bfd *, const char *, const char *, bfd_boolean));
+static bfd_boolean xcoff64_bad_format_hook
+  PARAMS ((bfd *, PTR ));
 
 /* Relocation functions */
-static boolean xcoff64_reloc_type_br PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+static bfd_boolean xcoff64_reloc_type_br
+  PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
 
-boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
+bfd_boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
   PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)) =
 {
   xcoff_reloc_type_pos,	 /* R_POS   (0x00) */
@@ -212,11 +238,14 @@ boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
 #define coff_bfd_is_local_label_name _bfd_xcoff_is_local_label_name
 #define coff_bfd_reloc_type_lookup xcoff64_reloc_type_lookup
 #ifdef AIX_CORE
-extern const bfd_target * rs6000coff_core_p PARAMS ((bfd *abfd));
-extern boolean rs6000coff_core_file_matches_executable_p
+extern const bfd_target * rs6000coff_core_p
+  PARAMS ((bfd *abfd));
+extern bfd_boolean rs6000coff_core_file_matches_executable_p
   PARAMS ((bfd *cbfd, bfd *ebfd));
-extern char *rs6000coff_core_file_failing_command PARAMS ((bfd *abfd));
-extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd));
+extern char *rs6000coff_core_file_failing_command
+  PARAMS ((bfd *abfd));
+extern int rs6000coff_core_file_failing_signal
+  PARAMS ((bfd *abfd));
 #define CORE_FILE_P rs6000coff_core_p
 #define coff_core_file_failing_command \
   rs6000coff_core_file_failing_command
@@ -496,33 +525,33 @@ _bfd_xcoff64_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
   return bfd_coff_auxesz (abfd);
 }
 
-static boolean
+static bfd_boolean
 _bfd_xcoff64_put_symbol_name (abfd, strtab, sym, name)
      bfd *abfd;
      struct bfd_strtab_hash *strtab;
      struct internal_syment *sym;
      const char *name;
 {
-  boolean hash;
+  bfd_boolean hash;
   bfd_size_type indx;
 
-  hash = true;
+  hash = TRUE;
 
   if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-    hash = false;
+    hash = FALSE;
 
-  indx = _bfd_stringtab_add (strtab, name, hash, false);
+  indx = _bfd_stringtab_add (strtab, name, hash, FALSE);
 
   if (indx == (bfd_size_type) -1)
-    return false;
+    return FALSE;
 
   sym->_n._n_n._n_zeroes = 0;
   sym->_n._n_n._n_offset = STRING_SIZE_SIZE + indx;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct xcoff_loader_info *ldinfo;
@@ -547,8 +576,8 @@ _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name)
 		    bfd_realloc ((PTR) ldinfo->strings, newalc));
       if (newstrings == NULL)
 	{
-	  ldinfo->failed = true;
-	  return false;
+	  ldinfo->failed = TRUE;
+	  return FALSE;
 	}
       ldinfo->string_alc = newalc;
       ldinfo->strings = newstrings;
@@ -561,7 +590,7 @@ _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name)
   ldsym->_l._l_l._l_offset = ldinfo->string_size + 2;
   ldinfo->string_size += len + 3;
 
-  return true;
+  return TRUE;
 }
 
 /* Routines to swap information in the XCOFF .loader section.  If we
@@ -720,20 +749,20 @@ xcoff64_swap_ldrel_out (abfd, src, d)
   bfd_put_32 (abfd, src->l_symndx, dst->l_symndx);
 }
 
-static boolean
+static bfd_boolean
 xcoff64_write_object_contents (abfd)
      bfd *abfd;
 {
   asection *current;
-  boolean hasrelocs = false;
-  boolean haslinno = false;
+  bfd_boolean hasrelocs = FALSE;
+  bfd_boolean haslinno = FALSE;
   file_ptr scn_base;
   file_ptr reloc_base;
   file_ptr lineno_base;
   file_ptr sym_base;
   unsigned long reloc_size = 0;
   unsigned long lnno_size = 0;
-  boolean long_section_names;
+  bfd_boolean long_section_names;
   asection *text_sec = ((void *) 0);
   asection *data_sec = ((void *) 0);
   asection *bss_sec = ((void *) 0);
@@ -745,7 +774,7 @@ xcoff64_write_object_contents (abfd)
   if (! abfd->output_has_begun)
     {
       if (! bfd_coff_compute_section_file_positions (abfd))
-	return false;
+	return FALSE;
     }
 
   /* Work out the size of the reloc and linno areas.  */
@@ -801,9 +830,9 @@ xcoff64_write_object_contents (abfd)
   internal_f.f_nscns = 0;
 
   if (bfd_seek (abfd, scn_base, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
-  long_section_names = false;
+  long_section_names = FALSE;
   for (current = abfd->sections; current != NULL; current = current->next)
     {
       struct internal_scnhdr section;
@@ -836,9 +865,9 @@ xcoff64_write_object_contents (abfd)
 
       section.s_nlnno = current->lineno_count;
       if (current->reloc_count != 0)
-	hasrelocs = true;
+	hasrelocs = TRUE;
       if (current->lineno_count != 0)
-	haslinno = true;
+	haslinno = TRUE;
 
       section.s_flags = sec_to_styp_flags (current->name, current->flags);
 
@@ -858,7 +887,7 @@ xcoff64_write_object_contents (abfd)
       amount = bfd_coff_scnhsz (abfd);
       if (bfd_coff_swap_scnhdr_out (abfd, &section, &buff) == 0
 	  || bfd_bwrite ((PTR) (&buff), amount, abfd) != amount)
-	return false;
+	return FALSE;
     }
 
   internal_f.f_timdat = 0;
@@ -909,14 +938,14 @@ xcoff64_write_object_contents (abfd)
       int firstundef;
 
       if (!coff_renumber_symbols (abfd, &firstundef))
-	return false;
+	return FALSE;
       coff_mangle_symbols (abfd);
       if (! coff_write_symbols (abfd))
-	return false;
+	return FALSE;
       if (! coff_write_linenumbers (abfd))
-	return false;
+	return FALSE;
       if (! coff_write_relocs (abfd, firstundef))
-	return false;
+	return FALSE;
 
       internal_f.f_symptr = sym_base;
       internal_f.f_nsyms = bfd_get_symcount (abfd);
@@ -1028,7 +1057,7 @@ xcoff64_write_object_contents (abfd)
     }
 
   if (bfd_seek (abfd, (file_ptr) 0, 0) != 0)
-    return false;
+    return FALSE;
 
   {
     char * buff;
@@ -1036,7 +1065,7 @@ xcoff64_write_object_contents (abfd)
 
     buff = bfd_malloc (amount);
     if (buff == NULL)
-      return false;
+      return FALSE;
 
     bfd_coff_swap_filehdr_out (abfd, (PTR) &internal_f, (PTR) buff);
     amount = bfd_bwrite ((PTR) buff, amount, abfd);
@@ -1044,7 +1073,7 @@ xcoff64_write_object_contents (abfd)
     free (buff);
 
     if (amount != bfd_coff_filhsz (abfd))
-      return false;
+      return FALSE;
   }
 
   if (abfd->flags & EXEC_P)
@@ -1054,7 +1083,7 @@ xcoff64_write_object_contents (abfd)
 
       buff = bfd_malloc (amount);
       if (buff == NULL)
-	return false;
+	return FALSE;
 
       bfd_coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) buff);
       amount = bfd_bwrite ((PTR) buff, amount, abfd);
@@ -1062,13 +1091,13 @@ xcoff64_write_object_contents (abfd)
       free (buff);
 
       if (amount != bfd_coff_aoutsz (abfd))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 xcoff64_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto,
 		       val, addend, relocation, contents)
      bfd *input_bfd;
@@ -1085,7 +1114,7 @@ xcoff64_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto,
   struct xcoff_link_hash_entry *h;
 
   if (0 > rel->r_symndx)
-    return false;
+    return FALSE;
 
   h = obj_xcoff_sym_hashes (input_bfd)[rel->r_symndx];
 
@@ -1133,7 +1162,7 @@ xcoff64_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto,
       howto->complain_on_overflow = complain_overflow_dont;
     }
 
-  howto->pc_relative = true;
+  howto->pc_relative = TRUE;
   howto->src_mask &= ~3;
   howto->dst_mask = howto->src_mask;
 
@@ -1143,13 +1172,13 @@ xcoff64_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto,
   *relocation = val + addend;
   *relocation -= (input_section->output_section->vma
 		  + input_section->output_offset);
-  return true;
+  return TRUE;
 }
 
 /* This is the relocation function for the PowerPC64.
    See xcoff_ppc_relocation_section for more information. */
 
-boolean
+bfd_boolean
 xcoff64_ppc_relocate_section (output_bfd, info, input_bfd,
 			      input_section, contents, relocs, syms,
 			      sections)
@@ -1191,16 +1220,16 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd,
       howto.rightshift = 0;
       howto.bitsize = (rel->r_size & 0x3f) + 1;
       howto.size = howto.bitsize > 16 ? (howto.bitsize > 32 ? 4 : 2) : 1;
-      howto.pc_relative = false;
+      howto.pc_relative = FALSE;
       howto.bitpos = 0;
       howto.complain_on_overflow = (rel->r_size & 0x80
 				    ? complain_overflow_signed
 				    : complain_overflow_bitfield);
       howto.special_function = NULL;
       howto.name = "internal";
-      howto.partial_inplace = true;
+      howto.partial_inplace = TRUE;
       howto.src_mask = howto.dst_mask = N_ONES (howto.bitsize);
-      howto.pcrel_offset = false;
+      howto.pcrel_offset = FALSE;
 
       /* symbol */
       val = 0;
@@ -1252,8 +1281,8 @@ xcoff64_ppc_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;
 
 		  /* Don't try to process the reloc.  It can't help, and
 		     it may generate another error.  */
@@ -1266,7 +1295,7 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd,
 	  || ((*xcoff64_calculate_relocation[rel->r_type])
 	      (input_bfd, input_section, output_bfd, rel, sym, &howto, val,
 	       addend, &relocation, contents)))
-	return false;
+	return FALSE;
 
       /* address */
       address = rel->r_vaddr - input_section->vma;
@@ -1320,7 +1349,7 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd,
 	  if (! ((*info->callbacks->reloc_overflow)
 		 (info, name, reloc_type_name, (bfd_vma) 0, input_bfd,
 		  input_section, rel->r_vaddr - input_section->vma)))
-	    return false;
+	    return FALSE;
 	}
 
       /* Add RELOCATION to the right bits of VALUE_TO_RELOCATE.  */
@@ -1337,7 +1366,7 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd,
 	bfd_put_64 (input_bfd, value_to_relocate, location);
 
     }
-  return true;
+  return TRUE;
 }
 
 
@@ -1354,105 +1383,105 @@ reloc_howto_type xcoff64_howto_table[] =
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_POS_64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit relocation, but store negative value.  */
   HOWTO (R_NEG,			/* type */
 	 0,			/* rightshift */
 	 -4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_NEG",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit PC relative relocation.  */
   HOWTO (R_REL,			/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_REL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit TOC relative relocation.  */
   HOWTO (R_TOC,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_TOC",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* I don't really know what this is.	*/
   HOWTO (R_RTB,			/* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RTB",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* External TOC relative symbol.  */
   HOWTO (R_GL,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_GL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Local TOC relative symbol.	 */
   HOWTO (R_TCL,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_TCL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (7),
 
@@ -1461,15 +1490,15 @@ reloc_howto_type xcoff64_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_BA_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03fffffc,		/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (9),
 
@@ -1478,15 +1507,15 @@ reloc_howto_type xcoff64_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_BR",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03fffffc,		/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (0xb),
 
@@ -1495,30 +1524,30 @@ reloc_howto_type xcoff64_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Load address.  */
   HOWTO (R_RLA,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RLA",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (0xe),
 
@@ -1527,15 +1556,15 @@ reloc_howto_type xcoff64_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_REF",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (0x10),
   EMPTY_HOWTO (0x11),
@@ -1545,209 +1574,209 @@ reloc_howto_type xcoff64_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_TRL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* TOC relative load address.	 */
   HOWTO (R_TRLA,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_TRLA",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable relative branch.  */
   HOWTO (R_RRTBI,		/* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RRTBI",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable absolute branch.  */
   HOWTO (R_RRTBA,		/* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RRTBA",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable call absolute indirect.	 */
   HOWTO (R_CAI,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_CAI",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable call relative.	*/
   HOWTO (R_CREL,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_CREL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (R_RBA,			/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBA",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03fffffc,		/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (R_RBAC,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBAC",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch relative.  */
   HOWTO (R_RBR,			/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBR_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03fffffc,		/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (R_RBRC,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBRC",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_POS,			/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_POS_32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit Non modifiable absolute branch.  */
   HOWTO (R_BA,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_BA_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xfffc,		/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch relative.  */
   HOWTO (R_RBR,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBR_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (R_RBA,			/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "R_RBA_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 };
 
@@ -1817,7 +1846,7 @@ xcoff64_reloc_type_lookup (abfd, code)
 
 /* Read in the armap of an XCOFF archive.  */
 
-static boolean
+static bfd_boolean
 xcoff64_slurp_armap (abfd)
      bfd *abfd;
 {
@@ -1835,40 +1864,40 @@ xcoff64_slurp_armap (abfd)
 
   if (xcoff_ardata (abfd) == NULL)
     {
-      bfd_has_map (abfd) = false;
-      return true;
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
     }
 
   off = bfd_scan_vma (xcoff_ardata_big (abfd)->symoff64,
 		      (const char **) NULL, 10);
   if (off == 0)
     {
-      bfd_has_map (abfd) = false;
-      return true;
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
     }
 
   if (bfd_seek (abfd, off, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   /* The symbol table starts with a normal archive header.  */
   if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
       != SIZEOF_AR_HDR_BIG)
-    return false;
+    return FALSE;
 
   /* Skip the name (normally empty).  */
   namlen = strtol (hdr.namlen, (char **) NULL, 10);
   pos = ((namlen + 1) & ~(size_t) 1) + SXCOFFARFMAG;
   if (bfd_seek (abfd, pos, SEEK_CUR) != 0)
-    return false;
+    return FALSE;
 
   sz = bfd_scan_vma (hdr.size, (const char **) NULL, 10);
 
   /* Read in the entire symbol table.  */
   contents = (bfd_byte *) bfd_alloc (abfd, sz);
   if (contents == NULL)
-    return false;
+    return FALSE;
   if (bfd_bread ((PTR) contents, sz, abfd) != sz)
-    return false;
+    return FALSE;
 
   /* The symbol table starts with an eight byte count.  */
   c = H_GET_64 (abfd, contents);
@@ -1876,13 +1905,13 @@ xcoff64_slurp_armap (abfd)
   if (c * 8 >= sz)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
   amt = c;
   amt *= sizeof (carsym);
   bfd_ardata (abfd)->symdefs = (carsym *) bfd_alloc (abfd, amt);
   if (bfd_ardata (abfd)->symdefs == NULL)
-    return false;
+    return FALSE;
 
   /* After the count comes a list of eight byte file offsets.  */
   for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 8;
@@ -1899,15 +1928,15 @@ xcoff64_slurp_armap (abfd)
       if (p >= cend)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       arsym->name = (char *) p;
     }
 
   bfd_ardata (abfd)->symdef_count = c;
-  bfd_has_map (abfd) = true;
+  bfd_has_map (abfd) = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 
@@ -2029,7 +2058,7 @@ xcoff64_openr_next_archived_file (archive, last_file)
 static int
 xcoff64_sizeof_headers (abfd, reloc)
      bfd *abfd;
-     boolean reloc ATTRIBUTE_UNUSED;
+     bfd_boolean reloc ATTRIBUTE_UNUSED;
 {
   int size;
 
@@ -2085,20 +2114,20 @@ xcoff64_create_csect_from_smclas (abfd, aux, symbol_name)
   return return_value;
 }
 
-static boolean
+static bfd_boolean
 xcoff64_is_lineno_count_overflow (abfd, value)
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd_vma value ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
 
-static boolean
+static bfd_boolean
 xcoff64_is_reloc_count_overflow (abfd, value)
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd_vma value ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
 
 static bfd_vma
@@ -2117,7 +2146,7 @@ xcoff64_loader_reloc_offset (abfd, ldhdr)
   return (ldhdr->l_rldoff);
 }
 
-static boolean
+static bfd_boolean
 xcoff64_bad_format_hook (abfd, filehdr)
      bfd * abfd;
      PTR filehdr;
@@ -2126,20 +2155,20 @@ xcoff64_bad_format_hook (abfd, filehdr)
 
   /* Check flavor first.  */
   if (bfd_get_flavour (abfd) != bfd_target_xcoff_flavour)
-    return false;
+    return FALSE;
 
   if (bfd_xcoff_magic_number (abfd) != internal_f->f_magic)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 xcoff64_generate_rtinit (abfd, init, fini, rtld)
      bfd *abfd;
      const char *init;
      const char *fini;
-     boolean rtld;
+     bfd_boolean rtld;
 {
   bfd_byte filehdr_ext[FILHSZ];
   bfd_byte scnhdr_ext[SCNHSZ * 3];
@@ -2166,7 +2195,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld)
   char *rtld_name = "__rtld";
 
   if (! bfd_xcoff_rtinit_size (abfd))
-    return false;
+    return FALSE;
 
   initsz = (init == NULL ? 0 : 1 + strlen (init));
   finisz = (fini == NULL ? 0 : 1 + strlen (fini));
@@ -2255,7 +2284,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld)
   data_buffer = NULL;
   data_buffer = (bfd_byte *) bfd_zmalloc (data_buffer_size);
   if (data_buffer == NULL)
-    return false;
+    return FALSE;
 
   if (initsz)
     {
@@ -2291,7 +2320,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld)
 
   string_table = (bfd_byte *) bfd_zmalloc (string_table_size);
   if (string_table == NULL)
-    return false;
+    return FALSE;
 
   val = string_table_size;
   bfd_put_32 (abfd, val, &string_table[0]);
@@ -2455,7 +2484,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld)
   free (data_buffer);
   data_buffer = NULL;
 
-  return true;
+  return TRUE;
 }
 
 /* The typical dynamic reloc.  */
@@ -2465,15 +2494,15 @@ HOWTO (0,			/* type */
        0,			/* rightshift */
        4,			/* size (0 = byte, 1 = short, 2 = long) */
        64,			/* bitsize */
-       false,			/* pc_relative */
+       FALSE,			/* pc_relative */
        0,			/* bitpos */
        complain_overflow_bitfield, /* complain_on_overflow */
        0,			/* special_function */
        "R_POS",			/* name */
-       true,			/* partial_inplace */
+       TRUE,			/* partial_inplace */
        MINUS_ONE,		/* src_mask */
        MINUS_ONE,		/* dst_mask */
-       false);			/* pcrel_offset */
+       FALSE);			/* pcrel_offset */
 
 static unsigned long xcoff64_glink_code[10] =
 {
@@ -2510,10 +2539,10 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data =
       RELSZ,
       LINESZ,
       FILNMLEN,
-      true,			/* _bfd_coff_long_filenames */
-      false,			/* _bfd_coff_long_section_names */
+      TRUE,			/* _bfd_coff_long_filenames */
+      FALSE,			/* _bfd_coff_long_section_names */
       3,			/* _bfd_coff_default_section_alignment_power */
-      true,			/* _bfd_coff_force_symnames_in_strings */
+      TRUE,			/* _bfd_coff_force_symnames_in_strings */
       4,			/* _bfd_coff_debug_string_prefix_length */
       coff_swap_filehdr_in,
       coff_swap_aouthdr_in,
@@ -2652,11 +2681,11 @@ const bfd_target rs6000coff64_vec =
 
     /* Copy */
     _bfd_xcoff_copy_private_bfd_data,
-    ((boolean (*) (bfd *, bfd *)) bfd_true),
-    ((boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
-    ((boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
-    ((boolean (*) (bfd *, flagword)) bfd_true),
-    ((boolean (*) (bfd *, void * )) bfd_true),
+    ((bfd_boolean (*) (bfd *, bfd *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, flagword)) bfd_true),
+    ((bfd_boolean (*) (bfd *, void * )) bfd_true),
 
     /* Core */
     coff_core_file_failing_command,
@@ -2666,7 +2695,7 @@ const bfd_target rs6000coff64_vec =
     /* Archive */
     xcoff64_slurp_armap,
     bfd_false,
-    ((boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
+    ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
     bfd_dont_truncate_arname,
     _bfd_xcoff_write_armap,
     _bfd_xcoff_read_ar_hdr,
@@ -2723,10 +2752,14 @@ const bfd_target rs6000coff64_vec =
     (void *) &bfd_xcoff_backend_data,
   };
 
-extern const bfd_target *xcoff64_core_p PARAMS ((bfd *));
-extern boolean xcoff64_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
-extern char *xcoff64_core_file_failing_command PARAMS ((bfd *));
-extern int xcoff64_core_file_failing_signal PARAMS ((bfd *));
+extern const bfd_target *xcoff64_core_p
+  PARAMS ((bfd *));
+extern bfd_boolean xcoff64_core_file_matches_executable_p
+  PARAMS ((bfd *, bfd *));
+extern char *xcoff64_core_file_failing_command
+  PARAMS ((bfd *));
+extern int xcoff64_core_file_failing_signal
+  PARAMS ((bfd *));
 
 /* AIX 5 */
 static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data =
@@ -2750,10 +2783,10 @@ static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data =
       RELSZ,
       LINESZ,
       FILNMLEN,
-      true,			/* _bfd_coff_long_filenames */
-      false,			/* _bfd_coff_long_section_names */
+      TRUE,			/* _bfd_coff_long_filenames */
+      FALSE,			/* _bfd_coff_long_section_names */
       3,			/* _bfd_coff_default_section_alignment_power */
-      true,			/* _bfd_coff_force_symnames_in_strings */
+      TRUE,			/* _bfd_coff_force_symnames_in_strings */
       4,			/* _bfd_coff_debug_string_prefix_length */
       coff_swap_filehdr_in,
       coff_swap_aouthdr_in,
@@ -2891,11 +2924,11 @@ const bfd_target aix5coff64_vec =
 
     /* Copy */
     _bfd_xcoff_copy_private_bfd_data,
-    ((boolean (*) (bfd *, bfd *)) bfd_true),
-    ((boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
-    ((boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
-    ((boolean (*) (bfd *, flagword)) bfd_true),
-    ((boolean (*) (bfd *, void * )) bfd_true),
+    ((bfd_boolean (*) (bfd *, bfd *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
+    ((bfd_boolean (*) (bfd *, flagword)) bfd_true),
+    ((bfd_boolean (*) (bfd *, void * )) bfd_true),
 
     /* Core */
     xcoff64_core_file_failing_command,
@@ -2905,7 +2938,7 @@ const bfd_target aix5coff64_vec =
     /* Archive */
     xcoff64_slurp_armap,
     bfd_false,
-    ((boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
+    ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
     bfd_dont_truncate_arname,
     _bfd_xcoff_write_armap,
     _bfd_xcoff_read_ar_hdr,
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 694fb12f4d8..1b6ef0be201 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -296,7 +296,7 @@ CODE_FRAGMENT
 .  struct lineno_cache_entry *lineno;
 .
 .  {* Have the line numbers been relocated yet ? *}
-.  boolean done_lineno;
+.  bfd_boolean done_lineno;
 .} coff_symbol_type;
 
 */
@@ -309,42 +309,58 @@ CODE_FRAGMENT
 
 #define STRING_SIZE_SIZE (4)
 
-static long sec_to_styp_flags PARAMS ((const char *, flagword));
-static boolean styp_to_sec_flags
+static long sec_to_styp_flags
+  PARAMS ((const char *, flagword));
+static bfd_boolean styp_to_sec_flags
   PARAMS ((bfd *, PTR, const char *, asection *, flagword *));
-static boolean coff_bad_format_hook PARAMS ((bfd *, PTR));
+static bfd_boolean coff_bad_format_hook
+  PARAMS ((bfd *, PTR));
 static void coff_set_custom_section_alignment
   PARAMS ((bfd *, asection *, const struct coff_section_alignment_entry *,
 	   const unsigned int));
-static boolean coff_new_section_hook PARAMS ((bfd *, asection *));
-static boolean coff_set_arch_mach_hook PARAMS ((bfd *, PTR));
-static boolean coff_write_relocs PARAMS ((bfd *, int));
-static boolean coff_set_flags
+static bfd_boolean coff_new_section_hook
+  PARAMS ((bfd *, asection *));
+static bfd_boolean coff_set_arch_mach_hook
+  PARAMS ((bfd *, PTR));
+static bfd_boolean coff_write_relocs
+  PARAMS ((bfd *, int));
+static bfd_boolean coff_set_flags
   PARAMS ((bfd *, unsigned int *, unsigned short *));
-static boolean coff_set_arch_mach
+static bfd_boolean coff_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long)) ATTRIBUTE_UNUSED;
-static boolean coff_compute_section_file_positions PARAMS ((bfd *));
-static boolean coff_write_object_contents PARAMS ((bfd *)) ATTRIBUTE_UNUSED;
-static boolean coff_set_section_contents
+static bfd_boolean coff_compute_section_file_positions
+  PARAMS ((bfd *));
+static bfd_boolean coff_write_object_contents
+  PARAMS ((bfd *)) ATTRIBUTE_UNUSED;
+static bfd_boolean coff_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static PTR buy_and_read PARAMS ((bfd *, file_ptr, bfd_size_type));
-static boolean coff_slurp_line_table PARAMS ((bfd *, asection *));
-static boolean coff_slurp_symbol_table PARAMS ((bfd *));
+static PTR buy_and_read
+  PARAMS ((bfd *, file_ptr, bfd_size_type));
+static bfd_boolean coff_slurp_line_table
+  PARAMS ((bfd *, asection *));
+static bfd_boolean coff_slurp_symbol_table
+  PARAMS ((bfd *));
 static enum coff_symbol_classification coff_classify_symbol
   PARAMS ((bfd *, struct internal_syment *));
-static boolean coff_slurp_reloc_table PARAMS ((bfd *, asection *, asymbol **));
+static bfd_boolean coff_slurp_reloc_table
+  PARAMS ((bfd *, asection *, asymbol **));
 static long coff_canonicalize_reloc
   PARAMS ((bfd *, asection *, arelent **, asymbol **));
 #ifndef coff_mkobject_hook
-static PTR coff_mkobject_hook PARAMS ((bfd *, PTR,  PTR));
+static PTR coff_mkobject_hook
+  PARAMS ((bfd *, PTR,  PTR));
 #endif
 #ifdef COFF_WITH_PE
-static flagword handle_COMDAT PARAMS ((bfd *, flagword, PTR, const char *, asection *));
+static flagword handle_COMDAT
+  PARAMS ((bfd *, flagword, PTR, const char *, asection *));
 #endif
 #ifdef COFF_IMAGE_WITH_PE
-static boolean coff_read_word PARAMS ((bfd *, unsigned int *));
-static unsigned int coff_compute_checksum PARAMS ((bfd *));
-static boolean coff_apply_checksum PARAMS ((bfd *));
+static bfd_boolean coff_read_word
+  PARAMS ((bfd *, unsigned int *));
+static unsigned int coff_compute_checksum
+  PARAMS ((bfd *));
+static bfd_boolean coff_apply_checksum
+  PARAMS ((bfd *));
 #endif
 
 /* void warning(); */
@@ -564,7 +580,7 @@ sec_to_styp_flags (sec_name, sec_flags)
 
 #ifndef COFF_WITH_PE
 
-static boolean
+static bfd_boolean
 styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR hdr;
@@ -699,10 +715,10 @@ styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
 #endif
 
   if (flags_ptr == NULL)
-    return false;
+    return FALSE;
 
   * flags_ptr = sec_flags;
-  return true;
+  return TRUE;
 }
 
 #else /* COFF_WITH_PE */
@@ -973,7 +989,7 @@ handle_COMDAT (abfd, sec_flags, hdr, name, section)
    required information.  FIXME: Is the COMDAT symbol index used for
    any purpose other than objdump?  */
 
-static boolean
+static bfd_boolean
 styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
      bfd *abfd;
      PTR hdr;
@@ -984,7 +1000,7 @@ styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
   struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
   long styp_flags = internal_s->s_flags;
   flagword sec_flags;
-  boolean result = true;
+  bfd_boolean result = TRUE;
 
   /* Assume read only unless IMAGE_SCN_MEM_WRITE is specified.  */
   sec_flags = SEC_READONLY;
@@ -1085,7 +1101,7 @@ styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
 	  (*_bfd_error_handler)
 	    (_("%s (%s): Section flag %s (0x%x) ignored"),
 	     bfd_archive_filename (abfd), name, unhandled, flag);
-	  result = false;
+	  result = FALSE;
 	}
     }
 
@@ -1173,10 +1189,10 @@ Special entry points for gdb to swap in coff symbol table parts:
 .  unsigned int _bfd_relsz;
 .  unsigned int _bfd_linesz;
 .  unsigned int _bfd_filnmlen;
-.  boolean _bfd_coff_long_filenames;
-.  boolean _bfd_coff_long_section_names;
+.  bfd_boolean _bfd_coff_long_filenames;
+.  bfd_boolean _bfd_coff_long_section_names;
 .  unsigned int _bfd_coff_default_section_alignment_power;
-.  boolean _bfd_coff_force_symnames_in_strings;
+.  bfd_boolean _bfd_coff_force_symnames_in_strings;
 .  unsigned int _bfd_coff_debug_string_prefix_length;
 .
 .  void (*_bfd_coff_swap_filehdr_in)
@@ -1191,32 +1207,32 @@ Special entry points for gdb to swap in coff symbol table parts:
 .  void (*_bfd_coff_swap_reloc_in)
 .    PARAMS ((bfd *abfd, PTR, PTR));
 .
-.  boolean (*_bfd_coff_bad_format_hook)
+.  bfd_boolean (*_bfd_coff_bad_format_hook)
 .    PARAMS ((bfd *, PTR));
 .
-.  boolean (*_bfd_coff_set_arch_mach_hook)
+.  bfd_boolean (*_bfd_coff_set_arch_mach_hook)
 .    PARAMS ((bfd *, PTR));
 .
 .  PTR (*_bfd_coff_mkobject_hook)
 .    PARAMS ((bfd *, PTR, PTR));
 .
-.  boolean (*_bfd_styp_to_sec_flags_hook)
+.  bfd_boolean (*_bfd_styp_to_sec_flags_hook)
 .    PARAMS ((bfd *, PTR, const char *, asection *, flagword *));
 .
 .  void (*_bfd_set_alignment_hook)
 .    PARAMS ((bfd *, asection *, PTR));
 .
-.  boolean (*_bfd_coff_slurp_symbol_table)
+.  bfd_boolean (*_bfd_coff_slurp_symbol_table)
 .    PARAMS ((bfd *));
 .
-.  boolean (*_bfd_coff_symname_in_debug)
+.  bfd_boolean (*_bfd_coff_symname_in_debug)
 .    PARAMS ((bfd *, struct internal_syment *));
 .
-.  boolean (*_bfd_coff_pointerize_aux_hook)
+.  bfd_boolean (*_bfd_coff_pointerize_aux_hook)
 .    PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
 .	     unsigned int, combined_entry_type *));
 .
-.  boolean (*_bfd_coff_print_aux)
+.  bfd_boolean (*_bfd_coff_print_aux)
 .    PARAMS ((bfd *, FILE *, combined_entry_type *, combined_entry_type *,
 .	     combined_entry_type *, unsigned int));
 .
@@ -1231,13 +1247,13 @@ Special entry points for gdb to swap in coff symbol table parts:
 .  enum coff_symbol_classification (*_bfd_coff_classify_symbol)
 .    PARAMS ((bfd *, struct internal_syment *));
 .
-.  boolean (*_bfd_coff_compute_section_file_positions)
+.  bfd_boolean (*_bfd_coff_compute_section_file_positions)
 .    PARAMS ((bfd *));
 .
-.  boolean (*_bfd_coff_start_final_link)
+.  bfd_boolean (*_bfd_coff_start_final_link)
 .    PARAMS ((bfd *, struct bfd_link_info *));
 .
-.  boolean (*_bfd_coff_relocate_section)
+.  bfd_boolean (*_bfd_coff_relocate_section)
 .    PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 .	     struct internal_reloc *, struct internal_syment *, asection **));
 .
@@ -1246,19 +1262,19 @@ Special entry points for gdb to swap in coff symbol table parts:
 .	     struct coff_link_hash_entry *, struct internal_syment *,
 .	     bfd_vma *));
 .
-.  boolean (*_bfd_coff_adjust_symndx)
+.  bfd_boolean (*_bfd_coff_adjust_symndx)
 .    PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-.	     struct internal_reloc *, boolean *));
+.	     struct internal_reloc *, bfd_boolean *));
 .
-.  boolean (*_bfd_coff_link_add_one_symbol)
+.  bfd_boolean (*_bfd_coff_link_add_one_symbol)
 .    PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
-.	     asection *, bfd_vma, const char *, boolean, boolean,
+.	     asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
 .	     struct bfd_link_hash_entry **));
 .
-.  boolean (*_bfd_coff_link_output_has_begun)
+.  bfd_boolean (*_bfd_coff_link_output_has_begun)
 .    PARAMS ((bfd *, struct coff_final_link_info *));
 .
-.  boolean (*_bfd_coff_final_link_postscript)
+.  bfd_boolean (*_bfd_coff_final_link_postscript)
 .    PARAMS ((bfd *, struct coff_final_link_info *));
 .
 .} bfd_coff_backend_data;
@@ -1394,7 +1410,7 @@ Special entry points for gdb to swap in coff symbol table parts:
 
 /* See whether the magic number matches.  */
 
-static boolean
+static bfd_boolean
 coff_bad_format_hook (abfd, filehdr)
      bfd * abfd ATTRIBUTE_UNUSED;
      PTR filehdr;
@@ -1402,7 +1418,7 @@ coff_bad_format_hook (abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   if (BADMAG (*internal_f))
-    return false;
+    return FALSE;
 
   /* if the optional header is NULL or not the correct size then
      quit; the only difference I can see between m88k dgux headers (MC88DMAGIC)
@@ -1415,10 +1431,10 @@ coff_bad_format_hook (abfd, filehdr)
 
 #if defined(M88) || defined(I960)
   if (internal_f->f_opthdr != 0 && bfd_coff_aoutsz (abfd) != internal_f->f_opthdr)
-    return false;
+    return FALSE;
 #endif
 
-  return true;
+  return TRUE;
 }
 
 /* Check whether this section uses an alignment other than the
@@ -1487,7 +1503,7 @@ static const unsigned int coff_section_alignment_table_size =
 /* Initialize a section structure with information peculiar to this
    particular implementation of COFF.  */
 
-static boolean
+static bfd_boolean
 coff_new_section_hook (abfd, section)
      bfd * abfd;
      asection * section;
@@ -1514,7 +1530,7 @@ coff_new_section_hook (abfd, section)
   amt = sizeof (combined_entry_type) * 10;
   native = (combined_entry_type *) bfd_zalloc (abfd, amt);
   if (native == NULL)
-    return false;
+    return FALSE;
 
   /* We don't need to set up n_name, n_value, or n_scnum in the native
      symbol information, since they'll be overriden by the BFD symbol
@@ -1531,7 +1547,7 @@ coff_new_section_hook (abfd, section)
 				     coff_section_alignment_table,
 				     coff_section_alignment_table_size);
 
-  return true;
+  return TRUE;
 }
 
 #ifdef COFF_ALIGN_IN_SECTION_HEADER
@@ -1703,9 +1719,9 @@ coff_set_alignment_hook (abfd, section, scnhdr)
 
 #ifndef coff_mkobject
 
-static boolean coff_mkobject PARAMS ((bfd *));
+static bfd_boolean coff_mkobject PARAMS ((bfd *));
 
-static boolean
+static bfd_boolean
 coff_mkobject (abfd)
      bfd * abfd;
 {
@@ -1714,7 +1730,7 @@ coff_mkobject (abfd)
 
   abfd->tdata.coff_obj_data = (struct coff_tdata *) bfd_zalloc (abfd, amt);
   if (abfd->tdata.coff_obj_data == 0)
-    return false;
+    return FALSE;
   coff = coff_data (abfd);
   coff->symbols = (coff_symbol_type *) NULL;
   coff->conversion_table = (unsigned int *) NULL;
@@ -1724,7 +1740,7 @@ coff_mkobject (abfd)
 
 /*  make_abs_section(abfd);*/
 
-  return true;
+  return TRUE;
 }
 #endif
 
@@ -1778,7 +1794,7 @@ coff_mkobject_hook (abfd, filehdr, aouthdr)
 # else
       xcoff->xcoff64 = 0;
 # endif
-      xcoff->full_aouthdr = true;
+      xcoff->full_aouthdr = TRUE;
       xcoff->toc = internal_a->o_toc;
       xcoff->sntoc = internal_a->o_sntoc;
       xcoff->snentry = internal_a->o_snentry;
@@ -1815,7 +1831,7 @@ coff_mkobject_hook (abfd, filehdr, aouthdr)
    would be target independent and would also be much more successful
    at linking together COFF files for different architectures.  */
 
-static boolean
+static bfd_boolean
 coff_set_arch_mach_hook (abfd, filehdr)
      bfd *abfd;
      PTR filehdr;
@@ -1917,7 +1933,7 @@ coff_set_arch_mach_hook (abfd, filehdr)
 	  machine = bfd_mach_z8002;
 	  break;
 	default:
-	  return false;
+	  return FALSE;
 	}
       break;
 #endif
@@ -1996,7 +2012,7 @@ coff_set_arch_mach_hook (abfd, filehdr)
 		    || bfd_bread (buf, amt, abfd) != amt)
 		  {
 		    free (buf);
-		    return false;
+		    return FALSE;
 		  }
 		bfd_coff_swap_sym_in (abfd, (PTR) buf, (PTR) &sym);
 		if (sym.n_sclass == C_FILE)
@@ -2162,15 +2178,15 @@ coff_set_arch_mach_hook (abfd, filehdr)
     }
 
   bfd_default_set_arch_mach (abfd, arch, machine);
-  return true;
+  return TRUE;
 }
 
 #ifdef SYMNAME_IN_DEBUG
 
-static boolean symname_in_debug_hook
+static bfd_boolean symname_in_debug_hook
   PARAMS ((bfd *, struct internal_syment *));
 
-static boolean
+static bfd_boolean
 symname_in_debug_hook (abfd, sym)
      bfd * abfd ATTRIBUTE_UNUSED;
      struct internal_syment *sym;
@@ -2181,7 +2197,7 @@ symname_in_debug_hook (abfd, sym)
 #else
 
 #define symname_in_debug_hook \
-  (boolean (*) PARAMS ((bfd *, struct internal_syment *))) bfd_false
+  (bfd_boolean (*) PARAMS ((bfd *, struct internal_syment *))) bfd_false
 
 #endif
 
@@ -2193,12 +2209,12 @@ symname_in_debug_hook (abfd, sym)
 
 /* Handle the csect auxent of a C_EXT or C_HIDEXT symbol.  */
 
-static boolean coff_pointerize_aux_hook
+static bfd_boolean coff_pointerize_aux_hook
   PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
 	   unsigned int, combined_entry_type *));
 
 /*ARGSUSED*/
-static boolean
+static bfd_boolean
 coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
      bfd *abfd ATTRIBUTE_UNUSED;
      combined_entry_type *table_base;
@@ -2218,14 +2234,14 @@ coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
 	  aux->fix_scnlen = 1;
 	}
 
-      /* Return true to indicate that the caller should not do any
+      /* Return TRUE to indicate that the caller should not do any
          further work on this auxent.  */
-      return true;
+      return TRUE;
     }
 
-  /* Return false to indicate that this auxent should be handled by
+  /* Return FALSE to indicate that this auxent should be handled by
      the caller.  */
-  return false;
+  return FALSE;
 }
 
 #else
@@ -2233,12 +2249,12 @@ coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
 
 /* We don't want to pointerize bal entries.  */
 
-static boolean coff_pointerize_aux_hook
+static bfd_boolean coff_pointerize_aux_hook
   PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
 	   unsigned int, combined_entry_type *));
 
 /*ARGSUSED*/
-static boolean
+static bfd_boolean
 coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
      bfd *abfd ATTRIBUTE_UNUSED;
      combined_entry_type *table_base ATTRIBUTE_UNUSED;
@@ -2246,7 +2262,7 @@ coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
      unsigned int indaux;
      combined_entry_type *aux ATTRIBUTE_UNUSED;
 {
-  /* Return true if we don't want to pointerize this aux entry, which
+  /* Return TRUE if we don't want to pointerize this aux entry, which
      is the case for the lastfirst aux entry for a C_LEAFPROC symbol.  */
   return (indaux == 1
 	  && (symbol->u.syment.n_sclass == C_LEAFPROC
@@ -2261,13 +2277,13 @@ coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
 #endif /* ! I960 */
 #endif /* ! RS6000COFF_C */
 
-/* Print an aux entry.  This returns true if it has printed it.  */
+/* Print an aux entry.  This returns TRUE if it has printed it.  */
 
-static boolean coff_print_aux
+static bfd_boolean coff_print_aux
   PARAMS ((bfd *, FILE *, combined_entry_type *, combined_entry_type *,
 	   combined_entry_type *, unsigned int));
 
-static boolean
+static bfd_boolean
 coff_print_aux (abfd, file, table_base, symbol, aux, indaux)
      bfd *abfd ATTRIBUTE_UNUSED;
      FILE *file ATTRIBUTE_UNUSED;
@@ -2314,12 +2330,12 @@ coff_print_aux (abfd, file, table_base, symbol, aux, indaux)
 	       (unsigned int) aux->u.auxent.x_csect.x_smclas,
 	       aux->u.auxent.x_csect.x_stab,
 	       (unsigned int) aux->u.auxent.x_csect.x_snstab);
-      return true;
+      return TRUE;
     }
 #endif
 
-  /* Return false to indicate that no special action was taken.  */
-  return false;
+  /* Return FALSE to indicate that no special action was taken.  */
+  return FALSE;
 }
 
 /*
@@ -2358,7 +2374,7 @@ compare_arelent_ptr (x, y)
 
 #endif /* TARG_AUX */
 
-static boolean
+static bfd_boolean
 coff_write_relocs (abfd, first_undef)
      bfd * abfd;
      int first_undef;
@@ -2382,14 +2398,14 @@ coff_write_relocs (abfd, first_undef)
 	amt *= sizeof (arelent *);
 	p = (arelent **) bfd_malloc (amt);
 	if (p == NULL && s->reloc_count > 0)
-	  return false;
+	  return FALSE;
 	memcpy (p, s->orelocation, (size_t) amt);
 	qsort (p, s->reloc_count, sizeof (arelent *), compare_arelent_ptr);
       }
 #endif
 
       if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
 #ifdef COFF_WITH_PE
       if (obj_pe (abfd) && s->reloc_count >= 0xffff)
@@ -2402,7 +2418,7 @@ coff_write_relocs (abfd, first_undef)
 	  coff_swap_reloc_out (abfd, &n, &dst);
 	  if (bfd_bwrite ((PTR) & dst, (bfd_size_type) bfd_coff_relsz (abfd),
 			 abfd) != bfd_coff_relsz (abfd))
-	    return false;
+	    return FALSE;
 	}
 #endif
 
@@ -2482,7 +2498,7 @@ coff_write_relocs (abfd, first_undef)
 	  coff_swap_reloc_out (abfd, &n, &dst);
 	  if (bfd_bwrite ((PTR) & dst, (bfd_size_type) bfd_coff_relsz (abfd),
 			 abfd) != bfd_coff_relsz (abfd))
-	    return false;
+	    return FALSE;
 	}
 
 #ifdef TARG_AUX
@@ -2491,13 +2507,13 @@ coff_write_relocs (abfd, first_undef)
 #endif
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set flags and magic number of a coff file from architecture and machine
-   type.  Result is true if we can represent the arch&type, false if not.  */
+   type.  Result is TRUE if we can represent the arch&type, FALSE if not.  */
 
-static boolean
+static bfd_boolean
 coff_set_flags (abfd, magicp, flagsp)
      bfd * abfd;
      unsigned int *magicp ATTRIBUTE_UNUSED;
@@ -2517,9 +2533,9 @@ coff_set_flags (abfd, magicp, flagsp)
 	  *flagsp = F_Z8002;
 	  break;
 	default:
-	  return false;
+	  return FALSE;
 	}
-      return true;
+      return TRUE;
 #endif
 #ifdef I960ROMAGIC
 
@@ -2559,10 +2575,10 @@ coff_set_flags (abfd, magicp, flagsp)
 	    flags = F_I960HX;
 	    break;
 	  default:
-	    return false;
+	    return FALSE;
 	  }
 	*flagsp = flags;
-	return true;
+	return TRUE;
       }
       break;
 #endif
@@ -2570,7 +2586,7 @@ coff_set_flags (abfd, magicp, flagsp)
 #ifdef TIC30MAGIC
     case bfd_arch_tic30:
       *magicp = TIC30MAGIC;
-      return true;
+      return TRUE;
 #endif
 
 #ifdef TICOFF_DEFAULT_MAGIC
@@ -2593,16 +2609,16 @@ coff_set_flags (abfd, magicp, flagsp)
               *magicp = TICOFF2MAGIC;
               break;
             default:
-              return false;
+              return FALSE;
             }
         }
-      return true;
+      return TRUE;
 #endif
 
 #ifdef TIC80_ARCH_MAGIC
     case bfd_arch_tic80:
       *magicp = TIC80_ARCH_MAGIC;
-      return true;
+      return TRUE;
 #endif
 #ifdef ARMMAGIC
     case bfd_arch_arm:
@@ -2640,12 +2656,12 @@ coff_set_flags (abfd, magicp, flagsp)
 	case bfd_mach_arm_5TE: * flagsp |= F_ARM_5; break;
 	case bfd_mach_arm_XScale: * flagsp |= F_ARM_5; break;
 	}
-      return true;
+      return TRUE;
 #endif
 #ifdef PPCMAGIC
     case bfd_arch_powerpc:
       *magicp = PPCMAGIC;
-      return true;
+      return TRUE;
       break;
 #endif
 #ifdef I386MAGIC
@@ -2655,19 +2671,19 @@ coff_set_flags (abfd, magicp, flagsp)
       /* Just overwrite the usual value if we're doing Lynx.  */
       *magicp = LYNXCOFFMAGIC;
 #endif
-      return true;
+      return TRUE;
       break;
 #endif
 #ifdef I860MAGIC
     case bfd_arch_i860:
       *magicp = I860MAGIC;
-      return true;
+      return TRUE;
       break;
 #endif
 #ifdef IA64MAGIC
     case bfd_arch_ia64:
       *magicp = IA64MAGIC;
-      return true;
+      return TRUE;
       break;
 #endif
 #ifdef MC68MAGIC
@@ -2686,14 +2702,14 @@ coff_set_flags (abfd, magicp, flagsp)
       /* Just overwrite the usual value if we're doing Lynx.  */
       *magicp = LYNXCOFFMAGIC;
 #endif
-      return true;
+      return TRUE;
       break;
 #endif
 
 #ifdef MC88MAGIC
     case bfd_arch_m88k:
       *magicp = MC88OMAGIC;
-      return true;
+      return TRUE;
       break;
 #endif
 #ifdef H8300MAGIC
@@ -2702,13 +2718,13 @@ coff_set_flags (abfd, magicp, flagsp)
 	{
 	case bfd_mach_h8300:
 	  *magicp = H8300MAGIC;
-	  return true;
+	  return TRUE;
 	case bfd_mach_h8300h:
 	  *magicp = H8300HMAGIC;
-	  return true;
+	  return TRUE;
 	case bfd_mach_h8300s:
 	  *magicp = H8300SMAGIC;
-	  return true;
+	  return TRUE;
 	}
       break;
 #endif
@@ -2723,14 +2739,14 @@ coff_set_flags (abfd, magicp, flagsp)
       else
 	*magicp = SH_ARCH_MAGIC_LITTLE;
 #endif
-      return true;
+      return TRUE;
       break;
 #endif
 
 #ifdef MIPS_ARCH_MAGIC_WINCE
     case bfd_arch_mips:
       *magicp = MIPS_ARCH_MAGIC_WINCE;
-      return true;
+      return TRUE;
       break;
 #endif
 
@@ -2741,14 +2757,14 @@ coff_set_flags (abfd, magicp, flagsp)
       /* Just overwrite the usual value if we're doing Lynx.  */
       *magicp = LYNXCOFFMAGIC;
 #endif
-      return true;
+      return TRUE;
       break;
 #endif
 
 #ifdef H8500MAGIC
     case bfd_arch_h8500:
       *magicp = H8500MAGIC;
-      return true;
+      return TRUE;
       break;
 #endif
 #ifdef A29K_MAGIC_BIG
@@ -2757,14 +2773,14 @@ coff_set_flags (abfd, magicp, flagsp)
 	*magicp = A29K_MAGIC_BIG;
       else
 	*magicp = A29K_MAGIC_LITTLE;
-      return true;
+      return TRUE;
       break;
 #endif
 
 #ifdef WE32KMAGIC
     case bfd_arch_we32k:
       *magicp = WE32KMAGIC;
-      return true;
+      return TRUE;
       break;
 #endif
 
@@ -2775,20 +2791,20 @@ coff_set_flags (abfd, magicp, flagsp)
 #endif
       BFD_ASSERT (bfd_get_flavour (abfd) == bfd_target_xcoff_flavour);
       *magicp = bfd_xcoff_magic_number (abfd);
-      return true;
+      return TRUE;
       break;
 #endif
 
 #ifdef MCOREMAGIC
     case bfd_arch_mcore:
       * magicp = MCOREMAGIC;
-      return true;
+      return TRUE;
 #endif
 
 #ifdef W65MAGIC
     case bfd_arch_w65:
       *magicp = W65MAGIC;
-      return true;
+      return TRUE;
 #endif
 
 #ifdef OR32_MAGIC_BIG
@@ -2797,19 +2813,19 @@ coff_set_flags (abfd, magicp, flagsp)
         * magicp = OR32_MAGIC_BIG;
       else
         * magicp = OR32_MAGIC_LITTLE;
-      return true;
+      return TRUE;
 #endif
 
     default:			/* Unknown architecture.  */
-      /* Fall through to "return false" below, to avoid
+      /* Fall through to "return FALSE" below, to avoid
 	 "statement never reached" errors on the one below.  */
       break;
     }
 
-  return false;
+  return FALSE;
 }
 
-static boolean
+static bfd_boolean
 coff_set_arch_mach (abfd, arch, machine)
      bfd * abfd;
      enum bfd_architecture arch;
@@ -2819,13 +2835,13 @@ coff_set_arch_mach (abfd, arch, machine)
   unsigned short dummy2;
 
   if (! bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
+    return FALSE;
 
   if (arch != bfd_arch_unknown
       && ! coff_set_flags (abfd, &dummy1, &dummy2))
-    return false;		/* We can't represent this type */
+    return FALSE;		/* We can't represent this type */
 
-  return true;			/* We're easy ...  */
+  return TRUE;			/* We're easy ...  */
 }
 
 #ifdef COFF_IMAGE_WITH_PE
@@ -2862,14 +2878,14 @@ sort_by_secaddr (arg1, arg2)
 #undef ALIGN_SECTIONS_IN_FILE
 #endif
 
-static boolean
+static bfd_boolean
 coff_compute_section_file_positions (abfd)
      bfd * abfd;
 {
   asection *current;
   asection *previous = (asection *) NULL;
   file_ptr sofar = bfd_coff_filhsz (abfd);
-  boolean align_adjust;
+  bfd_boolean align_adjust;
 #ifdef ALIGN_SECTIONS_IN_FILE
   file_ptr old_sofar;
 #endif
@@ -2975,7 +2991,7 @@ coff_compute_section_file_positions (abfd)
     amt = sizeof (struct asection *) * (count + 1);
     section_list = bfd_malloc (amt);
     if (section_list == NULL)
-      return false;
+      return FALSE;
 
     i = 0;
     for (current = abfd->sections; current != NULL; current = current->next)
@@ -3028,7 +3044,7 @@ coff_compute_section_file_positions (abfd)
   }
 #endif /* ! COFF_IMAGE_WITH_PE */
 
-  align_adjust = false;
+  align_adjust = FALSE;
   for (current = abfd->sections;
        current != (asection *) NULL;
        current = current->next)
@@ -3041,7 +3057,7 @@ coff_compute_section_file_positions (abfd)
 	  bfd_size_type amt = sizeof (struct coff_section_tdata);
 	  current->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
 	  if (current->used_by_bfd == NULL)
-	    return false;
+	    return FALSE;
 	}
       if (pei_section_data (abfd, current) == NULL)
 	{
@@ -3049,7 +3065,7 @@ coff_compute_section_file_positions (abfd)
 	  coff_section_data (abfd, current)->tdata
 	    = (PTR) bfd_zalloc (abfd, amt);
 	  if (coff_section_data (abfd, current)->tdata == NULL)
-	    return false;
+	    return FALSE;
 	}
       if (pei_section_data (abfd, current)->virt_size == 0)
 	pei_section_data (abfd, current)->virt_size = current->_raw_size;
@@ -3079,14 +3095,14 @@ coff_compute_section_file_positions (abfd)
 #ifdef RS6000COFF_C
 	  /* AIX loader checks the text section alignment of (vma - filepos)
 	     So even though the filepos may be aligned wrt the o_algntext, for
-	     AIX executables, this check fails. This shows up when an native 
+	     AIX executables, this check fails. This shows up when an native
 	     AIX executable is stripped with gnu strip because the default vma
 	     of native is 0x10000150 but default for gnu is 0x10000140.  Gnu
-	     stripped gnu excutable passes this check because the filepos is 
+	     stripped gnu excutable passes this check because the filepos is
 	     0x0140.  This problem also show up with 64 bit shared objects. The
 	     data section must also be aligned.  */
-	  if (!strcmp (current->name, _TEXT) 
-	      || !strcmp (current->name, _DATA)) 
+	  if (!strcmp (current->name, _TEXT)
+	      || !strcmp (current->name, _DATA))
 	    {
 	      bfd_vma pad;
 	      bfd_vma align;
@@ -3095,8 +3111,8 @@ coff_compute_section_file_positions (abfd)
 
 	      align = 1 << current->alignment_power;
 	      pad = abs (current->vma - sofar) % align;
-	      
-	      if (pad) 
+
+	      if (pad)
 		{
 		  pad = align - pad;
 		  sofar += pad;
@@ -3158,7 +3174,7 @@ coff_compute_section_file_positions (abfd)
          _raw_size, in case the caller only writes out data to the
          unaligned _raw_size.  */
       if (pei_section_data (abfd, current)->virt_size < current->_raw_size)
-	align_adjust = true;
+	align_adjust = TRUE;
 #endif
 
 #ifdef _LIB
@@ -3184,7 +3200,7 @@ coff_compute_section_file_positions (abfd)
       b = 0;
       if (bfd_seek (abfd, sofar - 1, SEEK_SET) != 0
 	  || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
-	return false;
+	return FALSE;
     }
 
   /* Make sure the relocations are aligned.  We don't need to make
@@ -3193,9 +3209,9 @@ coff_compute_section_file_positions (abfd)
   sofar = BFD_ALIGN (sofar, 1 << COFF_DEFAULT_SECTION_ALIGNMENT_POWER);
 
   obj_relocbase (abfd) = sofar;
-  abfd->output_has_begun = true;
+  abfd->output_has_begun = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 #if 0
@@ -3207,7 +3223,7 @@ coff_compute_section_file_positions (abfd)
 /* If .file, .text, .data, .bss symbols are missing, add them.  */
 /* @@ Should we only be adding missing symbols, or overriding the aux
    values for existing section symbols?  */
-static boolean
+static bfd_boolean
 coff_add_missing_symbols (abfd)
      bfd *abfd;
 {
@@ -3251,13 +3267,13 @@ coff_add_missing_symbols (abfd)
   need_file = 0;
 
   if (!need_text && !need_data && !need_bss && !need_file)
-    return true;
+    return TRUE;
   nsyms += need_text + need_data + need_bss + need_file;
   amt = nsyms;
   amt *= sizeof (asymbol *);
   sympp2 = (asymbol **) bfd_alloc (abfd, amt);
   if (!sympp2)
-    return false;
+    return FALSE;
   memcpy (sympp2, sympp, i * sizeof (asymbol *));
   if (need_file)
     {
@@ -3272,7 +3288,7 @@ coff_add_missing_symbols (abfd)
     sympp2[i++] = coff_section_symbol (abfd, _BSS);
   BFD_ASSERT (i == nsyms);
   bfd_set_symtab (abfd, sympp2, nsyms);
-  return true;
+  return TRUE;
 }
 
 #endif /* 0 */
@@ -3282,7 +3298,7 @@ coff_add_missing_symbols (abfd)
 static unsigned int pelength;
 static unsigned int peheader;
 
-static boolean
+static bfd_boolean
 coff_read_word (abfd, value)
   bfd *abfd;
   unsigned int *value;
@@ -3294,7 +3310,7 @@ coff_read_word (abfd, value)
   if (status < 1)
     {
       *value = 0;
-      return false;
+      return FALSE;
     }
 
   if (status == 1)
@@ -3304,14 +3320,14 @@ coff_read_word (abfd, value)
 
   pelength += (unsigned int) status;
 
-  return true;
+  return TRUE;
 }
 
 static unsigned int
 coff_compute_checksum (abfd)
   bfd *abfd;
 {
-  boolean more_data;
+  bfd_boolean more_data;
   file_ptr filepos;
   unsigned int value;
   unsigned int total;
@@ -3335,7 +3351,7 @@ coff_compute_checksum (abfd)
   return (0xffff & (total + (total >> 0x10)));
 }
 
-static boolean
+static bfd_boolean
 coff_apply_checksum (abfd)
   bfd *abfd;
 {
@@ -3343,51 +3359,51 @@ coff_apply_checksum (abfd)
   unsigned int checksum = 0;
 
   if (bfd_seek (abfd, 0x3c, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (!coff_read_word (abfd, &peheader))
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, peheader + 0x58, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   checksum = 0;
   bfd_bwrite (&checksum, (bfd_size_type) 4, abfd);
 
   if (bfd_seek (abfd, peheader, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   computed = coff_compute_checksum (abfd);
 
   checksum = computed + pelength;
 
   if (bfd_seek (abfd, peheader + 0x58, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   bfd_bwrite (&checksum, (bfd_size_type) 4, abfd);
 
-  return true;
+  return TRUE;
 }
 
 #endif /* COFF_IMAGE_WITH_PE */
 
 /* SUPPRESS 558 */
 /* SUPPRESS 529 */
-static boolean
+static bfd_boolean
 coff_write_object_contents (abfd)
      bfd * abfd;
 {
   asection *current;
-  boolean hasrelocs = false;
-  boolean haslinno = false;
-  boolean hasdebug = false;
+  bfd_boolean hasrelocs = FALSE;
+  bfd_boolean haslinno = FALSE;
+  bfd_boolean hasdebug = FALSE;
   file_ptr scn_base;
   file_ptr reloc_base;
   file_ptr lineno_base;
   file_ptr sym_base;
   unsigned long reloc_size = 0, reloc_count = 0;
   unsigned long lnno_size = 0;
-  boolean long_section_names;
+  bfd_boolean long_section_names;
   asection *text_sec = NULL;
   asection *data_sec = NULL;
   asection *bss_sec = NULL;
@@ -3407,7 +3423,7 @@ coff_write_object_contents (abfd)
   if (! abfd->output_has_begun)
     {
       if (! coff_compute_section_file_positions (abfd))
-	return false;
+	return FALSE;
     }
 
   reloc_base = obj_relocbase (abfd);
@@ -3479,21 +3495,21 @@ coff_write_object_contents (abfd)
     }
 
   if (bfd_seek (abfd, scn_base, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
-  long_section_names = false;
+  long_section_names = FALSE;
   for (current = abfd->sections;
        current != NULL;
        current = current->next)
     {
       struct internal_scnhdr section;
-      boolean is_reloc_section = false;
+      bfd_boolean is_reloc_section = FALSE;
 
 #ifdef COFF_IMAGE_WITH_PE
       if (strcmp (current->name, ".reloc") == 0)
 	{
-	  is_reloc_section = true;
-	  hasrelocs = true;
+	  is_reloc_section = TRUE;
+	  hasrelocs = TRUE;
 	  pe_data (abfd)->has_reloc_section = 1;
 	}
 #endif
@@ -3514,7 +3530,7 @@ coff_write_object_contents (abfd)
 	    memset (section.s_name, 0, SCNNMLEN);
 	    sprintf (section.s_name, "/%lu", (unsigned long) string_size);
 	    string_size += len + 1;
-	    long_section_names = true;
+	    long_section_names = TRUE;
 	  }
       }
 #endif
@@ -3565,13 +3581,13 @@ coff_write_object_contents (abfd)
 #ifndef COFF_IMAGE_WITH_PE
       /* In PEI, relocs come in the .reloc section.  */
       if (current->reloc_count != 0)
-	hasrelocs = true;
+	hasrelocs = TRUE;
 #endif
       if (current->lineno_count != 0)
-	haslinno = true;
+	haslinno = TRUE;
       if ((current->flags & SEC_DEBUGGING) != 0
 	  && ! is_reloc_section)
-	hasdebug = true;
+	hasdebug = TRUE;
 
 #ifdef RS6000COFF_C
 #ifndef XCOFF64
@@ -3628,7 +3644,7 @@ coff_write_object_contents (abfd)
 
 	  if (coff_swap_scnhdr_out (abfd, &section, &buff) == 0
 	      || bfd_bwrite ((PTR) &buff, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	}
 
 #ifdef COFF_WITH_PE
@@ -3752,7 +3768,7 @@ coff_write_object_contents (abfd)
 	  amt = bfd_coff_scnhsz (abfd);
 	  if (coff_swap_scnhdr_out (abfd, &scnhdr, &buff) == 0
 	      || bfd_bwrite ((PTR) &buff, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	}
     }
 #endif
@@ -3971,17 +3987,17 @@ coff_write_object_contents (abfd)
       int firstundef;
 #if 0
       if (!coff_add_missing_symbols (abfd))
-	return false;
+	return FALSE;
 #endif
       if (!coff_renumber_symbols (abfd, &firstundef))
-	return false;
+	return FALSE;
       coff_mangle_symbols (abfd);
       if (! coff_write_symbols (abfd))
-	return false;
+	return FALSE;
       if (! coff_write_linenumbers (abfd))
-	return false;
+	return FALSE;
       if (! coff_write_relocs (abfd, firstundef))
-	return false;
+	return FALSE;
     }
 #ifdef COFF_LONG_SECTION_NAMES
   else if (long_section_names && ! obj_coff_strings_written (abfd))
@@ -3989,7 +4005,7 @@ coff_write_object_contents (abfd)
       /* If we have long section names we have to write out the string
          table even if there are no symbols.  */
       if (! coff_write_symbols (abfd))
-	return false;
+	return FALSE;
     }
 #endif
 #ifdef COFF_IMAGE_WITH_PE
@@ -4005,7 +4021,7 @@ coff_write_object_contents (abfd)
 		    (file_ptr) BFD_ALIGN (sym_base, COFF_PAGE_SIZE) - 1,
 		    SEEK_SET) != 0
 	  || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
-	return false;
+	return FALSE;
     }
 #endif
 #endif
@@ -4124,7 +4140,7 @@ coff_write_object_contents (abfd)
 
   /* now write them */
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   {
     char * buff;
@@ -4132,7 +4148,7 @@ coff_write_object_contents (abfd)
 
     buff = bfd_malloc (amount);
     if (buff == NULL)
-      return false;
+      return FALSE;
 
     bfd_coff_swap_filehdr_out (abfd, (PTR) &internal_f, (PTR) buff);
     amount = bfd_bwrite ((PTR) buff, amount, abfd);
@@ -4140,7 +4156,7 @@ coff_write_object_contents (abfd)
     free (buff);
 
     if (amount != bfd_coff_filhsz (abfd))
-      return false;
+      return FALSE;
   }
 
   if (abfd->flags & EXEC_P)
@@ -4152,7 +4168,7 @@ coff_write_object_contents (abfd)
 
       buff = bfd_malloc (amount);
       if (buff == NULL)
-	return false;
+	return FALSE;
 
       coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) buff);
       amount = bfd_bwrite ((PTR) buff, amount, abfd);
@@ -4160,11 +4176,11 @@ coff_write_object_contents (abfd)
       free (buff);
 
       if (amount != bfd_coff_aoutsz (abfd))
-	return false;
+	return FALSE;
 
 #ifdef COFF_IMAGE_WITH_PE
       if (! coff_apply_checksum (abfd))
-	return false;
+	return FALSE;
 #endif
     }
 #ifdef RS6000COFF_C
@@ -4180,14 +4196,14 @@ coff_write_object_contents (abfd)
       else
 	size = SMALL_AOUTSZ;
       if (bfd_bwrite ((PTR) &buff, (bfd_size_type) size, abfd) != size)
-	return false;
+	return FALSE;
     }
 #endif
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 coff_set_section_contents (abfd, section, location, offset, count)
      bfd * abfd;
      sec_ptr section;
@@ -4198,7 +4214,7 @@ coff_set_section_contents (abfd, section, location, offset, count)
   if (! abfd->output_has_begun)	/* set by bfd.c handler */
     {
       if (! coff_compute_section_file_positions (abfd))
-	return false;
+	return FALSE;
     }
 
 #if defined(_LIB) && !defined(TARG_AUX)
@@ -4244,18 +4260,18 @@ coff_set_section_contents (abfd, section, location, offset, count)
   /* Don't write out bss sections - one way to do this is to
        see if the filepos has not been set.  */
   if (section->filepos == 0)
-    return true;
+    return TRUE;
 
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   return bfd_bwrite (location, count, abfd) == count;
 }
 #if 0
-static boolean
+static bfd_boolean
 coff_close_and_cleanup (abfd)
      bfd *abfd;
 {
@@ -4264,19 +4280,19 @@ coff_close_and_cleanup (abfd)
       {
       case bfd_archive:
 	if (!_bfd_write_archive_contents (abfd))
-	  return false;
+	  return FALSE;
 	break;
       case bfd_object:
 	if (!coff_write_object_contents (abfd))
-	  return false;
+	  return FALSE;
 	break;
       default:
 	bfd_set_error (bfd_error_invalid_operation);
-	return false;
+	return FALSE;
       }
 
   /* We depend on bfd_close to free all the memory on the objalloc.  */
-  return true;
+  return TRUE;
 }
 
 #endif
@@ -4320,7 +4336,7 @@ SUBSUBSECTION
 
 */
 
-static boolean
+static bfd_boolean
 coff_slurp_line_table (abfd, asect)
      bfd *abfd;
      asection *asect;
@@ -4336,7 +4352,7 @@ coff_slurp_line_table (abfd, asect)
   amt = ((bfd_size_type) asect->lineno_count + 1) * sizeof (alent);
   lineno_cache = (alent *) bfd_alloc (abfd, amt);
   if (lineno_cache == NULL)
-    return false;
+    return FALSE;
   else
     {
       unsigned int counter = 0;
@@ -4351,11 +4367,11 @@ coff_slurp_line_table (abfd, asect)
 
 	  if (cache_ptr->line_number == 0)
 	    {
-	      boolean warned;
+	      bfd_boolean warned;
 	      bfd_signed_vma symndx;
 	      coff_symbol_type *sym;
 
-	      warned = false;
+	      warned = FALSE;
 	      symndx = dst.l_addr.l_symndx;
 	      if (symndx < 0
 		  || (bfd_vma) symndx >= obj_raw_syment_count (abfd))
@@ -4364,7 +4380,7 @@ coff_slurp_line_table (abfd, asect)
 		    (_("%s: warning: illegal symbol index %ld in line numbers"),
 		     bfd_archive_filename (abfd), dst.l_addr.l_symndx);
 		  symndx = 0;
-		  warned = true;
+		  warned = TRUE;
 		}
 	      /* FIXME: We should not be casting between ints and
                  pointers like this.  */
@@ -4396,14 +4412,14 @@ coff_slurp_line_table (abfd, asect)
     }
   asect->lineno = lineno_cache;
   /* FIXME, free native_lineno here, or use alloca or something.  */
-  return true;
+  return TRUE;
 }
 
 /* Slurp in the symbol table, converting it to generic form.  Note
    that if coff_relocate_section is defined, the linker will read
    symbols via coff_link_add_symbols, rather than via this routine.  */
 
-static boolean
+static bfd_boolean
 coff_slurp_symbol_table (abfd)
      bfd * abfd;
 {
@@ -4415,12 +4431,12 @@ coff_slurp_symbol_table (abfd)
   unsigned int number_of_symbols = 0;
 
   if (obj_symbols (abfd))
-    return true;
+    return TRUE;
 
   /* Read in the symbol table */
   if ((native_symbols = coff_get_normalized_symtab (abfd)) == NULL)
     {
-      return (false);
+      return FALSE;
     }				/* on error */
 
   /* Allocate enough room for all the symbols in cached form */
@@ -4428,14 +4444,14 @@ coff_slurp_symbol_table (abfd)
   amt *= sizeof (coff_symbol_type);
   cached_area = (coff_symbol_type *) bfd_alloc (abfd, amt);
   if (cached_area == NULL)
-    return false;
+    return FALSE;
 
   amt = obj_raw_syment_count (abfd);
   amt *= sizeof (unsigned int);
   table_ptr = (unsigned int *) bfd_alloc (abfd, amt);
 
   if (table_ptr == NULL)
-    return false;
+    return FALSE;
   else
     {
       coff_symbol_type *dst = cached_area;
@@ -4453,7 +4469,7 @@ coff_slurp_symbol_table (abfd)
 	  dst->symbol.section = coff_section_from_bfd_index (abfd,
 						     src->u.syment.n_scnum);
 	  dst->symbol.flags = 0;
-	  dst->done_lineno = false;
+	  dst->done_lineno = FALSE;
 
 	  switch (src->u.syment.n_sclass)
 	    {
@@ -4767,7 +4783,7 @@ coff_slurp_symbol_table (abfd)
 	p = p->next;
       }
   }
-  return true;
+  return TRUE;
 }				/* coff_slurp_symbol_table() */
 
 /* Classify a COFF symbol.  A couple of targets have globally visible
@@ -4919,7 +4935,7 @@ SUBSUBSECTION
   }
 #endif
 
-static boolean
+static bfd_boolean
 coff_slurp_reloc_table (abfd, asect, symbols)
      bfd * abfd;
      sec_ptr asect;
@@ -4932,20 +4948,20 @@ coff_slurp_reloc_table (abfd, asect, symbols)
   bfd_size_type amt;
 
   if (asect->relocation)
-    return true;
+    return TRUE;
   if (asect->reloc_count == 0)
-    return true;
+    return TRUE;
   if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
+    return TRUE;
   if (!coff_slurp_symbol_table (abfd))
-    return false;
+    return FALSE;
   amt = (bfd_size_type) bfd_coff_relsz (abfd) * asect->reloc_count;
   native_relocs = (RELOC *) buy_and_read (abfd, asect->rel_filepos, amt);
   amt = (bfd_size_type) asect->reloc_count * sizeof (arelent);
   reloc_cache = (arelent *) bfd_alloc (abfd, amt);
 
   if (reloc_cache == NULL)
-    return false;
+    return FALSE;
 
   for (idx = 0; idx < asect->reloc_count; idx++)
     {
@@ -5011,12 +5027,12 @@ coff_slurp_reloc_table (abfd, asect, symbols)
 	    (_("%s: illegal relocation type %d at address 0x%lx"),
 	     bfd_archive_filename (abfd), dst.r_type, (long) dst.r_vaddr);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
     }
 
   asect->relocation = reloc_cache;
-  return true;
+  return TRUE;
 }
 
 #ifndef coff_rtype_to_howto
@@ -5193,10 +5209,10 @@ dummy_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 
 #ifndef coff_link_output_has_begun
 
-static boolean coff_link_output_has_begun
+static bfd_boolean coff_link_output_has_begun
   PARAMS ((bfd *, struct coff_final_link_info *));
 
-static boolean
+static bfd_boolean
 coff_link_output_has_begun (abfd, info)
      bfd * abfd;
      struct coff_final_link_info * info ATTRIBUTE_UNUSED;
@@ -5207,15 +5223,15 @@ coff_link_output_has_begun (abfd, info)
 
 #ifndef coff_final_link_postscript
 
-static boolean coff_final_link_postscript
+static bfd_boolean coff_final_link_postscript
   PARAMS ((bfd *, struct coff_final_link_info *));
 
-static boolean
+static bfd_boolean
 coff_final_link_postscript (abfd, pfinfo)
      bfd * abfd ATTRIBUTE_UNUSED;
      struct coff_final_link_info * pfinfo ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 #endif
 
@@ -5271,20 +5287,20 @@ static const bfd_coff_backend_data bfd_coff_std_swap_table =
   coff_SWAP_scnhdr_out,
   FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_LONG_SECTION_NAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
   COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
 #ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_DEBUG_STRING_WIDE_PREFIX
   4,
diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index 21589c6945a..c905ab17eec 100644
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -46,19 +46,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 static void coff_fix_symbol_name
   PARAMS ((bfd *, asymbol *, combined_entry_type *, bfd_size_type *,
 	   asection **, bfd_size_type *));
-static boolean coff_write_symbol
+static bfd_boolean coff_write_symbol
   PARAMS ((bfd *, asymbol *, combined_entry_type *, bfd_vma *,
 	   bfd_size_type *, asection **, bfd_size_type *));
-static boolean coff_write_alien_symbol
+static bfd_boolean coff_write_alien_symbol
   PARAMS ((bfd *, asymbol *, bfd_vma *, bfd_size_type *,
 	   asection **, bfd_size_type *));
-static boolean coff_write_native_symbol
+static bfd_boolean coff_write_native_symbol
   PARAMS ((bfd *, coff_symbol_type *, bfd_vma *, bfd_size_type *,
 	   asection **, bfd_size_type *));
 static void coff_pointerize_aux
   PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
 	   unsigned int, combined_entry_type *));
-static boolean make_a_section_from_file
+static bfd_boolean make_a_section_from_file
   PARAMS ((bfd *, struct internal_scnhdr *, unsigned int));
 static const bfd_target *coff_real_object_p
   PARAMS ((bfd *, unsigned, struct internal_filehdr *,
@@ -74,7 +74,7 @@ static char *copy_name
 
 /* Take a section header read from a coff file (in HOST byte order),
    and make a BFD "section" out of it.  This is used by ECOFF.  */
-static boolean
+static bfd_boolean
 make_a_section_from_file (abfd, hdr, target_index)
      bfd *abfd;
      struct internal_scnhdr *hdr;
@@ -82,7 +82,7 @@ make_a_section_from_file (abfd, hdr, target_index)
 {
   asection *return_section;
   char *name;
-  boolean result = true;
+  bfd_boolean result = TRUE;
   flagword flags;
 
   name = NULL;
@@ -103,14 +103,14 @@ make_a_section_from_file (abfd, hdr, target_index)
 	{
 	  strings = _bfd_coff_read_string_table (abfd);
 	  if (strings == NULL)
-	    return false;
+	    return FALSE;
 	  /* FIXME: For extra safety, we should make sure that
              strindex does not run us past the end, but right now we
              don't know the length of the string table.  */
 	  strings += strindex;
 	  name = bfd_alloc (abfd, (bfd_size_type) strlen (strings) + 1);
 	  if (name == NULL)
-	    return false;
+	    return FALSE;
 	  strcpy (name, strings);
 	}
     }
@@ -120,14 +120,14 @@ make_a_section_from_file (abfd, hdr, target_index)
       /* Assorted wastage to null-terminate the name, thanks AT&T! */
       name = bfd_alloc (abfd, (bfd_size_type) sizeof (hdr->s_name) + 1);
       if (name == NULL)
-	return false;
+	return FALSE;
       strncpy (name, (char *) &hdr->s_name[0], sizeof (hdr->s_name));
       name[sizeof (hdr->s_name)] = 0;
     }
 
   return_section = bfd_make_section_anyway (abfd, name);
   if (return_section == NULL)
-    return false;
+    return FALSE;
 
   return_section->vma = hdr->s_vaddr;
   return_section->lma = hdr->s_paddr;
@@ -147,7 +147,7 @@ make_a_section_from_file (abfd, hdr, target_index)
 
   if (! bfd_coff_styp_to_sec_flags_hook (abfd, hdr, name, return_section,
 					 & flags))
-    result = false;
+    result = FALSE;
 
   return_section->flags = flags;
 
@@ -423,12 +423,12 @@ _bfd_coff_internal_syment_name (abfd, sym, buf)
 }
 
 /* Read in and swap the relocs.  This returns a buffer holding the
-   relocs for section SEC in file ABFD.  If CACHE is true and
+   relocs for section SEC in file ABFD.  If CACHE is TRUE and
    INTERNAL_RELOCS is NULL, the relocs read in will be saved in case
    the function is called again.  If EXTERNAL_RELOCS is not NULL, it
    is a buffer large enough to hold the unswapped relocs.  If
    INTERNAL_RELOCS is not NULL, it is a buffer large enough to hold
-   the swapped relocs.  If REQUIRE_INTERNAL is true, then the return
+   the swapped relocs.  If REQUIRE_INTERNAL is TRUE, then the return
    value must be INTERNAL_RELOCS.  The function returns NULL on error.  */
 
 struct internal_reloc *
@@ -436,9 +436,9 @@ _bfd_coff_read_internal_relocs (abfd, sec, cache, external_relocs,
 				require_internal, internal_relocs)
      bfd *abfd;
      asection *sec;
-     boolean cache;
+     bfd_boolean cache;
      bfd_byte *external_relocs;
-     boolean require_internal;
+     bfd_boolean require_internal;
      struct internal_reloc *internal_relocs;
 {
   bfd_size_type relsz;
@@ -565,7 +565,7 @@ coff_count_linenumbers (abfd)
 	      do
 		{
 		  asection * sec = q->symbol.section->output_section;
-		  
+
 		  /* Do not try to update fields in read-only sections.  */
 		  if (! bfd_is_const_section (sec))
 		    sec->lineno_count ++;
@@ -656,7 +656,7 @@ fixup_symbol_value (abfd, coff_symbol_ptr, syment)
    chain, and that the last one points to the first external symbol. We
    do that here too.  */
 
-boolean
+bfd_boolean
 coff_renumber_symbols (bfd_ptr, first_undef)
      bfd *bfd_ptr;
      int *first_undef;
@@ -685,7 +685,7 @@ coff_renumber_symbols (bfd_ptr, first_undef)
     amt = sizeof (asymbol *) * ((bfd_size_type) symbol_count + 1);
     newsyms = (asymbol **) bfd_alloc (bfd_ptr, amt);
     if (!newsyms)
-      return false;
+      return FALSE;
     bfd_ptr->outsymbols = newsyms;
     for (i = 0; i < symbol_count; i++)
       if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) != 0
@@ -748,7 +748,7 @@ coff_renumber_symbols (bfd_ptr, first_undef)
     }
   obj_conv_table_size (bfd_ptr) = native_index;
 
-  return true;
+  return TRUE;
 }
 
 /* Run thorough the symbol table again, and fix it so that all
@@ -943,7 +943,7 @@ coff_fix_symbol_name (abfd, symbol, native, string_size_p,
 
 /* Write a symbol out to a COFF file.  */
 
-static boolean
+static bfd_boolean
 coff_write_symbol (abfd, symbol, native, written, string_size_p,
 		   debug_string_section_p, debug_string_size_p)
      bfd *abfd;
@@ -988,10 +988,10 @@ coff_write_symbol (abfd, symbol, native, written, string_size_p,
   symesz = bfd_coff_symesz (abfd);
   buf = bfd_alloc (abfd, symesz);
   if (!buf)
-    return false;
+    return FALSE;
   bfd_coff_swap_sym_out (abfd, &native->u.syment, buf);
   if (bfd_bwrite (buf, symesz, abfd) != symesz)
-    return false;
+    return FALSE;
   bfd_release (abfd, buf);
 
   if (native->u.syment.n_numaux > 0)
@@ -1002,7 +1002,7 @@ coff_write_symbol (abfd, symbol, native, written, string_size_p,
       auxesz = bfd_coff_auxesz (abfd);
       buf = bfd_alloc (abfd, auxesz);
       if (!buf)
-	return false;
+	return FALSE;
       for (j = 0; j < native->u.syment.n_numaux; j++)
 	{
 	  bfd_coff_swap_aux_out (abfd,
@@ -1013,7 +1013,7 @@ coff_write_symbol (abfd, symbol, native, written, string_size_p,
 				 native->u.syment.n_numaux,
 				 buf);
 	  if (bfd_bwrite (buf, auxesz, abfd) != auxesz)
-	    return false;
+	    return FALSE;
 	}
       bfd_release (abfd, buf);
     }
@@ -1022,14 +1022,14 @@ coff_write_symbol (abfd, symbol, native, written, string_size_p,
   set_index (symbol, *written);
 
   *written += numaux + 1;
-  return true;
+  return TRUE;
 }
 
 /* Write out a symbol to a COFF file that does not come from a COFF
    file originally.  This symbol may have been created by the linker,
    or we may be linking a non COFF file to a COFF file.  */
 
-static boolean
+static bfd_boolean
 coff_write_alien_symbol (abfd, symbol, written, string_size_p,
 			 debug_string_section_p, debug_string_size_p)
      bfd *abfd;
@@ -1062,7 +1062,7 @@ coff_write_alien_symbol (abfd, symbol, written, string_size_p,
          format.  So, we just ignore them.  We must clobber the symbol
          name to keep it from being put in the string table.  */
       symbol->name = "";
-      return true;
+      return TRUE;
     }
   else
     {
@@ -1097,7 +1097,7 @@ coff_write_alien_symbol (abfd, symbol, written, string_size_p,
 
 /* Write a native symbol to a COFF file.  */
 
-static boolean
+static bfd_boolean
 coff_write_native_symbol (abfd, symbol, written, string_size_p,
 			  debug_string_section_p, debug_string_size_p)
      bfd *abfd;
@@ -1153,7 +1153,7 @@ coff_write_native_symbol (abfd, symbol, written, string_size_p,
 #endif
 	  count++;
 	}
-      symbol->done_lineno = true;
+      symbol->done_lineno = TRUE;
 
       if (! bfd_is_const_section (symbol->symbol.section->output_section))
 	symbol->symbol.section->output_section->moving_line_filepos +=
@@ -1167,7 +1167,7 @@ coff_write_native_symbol (abfd, symbol, written, string_size_p,
 
 /* Write out the COFF symbols.  */
 
-boolean
+bfd_boolean
 coff_write_symbols (abfd)
      bfd *abfd;
 {
@@ -1203,7 +1203,7 @@ coff_write_symbols (abfd)
 
   /* Seek to the right place */
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   /* Output all the symbols we have */
 
@@ -1219,14 +1219,14 @@ coff_write_symbols (abfd)
 	  if (!coff_write_alien_symbol (abfd, symbol, &written, &string_size,
 					&debug_string_section,
 					&debug_string_size))
-	    return false;
+	    return FALSE;
 	}
       else
 	{
 	  if (!coff_write_native_symbol (abfd, c_symbol, &written,
 					 &string_size, &debug_string_section,
 					 &debug_string_size))
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -1246,7 +1246,7 @@ coff_write_symbols (abfd)
 #endif
       if (bfd_bwrite ((PTR) buffer, (bfd_size_type) sizeof (buffer), abfd)
 	  != sizeof (buffer))
-	return false;
+	return FALSE;
 
       /* Handle long section names.  This code must handle section
 	 names just as they are handled in coff_write_object_contents.  */
@@ -1263,7 +1263,7 @@ coff_write_symbols (abfd)
 		{
 		  if (bfd_bwrite (o->name, (bfd_size_type) (len + 1), abfd)
 		      != len + 1)
-		    return false;
+		    return FALSE;
 		}
 	    }
 	}
@@ -1304,7 +1304,7 @@ coff_write_symbols (abfd)
 	      if (bfd_coff_force_symnames_in_strings (abfd))
 		{
 		  if (bfd_bwrite (".file", (bfd_size_type) 6, abfd) != 6)
-		    return false;
+		    return FALSE;
 		}
 	      maxlen = bfd_coff_filnmlen (abfd);
 	    }
@@ -1315,7 +1315,7 @@ coff_write_symbols (abfd)
 	    {
 	      if (bfd_bwrite ((PTR) (q->name), (bfd_size_type) name_length + 1,
 			     abfd) != name_length + 1)
-		return false;
+		return FALSE;
 	    }
 	}
     }
@@ -1334,7 +1334,7 @@ coff_write_symbols (abfd)
 #endif
       if (bfd_bwrite ((PTR) buffer, (bfd_size_type) STRING_SIZE_SIZE, abfd)
 	  != STRING_SIZE_SIZE)
-	return false;
+	return FALSE;
     }
 
   /* Make sure the .debug section was created to be the correct size.
@@ -1348,10 +1348,10 @@ coff_write_symbols (abfd)
 				 1 << debug_string_section->alignment_power)
 		      == bfd_section_size (abfd, debug_string_section))));
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 coff_write_linenumbers (abfd)
      bfd *abfd;
 {
@@ -1362,14 +1362,14 @@ coff_write_linenumbers (abfd)
   linesz = bfd_coff_linesz (abfd);
   buff = bfd_alloc (abfd, linesz);
   if (!buff)
-    return false;
+    return FALSE;
   for (s = abfd->sections; s != (asection *) NULL; s = s->next)
     {
       if (s->lineno_count)
 	{
 	  asymbol **q = abfd->outsymbols;
 	  if (bfd_seek (abfd, s->line_filepos, SEEK_SET) != 0)
-	    return false;
+	    return FALSE;
 	  /* Find all the linenumbers in this section */
 	  while (*q)
 	    {
@@ -1389,7 +1389,7 @@ coff_write_linenumbers (abfd)
 		      bfd_coff_swap_lineno_out (abfd, &out, buff);
 		      if (bfd_bwrite (buff, (bfd_size_type) linesz, abfd)
 			  != linesz)
-			return false;
+			return FALSE;
 		      l++;
 		      while (l->line_number)
 			{
@@ -1398,7 +1398,7 @@ coff_write_linenumbers (abfd)
 			  bfd_coff_swap_lineno_out (abfd, &out, buff);
 			  if (bfd_bwrite (buff, (bfd_size_type) linesz, abfd)
 			      != linesz)
-			    return false;
+			    return FALSE;
 			  l++;
 			}
 		    }
@@ -1408,7 +1408,7 @@ coff_write_linenumbers (abfd)
 	}
     }
   bfd_release (abfd, buff);
-  return true;
+  return TRUE;
 }
 
 alent *
@@ -1585,7 +1585,7 @@ copy_name (abfd, name, maxlen)
 
 /* Read in the external symbols.  */
 
-boolean
+bfd_boolean
 _bfd_coff_get_external_symbols (abfd)
      bfd *abfd;
 {
@@ -1594,7 +1594,7 @@ _bfd_coff_get_external_symbols (abfd)
   PTR syms;
 
   if (obj_coff_external_syms (abfd) != NULL)
-    return true;
+    return TRUE;
 
   symesz = bfd_coff_symesz (abfd);
 
@@ -1602,19 +1602,19 @@ _bfd_coff_get_external_symbols (abfd)
 
   syms = (PTR) bfd_malloc (size);
   if (syms == NULL && size != 0)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
       || bfd_bread (syms, size, abfd) != size)
     {
       if (syms != NULL)
 	free (syms);
-      return false;
+      return FALSE;
     }
 
   obj_coff_external_syms (abfd) = syms;
 
-  return true;
+  return TRUE;
 }
 
 /* Read in the external strings.  The strings are not loaded until
@@ -1689,7 +1689,7 @@ _bfd_coff_read_string_table (abfd)
 
 /* Free up the external symbols and strings read from a COFF file.  */
 
-boolean
+bfd_boolean
 _bfd_coff_free_symbols (abfd)
      bfd *abfd;
 {
@@ -1705,7 +1705,7 @@ _bfd_coff_free_symbols (abfd)
       free (obj_coff_strings (abfd));
       obj_coff_strings (abfd) = NULL;
     }
-  return true;
+  return TRUE;
 }
 
 /* Read a symbol table into freshly bfd_allocated memory, swap it, and
@@ -1777,7 +1777,7 @@ coff_get_normalized_symtab (abfd)
     }
 
   /* Free the raw symbols, but not the strings (if we have them).  */
-  obj_coff_keep_strings (abfd) = true;
+  obj_coff_keep_strings (abfd) = TRUE;
   if (! _bfd_coff_free_symbols (abfd))
     return NULL;
 
@@ -1909,7 +1909,7 @@ coff_make_empty_symbol (abfd)
   new->symbol.section = 0;
   new->native = 0;
   new->lineno = (alent *) NULL;
-  new->done_lineno = false;
+  new->done_lineno = FALSE;
   new->symbol.the_bfd = abfd;
   return &new->symbol;
 }
@@ -1935,7 +1935,7 @@ coff_bfd_make_debug_symbol (abfd, ptr, sz)
   new->symbol.section = bfd_abs_section_ptr;
   new->symbol.flags = BSF_DEBUGGING;
   new->lineno = (alent *) NULL;
-  new->done_lineno = false;
+  new->done_lineno = FALSE;
   new->symbol.the_bfd = abfd;
   return &new->symbol;
 }
@@ -1957,7 +1957,7 @@ coff_get_symbol_info (abfd, symbol, ret)
 
 /* Return the COFF syment for a symbol.  */
 
-boolean
+bfd_boolean
 bfd_coff_get_syment (abfd, symbol, psyment)
      bfd *abfd;
      asymbol *symbol;
@@ -1969,7 +1969,7 @@ bfd_coff_get_syment (abfd, symbol, psyment)
   if (csym == NULL || csym->native == NULL)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   *psyment = csym->native->u.syment;
@@ -1980,12 +1980,12 @@ bfd_coff_get_syment (abfd, symbol, psyment)
 
   /* FIXME: We should handle fix_line here.  */
 
-  return true;
+  return TRUE;
 }
 
 /* Return the COFF auxent for a symbol.  */
 
-boolean
+bfd_boolean
 bfd_coff_get_auxent (abfd, symbol, indx, pauxent)
      bfd *abfd;
      asymbol *symbol;
@@ -2002,7 +2002,7 @@ bfd_coff_get_auxent (abfd, symbol, indx, pauxent)
       || indx >= csym->native->u.syment.n_numaux)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   ent = csym->native + indx + 1;
@@ -2024,7 +2024,7 @@ bfd_coff_get_auxent (abfd, symbol, indx, pauxent)
       ((combined_entry_type *) pauxent->x_csect.x_scnlen.p
        - obj_raw_syments (abfd));
 
-  return true;
+  return TRUE;
 }
 
 /* Print out information about COFF symbol.  */
@@ -2191,19 +2191,19 @@ coff_print_symbol (abfd, filep, symbol, how)
    function for the is_local_label_name entry point, but some may
    override it.  */
 
-boolean
+bfd_boolean
 _bfd_coff_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
 {
-  return (boolean) (name[0] == '.' && name[1] == 'L');
+  return name[0] == '.' && name[1] == 'L';
 }
 
 /* Provided a BFD, a section and an offset (in bytes, not octets) into the
    section, calculate and return the name of the source file and the line
    nearest to the wanted location.  */
 
-boolean
+bfd_boolean
 coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 			functionname_ptr, line_ptr)
      bfd *abfd;
@@ -2214,7 +2214,7 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
      const char **functionname_ptr;
      unsigned int *line_ptr;
 {
-  boolean found;
+  bfd_boolean found;
   unsigned int i;
   unsigned int line_base;
   coff_data_type *cof = coff_data (abfd);
@@ -2231,17 +2231,17 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 					     &found, filename_ptr,
 					     functionname_ptr, line_ptr,
 					     &coff_data(abfd)->line_info))
-    return false;
+    return FALSE;
 
   if (found)
-    return true;
+    return TRUE;
 
   /* Also try examining DWARF2 debugging information.  */
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr, 0,
 				     &coff_data(abfd)->dwarf2_find_line_info))
-    return true;
+    return TRUE;
 
   *filename_ptr = 0;
   *functionname_ptr = 0;
@@ -2249,15 +2249,15 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 
   /* Don't try and find line numbers in a non coff file */
   if (!bfd_family_coff (abfd))
-    return false;
+    return FALSE;
 
   if (cof == NULL)
-    return false;
+    return FALSE;
 
   /* Find the first C_FILE symbol.  */
   p = cof->raw_syments;
   if (!p)
-    return false;
+    return FALSE;
 
   pend = p + cof->raw_syment_count;
   while (p < pend)
@@ -2410,13 +2410,13 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
       sec_data->line_base = line_base;
     }
 
-  return true;
+  return TRUE;
 }
 
 int
 coff_sizeof_headers (abfd, reloc)
      bfd *abfd;
-     boolean reloc;
+     bfd_boolean reloc;
 {
   size_t size;
 
@@ -2434,7 +2434,7 @@ coff_sizeof_headers (abfd, reloc)
 }
 
 /* Change the class of a coff symbol held by BFD.  */
-boolean
+bfd_boolean
 bfd_coff_set_symbol_class (abfd, symbol, class)
      bfd *         abfd;
      asymbol *     symbol;
@@ -2446,7 +2446,7 @@ bfd_coff_set_symbol_class (abfd, symbol, class)
   if (csym == NULL)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
   else if (csym->native == NULL)
     {
@@ -2460,7 +2460,7 @@ bfd_coff_set_symbol_class (abfd, symbol, class)
 
       native = (combined_entry_type *) bfd_zalloc (abfd, amt);
       if (native == NULL)
-	return false;
+	return FALSE;
 
       native->u.syment.n_type   = T_NULL;
       native->u.syment.n_sclass = class;
@@ -2496,5 +2496,5 @@ bfd_coff_set_symbol_class (abfd, symbol, class)
       csym->native->u.syment.n_sclass = class;
     }
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index c1302ee878a..4e613881242 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;
 }
diff --git a/bfd/corefile.c b/bfd/corefile.c
index 24142254eed..da9d4d739dc 100644
--- a/bfd/corefile.c
+++ b/bfd/corefile.c
@@ -83,21 +83,21 @@ FUNCTION
 	core_file_matches_executable_p
 
 SYNOPSIS
-	boolean core_file_matches_executable_p
+	bfd_boolean core_file_matches_executable_p
 		(bfd *core_bfd, bfd *exec_bfd);
 
 DESCRIPTION
-	Return <<true>> if the core file attached to @var{core_bfd}
+	Return <<TRUE>> if the core file attached to @var{core_bfd}
 	was generated by a run of the executable file attached to
-	@var{exec_bfd}, <<false>> otherwise.
+	@var{exec_bfd}, <<FALSE>> otherwise.
 */
-boolean
+bfd_boolean
 core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd, *exec_bfd;
 {
     if ((core_bfd->format != bfd_core) || (exec_bfd->format != bfd_object)) {
 	    bfd_set_error (bfd_error_wrong_format);
-	    return false;
+	    return FALSE;
 	}
 
     return BFD_SEND (core_bfd, _core_file_matches_executable_p,
diff --git a/bfd/cpu-a29k.c b/bfd/cpu-a29k.c
index eaef4794eae..d6352b199c4 100644
--- a/bfd/cpu-a29k.c
+++ b/bfd/cpu-a29k.c
@@ -1,5 +1,5 @@
 /* BFD support for the AMD 29000 architecture.
-   Copyright 1992, 2000 Free Software Foundation, Inc.
+   Copyright 1992, 2000, 2002 Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_a29k_arch =
     "a29k",
     "a29k",
     4,
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
     0,
diff --git a/bfd/cpu-alpha.c b/bfd/cpu-alpha.c
index 93fc69ce617..7b1dde98221 100644
--- a/bfd/cpu-alpha.c
+++ b/bfd/cpu-alpha.c
@@ -1,5 +1,5 @@
 /* BFD support for the Alpha architecture.
-   Copyright 1992, 1993, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1998, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -42,10 +42,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* These exist only so that we can resonably disassemble PALcode.  */
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (64, 64, bfd_mach_alpha_ev4, "alpha:ev4", false, NN(1)),
-  N (64, 64, bfd_mach_alpha_ev5, "alpha:ev5", false, NN(2)),
-  N (64, 64, bfd_mach_alpha_ev6, "alpha:ev6", false, 0),
+  N (64, 64, bfd_mach_alpha_ev4, "alpha:ev4", FALSE, NN(1)),
+  N (64, 64, bfd_mach_alpha_ev5, "alpha:ev5", FALSE, NN(2)),
+  N (64, 64, bfd_mach_alpha_ev6, "alpha:ev6", FALSE, 0),
 };
 
 const bfd_arch_info_type bfd_alpha_arch =
-  N (64, 64, 0, "alpha", true, NN(0));
+  N (64, 64, 0, "alpha", TRUE, NN(0));
diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c
index 204eb483378..c69df0e715c 100644
--- a/bfd/cpu-arc.c
+++ b/bfd/cpu-arc.c
@@ -1,5 +1,5 @@
 /* BFD support for the ARC processor
-   Copyright 1994, 1995, 1997, 2001 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1997, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Doug Evans (dje@cygnus.com).
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -40,15 +40,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  ARC ( bfd_mach_arc_5, "arc5", false, &arch_info_struct[1] ),
-  ARC ( bfd_mach_arc_5, "base", false, &arch_info_struct[2] ),
-  ARC ( bfd_mach_arc_6, "arc6", false, &arch_info_struct[3] ),
-  ARC ( bfd_mach_arc_7, "arc7", false, &arch_info_struct[4] ),
-  ARC ( bfd_mach_arc_8, "arc8", false, NULL ),
+  ARC ( bfd_mach_arc_5, "arc5", FALSE, &arch_info_struct[1] ),
+  ARC ( bfd_mach_arc_5, "base", FALSE, &arch_info_struct[2] ),
+  ARC ( bfd_mach_arc_6, "arc6", FALSE, &arch_info_struct[3] ),
+  ARC ( bfd_mach_arc_7, "arc7", FALSE, &arch_info_struct[4] ),
+  ARC ( bfd_mach_arc_8, "arc8", FALSE, NULL ),
 };
 
 const bfd_arch_info_type bfd_arc_arch =
-  ARC ( bfd_mach_arc_6, "arc", true, &arch_info_struct[0] );
+  ARC ( bfd_mach_arc_6, "arc", TRUE, &arch_info_struct[0] );
 
 /* Utility routines.  */
 
diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c
index 9faf648e164..cd4bf14eaa8 100644
--- a/bfd/cpu-arm.c
+++ b/bfd/cpu-arm.c
@@ -24,7 +24,7 @@
 
 static const bfd_arch_info_type * compatible
   PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-static boolean scan
+static bfd_boolean scan
   PARAMS ((const struct bfd_arch_info *, const char *));
 
 /* This routine is provided two arch_infos and works out which ARM
@@ -98,7 +98,7 @@ processors[] =
   { bfd_mach_arm_XScale, "xscale" }
 };
 
-static boolean
+static bfd_boolean
 scan (info, string)
      const struct bfd_arch_info * info;
      const char * string;
@@ -107,7 +107,7 @@ scan (info, string)
 
   /* First test for an exact match.  */
   if (strcasecmp (string, info->printable_name) == 0)
-    return true;
+    return TRUE;
 
   /* Next check for a processor name instead of an Architecture name.  */
   for (i = sizeof (processors) / sizeof (processors[0]); i--;)
@@ -117,13 +117,13 @@ scan (info, string)
     }
 
   if (i != -1 && info->mach == processors [i].mach)
-    return true;
+    return TRUE;
 
   /* Finally check for the default architecture.  */
   if (strcasecmp (string, "arm") == 0)
     return info->the_default;
 
-  return false;
+  return FALSE;
 }
 
 #define N(number, print, default, next)  \
@@ -131,17 +131,17 @@ scan (info, string)
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (bfd_mach_arm_2,      "armv2",   false, & arch_info_struct[1]),
-  N (bfd_mach_arm_2a,     "armv2a",  false, & arch_info_struct[2]),
-  N (bfd_mach_arm_3,      "armv3",   false, & arch_info_struct[3]),
-  N (bfd_mach_arm_3M,     "armv3m",  false, & arch_info_struct[4]),
-  N (bfd_mach_arm_4,      "armv4",   false, & arch_info_struct[5]),
-  N (bfd_mach_arm_4T,     "armv4t",  false, & arch_info_struct[6]),
-  N (bfd_mach_arm_5,      "armv5",   false, & arch_info_struct[7]),
-  N (bfd_mach_arm_5T,     "armv5t",  false, & arch_info_struct[8]),
-  N (bfd_mach_arm_5TE,    "armv5te", false, & arch_info_struct[9]),
-  N (bfd_mach_arm_XScale, "xscale",  false, NULL)
+  N (bfd_mach_arm_2,      "armv2",   FALSE, & arch_info_struct[1]),
+  N (bfd_mach_arm_2a,     "armv2a",  FALSE, & arch_info_struct[2]),
+  N (bfd_mach_arm_3,      "armv3",   FALSE, & arch_info_struct[3]),
+  N (bfd_mach_arm_3M,     "armv3m",  FALSE, & arch_info_struct[4]),
+  N (bfd_mach_arm_4,      "armv4",   FALSE, & arch_info_struct[5]),
+  N (bfd_mach_arm_4T,     "armv4t",  FALSE, & arch_info_struct[6]),
+  N (bfd_mach_arm_5,      "armv5",   FALSE, & arch_info_struct[7]),
+  N (bfd_mach_arm_5T,     "armv5t",  FALSE, & arch_info_struct[8]),
+  N (bfd_mach_arm_5TE,    "armv5te", FALSE, & arch_info_struct[9]),
+  N (bfd_mach_arm_XScale, "xscale",  FALSE, NULL)
 };
 
 const bfd_arch_info_type bfd_arm_arch =
-  N (0, "arm", true, & arch_info_struct[0]);
+  N (0, "arm", TRUE, & arch_info_struct[0]);
diff --git a/bfd/cpu-avr.c b/bfd/cpu-avr.c
index b623790cac1..ba11c70a7a5 100644
--- a/bfd/cpu-avr.c
+++ b/bfd/cpu-avr.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the AVR architecture.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
    Contributed by Denis Chertykov <denisc@overta.ru>
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -44,23 +44,23 @@ static const bfd_arch_info_type *compatible
 static const bfd_arch_info_type arch_info_struct[] =
 {
   /* AT90S1200, ATtiny1x, ATtiny28 */
-  N (16, bfd_mach_avr1, "avr:1", false, & arch_info_struct[1]),
+  N (16, bfd_mach_avr1, "avr:1", FALSE, & arch_info_struct[1]),
 
   /* AT90S2xxx, AT90S4xxx, AT90S8xxx, ATtiny22 */
-  N (16, bfd_mach_avr2, "avr:2", false, & arch_info_struct[2]),
+  N (16, bfd_mach_avr2, "avr:2", FALSE, & arch_info_struct[2]),
 
   /* ATmega103, ATmega603 */
-  N (22, bfd_mach_avr3, "avr:3", false, & arch_info_struct[3]),
+  N (22, bfd_mach_avr3, "avr:3", FALSE, & arch_info_struct[3]),
 
   /* ATmega83, ATmega85 */
-  N (16, bfd_mach_avr4, "avr:4", false, & arch_info_struct[4]),
+  N (16, bfd_mach_avr4, "avr:4", FALSE, & arch_info_struct[4]),
 
   /* ATmega161, ATmega163, ATmega32, AT94K */
-  N (22, bfd_mach_avr5, "avr:5", false, NULL)
+  N (22, bfd_mach_avr5, "avr:5", FALSE, NULL)
 };
 
 const bfd_arch_info_type bfd_avr_arch =
-  N (16, bfd_mach_avr2, "avr", true, & arch_info_struct[0]);
+  N (16, bfd_mach_avr2, "avr", TRUE, & arch_info_struct[0]);
 
 /* This routine is provided two arch_infos and works out which AVR
    machine which would be compatible with both and returns a pointer
diff --git a/bfd/cpu-cris.c b/bfd/cpu-cris.c
index 10d779f6c9d..e9f68abfcf0 100644
--- a/bfd/cpu-cris.c
+++ b/bfd/cpu-cris.c
@@ -1,5 +1,5 @@
 /* BFD support for the Axis CRIS architecture.
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2002 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
 
@@ -38,7 +38,7 @@ bfd_cris_arch =
   "cris",			/* The printable name is the same.  */
   1,				/* Section alignment power; each section
 				   is aligned to (only) 2^1 bytes.  */
-  true,				/* This is the default "machine", since
+  TRUE,				/* This is the default "machine", since
 				   there's only one.  */
   bfd_default_compatible,	/* A default function for testing
 				   "machine" compatibility of two
diff --git a/bfd/cpu-d10v.c b/bfd/cpu-d10v.c
index 96946633a51..2be72d84163 100644
--- a/bfd/cpu-d10v.c
+++ b/bfd/cpu-d10v.c
@@ -1,5 +1,5 @@
 /* BFD support for the D10V processor
-   Copyright 1996, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1999, 2000, 2002 Free Software Foundation, Inc.
    Contributed by Martin Hunt (hunt@cygnus.com).
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ static const bfd_arch_info_type d10v_ts3_info =
   "d10v",
   "d10v:ts3",
   4, /* section alignment power */
-  false,
+  FALSE,
   bfd_default_compatible,
   bfd_default_scan,
   0,
@@ -48,7 +48,7 @@ static const bfd_arch_info_type d10v_ts2_info =
   "d10v",
   "d10v:ts2",
   4, /* section alignment power */
-  false,
+  FALSE,
   bfd_default_compatible,
   bfd_default_scan,
   &d10v_ts3_info,
@@ -64,7 +64,7 @@ const bfd_arch_info_type bfd_d10v_arch =
   "d10v",
   "d10v",
   4, /* section alignment power */
-  true,
+  TRUE,
   bfd_default_compatible,
   bfd_default_scan,
   &d10v_ts2_info,
diff --git a/bfd/cpu-d30v.c b/bfd/cpu-d30v.c
index 6eadfee271a..f884310062b 100644
--- a/bfd/cpu-d30v.c
+++ b/bfd/cpu-d30v.c
@@ -1,5 +1,5 @@
 /* BFD support for the Mitsubishi D30V processor
-   Copyright 1997 Free Software Foundation, Inc.
+   Copyright 1997, 2002 Free Software Foundation, Inc.
    Contributed by Martin Hunt (hunt@cygnus.com).
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_d30v_arch =
     "d30v",
     "d30v",
     4, /* section alignment power */
-    true,
+    TRUE,
     bfd_default_compatible,
     bfd_default_scan,
     0,
diff --git a/bfd/cpu-dlx.c b/bfd/cpu-dlx.c
index 2023ff53121..358a97bfa64 100644
--- a/bfd/cpu-dlx.c
+++ b/bfd/cpu-dlx.c
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_dlx_arch =
     "dlx",
     "dlx",
     4,
-    true, /* The one and only.  */
+    TRUE, /* The one and only.  */
     bfd_default_compatible,
     bfd_default_scan ,
     0,
diff --git a/bfd/cpu-fr30.c b/bfd/cpu-fr30.c
index b649edb3ee4..759f4d4b676 100644
--- a/bfd/cpu-fr30.c
+++ b/bfd/cpu-fr30.c
@@ -1,5 +1,5 @@
 /* BFD support for the FR30 processor.
-   Copyright 1998 Free Software Foundation, Inc.
+   Copyright 1998, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_fr30_arch =
   "fr30",			/* architecture name */
   "fr30",			/* printable name */
   4,				/* section align power */
-  true,				/* the default ? */
+  TRUE,				/* the default ? */
   bfd_default_compatible,	/* architecture comparison fn */
   bfd_default_scan,		/* string to architecture convert fn */
   NULL				/* next in list */
diff --git a/bfd/cpu-frv.c b/bfd/cpu-frv.c
index cd9ff1ef5c6..e87289aec03 100644
--- a/bfd/cpu-frv.c
+++ b/bfd/cpu-frv.c
@@ -1,5 +1,5 @@
 /* BFD support for the FRV processor.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -45,20 +45,20 @@ enum {
 }
 
 static const bfd_arch_info_type arch_info_300
-  = FRV_ARCH (bfd_mach_fr300,   "fr300",   false, (bfd_arch_info_type *)0);
+  = FRV_ARCH (bfd_mach_fr300,   "fr300",   FALSE, (bfd_arch_info_type *)0);
 
 static const bfd_arch_info_type arch_info_400
-  = FRV_ARCH (bfd_mach_fr400, "fr400", false, &arch_info_300);
+  = FRV_ARCH (bfd_mach_fr400, "fr400", FALSE, &arch_info_300);
 
 static const bfd_arch_info_type arch_info_500
-  = FRV_ARCH (bfd_mach_fr500, "fr500", false, &arch_info_400);
+  = FRV_ARCH (bfd_mach_fr500, "fr500", FALSE, &arch_info_400);
 
 static const bfd_arch_info_type arch_info_simple
-  = FRV_ARCH (bfd_mach_frvsimple, "simple", false, &arch_info_500);
+  = FRV_ARCH (bfd_mach_frvsimple, "simple", FALSE, &arch_info_500);
 
 static const bfd_arch_info_type arch_info_tomcat
-  = FRV_ARCH (bfd_mach_frvtomcat, "tomcat", false, &arch_info_simple);
+  = FRV_ARCH (bfd_mach_frvtomcat, "tomcat", FALSE, &arch_info_simple);
 
 const bfd_arch_info_type bfd_frv_arch
-  = FRV_ARCH (bfd_mach_frv, "frv", true, &arch_info_tomcat);
+  = FRV_ARCH (bfd_mach_frv, "frv", TRUE, &arch_info_tomcat);
 
diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
index 10ca3fdfc2b..eafcb9806dc 100644
--- a/bfd/cpu-h8300.c
+++ b/bfd/cpu-h8300.c
@@ -23,35 +23,35 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static boolean h8300_scan
+static bfd_boolean h8300_scan
   PARAMS ((const struct bfd_arch_info *, const char *));
 static const bfd_arch_info_type * compatible
   PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
 
-static boolean
+static bfd_boolean
 h8300_scan (info, string)
      const struct bfd_arch_info *info;
      const char *string;
 {
   if (*string != 'h' && *string != 'H')
-    return false;
+    return FALSE;
 
   string++;
   if (*string != '8')
-    return false;
+    return FALSE;
 
   string++;
   if (*string == '/')
     string++;
 
   if (*string != '3')
-    return false;
+    return FALSE;
   string++;
   if (*string != '0')
-    return false;
+    return FALSE;
   string++;
   if (*string != '0')
-    return false;
+    return FALSE;
   string++;
   if (*string == '-')
     string++;
@@ -107,7 +107,7 @@ static const bfd_arch_info_type h8300s_info_struct =
   "h8300s",			/* arch_name  */
   "h8300s",			/* printable name */
   1,
-  false,			/* the default machine */
+  FALSE,			/* the default machine */
   compatible,
   h8300_scan,
   0
@@ -123,7 +123,7 @@ static const bfd_arch_info_type h8300h_info_struct =
   "h8300h",			/* arch_name  */
   "h8300h",			/* printable name */
   1,
-  false,			/* the default machine */
+  FALSE,			/* the default machine */
   compatible,
   h8300_scan,
   &h8300s_info_struct
@@ -139,7 +139,7 @@ const bfd_arch_info_type bfd_h8300_arch =
   "h8300",			/* arch_name  */
   "h8300",			/* printable name */
   1,
-  true,				/* the default machine */
+  TRUE,				/* the default machine */
   compatible,
   h8300_scan,
   &h8300h_info_struct
diff --git a/bfd/cpu-h8500.c b/bfd/cpu-h8500.c
index 6a1fae05ee6..08fb359868b 100644
--- a/bfd/cpu-h8500.c
+++ b/bfd/cpu-h8500.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the H8/500 architecture.
-   Copyright 1993, 1995, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1993, 1995, 2000, 2001, 2002 Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -22,7 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static boolean scan_mach PARAMS ((const struct bfd_arch_info *, const char *));
+static bfd_boolean scan_mach
+  PARAMS ((const struct bfd_arch_info *, const char *));
 
 #if 0
 /*
@@ -119,15 +120,15 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
 }
 
 static reloc_howto_type howto_16
-  = NEWHOWTO(howto16_callback,"abs16",1,false,false);
+  = NEWHOWTO (howto16_callback, "abs16", 1, FALSE, FALSE);
 static reloc_howto_type howto_8
-  = NEWHOWTO(howto8_callback,"abs8",0,false,false);
+  = NEWHOWTO (howto8_callback, "abs8", 0, FALSE, FALSE);
 
 static reloc_howto_type howto_8_FFnn
-  = NEWHOWTO(howto8_FFnn_callback,"ff00+abs8",0,false,false);
+  = NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, FALSE, FALSE);
 
 static reloc_howto_type howto_8_pcrel
-  = NEWHOWTO(howto8_pcrel_callback,"pcrel8",0,false,true);
+  = NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, FALSE, TRUE);
 
 static reloc_howto_type *
 local_bfd_reloc_type_lookup (arch, code)
@@ -148,16 +149,20 @@ local_bfd_reloc_type_lookup (arch, code)
 }
 #endif
 
-static boolean
+static bfd_boolean
 scan_mach (info, string)
      const struct bfd_arch_info *info ATTRIBUTE_UNUSED;
      const char *string;
 {
-  if (strcmp(string,"h8/500") == 0) return true;
-  if (strcmp(string,"H8/500") == 0) return true;
-  if (strcmp(string,"h8500") == 0) return true;
-  if (strcmp(string,"H8500") == 0) return true;
-  return false;
+  if (strcmp (string,"h8/500") == 0)
+    return TRUE;
+  if (strcmp (string,"H8/500") == 0)
+    return TRUE;
+  if (strcmp (string,"h8500") == 0)
+    return TRUE;
+  if (strcmp (string,"H8500") == 0)
+    return TRUE;
+  return FALSE;
 }
 
 #if 0 /* not used currently */
@@ -185,7 +190,7 @@ const bfd_arch_info_type bfd_h8500_arch =
   "h8500",			/* arch_name  */
   "h8500",			/* printable name */
   1,
-  true,				/* the default machine */
+  TRUE,				/* the default machine */
   bfd_default_compatible,
   scan_mach,
   0,
diff --git a/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
index 0c22b8c4436..5757e49fe63 100644
--- a/bfd/cpu-hppa.c
+++ b/bfd/cpu-hppa.c
@@ -1,5 +1,6 @@
 /* BFD support for the HP Precision Architecture architecture.
-   Copyright 1992, 1995, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1992, 1995, 1998, 1999, 2000, 2002
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +32,7 @@ static const bfd_arch_info_type bfd_hppa10_arch =
   "hppa",
   "hppa1.0",
   3,
-  true,				/* Unless we use 1.1 specific features */
+  TRUE,				/* Unless we use 1.1 specific features */
   bfd_default_compatible,
   bfd_default_scan ,
   0,
@@ -48,7 +49,7 @@ static const bfd_arch_info_type bfd_hppa20_arch =
   "hppa",
   "hppa2.0",
   3,
-  false,			/* Unless we use 1.1 specific features */
+  FALSE,			/* Unless we use 1.1 specific features */
   bfd_default_compatible,
   bfd_default_scan ,
   &bfd_hppa10_arch,
@@ -65,7 +66,7 @@ static const bfd_arch_info_type bfd_hppa20w_arch =
   "hppa",
   "hppa2.0w",
   3,
-  false,			/* Unless we use 1.1 specific features */
+  FALSE,			/* Unless we use 1.1 specific features */
   bfd_default_compatible,
   bfd_default_scan ,
   &bfd_hppa20_arch,
@@ -81,7 +82,7 @@ const bfd_arch_info_type bfd_hppa_arch =
   "hppa",
   "hppa1.1",
   3,
-  false,			/* 1.1 specific features used */
+  FALSE,			/* 1.1 specific features used */
   bfd_default_compatible,
   bfd_default_scan ,
   &bfd_hppa20w_arch,
diff --git a/bfd/cpu-i370.c b/bfd/cpu-i370.c
index d6821132053..2bb2229f93f 100644
--- a/bfd/cpu-i370.c
+++ b/bfd/cpu-i370.c
@@ -36,7 +36,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "i370",
     "i370:360",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[1]
@@ -50,7 +50,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "i370",
     "i370:370",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     0
@@ -67,7 +67,7 @@ const bfd_arch_info_type bfd_i370_arch =
     "i370",
     "i370:common",
     3,
-    true, /* the default */
+    TRUE, /* the default */
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[0]
diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index f4928275727..272c7196242 100644
--- a/bfd/cpu-i386.c
+++ b/bfd/cpu-i386.c
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_i386_arch_intel_syntax =
   "i386:intel",
   "i386:intel",
   3,
-  true,
+  TRUE,
   bfd_default_compatible,
   bfd_default_scan ,
   0,
@@ -47,7 +47,7 @@ const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
   "i386:intel",
   "i386:x86-64:intel",
   3,
-  true,
+  TRUE,
   bfd_default_compatible,
   bfd_default_scan ,
   &bfd_i386_arch_intel_syntax,
@@ -62,7 +62,7 @@ static const bfd_arch_info_type i8086_arch =
   "i8086",
   "i8086",
   3,
-  false,
+  FALSE,
   bfd_default_compatible,
   bfd_default_scan ,
   &bfd_x86_64_arch_intel_syntax,
@@ -78,7 +78,7 @@ const bfd_arch_info_type bfd_x86_64_arch =
   "i386",
   "i386:x86-64",
   3,
-  true,
+  TRUE,
   bfd_default_compatible,
   bfd_default_scan ,
   &i8086_arch,
@@ -94,7 +94,7 @@ const bfd_arch_info_type bfd_i386_arch =
   "i386",
   "i386",
   3,
-  true,
+  TRUE,
   bfd_default_compatible,
   bfd_default_scan ,
   &bfd_x86_64_arch
diff --git a/bfd/cpu-i860.c b/bfd/cpu-i860.c
index 7445e5ffbae..0ee0c5a60bc 100644
--- a/bfd/cpu-i860.c
+++ b/bfd/cpu-i860.c
@@ -1,5 +1,5 @@
 /* BFD support for the Intel 860 architecture.
-   Copyright 1992, 1995, 2000 Free Software Foundation, Inc.
+   Copyright 1992, 1995, 2000, 2002 Free Software Foundation, Inc.
    Created mostly by substituting "860" for "386" in cpu-i386.c
    Harry Dolan <dolan@ssd.intel.com>, October 1995
 
@@ -33,7 +33,7 @@ const bfd_arch_info_type bfd_i860_arch =
     "i860",			/* Architecture name */
     "i860",			/* Printable name */
     3,				/* Section alignment exponent */
-    true,			/* Is this the default architecture? */
+    TRUE,			/* Is this the default architecture? */
     bfd_default_compatible,
     bfd_default_scan,
     0,				/* Next in list */
diff --git a/bfd/cpu-i960.c b/bfd/cpu-i960.c
index a7c45002ea1..e77a411adb9 100644
--- a/bfd/cpu-i960.c
+++ b/bfd/cpu-i960.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the i960 architecture.
-   Copyright 1990, 1991, 1993, 1994, 1996, 1999, 2000, 2001
+   Copyright 1990, 1991, 1993, 1994, 1996, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static boolean scan_960_mach
+static bfd_boolean scan_960_mach
   PARAMS ((const bfd_arch_info_type *, const char *));
 static const bfd_arch_info_type *compatible
   PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
@@ -32,13 +32,13 @@ static const bfd_arch_info_type *compatible
    could possibly refer to the i960 machine pointed at in the
    info_struct pointer */
 
-static boolean
+static bfd_boolean
 scan_960_mach (ap, string)
      const bfd_arch_info_type *ap;
      const char *string;
 {
   unsigned long machine;
-  int fail_because_not_80960 = false;
+  int fail_because_not_80960 = FALSE;
 
   /* Look for the string i960 at the front of the string.  */
   if (strncasecmp ("i960", string, 4) == 0)
@@ -51,7 +51,7 @@ scan_960_mach (ap, string)
 
       /* "i960:*" is valid, anything else is not.  */
       if (* string != ':')
-	return false;
+	return FALSE;
 
       string ++;
     }
@@ -61,16 +61,16 @@ scan_960_mach (ap, string)
     {
       string += 5;
 
-      /* Sett his to true here.  If a correct matching postfix
-	 is detected below it will be reset to false.  */
-      fail_because_not_80960 = true;
+      /* Set this to TRUE here.  If a correct matching postfix
+	 is detected below it will be reset to FALSE.  */
+      fail_because_not_80960 = TRUE;
     }
   /* No match, can't be us.  */
   else
-    return false;
+    return FALSE;
 
   if (* string == '\0')
-    return false;
+    return FALSE;
 
   if (string[0] == 'c' && string[1] == 'o' && string[2] == 'r' &&
       string[3] == 'e' && string[4] == '\0')
@@ -80,19 +80,19 @@ scan_960_mach (ap, string)
   else if (strcasecmp (string, "kb_sb") == 0)
     machine = bfd_mach_i960_kb_sb;
   else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char.  */
-    return false;
+    return FALSE;
   else if (string[0] == 'k' && string[1] == 'b')
-    { machine = bfd_mach_i960_kb_sb; fail_because_not_80960 = false; }
+    { machine = bfd_mach_i960_kb_sb; fail_because_not_80960 = FALSE; }
   else if (string[0] == 's' && string[1] == 'b')
     machine = bfd_mach_i960_kb_sb;
   else if (string[0] == 'm' && string[1] == 'c')
-    { machine = bfd_mach_i960_mc; fail_because_not_80960 = false; }
+    { machine = bfd_mach_i960_mc; fail_because_not_80960 = FALSE; }
   else if (string[0] == 'x' && string[1] == 'a')
     machine = bfd_mach_i960_xa;
   else if (string[0] == 'c' && string[1] == 'a')
-    { machine = bfd_mach_i960_ca; fail_because_not_80960 = false; }
+    { machine = bfd_mach_i960_ca; fail_because_not_80960 = FALSE; }
   else if (string[0] == 'k' && string[1] == 'a')
-    { machine = bfd_mach_i960_ka_sa; fail_because_not_80960 = false; }
+    { machine = bfd_mach_i960_ka_sa; fail_because_not_80960 = FALSE; }
   else if (string[0] == 's' && string[1] == 'a')
     machine = bfd_mach_i960_ka_sa;
   else if (string[0] == 'j' && string[1] == 'x')
@@ -100,15 +100,15 @@ scan_960_mach (ap, string)
   else if (string[0] == 'h' && string[1] == 'x')
     machine = bfd_mach_i960_hx;
   else
-    return false;
+    return FALSE;
 
   if (fail_because_not_80960)
-    return false;
+    return FALSE;
 
   if (machine == ap->mach)
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* This routine is provided two arch_infos and works out the i960
@@ -169,14 +169,14 @@ compatible (a,b)
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N(bfd_mach_i960_ka_sa,"i960:ka_sa",false, &arch_info_struct[1]),
-  N(bfd_mach_i960_kb_sb,"i960:kb_sb",false, &arch_info_struct[2]),
-  N(bfd_mach_i960_mc,   "i960:mc",   false, &arch_info_struct[3]),
-  N(bfd_mach_i960_xa,   "i960:xa",   false, &arch_info_struct[4]),
-  N(bfd_mach_i960_ca,   "i960:ca",   false, &arch_info_struct[5]),
-  N(bfd_mach_i960_jx,   "i960:jx",   false, &arch_info_struct[6]),
-  N(bfd_mach_i960_hx,	"i960:hx",   false, 0),
+  N(bfd_mach_i960_ka_sa,"i960:ka_sa",FALSE, &arch_info_struct[1]),
+  N(bfd_mach_i960_kb_sb,"i960:kb_sb",FALSE, &arch_info_struct[2]),
+  N(bfd_mach_i960_mc,   "i960:mc",   FALSE, &arch_info_struct[3]),
+  N(bfd_mach_i960_xa,   "i960:xa",   FALSE, &arch_info_struct[4]),
+  N(bfd_mach_i960_ca,   "i960:ca",   FALSE, &arch_info_struct[5]),
+  N(bfd_mach_i960_jx,   "i960:jx",   FALSE, &arch_info_struct[6]),
+  N(bfd_mach_i960_hx,	"i960:hx",   FALSE, 0),
 };
 
 const bfd_arch_info_type bfd_i960_arch =
-  N(bfd_mach_i960_core, "i960:core", true, &arch_info_struct[0]);
+  N(bfd_mach_i960_core, "i960:core", TRUE, &arch_info_struct[0]);
diff --git a/bfd/cpu-ia64.c b/bfd/cpu-ia64.c
index 1f36568dfa6..2185241e486 100644
--- a/bfd/cpu-ia64.c
+++ b/bfd/cpu-ia64.c
@@ -1,5 +1,5 @@
 /* BFD support for the ia64 architecture.
-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_ia64_elf32_arch =
     "ia64",
     "ia64-elf32",
     3,	/* log2 of section alignment */
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
     0,
@@ -48,7 +48,7 @@ const bfd_arch_info_type bfd_ia64_arch =
     "ia64",
     "ia64-elf64",
     3,	/* log2 of section alignment */
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
     &bfd_ia64_elf32_arch,
diff --git a/bfd/cpu-ip2k.c b/bfd/cpu-ip2k.c
index 6afb7fe57f6..a953149a474 100644
--- a/bfd/cpu-ip2k.c
+++ b/bfd/cpu-ip2k.c
@@ -1,5 +1,5 @@
 /* BFD support for the Scenix IP2xxx processor.
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_ip2k_nonext_arch =
   "ip2k",			/* Architecture name.  */
   "ip2022",			/* Machine name.  */
   1,				/* Section align power.  */
-  false,		        /* The default ?  */
+  FALSE,		        /* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
   NULL				/* Next in list.  */
@@ -47,7 +47,7 @@ const bfd_arch_info_type bfd_ip2k_arch =
   "ip2k",			/* Architecture name.  */
   "ip2022ext",			/* Machine name.  */
   1,				/* Section align power.  */
-  true,				/* The default ?  */
+  TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
   & bfd_ip2k_nonext_arch	/* Next in list.  */
diff --git a/bfd/cpu-m10200.c b/bfd/cpu-m10200.c
index 3f8a678beec..2d0adcd6bc2 100644
--- a/bfd/cpu-m10200.c
+++ b/bfd/cpu-m10200.c
@@ -1,5 +1,5 @@
 /* BFD support for the Matsushita 10200 processor
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_mn10200_arch =
     "mn10200",
     "mn10200",
     2,
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
     0,
diff --git a/bfd/cpu-m10300.c b/bfd/cpu-m10300.c
index 4add3c1aa42..a67c48b6879 100644
--- a/bfd/cpu-m10300.c
+++ b/bfd/cpu-m10300.c
@@ -1,5 +1,5 @@
 /* BFD support for the Matsushita 10300 processor
-   Copyright 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_am33_arch =
     "am33",
     "am33",
     2,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     0,
@@ -47,7 +47,7 @@ const bfd_arch_info_type bfd_mn10300_arch =
     "mn10300",
     "mn10300",
     2,
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan,
     &bfd_am33_arch,
diff --git a/bfd/cpu-m32r.c b/bfd/cpu-m32r.c
index c28b7da41eb..bebc2ed4b7e 100644
--- a/bfd/cpu-m32r.c
+++ b/bfd/cpu-m32r.c
@@ -1,5 +1,5 @@
 /* BFD support for the M32R processor.
-   Copyright 1996, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -29,11 +29,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (bfd_mach_m32rx, "m32rx", false, NULL)
+  N (bfd_mach_m32rx, "m32rx", FALSE, NULL)
 };
 
 #undef NEXT
 #define NEXT &arch_info_struct[0]
 
 const bfd_arch_info_type bfd_m32r_arch =
-  N (bfd_mach_m32r, "m32r", true, NEXT);
+  N (bfd_mach_m32r, "m32r", TRUE, NEXT);
diff --git a/bfd/cpu-m68hc11.c b/bfd/cpu-m68hc11.c
index 12329ebde1c..beea627c50c 100644
--- a/bfd/cpu-m68hc11.c
+++ b/bfd/cpu-m68hc11.c
@@ -1,5 +1,5 @@
 /* BFD support for the Motorola 68HC11 processor
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_m68hc11_arch =
     "m68hc11",
     "m68hc11",
     4, /* section alignment power */
-    true,
+    TRUE,
     bfd_default_compatible,
     bfd_default_scan,
     0,
diff --git a/bfd/cpu-m68hc12.c b/bfd/cpu-m68hc12.c
index 1810438b291..d43eb95fc17 100644
--- a/bfd/cpu-m68hc12.c
+++ b/bfd/cpu-m68hc12.c
@@ -1,5 +1,5 @@
 /* BFD support for the Motorola 68HC12 processor
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_m68hc12_arch =
     "m68hc12",
     "m68hc12",
     4, /* section alignment power */
-    true,
+    TRUE,
     bfd_default_compatible,
     bfd_default_scan,
     0,
diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
index c6820de15e5..1648340fa54 100644
--- a/bfd/cpu-m68k.c
+++ b/bfd/cpu-m68k.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for architectures.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1997, 1998, 2000, 2001
+   Copyright 1990, 1991, 1992, 1993, 1994, 1997, 1998, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
@@ -28,19 +28,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 static const bfd_arch_info_type arch_info_struct[] =
   {
-    N(bfd_mach_m68000, "m68k:68000", false, &arch_info_struct[1]),
-    N(bfd_mach_m68008, "m68k:68008", false, &arch_info_struct[2]),
-    N(bfd_mach_m68010, "m68k:68010", false, &arch_info_struct[3]),
-    N(bfd_mach_m68020, "m68k:68020", false, &arch_info_struct[4]),
-    N(bfd_mach_m68030, "m68k:68030", false, &arch_info_struct[5]),
-    N(bfd_mach_m68040, "m68k:68040", false, &arch_info_struct[6]),
-    N(bfd_mach_cpu32,  "m68k:cpu32", false, &arch_info_struct[7]),
-    N(bfd_mach_mcf5200,"m68k:5200",  false, &arch_info_struct[8]),
-    N(bfd_mach_mcf5206e,"m68k:5206e",false, &arch_info_struct[9]),
-    N(bfd_mach_mcf5307, "m68k:5307", false, &arch_info_struct[10]),
-    N(bfd_mach_mcf5407, "m68k:5407", false, &arch_info_struct[11]),
-    N(bfd_mach_m68060, "m68k:68060", false, 0),
+    N(bfd_mach_m68000, "m68k:68000", FALSE, &arch_info_struct[1]),
+    N(bfd_mach_m68008, "m68k:68008", FALSE, &arch_info_struct[2]),
+    N(bfd_mach_m68010, "m68k:68010", FALSE, &arch_info_struct[3]),
+    N(bfd_mach_m68020, "m68k:68020", FALSE, &arch_info_struct[4]),
+    N(bfd_mach_m68030, "m68k:68030", FALSE, &arch_info_struct[5]),
+    N(bfd_mach_m68040, "m68k:68040", FALSE, &arch_info_struct[6]),
+    N(bfd_mach_cpu32,  "m68k:cpu32", FALSE, &arch_info_struct[7]),
+    N(bfd_mach_mcf5200,"m68k:5200",  FALSE, &arch_info_struct[8]),
+    N(bfd_mach_mcf5206e,"m68k:5206e",FALSE, &arch_info_struct[9]),
+    N(bfd_mach_mcf5307, "m68k:5307", FALSE, &arch_info_struct[10]),
+    N(bfd_mach_mcf5407, "m68k:5407", FALSE, &arch_info_struct[11]),
+    N(bfd_mach_m68060, "m68k:68060", FALSE, 0),
   };
 
 const bfd_arch_info_type bfd_m68k_arch =
-  N(0, "m68k", true, &arch_info_struct[0]);
+  N(0, "m68k", TRUE, &arch_info_struct[0]);
diff --git a/bfd/cpu-m88k.c b/bfd/cpu-m88k.c
index ec698ed2c25..6e0012d4fe6 100644
--- a/bfd/cpu-m88k.c
+++ b/bfd/cpu-m88k.c
@@ -1,5 +1,5 @@
 /* bfd back-end for m88k support
-   Copyright 1990, 1991, 1994, 2000 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1994, 2000, 2002 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_m88k_arch =
     "m88k",
     "m88k:88100",
     3,
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
     0,
diff --git a/bfd/cpu-mcore.c b/bfd/cpu-mcore.c
index 624f2723c29..f7a2389dce7 100644
--- a/bfd/cpu-mcore.c
+++ b/bfd/cpu-mcore.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for Motorola's MCore architecture
-   Copyright 1993, 1999 Free Software Foundation, Inc.
+   Copyright 1993, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_mcore_arch =
   "MCore",	  		/* Architecture name */
   "MCore",	  		/* Printable name */
   3,		  		/* Section align power */
-  true,		  		/* Is this the default architecture ? */
+  TRUE,		  		/* Is this the default architecture ? */
   bfd_default_compatible,	/* Architecture comparison function */
   bfd_default_scan,	   	/* String to architecture conversion */
   NULL			   	/* Next in list */
diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index 75e84c227c6..e587535e28b 100644
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -90,29 +90,29 @@ enum
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (32, 32, bfd_mach_mips3000, "mips:3000",      false, NN(I_mips3000)),
-  N (32, 32, bfd_mach_mips3900, "mips:3900",      false, NN(I_mips3900)),
-  N (64, 64, bfd_mach_mips4000, "mips:4000",      false, NN(I_mips4000)),
-  N (64, 64, bfd_mach_mips4010, "mips:4010",      false, NN(I_mips4010)),
-  N (64, 64, bfd_mach_mips4100, "mips:4100",      false, NN(I_mips4100)),
-  N (64, 64, bfd_mach_mips4111, "mips:4111",      false, NN(I_mips4111)),
-  N (64, 64, bfd_mach_mips4120, "mips:4120",      false, NN(I_mips4120)),
-  N (64, 64, bfd_mach_mips4300, "mips:4300",      false, NN(I_mips4300)),
-  N (64, 64, bfd_mach_mips4400, "mips:4400",      false, NN(I_mips4400)),
-  N (64, 64, bfd_mach_mips4600, "mips:4600",      false, NN(I_mips4600)),
-  N (64, 64, bfd_mach_mips4650, "mips:4650",      false, NN(I_mips4650)),
-  N (64, 64, bfd_mach_mips5000, "mips:5000",      false, NN(I_mips5000)),
-  N (64, 64, bfd_mach_mips5400, "mips:5400",      false, NN(I_mips5400)),
-  N (64, 64, bfd_mach_mips5500, "mips:5500",      false, NN(I_mips5500)),
-  N (32, 32, bfd_mach_mips6000, "mips:6000",      false, NN(I_mips6000)),
-  N (64, 64, bfd_mach_mips8000, "mips:8000",      false, NN(I_mips8000)),
-  N (64, 64, bfd_mach_mips10000,"mips:10000",     false, NN(I_mips10000)),
-  N (64, 64, bfd_mach_mips12000,"mips:12000",     false, NN(I_mips12000)),
-  N (64, 64, bfd_mach_mips16,   "mips:16",        false, NN(I_mips16)),
-  N (64, 64, bfd_mach_mips5,    "mips:mips5",     false, NN(I_mips5)),
-  N (32, 32, bfd_mach_mipsisa32,  "mips:isa32",   false, NN(I_mipsisa32)),
-  N (64, 64, bfd_mach_mipsisa64,  "mips:isa64",   false, NN(I_mipsisa64)),
-  N (64, 64, bfd_mach_mips_sb1, "mips:sb1",       false, 0),
+  N (32, 32, bfd_mach_mips3000, "mips:3000",      FALSE, NN(I_mips3000)),
+  N (32, 32, bfd_mach_mips3900, "mips:3900",      FALSE, NN(I_mips3900)),
+  N (64, 64, bfd_mach_mips4000, "mips:4000",      FALSE, NN(I_mips4000)),
+  N (64, 64, bfd_mach_mips4010, "mips:4010",      FALSE, NN(I_mips4010)),
+  N (64, 64, bfd_mach_mips4100, "mips:4100",      FALSE, NN(I_mips4100)),
+  N (64, 64, bfd_mach_mips4111, "mips:4111",      FALSE, NN(I_mips4111)),
+  N (64, 64, bfd_mach_mips4120, "mips:4120",      FALSE, NN(I_mips4120)),
+  N (64, 64, bfd_mach_mips4300, "mips:4300",      FALSE, NN(I_mips4300)),
+  N (64, 64, bfd_mach_mips4400, "mips:4400",      FALSE, NN(I_mips4400)),
+  N (64, 64, bfd_mach_mips4600, "mips:4600",      FALSE, NN(I_mips4600)),
+  N (64, 64, bfd_mach_mips4650, "mips:4650",      FALSE, NN(I_mips4650)),
+  N (64, 64, bfd_mach_mips5000, "mips:5000",      FALSE, NN(I_mips5000)),
+  N (64, 64, bfd_mach_mips5400, "mips:5400",      FALSE, NN(I_mips5400)),
+  N (64, 64, bfd_mach_mips5500, "mips:5500",      FALSE, NN(I_mips5500)),
+  N (32, 32, bfd_mach_mips6000, "mips:6000",      FALSE, NN(I_mips6000)),
+  N (64, 64, bfd_mach_mips8000, "mips:8000",      FALSE, NN(I_mips8000)),
+  N (64, 64, bfd_mach_mips10000,"mips:10000",     FALSE, NN(I_mips10000)),
+  N (64, 64, bfd_mach_mips12000,"mips:12000",     FALSE, NN(I_mips12000)),
+  N (64, 64, bfd_mach_mips16,   "mips:16",        FALSE, NN(I_mips16)),
+  N (64, 64, bfd_mach_mips5,    "mips:mips5",     FALSE, NN(I_mips5)),
+  N (32, 32, bfd_mach_mipsisa32,  "mips:isa32",   FALSE, NN(I_mipsisa32)),
+  N (64, 64, bfd_mach_mipsisa64,  "mips:isa64",   FALSE, NN(I_mipsisa64)),
+  N (64, 64, bfd_mach_mips_sb1, "mips:sb1",       FALSE, 0),
 };
 
 /* The default architecture is mips:3000, but with a machine number of
@@ -120,4 +120,4 @@ static const bfd_arch_info_type arch_info_struct[] =
    of mips, and an explicit setting of mips:3000.  */
 
 const bfd_arch_info_type bfd_mips_arch =
-N (32, 32, 0, "mips", true, &arch_info_struct[0]);
+N (32, 32, 0, "mips", TRUE, &arch_info_struct[0]);
diff --git a/bfd/cpu-mmix.c b/bfd/cpu-mmix.c
index a21473ce4d4..57b28c585bb 100644
--- a/bfd/cpu-mmix.c
+++ b/bfd/cpu-mmix.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for MMIX.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
    Contributed by Hans-Peter Nilsson (hp@bitrange.com)
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -34,7 +34,7 @@ bfd_mmix_arch =
    "mmix",			/* Architecture name.  */
    "mmix",			/* Printable name.  */
    3,				/* Section align power.  */
-   true,			/* This is the default architecture.  */
+   TRUE,			/* This is the default architecture.  */
    bfd_default_compatible,	/* Architecture comparison function.  */
    bfd_default_scan,		/* String to architecture conversion.  */
    NULL				/* Next in list.  */
diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c
index acc081a153c..1fe67d9ffce 100644
--- a/bfd/cpu-ns32k.c
+++ b/bfd/cpu-ns32k.c
@@ -30,11 +30,11 @@
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N(32532,"ns32k:32532",true, 0), /* The word ns32k will match this too.  */
+  N(32532,"ns32k:32532",TRUE, 0), /* The word ns32k will match this too.  */
 };
 
 const bfd_arch_info_type bfd_ns32k_arch =
-  N(32032,"ns32k:32032",false, &arch_info_struct[0]);
+  N(32032,"ns32k:32032",FALSE, &arch_info_struct[0]);
 
 static bfd_reloc_status_type do_ns32k_reloc
   PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR, asection *,
@@ -232,16 +232,16 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 	 of the location within the section.  Some targets arrange for
 	 the addend to be the negative of the position of the location
 	 within the section; for example, i386-aout does this.  For
-	 i386-aout, pcrel_offset is false.  Some other targets do not
+	 i386-aout, pcrel_offset is FALSE.  Some other targets do not
 	 include the position of the location; for example, m88kbcs,
-	 or ELF.  For those targets, pcrel_offset is true.
+	 or ELF.  For those targets, pcrel_offset is TRUE.
 
 	 If we are producing relocateable output, then we must ensure
 	 that this reloc will be correctly computed when the final
-	 relocation is done.  If pcrel_offset is false we want to wind
+	 relocation is done.  If pcrel_offset is FALSE we want to wind
 	 up with the negative of the location within the section,
 	 which means we must adjust the existing addend by the change
-	 in the location within the section.  If pcrel_offset is true
+	 in the location within the section.  If pcrel_offset is TRUE
 	 we do not want to adjust the existing addend at all.
 
 	 FIXME: This seems logical to me, but for the case of
@@ -594,7 +594,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
 {
   int size;
   bfd_vma x;
-  boolean overflow;
+  bfd_boolean overflow;
 
   /* If the size is negative, negate RELOCATION.  This isn't very
      general.  */
@@ -622,7 +622,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
      which we don't check for.  We must either check at every single
      operation, which would be tedious, or we must do the computations
      in a type larger than bfd_vma, which would be inefficient.  */
-  overflow = false;
+  overflow = FALSE;
   if (howto->complain_on_overflow != complain_overflow_dont)
     {
       bfd_vma check;
@@ -697,7 +697,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
 
 	    if (signed_check > reloc_signed_max
 		|| signed_check < reloc_signed_min)
-	      overflow = true;
+	      overflow = TRUE;
 	  }
 	  break;
 	case complain_overflow_unsigned:
@@ -709,7 +709,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
 	    (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
 
 	    if (check > reloc_unsigned_max)
-	      overflow = true;
+	      overflow = TRUE;
 	  }
 	  break;
 	case complain_overflow_bitfield:
@@ -722,7 +722,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
 	    if ((check & ~reloc_bits) != 0
 		&& (((bfd_vma) signed_check & ~reloc_bits)
 		    != (-(bfd_vma) 1 & ~reloc_bits)))
-	      overflow = true;
+	      overflow = TRUE;
 	  }
 	  break;
 	default:
@@ -818,9 +818,9 @@ _bfd_ns32k_final_link_relocate (howto, input_bfd, input_section, contents,
      location we are relocating.  Some targets (e.g., i386-aout)
      arrange for the contents of the section to be the negative of the
      offset of the location within the section; for such targets
-     pcrel_offset is false.  Other targets (e.g., m88kbcs or ELF)
+     pcrel_offset is FALSE.  Other targets (e.g., m88kbcs or ELF)
      simply leave the contents of the section as zero; for such
-     targets pcrel_offset is true.  If pcrel_offset is false we do not
+     targets pcrel_offset is TRUE.  If pcrel_offset is FALSE we do not
      need to subtract out the offset of the location within the
      section (which is just ADDRESS).  */
   if (howto->pc_relative)
diff --git a/bfd/cpu-openrisc.c b/bfd/cpu-openrisc.c
index ffd8e5e6caf..0ddd68c523c 100644
--- a/bfd/cpu-openrisc.c
+++ b/bfd/cpu-openrisc.c
@@ -1,5 +1,5 @@
 /* BFD support for the OpenRISC architecture.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
    Contributed by Johan Rydberg, jrydberg@opencores.org
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -39,4 +39,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   }
 
 const bfd_arch_info_type bfd_openrisc_arch =
-  N (32, 32, 0, "openrisc", true, 0);
+  N (32, 32, 0, "openrisc", TRUE, 0);
diff --git a/bfd/cpu-or32.c b/bfd/cpu-or32.c
index 8a523280c84..e2f1d05f288 100644
--- a/bfd/cpu-or32.c
+++ b/bfd/cpu-or32.c
@@ -32,8 +32,8 @@ const bfd_arch_info_type bfd_or32_arch =
     "or32",
     "or32",
     4,
-    true,         /* The one and only.  */
-    bfd_default_compatible, 
+    TRUE,         /* The one and only.  */
+    bfd_default_compatible,
     bfd_default_scan ,
     0,
   };
diff --git a/bfd/cpu-pdp11.c b/bfd/cpu-pdp11.c
index 13e0e90d0d6..1ad036ee1fc 100644
--- a/bfd/cpu-pdp11.c
+++ b/bfd/cpu-pdp11.c
@@ -1,5 +1,5 @@
 /* BFD back-end for PDP-11 support.
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_pdp11_arch =
     "pdp11",
     "pdp11",
     1,		/* aligment = 16 bit */
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
     0,
diff --git a/bfd/cpu-pj.c b/bfd/cpu-pj.c
index 8e58c89fbd7..a2a4cd476de 100644
--- a/bfd/cpu-pj.c
+++ b/bfd/cpu-pj.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the Pico Java architecture.
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Transmeta. sac@pobox.com
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_pj_arch =
   "pj",				/* arch_name  */
   "pj",				/* printable name */
   1,
-  true,				/* the default machine */
+  TRUE,				/* the default machine */
   bfd_default_compatible,
   bfd_default_scan,
   0
diff --git a/bfd/cpu-powerpc.c b/bfd/cpu-powerpc.c
index 017442571c8..20b49094198 100644
--- a/bfd/cpu-powerpc.c
+++ b/bfd/cpu-powerpc.c
@@ -61,7 +61,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:common64",
     3,
-    true, /* default for 64 bit target */
+    TRUE, /* default for 64 bit target */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[1]
@@ -77,7 +77,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:common",
     3,
-    false,
+    FALSE,
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[2],
@@ -93,7 +93,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:common",
     3,
-    true, /* default for 32 bit target */
+    TRUE, /* default for 32 bit target */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[1],
@@ -109,7 +109,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:common64",
     3,
-    false,
+    FALSE,
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[2]
@@ -124,7 +124,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:603",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[3]
@@ -138,7 +138,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:EC603e",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[4]
@@ -152,7 +152,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:604",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[5]
@@ -166,7 +166,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:403",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[6]
@@ -180,7 +180,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:601",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[7]
@@ -194,7 +194,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:620",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[8]
@@ -208,7 +208,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:630",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[9]
@@ -222,7 +222,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:a35",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[10]
@@ -236,7 +236,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:rs64ii",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[11]
@@ -250,7 +250,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:rs64iii",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[12]
@@ -264,7 +264,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:7400",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[13]
@@ -278,7 +278,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:e500",
     3,
-    false,
+    FALSE,
     powerpc_compatible,
     bfd_default_scan,
     &bfd_powerpc_archs[14]
@@ -292,7 +292,7 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     "powerpc",
     "powerpc:MPC8XX",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
     0
diff --git a/bfd/cpu-rs6000.c b/bfd/cpu-rs6000.c
index 777611e603a..63df554dca6 100644
--- a/bfd/cpu-rs6000.c
+++ b/bfd/cpu-rs6000.c
@@ -1,5 +1,6 @@
 /* BFD back-end for rs6000 support
-   Copyright 1990, 1991, 1993, 1995, 2000 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1993, 1995, 2000, 2002
+   Free Software Foundation, Inc.
    FIXME: Can someone provide a transliteration of this name into ASCII?
    Using the following chars caused a compiler warning on HIUX (so I replaced
    them with octal escapes), and isn't useful without an understanding of what
@@ -64,7 +65,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "rs6000",
     "rs6000:rs1",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     rs6000_compatible,
     bfd_default_scan,
     &arch_info_struct[1]
@@ -78,7 +79,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "rs6000",
     "rs6000:rsc",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     rs6000_compatible,
     bfd_default_scan,
     &arch_info_struct[2]
@@ -92,7 +93,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "rs6000",
     "rs6000:rs2",
     3,
-    false, /* not the default */
+    FALSE, /* not the default */
     rs6000_compatible,
     bfd_default_scan,
     0
@@ -109,7 +110,7 @@ const bfd_arch_info_type bfd_rs6000_arch =
     "rs6000",
     "rs6000:6000",
     3,
-    true, /* the default */
+    TRUE, /* the default */
     rs6000_compatible,
     bfd_default_scan,
     &arch_info_struct[0]
diff --git a/bfd/cpu-s390.c b/bfd/cpu-s390.c
index ac0d45e0c75..66fd2461f2e 100644
--- a/bfd/cpu-s390.c
+++ b/bfd/cpu-s390.c
@@ -33,7 +33,7 @@ const bfd_arch_info_type bfd_s390_64_arch =
     "s390",
     "s390:64-bit",
     3, /* section alignment power */
-    true, /* the default */
+    TRUE, /* the default */
     bfd_default_compatible,
     bfd_default_scan,
     NULL
@@ -49,7 +49,7 @@ const bfd_arch_info_type bfd_s390_arch =
     "s390",
     "s390:31-bit",
     3, /* section alignment power */
-    true, /* the default */
+    TRUE, /* the default */
     bfd_default_compatible,
     bfd_default_scan,
     &bfd_s390_64_arch
diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c
index dff2f88ebe1..3331c27cc38 100644
--- a/bfd/cpu-sh.c
+++ b/bfd/cpu-sh.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the Hitachi-SH architecture.
-   Copyright 1993, 1994, 1997, 1998, 2000, 2001
+   Copyright 1993, 1994, 1997, 1998, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
@@ -60,7 +60,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sh",			/* arch_name  */
     "sh2",			/* printable name */
     1,
-    false,			/* not the default */
+    FALSE,			/* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     SH2_NEXT
@@ -74,7 +74,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sh",			/* arch_name  */
     "sh-dsp",			/* printable name */
     1,
-    false,			/* not the default */
+    FALSE,			/* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     SH_DSP_NEXT
@@ -88,7 +88,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sh",			/* arch_name  */
     "sh3",			/* printable name */
     1,
-    false,			/* not the default */
+    FALSE,			/* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     SH3_NEXT
@@ -102,7 +102,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sh",			/* arch_name  */
     "sh3-dsp",			/* printable name */
     1,
-    false,			/* not the default */
+    FALSE,			/* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     SH3_DSP_NEXT
@@ -116,7 +116,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sh",			/* arch_name  */
     "sh3e",			/* printable name */
     1,
-    false,			/* not the default */
+    FALSE,			/* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     SH3E_NEXT
@@ -130,7 +130,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sh",			/* arch_name  */
     "sh4",			/* printable name */
     1,
-    false,			/* not the default */
+    FALSE,			/* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     SH4_NEXT
@@ -144,7 +144,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sh",			/* arch_name  */
     "sh5",			/* printable name */
     1,
-    false,			/* not the default */
+    FALSE,			/* not the default */
     bfd_default_compatible,
     bfd_default_scan,
     SH64_NEXT
@@ -161,7 +161,7 @@ const bfd_arch_info_type bfd_sh_arch =
   "sh",				/* arch_name  */
   "sh",				/* printable name */
   1,
-  true,				/* the default machine */
+  TRUE,				/* the default machine */
   bfd_default_compatible,
   bfd_default_scan,
   SH_NEXT
diff --git a/bfd/cpu-sparc.c b/bfd/cpu-sparc.c
index e3b8ecbbe22..3c0eae50fad 100644
--- a/bfd/cpu-sparc.c
+++ b/bfd/cpu-sparc.c
@@ -33,7 +33,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:sparclet",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[1],
@@ -47,7 +47,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:sparclite",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[2],
@@ -61,7 +61,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:v8plus",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[3],
@@ -75,7 +75,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:v8plusa",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[4],
@@ -89,7 +89,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:sparclite_le",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[5],
@@ -103,7 +103,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:v9",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[6],
@@ -117,7 +117,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:v9a",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[7],
@@ -131,7 +131,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:v8plusb",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[8],
@@ -145,7 +145,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     "sparc",
     "sparc:v9b",
     3,
-    false,
+    FALSE,
     bfd_default_compatible,
     bfd_default_scan,
     0,
@@ -162,7 +162,7 @@ const bfd_arch_info_type bfd_sparc_arch =
     "sparc",
     "sparc",
     3,
-    true, /* the default */
+    TRUE, /* the default */
     bfd_default_compatible,
     bfd_default_scan,
     &arch_info_struct[0],
diff --git a/bfd/cpu-tic30.c b/bfd/cpu-tic30.c
index dd723f7b4a5..71bfc0dd2f4 100644
--- a/bfd/cpu-tic30.c
+++ b/bfd/cpu-tic30.c
@@ -1,5 +1,5 @@
 /* BFD support for the Texas Instruments TMS320C30 architecture.
-   Copyright 1998 Free Software Foundation, Inc.
+   Copyright 1998, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_tic30_arch =
   "tic30",
   "tms320c30",
   2,
-  true,				/* the one and only */
+  TRUE,				/* the one and only */
   bfd_default_compatible,
   bfd_default_scan,
   0,
diff --git a/bfd/cpu-tic4x.c b/bfd/cpu-tic4x.c
index 75a8a240c38..2260f703343 100644
--- a/bfd/cpu-tic4x.c
+++ b/bfd/cpu-tic4x.c
@@ -1,5 +1,5 @@
 /* bfd back-end for TMS320C[34]x support
-   Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2002 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz)
 
@@ -23,11 +23,11 @@
 #include "sysdep.h"
 #include "libbfd.h"
 
-static boolean c4x_scan
+static bfd_boolean c4x_scan
     PARAMS ((const struct bfd_arch_info *, const char * ));
 
 
-static boolean
+static bfd_boolean
 c4x_scan (info, string)
      const struct bfd_arch_info *info;
      const char *string;
@@ -39,14 +39,14 @@ c4x_scan (info, string)
   if (*string == 'C' || *string == 'c')
     string++;
   if (string[1] < '0' && string[1] > '9')
-    return false;
+    return FALSE;
 
   if (*string == '3')
     return (info->mach == bfd_mach_c3x);
   else if (*string == '4')
     return info->mach == bfd_mach_c4x;
 
-  return false;
+  return FALSE;
 }
 
 
@@ -60,8 +60,8 @@ const bfd_arch_info_type bfd_tic3x_arch =
     "c3x",			/* Architecture name.  */
     "tms320c3x",		/* Printable name.  */
     0,				/* Alignment power.  */
-    false,			/* Not the default architecture.  */
-    bfd_default_compatible, 
+    FALSE,			/* Not the default architecture.  */
+    bfd_default_compatible,
     c4x_scan,
     0
   };
@@ -76,8 +76,8 @@ const bfd_arch_info_type bfd_tic4x_arch =
     "c4x",			/* Architecture name.  */
     "tms320c4x",		/* Printable name.  */
     0,				/* Alignment power.  */
-    true,			/* The default architecture.  */
-    bfd_default_compatible, 
+    TRUE,			/* The default architecture.  */
+    bfd_default_compatible,
     c4x_scan,
     &bfd_tic3x_arch,
   };
diff --git a/bfd/cpu-tic54x.c b/bfd/cpu-tic54x.c
index 12f5029f219..b6962aacc01 100644
--- a/bfd/cpu-tic54x.c
+++ b/bfd/cpu-tic54x.c
@@ -1,5 +1,5 @@
 /* BFD support for the Texas Instruments TMS320C54X architecture.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_tic54x_arch =
   "tic54x",
   "tms320c54x",
   1,
-  true,				/* the one and only */
+  TRUE,				/* the one and only */
   bfd_default_compatible,
   bfd_default_scan,
   0,
diff --git a/bfd/cpu-tic80.c b/bfd/cpu-tic80.c
index 8e7af21f883..487bcb154f8 100644
--- a/bfd/cpu-tic80.c
+++ b/bfd/cpu-tic80.c
@@ -1,5 +1,5 @@
 /* bfd back-end for TI TMS320C80 (MVP) support
-   Copyright 1996 Free Software Foundation, Inc.
+   Copyright 1996, 2002 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus support (fnf@cygnus.com)
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_tic80_arch =
     "tic80",			/* architecture name */
     "tic80",			/* printable name */
     2,				/* section alignment power */
-    true,			/* default machine for architecture */
+    TRUE,			/* default machine for architecture */
     bfd_default_compatible,
     bfd_default_scan ,
     NULL,				/* Pointer to next in chain */
diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c
index 38333c8c153..fe966567650 100644
--- a/bfd/cpu-v850.c
+++ b/bfd/cpu-v850.c
@@ -30,11 +30,11 @@
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (bfd_mach_v850e,  "v850e",  false, NULL)
+  N (bfd_mach_v850e,  "v850e",  FALSE, NULL)
 };
 
 #undef  NEXT
 #define NEXT & arch_info_struct[0]
 
 const bfd_arch_info_type bfd_v850_arch =
-  N (bfd_mach_v850, "v850", true, NEXT);
+  N (bfd_mach_v850, "v850", TRUE, NEXT);
diff --git a/bfd/cpu-vax.c b/bfd/cpu-vax.c
index 8449a63dc64..98f868c44f5 100644
--- a/bfd/cpu-vax.c
+++ b/bfd/cpu-vax.c
@@ -1,5 +1,5 @@
 /* bfd back-end for vax support
-   Copyright 1990, 1991, 1994, 2000 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1994, 2000, 2002 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_vax_arch =
     "vax",
     "vax",
     3,
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
     0,
diff --git a/bfd/cpu-w65.c b/bfd/cpu-w65.c
index a73444da69f..ed54687d4a2 100644
--- a/bfd/cpu-w65.c
+++ b/bfd/cpu-w65.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the WDC 65816 architecture.
-   Copyright 1995, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1995, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -22,17 +22,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static boolean scan_mach
+static bfd_boolean scan_mach
   PARAMS ((const struct bfd_arch_info *, const char *));
 
-static boolean
+static bfd_boolean
 scan_mach (info, string)
      const struct bfd_arch_info *info ATTRIBUTE_UNUSED;
      const char *string;
 {
-  if (strcmp(string,"w65") == 0) return true;
-  if (strcmp(string,"w65816") == 0) return true;
-  return false;
+  if (strcmp(string,"w65") == 0)
+    return TRUE;
+  if (strcmp(string,"w65816") == 0)
+    return TRUE;
+  return FALSE;
 }
 
 const bfd_arch_info_type bfd_w65_arch =
@@ -45,7 +47,7 @@ const bfd_arch_info_type bfd_w65_arch =
   "w65",			/* arch_name  */
   "w65",			/* printable name */
   1,
-  true,				/* the default machine */
+  TRUE,				/* the default machine */
   bfd_default_compatible,
   scan_mach,
   0,
diff --git a/bfd/cpu-we32k.c b/bfd/cpu-we32k.c
index dc87d0a95cc..09bf97ae34c 100644
--- a/bfd/cpu-we32k.c
+++ b/bfd/cpu-we32k.c
@@ -1,5 +1,5 @@
 /* bfd back-end for we32k support
-   Copyright 1992, 2000 Free Software Foundation, Inc.
+   Copyright 1992, 2000, 2002 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@cs.widener.edu).
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_we32k_arch =
     "we32k",
     "we32k:32000",
     3,
-    true, /* the one and only */
+    TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
     0,
diff --git a/bfd/cpu-xstormy16.c b/bfd/cpu-xstormy16.c
index 827e16b792a..776a4831fdd 100644
--- a/bfd/cpu-xstormy16.c
+++ b/bfd/cpu-xstormy16.c
@@ -1,5 +1,5 @@
 /* BFD support for the XSTORMY16 processor.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_xstormy16_arch =
   "xstormy16",			/* architecture name */
   "xstormy16",			/* printable name */
   2,				/* section align power */
-  true,				/* the default ? */
+  TRUE,				/* the default ? */
   bfd_default_compatible,	/* architecture comparison fn */
   bfd_default_scan,		/* string to architecture convert fn */
   NULL				/* next in list */
diff --git a/bfd/cpu-z8k.c b/bfd/cpu-z8k.c
index b75eaeafd54..60d82ef62aa 100644
--- a/bfd/cpu-z8k.c
+++ b/bfd/cpu-z8k.c
@@ -1,5 +1,6 @@
 /* BFD library support routines for the Z800n architecture.
-   Copyright 1992, 1993, 1994, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 2000, 2001, 2002
+   Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -120,15 +121,15 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
 }
 
 static reloc_howto_type howto_16
-= NEWHOWTO (howto16_callback, "abs16", 1, false, false);
+= NEWHOWTO (howto16_callback, "abs16", 1, FALSE, FALSE);
 static reloc_howto_type howto_8
-= NEWHOWTO (howto8_callback, "abs8", 0, false, false);
+= NEWHOWTO (howto8_callback, "abs8", 0, FALSE, FALSE);
 
 static reloc_howto_type howto_8_FFnn
-= NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, false, false);
+= NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, FALSE, FALSE);
 
 static reloc_howto_type howto_8_pcrel
-= NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, false, true);
+= NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, FALSE, TRUE);
 
 static reloc_howto_type *
 local_bfd_reloc_type_lookup (arch, code)
@@ -166,12 +167,12 @@ compatible (a, b)
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  { 32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, false,
+  { 32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, FALSE,
     compatible, bfd_default_scan, 0 }
 };
 
 const bfd_arch_info_type bfd_z8k_arch =
 {
-  32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, true,
+  32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, TRUE,
   compatible, bfd_default_scan, &arch_info_struct[0]
 };
diff --git a/bfd/dwarf1.c b/bfd/dwarf1.c
index 65319861a1c..1047ebfc2e9 100644
--- a/bfd/dwarf1.c
+++ b/bfd/dwarf1.c
@@ -1,5 +1,5 @@
 /* DWARF 1 find nearest line (_bfd_dwarf1_find_nearest_line).
-   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 Written by Gavin Romig-Koch of Cygnus Solutions (gavin@cygnus.com).
 
@@ -126,15 +126,17 @@ struct linenumber {
 /* Find the form of an attr, from the attr field.  */
 #define FORM_FROM_ATTR(attr)	((attr) & 0xF)	/* Implicitly specified */
 
-static struct dwarf1_unit *alloc_dwarf1_unit PARAMS ((struct dwarf1_debug *));
+static struct dwarf1_unit *alloc_dwarf1_unit
+  PARAMS ((struct dwarf1_debug *));
 static struct dwarf1_func *alloc_dwarf1_func
   PARAMS ((struct dwarf1_debug *, struct dwarf1_unit *));
-static boolean parse_die PARAMS ((bfd *, struct die_info *, char *, char *));
-static boolean parse_line_table
+static bfd_boolean parse_die
+  PARAMS ((bfd *, struct die_info *, char *, char *));
+static bfd_boolean parse_line_table
   PARAMS ((struct dwarf1_debug *, struct dwarf1_unit *));
-static boolean parse_functions_in_unit
+static bfd_boolean parse_functions_in_unit
   PARAMS ((struct dwarf1_debug *, struct dwarf1_unit *));
-static boolean dwarf1_unit_find_nearest_line
+static bfd_boolean dwarf1_unit_find_nearest_line
   PARAMS ((struct dwarf1_debug *, struct dwarf1_unit *, unsigned long,
 	   const char **, const char **, unsigned int *));
 
@@ -176,9 +178,9 @@ alloc_dwarf1_func (stash, aUnit)
    'abfd' must be the bfd from which the section that 'aDiePtr'
    points to was pulled from.
 
-   Return false if the die is invalidly formatted; true otherwise.  */
+   Return FALSE if the die is invalidly formatted; TRUE otherwise.  */
 
-static boolean
+static bfd_boolean
 parse_die (abfd, aDieInfo, aDiePtr, aDiePtrEnd)
      bfd* abfd;
      struct die_info* aDieInfo;
@@ -195,12 +197,12 @@ parse_die (abfd, aDieInfo, aDiePtr, aDiePtrEnd)
   xptr += 4;
   if (aDieInfo->length == 0
       || (this_die + aDieInfo->length) >= aDiePtrEnd)
-    return false;
+    return FALSE;
   if (aDieInfo->length < 6)
     {
       /* Just padding bytes.  */
       aDieInfo->tag = TAG_padding;
-      return true;
+      return TRUE;
     }
 
   /* Then the tag.  */
@@ -259,14 +261,14 @@ parse_die (abfd, aDieInfo, aDiePtr, aDiePtrEnd)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Parse a dwarf1 line number table for 'aUnit->stmt_list_offset'
-   into 'aUnit->linenumber_table'.  Return false if an error
-   occurs; true otherwise.  */
+   into 'aUnit->linenumber_table'.  Return FALSE if an error
+   occurs; TRUE otherwise.  */
 
-static boolean
+static bfd_boolean
 parse_line_table (stash, aUnit)
   struct dwarf1_debug* stash;
   struct dwarf1_unit* aUnit;
@@ -281,19 +283,19 @@ parse_line_table (stash, aUnit)
 
       msec = bfd_get_section_by_name (stash->abfd, ".line");
       if (! msec)
-	return false;
+	return FALSE;
 
       size = bfd_get_section_size_before_reloc (msec);
       stash->line_section = (char *) bfd_alloc (stash->abfd, size);
 
       if (! stash->line_section)
-	return false;
+	return FALSE;
 
       if (! bfd_get_section_contents (stash->abfd, msec, stash->line_section,
 				      (bfd_vma) 0, size))
 	{
 	  stash->line_section = 0;
-	  return false;
+	  return FALSE;
 	}
 
       stash->line_section_end = stash->line_section + size;
@@ -341,15 +343,15 @@ parse_line_table (stash, aUnit)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Parse each function die in a compilation unit 'aUnit'.
    The first child die of 'aUnit' should be in 'aUnit->first_child',
    the result is placed in 'aUnit->func_list'.
-   Return false if error; true otherwise.  */
+   Return FALSE if error; TRUE otherwise.  */
 
-static boolean
+static bfd_boolean
 parse_functions_in_unit (stash, aUnit)
      struct dwarf1_debug* stash;
      struct dwarf1_unit* aUnit;
@@ -365,7 +367,7 @@ parse_functions_in_unit (stash, aUnit)
 
 	if (! parse_die (stash->abfd, &eachDieInfo, eachDie,
 			 stash->debug_section_end))
-	  return false;
+	  return FALSE;
 
 	if (eachDieInfo.tag == TAG_global_subroutine
 	    || eachDieInfo.tag == TAG_subroutine
@@ -386,13 +388,13 @@ parse_functions_in_unit (stash, aUnit)
 	  break;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Find the nearest line to 'addr' in 'aUnit'.
    Return whether we found the line (or a function) without error.  */
 
-static boolean
+static bfd_boolean
 dwarf1_unit_find_nearest_line (stash, aUnit, addr,
 		       filename_ptr, functionname_ptr,
 		       linenumber_ptr)
@@ -403,8 +405,8 @@ dwarf1_unit_find_nearest_line (stash, aUnit, addr,
   const char **functionname_ptr;
   unsigned int *linenumber_ptr;
 {
-  int line_p = false;
-  int func_p = false;
+  int line_p = FALSE;
+  int func_p = FALSE;
 
   if (aUnit->low_pc <= addr && addr < aUnit->high_pc)
     {
@@ -416,13 +418,13 @@ dwarf1_unit_find_nearest_line (stash, aUnit, addr,
 	  if (! aUnit->linenumber_table)
 	    {
 	      if (! parse_line_table (stash, aUnit))
-		return false;
+		return FALSE;
 	    }
 
 	  if (! aUnit->func_list)
 	    {
 	      if (! parse_functions_in_unit (stash, aUnit))
-		return false;
+		return FALSE;
 	    }
 
 	  for (i = 0; i < aUnit->line_count; i++)
@@ -432,7 +434,7 @@ dwarf1_unit_find_nearest_line (stash, aUnit, addr,
 		{
 		  *filename_ptr = aUnit->name;
 		  *linenumber_ptr = aUnit->linenumber_table[i].linenumber;
-		  line_p = true;
+		  line_p = TRUE;
 		  break;
 		}
 	    }
@@ -445,7 +447,7 @@ dwarf1_unit_find_nearest_line (stash, aUnit, addr,
 		  && addr < eachFunc->high_pc)
 		{
 		  *functionname_ptr = eachFunc->name;
-		  func_p = true;
+		  func_p = TRUE;
 		  break;
 		}
 	    }
@@ -456,9 +458,9 @@ dwarf1_unit_find_nearest_line (stash, aUnit, addr,
 }
 
 /* The DWARF 1 version of find_nearest line.
-   Return true if the line is found without error.  */
+   Return TRUE if the line is found without error.  */
 
-boolean
+bfd_boolean
 _bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
                               filename_ptr, functionname_ptr, linenumber_ptr)
      bfd *abfd;
@@ -489,7 +491,7 @@ _bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
 	= (struct dwarf1_debug *) bfd_zalloc (abfd, size);
 
       if (! stash)
-	return false;
+	return FALSE;
 
       msec = bfd_get_section_by_name (abfd, ".debug");
       if (! msec)
@@ -497,20 +499,20 @@ _bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
 	  /* No dwarf1 info.  Note that at this point the stash
 	     has been allocated, but contains zeros, this lets
 	     future calls to this function fail quicker.  */
-	  return false;
+	  return FALSE;
 	}
 
       size = bfd_get_section_size_before_reloc (msec);
       stash->debug_section = (char *) bfd_alloc (abfd, size);
 
       if (! stash->debug_section)
-	return false;
+	return FALSE;
 
       if (! bfd_get_section_contents (abfd, msec, stash->debug_section,
 				      (bfd_vma) 0, size))
 	{
 	  stash->debug_section = 0;
-	  return false;
+	  return FALSE;
 	}
 
       stash->debug_section_end = stash->debug_section + size;
@@ -522,7 +524,7 @@ _bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
      or that an error occured while setting up the stash.  */
 
   if (! stash->debug_section)
-    return false;
+    return FALSE;
 
   /* Look at the previously parsed units to see if any contain
      the addr.  */
@@ -541,7 +543,7 @@ _bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
 
       if (! parse_die (stash->abfd, &aDieInfo, stash->currentDie,
 		       stash->debug_section_end))
-	return false;
+	return FALSE;
 
       if (aDieInfo.tag == TAG_compile_unit)
 	{
@@ -578,7 +580,7 @@ _bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
 	stash->currentDie += aDieInfo.length;
     }
 
-  return false;
+  return FALSE;
 }
 
 /* EOF */
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 063982662bc..bdf7f3f230c 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -157,7 +157,7 @@ struct comp_unit
   /* The DW_AT_comp_dir attribute.  */
   char* comp_dir;
 
-  /* True if there is a line number table associated with this comp. unit.  */
+  /* TRUE if there is a line number table associated with this comp. unit.  */
   int stmtlist;
 
   /* The offset into .debug_line of the line number table.  */
@@ -239,19 +239,19 @@ static char *concat_filename PARAMS ((struct line_info_table *, unsigned int));
 static void arange_add PARAMS ((struct comp_unit *, bfd_vma, bfd_vma));
 static struct line_info_table *decode_line_info
   PARAMS ((struct comp_unit *, struct dwarf2_debug *));
-static boolean lookup_address_in_line_info_table
+static bfd_boolean lookup_address_in_line_info_table
   PARAMS ((struct line_info_table *, bfd_vma, struct funcinfo *,
 	   const char **, unsigned int *));
-static boolean lookup_address_in_function_table
+static bfd_boolean lookup_address_in_function_table
   PARAMS ((struct funcinfo *, bfd_vma, struct funcinfo **, const char **));
-static boolean scan_unit_for_functions PARAMS ((struct comp_unit *));
+static bfd_boolean scan_unit_for_functions PARAMS ((struct comp_unit *));
 static bfd_vma find_rela_addend
   PARAMS ((bfd *, asection *, bfd_size_type, asymbol**));
 static struct comp_unit *parse_comp_unit
   PARAMS ((bfd *, struct dwarf2_debug *, bfd_vma, unsigned int));
-static boolean comp_unit_contains_address
+static bfd_boolean comp_unit_contains_address
   PARAMS ((struct comp_unit *, bfd_vma));
-static boolean comp_unit_find_nearest_line
+static bfd_boolean comp_unit_find_nearest_line
   PARAMS ((struct comp_unit *, bfd_vma, const char **, const char **,
 	   unsigned int *, struct dwarf2_debug *));
 static asection *find_debug_info PARAMS ((bfd *, asection *));
@@ -1310,11 +1310,11 @@ decode_line_info (unit, stash)
   return table;
 }
 
-/* If ADDR is within TABLE set the output parameters and return true,
-   otherwise return false.  The output parameters, FILENAME_PTR and
+/* If ADDR is within TABLE set the output parameters and return TRUE,
+   otherwise return FALSE.  The output parameters, FILENAME_PTR and
    LINENUMBER_PTR, are pointers to the objects to be filled in.  */
 
-static boolean
+static bfd_boolean
 lookup_address_in_line_info_table (table, addr, function, filename_ptr,
 				   linenumber_ptr)
      struct line_info_table* table;
@@ -1329,7 +1329,7 @@ lookup_address_in_line_info_table (table, addr, function, filename_ptr,
   *filename_ptr = NULL;
 
   if (!next_line)
-    return false;
+    return FALSE;
 
   each_line = next_line->prev_line;
 
@@ -1343,10 +1343,10 @@ lookup_address_in_line_info_table (table, addr, function, filename_ptr,
       /* If we have an address match, save this info.  This allows us
 	 to return as good as results as possible for strange debugging
 	 info.  */
-      boolean addr_match = false;
+      bfd_boolean addr_match = FALSE;
       if (each_line->address <= addr && addr <= next_line->address)
 	{
-	  addr_match = true;
+	  addr_match = TRUE;
 
 	  /* If this line appears to span functions, and addr is in the
 	     later function, return the first line of that function instead
@@ -1367,7 +1367,7 @@ lookup_address_in_line_info_table (table, addr, function, filename_ptr,
 	}
 
       if (addr_match && !each_line->end_sequence)
-	return true; /* we have definitely found what we want */
+	return TRUE; /* we have definitely found what we want */
 
       next_line = each_line;
       each_line = each_line->prev_line;
@@ -1383,17 +1383,17 @@ lookup_address_in_line_info_table (table, addr, function, filename_ptr,
     {
       *filename_ptr = next_line->filename;
       *linenumber_ptr = next_line->line;
-      return true;
+      return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
 
 /* Function table functions.  */
 
-/* If ADDR is within TABLE, set FUNCTIONNAME_PTR, and return true.  */
+/* If ADDR is within TABLE, set FUNCTIONNAME_PTR, and return TRUE.  */
 
-static boolean
+static bfd_boolean
 lookup_address_in_function_table (table, addr, function_ptr,
 				  functionname_ptr)
      struct funcinfo* table;
@@ -1411,11 +1411,11 @@ lookup_address_in_function_table (table, addr, function_ptr,
 	{
 	  *functionname_ptr = each_func->name;
 	  *function_ptr = each_func;
-	  return true;
+	  return TRUE;
 	}
     }
 
-  return false;
+  return FALSE;
 }
 
 /* DWARF2 Compilation unit functions.  */
@@ -1423,7 +1423,7 @@ lookup_address_in_function_table (table, addr, function_ptr,
 /* Scan over each die in a comp. unit looking for functions to add
    to the function table.  */
 
-static boolean
+static bfd_boolean
 scan_unit_for_functions (unit)
      struct comp_unit *unit;
 {
@@ -1454,7 +1454,7 @@ scan_unit_for_functions (unit)
 	  (*_bfd_error_handler) (_("Dwarf Error: Could not find abbrev number %u."),
 			     abbrev_number);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       if (abbrev->tag == DW_TAG_subprogram)
@@ -1518,7 +1518,7 @@ scan_unit_for_functions (unit)
 	nesting_level++;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Look for a RELA relocation to be applied on OFFSET of section SEC,
@@ -1727,9 +1727,9 @@ parse_comp_unit (abfd, stash, unit_length, offset_size)
   return unit;
 }
 
-/* Return true if UNIT contains the address given by ADDR.  */
+/* Return TRUE if UNIT contains the address given by ADDR.  */
 
-static boolean
+static bfd_boolean
 comp_unit_contains_address (unit, addr)
      struct comp_unit* unit;
      bfd_vma addr;
@@ -1737,18 +1737,18 @@ comp_unit_contains_address (unit, addr)
   struct arange *arange;
 
   if (unit->error)
-    return false;
+    return FALSE;
 
   arange = &unit->arange;
   do
     {
       if (addr >= arange->low && addr < arange->high)
-	return true;
+	return TRUE;
       arange = arange->next;
     }
   while (arange);
 
-  return false;
+  return FALSE;
 }
 
 /* If UNIT contains ADDR, set the output parameters to the values for
@@ -1756,10 +1756,10 @@ comp_unit_contains_address (unit, addr)
    FUNCTIONNAME_PTR, and LINENUMBER_PTR, are pointers to the objects
    to be filled in.
 
-   Return true of UNIT contains ADDR, and no errors were encountered;
-   false otherwise.  */
+   Return TRUE of UNIT contains ADDR, and no errors were encountered;
+   FALSE otherwise.  */
 
-static boolean
+static bfd_boolean
 comp_unit_find_nearest_line (unit, addr, filename_ptr, functionname_ptr,
 			     linenumber_ptr, stash)
      struct comp_unit* unit;
@@ -1769,19 +1769,19 @@ comp_unit_find_nearest_line (unit, addr, filename_ptr, functionname_ptr,
      unsigned int *linenumber_ptr;
      struct dwarf2_debug *stash;
 {
-  boolean line_p;
-  boolean func_p;
+  bfd_boolean line_p;
+  bfd_boolean func_p;
   struct funcinfo *function;
 
   if (unit->error)
-    return false;
+    return FALSE;
 
   if (! unit->line_table)
     {
       if (! unit->stmtlist)
 	{
 	  unit->error = 1;
-	  return false;
+	  return FALSE;
 	}
 
       unit->line_table = decode_line_info (unit, stash);
@@ -1789,14 +1789,14 @@ comp_unit_find_nearest_line (unit, addr, filename_ptr, functionname_ptr,
       if (! unit->line_table)
 	{
 	  unit->error = 1;
-	  return false;
+	  return FALSE;
 	}
 
       if (unit->first_child_die_ptr < unit->end_ptr
 	  && ! scan_unit_for_functions (unit))
 	{
 	  unit->error = 1;
-	  return false;
+	  return FALSE;
 	}
     }
 
@@ -1806,7 +1806,7 @@ comp_unit_find_nearest_line (unit, addr, filename_ptr, functionname_ptr,
   line_p = lookup_address_in_line_info_table (unit->line_table, addr,
 					      function, filename_ptr,
 					      linenumber_ptr);
-  return (boolean) (line_p || func_p);
+  return line_p || func_p;
 }
 
 /* Locate a section in a BFD containing debugging info.  The search starts
@@ -1847,13 +1847,13 @@ find_debug_info (abfd, after_sec)
   return NULL;
 }
 
-/* The DWARF2 version of find_nearest line.  Return true if the line
+/* The DWARF2 version of find_nearest line.  Return TRUE if the line
    is found without error.  ADDR_SIZE is the number of bytes in the
    initial .debug_info length field and in the abbreviation offset.
    You may use zero to indicate that the default value should be
    used.  */
 
-boolean
+bfd_boolean
 _bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 			       filename_ptr, functionname_ptr,
 			       linenumber_ptr, addr_size, pinfo)
@@ -1901,7 +1901,7 @@ _bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 
       stash = (struct dwarf2_debug*) bfd_zalloc (abfd, amt);
       if (! stash)
-	return false;
+	return FALSE;
 
       *pinfo = (PTR) stash;
 
@@ -1910,7 +1910,7 @@ _bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 	/* No dwarf2 info.  Note that at this point the stash
 	   has been allocated, but contains zeros, this lets
 	   future calls to this function fail quicker.  */
-	 return false;
+	 return FALSE;
 
       /* There can be more than one DWARF2 info section in a BFD these days.
 	 Read them all in and produce one large stash.  We do this in two
@@ -1922,7 +1922,7 @@ _bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 
       stash->info_ptr = (char *) bfd_alloc (abfd, total_size);
       if (stash->info_ptr == NULL)
-	return false;
+	return FALSE;
 
       stash->info_ptr_end = stash->info_ptr;
 
@@ -1971,7 +1971,7 @@ _bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
   /* A null info_ptr indicates that there is no dwarf2 info
      (or that an error occured while setting up the stash).  */
   if (! stash->info_ptr)
-    return false;
+    return FALSE;
 
   /* Check the previously read comp. units first.  */
   for (each = stash->all_comp_units; each; each = each->next_unit)
@@ -1984,7 +1984,7 @@ _bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
   while (stash->info_ptr < stash->info_ptr_end)
     {
       bfd_vma length;
-      boolean found;
+      bfd_boolean found;
       unsigned int offset_size = addr_size;
 
       if (addr_size == 4)
@@ -2047,11 +2047,11 @@ _bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 						       linenumber_ptr,
 						       stash);
 		  if (found)
-		    return true;
+		    return TRUE;
 		}
 	    }
 	}
     }
 
-  return false;
+  return FALSE;
 }
diff --git a/bfd/ecoff.c b/bfd/ecoff.c
index 4f129f602f6..752752f3e68 100644
--- a/bfd/ecoff.c
+++ b/bfd/ecoff.c
@@ -46,19 +46,32 @@
 
 /* Prototypes for static functions.  */
 
-static int ecoff_get_magic PARAMS ((bfd *));
-static long ecoff_sec_to_styp_flags PARAMS ((const char *, flagword));
-static boolean ecoff_slurp_symbolic_header PARAMS ((bfd *));
-static boolean ecoff_set_symbol_info PARAMS ((bfd *, SYMR *, asymbol *, int, int));
-static void ecoff_emit_aggregate PARAMS ((bfd *, FDR *, char *, RNDXR *, long, const char *));
-static char *ecoff_type_to_string PARAMS ((bfd *, FDR *, unsigned int));
-static boolean ecoff_slurp_reloc_table PARAMS ((bfd *, asection *, asymbol **));
-static int ecoff_sort_hdrs PARAMS ((const PTR, const PTR));
-static boolean ecoff_compute_section_file_positions PARAMS ((bfd *));
-static bfd_size_type ecoff_compute_reloc_file_positions PARAMS ((bfd *));
-static boolean ecoff_get_extr PARAMS ((asymbol *, EXTR *));
-static void ecoff_set_index PARAMS ((asymbol *, bfd_size_type));
-static unsigned int ecoff_armap_hash PARAMS ((const char *, unsigned int *, unsigned int, unsigned int));
+static int ecoff_get_magic
+  PARAMS ((bfd *));
+static long ecoff_sec_to_styp_flags
+  PARAMS ((const char *, flagword));
+static bfd_boolean ecoff_slurp_symbolic_header
+  PARAMS ((bfd *));
+static bfd_boolean ecoff_set_symbol_info
+  PARAMS ((bfd *, SYMR *, asymbol *, int, int));
+static void ecoff_emit_aggregate
+  PARAMS ((bfd *, FDR *, char *, RNDXR *, long, const char *));
+static char *ecoff_type_to_string
+  PARAMS ((bfd *, FDR *, unsigned int));
+static bfd_boolean ecoff_slurp_reloc_table
+  PARAMS ((bfd *, asection *, asymbol **));
+static int ecoff_sort_hdrs
+  PARAMS ((const PTR, const PTR));
+static bfd_boolean ecoff_compute_section_file_positions
+  PARAMS ((bfd *));
+static bfd_size_type ecoff_compute_reloc_file_positions
+  PARAMS ((bfd *));
+static bfd_boolean ecoff_get_extr
+  PARAMS ((asymbol *, EXTR *));
+static void ecoff_set_index
+  PARAMS ((asymbol *, bfd_size_type));
+static unsigned int ecoff_armap_hash
+  PARAMS ((const char *, unsigned int *, unsigned int, unsigned int));
 
 /* This stuff is somewhat copied from coffcode.h.  */
 
@@ -90,7 +103,7 @@ static asection bfd_debug_section =
 
 /* Create an ECOFF object.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_mkobject (abfd)
      bfd *abfd;
 {
@@ -98,9 +111,9 @@ _bfd_ecoff_mkobject (abfd)
 
   abfd->tdata.ecoff_obj_data = (struct ecoff_tdata *) bfd_zalloc (abfd, amt);
   if (abfd->tdata.ecoff_obj_data == NULL)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* This is a hook called by coff_real_object_p to create any backend
@@ -151,7 +164,7 @@ _bfd_ecoff_mkobject_hook (abfd, filehdr, aouthdr)
 
 /* Initialize a new section.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_new_section_hook (abfd, section)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section;
@@ -182,7 +195,7 @@ _bfd_ecoff_new_section_hook (abfd, section)
      uncertain about .init on some systems and I don't know how shared
      libraries work.  */
 
-  return true;
+  return TRUE;
 }
 
 /* Determine the machine architecture and type.  This is called from
@@ -190,7 +203,7 @@ _bfd_ecoff_new_section_hook (abfd, section)
    below.  This could be an ECOFF backend routine, with one version
    for each target, but there aren't all that many ECOFF targets.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_set_arch_mach_hook (abfd, filehdr)
      bfd *abfd;
      PTR filehdr;
@@ -360,7 +373,7 @@ ecoff_sec_to_styp_flags (name, flags)
 
 /* Get the BFD flags to use for a section.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR hdr;
@@ -425,12 +438,12 @@ _bfd_ecoff_styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
     sec_flags |= SEC_ALLOC | SEC_LOAD;
 
   * flags_ptr = sec_flags;
-  return true;
+  return TRUE;
 }
 
 /* Read in the symbolic header for an ECOFF object file.  */
 
-static boolean
+static bfd_boolean
 ecoff_slurp_symbolic_header (abfd)
      bfd *abfd;
 {
@@ -442,13 +455,13 @@ ecoff_slurp_symbolic_header (abfd)
   /* See if we've already read it in.  */
   if (ecoff_data (abfd)->debug_info.symbolic_header.magic ==
       backend->debug_swap.sym_magic)
-    return true;
+    return TRUE;
 
   /* See whether there is a symbolic header.  */
   if (ecoff_data (abfd)->sym_filepos == 0)
     {
       bfd_get_symcount (abfd) = 0;
-      return true;
+      return TRUE;
     }
 
   /* At this point bfd_get_symcount (abfd) holds the number of symbols
@@ -459,7 +472,7 @@ ecoff_slurp_symbolic_header (abfd)
   if (bfd_get_symcount (abfd) != external_hdr_size)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   /* Read the symbolic information header.  */
@@ -485,18 +498,18 @@ ecoff_slurp_symbolic_header (abfd)
 
   if (raw != NULL)
     free (raw);
-  return true;
+  return TRUE;
  error_return:
   if (raw != NULL)
     free (raw);
-  return false;
+  return FALSE;
 }
 
 /* Read in and swap the important symbolic information for an ECOFF
    object file.  This is called by gdb via the read_debug_info entry
    point in the backend structure.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_slurp_symbolic_info (abfd, ignore, debug)
      bfd *abfd;
      asection *ignore ATTRIBUTE_UNUSED;
@@ -521,15 +534,15 @@ _bfd_ecoff_slurp_symbolic_info (abfd, ignore, debug)
   /* Check whether we've already gotten it, and whether there's any to
      get.  */
   if (ecoff_data (abfd)->raw_syments != (PTR) NULL)
-    return true;
+    return TRUE;
   if (ecoff_data (abfd)->sym_filepos == 0)
     {
       bfd_get_symcount (abfd) = 0;
-      return true;
+      return TRUE;
     }
 
   if (! ecoff_slurp_symbolic_header (abfd))
-    return false;
+    return FALSE;
 
   internal_symhdr = &debug->symbolic_header;
 
@@ -569,11 +582,11 @@ _bfd_ecoff_slurp_symbolic_info (abfd, ignore, debug)
   if (raw_size == 0)
     {
       ecoff_data (abfd)->sym_filepos = 0;
-      return true;
+      return TRUE;
     }
   raw = (PTR) bfd_alloc (abfd, raw_size);
   if (raw == NULL)
-    return false;
+    return FALSE;
 
   pos = ecoff_data (abfd)->sym_filepos;
   pos += backend->debug_swap.external_hdr_size;
@@ -581,7 +594,7 @@ _bfd_ecoff_slurp_symbolic_info (abfd, ignore, debug)
       || bfd_bread (raw, raw_size, abfd) != raw_size)
     {
       bfd_release (abfd, raw);
-      return false;
+      return FALSE;
     }
 
   ecoff_data (abfd)->raw_syments = raw;
@@ -620,7 +633,7 @@ _bfd_ecoff_slurp_symbolic_info (abfd, ignore, debug)
   amt *= sizeof (struct fdr);
   debug->fdr = (struct fdr *) bfd_alloc (abfd, amt);
   if (debug->fdr == NULL)
-    return false;
+    return FALSE;
   external_fdr_size = backend->debug_swap.external_fdr_size;
   fdr_ptr = debug->fdr;
   fraw_src = (char *) debug->external_fdr;
@@ -628,7 +641,7 @@ _bfd_ecoff_slurp_symbolic_info (abfd, ignore, debug)
   for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
     (*backend->debug_swap.swap_fdr_in) (abfd, (PTR) fraw_src, fdr_ptr);
 
-  return true;
+  return TRUE;
 }
 
 /* ECOFF symbol table routines.  The ECOFF symbol table is described
@@ -657,7 +670,7 @@ _bfd_ecoff_make_empty_symbol (abfd)
     return (asymbol *) NULL;
   new->symbol.section = (asection *) NULL;
   new->fdr = (FDR *) NULL;
-  new->local = false;
+  new->local = FALSE;
   new->native = NULL;
   new->symbol.the_bfd = abfd;
   return &new->symbol;
@@ -665,7 +678,7 @@ _bfd_ecoff_make_empty_symbol (abfd)
 
 /* Set the BFD flags and section for an ECOFF symbol.  */
 
-static boolean
+static bfd_boolean
 ecoff_set_symbol_info (abfd, ecoff_sym, asym, ext, weak)
      bfd *abfd;
      SYMR *ecoff_sym;
@@ -691,12 +704,12 @@ ecoff_set_symbol_info (abfd, ecoff_sym, asym, ext, weak)
       if (ECOFF_IS_STAB (ecoff_sym))
 	{
 	  asym->flags = BSF_DEBUGGING;
-	  return true;
+	  return TRUE;
 	}
       break;
     default:
       asym->flags = BSF_DEBUGGING;
-      return true;
+      return TRUE;
     }
 
   if (weak)
@@ -877,7 +890,7 @@ ecoff_set_symbol_info (abfd, ecoff_sym, asym, ext, weak)
 		amt = strlen (name) + 1;
 		copy = (char *) bfd_alloc (abfd, amt);
 		if (!copy)
-		  return false;
+		  return FALSE;
 		strcpy (copy, name);
 		section = bfd_make_section (abfd, copy);
 	      }
@@ -886,7 +899,7 @@ ecoff_set_symbol_info (abfd, ecoff_sym, asym, ext, weak)
 	    amt = sizeof (arelent_chain);
 	    reloc_chain = (arelent_chain *) bfd_alloc (abfd, amt);
 	    if (!reloc_chain)
-	      return false;
+	      return FALSE;
 	    reloc_chain->relent.sym_ptr_ptr =
 	      bfd_get_section (asym)->symbol_ptr_ptr;
 	    reloc_chain->relent.address = section->_raw_size;
@@ -919,12 +932,12 @@ ecoff_set_symbol_info (abfd, ecoff_sym, asym, ext, weak)
 	  break;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Read an ECOFF symbol table.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_slurp_symbol_table (abfd)
      bfd *abfd;
 {
@@ -947,20 +960,20 @@ _bfd_ecoff_slurp_symbol_table (abfd)
 
   /* If we've already read in the symbol table, do nothing.  */
   if (ecoff_data (abfd)->canonical_symbols != NULL)
-    return true;
+    return TRUE;
 
   /* Get the symbolic information.  */
   if (! _bfd_ecoff_slurp_symbolic_info (abfd, (asection *) NULL,
 					&ecoff_data (abfd)->debug_info))
-    return false;
+    return FALSE;
   if (bfd_get_symcount (abfd) == 0)
-    return true;
+    return TRUE;
 
   internal_size = bfd_get_symcount (abfd);
   internal_size *= sizeof (ecoff_symbol_type);
   internal = (ecoff_symbol_type *) bfd_alloc (abfd, internal_size);
   if (internal == NULL)
-    return false;
+    return FALSE;
 
   internal_ptr = internal;
   eraw_src = (char *) ecoff_data (abfd)->debug_info.external_ext;
@@ -977,14 +990,14 @@ _bfd_ecoff_slurp_symbol_table (abfd)
       if (!ecoff_set_symbol_info (abfd, &internal_esym.asym,
 				  &internal_ptr->symbol, 1,
 				  internal_esym.weakext))
-	return false;
+	return FALSE;
       /* The alpha uses a negative ifd field for section symbols.  */
       if (internal_esym.ifd >= 0)
 	internal_ptr->fdr = (ecoff_data (abfd)->debug_info.fdr
 			     + internal_esym.ifd);
       else
 	internal_ptr->fdr = NULL;
-      internal_ptr->local = false;
+      internal_ptr->local = FALSE;
       internal_ptr->native = (PTR) eraw_src;
     }
 
@@ -1012,16 +1025,16 @@ _bfd_ecoff_slurp_symbol_table (abfd)
 				       + internal_sym.iss);
 	  if (!ecoff_set_symbol_info (abfd, &internal_sym,
 				      &internal_ptr->symbol, 0, 0))
-	    return false;
+	    return FALSE;
 	  internal_ptr->fdr = fdr_ptr;
-	  internal_ptr->local = true;
+	  internal_ptr->local = TRUE;
 	  internal_ptr->native = (PTR) lraw_src;
 	}
     }
 
   ecoff_data (abfd)->canonical_symbols = internal;
 
-  return true;
+  return TRUE;
 }
 
 /* Return the amount of space needed for the canonical symbols.  */
@@ -1443,7 +1456,7 @@ _bfd_ecoff_get_symbol_info (abfd, symbol, ret)
 
 /* Return whether this is a local label.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_bfd_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -1642,7 +1655,7 @@ _bfd_ecoff_print_symbol (abfd, filep, symbol, how)
 
 /* Read in the relocs for a section.  */
 
-static boolean
+static bfd_boolean
 ecoff_slurp_reloc_table (abfd, section, symbols)
      bfd *abfd;
      asection *section;
@@ -1659,10 +1672,10 @@ ecoff_slurp_reloc_table (abfd, section, symbols)
   if (section->relocation != (arelent *) NULL
       || section->reloc_count == 0
       || (section->flags & SEC_CONSTRUCTOR) != 0)
-    return true;
+    return TRUE;
 
   if (! _bfd_ecoff_slurp_symbol_table (abfd))
-    return false;
+    return FALSE;
 
   amt = section->reloc_count;
   amt *= sizeof (arelent);
@@ -1673,11 +1686,11 @@ ecoff_slurp_reloc_table (abfd, section, symbols)
   external_relocs = (char *) bfd_alloc (abfd, amt);
   if (internal_relocs == (arelent *) NULL
       || external_relocs == (char *) NULL)
-    return false;
+    return FALSE;
   if (bfd_seek (abfd, section->rel_filepos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   if (bfd_bread (external_relocs, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   for (i = 0, rptr = internal_relocs; i < section->reloc_count; i++, rptr++)
     {
@@ -1747,7 +1760,7 @@ ecoff_slurp_reloc_table (abfd, section, symbols)
 
   section->relocation = internal_relocs;
 
-  return true;
+  return TRUE;
 }
 
 /* Get a canonical list of relocs.  */
@@ -1795,7 +1808,7 @@ _bfd_ecoff_canonicalize_reloc (abfd, section, relptr, symbols)
    and return the name of the source file and the line nearest to the
    wanted location.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_find_nearest_line (abfd, section, ignore_symbols, offset,
 			      filename_ptr, functionname_ptr, retline_ptr)
      bfd *abfd;
@@ -1814,7 +1827,7 @@ _bfd_ecoff_find_nearest_line (abfd, section, ignore_symbols, offset,
   /* Make sure we have the FDR's.  */
   if (! _bfd_ecoff_slurp_symbolic_info (abfd, (asection *) NULL, debug_info)
       || bfd_get_symcount (abfd) == 0)
-    return false;
+    return FALSE;
 
   if (ecoff_data (abfd)->find_line_info == NULL)
     {
@@ -1822,7 +1835,7 @@ _bfd_ecoff_find_nearest_line (abfd, section, ignore_symbols, offset,
       ecoff_data (abfd)->find_line_info
 	= (struct ecoff_find_line *) bfd_zalloc (abfd, amt);
       if (ecoff_data (abfd)->find_line_info == NULL)
-	return false;
+	return FALSE;
     }
   line_info = ecoff_data (abfd)->find_line_info;
 
@@ -1844,7 +1857,7 @@ _bfd_ecoff_find_nearest_line (abfd, section, ignore_symbols, offset,
    the symbol table, so this function only handles the other debugging
    information.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_bfd_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -1854,13 +1867,13 @@ _bfd_ecoff_bfd_copy_private_bfd_data (ibfd, obfd)
   register int i;
   asymbol **sym_ptr_ptr;
   size_t c;
-  boolean local;
+  bfd_boolean local;
 
   /* We only want to copy information over if both BFD's use ECOFF
      format.  */
   if (bfd_get_flavour (ibfd) != bfd_target_ecoff_flavour
       || bfd_get_flavour (obfd) != bfd_target_ecoff_flavour)
-    return true;
+    return TRUE;
 
   /* Copy the GP value and the register masks.  */
   ecoff_data (obfd)->gp = ecoff_data (ibfd)->gp;
@@ -1876,15 +1889,15 @@ _bfd_ecoff_bfd_copy_private_bfd_data (ibfd, obfd)
   c = bfd_get_symcount (obfd);
   sym_ptr_ptr = bfd_get_outsymbols (obfd);
   if (c == 0 || sym_ptr_ptr == (asymbol **) NULL)
-    return true;
+    return TRUE;
 
   /* See if there are any local symbols.  */
-  local = false;
+  local = FALSE;
   for (; c > 0; c--, sym_ptr_ptr++)
     {
       if (ecoffsymbol (*sym_ptr_ptr)->local)
 	{
-	  local = true;
+	  local = TRUE;
 	  break;
 	}
     }
@@ -1947,14 +1960,14 @@ _bfd_ecoff_bfd_copy_private_bfd_data (ibfd, obfd)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the architecture.  The supported architecture is stored in the
    backend pointer.  We always set the architecture anyhow, since many
    callers ignore the return value.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -1969,7 +1982,7 @@ _bfd_ecoff_set_arch_mach (abfd, arch, machine)
 int
 _bfd_ecoff_sizeof_headers (abfd, reloc)
      bfd *abfd;
-     boolean reloc ATTRIBUTE_UNUSED;
+     bfd_boolean reloc ATTRIBUTE_UNUSED;
 {
   asection *current;
   int c;
@@ -1989,7 +2002,7 @@ _bfd_ecoff_sizeof_headers (abfd, reloc)
 
 /* Get the contents of a section.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -2033,7 +2046,7 @@ ecoff_sort_hdrs (arg1, arg2)
 /* Calculate the file position for each section, and set
    reloc_filepos.  */
 
-static boolean
+static bfd_boolean
 ecoff_compute_section_file_positions (abfd)
      bfd *abfd;
 {
@@ -2042,12 +2055,12 @@ ecoff_compute_section_file_positions (abfd)
   asection *current;
   unsigned int i;
   file_ptr old_sofar;
-  boolean rdata_in_text;
-  boolean first_data, first_nonalloc;
+  bfd_boolean rdata_in_text;
+  bfd_boolean first_data, first_nonalloc;
   const bfd_vma round = ecoff_backend (abfd)->round;
   bfd_size_type amt;
 
-  sofar = _bfd_ecoff_sizeof_headers (abfd, false);
+  sofar = _bfd_ecoff_sizeof_headers (abfd, FALSE);
   file_sofar = sofar;
 
   /* Sort the sections by VMA.  */
@@ -2055,7 +2068,7 @@ ecoff_compute_section_file_positions (abfd)
   amt *= sizeof (asection *);
   sorted_hdrs = (asection **) bfd_malloc (amt);
   if (sorted_hdrs == NULL)
-    return false;
+    return FALSE;
   for (current = abfd->sections, i = 0;
        current != NULL;
        current = current->next, i++)
@@ -2079,15 +2092,15 @@ ecoff_compute_section_file_positions (abfd)
 	      && strcmp (current->name, _PDATA) != 0
 	      && strcmp (current->name, _RCONST) != 0)
 	    {
-	      rdata_in_text = false;
+	      rdata_in_text = FALSE;
 	      break;
 	    }
 	}
     }
   ecoff_data (abfd)->rdata_in_text = rdata_in_text;
 
-  first_data = true;
-  first_nonalloc = true;
+  first_data = TRUE;
+  first_nonalloc = TRUE;
   for (i = 0; i < abfd->section_count; i++)
     {
       unsigned int alignment_power;
@@ -2120,7 +2133,7 @@ ecoff_compute_section_file_positions (abfd)
 	{
 	  sofar = (sofar + round - 1) &~ (round - 1);
 	  file_sofar = (file_sofar + round - 1) &~ (round - 1);
-	  first_data = false;
+	  first_data = FALSE;
 	}
       else if (strcmp (current->name, _LIB) == 0)
 	{
@@ -2138,7 +2151,7 @@ ecoff_compute_section_file_positions (abfd)
 	  /* Skip up to the next page for an unallocated section, such
              as the .comment section on the Alpha.  This leaves room
              for the .bss section.  */
-	  first_nonalloc = false;
+	  first_nonalloc = FALSE;
 	  sofar = (sofar + round - 1) &~ (round - 1);
 	  file_sofar = (file_sofar + round - 1) &~ (round - 1);
 	}
@@ -2177,7 +2190,7 @@ ecoff_compute_section_file_positions (abfd)
 
   ecoff_data (abfd)->reloc_filepos = file_sofar;
 
-  return true;
+  return TRUE;
 }
 
 /* Determine the location of the relocs for all the sections in the
@@ -2199,7 +2212,7 @@ ecoff_compute_reloc_file_positions (abfd)
     {
       if (! ecoff_compute_section_file_positions (abfd))
 	abort ();
-      abfd->output_has_begun = true;
+      abfd->output_has_begun = TRUE;
     }
 
   reloc_base = ecoff_data (abfd)->reloc_filepos;
@@ -2239,7 +2252,7 @@ ecoff_compute_reloc_file_positions (abfd)
 
 /* Set the contents of a section.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -2250,11 +2263,11 @@ _bfd_ecoff_set_section_contents (abfd, section, location, offset, count)
   file_ptr pos;
 
   /* This must be done first, because bfd_set_section_contents is
-     going to set output_has_begun to true.  */
+     going to set output_has_begun to TRUE.  */
   if (! abfd->output_has_begun)
     {
       if (! ecoff_compute_section_file_positions (abfd))
-	return false;
+	return FALSE;
     }
 
   /* Handle the .lib section specially so that Irix 4 shared libraries
@@ -2275,14 +2288,14 @@ _bfd_ecoff_set_section_contents (abfd, section, location, offset, count)
     }
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   pos = section->filepos + offset;
   if (bfd_seek (abfd, pos, SEEK_SET) != 0
       || bfd_bwrite (location, count, abfd) != count)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Get the GP value for an ECOFF file.  This is a hook used by
@@ -2305,7 +2318,7 @@ bfd_ecoff_get_gp_value (abfd)
 /* Set the GP value for an ECOFF file.  This is a hook used by the
    assembler.  */
 
-boolean
+bfd_boolean
 bfd_ecoff_set_gp_value (abfd, gp_value)
      bfd *abfd;
      bfd_vma gp_value;
@@ -2314,18 +2327,18 @@ bfd_ecoff_set_gp_value (abfd, gp_value)
       || bfd_get_format (abfd) != bfd_object)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   ecoff_data (abfd)->gp = gp_value;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the register masks for an ECOFF file.  This is a hook used by
    the assembler.  */
 
-boolean
+bfd_boolean
 bfd_ecoff_set_regmasks (abfd, gprmask, fprmask, cprmask)
      bfd *abfd;
      unsigned long gprmask;
@@ -2338,7 +2351,7 @@ bfd_ecoff_set_regmasks (abfd, gprmask, fprmask, cprmask)
       || bfd_get_format (abfd) != bfd_object)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   tdata = ecoff_data (abfd);
@@ -2352,13 +2365,13 @@ bfd_ecoff_set_regmasks (abfd, gprmask, fprmask, cprmask)
 	tdata->cprmask[i] = cprmask[i];
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Get ECOFF EXTR information for an external symbol.  This function
    is passed to bfd_ecoff_debug_externals.  */
 
-static boolean
+static bfd_boolean
 ecoff_get_extr (sym, esym)
      asymbol *sym;
      EXTR *esym;
@@ -2373,7 +2386,7 @@ ecoff_get_extr (sym, esym)
       if ((sym->flags & BSF_DEBUGGING) != 0
 	  || (sym->flags & BSF_LOCAL) != 0
 	  || (sym->flags & BSF_SECTION_SYM) != 0)
-	return false;
+	return FALSE;
 
       esym->jmptbl = 0;
       esym->cobol_main = 0;
@@ -2385,13 +2398,13 @@ ecoff_get_extr (sym, esym)
       esym->asym.sc = scAbs;
       esym->asym.reserved = 0;
       esym->asym.index = indexNil;
-      return true;
+      return TRUE;
     }
 
   ecoff_sym_ptr = ecoffsymbol (sym);
 
   if (ecoff_sym_ptr->local)
-    return false;
+    return FALSE;
 
   input_bfd = bfd_asymbol_bfd (sym);
   (*(ecoff_backend (input_bfd)->debug_swap.swap_ext_in))
@@ -2417,7 +2430,7 @@ ecoff_get_extr (sym, esym)
 	esym->ifd = input_debug->ifdmap[esym->ifd];
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the external symbol index.  This routine is passed to
@@ -2433,7 +2446,7 @@ ecoff_set_index (sym, indx)
 
 /* Write out an ECOFF file.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -2445,13 +2458,11 @@ _bfd_ecoff_write_object_contents (abfd)
   const bfd_size_type external_hdr_size
     = backend->debug_swap.external_hdr_size;
   const bfd_size_type external_reloc_size = backend->external_reloc_size;
-  void (* const adjust_reloc_out) PARAMS ((bfd *,
-					   const arelent *,
-					   struct internal_reloc *))
+  void (* const adjust_reloc_out)
+  PARAMS ((bfd *, const arelent *, struct internal_reloc *))
     = backend->adjust_reloc_out;
-  void (* const swap_reloc_out) PARAMS ((bfd *,
-					 const struct internal_reloc *,
-					 PTR))
+  void (* const swap_reloc_out)
+  PARAMS ((bfd *, const struct internal_reloc *, PTR))
     = backend->swap_reloc_out;
   struct ecoff_debug_info * const debug = &ecoff_data (abfd)->debug_info;
   HDRR * const symhdr = &debug->symbolic_header;
@@ -2460,10 +2471,10 @@ _bfd_ecoff_write_object_contents (abfd)
   bfd_size_type reloc_size;
   bfd_size_type text_size;
   bfd_vma text_start;
-  boolean set_text_start;
+  bfd_boolean set_text_start;
   bfd_size_type data_size;
   bfd_vma data_start;
-  boolean set_data_start;
+  bfd_boolean set_data_start;
   bfd_size_type bss_size;
   PTR buff = NULL;
   PTR reloc_buff = NULL;
@@ -2485,14 +2496,14 @@ _bfd_ecoff_write_object_contents (abfd)
     }
 
   if ((abfd->flags & D_PAGED) != 0)
-    text_size = _bfd_ecoff_sizeof_headers (abfd, false);
+    text_size = _bfd_ecoff_sizeof_headers (abfd, FALSE);
   else
     text_size = 0;
   text_start = 0;
-  set_text_start = false;
+  set_text_start = FALSE;
   data_size = 0;
   data_start = 0;
-  set_data_start = false;
+  set_data_start = FALSE;
   bss_size = 0;
 
   /* Write section headers to the file.  */
@@ -2588,7 +2599,7 @@ _bfd_ecoff_write_object_contents (abfd)
 	  if (! set_text_start || text_start > vma)
 	    {
 	      text_start = vma;
-	      set_text_start = true;
+	      set_text_start = TRUE;
 	    }
 	}
       else if ((section.s_flags & STYP_RDATA) != 0
@@ -2604,7 +2615,7 @@ _bfd_ecoff_write_object_contents (abfd)
 	  if (! set_data_start || data_start > vma)
 	    {
 	      data_start = vma;
-	      set_data_start = true;
+	      set_data_start = TRUE;
 	    }
 	}
       else if ((section.s_flags & STYP_BSS) != 0
@@ -2870,13 +2881,13 @@ _bfd_ecoff_write_object_contents (abfd)
     bfd_release (abfd, reloc_buff);
   if (buff != NULL)
     free (buff);
-  return true;
+  return TRUE;
  error_return:
   if (reloc_buff != NULL)
     bfd_release (abfd, reloc_buff);
   if (buff != NULL)
     free (buff);
-  return false;
+  return FALSE;
 }
 
 /* Archive handling.  ECOFF uses what appears to be a unique type of
@@ -2949,7 +2960,7 @@ ecoff_armap_hash (s, rehash, size, hlog)
 
 /* Read in the armap.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_slurp_armap (abfd)
      bfd *abfd;
 {
@@ -2968,12 +2979,12 @@ _bfd_ecoff_slurp_armap (abfd)
   /* Get the name of the first element.  */
   i = bfd_bread ((PTR) nextname, (bfd_size_type) 16, abfd);
   if (i == 0)
-      return true;
+      return TRUE;
   if (i != 16)
-      return false;
+      return FALSE;
 
   if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
-    return false;
+    return FALSE;
 
   /* Irix 4.0.5F apparently can use either an ECOFF armap or a
      standard COFF armap.  We could move the ECOFF armap stuff into
@@ -2995,8 +3006,8 @@ _bfd_ecoff_slurp_armap (abfd)
       || strncmp (nextname + ARMAP_END_INDEX,
 		  ARMAP_END, sizeof ARMAP_END - 1) != 0)
     {
-      bfd_has_map (abfd) = false;
-      return true;
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
     }
 
   /* Make sure we have the right byte ordering.  */
@@ -3006,27 +3017,27 @@ _bfd_ecoff_slurp_armap (abfd)
 	  ^ (bfd_big_endian (abfd))))
     {
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
   /* Read in the armap.  */
   ardata = bfd_ardata (abfd);
   mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
   if (mapdata == (struct areltdata *) NULL)
-    return false;
+    return FALSE;
   parsed_size = mapdata->parsed_size;
   bfd_release (abfd, (PTR) mapdata);
 
   raw_armap = (char *) bfd_alloc (abfd, parsed_size);
   if (raw_armap == (char *) NULL)
-    return false;
+    return FALSE;
 
   if (bfd_bread ((PTR) raw_armap, parsed_size, abfd) != parsed_size)
     {
       if (bfd_get_error () != bfd_error_system_call)
 	bfd_set_error (bfd_error_malformed_archive);
       bfd_release (abfd, (PTR) raw_armap);
-      return false;
+      return FALSE;
     }
 
   ardata->tdata = (PTR) raw_armap;
@@ -3086,7 +3097,7 @@ _bfd_ecoff_slurp_armap (abfd)
   amt *= sizeof (struct symdef);
   symdef_ptr = (struct symdef *) bfd_alloc (abfd, amt);
   if (!symdef_ptr)
-    return false;
+    return FALSE;
 
   ardata->symdefs = (carsym *) symdef_ptr;
 
@@ -3108,14 +3119,14 @@ _bfd_ecoff_slurp_armap (abfd)
   /* Pad to an even boundary.  */
   ardata->first_file_filepos += ardata->first_file_filepos % 2;
 
-  bfd_has_map (abfd) = true;
+  bfd_has_map (abfd) = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* Write out an armap.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_write_armap (abfd, elength, map, orl_count, stridx)
      bfd *abfd;
      unsigned int elength;
@@ -3199,15 +3210,15 @@ _bfd_ecoff_write_armap (abfd, elength, map, orl_count, stridx)
 
   if (bfd_bwrite ((PTR) &hdr, (bfd_size_type) sizeof (struct ar_hdr), abfd)
       != sizeof (struct ar_hdr))
-    return false;
+    return FALSE;
 
   H_PUT_32 (abfd, hashsize, temp);
   if (bfd_bwrite ((PTR) temp, (bfd_size_type) 4, abfd) != 4)
-    return false;
+    return FALSE;
 
   hashtable = (bfd_byte *) bfd_zalloc (abfd, symdefsize);
   if (!hashtable)
-    return false;
+    return FALSE;
 
   current = abfd->archive_head;
   last_elt = current;
@@ -3252,21 +3263,21 @@ _bfd_ecoff_write_armap (abfd, elength, map, orl_count, stridx)
     }
 
   if (bfd_bwrite ((PTR) hashtable, symdefsize, abfd) != symdefsize)
-    return false;
+    return FALSE;
 
   bfd_release (abfd, hashtable);
 
   /* Now write the strings.  */
   H_PUT_32 (abfd, stringsize, temp);
   if (bfd_bwrite ((PTR) temp, (bfd_size_type) 4, abfd) != 4)
-    return false;
+    return FALSE;
   for (i = 0; i < orl_count; i++)
     {
       bfd_size_type len;
 
       len = strlen (*map[i].name) + 1;
       if (bfd_bwrite ((PTR) (*map[i].name), len, abfd) != len)
-	return false;
+	return FALSE;
     }
 
   /* The spec sez this should be a newline.  But in order to be
@@ -3274,10 +3285,10 @@ _bfd_ecoff_write_armap (abfd, elength, map, orl_count, stridx)
   if (padit)
     {
       if (bfd_bwrite ("", (bfd_size_type) 1, abfd) != 1)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* See whether this BFD is an archive.  If it is, read in the armap
@@ -3343,7 +3354,7 @@ _bfd_ecoff_archive_p (abfd)
       first = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
       if (first != NULL)
 	{
-	  first->target_defaulted = false;
+	  first->target_defaulted = FALSE;
 	  if (bfd_check_format (first, bfd_object)
 	      && first->xvec != abfd->xvec)
 	    {
@@ -3372,13 +3383,13 @@ static struct bfd_hash_entry *ecoff_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *entry,
 	   struct bfd_hash_table *table,
 	   const char *string));
-static boolean ecoff_link_add_archive_symbols
+static bfd_boolean ecoff_link_add_archive_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean ecoff_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean ecoff_link_add_object_symbols
+static bfd_boolean ecoff_link_check_archive_element
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded));
+static bfd_boolean ecoff_link_add_object_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean ecoff_link_add_externals
+static bfd_boolean ecoff_link_add_externals
   PARAMS ((bfd *, struct bfd_link_info *, PTR, char *));
 
 /* Routine to create an entry in an ECOFF link hash table.  */
@@ -3449,7 +3460,7 @@ _bfd_ecoff_bfd_link_hash_table_create (abfd)
 #define ecoff_link_hash_traverse(table, func, info)			\
   (bfd_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the ECOFF link hash table from the info structure.  This is
@@ -3460,7 +3471,7 @@ _bfd_ecoff_bfd_link_hash_table_create (abfd)
 /* Given an ECOFF BFD, add symbols to the global hash table as
    appropriate.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_bfd_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3473,7 +3484,7 @@ _bfd_ecoff_bfd_link_add_symbols (abfd, info)
       return ecoff_link_add_archive_symbols (abfd, info);
     default:
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 }
 
@@ -3484,7 +3495,7 @@ _bfd_ecoff_bfd_link_add_symbols (abfd, info)
    already have a hash table, so there is no reason to construct
    another one.  */
 
-static boolean
+static bfd_boolean
 ecoff_link_add_archive_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3502,9 +3513,9 @@ ecoff_link_add_archive_symbols (abfd, info)
     {
       /* An empty archive is a special case.  */
       if (bfd_openr_next_archived_file (abfd, (bfd *) NULL) == NULL)
-	return true;
+	return TRUE;
       bfd_set_error (bfd_error_no_armap);
-      return false;
+      return FALSE;
     }
 
   /* If we don't have any raw data for this archive, as can happen on
@@ -3582,10 +3593,10 @@ ecoff_link_add_archive_symbols (abfd, info)
 	  || strcmp (name, h->root.string) != 0)
 	{
 	  unsigned int srch;
-	  boolean found;
+	  bfd_boolean found;
 
 	  /* That was the wrong symbol.  Try rehashing.  */
-	  found = false;
+	  found = FALSE;
 	  for (srch = (hash + rehash) & (armap_count - 1);
 	       srch != hash;
 	       srch = (srch + rehash) & (armap_count - 1))
@@ -3597,7 +3608,7 @@ ecoff_link_add_archive_symbols (abfd, info)
 	      if (name[0] == h->root.string[0]
 		  && strcmp (name, h->root.string) == 0)
 		{
-		  found = true;
+		  found = TRUE;
 		  break;
 		}
 	    }
@@ -3613,33 +3624,33 @@ ecoff_link_add_archive_symbols (abfd, info)
 
       element = (*backend->get_elt_at_filepos) (abfd, (file_ptr) file_offset);
       if (element == (bfd *) NULL)
-	return false;
+	return FALSE;
 
       if (! bfd_check_format (element, bfd_object))
-	return false;
+	return FALSE;
 
       /* Unlike the generic linker, we know that this element provides
 	 a definition for an undefined symbol and we know that we want
 	 to include it.  We don't need to check anything.  */
       if (! (*info->callbacks->add_archive_element) (info, element, name))
-	return false;
+	return FALSE;
       if (! ecoff_link_add_object_symbols (element, info))
-	return false;
+	return FALSE;
 
       pundef = &(*pundef)->next;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called if we used _bfd_generic_link_add_archive_symbols
    because we were not dealing with an ECOFF archive.  */
 
-static boolean
+static bfd_boolean
 ecoff_link_check_archive_element (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
   const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
   void (* const swap_ext_in) PARAMS ((bfd *, PTR, EXTR *))
@@ -3652,7 +3663,7 @@ ecoff_link_check_archive_element (abfd, info, pneeded)
   char *ext_ptr;
   char *ext_end;
 
-  *pneeded = false;
+  *pneeded = FALSE;
 
   if (! ecoff_slurp_symbolic_header (abfd))
     goto error_return;
@@ -3690,7 +3701,7 @@ ecoff_link_check_archive_element (abfd, info, pneeded)
   for (; ext_ptr < ext_end; ext_ptr += external_ext_size)
     {
       EXTR esym;
-      boolean def;
+      bfd_boolean def;
       const char *name;
       struct bfd_link_hash_entry *h;
 
@@ -3716,10 +3727,10 @@ ecoff_link_check_archive_element (abfd, info, pneeded)
 	case scInit:
 	case scFini:
 	case scRConst:
-	  def = true;
+	  def = TRUE;
 	  break;
 	default:
-	  def = false;
+	  def = FALSE;
 	  break;
 	}
 
@@ -3727,7 +3738,7 @@ ecoff_link_check_archive_element (abfd, info, pneeded)
 	continue;
 
       name = ssext + esym.asym.iss;
-      h = bfd_link_hash_lookup (info->hash, name, false, false, true);
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
 
       /* Unlike the generic linker, we do not pull in elements because
 	 of common symbols.  */
@@ -3741,7 +3752,7 @@ ecoff_link_check_archive_element (abfd, info, pneeded)
       if (! ecoff_link_add_externals (abfd, info, external_ext, ssext))
 	goto error_return;
 
-      *pneeded = true;
+      *pneeded = TRUE;
       goto successful_return;
     }
 
@@ -3750,19 +3761,19 @@ ecoff_link_check_archive_element (abfd, info, pneeded)
     free (external_ext);
   if (ssext != NULL)
     free (ssext);
-  return true;
+  return TRUE;
  error_return:
   if (external_ext != NULL)
     free (external_ext);
   if (ssext != NULL)
     free (ssext);
-  return false;
+  return FALSE;
 }
 
 /* Add symbols from an ECOFF object file to the global linker hash
    table.  */
 
-static boolean
+static bfd_boolean
 ecoff_link_add_object_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3772,14 +3783,14 @@ ecoff_link_add_object_symbols (abfd, info)
   PTR external_ext = NULL;
   bfd_size_type esize;
   char *ssext = NULL;
-  boolean result;
+  bfd_boolean result;
 
   if (! ecoff_slurp_symbolic_header (abfd))
-    return false;
+    return FALSE;
 
   /* If there are no symbols, we don't want it.  */
   if (bfd_get_symcount (abfd) == 0)
-    return true;
+    return TRUE;
 
   symhdr = &ecoff_data (abfd)->debug_info.symbolic_header;
 
@@ -3816,7 +3827,7 @@ ecoff_link_add_object_symbols (abfd, info)
     free (ssext);
   if (external_ext != NULL)
     free (external_ext);
-  return false;
+  return FALSE;
 }
 
 /* Add the external symbols of an object file to the global linker
@@ -3825,7 +3836,7 @@ ecoff_link_add_object_symbols (abfd, info)
    explicitly save any information we may need later on in the link.
    We do not want to read the external symbol information again.  */
 
-static boolean
+static bfd_boolean
 ecoff_link_add_externals (abfd, info, external_ext, ssext)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3848,7 +3859,7 @@ ecoff_link_add_externals (abfd, info, external_ext, ssext)
   amt *= sizeof (struct bfd_link_hash_entry *);
   sym_hash = (struct bfd_link_hash_entry **) bfd_alloc (abfd, amt);
   if (!sym_hash)
-    return false;
+    return FALSE;
   ecoff_data (abfd)->sym_hashes = (struct ecoff_link_hash_entry **) sym_hash;
 
   ext_ptr = (char *) external_ext;
@@ -3856,7 +3867,7 @@ ecoff_link_add_externals (abfd, info, external_ext, ssext)
   for (; ext_ptr < ext_end; ext_ptr += external_ext_size, sym_hash++)
     {
       EXTR esym;
-      boolean skip;
+      bfd_boolean skip;
       bfd_vma value;
       asection *section;
       const char *name;
@@ -3867,7 +3878,7 @@ ecoff_link_add_externals (abfd, info, external_ext, ssext)
       (*swap_ext_in) (abfd, (PTR) ext_ptr, &esym);
 
       /* Skip debugging symbols.  */
-      skip = false;
+      skip = FALSE;
       switch (esym.asym.st)
 	{
 	case stGlobal:
@@ -3877,7 +3888,7 @@ ecoff_link_add_externals (abfd, info, external_ext, ssext)
 	case stStaticProc:
 	  break;
 	default:
-	  skip = true;
+	  skip = TRUE;
 	  break;
 	}
 
@@ -3983,8 +3994,8 @@ ecoff_link_add_externals (abfd, info, external_ext, ssext)
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, abfd, name,
 	      (flagword) (esym.weakext ? BSF_WEAK : BSF_GLOBAL),
-	      section, value, (const char *) NULL, true, true, sym_hash)))
-	return false;
+	      section, value, (const char *) NULL, TRUE, TRUE, sym_hash)))
+	return FALSE;
 
       h = (struct ecoff_link_hash_entry *) *sym_hash;
 
@@ -4024,20 +4035,20 @@ ecoff_link_add_externals (abfd, info, external_ext, ssext)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* ECOFF final link routines.  */
 
-static boolean ecoff_final_link_debug_accumulate
+static bfd_boolean ecoff_final_link_debug_accumulate
   PARAMS ((bfd *output_bfd, bfd *input_bfd, struct bfd_link_info *,
 	   PTR handle));
-static boolean ecoff_link_write_external
+static bfd_boolean ecoff_link_write_external
   PARAMS ((struct ecoff_link_hash_entry *, PTR));
-static boolean ecoff_indirect_link_order
+static bfd_boolean ecoff_indirect_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   struct bfd_link_order *));
-static boolean ecoff_reloc_link_order
+static bfd_boolean ecoff_reloc_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   struct bfd_link_order *));
 
@@ -4054,7 +4065,7 @@ struct extsym_info
    processes all the link order information.  This may cause it to
    close and reopen some input BFDs; I'll see how bad this is.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -4101,14 +4112,14 @@ _bfd_ecoff_bfd_final_link (abfd, info)
 
   handle = bfd_ecoff_debug_init (abfd, debug, &backend->debug_swap, info);
   if (handle == (PTR) NULL)
-    return false;
+    return FALSE;
 
   /* Accumulate the debugging symbols from each input BFD.  */
   for (input_bfd = info->input_bfds;
        input_bfd != (bfd *) NULL;
        input_bfd = input_bfd->link_next)
     {
-      boolean ret;
+      bfd_boolean ret;
 
       if (bfd_get_flavour (input_bfd) == bfd_target_ecoff_flavour)
 	{
@@ -4125,7 +4136,7 @@ _bfd_ecoff_bfd_final_link (abfd, info)
 						debug, &backend->debug_swap,
 						input_bfd, info);
       if (! ret)
-	return false;
+	return FALSE;
 
       /* Combine the register masks.  */
       ecoff_data (abfd)->gprmask |= ecoff_data (input_bfd)->gprmask;
@@ -4169,7 +4180,7 @@ _bfd_ecoff_bfd_final_link (abfd, info)
   if (! bfd_ecoff_write_accumulated_debug (handle, abfd, debug,
 					   &backend->debug_swap, info,
 					   ecoff_data (abfd)->sym_filepos))
-    return false;
+    return FALSE;
 
   bfd_ecoff_debug_free (handle, abfd, debug, &backend->debug_swap, info);
 
@@ -4187,7 +4198,7 @@ _bfd_ecoff_bfd_final_link (abfd, info)
     {
       struct bfd_link_hash_entry *h;
 
-      h = bfd_link_hash_lookup (info->hash, "_gp", false, false, true);
+      h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
       if (h != (struct bfd_link_hash_entry *) NULL
 	  && h->type == bfd_link_hash_defined)
 	ecoff_data (abfd)->gp = (h->u.def.value
@@ -4230,34 +4241,34 @@ _bfd_ecoff_bfd_final_link (abfd, info)
 		  == bfd_target_ecoff_flavour))
 	    {
 	      if (! ecoff_indirect_link_order (abfd, info, o, p))
-		return false;
+		return FALSE;
 	    }
 	  else if (p->type == bfd_section_reloc_link_order
 		   || p->type == bfd_symbol_reloc_link_order)
 	    {
 	      if (! ecoff_reloc_link_order (abfd, info, o, p))
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
 	      if (! _bfd_default_link_order (abfd, info, o, p))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 
   bfd_get_symcount (abfd) = symhdr->iextMax + symhdr->isymMax;
 
-  ecoff_data (abfd)->linker = true;
+  ecoff_data (abfd)->linker = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* Accumulate the debugging information for an input BFD into the
    output BFD.  This must read in the symbolic information of the
    input BFD.  */
 
-static boolean
+static bfd_boolean
 ecoff_final_link_debug_accumulate (output_bfd, input_bfd, info, handle)
      bfd *output_bfd;
      bfd *input_bfd;
@@ -4268,7 +4279,7 @@ ecoff_final_link_debug_accumulate (output_bfd, input_bfd, info, handle)
   const struct ecoff_debug_swap * const swap =
     &ecoff_backend (input_bfd)->debug_swap;
   HDRR *symhdr = &debug->symbolic_header;
-  boolean ret;
+  bfd_boolean ret;
 
 #define READ(ptr, offset, count, size, type)				 \
   if (symhdr->count == 0)						 \
@@ -4279,13 +4290,13 @@ ecoff_final_link_debug_accumulate (output_bfd, input_bfd, info, handle)
       debug->ptr = (type) bfd_malloc (amt);				 \
       if (debug->ptr == NULL)						 \
 	{								 \
-          ret = false;							 \
+          ret = FALSE;							 \
           goto return_something;					 \
 	}								 \
       if (bfd_seek (input_bfd, (file_ptr) symhdr->offset, SEEK_SET) != 0 \
 	  || bfd_bread (debug->ptr, amt, input_bfd) != amt)		 \
 	{								 \
-          ret = false;							 \
+          ret = FALSE;							 \
           goto return_something;					 \
 	}								 \
     }
@@ -4356,37 +4367,37 @@ ecoff_final_link_debug_accumulate (output_bfd, input_bfd, info, handle)
 /* Put out information for an external symbol.  These come only from
    the hash table.  */
 
-static boolean
+static bfd_boolean
 ecoff_link_write_external (h, data)
      struct ecoff_link_hash_entry *h;
      PTR data;
 {
   struct extsym_info *einfo = (struct extsym_info *) data;
   bfd *output_bfd = einfo->abfd;
-  boolean strip;
+  bfd_boolean strip;
 
   if (h->root.type == bfd_link_hash_warning)
     {
       h = (struct ecoff_link_hash_entry *) h->root.u.i.link;
       if (h->root.type == bfd_link_hash_new)
-	return true;
+	return TRUE;
     }
 
   /* We need to check if this symbol is being stripped.  */
   if (h->root.type == bfd_link_hash_undefined
       || h->root.type == bfd_link_hash_undefweak)
-    strip = false;
+    strip = FALSE;
   else if (einfo->info->strip == strip_all
 	   || (einfo->info->strip == strip_some
 	       && bfd_hash_lookup (einfo->info->keep_hash,
 				   h->root.root.string,
-				   false, false) == NULL))
-    strip = true;
+				   FALSE, FALSE) == NULL))
+    strip = TRUE;
   else
-    strip = false;
+    strip = FALSE;
 
   if (strip || h->written)
-    return true;
+    return TRUE;
 
   if (h->abfd == (bfd *) NULL)
     {
@@ -4484,7 +4495,7 @@ ecoff_link_write_external (h, data)
     case bfd_link_hash_indirect:
       /* We ignore these symbols, since the indirected symbol is
 	 already in the hash table.  */
-      return true;
+      return TRUE;
     }
 
   /* bfd_ecoff_debug_one_external uses iextMax to keep track of the
@@ -4500,7 +4511,7 @@ ecoff_link_write_external (h, data)
 
 /* Relocate and write an ECOFF section into an ECOFF output file.  */
 
-static boolean
+static bfd_boolean
 ecoff_indirect_link_order (output_bfd, info, output_section, link_order)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -4521,7 +4532,7 @@ ecoff_indirect_link_order (output_bfd, info, output_section, link_order)
   BFD_ASSERT ((output_section->flags & SEC_HAS_CONTENTS) != 0);
 
   if (link_order->size == 0)
-    return true;
+    return TRUE;
 
   input_section = link_order->u.indirect.section;
   input_bfd = input_section->owner;
@@ -4610,14 +4621,14 @@ ecoff_indirect_link_order (output_bfd, info, output_section, link_order)
     free (contents);
   if (external_relocs != NULL && section_tdata == NULL)
     free (external_relocs);
-  return true;
+  return TRUE;
 
  error_return:
   if (contents != NULL)
     free (contents);
   if (external_relocs != NULL && section_tdata == NULL)
     free (external_relocs);
-  return false;
+  return FALSE;
 }
 
 /* Generate a reloc when linking an ECOFF file.  This is a reloc
@@ -4625,7 +4636,7 @@ ecoff_indirect_link_order (output_bfd, info, output_section, link_order)
    is used to build constructor and destructor tables when linking
    with -Ur.  */
 
-static boolean
+static bfd_boolean
 ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -4639,7 +4650,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
   struct internal_reloc in;
   bfd_size_type external_reloc_size;
   bfd_byte *rbuf;
-  boolean ok;
+  bfd_boolean ok;
   file_ptr pos;
 
   type = link_order->type;
@@ -4654,7 +4665,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
   if (rel.howto == 0)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   if (type == bfd_section_reloc_link_order)
@@ -4670,7 +4681,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
          actually against the section.  */
       h = bfd_wrapped_link_hash_lookup (output_bfd, info,
 					link_order->u.reloc.p->u.name,
-					false, false, false);
+					FALSE, FALSE, FALSE);
       if (h != NULL
 	  && (h->type == bfd_link_hash_defined
 	      || h->type == bfd_link_hash_defweak))
@@ -4704,7 +4715,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
       size = bfd_get_reloc_size (rel.howto);
       buf = (bfd_byte *) bfd_zmalloc (size);
       if (buf == (bfd_byte *) NULL)
-	return false;
+	return FALSE;
       rstat = _bfd_relocate_contents (rel.howto, output_bfd,
 				      (bfd_vma) addend, buf);
       switch (rstat)
@@ -4724,7 +4735,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
 		  (asection *) NULL, (bfd_vma) 0)))
 	    {
 	      free (buf);
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 	}
@@ -4732,7 +4743,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
 				     (file_ptr) link_order->offset, size);
       free (buf);
       if (! ok)
-	return false;
+	return FALSE;
     }
 
   rel.addend = 0;
@@ -4749,7 +4760,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
       h = ((struct ecoff_link_hash_entry *)
 	   bfd_wrapped_link_hash_lookup (output_bfd, info,
 					 link_order->u.reloc.p->u.name,
-					 false, false, true));
+					 FALSE, FALSE, TRUE));
       if (h != (struct ecoff_link_hash_entry *) NULL
 	  && h->indx != -1)
 	in.r_symndx = h->indx;
@@ -4758,7 +4769,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
 	  if (! ((*info->callbacks->unattached_reloc)
 		 (info, link_order->u.reloc.p->u.name, (bfd *) NULL,
 		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
+	    return FALSE;
 	  in.r_symndx = 0;
 	}
       in.r_extern = 1;
@@ -4810,7 +4821,7 @@ ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
   external_reloc_size = ecoff_backend (output_bfd)->external_reloc_size;
   rbuf = (bfd_byte *) bfd_malloc (external_reloc_size);
   if (rbuf == (bfd_byte *) NULL)
-    return false;
+    return FALSE;
 
   (*ecoff_backend (output_bfd)->swap_reloc_out) (output_bfd, &in, (PTR) rbuf);
 
diff --git a/bfd/ecofflink.c b/bfd/ecofflink.c
index 5b854af78e3..2ff5d1b2067 100644
--- a/bfd/ecofflink.c
+++ b/bfd/ecofflink.c
@@ -32,24 +32,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libcoff.h"
 #include "libecoff.h"
 
-static boolean ecoff_add_bytes PARAMS ((char **buf, char **bufend,
-					size_t need));
+static bfd_boolean ecoff_add_bytes
+  PARAMS ((char **buf, char **bufend, size_t need));
 static struct bfd_hash_entry *string_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
 	   const char *));
-static void ecoff_align_debug PARAMS ((bfd *abfd,
-				       struct ecoff_debug_info *debug,
-				       const struct ecoff_debug_swap *swap));
-static boolean ecoff_write_symhdr PARAMS ((bfd *, struct ecoff_debug_info *,
-					   const struct ecoff_debug_swap *,
-					   file_ptr where));
-static int cmp_fdrtab_entry PARAMS ((const PTR, const PTR));
-static boolean mk_fdrtab PARAMS ((bfd *,
-				  struct ecoff_debug_info * const,
-				  const struct ecoff_debug_swap * const,
-				  struct ecoff_find_line *));
-static long fdrtab_lookup PARAMS ((struct ecoff_find_line *, bfd_vma));
-static boolean lookup_line
+static void ecoff_align_debug
+  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
+	   const struct ecoff_debug_swap *swap));
+static bfd_boolean ecoff_write_symhdr
+  PARAMS ((bfd *, struct ecoff_debug_info *, const struct ecoff_debug_swap *,
+	   file_ptr where));
+static int cmp_fdrtab_entry
+  PARAMS ((const PTR, const PTR));
+static bfd_boolean mk_fdrtab
+  PARAMS ((bfd *, struct ecoff_debug_info * const,
+	   const struct ecoff_debug_swap * const, struct ecoff_find_line *));
+static long fdrtab_lookup
+  PARAMS ((struct ecoff_find_line *, bfd_vma));
+static bfd_boolean lookup_line
   PARAMS ((bfd *, struct ecoff_debug_info * const,
 	   const struct ecoff_debug_swap * const, struct ecoff_find_line *));
 
@@ -253,7 +254,7 @@ _bfd_ecoff_swap_rndx_out (bigend, intern_copy, ext)
 
 /* Add bytes to a buffer.  Return success.  */
 
-static boolean
+static bfd_boolean
 ecoff_add_bytes (buf, bufend, need)
      char **buf;
      char **bufend;
@@ -274,10 +275,10 @@ ecoff_add_bytes (buf, bufend, need)
     }
   newbuf = (char *) bfd_realloc (*buf, (bfd_size_type) have + want);
   if (newbuf == NULL)
-    return false;
+    return FALSE;
   *buf = newbuf;
   *bufend = *buf + have + want;
-  return true;
+  return TRUE;
 }
 
 /* We keep a hash table which maps strings to numbers.  We use it to
@@ -347,7 +348,7 @@ struct shuffle
   /* The length of the information.  */
   unsigned long size;
   /* Whether this information comes from a file or not.  */
-  boolean filep;
+  bfd_boolean filep;
   union
     {
       struct
@@ -400,12 +401,11 @@ struct accumulate
 
 /* Add a file entry to a shuffle list.  */
 
-static boolean add_file_shuffle PARAMS ((struct accumulate *,
-				      struct shuffle **,
-				      struct shuffle **, bfd *, file_ptr,
-				      unsigned long));
+static bfd_boolean add_file_shuffle
+  PARAMS ((struct accumulate *, struct shuffle **, struct shuffle **,
+	   bfd *, file_ptr, unsigned long));
 
-static boolean
+static bfd_boolean
 add_file_shuffle (ainfo, head, tail, input_bfd, offset, size)
      struct accumulate *ainfo;
      struct shuffle **head;
@@ -425,7 +425,7 @@ add_file_shuffle (ainfo, head, tail, input_bfd, offset, size)
       (*tail)->size += size;
       if ((*tail)->size > ainfo->largest_file_shuffle)
 	ainfo->largest_file_shuffle = (*tail)->size;
-      return true;
+      return TRUE;
     }
 
   n = (struct shuffle *) objalloc_alloc (ainfo->memory,
@@ -433,11 +433,11 @@ add_file_shuffle (ainfo, head, tail, input_bfd, offset, size)
   if (!n)
     {
       bfd_set_error (bfd_error_no_memory);
-      return false;
+      return FALSE;
     }
   n->next = NULL;
   n->size = size;
-  n->filep = true;
+  n->filep = TRUE;
   n->u.file.input_bfd = input_bfd;
   n->u.file.offset = offset;
   if (*head == (struct shuffle *) NULL)
@@ -447,17 +447,16 @@ add_file_shuffle (ainfo, head, tail, input_bfd, offset, size)
   *tail = n;
   if (size > ainfo->largest_file_shuffle)
     ainfo->largest_file_shuffle = size;
-  return true;
+  return TRUE;
 }
 
 /* Add a memory entry to a shuffle list.  */
 
-static boolean add_memory_shuffle PARAMS ((struct accumulate *,
-					   struct shuffle **head,
-					   struct shuffle **tail,
-					   bfd_byte *data, unsigned long size));
+static bfd_boolean add_memory_shuffle
+  PARAMS ((struct accumulate *, struct shuffle **head, struct shuffle **tail,
+	   bfd_byte *data, unsigned long size));
 
-static boolean
+static bfd_boolean
 add_memory_shuffle (ainfo, head, tail, data, size)
      struct accumulate *ainfo;
      struct shuffle **head;
@@ -472,18 +471,18 @@ add_memory_shuffle (ainfo, head, tail, data, size)
   if (!n)
     {
       bfd_set_error (bfd_error_no_memory);
-      return false;
+      return FALSE;
     }
   n->next = NULL;
   n->size = size;
-  n->filep = false;
+  n->filep = FALSE;
   n->u.memory = (PTR) data;
   if (*head == (struct shuffle *) NULL)
     *head = n;
   if (*tail != (struct shuffle *) NULL)
     (*tail)->next = n;
   *tail = n;
-  return true;
+  return TRUE;
 }
 
 /* Initialize the FDR hash table.  This returns a handle which is then
@@ -576,7 +575,7 @@ bfd_ecoff_debug_free (handle, output_bfd, output_debug, output_swap, info)
    linker information structure.  HANDLE is returned by
    bfd_ecoff_debug_init.  */
 
-boolean
+bfd_boolean
 bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 			    input_bfd, input_debug, input_swap,
 			    info)
@@ -672,10 +671,10 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
   if (!input_debug->ifdmap || !rfd_out)
     {
       bfd_set_error (bfd_error_no_memory);
-      return false;
+      return FALSE;
     }
   if (!add_memory_shuffle (ainfo, &ainfo->rfd, &ainfo->rfd_end, rfd_out, sz))
-    return false;
+    return FALSE;
 
   copied = 0;
 
@@ -716,13 +715,13 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 
 	  lookup = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 20);
 	  if (lookup == NULL)
-	    return false;
+	    return FALSE;
 	  sprintf (lookup, "%s %lx %lx", name, fdr.csym, fdr.caux);
 
-	  fh = string_hash_lookup (&ainfo->fdr_hash, lookup, true, true);
+	  fh = string_hash_lookup (&ainfo->fdr_hash, lookup, TRUE, TRUE);
 	  free (lookup);
 	  if (fh == (struct string_hash_entry *) NULL)
-	    return false;
+	    return FALSE;
 
 	  if (fh->val != -1)
 	    {
@@ -773,10 +772,10 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
   if (!fdr_out)
     {
       bfd_set_error (bfd_error_no_memory);
-      return false;
+      return FALSE;
     }
   if (!add_memory_shuffle (ainfo, &ainfo->fdr, &ainfo->fdr_end, fdr_out, sz))
-    return false;
+    return FALSE;
   for (fdr_ptr = fdr_start, i = 0;
        fdr_ptr < fdr_end;
        fdr_ptr += fdr_add, i++)
@@ -786,7 +785,7 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
       bfd_byte *sym_out;
       bfd_byte *lraw_src;
       bfd_byte *lraw_end;
-      boolean fgotfilename;
+      bfd_boolean fgotfilename;
 
       if (input_debug->ifdmap[i] < output_symhdr->ifdMax)
 	{
@@ -822,17 +821,17 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 
       /* Swap in the local symbols, adjust their values, and swap them
 	 out again.  */
-      fgotfilename = false;
+      fgotfilename = FALSE;
       sz = fdr.csym * external_sym_size;
       sym_out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
       if (!sym_out)
 	{
 	  bfd_set_error (bfd_error_no_memory);
-	  return false;
+	  return FALSE;
 	}
       if (!add_memory_shuffle (ainfo, &ainfo->sym, &ainfo->sym_end, sym_out,
 			       sz))
-	return false;
+	return FALSE;
       lraw_src = ((bfd_byte *) input_debug->external_sym
 		  + fdr.isymBase * input_swap->external_sym_size);
       lraw_end = lraw_src + fdr.csym * input_swap->external_sym_size;
@@ -884,13 +883,13 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	     prevent us from easily merging different FDR's.  */
 	  if (! info->relocateable)
 	    {
-	      boolean ffilename;
+	      bfd_boolean ffilename;
 	      const char *name;
 
 	      if (! fgotfilename && internal_sym.iss == fdr.rss)
-		ffilename = true;
+		ffilename = TRUE;
 	      else
-		ffilename = false;
+		ffilename = FALSE;
 
 	      /* Hash the name into the string table.  */
 	      name = input_debug->ss + fdr.issBase + internal_sym.iss;
@@ -900,9 +899,9 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 		{
 		  struct string_hash_entry *sh;
 
-		  sh = string_hash_lookup (&ainfo->str_hash, name, true, true);
+		  sh = string_hash_lookup (&ainfo->str_hash, name, TRUE, TRUE);
 		  if (sh == (struct string_hash_entry *) NULL)
-		    return false;
+		    return FALSE;
 		  if (sh->val == -1)
 		    {
 		      sh->val = output_symhdr->issMax;
@@ -920,7 +919,7 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	      if (ffilename)
 		{
 		  fdr.rss = internal_sym.iss;
-		  fgotfilename = true;
+		  fgotfilename = TRUE;
 		}
 	    }
 
@@ -942,7 +941,7 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	  file_ptr pos = input_symhdr->cbLineOffset + fdr.cbLineOffset;
 	  if (!add_file_shuffle (ainfo, &ainfo->line, &ainfo->line_end,
 				 input_bfd, pos, (unsigned long) fdr.cbLine))
-	    return false;
+	    return FALSE;
 	  fdr.ilineBase = output_symhdr->ilineMax;
 	  fdr.cbLineOffset = output_symhdr->cbLine;
 	  output_symhdr->ilineMax += fdr.cline;
@@ -955,7 +954,7 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	  if (!add_file_shuffle (ainfo, &ainfo->aux, &ainfo->aux_end,
 				 input_bfd, pos,
 				 fdr.caux * sizeof (union aux_ext)))
-	    return false;
+	    return FALSE;
 	  fdr.iauxBase = output_symhdr->iauxMax;
 	  output_symhdr->iauxMax += fdr.caux;
 	}
@@ -974,7 +973,7 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	  file_ptr pos = input_symhdr->cbSsOffset + fdr.issBase;
 	  if (!add_file_shuffle (ainfo, &ainfo->ss, &ainfo->ss_end,
 				 input_bfd, pos, (unsigned long) fdr.cbSs))
-	    return false;
+	    return FALSE;
 	  fdr.issBase = output_symhdr->issMax;
 	  output_symhdr->issMax += fdr.cbSs;
 	}
@@ -994,7 +993,7 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	      unsigned long size = fdr.cpd * external_pdr_size;
 	      if (!add_file_shuffle (ainfo, &ainfo->pdr, &ainfo->pdr_end,
 				     input_bfd, pos, size))
-		return false;
+		return FALSE;
 	    }
 	  BFD_ASSERT (external_opt_size == input_swap->external_opt_size);
 	  if (fdr.copt > 0)
@@ -1004,7 +1003,7 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	      unsigned long size = fdr.copt * external_opt_size;
 	      if (!add_file_shuffle (ainfo, &ainfo->opt, &ainfo->opt_end,
 				     input_bfd, pos, size))
-		return false;
+		return FALSE;
 	    }
 	}
       else
@@ -1027,11 +1026,11 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	  if (!out)
 	    {
 	      bfd_set_error (bfd_error_no_memory);
-	      return false;
+	      return FALSE;
 	    }
 	  if (!add_memory_shuffle (ainfo, &ainfo->pdr, &ainfo->pdr_end, out,
 				   sz))
-	    return false;
+	    return FALSE;
 	  for (; in < end; in += insz, out += outsz)
 	    {
 	      PDR pdr;
@@ -1068,11 +1067,11 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
 	  if (!out)
 	    {
 	      bfd_set_error (bfd_error_no_memory);
-	      return false;
+	      return FALSE;
 	    }
 	  if (!add_memory_shuffle (ainfo, &ainfo->opt, &ainfo->opt_end, out,
 				   sz))
-	    return false;
+	    return FALSE;
 	  for (; in < end; in += insz, out += outsz)
 	    {
 	      OPTR opt;
@@ -1104,16 +1103,15 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
       ++output_symhdr->ifdMax;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Add a string to the debugging information we are accumulating.
    Return the offset from the fdr string base.  */
 
-static long ecoff_add_string PARAMS ((struct accumulate *,
-				      struct bfd_link_info *,
-				      struct ecoff_debug_info *,
-				      FDR *fdr, const char *string));
+static long ecoff_add_string
+  PARAMS ((struct accumulate *, struct bfd_link_info *,
+	   struct ecoff_debug_info *, FDR *fdr, const char *string));
 
 static long
 ecoff_add_string (ainfo, info, debug, fdr, string)
@@ -1142,7 +1140,7 @@ ecoff_add_string (ainfo, info, debug, fdr, string)
     {
       struct string_hash_entry *sh;
 
-      sh = string_hash_lookup (&ainfo->str_hash, string, true, true);
+      sh = string_hash_lookup (&ainfo->str_hash, string, TRUE, TRUE);
       if (sh == (struct string_hash_entry *) NULL)
 	return -1;
       if (sh->val == -1)
@@ -1164,7 +1162,7 @@ ecoff_add_string (ainfo, info, debug, fdr, string)
 
 /* Add debugging information from a non-ECOFF file.  */
 
-boolean
+bfd_boolean
 bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
 				  output_swap, input_bfd, info)
      PTR handle;
@@ -1203,19 +1201,19 @@ bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
   fdr.rss = ecoff_add_string (ainfo, info, output_debug, &fdr,
 			      bfd_archive_filename (input_bfd));
   if (fdr.rss == -1)
-    return false;
+    return FALSE;
   fdr.isymBase = output_symhdr->isymMax;
 
   /* Get the local symbols from the input BFD.  */
   symsize = bfd_get_symtab_upper_bound (input_bfd);
   if (symsize < 0)
-    return false;
+    return FALSE;
   symbols = (asymbol **) bfd_alloc (output_bfd, (bfd_size_type) symsize);
   if (symbols == (asymbol **) NULL)
-    return false;
+    return FALSE;
   symcount = bfd_canonicalize_symtab (input_bfd, symbols);
   if (symcount < 0)
-    return false;
+    return FALSE;
   sym_end = symbols + symcount;
 
   /* Handle the local symbols.  Any external symbols are handled
@@ -1233,7 +1231,7 @@ bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
 					   (*sym_ptr)->name);
 
       if (internal_sym.iss == -1)
-	return false;
+	return FALSE;
       if (bfd_is_com_section ((*sym_ptr)->section)
 	  || bfd_is_und_section ((*sym_ptr)->section))
 	internal_sym.value = (*sym_ptr)->value;
@@ -1250,7 +1248,7 @@ bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
       if (!external_sym)
 	{
 	  bfd_set_error (bfd_error_no_memory);
-	  return false;
+	  return FALSE;
 	}
       (*swap_sym_out) (output_bfd, &internal_sym, external_sym);
       add_memory_shuffle (ainfo, &ainfo->sym, &ainfo->sym_end,
@@ -1271,7 +1269,7 @@ bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
   if (!external_fdr)
     {
       bfd_set_error (bfd_error_no_memory);
-      return false;
+      return FALSE;
     }
   (*output_swap->swap_fdr_out) (output_bfd, &fdr, external_fdr);
   add_memory_shuffle (ainfo, &ainfo->fdr, &ainfo->fdr_end,
@@ -1280,7 +1278,7 @@ bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
 
   ++output_symhdr->ifdMax;
 
-  return true;
+  return TRUE;
 }
 
 /* Set up ECOFF debugging information for the external symbols.
@@ -1288,14 +1286,14 @@ bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
    probably be changed to use a shuffle structure.  The assembler uses
    this interface, so that must be changed to do something else.  */
 
-boolean
+bfd_boolean
 bfd_ecoff_debug_externals (abfd, debug, swap, relocateable, get_extr,
 			   set_index)
      bfd *abfd;
      struct ecoff_debug_info *debug;
      const struct ecoff_debug_swap *swap;
-     boolean relocateable;
-     boolean (*get_extr) PARAMS ((asymbol *, EXTR *));
+     bfd_boolean relocateable;
+     bfd_boolean (*get_extr) PARAMS ((asymbol *, EXTR *));
      void (*set_index) PARAMS ((asymbol *, bfd_size_type));
 {
   HDRR * const symhdr = &debug->symbolic_header;
@@ -1304,7 +1302,7 @@ bfd_ecoff_debug_externals (abfd, debug, swap, relocateable, get_extr,
 
   sym_ptr_ptr = bfd_get_outsymbols (abfd);
   if (sym_ptr_ptr == NULL)
-    return true;
+    return TRUE;
 
   for (c = bfd_get_symcount (abfd); c > 0; c--, sym_ptr_ptr++)
     {
@@ -1349,15 +1347,15 @@ bfd_ecoff_debug_externals (abfd, debug, swap, relocateable, get_extr,
 
       if (! bfd_ecoff_debug_one_external (abfd, debug, swap,
 					  sym_ptr->name, &esym))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Add a single external symbol to the debugging information.  */
 
-boolean
+bfd_boolean
 bfd_ecoff_debug_one_external (abfd, debug, swap, name, esym)
      bfd *abfd;
      struct ecoff_debug_info *debug;
@@ -1379,7 +1377,7 @@ bfd_ecoff_debug_one_external (abfd, debug, swap, name, esym)
       if (! ecoff_add_bytes ((char **) &debug->ssext,
 			     (char **) &debug->ssext_end,
 			     symhdr->issExtMax + namelen + 1))
-	return false;
+	return FALSE;
     }
   if ((size_t) ((char *) debug->external_ext_end
 		- (char *) debug->external_ext)
@@ -1388,7 +1386,7 @@ bfd_ecoff_debug_one_external (abfd, debug, swap, name, esym)
       if (! ecoff_add_bytes ((char **) &debug->external_ext,
 			     (char **) &debug->external_ext_end,
 			     (symhdr->iextMax + 1) * (size_t) external_ext_size))
-	return false;
+	return FALSE;
     }
 
   esym->asym.iss = symhdr->issExtMax;
@@ -1402,7 +1400,7 @@ bfd_ecoff_debug_one_external (abfd, debug, swap, name, esym)
   strcpy (debug->ssext + symhdr->issExtMax, name);
   symhdr->issExtMax += namelen + 1;
 
-  return true;
+  return TRUE;
 }
 
 /* Align the ECOFF debugging information.  */
@@ -1503,7 +1501,7 @@ bfd_ecoff_debug_size (abfd, debug, swap)
    going to be placed at.  This assumes that the counts are set
    correctly.  */
 
-static boolean
+static bfd_boolean
 ecoff_write_symhdr (abfd, debug, swap, where)
      bfd *abfd;
      struct ecoff_debug_info *debug;
@@ -1517,7 +1515,7 @@ ecoff_write_symhdr (abfd, debug, swap, where)
 
   /* Go to the right location in the file.  */
   if (bfd_seek (abfd, where, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   where += swap->external_hdr_size;
 
@@ -1557,11 +1555,11 @@ ecoff_write_symhdr (abfd, debug, swap, where)
 
   if (buff != NULL)
     free (buff);
-  return true;
+  return TRUE;
  error_return:
   if (buff != NULL)
     free (buff);
-  return false;
+  return FALSE;
 }
 
 /* Write out the ECOFF debugging information.  This function assumes
@@ -1570,7 +1568,7 @@ ecoff_write_symhdr (abfd, debug, swap, where)
    information to.  This function fills in the file offsets in the
    symbolic header.  */
 
-boolean
+bfd_boolean
 bfd_ecoff_write_debug (abfd, debug, swap, where)
      bfd *abfd;
      struct ecoff_debug_info *debug;
@@ -1580,14 +1578,14 @@ bfd_ecoff_write_debug (abfd, debug, swap, where)
   HDRR * const symhdr = &debug->symbolic_header;
 
   if (! ecoff_write_symhdr (abfd, debug, swap, where))
-    return false;
+    return FALSE;
 
 #define WRITE(ptr, count, size, offset) \
   BFD_ASSERT (symhdr->offset == 0 \
 	      || (bfd_vma) bfd_tell (abfd) == symhdr->offset); \
   if (bfd_bwrite ((PTR) debug->ptr, (bfd_size_type) size * symhdr->count, abfd)\
       != size * symhdr->count) \
-    return false;
+    return FALSE;
 
   WRITE (line, cbLine, sizeof (unsigned char), cbLineOffset);
   WRITE (external_dnr, idnMax, swap->external_dnr_size, cbDnOffset);
@@ -1603,16 +1601,16 @@ bfd_ecoff_write_debug (abfd, debug, swap, where)
   WRITE (external_ext, iextMax, swap->external_ext_size, cbExtOffset);
 #undef WRITE
 
-  return true;
+  return TRUE;
 }
 
 /* Write out a shuffle list.  */
 
-static boolean ecoff_write_shuffle PARAMS ((bfd *,
-					    const struct ecoff_debug_swap *,
-					    struct shuffle *, PTR space));
+static bfd_boolean ecoff_write_shuffle
+  PARAMS ((bfd *, const struct ecoff_debug_swap *, struct shuffle *,
+	   PTR space));
 
-static boolean
+static bfd_boolean
 ecoff_write_shuffle (abfd, swap, shuffle, space)
      bfd *abfd;
      const struct ecoff_debug_swap *swap;
@@ -1629,7 +1627,7 @@ ecoff_write_shuffle (abfd, swap, shuffle, space)
 	{
 	  if (bfd_bwrite (l->u.memory, (bfd_size_type) l->size, abfd)
 	      != l->size)
-	    return false;
+	    return FALSE;
 	}
       else
 	{
@@ -1637,7 +1635,7 @@ ecoff_write_shuffle (abfd, swap, shuffle, space)
 	      || bfd_bread (space, (bfd_size_type) l->size,
 			   l->u.file.input_bfd) != l->size
 	      || bfd_bwrite (space, (bfd_size_type) l->size, abfd) != l->size)
-	    return false;
+	    return FALSE;
 	}
       total += l->size;
     }
@@ -1650,23 +1648,23 @@ ecoff_write_shuffle (abfd, swap, shuffle, space)
       i = swap->debug_align - (total & (swap->debug_align - 1));
       s = (bfd_byte *) bfd_zmalloc ((bfd_size_type) i);
       if (s == NULL && i != 0)
-	return false;
+	return FALSE;
 
       if (bfd_bwrite ((PTR) s, (bfd_size_type) i, abfd) != i)
 	{
 	  free (s);
-	  return false;
+	  return FALSE;
 	}
       free (s);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out debugging information using accumulated linker
    information.  */
 
-boolean
+bfd_boolean
 bfd_ecoff_write_accumulated_debug (handle, abfd, debug, swap, info, where)
      PTR handle;
      bfd *abfd;
@@ -1784,12 +1782,12 @@ bfd_ecoff_write_accumulated_debug (handle, abfd, debug, swap, info, where)
 
   if (space != NULL)
     free (space);
-  return true;
+  return TRUE;
 
  error_return:
   if (space != NULL)
     free (space);
-  return false;
+  return FALSE;
 }
 
 /* Handle the find_nearest_line function for both ECOFF and MIPS ELF
@@ -1820,7 +1818,7 @@ cmp_fdrtab_entry (leftp, rightp)
    table will be sorted by address so we can look it up via binary
    search.  */
 
-static boolean
+static bfd_boolean
 mk_fdrtab (abfd, debug_info, debug_swap, line_info)
      bfd *abfd;
      struct ecoff_debug_info * const debug_info;
@@ -1831,7 +1829,7 @@ mk_fdrtab (abfd, debug_info, debug_swap, line_info)
   FDR *fdr_ptr;
   FDR *fdr_start;
   FDR *fdr_end;
-  boolean stabs;
+  bfd_boolean stabs;
   long len;
   bfd_size_type amt;
 
@@ -1851,7 +1849,7 @@ mk_fdrtab (abfd, debug_info, debug_swap, line_info)
   amt = (bfd_size_type) len * sizeof (struct ecoff_fdrtab_entry);
   line_info->fdrtab = (struct ecoff_fdrtab_entry*) bfd_zalloc (abfd, amt);
   if (line_info->fdrtab == NULL)
-    return false;
+    return FALSE;
   line_info->fdrtab_len = len;
 
   tab = line_info->fdrtab;
@@ -1863,7 +1861,7 @@ mk_fdrtab (abfd, debug_info, debug_swap, line_info)
       /* Check whether this file has stabs debugging information.  In
 	 a file with stabs debugging information, the second local
 	 symbol is named @stabs.  */
-      stabs = false;
+      stabs = FALSE;
       if (fdr_ptr->csym >= 2)
 	{
 	  char *sym_ptr;
@@ -1874,7 +1872,7 @@ mk_fdrtab (abfd, debug_info, debug_swap, line_info)
 	  (*debug_swap->swap_sym_in) (abfd, sym_ptr, &sym);
 	  if (strcmp (debug_info->ss + fdr_ptr->issBase + sym.iss,
 		      STABS_SYMBOL) == 0)
-	    stabs = true;
+	    stabs = TRUE;
 	}
 
       if (!stabs)
@@ -1909,7 +1907,7 @@ mk_fdrtab (abfd, debug_info, debug_swap, line_info)
   qsort ((PTR) line_info->fdrtab, (size_t) len,
 	 sizeof (struct ecoff_fdrtab_entry), cmp_fdrtab_entry);
 
-  return true;
+  return TRUE;
 }
 
 /* Return index of first FDR that covers to OFFSET.  */
@@ -1956,7 +1954,7 @@ fdrtab_lookup (line_info, offset)
 /* Look up a line given an address, storing the information in
    LINE_INFO->cache.  */
 
-static boolean
+static bfd_boolean
 lookup_line (abfd, debug_info, debug_swap, line_info)
      bfd *abfd;
      struct ecoff_debug_info * const debug_info;
@@ -1965,7 +1963,7 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
 {
   struct ecoff_fdrtab_entry *tab;
   bfd_vma offset;
-  boolean stabs;
+  bfd_boolean stabs;
   FDR *fdr_ptr;
   int i;
 
@@ -1975,20 +1973,20 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
      don't have it already.  */
   if (line_info->fdrtab == NULL
       && !mk_fdrtab (abfd, debug_info, debug_swap, line_info))
-    return false;
+    return FALSE;
 
   tab = line_info->fdrtab;
 
   /* find first FDR for address OFFSET */
   i = fdrtab_lookup (line_info, offset);
   if (i < 0)
-    return false;		/* no FDR, no fun...  */
+    return FALSE;		/* no FDR, no fun...  */
   fdr_ptr = tab[i].fdr;
 
   /* Check whether this file has stabs debugging information.  In a
      file with stabs debugging information, the second local symbol is
      named @stabs.  */
-  stabs = false;
+  stabs = FALSE;
   if (fdr_ptr->csym >= 2)
     {
       char *sym_ptr;
@@ -1999,7 +1997,7 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
       (*debug_swap->swap_sym_in) (abfd, sym_ptr, &sym);
       if (strcmp (debug_info->ss + fdr_ptr->issBase + sym.iss,
 		  STABS_SYMBOL) == 0)
-	stabs = true;
+	stabs = TRUE;
     }
 
   if (!stabs)
@@ -2120,7 +2118,7 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
 	     && tab[i].base_addr == tab[i - 1].base_addr);
 
       if (!best_fdr || !best_pdr)
-	return false;			/* shouldn't happen...  */
+	return FALSE;			/* shouldn't happen...  */
 
       /* phew, finally we got something that we can hold onto: */
       fdr_ptr = best_fdr;
@@ -2213,8 +2211,8 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
       const char *line_file_name;
       bfd_vma low_func_vma;
       bfd_vma low_line_vma;
-      boolean past_line;
-      boolean past_fn;
+      bfd_boolean past_line;
+      bfd_boolean past_fn;
       char *sym_ptr, *sym_ptr_end;
       size_t len, funclen;
       char *buffer = NULL;
@@ -2240,8 +2238,8 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
       line_file_name = NULL;
       low_func_vma = 0;
       low_line_vma = 0;
-      past_line = false;
-      past_fn = false;
+      past_line = FALSE;
+      past_fn = FALSE;
 
       external_sym_size = debug_swap->external_sym_size;
 
@@ -2291,7 +2289,7 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
 
 		case N_FUN:
 		  if (sym.value > offset)
-		    past_fn = true;
+		    past_fn = TRUE;
 		  else if (sym.value >= low_func_vma)
 		    {
 		      low_func_vma = sym.value;
@@ -2304,7 +2302,7 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
 	  else if (sym.st == stLabel && sym.index != indexNil)
 	    {
 	      if (sym.value > offset)
-		past_line = true;
+		past_line = TRUE;
 	      else if (sym.value >= low_line_vma)
 		{
 		  low_line_vma = sym.value;
@@ -2336,7 +2334,7 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
 	    free (line_info->find_buffer);
 	  buffer = (char *) bfd_malloc ((bfd_size_type) len);
 	  if (buffer == NULL)
-	    return false;
+	    return FALSE;
 	  line_info->find_buffer = buffer;
 	}
 
@@ -2364,12 +2362,12 @@ lookup_line (abfd, debug_info, debug_swap, line_info)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Do the work of find_nearest_line.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_locate_line (abfd, section, offset, debug_info, debug_swap,
 			line_info, filename_ptr, functionname_ptr, retline_ptr)
      bfd *abfd;
@@ -2395,7 +2393,7 @@ _bfd_ecoff_locate_line (abfd, section, offset, debug_info, debug_swap,
       if (! lookup_line (abfd, debug_info, debug_swap, line_info))
 	{
 	  line_info->cache.sect = NULL;
-	  return false;
+	  return FALSE;
 	}
     }
 
@@ -2403,7 +2401,7 @@ _bfd_ecoff_locate_line (abfd, section, offset, debug_info, debug_swap,
   *functionname_ptr = line_info->cache.functionname;
   *retline_ptr = line_info->cache.line_num;
 
-  return true;
+  return TRUE;
 }
 
 /* These routines copy symbolic information into a memory buffer.
@@ -2416,9 +2414,10 @@ _bfd_ecoff_locate_line (abfd, section, offset, debug_info, debug_swap,
 
 /* Collect a shuffle into a memory buffer.  */
 
-static boolean ecoff_collect_shuffle PARAMS ((struct shuffle *, bfd_byte *));
+static bfd_boolean ecoff_collect_shuffle
+  PARAMS ((struct shuffle *, bfd_byte *));
 
-static boolean
+static bfd_boolean
 ecoff_collect_shuffle (l, buff)
      struct shuffle *l;
      bfd_byte *buff;
@@ -2435,18 +2434,18 @@ ecoff_collect_shuffle (l, buff)
 	  if (bfd_seek (l->u.file.input_bfd, l->u.file.offset, SEEK_SET) != 0
 	      || (bfd_bread (buff, (bfd_size_type) l->size, l->u.file.input_bfd)
 		  != l->size))
-	    return false;
+	    return FALSE;
 	}
       total += l->size;
       buff += l->size;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Copy PDR information into a memory buffer.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_get_accumulated_pdr (handle, buff)
      PTR handle;
      bfd_byte *buff;
@@ -2458,7 +2457,7 @@ _bfd_ecoff_get_accumulated_pdr (handle, buff)
 
 /* Copy symbol information into a memory buffer.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_get_accumulated_sym (handle, buff)
      PTR handle;
      bfd_byte *buff;
@@ -2470,7 +2469,7 @@ _bfd_ecoff_get_accumulated_sym (handle, buff)
 
 /* Copy the string table into a memory buffer.  */
 
-boolean
+bfd_boolean
 _bfd_ecoff_get_accumulated_ss (handle, buff)
      PTR handle;
      bfd_byte *buff;
@@ -2497,5 +2496,5 @@ _bfd_ecoff_get_accumulated_ss (handle, buff)
       buff += len + 1;
     }
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/efi-app-ia32.c b/bfd/efi-app-ia32.c
index 8519f99a0ba..03152213ada 100644
--- a/bfd/efi-app-ia32.c
+++ b/bfd/efi-app-ia32.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Intel IA-32 EFI application files.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
    Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define TARGET_NAME "efi-app-ia32"
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 #define TARGET_UNDERSCORE '_'
 #define COFF_LONG_SECTION_NAMES
 #define PEI_TARGET_SUBSYSTEM	IMAGE_SUBSYSTEM_EFI_APPLICATION
diff --git a/bfd/efi-app-ia64.c b/bfd/efi-app-ia64.c
index 61045682ee8..c7e9bcfc33c 100644
--- a/bfd/efi-app-ia64.c
+++ b/bfd/efi-app-ia64.c
@@ -1,5 +1,5 @@
 /* BFD back-end for HP/Intel IA-64 EFI application files.
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
 #define COFF_WITH_pep
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 #define TARGET_UNDERSCORE '_'
 #define COFF_LONG_SECTION_NAMES
 #define PEI_TARGET_SUBSYSTEM		IMAGE_SUBSYSTEM_EFI_APPLICATION
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 18cf8cbfa60..8e5e024edc1 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -139,7 +139,7 @@ struct elf_link_hash_entry
      and track a size while the symbol is still undefined.  It is indexed
      via offset/sizeof(target_void_pointer).  */
   size_t vtable_entries_size;
-  boolean *vtable_entries_used;
+  bfd_boolean *vtable_entries_used;
 
   /* Virtual table derivation info.  */
   struct elf_link_hash_entry *vtable_parent;
@@ -305,7 +305,7 @@ struct eh_frame_hdr_info
   /* TRUE if .eh_frame_hdr should contain the sorted search table.
      We build it if we successfully read all .eh_frame input sections
      and recognize them.  */
-  boolean table;
+  bfd_boolean table;
 };
 
 /* Cached start, size and alignment of PT_TLS segment.  */
@@ -324,7 +324,7 @@ struct elf_link_hash_table
 
   /* Whether we have created the special dynamic sections required
      when linking against or generating a shared object.  */
-  boolean dynamic_sections_created;
+  bfd_boolean dynamic_sections_created;
 
   /* The BFD used to hold special sections created by the linker.
      This will be the first BFD found which requires these sections to
@@ -391,14 +391,14 @@ struct elf_link_hash_table
 #define elf_link_hash_traverse(table, func, info)			\
   (bfd_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the ELF linker hash table from a link_info structure.  */
 
 #define elf_hash_table(p) ((struct elf_link_hash_table *) ((p)->hash))
 
-/* Returns true if the hash table is a struct elf_link_hash_table.  */
+/* Returns TRUE if the hash table is a struct elf_link_hash_table.  */
 #define is_elf_hash_table(p)					      	\
   ((p)->hash->type == bfd_link_elf_hash_table)
 
@@ -432,7 +432,7 @@ struct elf_size_info {
   unsigned char elfclass, ev_current;
   int (*write_out_phdrs)
     PARAMS ((bfd *, const Elf_Internal_Phdr *, unsigned int));
-  boolean (*write_shdrs_and_ehdr)
+  bfd_boolean (*write_shdrs_and_ehdr)
     PARAMS ((bfd *));
   void (*write_relocs)
     PARAMS ((bfd *, asection *, PTR));
@@ -440,10 +440,10 @@ struct elf_size_info {
     PARAMS ((bfd *, const PTR, const PTR, Elf_Internal_Sym *));
   void (*swap_symbol_out)
     PARAMS ((bfd *, const Elf_Internal_Sym *, PTR, PTR));
-  boolean (*slurp_reloc_table)
-    PARAMS ((bfd *, asection *, asymbol **, boolean));
+  bfd_boolean (*slurp_reloc_table)
+    PARAMS ((bfd *, asection *, asymbol **, bfd_boolean));
   long (*slurp_symbol_table)
-    PARAMS ((bfd *, asymbol **, boolean));
+    PARAMS ((bfd *, asymbol **, bfd_boolean));
   void (*swap_dyn_in)
     PARAMS ((bfd *, const PTR, Elf_Internal_Dyn *));
   void (*swap_dyn_out)
@@ -491,7 +491,7 @@ struct elf_reloc_cookie
   size_t locsymcount;
   size_t extsymoff;
   struct elf_link_hash_entry **sym_hashes;
-  boolean bad_symtab;
+  bfd_boolean bad_symtab;
 };
 
 /* The level of IRIX compatibility we're striving for.  */
@@ -528,7 +528,7 @@ struct elf_backend_data
      This should be NULL for most targets, in which case the correct
      thing will be done.  MIPS ELF, at least on the Irix 5, has
      special requirements.  */
-  boolean (*elf_backend_sym_is_global)
+  bfd_boolean (*elf_backend_sym_is_global)
     PARAMS ((bfd *, asymbol *));
 
   /* The remaining functions are hooks which are called only if they
@@ -538,9 +538,9 @@ struct elf_backend_data
      particular BFD format is relevant for an object file, and to
      permit the backend to set any global information it wishes.  When
      this is called elf_elfheader is set, but anything else should be
-     used with caution.  If this returns false, the check_format
+     used with caution.  If this returns FALSE, the check_format
      routine will return a bfd_error_wrong_format error.  */
-  boolean (*elf_backend_object_p)
+  bfd_boolean (*elf_backend_object_p)
     PARAMS ((bfd *));
 
   /* A function to do additional symbol processing when reading the
@@ -551,7 +551,7 @@ struct elf_backend_data
 
   /* A function to do additional symbol processing after reading the
      entire ELF symbol table.  */
-  boolean (*elf_backend_symbol_table_processing)
+  bfd_boolean (*elf_backend_symbol_table_processing)
     PARAMS ((bfd *, elf_symbol_type *, unsigned int));
 
    /* A function to set the type of the info field.  Processor-specific
@@ -563,35 +563,35 @@ struct elf_backend_data
      just before writing it out.  This is used to set the flags and
      type fields for some sections, or to actually write out data for
      unusual sections.  */
-  boolean (*elf_backend_section_processing)
+  bfd_boolean (*elf_backend_section_processing)
     PARAMS ((bfd *, Elf_Internal_Shdr *));
 
   /* A function to handle unusual section types when creating BFD
      sections from ELF sections.  */
-  boolean (*elf_backend_section_from_shdr)
+  bfd_boolean (*elf_backend_section_from_shdr)
     PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
 
   /* A function to convert machine dependent section header flags to
      BFD internal section header flags.  */
-  boolean (*elf_backend_section_flags)
+  bfd_boolean (*elf_backend_section_flags)
     PARAMS ((flagword *, Elf_Internal_Shdr *));
 
   /* A function to handle unusual program segment types when creating BFD
      sections from ELF program segments.  */
-  boolean (*elf_backend_section_from_phdr)
+  bfd_boolean (*elf_backend_section_from_phdr)
     PARAMS ((bfd *, Elf_Internal_Phdr *, int));
 
   /* A function to set up the ELF section header for a BFD section in
      preparation for writing it out.  This is where the flags and type
      fields are set for unusual sections.  */
-  boolean (*elf_backend_fake_sections)
+  bfd_boolean (*elf_backend_fake_sections)
     PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
 
   /* A function to get the ELF section index for a BFD section.  If
-     this returns true, the section was found.  If it is a normal ELF
+     this returns TRUE, the section was found.  If it is a normal ELF
      section, *RETVAL should be left unchanged.  If it is not a normal
      ELF section *RETVAL should be set to the SHN_xxxx index.  */
-  boolean (*elf_backend_section_from_bfd_section)
+  bfd_boolean (*elf_backend_section_from_bfd_section)
     PARAMS ((bfd *, asection *, int *retval));
 
   /* If this field is not NULL, it is called by the add_symbols phase
@@ -602,14 +602,14 @@ struct elf_backend_data
      handling all processor dependent symbol bindings and section
      indices, and must set at least *FLAGS and *SEC for each processor
      dependent case; failure to do so will cause a link error.  */
-  boolean (*elf_add_symbol_hook)
+  bfd_boolean (*elf_add_symbol_hook)
     PARAMS ((bfd *abfd, struct bfd_link_info *info,
 	     const Elf_Internal_Sym *, const char **name,
 	     flagword *flags, asection **sec, bfd_vma *value));
 
   /* If this field is not NULL, it is called by the elf_link_output_sym
      phase of a link for each symbol which will appear in the object file.  */
-  boolean (*elf_backend_link_output_symbol_hook)
+  bfd_boolean (*elf_backend_link_output_symbol_hook)
     PARAMS ((bfd *, struct bfd_link_info *info, const char *,
 	     Elf_Internal_Sym *, asection *));
 
@@ -621,7 +621,7 @@ struct elf_backend_data
      created, and this function may modify the section flags if
      desired.  This function will normally create the .got and .plt
      sections, but different backends have different requirements.  */
-  boolean (*elf_backend_create_dynamic_sections)
+  bfd_boolean (*elf_backend_create_dynamic_sections)
     PARAMS ((bfd *abfd, struct bfd_link_info *info));
 
   /* The CHECK_RELOCS function is called by the add_symbols phase of
@@ -634,7 +634,7 @@ struct elf_backend_data
      relocs are always passed as Rela structures; if the section
      actually uses Rel structures, the r_addend field will always be
      zero.  */
-  boolean (*check_relocs)
+  bfd_boolean (*check_relocs)
     PARAMS ((bfd *abfd, struct bfd_link_info *info, asection *o,
 	     const Elf_Internal_Rela *relocs));
 
@@ -650,14 +650,14 @@ struct elf_backend_data
      the link can deal with.  This will normally involve adding an
      entry to the .plt or .got or some such section, and setting the
      symbol to point to that.  */
-  boolean (*elf_backend_adjust_dynamic_symbol)
+  bfd_boolean (*elf_backend_adjust_dynamic_symbol)
     PARAMS ((struct bfd_link_info *info, struct elf_link_hash_entry *h));
 
   /* The ALWAYS_SIZE_SECTIONS function is called by the backend linker
      after all the linker input files have been seen but before the
      section sizes have been set.  This is called after
      ADJUST_DYNAMIC_SYMBOL, but before SIZE_DYNAMIC_SECTIONS.  */
-  boolean (*elf_backend_always_size_sections)
+  bfd_boolean (*elf_backend_always_size_sections)
     PARAMS ((bfd *output_bfd, struct bfd_link_info *info));
 
   /* The SIZE_DYNAMIC_SECTIONS function is called by the ELF backend
@@ -670,7 +670,7 @@ struct elf_backend_data
      .dynstr and .hash sections.  This function must handle the
      .interp section and any sections created by the
      CREATE_DYNAMIC_SECTIONS entry point.  */
-  boolean (*elf_backend_size_dynamic_sections)
+  bfd_boolean (*elf_backend_size_dynamic_sections)
     PARAMS ((bfd *output_bfd, struct bfd_link_info *info));
 
   /* The RELOCATE_SECTION function is called by the ELF backend linker
@@ -701,7 +701,7 @@ struct elf_backend_data
      going to be the section symbol corresponding to the output
      section, which means that the addend must be adjusted
      accordingly.  */
-  boolean (*elf_backend_relocate_section)
+  bfd_boolean (*elf_backend_relocate_section)
     PARAMS ((bfd *output_bfd, struct bfd_link_info *info,
 	     bfd *input_bfd, asection *input_section, bfd_byte *contents,
 	     Elf_Internal_Rela *relocs, Elf_Internal_Sym *local_syms,
@@ -714,7 +714,7 @@ struct elf_backend_data
      dynamic sections.  Note that FINISH_DYNAMIC_SYMBOL is called on
      all .dynsym symbols, while ADJUST_DYNAMIC_SYMBOL is only called
      on those symbols which are defined by a dynamic object.  */
-  boolean (*elf_backend_finish_dynamic_symbol)
+  bfd_boolean (*elf_backend_finish_dynamic_symbol)
     PARAMS ((bfd *output_bfd, struct bfd_link_info *info,
 	     struct elf_link_hash_entry *h, Elf_Internal_Sym *sym));
 
@@ -722,7 +722,7 @@ struct elf_backend_data
      linker just before it writes all the dynamic sections out to the
      output file.  The FINISH_DYNAMIC_SYMBOL will have been called on
      all dynamic symbols.  */
-  boolean (*elf_backend_finish_dynamic_sections)
+  bfd_boolean (*elf_backend_finish_dynamic_sections)
     PARAMS ((bfd *output_bfd, struct bfd_link_info *info));
 
   /* A function to do any beginning processing needed for the ELF file
@@ -731,10 +731,10 @@ struct elf_backend_data
     PARAMS ((bfd *, struct bfd_link_info *));
 
   /* A function to do any final processing needed for the ELF file
-     before writing it out.  The LINKER argument is true if this BFD
+     before writing it out.  The LINKER argument is TRUE if this BFD
      was created by the ELF backend linker.  */
   void (*elf_backend_final_write_processing)
-    PARAMS ((bfd *, boolean linker));
+    PARAMS ((bfd *, bfd_boolean linker));
 
   /* This function is called by get_program_header_size.  It should
      return the number of additional program segments which this BFD
@@ -744,7 +744,7 @@ struct elf_backend_data
 
   /* This function is called to modify an existing segment map in a
      backend specific fashion.  */
-  boolean (*elf_backend_modify_segment_map)
+  bfd_boolean (*elf_backend_modify_segment_map)
     PARAMS ((bfd *));
 
   /* This function is called during section gc to discover the section a
@@ -756,7 +756,7 @@ struct elf_backend_data
   /* This function, if defined, is called during the sweep phase of gc
      in order that a backend might update any data structures it might
      be maintaining.  */
-  boolean (*gc_sweep_hook)
+  bfd_boolean (*gc_sweep_hook)
     PARAMS ((bfd *abfd, struct bfd_link_info *info, asection *o,
 	     const Elf_Internal_Rela *relocs));
 
@@ -776,9 +776,9 @@ struct elf_backend_data
      global symbols converted to locals are emited into the symtab
      section.  It allows the backend to emit special global symbols
      not handled in the hash table.  */
-  boolean (*elf_backend_output_arch_syms)
+  bfd_boolean (*elf_backend_output_arch_syms)
     PARAMS ((bfd *, struct bfd_link_info *, PTR,
-	    boolean (*) (PTR, const char *, Elf_Internal_Sym *, asection *)));
+	    bfd_boolean (*) (PTR, const char *, Elf_Internal_Sym *, asection *)));
 
   /* Copy any information related to dynamic linking from a pre-existing
      symbol to a newly created symbol.  Also called to copy flags and
@@ -792,11 +792,11 @@ struct elf_backend_data
   /* Modify any information related to dynamic linking such that the
      symbol is not exported.  */
   void (*elf_backend_hide_symbol)
-    PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
+    PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean));
 
   /* Emit relocations.  Overrides default routine for emitting relocs,
      except during a relocatable link, or if all relocs are being emitted.  */
-  boolean (*elf_backend_emit_relocs)
+  bfd_boolean (*elf_backend_emit_relocs)
     PARAMS ((bfd *, asection *, Elf_Internal_Shdr *, Elf_Internal_Rela *));
 
   /* Count relocations.  Not called for relocatable links
@@ -806,12 +806,12 @@ struct elf_backend_data
 
   /* This function, if defined, is called when an NT_PRSTATUS note is found
      in a core file. */
-  boolean (*elf_backend_grok_prstatus)
+  bfd_boolean (*elf_backend_grok_prstatus)
     PARAMS ((bfd *, Elf_Internal_Note *));
 
   /* This function, if defined, is called when an NT_PSINFO or NT_PRPSINFO
      note is found in a core file. */
-  boolean (*elf_backend_grok_psinfo)
+  bfd_boolean (*elf_backend_grok_psinfo)
     PARAMS ((bfd *, Elf_Internal_Note *));
 
   /* Functions to print VMAs.  Special code to handle 64 bit ELF files.  */
@@ -826,17 +826,17 @@ struct elf_backend_data
 
   /* This function, if defined, removes information about discarded functions
      from other sections which mention them.  */
-  boolean (*elf_backend_discard_info)
+  bfd_boolean (*elf_backend_discard_info)
     PARAMS ((bfd *, struct elf_reloc_cookie *, struct bfd_link_info *));
 
   /* This function, if defined, signals that the function above has removed
      the discarded relocations for this section.  */
-  boolean (*elf_backend_ignore_discarded_relocs)
+  bfd_boolean (*elf_backend_ignore_discarded_relocs)
     PARAMS ((asection *));
 
   /* This function, if defined, may write out the given section.
-     Returns true if it did so and false if the caller should.  */
-  boolean (*elf_backend_write_section)
+     Returns TRUE if it did so and FALSE if the caller should.  */
+  bfd_boolean (*elf_backend_write_section)
     PARAMS ((bfd *, asection *, bfd_byte *));
 
   /* The level of IRIX compatibility we're striving for.
@@ -845,7 +845,7 @@ struct elf_backend_data
     PARAMS ((bfd *));
 
   reloc_howto_type *(*elf_backend_mips_rtype_to_howto)
-    PARAMS ((unsigned int, boolean));
+    PARAMS ((unsigned int, bfd_boolean));
 
   /* The swapping table to use when dealing with ECOFF information.
      Used for the MIPS ELF .mdebug section.  */
@@ -866,14 +866,14 @@ struct elf_backend_data
   bfd_vma got_header_size;
   bfd_vma plt_header_size;
 
-  /* This is true if the linker should act like collect and gather
-     global constructors and destructors by name.  This is true for
+  /* This is TRUE if the linker should act like collect and gather
+     global constructors and destructors by name.  This is TRUE for
      MIPS ELF because the Irix 5 tools can not handle the .init
      section.  */
   unsigned collect : 1;
 
-  /* This is true if the linker should ignore changes to the type of a
-     symbol.  This is true for MIPS ELF because some Irix 5 objects
+  /* This is TRUE if the linker should ignore changes to the type of a
+     symbol.  This is TRUE for MIPS ELF because some Irix 5 objects
      record undefined functions as STT_OBJECT although the definitions
      are STT_FUNC.  */
   unsigned type_change_ok : 1;
@@ -900,7 +900,7 @@ struct elf_backend_data
      backend relocate_section routine for relocatable linking.  */
   unsigned rela_normal : 1;
 
-  /* True if addresses "naturally" sign extend.  This is used when
+  /* TRUE if addresses "naturally" sign extend.  This is used when
      swapping in from Elf32 when BFD64.  */
   unsigned sign_extend_vma : 1;
 
@@ -1009,7 +1009,7 @@ struct bfd_elf_section_data
 #define elf_next_in_group(sec) (elf_section_data(sec)->next_in_group)
 #define elf_linkonce_p(sec)    (elf_section_data(sec)->linkonce_p)
 
-/* Return true if section has been discarded.  */
+/* Return TRUE if section has been discarded.  */
 #define elf_discarded_section(sec)					\
   (!bfd_is_abs_section(sec)						\
    && bfd_is_abs_section((sec)->output_section)				\
@@ -1048,7 +1048,7 @@ typedef struct elf_linker_section
   bfd_vma hole_offset;			/* current offset for the hole */
   bfd_vma max_hole_offset;		/* maximum offset for the hole */
   elf_linker_section_enum_t which;	/* which section this is */
-  boolean hole_written_p;		/* whether the hole has been initialized */
+  bfd_boolean hole_written_p;		/* whether the hole has been initialized */
   unsigned int alignment;		/* alignment for the section */
   flagword flags;			/* flags to use to create the section */
 } elf_linker_section_t;
@@ -1062,7 +1062,7 @@ typedef struct elf_linker_section_pointers
   bfd_vma offset;				/* offset of pointer from beginning of section */
   bfd_vma addend;				/* addend used */
   elf_linker_section_enum_t which;		/* which linker section this is */
-  boolean written_address_p;			/* whether address was written yet */
+  bfd_boolean written_address_p;		/* whether address was written yet */
 } elf_linker_section_pointers_t;
 
 /* Some private data is stashed away for future use using the tdata pointer
@@ -1113,9 +1113,9 @@ struct elf_obj_tdata
   char* core_program;
   char* core_command;
 
-  /* This is set to true if the object was created by the backend
+  /* This is set to TRUE if the object was created by the backend
      linker.  */
-  boolean linker;
+  bfd_boolean linker;
 
   /* A mapping from external symbols to entries in the linker hash
      table, used when linking.  This is indexed by the symbol index
@@ -1162,7 +1162,7 @@ struct elf_obj_tdata
      this BFD appears to be screwed up.  If it is, we ignore the
      sh_info field in the symbol table header, and always read all the
      symbols.  */
-  boolean bad_symtab;
+  bfd_boolean bad_symtab;
 
   /* Records the result of `get_program_header_size'.  */
   bfd_size_type program_header_size;
@@ -1192,7 +1192,7 @@ struct elf_obj_tdata
   asection *eh_frame_hdr;
 
   /* Used to determine if the e_flags field has been initialized */
-  boolean flags_init;
+  bfd_boolean flags_init;
 
   /* Number of symbol version definitions we are about to emit.  */
   unsigned int cverdefs;
@@ -1277,9 +1277,9 @@ extern Elf_Internal_Sym *bfd_elf_get_elf_syms
   PARAMS ((bfd *, Elf_Internal_Shdr *, size_t, size_t,
 	   Elf_Internal_Sym *, PTR, Elf_External_Sym_Shndx *));
 
-extern boolean _bfd_elf_copy_private_bfd_data
+extern bfd_boolean _bfd_elf_copy_private_bfd_data
   PARAMS ((bfd *, bfd *));
-extern boolean _bfd_elf_print_private_bfd_data
+extern bfd_boolean _bfd_elf_print_private_bfd_data
   PARAMS ((bfd *, PTR));
 extern void bfd_elf_print_symbol
   PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
@@ -1310,15 +1310,15 @@ extern unsigned long bfd_elf_hash
 
 extern bfd_reloc_status_type bfd_elf_generic_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-extern boolean bfd_elf_mkobject
+extern bfd_boolean bfd_elf_mkobject
   PARAMS ((bfd *));
-extern boolean bfd_elf_mkcorefile
+extern bfd_boolean bfd_elf_mkcorefile
   PARAMS ((bfd *));
 extern Elf_Internal_Shdr *bfd_elf_find_section
   PARAMS ((bfd *, char *));
-extern boolean _bfd_elf_make_section_from_shdr
+extern bfd_boolean _bfd_elf_make_section_from_shdr
   PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
-extern boolean _bfd_elf_make_section_from_phdr
+extern bfd_boolean _bfd_elf_make_section_from_phdr
   PARAMS ((bfd *, Elf_Internal_Phdr *, int, const char *));
 extern struct bfd_hash_entry *_bfd_elf_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
@@ -1328,31 +1328,31 @@ extern void _bfd_elf_link_hash_copy_indirect
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
 extern void _bfd_elf_link_hash_hide_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
-extern boolean _bfd_elf_link_hash_table_init
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean));
+extern bfd_boolean _bfd_elf_link_hash_table_init
   PARAMS ((struct elf_link_hash_table *, bfd *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
 				       const char *)));
-extern boolean _bfd_elf_slurp_version_tables
+extern bfd_boolean _bfd_elf_slurp_version_tables
   PARAMS ((bfd *));
-extern boolean _bfd_elf_merge_sections
+extern bfd_boolean _bfd_elf_merge_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf_discard_group
+extern bfd_boolean bfd_elf_discard_group
   PARAMS ((bfd *, struct sec *));
 extern void bfd_elf_set_group_contents
   PARAMS ((bfd *, asection *, PTR));
 extern void _bfd_elf_link_just_syms
   PARAMS ((asection *, struct bfd_link_info *));
-extern boolean _bfd_elf_copy_private_symbol_data
+extern bfd_boolean _bfd_elf_copy_private_symbol_data
   PARAMS ((bfd *, asymbol *, bfd *, asymbol *));
-extern boolean _bfd_elf_copy_private_section_data
+extern bfd_boolean _bfd_elf_copy_private_section_data
   PARAMS ((bfd *, asection *, bfd *, asection *));
-extern boolean _bfd_elf_write_object_contents
+extern bfd_boolean _bfd_elf_write_object_contents
   PARAMS ((bfd *));
-extern boolean _bfd_elf_write_corefile_contents
+extern bfd_boolean _bfd_elf_write_corefile_contents
   PARAMS ((bfd *));
-extern boolean _bfd_elf_set_section_contents
+extern bfd_boolean _bfd_elf_set_section_contents
   PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
 extern long _bfd_elf_get_symtab_upper_bound
   PARAMS ((bfd *));
@@ -1374,31 +1374,31 @@ extern asymbol *_bfd_elf_make_empty_symbol
   PARAMS ((bfd *));
 extern void _bfd_elf_get_symbol_info
   PARAMS ((bfd *, asymbol *, symbol_info *));
-extern boolean _bfd_elf_is_local_label_name
+extern bfd_boolean _bfd_elf_is_local_label_name
   PARAMS ((bfd *, const char *));
 extern alent *_bfd_elf_get_lineno
   PARAMS ((bfd *, asymbol *));
-extern boolean _bfd_elf_set_arch_mach
+extern bfd_boolean _bfd_elf_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-extern boolean _bfd_elf_find_nearest_line
+extern bfd_boolean _bfd_elf_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
 #define _bfd_elf_read_minisymbols _bfd_generic_read_minisymbols
 #define _bfd_elf_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
 extern int _bfd_elf_sizeof_headers
-  PARAMS ((bfd *, boolean));
-extern boolean _bfd_elf_new_section_hook
+  PARAMS ((bfd *, bfd_boolean));
+extern bfd_boolean _bfd_elf_new_section_hook
   PARAMS ((bfd *, asection *));
-extern boolean _bfd_elf_init_reloc_shdr
-  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *, boolean));
+extern bfd_boolean _bfd_elf_init_reloc_shdr
+  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *, bfd_boolean));
 
 /* If the target doesn't have reloc handling written yet:  */
 extern void _bfd_elf_no_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 
-extern boolean bfd_section_from_shdr
+extern bfd_boolean bfd_section_from_shdr
   PARAMS ((bfd *, unsigned int shindex));
-extern boolean bfd_section_from_phdr
+extern bfd_boolean bfd_section_from_phdr
   PARAMS ((bfd *, Elf_Internal_Phdr *, int));
 
 extern int _bfd_elf_symbol_from_bfd_symbol
@@ -1408,7 +1408,7 @@ extern asection *bfd_section_from_r_symndx
   PARAMS ((bfd *, struct sym_sec_cache *, asection *, unsigned long));
 extern asection *bfd_section_from_elf_index
   PARAMS ((bfd *, unsigned int));
-extern boolean _bfd_elf_create_dynamic_sections
+extern bfd_boolean _bfd_elf_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 extern struct bfd_strtab_hash *_bfd_elf_stringtab_init
   PARAMS ((void));
@@ -1418,7 +1418,7 @@ extern struct elf_strtab_hash * _bfd_elf_strtab_init
 extern void _bfd_elf_strtab_free
   PARAMS ((struct elf_strtab_hash *));
 extern bfd_size_type _bfd_elf_strtab_add
-  PARAMS ((struct elf_strtab_hash *, const char *, boolean));
+  PARAMS ((struct elf_strtab_hash *, const char *, bfd_boolean));
 extern void _bfd_elf_strtab_addref
   PARAMS ((struct elf_strtab_hash *, bfd_size_type));
 extern void _bfd_elf_strtab_delref
@@ -1429,47 +1429,47 @@ extern bfd_size_type _bfd_elf_strtab_size
   PARAMS ((struct elf_strtab_hash *));
 extern bfd_size_type _bfd_elf_strtab_offset
   PARAMS ((struct elf_strtab_hash *, bfd_size_type));
-extern boolean _bfd_elf_strtab_emit
+extern bfd_boolean _bfd_elf_strtab_emit
   PARAMS ((bfd *, struct elf_strtab_hash *));
 extern void _bfd_elf_strtab_finalize
   PARAMS ((struct elf_strtab_hash *));
 
-extern boolean _bfd_elf_discard_section_eh_frame
+extern bfd_boolean _bfd_elf_discard_section_eh_frame
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   boolean (*) (bfd_vma, PTR), struct elf_reloc_cookie *));
-extern boolean _bfd_elf_discard_section_eh_frame_hdr
+	   bfd_boolean (*) (bfd_vma, PTR), struct elf_reloc_cookie *));
+extern bfd_boolean _bfd_elf_discard_section_eh_frame_hdr
   PARAMS ((bfd *, struct bfd_link_info *));
 extern bfd_vma _bfd_elf_eh_frame_section_offset
   PARAMS ((bfd *, asection *, bfd_vma));
-extern boolean _bfd_elf_write_section_eh_frame
+extern bfd_boolean _bfd_elf_write_section_eh_frame
   PARAMS ((bfd *, struct bfd_link_info *, asection *, bfd_byte *));
-extern boolean _bfd_elf_write_section_eh_frame_hdr
+extern bfd_boolean _bfd_elf_write_section_eh_frame_hdr
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_elf_maybe_strip_eh_frame_hdr
+extern bfd_boolean _bfd_elf_maybe_strip_eh_frame_hdr
   PARAMS ((struct bfd_link_info *));
 
-extern boolean _bfd_elf_link_record_dynamic_symbol
+extern bfd_boolean _bfd_elf_link_record_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 extern long _bfd_elf_link_lookup_local_dynindx
   PARAMS ((struct bfd_link_info *, bfd *, long));
-extern boolean _bfd_elf_compute_section_file_positions
+extern bfd_boolean _bfd_elf_compute_section_file_positions
   PARAMS ((bfd *, struct bfd_link_info *));
 extern void _bfd_elf_assign_file_positions_for_relocs
   PARAMS ((bfd *));
 extern file_ptr _bfd_elf_assign_file_position_for_section
-  PARAMS ((Elf_Internal_Shdr *, file_ptr, boolean));
+  PARAMS ((Elf_Internal_Shdr *, file_ptr, bfd_boolean));
 
-extern boolean _bfd_elf_validate_reloc
+extern bfd_boolean _bfd_elf_validate_reloc
   PARAMS ((bfd *, arelent *));
 
-extern boolean _bfd_elf_create_dynamic_sections
+extern bfd_boolean _bfd_elf_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_elf_create_got_section
+extern bfd_boolean _bfd_elf_create_got_section
   PARAMS ((bfd *, struct bfd_link_info *));
 extern unsigned long _bfd_elf_link_renumber_dynsyms
   PARAMS ((bfd *, struct bfd_link_info *));
 
-extern boolean _bfd_elfcore_make_pseudosection
+extern bfd_boolean _bfd_elfcore_make_pseudosection
   PARAMS ((bfd *, char *, size_t, ufile_ptr));
 extern char *_bfd_elfcore_strndup
   PARAMS ((bfd *, char *, size_t));
@@ -1482,7 +1482,7 @@ extern elf_linker_section_pointers_t *_bfd_elf_find_pointer_linker_section
   PARAMS ((elf_linker_section_pointers_t *, bfd_vma,
 	   elf_linker_section_enum_t));
 
-extern boolean bfd_elf32_create_pointer_linker_section
+extern bfd_boolean bfd_elf32_create_pointer_linker_section
   PARAMS ((bfd *, struct bfd_link_info *, elf_linker_section_t *,
 	   struct elf_link_hash_entry *, const Elf_Internal_Rela *));
 
@@ -1491,7 +1491,7 @@ extern bfd_vma bfd_elf32_finish_pointer_linker_section
 	   struct elf_link_hash_entry *, bfd_vma,
 	   const Elf_Internal_Rela *, int));
 
-extern boolean bfd_elf64_create_pointer_linker_section
+extern bfd_boolean bfd_elf64_create_pointer_linker_section
   PARAMS ((bfd *, struct bfd_link_info *, elf_linker_section_t *,
 	   struct elf_link_hash_entry *, const Elf_Internal_Rela *));
 
@@ -1500,7 +1500,7 @@ extern bfd_vma bfd_elf64_finish_pointer_linker_section
 	   struct elf_link_hash_entry *, bfd_vma,
 	   const Elf_Internal_Rela *, int));
 
-extern boolean _bfd_elf_make_linker_section_rela
+extern bfd_boolean _bfd_elf_make_linker_section_rela
   PARAMS ((bfd *, elf_linker_section_t *, int));
 
 extern const bfd_target *bfd_elf32_object_p
@@ -1511,12 +1511,12 @@ extern char *bfd_elf32_core_file_failing_command
   PARAMS ((bfd *));
 extern int bfd_elf32_core_file_failing_signal
   PARAMS ((bfd *));
-extern boolean bfd_elf32_core_file_matches_executable_p
+extern bfd_boolean bfd_elf32_core_file_matches_executable_p
   PARAMS ((bfd *, bfd *));
 
-extern boolean bfd_elf32_bfd_link_add_symbols
+extern bfd_boolean bfd_elf32_bfd_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf32_bfd_final_link
+extern bfd_boolean bfd_elf32_bfd_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
 extern void bfd_elf32_swap_symbol_in
@@ -1540,21 +1540,21 @@ extern void bfd_elf32_swap_dyn_in
 extern void bfd_elf32_swap_dyn_out
   PARAMS ((bfd *, const Elf_Internal_Dyn *, PTR));
 extern long bfd_elf32_slurp_symbol_table
-  PARAMS ((bfd *, asymbol **, boolean));
-extern boolean bfd_elf32_write_shdrs_and_ehdr
+  PARAMS ((bfd *, asymbol **, bfd_boolean));
+extern bfd_boolean bfd_elf32_write_shdrs_and_ehdr
   PARAMS ((bfd *));
 extern int bfd_elf32_write_out_phdrs
   PARAMS ((bfd *, const Elf_Internal_Phdr *, unsigned int));
 extern void bfd_elf32_write_relocs
   PARAMS ((bfd *, asection *, PTR));
-extern boolean bfd_elf32_slurp_reloc_table
-  PARAMS ((bfd *, asection *, asymbol **, boolean));
-extern boolean bfd_elf32_add_dynamic_entry
+extern bfd_boolean bfd_elf32_slurp_reloc_table
+  PARAMS ((bfd *, asection *, asymbol **, bfd_boolean));
+extern bfd_boolean bfd_elf32_add_dynamic_entry
   PARAMS ((struct bfd_link_info *, bfd_vma, bfd_vma));
-extern boolean bfd_elf32_link_create_dynamic_sections
+extern bfd_boolean bfd_elf32_link_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 extern Elf_Internal_Rela *_bfd_elf32_link_read_relocs
-  PARAMS ((bfd *, asection *, PTR, Elf_Internal_Rela *, boolean));
+  PARAMS ((bfd *, asection *, PTR, Elf_Internal_Rela *, bfd_boolean));
 
 extern const bfd_target *bfd_elf64_object_p
   PARAMS ((bfd *));
@@ -1564,11 +1564,11 @@ extern char *bfd_elf64_core_file_failing_command
   PARAMS ((bfd *));
 extern int bfd_elf64_core_file_failing_signal
   PARAMS ((bfd *));
-extern boolean bfd_elf64_core_file_matches_executable_p
+extern bfd_boolean bfd_elf64_core_file_matches_executable_p
   PARAMS ((bfd *, bfd *));
-extern boolean bfd_elf64_bfd_link_add_symbols
+extern bfd_boolean bfd_elf64_bfd_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf64_bfd_final_link
+extern bfd_boolean bfd_elf64_bfd_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
 extern void bfd_elf64_swap_symbol_in
@@ -1592,21 +1592,21 @@ extern void bfd_elf64_swap_dyn_in
 extern void bfd_elf64_swap_dyn_out
   PARAMS ((bfd *, const Elf_Internal_Dyn *, PTR));
 extern long bfd_elf64_slurp_symbol_table
-  PARAMS ((bfd *, asymbol **, boolean));
-extern boolean bfd_elf64_write_shdrs_and_ehdr
+  PARAMS ((bfd *, asymbol **, bfd_boolean));
+extern bfd_boolean bfd_elf64_write_shdrs_and_ehdr
   PARAMS ((bfd *));
 extern int bfd_elf64_write_out_phdrs
   PARAMS ((bfd *, const Elf_Internal_Phdr *, unsigned int));
 extern void bfd_elf64_write_relocs
   PARAMS ((bfd *, asection *, PTR));
-extern boolean bfd_elf64_slurp_reloc_table
-  PARAMS ((bfd *, asection *, asymbol **, boolean));
-extern boolean bfd_elf64_add_dynamic_entry
+extern bfd_boolean bfd_elf64_slurp_reloc_table
+  PARAMS ((bfd *, asection *, asymbol **, bfd_boolean));
+extern bfd_boolean bfd_elf64_add_dynamic_entry
   PARAMS ((struct bfd_link_info *, bfd_vma, bfd_vma));
-extern boolean bfd_elf64_link_create_dynamic_sections
+extern bfd_boolean bfd_elf64_link_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 extern Elf_Internal_Rela *_bfd_elf64_link_read_relocs
-  PARAMS ((bfd *, asection *, PTR, Elf_Internal_Rela *, boolean));
+  PARAMS ((bfd *, asection *, PTR, Elf_Internal_Rela *, bfd_boolean));
 
 #define bfd_elf32_link_record_dynamic_symbol \
   _bfd_elf_link_record_dynamic_symbol
@@ -1620,37 +1620,37 @@ extern int elf_link_record_local_dynamic_symbol
 #define _bfd_elf64_link_record_local_dynamic_symbol \
   elf_link_record_local_dynamic_symbol
 
-extern boolean _bfd_elf_close_and_cleanup
+extern bfd_boolean _bfd_elf_close_and_cleanup
   PARAMS ((bfd *));
 extern bfd_reloc_status_type _bfd_elf_rel_vtable_reloc_fn
   PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR,
            asection *, bfd *, char **));
 
-extern boolean _bfd_elf32_gc_sections
+extern bfd_boolean _bfd_elf32_gc_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_elf32_gc_common_finalize_got_offsets
+extern bfd_boolean _bfd_elf32_gc_common_finalize_got_offsets
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_elf32_gc_common_final_link
+extern bfd_boolean _bfd_elf32_gc_common_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_elf32_gc_record_vtinherit
+extern bfd_boolean _bfd_elf32_gc_record_vtinherit
   PARAMS ((bfd *, asection *, struct elf_link_hash_entry *, bfd_vma));
-extern boolean _bfd_elf32_gc_record_vtentry
+extern bfd_boolean _bfd_elf32_gc_record_vtentry
   PARAMS ((bfd *, asection *, struct elf_link_hash_entry *, bfd_vma));
 
-extern boolean _bfd_elf64_gc_sections
+extern bfd_boolean _bfd_elf64_gc_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_elf64_gc_common_finalize_got_offsets
+extern bfd_boolean _bfd_elf64_gc_common_finalize_got_offsets
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_elf64_gc_common_final_link
+extern bfd_boolean _bfd_elf64_gc_common_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_elf64_gc_record_vtinherit
+extern bfd_boolean _bfd_elf64_gc_record_vtinherit
   PARAMS ((bfd *, asection *, struct elf_link_hash_entry *, bfd_vma));
-extern boolean _bfd_elf64_gc_record_vtentry
+extern bfd_boolean _bfd_elf64_gc_record_vtentry
   PARAMS ((bfd *, asection *, struct elf_link_hash_entry *, bfd_vma));
 
-extern boolean _bfd_elf32_reloc_symbol_deleted_p
+extern bfd_boolean _bfd_elf32_reloc_symbol_deleted_p
   PARAMS ((bfd_vma, PTR));
-extern boolean _bfd_elf64_reloc_symbol_deleted_p
+extern bfd_boolean _bfd_elf64_reloc_symbol_deleted_p
   PARAMS ((bfd_vma, PTR));
 
 /* Exported interface for writing elf corefile notes. */
@@ -1671,7 +1671,7 @@ extern char *elfcore_write_lwpstatus
 
 /* SH ELF specific routine.  */
 
-extern boolean _sh_elf_set_mach_from_flags
+extern bfd_boolean _sh_elf_set_mach_from_flags
   PARAMS ((bfd *));
 
 #endif /* _LIBELF_H_ */
diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
index 8938ecf32dc..7c126743d94 100644
--- a/bfd/elf-eh-frame.c
+++ b/bfd/elf-eh-frame.c
@@ -161,7 +161,7 @@ read_value (abfd, buf, width)
 
   return value;
 }
-    
+
 /* Store a width sized value to memory.  */
 
 static void
@@ -210,16 +210,16 @@ int cie_compare (c1, c2)
 
 /* This function is called for each input file before the .eh_frame
    section is relocated.  It discards duplicate CIEs and FDEs for discarded
-   functions.  The function returns true iff any entries have been
+   functions.  The function returns TRUE iff any entries have been
    deleted.  */
 
-boolean
+bfd_boolean
 _bfd_elf_discard_section_eh_frame (abfd, info, sec,
 				   reloc_symbol_deleted_p, cookie)
      bfd *abfd;
      struct bfd_link_info *info;
      asection *sec;
-     boolean (*reloc_symbol_deleted_p) PARAMS ((bfd_vma, PTR));
+     bfd_boolean (*reloc_symbol_deleted_p) PARAMS ((bfd_vma, PTR));
      struct elf_reloc_cookie *cookie;
 {
   bfd_byte *ehbuf = NULL, *buf;
@@ -238,7 +238,7 @@ _bfd_elf_discard_section_eh_frame (abfd, info, sec,
   if (sec->_raw_size == 0)
     {
       /* This file does not contain .eh_frame information.  */
-      return false;
+      return FALSE;
     }
 
   if ((sec->output_section != NULL
@@ -246,7 +246,7 @@ _bfd_elf_discard_section_eh_frame (abfd, info, sec,
     {
       /* At least one of the sections is being discarded from the
          link, so we should just ignore them.  */
-      return false;
+      return FALSE;
     }
 
   htab = elf_hash_table (info);
@@ -268,7 +268,7 @@ _bfd_elf_discard_section_eh_frame (abfd, info, sec,
     {
       /* Empty .eh_frame section.  */
       free (ehbuf);
-      return false;
+      return FALSE;
     }
 
   /* If .eh_frame section size doesn't fit into int, we cannot handle
@@ -578,7 +578,7 @@ _bfd_elf_discard_section_eh_frame (abfd, info, sec,
 		     which we cannot turn into PC relative,
 		     don't create the binary search table,
 		     since it is affected by runtime relocations.  */
-		  hdr_info->table = false;
+		  hdr_info->table = FALSE;
 		}
 	      cie_usage_count++;
 	      hdr_info->fde_count++;
@@ -663,16 +663,16 @@ free_no_table:
     free (ehbuf);
   if (sec_info)
     free (sec_info);
-  hdr_info->table = false;
+  hdr_info->table = FALSE;
   hdr_info->last_cie.hdr.length = 0;
-  return false;
+  return FALSE;
 }
 
 /* This function is called for .eh_frame_hdr section after
    _bfd_elf_discard_section_eh_frame has been called on all .eh_frame
    input sections.  It finalizes the size of .eh_frame_hdr section.  */
 
-boolean
+bfd_boolean
 _bfd_elf_discard_section_eh_frame_hdr (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -685,7 +685,7 @@ _bfd_elf_discard_section_eh_frame_hdr (abfd, info)
   hdr_info = &htab->eh_info;
   sec = hdr_info->hdr_sec;
   if (sec == NULL)
-    return false;
+    return FALSE;
 
   sec->_cooked_size = EH_FRAME_HDR_SIZE;
   if (hdr_info->table)
@@ -694,7 +694,7 @@ _bfd_elf_discard_section_eh_frame_hdr (abfd, info)
   /* Request program headers to be recalculated.  */
   elf_tdata (abfd)->program_header_size = 0;
   elf_tdata (abfd)->eh_frame_hdr = sec;
-  return true;
+  return TRUE;
 }
 
 /* This function is called from size_dynamic_sections.
@@ -702,7 +702,7 @@ _bfd_elf_discard_section_eh_frame_hdr (abfd, info)
    because later on it is too late for calling _bfd_strip_section_from_output,
    since dynamic symbol table has been sized.  */
 
-boolean
+bfd_boolean
 _bfd_elf_maybe_strip_eh_frame_hdr (info)
      struct bfd_link_info *info;
 {
@@ -714,12 +714,12 @@ _bfd_elf_maybe_strip_eh_frame_hdr (info)
   htab = elf_hash_table (info);
   hdr_info = &htab->eh_info;
   if (hdr_info->hdr_sec == NULL)
-    return true;
+    return TRUE;
 
   if (bfd_is_abs_section (hdr_info->hdr_sec->output_section))
     {
       hdr_info->hdr_sec = NULL;
-      return true;
+      return TRUE;
     }
 
   abfd = NULL;
@@ -737,11 +737,11 @@ _bfd_elf_maybe_strip_eh_frame_hdr (info)
     {
       _bfd_strip_section_from_output (info, hdr_info->hdr_sec);
       hdr_info->hdr_sec = NULL;
-      return true;
+      return TRUE;
     }
 
-  hdr_info->table = true;
-  return true;
+  hdr_info->table = TRUE;
+  return TRUE;
 }
 
 /* Adjust an address in the .eh_frame section.  Given OFFSET within
@@ -809,7 +809,7 @@ _bfd_elf_eh_frame_section_offset (output_bfd, sec, offset)
 /* Write out .eh_frame section.  This is called with the relocated
    contents.  */
 
-boolean
+bfd_boolean
 _bfd_elf_write_section_eh_frame (abfd, info, sec, contents)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -954,7 +954,7 @@ _bfd_elf_write_section_eh_frame (abfd, info, sec, contents)
 	  unsigned int width;
 
 	  buf = contents + sec_info->entry[i].offset;
-	  /* Skip length.  */	
+	  /* Skip length.  */
 	  buf += 4;
 	  bfd_put_32 (abfd,
 		      sec_info->entry[i].new_offset + 4 - cie_offset, buf);
@@ -1088,7 +1088,7 @@ vma_compare (a, b)
 				 FDE initial_location field and FDE address,
 				 sorted by increasing initial_loc)  */
 
-boolean
+bfd_boolean
 _bfd_elf_write_section_eh_frame_hdr (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1104,18 +1104,18 @@ _bfd_elf_write_section_eh_frame_hdr (abfd, info)
   hdr_info = &htab->eh_info;
   sec = hdr_info->hdr_sec;
   if (sec == NULL)
-    return true;
+    return TRUE;
 
   size = EH_FRAME_HDR_SIZE;
   if (hdr_info->array && hdr_info->array_count == hdr_info->fde_count)
     size += 4 + hdr_info->fde_count * 8;
   contents = bfd_malloc (size);
   if (contents == NULL)
-    return false;
+    return FALSE;
 
   eh_frame_sec = bfd_get_section_by_name (abfd, ".eh_frame");
   if (eh_frame_sec == NULL)
-    return false;
+    return FALSE;
 
   memset (contents, 0, EH_FRAME_HDR_SIZE);
   contents[0] = 1;				/* Version  */
diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index 5615cf597d6..5e4458c1170 100644
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -53,42 +53,42 @@ static void elf_hppa_info_to_howto_rel
 static reloc_howto_type * elf_hppa_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 
-static boolean elf_hppa_is_local_label_name
+static bfd_boolean elf_hppa_is_local_label_name
   PARAMS ((bfd *, const char *));
 
-static boolean elf_hppa_fake_sections
+static bfd_boolean elf_hppa_fake_sections
   PARAMS ((bfd *abfd, Elf_Internal_Shdr *, asection *));
 
 static void elf_hppa_final_write_processing
-  PARAMS ((bfd *, boolean));
+  PARAMS ((bfd *, bfd_boolean));
 
 static int hppa_unwind_entry_compare
   PARAMS ((const PTR, const PTR));
 
-static boolean elf_hppa_sort_unwind
+static bfd_boolean elf_hppa_sort_unwind
   PARAMS ((bfd *));
 
 #if ARCH_SIZE == 64
-static boolean elf_hppa_add_symbol_hook
+static bfd_boolean elf_hppa_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
 
-static boolean elf_hppa_unmark_useless_dynamic_symbols
+static bfd_boolean elf_hppa_unmark_useless_dynamic_symbols
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean elf_hppa_remark_useless_dynamic_symbols
+static bfd_boolean elf_hppa_remark_useless_dynamic_symbols
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean elf_hppa_is_dynamic_loader_symbol
+static bfd_boolean elf_hppa_is_dynamic_loader_symbol
   PARAMS ((const char *));
 
 static void elf_hppa_record_segment_addrs
   PARAMS ((bfd *, asection *, PTR));
 
-static boolean elf_hppa_final_link
+static bfd_boolean elf_hppa_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
-static boolean elf_hppa_relocate_section
+static bfd_boolean elf_hppa_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
 	   bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 
@@ -106,506 +106,506 @@ static int elf_hppa_relocate_insn
 
 static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] =
 {
-  { R_PARISC_NONE, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_NONE", false, 0, 0, false },
+  { R_PARISC_NONE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_NONE", FALSE, 0, 0, FALSE },
 
   /* The values in DIR32 are to placate the check in
      _bfd_stab_section_find_nearest_line.  */
-  { R_PARISC_DIR32, 0, 2, 32, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR32", false, 0, 0xffffffff, false },
-  { R_PARISC_DIR21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR21L", false, 0, 0, false },
-  { R_PARISC_DIR17R, 0, 0, 17, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR17R", false, 0, 0, false },
-  { R_PARISC_DIR17F, 0, 0, 17, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR17F", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DIR14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR14R", false, 0, 0, false },
-  { R_PARISC_DIR14F, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR14F", false, 0, 0, false },
+  { R_PARISC_DIR32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR32", FALSE, 0, 0xffffffff, FALSE },
+  { R_PARISC_DIR21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR17R, 0, 0, 17, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR17R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR17F, 0, 0, 17, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR17F", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR14F, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR14F", FALSE, 0, 0, FALSE },
   /* 8 */
-  { R_PARISC_PCREL12F, 0, 0, 12, true, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL12F", false, 0, 0, false },
-  { R_PARISC_PCREL32, 0, 0, 32, true, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL32", false, 0, 0, false },
-  { R_PARISC_PCREL21L, 0, 0, 21, true, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL21L", false, 0, 0, false },
-  { R_PARISC_PCREL17R, 0, 0, 17, true, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL17R", false, 0, 0, false },
-  { R_PARISC_PCREL17F, 0, 0, 17, true, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL17F", false, 0, 0, false },
-  { R_PARISC_PCREL17C, 0, 0, 17, true, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL17C", false, 0, 0, false },
-  { R_PARISC_PCREL14R, 0, 0, 14, true, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL14R", false, 0, 0, false },
-  { R_PARISC_PCREL14F, 0, 0, 14, true, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL14F", false, 0, 0, false },
+  { R_PARISC_PCREL12F, 0, 0, 12, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL12F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL32, 0, 0, 32, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL21L, 0, 0, 21, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL17R, 0, 0, 17, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL17R", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL17F, 0, 0, 17, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL17F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL17C, 0, 0, 17, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL17C", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL14R, 0, 0, 14, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL14F, 0, 0, 14, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL14F", FALSE, 0, 0, FALSE },
   /* 16 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DPREL21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DPREL21L", false, 0, 0, false },
-  { R_PARISC_DPREL14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DPREL14WR", false, 0, 0, false },
-  { R_PARISC_DPREL14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DPREL14DR", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DPREL14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DPREL14R", false, 0, 0, false },
-  { R_PARISC_DPREL14F, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DPREL14F", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL14F, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL14F", FALSE, 0, 0, FALSE },
   /* 24 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DLTREL21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTREL21L", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DLTREL14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTREL14R", false, 0, 0, false },
-  { R_PARISC_DLTREL14F, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTREL14F", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL14F, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL14F", FALSE, 0, 0, FALSE },
   /* 32 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DLTIND21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTIND21L", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DLTIND14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTIND14R", false, 0, 0, false },
-  { R_PARISC_DLTIND14F, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTIND14F", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND14F, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND14F", FALSE, 0, 0, FALSE },
   /* 40 */
-  { R_PARISC_SETBASE, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_SETBASE", false, 0, 0, false },
-  { R_PARISC_SECREL32, 0, 0, 32, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_SECREL32", false, 0, 0, false },
-  { R_PARISC_BASEREL21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_BASEREL21L", false, 0, 0, false },
-  { R_PARISC_BASEREL17R, 0, 0, 17, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_BASEREL17R", false, 0, 0, false },
-  { R_PARISC_BASEREL17F, 0, 0, 17, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_BASEREL17F", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_BASEREL14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_BASEREL14R", false, 0, 0, false },
-  { R_PARISC_BASEREL14F, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_BASEREL14F", false, 0, 0, false },
+  { R_PARISC_SETBASE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SETBASE", FALSE, 0, 0, FALSE },
+  { R_PARISC_SECREL32, 0, 0, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SECREL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL17R, 0, 0, 17, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL17R", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL17F, 0, 0, 17, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL17F", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL14F, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL14F", FALSE, 0, 0, FALSE },
   /* 48 */
-  { R_PARISC_SEGBASE, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_SEGBASE", false, 0, 0, false },
-  { R_PARISC_SEGREL32, 0, 0, 32, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_SEGREL32", false, 0, 0, false },
-  { R_PARISC_PLTOFF21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLTOFF21L", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_PLTOFF14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14R", false, 0, 0, false },
-  { R_PARISC_PLTOFF14F, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14F", false, 0, 0, false },
+  { R_PARISC_SEGBASE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SEGBASE", FALSE, 0, 0, FALSE },
+  { R_PARISC_SEGREL32, 0, 0, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SEGREL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF14F, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14F", FALSE, 0, 0, FALSE },
   /* 56 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_LTOFF_FPTR32, 0, 0, 32, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR32", false, 0, 0, false },
-  { R_PARISC_LTOFF_FPTR21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR21L", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_LTOFF_FPTR14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14R", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR32, 0, 0, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR32", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 64 */
-  { R_PARISC_FPTR64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_FPTR64", false, 0, 0, false },
-  { R_PARISC_PLABEL32, 0, 0, 32, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLABEL32", false, 0, 0, false },
-  { R_PARISC_PLABEL21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLABEL21L", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_PLABEL14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLABEL14R", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_FPTR64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_FPTR64", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLABEL32, 0, 0, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLABEL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLABEL21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLABEL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLABEL14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLABEL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 72 */
-  { R_PARISC_PCREL64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL64", false, 0, 0, false },
-  { R_PARISC_PCREL22C, 0, 0, 22, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL22C", false, 0, 0, false },
-  { R_PARISC_PCREL22F, 0, 0, 22, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL22F", false, 0, 0, false },
-  { R_PARISC_PCREL14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL14WR", false, 0, 0, false },
-  { R_PARISC_PCREL14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL14DR", false, 0, 0, false },
-  { R_PARISC_PCREL16F, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL16F", false, 0, 0, false },
-  { R_PARISC_PCREL16WF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL16WF", false, 0, 0, false },
-  { R_PARISC_PCREL16DF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PCREL16DF", false, 0, 0, false },
+  { R_PARISC_PCREL64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL64", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL22C, 0, 0, 22, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL22C", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL22F, 0, 0, 22, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL22F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL16F, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL16WF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL16DF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL16DF", FALSE, 0, 0, FALSE },
   /* 80 */
-  { R_PARISC_DIR64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR64", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DIR14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR14WR", false, 0, 0, false },
-  { R_PARISC_DIR14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR14DR", false, 0, 0, false },
-  { R_PARISC_DIR16F, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR16F", false, 0, 0, false },
-  { R_PARISC_DIR16WF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR16WF", false, 0, 0, false },
-  { R_PARISC_DIR16DF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DIR16DF", false, 0, 0, false },
+  { R_PARISC_DIR64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR16F, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR16WF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR16DF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR16DF", FALSE, 0, 0, FALSE },
   /* 88 */
-  { R_PARISC_GPREL64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_GPREL64", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DLTREL14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTREL14WR", false, 0, 0, false },
-  { R_PARISC_DLTREL14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTREL14DR", false, 0, 0, false },
-  { R_PARISC_GPREL16F, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_GPREL16F", false, 0, 0, false },
-  { R_PARISC_GPREL16WF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_GPREL16WF", false, 0, 0, false },
-  { R_PARISC_GPREL16DF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_GPREL16DF", false, 0, 0, false },
+  { R_PARISC_GPREL64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_GPREL64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_GPREL16F, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_GPREL16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_GPREL16WF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_GPREL16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_GPREL16DF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_GPREL16DF", FALSE, 0, 0, FALSE },
   /* 96 */
-  { R_PARISC_LTOFF64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF64", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_DLTIND14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTIND14WR", false, 0, 0, false },
-  { R_PARISC_DLTIND14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_DLTIND14DR", false, 0, 0, false },
-  { R_PARISC_LTOFF16F, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF16F", false, 0, 0, false },
-  { R_PARISC_LTOFF16WF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF16DF", false, 0, 0, false },
-  { R_PARISC_LTOFF16DF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF16DF", false, 0, 0, false },
+  { R_PARISC_LTOFF64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF16F, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF16WF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF16DF", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF16DF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF16DF", FALSE, 0, 0, FALSE },
   /* 104 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_BASEREL14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_BASEREL14WR", false, 0, 0, false },
-  { R_PARISC_BASEREL14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_BASEREL14DR", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 112 */
-  { R_PARISC_SEGREL64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_SEGREL64", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_PLTOFF14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14WR", false, 0, 0, false },
-  { R_PARISC_PLTOFF14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14DR", false, 0, 0, false },
-  { R_PARISC_PLTOFF16F, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16F", false, 0, 0, false },
-  { R_PARISC_PLTOFF16WF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16WF", false, 0, 0, false },
-  { R_PARISC_PLTOFF16DF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16DF", false, 0, 0, false },
+  { R_PARISC_SEGREL64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SEGREL64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF16F, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF16WF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF16DF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16DF", FALSE, 0, 0, FALSE },
   /* 120 */
-  { R_PARISC_LTOFF_FPTR64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_LTOFF_FPTR14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14WR", false, 0, 0, false },
-  { R_PARISC_LTOFF_FPTR14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14DR", false, 0, 0, false },
-  { R_PARISC_LTOFF_FPTR16F, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR16F", false, 0, 0, false },
-  { R_PARISC_LTOFF_FPTR16WF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR16WF", false, 0, 0, false },
-  { R_PARISC_LTOFF_FPTR16DF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_LTOFF_FPTR64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR16F, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR16WF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR16DF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 128 */
-  { R_PARISC_COPY, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_COPY", false, 0, 0, false },
-  { R_PARISC_IPLT, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_IPLT", false, 0, 0, false },
-  { R_PARISC_EPLT, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_EPLT", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_COPY, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_COPY", FALSE, 0, 0, FALSE },
+  { R_PARISC_IPLT, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_IPLT", FALSE, 0, 0, FALSE },
+  { R_PARISC_EPLT, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_EPLT", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 136 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 144 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 152 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_TPREL32, 0, 0, 32, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL32", false, 0, 0, false },
-  { R_PARISC_TPREL21L, 0, 0, 21, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL21L", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_TPREL14R, 0, 0, 14, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL14R", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL32, 0, 0, 32, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL21L, 0, 0, 21, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL14R, 0, 0, 14, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 160 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_LTOFF_TP21L, 0, 0, 21, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP21L", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_LTOFF_TP14R, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_LTOFF_TP14F, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14F", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP14F, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14F", FALSE, 0, 0, FALSE },
   /* 168 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 176 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 184 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 192 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 200 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 208 */
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
   /* 216 */
-  { R_PARISC_TPREL64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL64", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_TPREL14WR, 0, 0, 14, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL14WR", false, 0, 0, false },
-  { R_PARISC_TPREL14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL14DR", false, 0, 0, false },
-  { R_PARISC_TPREL16F, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL16F", false, 0, 0, false },
-  { R_PARISC_TPREL16WF, 0, 0, 16, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL16WF", false, 0, 0, false },
-  { R_PARISC_TPREL16DF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_TPREL16DF", false, 0, 0, false },
+  { R_PARISC_TPREL64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL14WR, 0, 0, 14, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL16F, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL16WF, 0, 0, 16, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL16DF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL16DF", FALSE, 0, 0, FALSE },
   /* 224 */
-  { R_PARISC_LTOFF_TP64, 0, 0, 64, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP64", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", false, 0, 0, false },
-  { R_PARISC_LTOFF_TP14WR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14WR", false, 0, 0, false },
-  { R_PARISC_LTOFF_TP14DR, 0, 0, 14, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14DR", false, 0, 0, false },
-  { R_PARISC_LTOFF_TP16F, 0, 0, 16, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16F", false, 0, 0, false },
-  { R_PARISC_LTOFF_TP16WF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16WF", false, 0, 0, false },
-  { R_PARISC_LTOFF_TP16DF, 0, 0, 16, false, 0, complain_overflow_bitfield,
-    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16DF", false, 0, 0, false },
+  { R_PARISC_LTOFF_TP64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP14WR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP14DR, 0, 0, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP16F, 0, 0, 16, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP16WF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP16DF, 0, 0, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16DF", FALSE, 0, 0, FALSE },
   /* 232 */
-  { R_PARISC_GNU_VTENTRY, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_GNU_VTENTRY", false, 0, 0, false },
-  { R_PARISC_GNU_VTINHERIT, 0, 0, 0, false, 0, complain_overflow_dont,
-    bfd_elf_generic_reloc, "R_PARISC_GNU_VTINHERIT", false, 0, 0, false },
+  { R_PARISC_GNU_VTENTRY, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_GNU_VTENTRY", FALSE, 0, 0, FALSE },
+  { R_PARISC_GNU_VTINHERIT, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_GNU_VTINHERIT", FALSE, 0, 0, FALSE },
 };
 
 #define OFFSET_14R_FROM_21L 4
@@ -958,9 +958,9 @@ elf_hppa_reloc_type_lookup (abfd, code)
   return NULL;
 }
 
-/* Return true if SYM represents a local label symbol.  */
+/* Return TRUE if SYM represents a local label symbol.  */
 
-static boolean
+static bfd_boolean
 elf_hppa_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -973,7 +973,7 @@ elf_hppa_is_local_label_name (abfd, name)
 /* Set the correct type for an ELF section.  We do this by the
    section name, which is a hack, but ought to work.  */
 
-static boolean
+static bfd_boolean
 elf_hppa_fake_sections (abfd, hdr, sec)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -1013,13 +1013,13 @@ elf_hppa_fake_sections (abfd, hdr, sec)
       /* I have no idea if this is really necessary or what it means.  */
       hdr->sh_entsize = 4;
     }
-  return true;
+  return TRUE;
 }
 
 static void
 elf_hppa_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   int mach = bfd_get_mach (abfd);
 
@@ -1070,7 +1070,7 @@ hppa_unwind_entry_compare (a, b)
   return av < bv ? -1 : av > bv ? 1 : 0;
 }
 
-static boolean elf_hppa_sort_unwind (abfd)
+static bfd_boolean elf_hppa_sort_unwind (abfd)
      bfd *abfd;
 {
   asection *s;
@@ -1088,18 +1088,18 @@ static boolean elf_hppa_sort_unwind (abfd)
       size = s->_raw_size;
       contents = bfd_malloc (size);
       if (contents == NULL)
-	return false;
+	return FALSE;
 
       if (! bfd_get_section_contents (abfd, s, contents, (file_ptr) 0, size))
-	return false;
+	return FALSE;
 
       qsort (contents, (size_t) (size / 16), 16, hppa_unwind_entry_compare);
 
       if (! bfd_set_section_contents (abfd, s, contents, (file_ptr) 0, size))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 #if ARCH_SIZE == 64
@@ -1107,7 +1107,7 @@ static boolean elf_hppa_sort_unwind (abfd)
    file.  HP's libraries define symbols with HP specific section
    indices, which we have to handle.  */
 
-static boolean
+static bfd_boolean
 elf_hppa_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1134,10 +1134,10 @@ elf_hppa_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf_hppa_unmark_useless_dynamic_symbols (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -1170,10 +1170,10 @@ elf_hppa_unmark_useless_dynamic_symbols (h, data)
       h->elf_link_hash_flags |= 0x8000;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf_hppa_remark_useless_dynamic_symbols (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -1207,10 +1207,10 @@ elf_hppa_remark_useless_dynamic_symbols (h, data)
       h->elf_link_hash_flags &= ~0x8000;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf_hppa_is_dynamic_loader_symbol (name)
      const char * name;
 {
@@ -1257,12 +1257,12 @@ elf_hppa_record_segment_addrs (abfd, section, data)
    We use this hook to (possibly) provide a value for __gp, then we
    fall back to the generic ELF final link routine.  */
 
-static boolean
+static bfd_boolean
 elf_hppa_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
-  boolean retval;
+  bfd_boolean retval;
   struct elf64_hppa_link_hash_table *hppa_info = elf64_hppa_hash_table (info);
 
   if (! info->relocateable)
@@ -1274,8 +1274,8 @@ elf_hppa_final_link (abfd, info)
 	 by one of the objects being linked.  First try to find the symbol
 	 in the hash table.  If that fails, just compute the value __gp
 	 should have had.  */
-      gp = elf_link_hash_lookup (elf_hash_table (info), "__gp", false,
-				 false, false);
+      gp = elf_link_hash_lookup (elf_hash_table (info), "__gp", FALSE,
+				 FALSE, FALSE);
 
       if (gp)
 	{
@@ -1313,7 +1313,7 @@ elf_hppa_final_link (abfd, info)
 	      if (!sec || (sec->flags & SEC_EXCLUDE))
 		sec = bfd_get_section_by_name (abfd, ".data");
 	      if (!sec || (sec->flags & SEC_EXCLUDE))
-		return false;
+		return FALSE;
 
 	      gp_val = sec->output_offset + sec->output_section->vma;
 	    }
@@ -1359,7 +1359,7 @@ elf_hppa_final_link (abfd, info)
 
 /* Relocate an HPPA ELF section.  */
 
-static boolean
+static bfd_boolean
 elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -1377,7 +1377,7 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
   struct elf64_hppa_link_hash_table *hppa_info;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   hppa_info = elf64_hppa_hash_table (info);
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -1404,7 +1404,7 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r_type < 0 || r_type >= (int) R_PARISC_UNIMPLEMENTED)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       /* This is a final link.  */
@@ -1424,7 +1424,7 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 	  dyn_name = get_dyn_name (input_section, h, rel,
 				   &dynh_buf, &dynh_buflen);
 	  dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-					      dyn_name, false, false);
+					      dyn_name, FALSE, FALSE);
 
 	}
       else
@@ -1447,7 +1447,7 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 	      dyn_name = get_dyn_name (input_section, h, rel,
 				       &dynh_buf, &dynh_buflen);
 	      dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-						  dyn_name, false, false);
+						  dyn_name, FALSE, FALSE);
 
 	      /* If we have a relocation against a symbol defined in a
 		 shared library and we have not created an entry in the
@@ -1476,14 +1476,14 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (info->symbolic)
 		(*info->callbacks->undefined_symbol)
 		  (info, h->root.root.string, input_bfd,
-		   input_section, rel->r_offset, false);
+		   input_section, rel->r_offset, FALSE);
 
 	      /* If this symbol has an entry in the PA64 dynamic hash
 		 table, then get it.  */
 	      dyn_name = get_dyn_name (input_section, h, rel,
 				       &dynh_buf, &dynh_buflen);
 	      dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-						  dyn_name, false, false);
+						  dyn_name, FALSE, FALSE);
 
 	      if (dyn_h == NULL)
 		{
@@ -1506,8 +1506,8 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 		{
 		  if (!((*info->callbacks->undefined_symbol)
 			(info, h->root.root.string, input_bfd,
-			 input_section, rel->r_offset, true)))
-		    return false;
+			 input_section, rel->r_offset, TRUE)))
+		    return FALSE;
 		  break;
 		}
 	    }
@@ -1521,7 +1521,7 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 						      symtab_hdr->sh_link,
 						      sym->st_name);
 	  if (sym_name == NULL)
-	    return false;
+	    return FALSE;
 	  if (*sym_name == '\0')
 	    sym_name = bfd_section_name (input_bfd, sym_sec);
 	}
@@ -1542,13 +1542,13 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 		if (!((*info->callbacks->reloc_overflow)
 		      (info, sym_name, howto->name, (bfd_vma) 0,
 			input_bfd, input_section, rel->r_offset)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Compute the value for a relocation (REL) during a final link stage,
diff --git a/bfd/elf-m10200.c b/bfd/elf-m10200.c
index a97010e4efa..f5f27894c03 100644
--- a/bfd/elf-m10200.c
+++ b/bfd/elf-m10200.c
@@ -27,23 +27,23 @@ static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 static void mn10200_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean mn10200_elf_relax_delete_bytes
+static bfd_boolean mn10200_elf_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, int));
-static boolean mn10200_elf_symbol_address_p
+static bfd_boolean mn10200_elf_symbol_address_p
   PARAMS ((bfd *, asection *, Elf_Internal_Sym *, bfd_vma));
 static bfd_reloc_status_type mn10200_elf_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *,
 	   bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
 	   struct bfd_link_info *, asection *, int));
-static boolean mn10200_elf_relocate_section
-PARAMS (( bfd *, struct bfd_link_info *, bfd *, asection *,
-	  bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *,
-	  asection **));
-static boolean mn10200_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
+static bfd_boolean mn10200_elf_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+	   bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *,
+	   asection **));
+static bfd_boolean mn10200_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
 static bfd_byte * mn10200_elf_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
+	   bfd_byte *, bfd_boolean, asymbol **));
 
 enum reloc_type {
   R_MN10200_NONE = 0,
@@ -63,114 +63,114 @@ static reloc_howto_type elf_mn10200_howto_table[] = {
 	 0,
 	 2,
 	 16,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10200_NONE",
-	 false,
+	 FALSE,
 	 0,
 	 0,
-	 false),
+	 FALSE),
   /* Standard 32 bit reloc.  */
   HOWTO (R_MN10200_32,
 	 0,
 	 2,
 	 32,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10200_32",
-	 false,
+	 FALSE,
 	 0xffffffff,
 	 0xffffffff,
-	 false),
+	 FALSE),
   /* Standard 16 bit reloc.  */
   HOWTO (R_MN10200_16,
 	 0,
 	 1,
 	 16,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10200_16",
-	 false,
+	 FALSE,
 	 0xffff,
 	 0xffff,
-	 false),
+	 FALSE),
   /* Standard 8 bit reloc.  */
   HOWTO (R_MN10200_8,
 	 0,
 	 0,
 	 8,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10200_8",
-	 false,
+	 FALSE,
 	 0xff,
 	 0xff,
-	 false),
+	 FALSE),
   /* Standard 24 bit reloc.  */
   HOWTO (R_MN10200_24,
 	 0,
 	 2,
 	 24,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10200_24",
-	 false,
+	 FALSE,
 	 0xffffff,
 	 0xffffff,
-	 false),
+	 FALSE),
   /* Simple 8 pc-relative reloc.  */
   HOWTO (R_MN10200_PCREL8,
 	 0,
 	 0,
 	 8,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10200_PCREL8",
-	 false,
+	 FALSE,
 	 0xff,
 	 0xff,
-	 true),
+	 TRUE),
   /* Simple 16 pc-relative reloc.  */
   HOWTO (R_MN10200_PCREL16,
 	 0,
 	 1,
 	 16,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10200_PCREL16",
-	 false,
+	 FALSE,
 	 0xffff,
 	 0xffff,
-	 true),
+	 TRUE),
   /* Simple 32bit pc-relative reloc with a 1 byte adjustment
      to get the pc-relative offset correct.  */
   HOWTO (R_MN10200_PCREL24,
 	 0,
 	 2,
 	 24,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10200_PCREL24",
-	 false,
+	 FALSE,
 	 0xffffff,
 	 0xffffff,
-	 true),
+	 TRUE),
 };
 
 struct mn10200_reloc_map {
@@ -327,7 +327,7 @@ mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
 }
 
 /* Relocate an MN10200 ELF section.  */
-static boolean
+static bfd_boolean
 mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			      contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -344,7 +344,7 @@ mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *rel, *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -395,8 +395,8 @@ mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -428,14 +428,14 @@ mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_undefined:
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, name, input_bfd, input_section,
-		      rel->r_offset, true)))
-		return false;
+		      rel->r_offset, TRUE)))
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -458,13 +458,13 @@ mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->warning)
 		    (info, msg, name, input_bfd, input_section,
 		     rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This function handles relaxing for the mn10200.
@@ -496,12 +496,12 @@ mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	We don't handle imm16->imm8 or d16->d8 as they're very rare
 	and somewhat more difficult to support.  */
 
-static boolean
+static bfd_boolean
 mn10200_elf_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
@@ -510,7 +510,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
   Elf_Internal_Sym *isymbuf = NULL;
 
   /* Assume nothing changes.  */
-  *again = false;
+  *again = FALSE;
 
   /* We don't have to do anything for a relocateable link, if
      this section does not have relocs, or if this is not a
@@ -519,7 +519,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0
       || (sec->flags & SEC_CODE) == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -679,7 +679,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
 
 	      /* That will change things, so, we should relax again.
 		 Note that this is not required, and it may be slow.  */
-	      *again = true;
+	      *again = TRUE;
 	    }
 	}
 
@@ -726,7 +726,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
 
 	      /* That will change things, so, we should relax again.
 		 Note that this is not required, and it may be slow.  */
-	      *again = true;
+	      *again = TRUE;
 	    }
 	}
 
@@ -879,7 +879,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
 
 	  /* That will change things, so, we should relax again.
 	     Note that this is not required, and it may be slow.  */
-	  *again = true;
+	  *again = TRUE;
 	}
 
       /* Try to turn a 24bit immediate, displacement or absolute address
@@ -942,7 +942,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
 
 		  /* That will change things, so, we should relax again.
 		     Note that this is not required, and it may be slow.  */
-		  *again = true;
+		  *again = TRUE;
 		  break;
 
 		/* mov imm24,an -> mov imm16,an
@@ -993,7 +993,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
 
 		  /* That will change things, so, we should relax again.
 		     Note that this is not required, and it may be slow.  */
-		  *again = true;
+		  *again = TRUE;
 		  break;
 
 		/* cmp imm24,dn -> cmp imm16,dn
@@ -1094,7 +1094,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
 
 		  /* That will change things, so, we should relax again.
 		     Note that this is not required, and it may be slow.  */
-		  *again = true;
+		  *again = TRUE;
 		  break;
 
 		/* movb (abs24),dn ->movbu (abs16),dn extxb bn */
@@ -1125,7 +1125,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
 
 		  /* That will change things, so, we should relax again.
 		     Note that this is not required, and it may be slow.  */
-		  *again = true;
+		  *again = TRUE;
 		  break;
 		}
 	    }
@@ -1160,7 +1160,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL
@@ -1173,12 +1173,12 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return false;
+  return FALSE;
 }
 
 /* Delete some bytes from a section while relaxing.  */
 
-static boolean
+static bfd_boolean
 mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
      bfd *abfd;
      asection *sec;
@@ -1253,12 +1253,12 @@ mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
-/* Return true if a symbol exists at the given address, else return
-   false.  */
-static boolean
+/* Return TRUE if a symbol exists at the given address, else return
+   FALSE.  */
+static bfd_boolean
 mn10200_elf_symbol_address_p (abfd, sec, isym, addr)
      bfd *abfd;
      asection *sec;
@@ -1280,7 +1280,7 @@ mn10200_elf_symbol_address_p (abfd, sec, isym, addr)
     {
       if (isym->st_shndx == sec_shndx
 	  && isym->st_value == addr)
-	return true;
+	return TRUE;
     }
 
   symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
@@ -1294,10 +1294,10 @@ mn10200_elf_symbol_address_p (abfd, sec, isym, addr)
 	   || sym_hash->root.type == bfd_link_hash_defweak)
 	  && sym_hash->root.u.def.section == sec
 	  && sym_hash->root.u.def.value == addr)
-	return true;
+	return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
 
 /* This is a version of bfd_generic_get_relocated_section_contents
@@ -1310,7 +1310,7 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   Elf_Internal_Shdr *symtab_hdr;
@@ -1344,7 +1344,7 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
 
       internal_relocs = (_bfd_elf32_link_read_relocs
 			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
+			  (Elf_Internal_Rela *) NULL, FALSE));
       if (internal_relocs == NULL)
 	goto error_return;
 
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index 4497ef27b3c..4dd0b916e34 100644
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -28,19 +28,22 @@ static bfd_reloc_status_type mn10300_elf_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *,
 	   bfd_vma, bfd_vma, bfd_vma, struct bfd_link_info *,
 	   asection *, int));
-static boolean mn10300_elf_relocate_section
+static bfd_boolean mn10300_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean mn10300_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
+static bfd_boolean mn10300_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
 static bfd_byte * mn10300_elf_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
-static unsigned long elf_mn10300_mach PARAMS ((flagword));
-
-void    _bfd_mn10300_elf_final_write_processing PARAMS ((bfd *, boolean));
-boolean _bfd_mn10300_elf_object_p PARAMS ((bfd *));
-boolean _bfd_mn10300_elf_merge_private_bfd_data PARAMS ((bfd *,bfd *));
+	   bfd_byte *, bfd_boolean, asymbol **));
+static unsigned long elf_mn10300_mach
+  PARAMS ((flagword));
+void _bfd_mn10300_elf_final_write_processing
+  PARAMS ((bfd *, bfd_boolean));
+bfd_boolean _bfd_mn10300_elf_object_p
+  PARAMS ((bfd *));
+bfd_boolean _bfd_mn10300_elf_merge_private_bfd_data
+  PARAMS ((bfd *,bfd *));
 
 struct elf32_mn10300_link_hash_entry {
   /* The basic elf link hash table entry.  */
@@ -104,7 +107,7 @@ struct elf32_mn10300_link_hash_table {
 #define elf32_mn10300_link_hash_traverse(table, func, info)		\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 static struct bfd_hash_entry *elf32_mn10300_link_hash_newfunc
@@ -118,17 +121,17 @@ static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 static void mn10300_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean mn10300_elf_check_relocs
+static bfd_boolean mn10300_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection *mn10300_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *info, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean mn10300_elf_relax_delete_bytes
+static bfd_boolean mn10300_elf_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, int));
-static boolean mn10300_elf_symbol_address_p
-PARAMS ((bfd *, asection *, Elf_Internal_Sym *, bfd_vma));
-static boolean elf32_mn10300_finish_hash_table_entry
+static bfd_boolean mn10300_elf_symbol_address_p
+  PARAMS ((bfd *, asection *, Elf_Internal_Sym *, bfd_vma));
+static bfd_boolean elf32_mn10300_finish_hash_table_entry
   PARAMS ((struct bfd_hash_entry *, PTR));
 static void compute_function_info
   PARAMS ((bfd *, struct elf32_mn10300_link_hash_entry *,
@@ -140,144 +143,144 @@ static reloc_howto_type elf_mn10300_howto_table[] = {
 	 0,
 	 2,
 	 16,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10300_NONE",
-	 false,
+	 FALSE,
 	 0,
 	 0,
-	 false),
+	 FALSE),
   /* Standard 32 bit reloc.  */
   HOWTO (R_MN10300_32,
 	 0,
 	 2,
 	 32,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10300_32",
-	 false,
+	 FALSE,
 	 0xffffffff,
 	 0xffffffff,
-	 false),
+	 FALSE),
   /* Standard 16 bit reloc.  */
   HOWTO (R_MN10300_16,
 	 0,
 	 1,
 	 16,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10300_16",
-	 false,
+	 FALSE,
 	 0xffff,
 	 0xffff,
-	 false),
+	 FALSE),
   /* Standard 8 bit reloc.  */
   HOWTO (R_MN10300_8,
 	 0,
 	 0,
 	 8,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10300_8",
-	 false,
+	 FALSE,
 	 0xff,
 	 0xff,
-	 false),
+	 FALSE),
   /* Standard 32bit pc-relative reloc.  */
   HOWTO (R_MN10300_PCREL32,
 	 0,
 	 2,
 	 32,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10300_PCREL32",
-	 false,
+	 FALSE,
 	 0xffffffff,
 	 0xffffffff,
-	 true),
+	 TRUE),
   /* Standard 16bit pc-relative reloc.  */
   HOWTO (R_MN10300_PCREL16,
 	 0,
 	 1,
 	 16,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10300_PCREL16",
-	 false,
+	 FALSE,
 	 0xffff,
 	 0xffff,
-	 true),
+	 TRUE),
   /* Standard 8 pc-relative reloc.  */
   HOWTO (R_MN10300_PCREL8,
 	 0,
 	 0,
 	 8,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10300_PCREL8",
-	 false,
+	 FALSE,
 	 0xff,
 	 0xff,
-	 true),
+	 TRUE),
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_MN10300_GNU_VTINHERIT, /* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_MN10300_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_MN10300_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_MN10300_GNU_VTENTRY", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Standard 24 bit reloc.  */
   HOWTO (R_MN10300_24,
 	 0,
 	 2,
 	 24,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 bfd_elf_generic_reloc,
 	 "R_MN10300_24",
-	 false,
+	 FALSE,
 	 0xffffff,
 	 0xffffff,
-	 false),
+	 FALSE),
 };
 
 struct mn10300_reloc_map {
@@ -335,7 +338,7 @@ mn10300_info_to_howto (abfd, cache_ptr, dst)
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 mn10300_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -348,7 +351,7 @@ mn10300_elf_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -374,19 +377,19 @@ mn10300_elf_check_relocs (abfd, info, sec, relocs)
 	   Reconstruct it for later use during GC.  */
 	case R_MN10300_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	/* This relocation describes which C++ vtable entries are actually
 	   used.  Record for later use during GC.  */
 	case R_MN10300_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -531,7 +534,7 @@ mn10300_elf_final_link_relocate (howto, input_bfd, output_bfd,
 }
 
 /* Relocate an MN10300 ELF section.  */
-static boolean
+static bfd_boolean
 mn10300_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			      contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -548,7 +551,7 @@ mn10300_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *rel, *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = (struct elf32_mn10300_link_hash_entry **)
@@ -605,8 +608,8 @@ mn10300_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -638,14 +641,14 @@ mn10300_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_undefined:
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, name, input_bfd, input_section,
-		      rel->r_offset, true)))
-		return false;
+		      rel->r_offset, TRUE)))
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -668,17 +671,17 @@ mn10300_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->warning)
 		    (info, msg, name, input_bfd, input_section,
 		     rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish initializing one hash table entry.  */
-static boolean
+static bfd_boolean
 elf32_mn10300_finish_hash_table_entry (gen_entry, in_args)
      struct bfd_hash_entry *gen_entry;
      PTR in_args ATTRIBUTE_UNUSED;
@@ -694,7 +697,7 @@ elf32_mn10300_finish_hash_table_entry (gen_entry, in_args)
   /* If we already know we want to convert "call" to "calls" for calls
      to this symbol, then return now.  */
   if (entry->flags == MN10300_CONVERT_CALL_TO_CALLS)
-    return true;
+    return TRUE;
 
   /* If there are no named calls to this symbol, or there's nothing we
      can move from the function itself into the "call" instruction, then
@@ -706,7 +709,7 @@ elf32_mn10300_finish_hash_table_entry (gen_entry, in_args)
       /* Make a note that we should convert "call" instructions to "calls"
 	 instructions for calls to this symbol.  */
       entry->flags |= MN10300_CONVERT_CALL_TO_CALLS;
-      return true;
+      return TRUE;
     }
 
   /* We may be able to move some instructions from the function itself into
@@ -729,7 +732,7 @@ elf32_mn10300_finish_hash_table_entry (gen_entry, in_args)
     entry->flags |= MN10300_CONVERT_CALL_TO_CALLS;
 
   /* This routine never fails.  */
-  return true;
+  return TRUE;
 }
 
 /* This function handles relaxing for the mn10300.
@@ -771,12 +774,12 @@ elf32_mn10300_finish_hash_table_entry (gen_entry, in_args)
 	We don't handle imm16->imm8 or d16->d8 as they're very rare
 	and somewhat more difficult to support.  */
 
-static boolean
+static bfd_boolean
 mn10300_elf_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs = NULL;
@@ -787,7 +790,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
   asection *section = sec;
 
   /* Assume nothing changes.  */
-  *again = false;
+  *again = FALSE;
 
   /* We need a pointer to the mn10300 specific hash table.  */
   hash_table = elf32_mn10300_hash_table (link_info);
@@ -928,7 +931,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 			  elftab = &hash_table->static_hash_table->root;
 			  hash = ((struct elf32_mn10300_link_hash_entry *)
 				  elf_link_hash_lookup (elftab, sym_name,
-							true, true, false));
+							TRUE, TRUE, FALSE));
 			  free (new_name);
 			}
 		      else
@@ -1011,7 +1014,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 			  elftab = &hash_table->static_hash_table->root;
 			  hash = ((struct elf32_mn10300_link_hash_entry *)
 				  elf_link_hash_lookup (elftab, sym_name,
-							true, true, false));
+							TRUE, TRUE, FALSE));
 			  free (new_name);
 			  compute_function_info (input_bfd, hash,
 						 isym->st_value, contents);
@@ -1191,7 +1194,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 		  elftab = &hash_table->static_hash_table->root;
 		  sym_hash = ((struct elf32_mn10300_link_hash_entry *)
 			      elf_link_hash_lookup (elftab, sym_name,
-						    false, false, false));
+						    FALSE, FALSE, FALSE));
 
 		  free (new_name);
 		  if (sym_hash == NULL)
@@ -1230,7 +1233,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		      /* Something changed.  Not strictly necessary, but
 			 may lead to more relaxing opportunities.  */
-		      *again = true;
+		      *again = TRUE;
 		    }
 		}
 
@@ -1283,7 +1286,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		      /* Something changed.  Not strictly necessary, but
 			 may lead to more relaxing opportunities.  */
-		      *again = true;
+		      *again = TRUE;
 		    }
 		}
 
@@ -1338,7 +1341,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0
       || (sec->flags & SEC_CODE) == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -1387,7 +1390,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 	    }
 	}
 
-      /* Read this BFD's symbols if we haven't done so already.  */ 
+      /* Read this BFD's symbols if we haven't done so already.  */
       if (isymbuf == NULL && symtab_hdr->sh_info != 0)
 	{
 	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
@@ -1435,7 +1438,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 	  h = (struct elf32_mn10300_link_hash_entry *)
 		elf_link_hash_lookup (&hash_table->static_hash_table->root,
-				      sym_name, false, false, false);
+				      sym_name, FALSE, FALSE, FALSE);
 	  free (new_name);
 	}
       else
@@ -1509,7 +1512,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		  /* That will change things, so, we should relax again.
 		     Note that this is not required, and it may be slow.  */
-		  *again = true;
+		  *again = TRUE;
 		}
 	    }
 	  else if (h)
@@ -1573,7 +1576,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 	      /* That will change things, so, we should relax again.
 		 Note that this is not required, and it may be slow.  */
-	      *again = true;
+	      *again = TRUE;
 	    }
 	}
 
@@ -1616,7 +1619,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		  /* That will change things, so, we should relax again.
 		     Note that this is not required, and it may be slow.  */
-		  *again = true;
+		  *again = TRUE;
 		}
 	    }
 	  else if (h)
@@ -1673,7 +1676,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 	      /* That will change things, so, we should relax again.
 		 Note that this is not required, and it may be slow.  */
-	      *again = true;
+	      *again = TRUE;
 	    }
 	}
 
@@ -1813,7 +1816,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 	  /* That will change things, so, we should relax again.
 	     Note that this is not required, and it may be slow.  */
-	  *again = true;
+	  *again = TRUE;
 	}
 
       /* Try to turn a 24 immediate, displacement or absolute address
@@ -1876,7 +1879,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 			  /* That will change things, so, we should relax
 			     again.  Note that this is not required, and it
 			     may be slow.  */
-			  *again = true;
+			  *again = TRUE;
 			  break;
 			}
 		    }
@@ -1947,7 +1950,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 			  /* That will change things, so, we should relax
 			     again.  Note that this is not required, and it
 			     may be slow.  */
-			  *again = true;
+			  *again = TRUE;
 			  break;
 			}
 		    }
@@ -2024,7 +2027,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		    /* That will change things, so, we should relax again.
 		       Note that this is not required, and it may be slow.  */
-		    *again = true;
+		    *again = TRUE;
 		    break;
 		  }
 	      else if ((code & 0xf0) == 0x80
@@ -2069,7 +2072,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		    /* That will change things, so, we should relax again.
 		       Note that this is not required, and it may be slow.  */
-		    *again = true;
+		    *again = TRUE;
 		    break;
 
 		  /* mov am,(abs32)    -> mov am,(abs16)
@@ -2107,7 +2110,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		    /* That will change things, so, we should relax again.
 		       Note that this is not required, and it may be slow.  */
-		    *again = true;
+		    *again = TRUE;
 		    break;
 		  }
 	      else if ((code & 0xf0) < 0xf0)
@@ -2171,7 +2174,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		    /* That will change things, so, we should relax again.
 		       Note that this is not required, and it may be slow.  */
-		    *again = true;
+		    *again = TRUE;
 		    break;
 
 		  /* mov (abs32),an    -> mov (abs16),an
@@ -2232,7 +2235,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		    /* That will change things, so, we should relax again.
 		       Note that this is not required, and it may be slow.  */
-		    *again = true;
+		    *again = TRUE;
 		    break;
 		  }
 	      else if (code == 0xfe)
@@ -2259,7 +2262,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 
 		  /* That will change things, so, we should relax again.
 		     Note that this is not required, and it may be slow.  */
-		  *again = true;
+		  *again = TRUE;
 		  break;
 		}
 	    }
@@ -2294,7 +2297,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL
@@ -2307,7 +2310,7 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (section)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return false;
+  return FALSE;
 }
 
 /* Compute the stack size and movm arguments for the function
@@ -2412,7 +2415,7 @@ compute_function_info (abfd, hash, addr, contents)
 
 /* Delete some bytes from a section while relaxing.  */
 
-static boolean
+static bfd_boolean
 mn10300_elf_relax_delete_bytes (abfd, sec, addr, count)
      bfd *abfd;
      asection *sec;
@@ -2486,12 +2489,12 @@ mn10300_elf_relax_delete_bytes (abfd, sec, addr, count)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
-/* Return true if a symbol exists at the given address, else return
-   false.  */
-static boolean
+/* Return TRUE if a symbol exists at the given address, else return
+   FALSE.  */
+static bfd_boolean
 mn10300_elf_symbol_address_p (abfd, sec, isym, addr)
      bfd *abfd;
      asection *sec;
@@ -2513,7 +2516,7 @@ mn10300_elf_symbol_address_p (abfd, sec, isym, addr)
     {
       if (isym->st_shndx == sec_shndx
 	  && isym->st_value == addr)
-	return true;
+	return TRUE;
     }
 
   symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
@@ -2527,10 +2530,10 @@ mn10300_elf_symbol_address_p (abfd, sec, isym, addr)
 	   || sym_hash->root.type == bfd_link_hash_defweak)
 	  && sym_hash->root.u.def.section == sec
 	  && sym_hash->root.u.def.value == addr)
-	return true;
+	return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
 
 /* This is a version of bfd_generic_get_relocated_section_contents
@@ -2543,7 +2546,7 @@ mn10300_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   Elf_Internal_Shdr *symtab_hdr;
@@ -2576,7 +2579,7 @@ mn10300_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
 
       internal_relocs = (_bfd_elf32_link_read_relocs
 			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
+			  (Elf_Internal_Rela *) NULL, FALSE));
       if (internal_relocs == NULL)
 	goto error_return;
 
@@ -2757,7 +2760,7 @@ elf_mn10300_mach (flags)
 void
 _bfd_mn10300_elf_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
 
@@ -2777,36 +2780,36 @@ _bfd_mn10300_elf_final_write_processing (abfd, linker)
   elf_elfheader (abfd)->e_flags |= val;
 }
 
-boolean
+bfd_boolean
 _bfd_mn10300_elf_object_p (abfd)
      bfd *abfd;
 {
   bfd_default_set_arch_mach (abfd, bfd_arch_mn10300,
 			     elf_mn10300_mach (elf_elfheader (abfd)->e_flags));
-  return true;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-boolean
+bfd_boolean
 _bfd_mn10300_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
       && bfd_get_mach (obfd) < bfd_get_mach (ibfd))
     {
       if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
                                bfd_get_mach (ibfd)))
-        return false;
+        return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 #define TARGET_LITTLE_SYM	bfd_elf32_mn10300_vec
diff --git a/bfd/elf-strtab.c b/bfd/elf-strtab.c
index 7a993c252f5..3bd5531a81d 100644
--- a/bfd/elf-strtab.c
+++ b/bfd/elf-strtab.c
@@ -148,7 +148,7 @@ bfd_size_type
 _bfd_elf_strtab_add (tab, str, copy)
      struct elf_strtab_hash *tab;
      const char *str;
-     boolean copy;
+     bfd_boolean copy;
 {
   register struct elf_strtab_hash_entry *entry;
 
@@ -159,7 +159,7 @@ _bfd_elf_strtab_add (tab, str, copy)
 
   BFD_ASSERT (tab->sec_size == 0);
   entry = (struct elf_strtab_hash_entry *)
-	  bfd_hash_lookup (&tab->table, str, true, copy);
+	  bfd_hash_lookup (&tab->table, str, TRUE, copy);
 
   if (entry == NULL)
     return (bfd_size_type) -1;
@@ -243,7 +243,7 @@ _bfd_elf_strtab_offset (tab, idx)
   return tab->array[idx]->u.index;
 }
 
-boolean
+bfd_boolean
 _bfd_elf_strtab_emit (abfd, tab)
      register bfd *abfd;
      struct elf_strtab_hash *tab;
@@ -251,7 +251,7 @@ _bfd_elf_strtab_emit (abfd, tab)
   bfd_size_type off = 1, i;
 
   if (bfd_bwrite ("", 1, abfd) != 1)
-    return false;
+    return FALSE;
 
   for (i = 1; i < tab->size; ++i)
     {
@@ -265,13 +265,13 @@ _bfd_elf_strtab_emit (abfd, tab)
 	continue;
 
       if (bfd_bwrite ((PTR) str, (bfd_size_type) len, abfd) != len)
-	return false;
+	return FALSE;
 
       off += len;
     }
 
   BFD_ASSERT (off == tab->sec_size);
-  return true;
+  return TRUE;
 }
 
 /* Compare two elf_strtab_hash_entry structures.  This is called via qsort.  */
diff --git a/bfd/elf.c b/bfd/elf.c
index 341f3ae77fb..b1128f243a8 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
+   along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /*  SECTION
@@ -41,39 +41,62 @@
 #include "libiberty.h"
 
 static INLINE struct elf_segment_map *make_mapping
-  PARAMS ((bfd *, asection **, unsigned int, unsigned int, boolean));
-static boolean map_sections_to_segments PARAMS ((bfd *));
-static int elf_sort_sections PARAMS ((const PTR, const PTR));
-static boolean assign_file_positions_for_segments PARAMS ((bfd *));
-static boolean assign_file_positions_except_relocs PARAMS ((bfd *));
-static boolean prep_headers PARAMS ((bfd *));
-static boolean swap_out_syms PARAMS ((bfd *, struct bfd_strtab_hash **, int));
-static boolean copy_private_bfd_data PARAMS ((bfd *, bfd *));
-static char *elf_read PARAMS ((bfd *, file_ptr, bfd_size_type));
-static const char *group_signature PARAMS ((bfd *, Elf_Internal_Shdr *));
-static boolean setup_group PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
-static void merge_sections_remove_hook PARAMS ((bfd *, asection *));
-static void elf_fake_sections PARAMS ((bfd *, asection *, PTR));
-static boolean assign_section_numbers PARAMS ((bfd *));
-static INLINE int sym_is_global PARAMS ((bfd *, asymbol *));
-static boolean elf_map_symbols PARAMS ((bfd *));
-static bfd_size_type get_program_header_size PARAMS ((bfd *));
-static boolean elfcore_read_notes PARAMS ((bfd *, file_ptr, bfd_size_type));
-static boolean elf_find_function PARAMS ((bfd *, asection *, asymbol **,
-					  bfd_vma, const char **,
-					  const char **));
-static int elfcore_make_pid PARAMS ((bfd *));
-static boolean elfcore_maybe_make_sect PARAMS ((bfd *, char *, asection *));
-static boolean elfcore_make_note_pseudosection PARAMS ((bfd *, char *,
-							Elf_Internal_Note *));
-static boolean elfcore_grok_prfpreg PARAMS ((bfd *, Elf_Internal_Note *));
-static boolean elfcore_grok_prxfpreg PARAMS ((bfd *, Elf_Internal_Note *));
-static boolean elfcore_grok_note PARAMS ((bfd *, Elf_Internal_Note *));
-
-static boolean elfcore_netbsd_get_lwpid PARAMS ((Elf_Internal_Note *, int *));
-static boolean elfcore_grok_netbsd_procinfo PARAMS ((bfd *,
-						     Elf_Internal_Note *));
-static boolean elfcore_grok_netbsd_note PARAMS ((bfd *, Elf_Internal_Note *));
+  PARAMS ((bfd *, asection **, unsigned int, unsigned int, bfd_boolean));
+static bfd_boolean map_sections_to_segments
+  PARAMS ((bfd *));
+static int elf_sort_sections
+  PARAMS ((const PTR, const PTR));
+static bfd_boolean assign_file_positions_for_segments
+  PARAMS ((bfd *));
+static bfd_boolean assign_file_positions_except_relocs
+  PARAMS ((bfd *));
+static bfd_boolean prep_headers
+  PARAMS ((bfd *));
+static bfd_boolean swap_out_syms
+  PARAMS ((bfd *, struct bfd_strtab_hash **, int));
+static bfd_boolean copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static char *elf_read
+  PARAMS ((bfd *, file_ptr, bfd_size_type));
+static const char *group_signature
+  PARAMS ((bfd *, Elf_Internal_Shdr *));
+static bfd_boolean setup_group
+  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
+static void merge_sections_remove_hook
+  PARAMS ((bfd *, asection *));
+static void elf_fake_sections
+  PARAMS ((bfd *, asection *, PTR));
+static bfd_boolean assign_section_numbers
+  PARAMS ((bfd *));
+static INLINE int sym_is_global
+  PARAMS ((bfd *, asymbol *));
+static bfd_boolean elf_map_symbols
+  PARAMS ((bfd *));
+static bfd_size_type get_program_header_size
+  PARAMS ((bfd *));
+static bfd_boolean elfcore_read_notes
+  PARAMS ((bfd *, file_ptr, bfd_size_type));
+static bfd_boolean elf_find_function
+  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
+	   const char **));
+static int elfcore_make_pid
+  PARAMS ((bfd *));
+static bfd_boolean elfcore_maybe_make_sect
+  PARAMS ((bfd *, char *, asection *));
+static bfd_boolean elfcore_make_note_pseudosection
+  PARAMS ((bfd *, char *, Elf_Internal_Note *));
+static bfd_boolean elfcore_grok_prfpreg
+  PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elfcore_grok_prxfpreg
+  PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elfcore_grok_note
+  PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elfcore_netbsd_get_lwpid
+  PARAMS ((Elf_Internal_Note *, int *));
+static bfd_boolean elfcore_grok_netbsd_procinfo
+  PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elfcore_grok_netbsd_note
+  PARAMS ((bfd *, Elf_Internal_Note *));
 
 /* Swap version information in and out.  The version information is
    currently size independent.  If that ever changes, this code will
@@ -270,7 +293,7 @@ elf_read (abfd, offset, size)
   return buf;
 }
 
-boolean
+bfd_boolean
 bfd_elf_mkobject (abfd)
      bfd *abfd;
 {
@@ -279,14 +302,14 @@ bfd_elf_mkobject (abfd)
   bfd_size_type amt = sizeof (struct elf_obj_tdata);
   elf_tdata (abfd) = (struct elf_obj_tdata *) bfd_zalloc (abfd, amt);
   if (elf_tdata (abfd) == 0)
-    return false;
+    return FALSE;
   /* Since everything is done at close time, do we need any
      initialization?  */
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 bfd_elf_mkcorefile (abfd)
      bfd *abfd;
 {
@@ -501,7 +524,7 @@ group_signature (abfd, ghdr)
 
 /* Set next_in_group list pointer, and group name for NEWSECT.  */
 
-static boolean
+static bfd_boolean
 setup_group (abfd, hdr, newsect)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -537,7 +560,7 @@ setup_group (abfd, hdr, newsect)
 	  bfd_size_type amt = num_group * sizeof (Elf_Internal_Shdr *);
 	  elf_tdata (abfd)->group_sect_ptr = bfd_alloc (abfd, amt);
 	  if (elf_tdata (abfd)->group_sect_ptr == NULL)
-	    return false;
+	    return FALSE;
 
 	  num_group = 0;
 	  for (i = 0; i < shnum; i++)
@@ -560,7 +583,7 @@ setup_group (abfd, hdr, newsect)
 		      || bfd_seek (abfd, shdr->sh_offset, SEEK_SET) != 0
 		      || (bfd_bread (shdr->contents, shdr->sh_size, abfd)
 			  != shdr->sh_size))
-		    return false;
+		    return FALSE;
 
 		  /* Translate raw contents, a flag word followed by an
 		     array of elf section indices all in target byte order,
@@ -637,7 +660,7 @@ setup_group (abfd, hdr, newsect)
 
 		    gname = group_signature (abfd, shdr);
 		    if (gname == NULL)
-		      return false;
+		      return FALSE;
 		    elf_group_name (newsect) = gname;
 
 		    /* Start a circular list with one element.  */
@@ -660,10 +683,10 @@ setup_group (abfd, hdr, newsect)
       (*_bfd_error_handler) (_("%s: no group info for section %s"),
 			     bfd_archive_filename (abfd), newsect->name);
     }
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 bfd_elf_discard_group (abfd, group)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *group;
@@ -679,13 +702,13 @@ bfd_elf_discard_group (abfd, group)
       if (s == first)
 	break;
     }
-  return true;
+  return TRUE;
 }
 
 /* Make a BFD section from an ELF section.  We store a pointer to the
    BFD section in the bfd_section field of the header.  */
 
-boolean
+bfd_boolean
 _bfd_elf_make_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -699,12 +722,12 @@ _bfd_elf_make_section_from_shdr (abfd, hdr, name)
     {
       BFD_ASSERT (strcmp (name,
 			  bfd_get_section_name (abfd, hdr->bfd_section)) == 0);
-      return true;
+      return TRUE;
     }
 
   newsect = bfd_make_section_anyway (abfd, name);
   if (newsect == NULL)
-    return false;
+    return FALSE;
 
   newsect->filepos = hdr->sh_offset;
 
@@ -712,7 +735,7 @@ _bfd_elf_make_section_from_shdr (abfd, hdr, name)
       || ! bfd_set_section_size (abfd, newsect, hdr->sh_size)
       || ! bfd_set_section_alignment (abfd, newsect,
 				      bfd_log2 ((bfd_vma) hdr->sh_addralign)))
-    return false;
+    return FALSE;
 
   flags = SEC_NO_FLAGS;
   if (hdr->sh_type != SHT_NOBITS)
@@ -740,7 +763,7 @@ _bfd_elf_make_section_from_shdr (abfd, hdr, name)
     }
   if (hdr->sh_flags & SHF_GROUP)
     if (!setup_group (abfd, hdr, newsect))
-      return false;
+      return FALSE;
   if ((hdr->sh_flags & SHF_TLS) != 0)
     flags |= SEC_THREAD_LOCAL;
 
@@ -777,10 +800,10 @@ _bfd_elf_make_section_from_shdr (abfd, hdr, name)
   bed = get_elf_backend_data (abfd);
   if (bed->elf_backend_section_flags)
     if (! bed->elf_backend_section_flags (&flags, hdr))
-      return false;
+      return FALSE;
 
   if (! bfd_set_section_flags (abfd, newsect, flags))
-    return false;
+    return FALSE;
 
   if ((flags & SEC_ALLOC) != 0)
     {
@@ -851,7 +874,7 @@ _bfd_elf_make_section_from_shdr (abfd, hdr, name)
   hdr->bfd_section = newsect;
   elf_section_data (newsect)->this_hdr = *hdr;
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -955,17 +978,17 @@ merge_sections_remove_hook (abfd, sec)
 
 /* Finish SHF_MERGE section merging.  */
 
-boolean
+bfd_boolean
 _bfd_elf_merge_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   if (!is_elf_hash_table (info))
-    return false;
+    return FALSE;
   if (elf_hash_table (info)->merge_info)
     _bfd_merge_sections (abfd, elf_hash_table (info)->merge_info,
 			 merge_sections_remove_hook);
-  return true;
+  return TRUE;
 }
 
 void
@@ -984,14 +1007,14 @@ _bfd_elf_link_just_syms (sec, info)
 /* Copy the program header and other data from one object module to
    another.  */
 
-boolean
+bfd_boolean
 _bfd_elf_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   BFD_ASSERT (!elf_flags_init (obfd)
 	      || (elf_elfheader (obfd)->e_flags
@@ -999,13 +1022,13 @@ _bfd_elf_copy_private_bfd_data (ibfd, obfd)
 
   elf_gp (obfd) = elf_gp (ibfd);
   elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  elf_flags_init (obfd) = true;
-  return true;
+  elf_flags_init (obfd) = TRUE;
+  return TRUE;
 }
 
 /* Print out the program headers.  */
 
-boolean
+bfd_boolean
 _bfd_elf_print_private_bfd_data (abfd, farg)
      bfd *abfd;
      PTR farg;
@@ -1094,14 +1117,14 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
 	  Elf_Internal_Dyn dyn;
 	  const char *name;
 	  char ab[20];
-	  boolean stringp;
+	  bfd_boolean stringp;
 
 	  (*swap_dyn_in) (abfd, (PTR) extdyn, &dyn);
 
 	  if (dyn.d_tag == DT_NULL)
 	    break;
 
-	  stringp = false;
+	  stringp = FALSE;
 	  switch (dyn.d_tag)
 	    {
 	    default:
@@ -1109,7 +1132,7 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
 	      name = ab;
 	      break;
 
-	    case DT_NEEDED: name = "NEEDED"; stringp = true; break;
+	    case DT_NEEDED: name = "NEEDED"; stringp = TRUE; break;
 	    case DT_PLTRELSZ: name = "PLTRELSZ"; break;
 	    case DT_PLTGOT: name = "PLTGOT"; break;
 	    case DT_HASH: name = "HASH"; break;
@@ -1122,8 +1145,8 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
 	    case DT_SYMENT: name = "SYMENT"; break;
 	    case DT_INIT: name = "INIT"; break;
 	    case DT_FINI: name = "FINI"; break;
-	    case DT_SONAME: name = "SONAME"; stringp = true; break;
-	    case DT_RPATH: name = "RPATH"; stringp = true; break;
+	    case DT_SONAME: name = "SONAME"; stringp = TRUE; break;
+	    case DT_RPATH: name = "RPATH"; stringp = TRUE; break;
 	    case DT_SYMBOLIC: name = "SYMBOLIC"; break;
 	    case DT_REL: name = "REL"; break;
 	    case DT_RELSZ: name = "RELSZ"; break;
@@ -1137,7 +1160,7 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
 	    case DT_FINI_ARRAY: name = "FINI_ARRAY"; break;
 	    case DT_INIT_ARRAYSZ: name = "INIT_ARRAYSZ"; break;
 	    case DT_FINI_ARRAYSZ: name = "FINI_ARRAYSZ"; break;
-	    case DT_RUNPATH: name = "RUNPATH"; stringp = true; break;
+	    case DT_RUNPATH: name = "RUNPATH"; stringp = TRUE; break;
 	    case DT_FLAGS: name = "FLAGS"; break;
 	    case DT_PREINIT_ARRAY: name = "PREINIT_ARRAY"; break;
 	    case DT_PREINIT_ARRAYSZ: name = "PREINIT_ARRAYSZ"; break;
@@ -1149,9 +1172,9 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
 	    case DT_POSFLAG_1: name = "POSFLAG_1"; break;
 	    case DT_SYMINSZ: name = "SYMINSZ"; break;
 	    case DT_SYMINENT: name = "SYMINENT"; break;
-	    case DT_CONFIG: name = "CONFIG"; stringp = true; break;
-	    case DT_DEPAUDIT: name = "DEPAUDIT"; stringp = true; break;
-	    case DT_AUDIT: name = "AUDIT"; stringp = true; break;
+	    case DT_CONFIG: name = "CONFIG"; stringp = TRUE; break;
+	    case DT_DEPAUDIT: name = "DEPAUDIT"; stringp = TRUE; break;
+	    case DT_AUDIT: name = "AUDIT"; stringp = TRUE; break;
 	    case DT_PLTPAD: name = "PLTPAD"; break;
 	    case DT_MOVETAB: name = "MOVETAB"; break;
 	    case DT_SYMINFO: name = "SYMINFO"; break;
@@ -1163,9 +1186,9 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
 	    case DT_VERDEFNUM: name = "VERDEFNUM"; break;
 	    case DT_VERNEED: name = "VERNEED"; break;
 	    case DT_VERNEEDNUM: name = "VERNEEDNUM"; break;
-	    case DT_AUXILIARY: name = "AUXILIARY"; stringp = true; break;
+	    case DT_AUXILIARY: name = "AUXILIARY"; stringp = TRUE; break;
 	    case DT_USED: name = "USED"; break;
-	    case DT_FILTER: name = "FILTER"; stringp = true; break;
+	    case DT_FILTER: name = "FILTER"; stringp = TRUE; break;
 	    }
 
 	  fprintf (f, "  %-11s ", name);
@@ -1192,7 +1215,7 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
       || (elf_dynverref (abfd) != 0 && elf_tdata (abfd)->verref == NULL))
     {
       if (! _bfd_elf_slurp_version_tables (abfd))
-	return false;
+	return FALSE;
     }
 
   if (elf_dynverdef (abfd) != 0)
@@ -1234,12 +1257,12 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
 	}
     }
 
-  return true;
+  return TRUE;
 
  error_return:
   if (dynbuf != NULL)
     free (dynbuf);
-  return false;
+  return FALSE;
 }
 
 /* Display ELF-specific fields of a symbol.  */
@@ -1474,7 +1497,7 @@ void
 _bfd_elf_link_hash_hide_symbol (info, h, force_local)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
-     boolean force_local;
+     bfd_boolean force_local;
 {
   h->plt.offset = (bfd_vma) -1;
   h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
@@ -1492,17 +1515,17 @@ _bfd_elf_link_hash_hide_symbol (info, h, force_local)
 
 /* Initialize an ELF linker hash table.  */
 
-boolean
+bfd_boolean
 _bfd_elf_link_hash_table_init (table, abfd, newfunc)
      struct elf_link_hash_table *table;
      bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
+     struct bfd_hash_entry *(*newfunc)
+       PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
+		const char *));
 {
-  boolean ret;
+  bfd_boolean ret;
 
-  table->dynamic_sections_created = false;
+  table->dynamic_sections_created = FALSE;
   table->dynobj = NULL;
   /* Make sure can_refcount is extended to the width and signedness of
      init_refcount before we subtract one from it.  */
@@ -1618,7 +1641,7 @@ bfd_elf_get_dt_soname (abfd)
 /* Get the list of DT_NEEDED entries from a BFD.  This is a hook for
    the ELF linker emulation code.  */
 
-boolean
+bfd_boolean
 bfd_elf_get_bfd_needed_list (abfd, pneeded)
      bfd *abfd;
      struct bfd_link_needed_list **pneeded;
@@ -1635,11 +1658,11 @@ bfd_elf_get_bfd_needed_list (abfd, pneeded)
 
   if (bfd_get_flavour (abfd) != bfd_target_elf_flavour
       || bfd_get_format (abfd) != bfd_object)
-    return true;
+    return TRUE;
 
   s = bfd_get_section_by_name (abfd, ".dynamic");
   if (s == NULL || s->_raw_size == 0)
-    return true;
+    return TRUE;
 
   dynbuf = (bfd_byte *) bfd_malloc (s->_raw_size);
   if (dynbuf == NULL)
@@ -1694,12 +1717,12 @@ bfd_elf_get_bfd_needed_list (abfd, pneeded)
 
   free (dynbuf);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (dynbuf != NULL)
     free (dynbuf);
-  return false;
+  return FALSE;
 }
 
 /* Allocate an ELF string table--force the first byte to be zero.  */
@@ -1714,7 +1737,7 @@ _bfd_elf_stringtab_init ()
     {
       bfd_size_type loc;
 
-      loc = _bfd_stringtab_add (ret, "", true, false);
+      loc = _bfd_stringtab_add (ret, "", TRUE, FALSE);
       BFD_ASSERT (loc == 0 || loc == (bfd_size_type) -1);
       if (loc == (bfd_size_type) -1)
 	{
@@ -1729,7 +1752,7 @@ _bfd_elf_stringtab_init ()
 
 /* Create a new bfd section from an ELF section header.  */
 
-boolean
+bfd_boolean
 bfd_section_from_shdr (abfd, shindex)
      bfd *abfd;
      unsigned int shindex;
@@ -1745,7 +1768,7 @@ bfd_section_from_shdr (abfd, shindex)
     {
     case SHT_NULL:
       /* Inactive section. Throw it away.  */
-      return true;
+      return TRUE;
 
     case SHT_PROGBITS:	/* Normal section with contents.  */
     case SHT_NOBITS:	/* .bss section.  */
@@ -1758,7 +1781,7 @@ bfd_section_from_shdr (abfd, shindex)
 
     case SHT_DYNAMIC:	/* Dynamic linking information.  */
       if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-	return false;
+	return FALSE;
       if (elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_STRTAB)
 	{
 	  Elf_Internal_Shdr *dynsymhdr;
@@ -1791,7 +1814,7 @@ bfd_section_from_shdr (abfd, shindex)
 
     case SHT_SYMTAB:		/* A symbol table */
       if (elf_onesymtab (abfd) == shindex)
-	return true;
+	return TRUE;
 
       BFD_ASSERT (hdr->sh_entsize == bed->s->sizeof_sym);
       BFD_ASSERT (elf_onesymtab (abfd) == 0);
@@ -1809,13 +1832,13 @@ bfd_section_from_shdr (abfd, shindex)
       if ((hdr->sh_flags & SHF_ALLOC) != 0
 	  && (abfd->flags & DYNAMIC) != 0
 	  && ! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-	return false;
+	return FALSE;
 
-      return true;
+      return TRUE;
 
     case SHT_DYNSYM:		/* A dynamic symbol table */
       if (elf_dynsymtab (abfd) == shindex)
-	return true;
+	return TRUE;
 
       BFD_ASSERT (hdr->sh_entsize == bed->s->sizeof_sym);
       BFD_ASSERT (elf_dynsymtab (abfd) == 0);
@@ -1830,26 +1853,26 @@ bfd_section_from_shdr (abfd, shindex)
 
     case SHT_SYMTAB_SHNDX:	/* Symbol section indices when >64k sections */
       if (elf_symtab_shndx (abfd) == shindex)
-	return true;
+	return TRUE;
 
       /* Get the associated symbol table.  */
       if (! bfd_section_from_shdr (abfd, hdr->sh_link)
 	  || hdr->sh_link != elf_onesymtab (abfd))
-	return false;
+	return FALSE;
 
       elf_symtab_shndx (abfd) = shindex;
       elf_tdata (abfd)->symtab_shndx_hdr = *hdr;
       elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->symtab_shndx_hdr;
-      return true;
+      return TRUE;
 
     case SHT_STRTAB:		/* A string table */
       if (hdr->bfd_section != NULL)
-	return true;
+	return TRUE;
       if (ehdr->e_shstrndx == shindex)
 	{
 	  elf_tdata (abfd)->shstrtab_hdr = *hdr;
 	  elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->shstrtab_hdr;
-	  return true;
+	  return TRUE;
 	}
       {
 	unsigned int i, num_sec;
@@ -1861,13 +1884,13 @@ bfd_section_from_shdr (abfd, shindex)
 	    if (hdr2->sh_link == shindex)
 	      {
 		if (! bfd_section_from_shdr (abfd, i))
-		  return false;
+		  return FALSE;
 		if (elf_onesymtab (abfd) == i)
 		  {
 		    elf_tdata (abfd)->strtab_hdr = *hdr;
 		    elf_elfsections (abfd)[shindex] =
 		      &elf_tdata (abfd)->strtab_hdr;
-		    return true;
+		    return TRUE;
 		  }
 		if (elf_dynsymtab (abfd) == i)
 		  {
@@ -1947,7 +1970,7 @@ bfd_section_from_shdr (abfd, shindex)
 	/* Get the symbol table.  */
 	if (elf_elfsections (abfd)[hdr->sh_link]->sh_type == SHT_SYMTAB
 	    && ! bfd_section_from_shdr (abfd, hdr->sh_link))
-	  return false;
+	  return FALSE;
 
 	/* If this reloc section does not use the main symbol table we
 	   don't treat it as a reloc section.  BFD can't adequately
@@ -1959,10 +1982,10 @@ bfd_section_from_shdr (abfd, shindex)
 	  return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
 
 	if (! bfd_section_from_shdr (abfd, hdr->sh_info))
-	  return false;
+	  return FALSE;
 	target_sect = bfd_section_from_elf_index (abfd, hdr->sh_info);
 	if (target_sect == NULL)
-	  return false;
+	  return FALSE;
 
 	if ((target_sect->flags & SEC_RELOC) == 0
 	    || target_sect->reloc_count == 0)
@@ -1987,7 +2010,7 @@ bfd_section_from_shdr (abfd, shindex)
 	  elf_section_data (target_sect)->use_rela_p
 	    = (hdr->sh_type == SHT_RELA);
 	abfd->flags |= HAS_RELOC;
-	return true;
+	return TRUE;
       }
       break;
 
@@ -2010,7 +2033,7 @@ bfd_section_from_shdr (abfd, shindex)
       break;
 
     case SHT_SHLIB:
-      return true;
+      return TRUE;
 
     case SHT_GROUP:
       /* We need a BFD section for objcopy and relocatable linking,
@@ -2018,9 +2041,9 @@ bfd_section_from_shdr (abfd, shindex)
 	 name.  */
       name = group_signature (abfd, hdr);
       if (name == NULL)
-	return false;
+	return FALSE;
       if (!_bfd_elf_make_section_from_shdr (abfd, hdr, name))
-	return false;
+	return FALSE;
       if (hdr->contents != NULL)
 	{
 	  Elf_Internal_Group *idx = (Elf_Internal_Group *) hdr->contents;
@@ -2050,7 +2073,7 @@ bfd_section_from_shdr (abfd, shindex)
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section for the local symbol specified by ABFD, R_SYMNDX.
@@ -2107,7 +2130,7 @@ bfd_section_from_elf_index (abfd, index)
   return elf_elfsections (abfd)[index]->bfd_section;
 }
 
-boolean
+bfd_boolean
 _bfd_elf_new_section_hook (abfd, sec)
      bfd *abfd;
      asection *sec;
@@ -2117,14 +2140,14 @@ _bfd_elf_new_section_hook (abfd, sec)
 
   sdata = (struct bfd_elf_section_data *) bfd_zalloc (abfd, amt);
   if (!sdata)
-    return false;
+    return FALSE;
   sec->used_by_bfd = (PTR) sdata;
 
   /* Indicate whether or not this section should use RELA relocations.  */
   sdata->use_rela_p
     = get_elf_backend_data (abfd)->default_use_rela_p;
 
-  return true;
+  return TRUE;
 }
 
 /* Create a new bfd section from an ELF program header.
@@ -2149,7 +2172,7 @@ _bfd_elf_new_section_hook (abfd, sec)
 
  */
 
-boolean
+bfd_boolean
 _bfd_elf_make_section_from_phdr (abfd, hdr, index, typename)
      bfd *abfd;
      Elf_Internal_Phdr *hdr;
@@ -2169,11 +2192,11 @@ _bfd_elf_make_section_from_phdr (abfd, hdr, index, typename)
   len = strlen (namebuf) + 1;
   name = bfd_alloc (abfd, (bfd_size_type) len);
   if (!name)
-    return false;
+    return FALSE;
   memcpy (name, namebuf, len);
   newsect = bfd_make_section (abfd, name);
   if (newsect == NULL)
-    return false;
+    return FALSE;
   newsect->vma = hdr->p_vaddr;
   newsect->lma = hdr->p_paddr;
   newsect->_raw_size = hdr->p_filesz;
@@ -2201,11 +2224,11 @@ _bfd_elf_make_section_from_phdr (abfd, hdr, index, typename)
       len = strlen (namebuf) + 1;
       name = bfd_alloc (abfd, (bfd_size_type) len);
       if (!name)
-	return false;
+	return FALSE;
       memcpy (name, namebuf, len);
       newsect = bfd_make_section (abfd, name);
       if (newsect == NULL)
-	return false;
+	return FALSE;
       newsect->vma = hdr->p_vaddr + hdr->p_filesz;
       newsect->lma = hdr->p_paddr + hdr->p_filesz;
       newsect->_raw_size = hdr->p_memsz - hdr->p_filesz;
@@ -2219,10 +2242,10 @@ _bfd_elf_make_section_from_phdr (abfd, hdr, index, typename)
 	newsect->flags |= SEC_READONLY;
     }
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 bfd_section_from_phdr (abfd, hdr, index)
      bfd *abfd;
      Elf_Internal_Phdr *hdr;
@@ -2246,10 +2269,10 @@ bfd_section_from_phdr (abfd, hdr, index)
 
     case PT_NOTE:
       if (! _bfd_elf_make_section_from_phdr (abfd, hdr, index, "note"))
-	return false;
+	return FALSE;
       if (! elfcore_read_notes (abfd, (file_ptr) hdr->p_offset, hdr->p_filesz))
-	return false;
-      return true;
+	return FALSE;
+      return TRUE;
 
     case PT_SHLIB:
       return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "shlib");
@@ -2269,15 +2292,15 @@ bfd_section_from_phdr (abfd, hdr, index)
 }
 
 /* Initialize REL_HDR, the section-header for new section, containing
-   relocations against ASECT.  If USE_RELA_P is true, we use RELA
+   relocations against ASECT.  If USE_RELA_P is TRUE, we use RELA
    relocations; otherwise, we use REL relocations.  */
 
-boolean
+bfd_boolean
 _bfd_elf_init_reloc_shdr (abfd, rel_hdr, asect, use_rela_p)
      bfd *abfd;
      Elf_Internal_Shdr *rel_hdr;
      asection *asect;
-     boolean use_rela_p;
+     bfd_boolean use_rela_p;
 {
   char *name;
   struct elf_backend_data *bed = get_elf_backend_data (abfd);
@@ -2285,13 +2308,13 @@ _bfd_elf_init_reloc_shdr (abfd, rel_hdr, asect, use_rela_p)
 
   name = bfd_alloc (abfd, amt);
   if (name == NULL)
-    return false;
+    return FALSE;
   sprintf (name, "%s%s", use_rela_p ? ".rela" : ".rel", asect->name);
   rel_hdr->sh_name =
     (unsigned int) _bfd_elf_strtab_add (elf_shstrtab (abfd), name,
-					false);
+					FALSE);
   if (rel_hdr->sh_name == (unsigned int) -1)
-    return false;
+    return FALSE;
   rel_hdr->sh_type = use_rela_p ? SHT_RELA : SHT_REL;
   rel_hdr->sh_entsize = (use_rela_p
 			 ? bed->s->sizeof_rela
@@ -2302,7 +2325,7 @@ _bfd_elf_init_reloc_shdr (abfd, rel_hdr, asect, use_rela_p)
   rel_hdr->sh_size = 0;
   rel_hdr->sh_offset = 0;
 
-  return true;
+  return TRUE;
 }
 
 /* Set up an ELF internal section header for a section.  */
@@ -2314,7 +2337,7 @@ elf_fake_sections (abfd, asect, failedptrarg)
      PTR failedptrarg;
 {
   struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  boolean *failedptr = (boolean *) failedptrarg;
+  bfd_boolean *failedptr = (bfd_boolean *) failedptrarg;
   Elf_Internal_Shdr *this_hdr;
 
   if (*failedptr)
@@ -2327,10 +2350,10 @@ elf_fake_sections (abfd, asect, failedptrarg)
   this_hdr = &elf_section_data (asect)->this_hdr;
 
   this_hdr->sh_name = (unsigned long) _bfd_elf_strtab_add (elf_shstrtab (abfd),
-							   asect->name, false);
+							   asect->name, FALSE);
   if (this_hdr->sh_name == (unsigned long) -1)
     {
-      *failedptr = true;
+      *failedptr = TRUE;
       return;
     }
 
@@ -2457,7 +2480,7 @@ elf_fake_sections (abfd, asect, failedptrarg)
       if (asect->_raw_size == 0 && (asect->flags & SEC_HAS_CONTENTS) == 0)
 	{
 	  struct bfd_link_order *o;
-                                          
+
 	  this_hdr->sh_size = 0;
 	  for (o = asect->link_order_head; o != NULL; o = o->next)
 	    if (this_hdr->sh_size < o->offset + o->size)
@@ -2470,7 +2493,7 @@ elf_fake_sections (abfd, asect, failedptrarg)
   /* Check for processor-specific section types.  */
   if (bed->elf_backend_fake_sections
       && !(*bed->elf_backend_fake_sections) (abfd, this_hdr, asect))
-    *failedptr = true;
+    *failedptr = TRUE;
 
   /* If the section has relocs, set up a section header for the
      SHT_REL[A] section.  If two relocation sections are required for
@@ -2481,7 +2504,7 @@ elf_fake_sections (abfd, asect, failedptrarg)
 				    &elf_section_data (asect)->rel_hdr,
 				    asect,
 				    elf_section_data (asect)->use_rela_p))
-    *failedptr = true;
+    *failedptr = TRUE;
 }
 
 /* Fill in the contents of a SHT_GROUP section.  */
@@ -2492,12 +2515,12 @@ bfd_elf_set_group_contents (abfd, sec, failedptrarg)
      asection *sec;
      PTR failedptrarg;
 {
-  boolean *failedptr = (boolean *) failedptrarg;
+  bfd_boolean *failedptr = (bfd_boolean *) failedptrarg;
   unsigned long symindx;
   asection *elt, *first;
   unsigned char *loc;
   struct bfd_link_order *l;
-  boolean gas;
+  bfd_boolean gas;
 
   if (elf_section_data (sec)->this_hdr.sh_type != SHT_GROUP
       || *failedptr)
@@ -2519,17 +2542,17 @@ bfd_elf_set_group_contents (abfd, sec, failedptrarg)
   elf_section_data (sec)->this_hdr.sh_info = symindx;
 
   /* The contents won't be allocated for "ld -r" or objcopy.  */
-  gas = true;
+  gas = TRUE;
   if (sec->contents == NULL)
     {
-      gas = false;
+      gas = FALSE;
       sec->contents = bfd_alloc (abfd, sec->_raw_size);
 
       /* Arrange for the section to be written out.  */
       elf_section_data (sec)->this_hdr.contents = sec->contents;
       if (sec->contents == NULL)
 	{
-	  *failedptr = true;
+	  *failedptr = TRUE;
 	  return;
 	}
     }
@@ -2595,7 +2618,7 @@ bfd_elf_set_group_contents (abfd, sec, failedptrarg)
    too.  The link/info pointers for the standard section types are filled
    in here too, while we're at it.  */
 
-static boolean
+static bfd_boolean
 assign_section_numbers (abfd)
      bfd *abfd;
 {
@@ -2657,9 +2680,9 @@ assign_section_numbers (abfd)
 	  t->symtab_shndx_section = section_number++;
 	  t->symtab_shndx_hdr.sh_name
 	    = (unsigned int) _bfd_elf_strtab_add (elf_shstrtab (abfd),
-						  ".symtab_shndx", false);
+						  ".symtab_shndx", FALSE);
 	  if (t->symtab_shndx_hdr.sh_name == (unsigned int) -1)
-	    return false;
+	    return FALSE;
 	}
       if (section_number == SHN_LORESERVE)
 	section_number += SHN_HIRESERVE + 1 - SHN_LORESERVE;
@@ -2680,14 +2703,14 @@ assign_section_numbers (abfd)
   amt = section_number * sizeof (Elf_Internal_Shdr *);
   i_shdrp = (Elf_Internal_Shdr **) bfd_zalloc (abfd, amt);
   if (i_shdrp == NULL)
-    return false;
+    return FALSE;
 
   amt = sizeof (Elf_Internal_Shdr);
   i_shdrp[0] = (Elf_Internal_Shdr *) bfd_zalloc (abfd, amt);
   if (i_shdrp[0] == NULL)
     {
       bfd_release (abfd, i_shdrp);
-      return false;
+      return FALSE;
     }
 
   elf_elfsections (abfd) = i_shdrp;
@@ -2771,7 +2794,7 @@ assign_section_numbers (abfd)
 	      len = strlen (sec->name);
 	      alc = (char *) bfd_malloc ((bfd_size_type) (len - 2));
 	      if (alc == NULL)
-		return false;
+		return FALSE;
 	      memcpy (alc, sec->name, len - 3);
 	      alc[len - 3] = '\0';
 	      s = bfd_get_section_by_name (abfd, alc);
@@ -2820,7 +2843,7 @@ assign_section_numbers (abfd)
     else
       i_shdrp[secn]->sh_name = _bfd_elf_strtab_offset (elf_shstrtab (abfd),
 						       i_shdrp[secn]->sh_name);
-  return true;
+  return TRUE;
 }
 
 /* Map symbol from it's internal number to the external number, moving
@@ -2841,7 +2864,7 @@ sym_is_global (abfd, sym)
 	  || bfd_is_com_section (bfd_get_section (sym)));
 }
 
-static boolean
+static bfd_boolean
 elf_map_symbols (abfd)
      bfd *abfd;
 {
@@ -2873,7 +2896,7 @@ elf_map_symbols (abfd)
   amt = max_index * sizeof (asymbol *);
   sect_syms = (asymbol **) bfd_zalloc (abfd, amt);
   if (sect_syms == NULL)
-    return false;
+    return FALSE;
   elf_section_syms (abfd) = sect_syms;
   elf_num_section_syms (abfd) = max_index;
 
@@ -2948,7 +2971,7 @@ elf_map_symbols (abfd)
   new_syms = (asymbol **) bfd_alloc (abfd, amt);
 
   if (new_syms == NULL)
-    return false;
+    return FALSE;
 
   for (idx = 0; idx < symcount; idx++)
     {
@@ -2983,13 +3006,14 @@ elf_map_symbols (abfd)
 
   elf_num_locals (abfd) = num_locals;
   elf_num_globals (abfd) = num_globals;
-  return true;
+  return TRUE;
 }
 
 /* Align to the maximum file alignment that could be required for any
    ELF data structure.  */
 
-static INLINE file_ptr align_file_position PARAMS ((file_ptr, int));
+static INLINE file_ptr align_file_position
+  PARAMS ((file_ptr, int));
 static INLINE file_ptr
 align_file_position (off, align)
      file_ptr off;
@@ -3005,7 +3029,7 @@ INLINE file_ptr
 _bfd_elf_assign_file_position_for_section (i_shdrp, offset, align)
      Elf_Internal_Shdr *i_shdrp;
      file_ptr offset;
-     boolean align;
+     bfd_boolean align;
 {
   if (align)
     {
@@ -3027,37 +3051,37 @@ _bfd_elf_assign_file_position_for_section (i_shdrp, offset, align)
    otherwise prepare to begin writing out the ELF file.  If LINK_INFO
    is not NULL, this is being called by the ELF backend linker.  */
 
-boolean
+bfd_boolean
 _bfd_elf_compute_section_file_positions (abfd, link_info)
      bfd *abfd;
      struct bfd_link_info *link_info;
 {
   struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  boolean failed;
+  bfd_boolean failed;
   struct bfd_strtab_hash *strtab;
   Elf_Internal_Shdr *shstrtab_hdr;
 
   if (abfd->output_has_begun)
-    return true;
+    return TRUE;
 
   /* Do any elf backend specific processing first.  */
   if (bed->elf_backend_begin_write_processing)
     (*bed->elf_backend_begin_write_processing) (abfd, link_info);
 
   if (! prep_headers (abfd))
-    return false;
+    return FALSE;
 
   /* Post process the headers if necessary.  */
   if (bed->elf_backend_post_process_headers)
     (*bed->elf_backend_post_process_headers) (abfd, link_info);
 
-  failed = false;
+  failed = FALSE;
   bfd_map_over_sections (abfd, elf_fake_sections, &failed);
   if (failed)
-    return false;
+    return FALSE;
 
   if (!assign_section_numbers (abfd))
-    return false;
+    return FALSE;
 
   /* The backend linker builds symbol table information itself.  */
   if (link_info == NULL && bfd_get_symcount (abfd) > 0)
@@ -3066,14 +3090,14 @@ _bfd_elf_compute_section_file_positions (abfd, link_info)
       int relocatable_p = ! (abfd->flags & (EXEC_P | DYNAMIC));
 
       if (! swap_out_syms (abfd, &strtab, relocatable_p))
-	return false;
+	return FALSE;
     }
 
   if (link_info == NULL)
     {
       bfd_map_over_sections (abfd, bfd_elf_set_group_contents, &failed);
       if (failed)
-	return false;
+	return FALSE;
     }
 
   shstrtab_hdr = &elf_tdata (abfd)->shstrtab_hdr;
@@ -3089,7 +3113,7 @@ _bfd_elf_compute_section_file_positions (abfd, link_info)
   shstrtab_hdr->sh_addralign = 1;
 
   if (!assign_file_positions_except_relocs (abfd))
-    return false;
+    return FALSE;
 
   if (link_info == NULL && bfd_get_symcount (abfd) > 0)
     {
@@ -3099,14 +3123,14 @@ _bfd_elf_compute_section_file_positions (abfd, link_info)
       off = elf_tdata (abfd)->next_file_pos;
 
       hdr = &elf_tdata (abfd)->symtab_hdr;
-      off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
+      off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
 
       hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
       if (hdr->sh_size != 0)
-	off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
+	off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
 
       hdr = &elf_tdata (abfd)->strtab_hdr;
-      off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
+      off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
 
       elf_tdata (abfd)->next_file_pos = off;
 
@@ -3114,13 +3138,13 @@ _bfd_elf_compute_section_file_positions (abfd, link_info)
          out.  */
       if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
 	  || ! _bfd_stringtab_emit (abfd, strtab))
-	return false;
+	return FALSE;
       _bfd_stringtab_free (strtab);
     }
 
-  abfd->output_has_begun = true;
+  abfd->output_has_begun = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* Create a mapping from a set of sections to a program segment.  */
@@ -3131,7 +3155,7 @@ make_mapping (abfd, sections, from, to, phdr)
      asection **sections;
      unsigned int from;
      unsigned int to;
-     boolean phdr;
+     bfd_boolean phdr;
 {
   struct elf_segment_map *m;
   unsigned int i;
@@ -3161,7 +3185,7 @@ make_mapping (abfd, sections, from, to, phdr)
 
 /* Set up a mapping from BFD sections to program segments.  */
 
-static boolean
+static bfd_boolean
 map_sections_to_segments (abfd)
      bfd *abfd;
 {
@@ -3176,18 +3200,18 @@ map_sections_to_segments (abfd)
   unsigned int phdr_index;
   bfd_vma maxpagesize;
   asection **hdrpp;
-  boolean phdr_in_segment = true;
-  boolean writable;
+  bfd_boolean phdr_in_segment = TRUE;
+  bfd_boolean writable;
   int tls_count = 0;
   asection *first_tls = NULL;
   asection *dynsec, *eh_frame_hdr;
   bfd_size_type amt;
 
   if (elf_tdata (abfd)->segment_map != NULL)
-    return true;
+    return TRUE;
 
   if (bfd_count_sections (abfd) == 0)
-    return true;
+    return TRUE;
 
   /* Select the allocated sections, and sort them.  */
 
@@ -3254,7 +3278,7 @@ map_sections_to_segments (abfd)
   last_hdr = NULL;
   phdr_index = 0;
   maxpagesize = get_elf_backend_data (abfd)->maxpagesize;
-  writable = false;
+  writable = FALSE;
   dynsec = bfd_get_section_by_name (abfd, ".dynamic");
   if (dynsec != NULL
       && (dynsec->flags & SEC_LOAD) == 0)
@@ -3274,13 +3298,13 @@ map_sections_to_segments (abfd)
       if ((abfd->flags & D_PAGED) == 0
 	  || sections[0]->lma < phdr_size
 	  || sections[0]->lma % maxpagesize < phdr_size % maxpagesize)
-	phdr_in_segment = false;
+	phdr_in_segment = FALSE;
     }
 
   for (i = 0, hdrpp = sections; i < count; i++, hdrpp++)
     {
       asection *hdr;
-      boolean new_segment;
+      bfd_boolean new_segment;
 
       hdr = *hdrpp;
 
@@ -3291,35 +3315,35 @@ map_sections_to_segments (abfd)
 	{
 	  /* If we don't have a segment yet, then we don't need a new
 	     one (we build the last one after this loop).  */
-	  new_segment = false;
+	  new_segment = FALSE;
 	}
       else if (last_hdr->lma - last_hdr->vma != hdr->lma - hdr->vma)
 	{
 	  /* If this section has a different relation between the
              virtual address and the load address, then we need a new
              segment.  */
-	  new_segment = true;
+	  new_segment = TRUE;
 	}
       else if (BFD_ALIGN (last_hdr->lma + last_hdr->_raw_size, maxpagesize)
 	       < BFD_ALIGN (hdr->lma, maxpagesize))
 	{
 	  /* If putting this section in this segment would force us to
              skip a page in the segment, then we need a new segment.  */
-	  new_segment = true;
+	  new_segment = TRUE;
 	}
       else if ((last_hdr->flags & SEC_LOAD) == 0
 	       && (hdr->flags & SEC_LOAD) != 0)
 	{
 	  /* We don't want to put a loadable section after a
              nonloadable section in the same segment.  */
-	  new_segment = true;
+	  new_segment = TRUE;
 	}
       else if ((abfd->flags & D_PAGED) == 0)
 	{
 	  /* If the file is not demand paged, which means that we
              don't require the sections to be correctly aligned in the
              file, then there is no other reason for a new segment.  */
-	  new_segment = false;
+	  new_segment = FALSE;
 	}
       else if (! writable
 	       && (hdr->flags & SEC_READONLY) == 0
@@ -3334,18 +3358,18 @@ map_sections_to_segments (abfd)
              only case in which the new section is not on the same
              page as the previous section is when the previous section
              ends precisely on a page boundary.  */
-	  new_segment = true;
+	  new_segment = TRUE;
 	}
       else
 	{
 	  /* Otherwise, we can use the same segment.  */
-	  new_segment = false;
+	  new_segment = FALSE;
 	}
 
       if (! new_segment)
 	{
 	  if ((hdr->flags & SEC_READONLY) == 0)
-	    writable = true;
+	    writable = TRUE;
 	  last_hdr = hdr;
 	  continue;
 	}
@@ -3361,13 +3385,13 @@ map_sections_to_segments (abfd)
       pm = &m->next;
 
       if ((hdr->flags & SEC_READONLY) == 0)
-	writable = true;
+	writable = TRUE;
       else
-	writable = false;
+	writable = FALSE;
 
       last_hdr = hdr;
       phdr_index = i;
-      phdr_in_segment = false;
+      phdr_in_segment = FALSE;
     }
 
   /* Create a final PT_LOAD program segment.  */
@@ -3477,12 +3501,12 @@ map_sections_to_segments (abfd)
   sections = NULL;
 
   elf_tdata (abfd)->segment_map = mfirst;
-  return true;
+  return TRUE;
 
  error_return:
   if (sections != NULL)
     free (sections);
-  return false;
+  return FALSE;
 }
 
 /* Sort sections by address.  */
@@ -3545,7 +3569,7 @@ elf_sort_sections (arg1, arg2)
    sections to segments.  This function also sets up some fields in
    the file header, and writes out the program headers.  */
 
-static boolean
+static bfd_boolean
 assign_file_positions_for_segments (abfd)
      bfd *abfd;
 {
@@ -3563,7 +3587,7 @@ assign_file_positions_for_segments (abfd)
   if (elf_tdata (abfd)->segment_map == NULL)
     {
       if (! map_sections_to_segments (abfd))
-	return false;
+	return FALSE;
     }
   else
     {
@@ -3600,7 +3624,7 @@ assign_file_positions_for_segments (abfd)
   if (bed->elf_backend_modify_segment_map)
     {
       if (! (*bed->elf_backend_modify_segment_map) (abfd))
-	return false;
+	return FALSE;
     }
 
   count = 0;
@@ -3612,7 +3636,7 @@ assign_file_positions_for_segments (abfd)
   elf_elfheader (abfd)->e_phnum = count;
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   /* If we already counted the number of program segments, make sure
      that we allocated enough space.  This happens when SIZEOF_HEADERS
@@ -3624,7 +3648,7 @@ assign_file_positions_for_segments (abfd)
        (_("%s: Not enough room for program headers (allocated %u, need %u)"),
 	bfd_get_filename (abfd), alloc, count));
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   if (alloc == 0)
@@ -3633,7 +3657,7 @@ assign_file_positions_for_segments (abfd)
   amt = alloc * sizeof (Elf_Internal_Phdr);
   phdrs = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt);
   if (phdrs == NULL)
-    return false;
+    return FALSE;
 
   off = bed->s->sizeof_ehdr;
   off += alloc * bed->s->sizeof_phdr;
@@ -3729,7 +3753,7 @@ assign_file_positions_for_segments (abfd)
 		    (_("%s: Not enough room for program headers, try linking with -N"),
 		     bfd_get_filename (abfd));
 		  bfd_set_error (bfd_error_bad_value);
-		  return false;
+		  return FALSE;
 		}
 
 	      p->p_vaddr -= off;
@@ -3856,7 +3880,7 @@ Error: First section in segment (%s) starts at 0x%x whereas the segment starts a
 					      bfd_section_name (abfd, sec),
 					      sec->lma,
 					      p->p_paddr);
-		      return false;
+		      return FALSE;
 		    }
 		  p->p_memsz += adjust;
 		  off += adjust;
@@ -3979,9 +4003,9 @@ Error: First section in segment (%s) starts at 0x%x whereas the segment starts a
   /* Write out the program headers.  */
   if (bfd_seek (abfd, (bfd_signed_vma) bed->s->sizeof_ehdr, SEEK_SET) != 0
       || bed->s->write_out_phdrs (abfd, phdrs, alloc) != 0)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Get the size of the program header.
@@ -4027,7 +4051,7 @@ get_program_header_size (abfd)
     {
       /* If we have a loadable interpreter section, we need a
 	 PT_INTERP segment.  In this case, assume we also need a
-	 PT_PHDR segment, although that may not be true for all
+	 PT_PHDR segment, although that may not be TRUE for all
 	 targets.  */
       segs += 2;
     }
@@ -4090,7 +4114,7 @@ get_program_header_size (abfd)
 
    We also don't set the positions of the .symtab and .strtab here.  */
 
-static boolean
+static bfd_boolean
 assign_file_positions_except_relocs (abfd)
      bfd *abfd;
 {
@@ -4127,7 +4151,7 @@ assign_file_positions_except_relocs (abfd)
 	      hdr->sh_offset = -1;
 	    }
 	  else
-	    off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
+	    off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
 
 	  if (i == SHN_LORESERVE - 1)
 	    {
@@ -4144,7 +4168,7 @@ assign_file_positions_except_relocs (abfd)
       /* Assign file positions for the loaded sections based on the
          assignment of sections to segments.  */
       if (! assign_file_positions_for_segments (abfd))
-	return false;
+	return FALSE;
 
       /* Assign file positions for the other sections.  */
 
@@ -4170,7 +4194,7 @@ assign_file_positions_except_relocs (abfd)
 	      else
 		off += (hdr->sh_addr - off) % hdr->sh_addralign;
 	      off = _bfd_elf_assign_file_position_for_section (hdr, off,
-							       false);
+							       FALSE);
 	    }
 	  else if (hdr->sh_type == SHT_REL
 		   || hdr->sh_type == SHT_RELA
@@ -4179,7 +4203,7 @@ assign_file_positions_except_relocs (abfd)
 		   || hdr == i_shdrpp[tdata->strtab_section])
 	    hdr->sh_offset = -1;
 	  else
-	    off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
+	    off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
 
 	  if (i == SHN_LORESERVE - 1)
 	    {
@@ -4196,10 +4220,10 @@ assign_file_positions_except_relocs (abfd)
 
   elf_tdata (abfd)->next_file_pos = off;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 prep_headers (abfd)
      bfd *abfd;
 {
@@ -4214,7 +4238,7 @@ prep_headers (abfd)
 
   shstrtab = _bfd_elf_strtab_init ();
   if (shstrtab == NULL)
-    return false;
+    return FALSE;
 
   elf_shstrtab (abfd) = shstrtab;
 
@@ -4292,17 +4316,17 @@ prep_headers (abfd)
     }
 
   elf_tdata (abfd)->symtab_hdr.sh_name =
-    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".symtab", false);
+    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".symtab", FALSE);
   elf_tdata (abfd)->strtab_hdr.sh_name =
-    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".strtab", false);
+    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".strtab", FALSE);
   elf_tdata (abfd)->shstrtab_hdr.sh_name =
-    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".shstrtab", false);
+    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".shstrtab", FALSE);
   if (elf_tdata (abfd)->symtab_hdr.sh_name == (unsigned int) -1
       || elf_tdata (abfd)->symtab_hdr.sh_name == (unsigned int) -1
       || elf_tdata (abfd)->shstrtab_hdr.sh_name == (unsigned int) -1)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Assign file positions for all the reloc sections which are not part
@@ -4326,34 +4350,34 @@ _bfd_elf_assign_file_positions_for_relocs (abfd)
       shdrp = *shdrpp;
       if ((shdrp->sh_type == SHT_REL || shdrp->sh_type == SHT_RELA)
 	  && shdrp->sh_offset == -1)
-	off = _bfd_elf_assign_file_position_for_section (shdrp, off, true);
+	off = _bfd_elf_assign_file_position_for_section (shdrp, off, TRUE);
     }
 
   elf_tdata (abfd)->next_file_pos = off;
 }
 
-boolean
+bfd_boolean
 _bfd_elf_write_object_contents (abfd)
      bfd *abfd;
 {
   struct elf_backend_data *bed = get_elf_backend_data (abfd);
   Elf_Internal_Ehdr *i_ehdrp;
   Elf_Internal_Shdr **i_shdrp;
-  boolean failed;
+  bfd_boolean failed;
   unsigned int count, num_sec;
 
   if (! abfd->output_has_begun
       && ! _bfd_elf_compute_section_file_positions
              (abfd, (struct bfd_link_info *) NULL))
-    return false;
+    return FALSE;
 
   i_shdrp = elf_elfsections (abfd);
   i_ehdrp = elf_elfheader (abfd);
 
-  failed = false;
+  failed = FALSE;
   bfd_map_over_sections (abfd, bed->s->write_relocs, &failed);
   if (failed)
-    return false;
+    return FALSE;
 
   _bfd_elf_assign_file_positions_for_relocs (abfd);
 
@@ -4369,7 +4393,7 @@ _bfd_elf_write_object_contents (abfd)
 
 	  if (bfd_seek (abfd, i_shdrp[count]->sh_offset, SEEK_SET) != 0
 	      || bfd_bwrite (i_shdrp[count]->contents, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	}
       if (count == SHN_LORESERVE - 1)
 	count += SHN_HIRESERVE + 1 - SHN_LORESERVE;
@@ -4378,7 +4402,7 @@ _bfd_elf_write_object_contents (abfd)
   /* Write out the section header names.  */
   if (bfd_seek (abfd, elf_tdata (abfd)->shstrtab_hdr.sh_offset, SEEK_SET) != 0
       || ! _bfd_elf_strtab_emit (abfd, elf_shstrtab (abfd)))
-    return false;
+    return FALSE;
 
   if (bed->elf_backend_final_write_processing)
     (*bed->elf_backend_final_write_processing) (abfd,
@@ -4387,7 +4411,7 @@ _bfd_elf_write_object_contents (abfd)
   return bed->s->write_shdrs_and_ehdr (abfd);
 }
 
-boolean
+bfd_boolean
 _bfd_elf_write_corefile_contents (abfd)
      bfd *abfd;
 {
@@ -4505,31 +4529,31 @@ _bfd_elf_symbol_from_bfd_symbol (abfd, asym_ptr_ptr)
 
 /* Copy private BFD data.  This copies any program header information.  */
 
-static boolean
+static bfd_boolean
 copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
-  Elf_Internal_Ehdr *       iehdr;
-  struct elf_segment_map *  map;
-  struct elf_segment_map *  map_first;
-  struct elf_segment_map ** pointer_to_map;
-  Elf_Internal_Phdr *       segment;
-  asection *                section;
-  unsigned int              i;
-  unsigned int              num_segments;
-  boolean                   phdr_included = false;
-  bfd_vma                   maxpagesize;
-  struct elf_segment_map *  phdr_adjust_seg = NULL;
-  unsigned int              phdr_adjust_num = 0;
-  struct elf_backend_data * bed;
+  Elf_Internal_Ehdr *iehdr;
+  struct elf_segment_map *map;
+  struct elf_segment_map *map_first;
+  struct elf_segment_map **pointer_to_map;
+  Elf_Internal_Phdr *segment;
+  asection *section;
+  unsigned int i;
+  unsigned int num_segments;
+  bfd_boolean phdr_included = FALSE;
+  bfd_vma maxpagesize;
+  struct elf_segment_map *phdr_adjust_seg = NULL;
+  unsigned int phdr_adjust_num = 0;
+  struct elf_backend_data *bed;
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (elf_tdata (ibfd)->phdr == NULL)
-    return true;
+    return TRUE;
 
   bed = get_elf_backend_data (ibfd);
   iehdr = elf_elfheader (ibfd);
@@ -4545,14 +4569,14 @@ copy_private_bfd_data (ibfd, obfd)
   (start + (segment->p_memsz > segment->p_filesz			\
 	    ? segment->p_memsz : segment->p_filesz))
 
-  /* Returns true if the given section is contained within
+  /* Returns TRUE if the given section is contained within
      the given segment.  VMA addresses are compared.  */
 #define IS_CONTAINED_BY_VMA(section, segment)				\
   (section->vma >= segment->p_vaddr					\
    && (section->vma + section->_raw_size				\
        <= (SEGMENT_END (segment, segment->p_vaddr))))
 
-  /* Returns true if the given section is contained within
+  /* Returns TRUE if the given section is contained within
      the given segment.  LMA addresses are compared.  */
 #define IS_CONTAINED_BY_LMA(section, segment, base)			\
   (section->lma >= base							\
@@ -4598,18 +4622,18 @@ copy_private_bfd_data (ibfd, obfd)
    && section->output_section != NULL					\
    && ! section->segment_mark)
 
-  /* Returns true iff seg1 starts after the end of seg2.  */
+  /* Returns TRUE iff seg1 starts after the end of seg2.  */
 #define SEGMENT_AFTER_SEGMENT(seg1, seg2)				\
   (seg1->p_vaddr >= SEGMENT_END (seg2, seg2->p_vaddr))
 
-  /* Returns true iff seg1 and seg2 overlap.  */
+  /* Returns TRUE iff seg1 and seg2 overlap.  */
 #define SEGMENT_OVERLAPS(seg1, seg2)					\
   (!(SEGMENT_AFTER_SEGMENT (seg1, seg2)					\
      || SEGMENT_AFTER_SEGMENT (seg2, seg1)))
 
   /* Initialise the segment mark field.  */
   for (section = ibfd->sections; section != NULL; section = section->next)
-    section->segment_mark = false;
+    section->segment_mark = FALSE;
 
   /* Scan through the segments specified in the program header
      of the input BFD.  For this first scan we look for overlaps
@@ -4714,7 +4738,7 @@ copy_private_bfd_data (ibfd, obfd)
       amt += ((bfd_size_type) section_count - 1) * sizeof (asection *);
       map = (struct elf_segment_map *) bfd_alloc (obfd, amt);
       if (map == NULL)
-	return false;
+	return FALSE;
 
       /* Initialise the fields of the segment map.  Default to
 	 using the physical address of the segment in the input BFD.  */
@@ -4741,7 +4765,7 @@ copy_private_bfd_data (ibfd, obfd)
 		     + iehdr->e_phnum * iehdr->e_phentsize)));
 
 	  if (segment->p_type == PT_LOAD && map->includes_phdrs)
-	    phdr_included = true;
+	    phdr_included = TRUE;
 	}
 
       if (section_count == 0)
@@ -4795,7 +4819,7 @@ copy_private_bfd_data (ibfd, obfd)
       amt = section_count * sizeof (asection *);
       sections = (asection **) bfd_malloc (amt);
       if (sections == NULL)
-	return false;
+	return FALSE;
 
       /* Step One: Scan for segment vs section LMA conflicts.
 	 Also add the sections to the section array allocated above.
@@ -4976,7 +5000,7 @@ copy_private_bfd_data (ibfd, obfd)
 		  map->sections[map->count++] = output_section;
 		  ++isec;
 		  sections[j] = NULL;
-		  section->segment_mark = true;
+		  section->segment_mark = TRUE;
 		}
 	      else if (suggested_lma == 0)
 		suggested_lma = output_section->lma;
@@ -4997,7 +5021,7 @@ copy_private_bfd_data (ibfd, obfd)
 	      amt += ((bfd_size_type) section_count - 1) * sizeof (asection *);
 	      map = (struct elf_segment_map *) bfd_alloc (obfd, amt);
 	      if (map == NULL)
-		return false;
+		return FALSE;
 
 	      /* Initialise the fields of the segment map.  Set the physical
 		 physical address to the LMA of the first section that has
@@ -5080,13 +5104,13 @@ copy_private_bfd_data (ibfd, obfd)
 #undef INCLUDE_SECTION_IN_SEGMENT
 #undef SEGMENT_AFTER_SEGMENT
 #undef SEGMENT_OVERLAPS
-  return true;
+  return TRUE;
 }
 
 /* Copy private section information.  This copies over the entsize
    field, and sometimes the info field.  */
 
-boolean
+bfd_boolean
 _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
      bfd *ibfd;
      asection *isec;
@@ -5097,7 +5121,7 @@ _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
 
   if (ibfd->xvec->flavour != bfd_target_elf_flavour
       || obfd->xvec->flavour != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (elf_tdata (obfd)->segment_map == NULL && elf_tdata (ibfd)->phdr != NULL)
     {
@@ -5113,7 +5137,7 @@ _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
 	if (s == NULL)
 	  {
 	    if (! copy_private_bfd_data (ibfd, obfd))
-	      return false;
+	      return FALSE;
 	  }
     }
 
@@ -5137,7 +5161,7 @@ _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
   elf_section_data (osec)->use_rela_p
     = elf_section_data (isec)->use_rela_p;
 
-  return true;
+  return TRUE;
 }
 
 /* Copy private symbol information.  If this symbol is in a section
@@ -5152,7 +5176,7 @@ _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
 #define MAP_SHSTRTAB  (SHN_HIOS + 4)
 #define MAP_SYM_SHNDX (SHN_HIOS + 5)
 
-boolean
+bfd_boolean
 _bfd_elf_copy_private_symbol_data (ibfd, isymarg, obfd, osymarg)
      bfd *ibfd;
      asymbol *isymarg;
@@ -5163,7 +5187,7 @@ _bfd_elf_copy_private_symbol_data (ibfd, isymarg, obfd, osymarg)
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   isym = elf_symbol_from (ibfd, isymarg);
   osym = elf_symbol_from (obfd, osymarg);
@@ -5188,12 +5212,12 @@ _bfd_elf_copy_private_symbol_data (ibfd, isymarg, obfd, osymarg)
       osym->internal_elf_sym.st_shndx = shndx;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Swap out the symbols.  */
 
-static boolean
+static bfd_boolean
 swap_out_syms (abfd, sttp, relocatable_p)
      bfd *abfd;
      struct bfd_strtab_hash **sttp;
@@ -5212,12 +5236,12 @@ swap_out_syms (abfd, sttp, relocatable_p)
   bfd_size_type amt;
 
   if (!elf_map_symbols (abfd))
-    return false;
+    return FALSE;
 
   /* Dump out the symtabs.  */
   stt = _bfd_elf_stringtab_init ();
   if (stt == NULL)
-    return false;
+    return FALSE;
 
   bed = get_elf_backend_data (abfd);
   symcount = bfd_get_symcount (abfd);
@@ -5234,7 +5258,7 @@ swap_out_syms (abfd, sttp, relocatable_p)
   amt = (bfd_size_type) (1 + symcount) * bed->s->sizeof_sym;
   outbound_syms = bfd_alloc (abfd, amt);
   if (outbound_syms == NULL)
-    return false;
+    return FALSE;
   symtab_hdr->contents = (PTR) outbound_syms;
 
   outbound_shndx = NULL;
@@ -5244,7 +5268,7 @@ swap_out_syms (abfd, sttp, relocatable_p)
       amt = (bfd_size_type) (1 + symcount) * sizeof (Elf_External_Sym_Shndx);
       outbound_shndx = bfd_zalloc (abfd, amt);
       if (outbound_shndx == NULL)
-	return false;
+	return FALSE;
       symtab_shndx_hdr->contents = outbound_shndx;
       symtab_shndx_hdr->sh_type = SHT_SYMTAB_SHNDX;
       symtab_shndx_hdr->sh_size = amt;
@@ -5286,9 +5310,9 @@ swap_out_syms (abfd, sttp, relocatable_p)
 	{
 	  sym.st_name = (unsigned long) _bfd_stringtab_add (stt,
 							    syms[idx]->name,
-							    true, false);
+							    TRUE, FALSE);
 	  if (sym.st_name == (unsigned long) -1)
-	    return false;
+	    return FALSE;
 	}
 
       type_ptr = elf_symbol_from (abfd, syms[idx]);
@@ -5448,7 +5472,7 @@ swap_out_syms (abfd, sttp, relocatable_p)
   symstrtab_hdr->sh_info = 0;
   symstrtab_hdr->sh_addralign = 1;
 
-  return true;
+  return TRUE;
 }
 
 /* Return the number of bytes required to hold the symtab vector.
@@ -5516,7 +5540,7 @@ _bfd_elf_canonicalize_reloc (abfd, section, relptr, symbols)
   unsigned int i;
   struct elf_backend_data *bed = get_elf_backend_data (abfd);
 
-  if (! bed->s->slurp_reloc_table (abfd, section, symbols, false))
+  if (! bed->s->slurp_reloc_table (abfd, section, symbols, FALSE))
     return -1;
 
   tblptr = section->relocation;
@@ -5534,7 +5558,7 @@ _bfd_elf_get_symtab (abfd, alocation)
      asymbol **alocation;
 {
   struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  long symcount = bed->s->slurp_symbol_table (abfd, alocation, false);
+  long symcount = bed->s->slurp_symbol_table (abfd, alocation, FALSE);
 
   if (symcount >= 0)
     bfd_get_symcount (abfd) = symcount;
@@ -5547,7 +5571,7 @@ _bfd_elf_canonicalize_dynamic_symtab (abfd, alocation)
      asymbol **alocation;
 {
   struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  long symcount = bed->s->slurp_symbol_table (abfd, alocation, true);
+  long symcount = bed->s->slurp_symbol_table (abfd, alocation, TRUE);
 
   if (symcount >= 0)
     bfd_get_dynamic_symcount (abfd) = symcount;
@@ -5598,7 +5622,8 @@ _bfd_elf_canonicalize_dynamic_reloc (abfd, storage, syms)
      arelent **storage;
      asymbol **syms;
 {
-  boolean (*slurp_relocs) PARAMS ((bfd *, asection *, asymbol **, boolean));
+  bfd_boolean (*slurp_relocs)
+    PARAMS ((bfd *, asection *, asymbol **, bfd_boolean));
   asection *s;
   long ret;
 
@@ -5619,7 +5644,7 @@ _bfd_elf_canonicalize_dynamic_reloc (abfd, storage, syms)
 	  arelent *p;
 	  long count, i;
 
-	  if (! (*slurp_relocs) (abfd, s, syms, true))
+	  if (! (*slurp_relocs) (abfd, s, syms, TRUE))
 	    return -1;
 	  count = s->_raw_size / elf_section_data (s)->this_hdr.sh_entsize;
 	  p = s->relocation;
@@ -5636,7 +5661,7 @@ _bfd_elf_canonicalize_dynamic_reloc (abfd, storage, syms)
 
 /* Read in the version information.  */
 
-boolean
+bfd_boolean
 _bfd_elf_slurp_version_tables (abfd)
      bfd *abfd;
 {
@@ -5823,12 +5848,12 @@ _bfd_elf_slurp_version_tables (abfd)
       contents = NULL;
     }
 
-  return true;
+  return TRUE;
 
  error_return:
   if (contents == NULL)
     free (contents);
-  return false;
+  return FALSE;
 }
 
 asymbol *
@@ -5861,19 +5886,19 @@ _bfd_elf_get_symbol_info (ignore_abfd, symbol, ret)
    use this function for the is_local_label_name entry point, but some
    override it.  */
 
-boolean
+bfd_boolean
 _bfd_elf_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
 {
   /* Normal local symbols start with ``.L''.  */
   if (name[0] == '.' && name[1] == 'L')
-    return true;
+    return TRUE;
 
   /* At least some SVR4 compilers (e.g., UnixWare 2.1 cc) generate
      DWARF debugging symbols starting with ``..''.  */
   if (name[0] == '.' && name[1] == '.')
-    return true;
+    return TRUE;
 
   /* gcc will sometimes generate symbols beginning with ``_.L_'' when
      emitting DWARF debugging output.  I suspect this is actually a
@@ -5882,9 +5907,9 @@ _bfd_elf_is_local_label_name (abfd, name)
      underscore to be emitted on some ELF targets).  For ease of use,
      we treat such symbols as local.  */
   if (name[0] == '_' && name[1] == '.' && name[2] == 'L' && name[3] == '_')
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 alent *
@@ -5896,7 +5921,7 @@ _bfd_elf_get_lineno (ignore_abfd, symbol)
   return NULL;
 }
 
-boolean
+bfd_boolean
 _bfd_elf_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -5907,7 +5932,7 @@ _bfd_elf_set_arch_mach (abfd, arch, machine)
   if (arch != get_elf_backend_data (abfd)->arch
       && arch != bfd_arch_unknown
       && get_elf_backend_data (abfd)->arch != bfd_arch_unknown)
-    return false;
+    return FALSE;
 
   return bfd_default_set_arch_mach (abfd, arch, machine);
 }
@@ -5915,7 +5940,7 @@ _bfd_elf_set_arch_mach (abfd, arch, machine)
 /* Find the function to a particular section and offset,
    for error reporting.  */
 
-static boolean
+static bfd_boolean
 elf_find_function (abfd, section, symbols, offset,
 		   filename_ptr, functionname_ptr)
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -5964,20 +5989,20 @@ elf_find_function (abfd, section, symbols, offset,
     }
 
   if (func == NULL)
-    return false;
+    return FALSE;
 
   if (filename_ptr)
     *filename_ptr = filename;
   if (functionname_ptr)
     *functionname_ptr = bfd_asymbol_name (func);
 
-  return true;
+  return TRUE;
 }
 
 /* Find the nearest line to a particular section and offset,
    for error reporting.  */
 
-boolean
+bfd_boolean
 _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
 			    filename_ptr, functionname_ptr, line_ptr)
      bfd *abfd;
@@ -5988,7 +6013,7 @@ _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
      const char **functionname_ptr;
      unsigned int *line_ptr;
 {
-  boolean found;
+  bfd_boolean found;
 
   if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
@@ -5999,7 +6024,7 @@ _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
 			   *filename_ptr ? NULL : filename_ptr,
 			   functionname_ptr);
 
-      return true;
+      return TRUE;
     }
 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
@@ -6012,32 +6037,32 @@ _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
 			   *filename_ptr ? NULL : filename_ptr,
 			   functionname_ptr);
 
-      return true;
+      return TRUE;
     }
 
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
 					     &found, filename_ptr,
 					     functionname_ptr, line_ptr,
 					     &elf_tdata (abfd)->line_info))
-    return false;
+    return FALSE;
   if (found && (*functionname_ptr || *line_ptr))
-    return true;
+    return TRUE;
 
   if (symbols == NULL)
-    return false;
+    return FALSE;
 
   if (! elf_find_function (abfd, section, symbols, offset,
 			   filename_ptr, functionname_ptr))
-    return false;
+    return FALSE;
 
   *line_ptr = 0;
-  return true;
+  return TRUE;
 }
 
 int
 _bfd_elf_sizeof_headers (abfd, reloc)
      bfd *abfd;
-     boolean reloc;
+     bfd_boolean reloc;
 {
   int ret;
 
@@ -6047,7 +6072,7 @@ _bfd_elf_sizeof_headers (abfd, reloc)
   return ret;
 }
 
-boolean
+bfd_boolean
 _bfd_elf_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -6061,15 +6086,15 @@ _bfd_elf_set_section_contents (abfd, section, location, offset, count)
   if (! abfd->output_has_begun
       && ! (_bfd_elf_compute_section_file_positions
 	    (abfd, (struct bfd_link_info *) NULL)))
-    return false;
+    return FALSE;
 
   hdr = &elf_section_data (section)->this_hdr;
   pos = hdr->sh_offset + offset;
   if (bfd_seek (abfd, pos, SEEK_SET) != 0
       || bfd_bwrite (location, count, abfd) != count)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 void
@@ -6083,7 +6108,7 @@ _bfd_elf_no_info_to_howto (abfd, cache_ptr, dst)
 
 /* Try to convert a non-ELF reloc into an ELF one.  */
 
-boolean
+bfd_boolean
 _bfd_elf_validate_reloc (abfd, areloc)
      bfd *abfd;
      arelent *areloc;
@@ -6169,17 +6194,17 @@ _bfd_elf_validate_reloc (abfd, areloc)
 	goto fail;
     }
 
-  return true;
+  return TRUE;
 
  fail:
   (*_bfd_error_handler)
     (_("%s: unsupported relocation type %s"),
      bfd_archive_filename (abfd), areloc->howto->name);
   bfd_set_error (bfd_error_bad_value);
-  return false;
+  return FALSE;
 }
 
-boolean
+bfd_boolean
 _bfd_elf_close_and_cleanup (abfd)
      bfd *abfd;
 {
@@ -6234,7 +6259,7 @@ elfcore_make_pid (abfd)
    reference to NAME, so you shouldn't deallocate or
    overwrite it.  */
 
-static boolean
+static bfd_boolean
 elfcore_maybe_make_sect (abfd, name, sect)
      bfd *abfd;
      char *name;
@@ -6243,17 +6268,17 @@ elfcore_maybe_make_sect (abfd, name, sect)
   asection *sect2;
 
   if (bfd_get_section_by_name (abfd, name) != NULL)
-    return true;
+    return TRUE;
 
   sect2 = bfd_make_section (abfd, name);
   if (sect2 == NULL)
-    return false;
+    return FALSE;
 
   sect2->_raw_size = sect->_raw_size;
   sect2->filepos = sect->filepos;
   sect2->flags = sect->flags;
   sect2->alignment_power = sect->alignment_power;
-  return true;
+  return TRUE;
 }
 
 /* Create a pseudosection containing SIZE bytes at FILEPOS.  This
@@ -6263,7 +6288,7 @@ elfcore_maybe_make_sect (abfd, name, sect)
    - For the multi-threaded case, a section named "NAME/PID", where
      PID is elfcore_make_pid (abfd).
    Both pseudosections have identical contents. */
-boolean
+bfd_boolean
 _bfd_elfcore_make_pseudosection (abfd, name, size, filepos)
      bfd *abfd;
      char *name;
@@ -6281,12 +6306,12 @@ _bfd_elfcore_make_pseudosection (abfd, name, size, filepos)
   len = strlen (buf) + 1;
   threaded_name = bfd_alloc (abfd, (bfd_size_type) len);
   if (threaded_name == NULL)
-    return false;
+    return FALSE;
   memcpy (threaded_name, buf, len);
 
   sect = bfd_make_section (abfd, threaded_name);
   if (sect == NULL)
-    return false;
+    return FALSE;
   sect->_raw_size = size;
   sect->filepos = filepos;
   sect->flags = SEC_HAS_CONTENTS;
@@ -6302,9 +6327,10 @@ _bfd_elfcore_make_pseudosection (abfd, name, size, filepos)
 */
 
 #if defined (HAVE_PRSTATUS_T)
-static boolean elfcore_grok_prstatus PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elfcore_grok_prstatus
+  PARAMS ((bfd *, Elf_Internal_Note *));
 
-static boolean
+static bfd_boolean
 elfcore_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6367,7 +6393,7 @@ elfcore_grok_prstatus (abfd, note)
     {
       /* Fail - we don't know how to handle any other
 	 note size (ie. data object type).  */
-      return true;
+      return TRUE;
     }
 
   /* Make a ".reg/999" section and a ".reg" section.  */
@@ -6377,7 +6403,7 @@ elfcore_grok_prstatus (abfd, note)
 #endif /* defined (HAVE_PRSTATUS_T) */
 
 /* Create a pseudosection containing the exact contents of NOTE.  */
-static boolean
+static bfd_boolean
 elfcore_make_note_pseudosection (abfd, name, note)
      bfd *abfd;
      char *name;
@@ -6391,7 +6417,7 @@ elfcore_make_note_pseudosection (abfd, name, note)
    but it doesn't matter, because we don't have to pick this
    data structure apart.  */
 
-static boolean
+static bfd_boolean
 elfcore_grok_prfpreg (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6403,7 +6429,7 @@ elfcore_grok_prfpreg (abfd, note)
    type of 5 (NT_PRXFPREG).  Just include the whole note's contents
    literally.  */
 
-static boolean
+static bfd_boolean
 elfcore_grok_prxfpreg (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6455,9 +6481,10 @@ _bfd_elfcore_strndup (abfd, start, max)
 }
 
 #if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
-static boolean elfcore_grok_psinfo PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elfcore_grok_psinfo
+  PARAMS ((bfd *, Elf_Internal_Note *));
 
-static boolean
+static bfd_boolean
 elfcore_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6498,7 +6525,7 @@ elfcore_grok_psinfo (abfd, note)
     {
       /* Fail - we don't know how to handle any other
 	 note size (ie. data object type).  */
-      return true;
+      return TRUE;
     }
 
   /* Note that for some reason, a spurious space is tacked
@@ -6513,14 +6540,15 @@ elfcore_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 #endif /* defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T) */
 
 #if defined (HAVE_PSTATUS_T)
-static boolean elfcore_grok_pstatus PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elfcore_grok_pstatus
+  PARAMS ((bfd *, Elf_Internal_Note *));
 
-static boolean
+static bfd_boolean
 elfcore_grok_pstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6552,14 +6580,15 @@ elfcore_grok_pstatus (abfd, note)
      lwpstatus_t in pstat.pr_lwp, but we'll catch it all in an
      NT_LWPSTATUS note, presumably.  */
 
-  return true;
+  return TRUE;
 }
 #endif /* defined (HAVE_PSTATUS_T) */
 
 #if defined (HAVE_LWPSTATUS_T)
-static boolean elfcore_grok_lwpstatus PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elfcore_grok_lwpstatus
+  PARAMS ((bfd *, Elf_Internal_Note *));
 
-static boolean
+static bfd_boolean
 elfcore_grok_lwpstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6575,7 +6604,7 @@ elfcore_grok_lwpstatus (abfd, note)
       && note->descsz != sizeof (lwpxstatus_t)
 #endif
       )
-    return true;
+    return TRUE;
 
   memcpy (&lwpstat, note->descdata, sizeof (lwpstat));
 
@@ -6588,12 +6617,12 @@ elfcore_grok_lwpstatus (abfd, note)
   len = strlen (buf) + 1;
   name = bfd_alloc (abfd, (bfd_size_type) len);
   if (name == NULL)
-    return false;
+    return FALSE;
   memcpy (name, buf, len);
 
   sect = bfd_make_section (abfd, name);
   if (sect == NULL)
-    return false;
+    return FALSE;
 
 #if defined (HAVE_LWPSTATUS_T_PR_CONTEXT)
   sect->_raw_size = sizeof (lwpstat.pr_context.uc_mcontext.gregs);
@@ -6610,7 +6639,7 @@ elfcore_grok_lwpstatus (abfd, note)
   sect->alignment_power = 2;
 
   if (!elfcore_maybe_make_sect (abfd, ".reg", sect))
-    return false;
+    return FALSE;
 
   /* Make a ".reg2/999" section */
 
@@ -6618,12 +6647,12 @@ elfcore_grok_lwpstatus (abfd, note)
   len = strlen (buf) + 1;
   name = bfd_alloc (abfd, (bfd_size_type) len);
   if (name == NULL)
-    return false;
+    return FALSE;
   memcpy (name, buf, len);
 
   sect = bfd_make_section (abfd, name);
   if (sect == NULL)
-    return false;
+    return FALSE;
 
 #if defined (HAVE_LWPSTATUS_T_PR_CONTEXT)
   sect->_raw_size = sizeof (lwpstat.pr_context.uc_mcontext.fpregs);
@@ -6644,7 +6673,7 @@ elfcore_grok_lwpstatus (abfd, note)
 #endif /* defined (HAVE_LWPSTATUS_T) */
 
 #if defined (HAVE_WIN32_PSTATUS_T)
-static boolean
+static bfd_boolean
 elfcore_grok_win32pstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6656,7 +6685,7 @@ elfcore_grok_win32pstatus (abfd, note)
   win32_pstatus_t pstatus;
 
   if (note->descsz < sizeof (pstatus))
-    return true;
+    return TRUE;
 
   memcpy (&pstatus, note->descdata, sizeof (pstatus));
 
@@ -6675,13 +6704,13 @@ elfcore_grok_win32pstatus (abfd, note)
       len = strlen (buf) + 1;
       name = bfd_alloc (abfd, (bfd_size_type) len);
       if (name == NULL)
-	return false;
+	return FALSE;
 
       memcpy (name, buf, len);
 
       sect = bfd_make_section (abfd, name);
       if (sect == NULL)
-	return false;
+	return FALSE;
 
       sect->_raw_size = sizeof (pstatus.data.thread_info.thread_context);
       sect->filepos = (note->descpos
@@ -6692,7 +6721,7 @@ elfcore_grok_win32pstatus (abfd, note)
 
       if (pstatus.data.thread_info.is_active_thread)
 	if (! elfcore_maybe_make_sect (abfd, ".reg", sect))
-	  return false;
+	  return FALSE;
       break;
 
     case NOTE_INFO_MODULE:
@@ -6702,14 +6731,14 @@ elfcore_grok_win32pstatus (abfd, note)
       len = strlen (buf) + 1;
       name = bfd_alloc (abfd, (bfd_size_type) len);
       if (name == NULL)
-	return false;
+	return FALSE;
 
       memcpy (name, buf, len);
 
       sect = bfd_make_section (abfd, name);
 
       if (sect == NULL)
-	return false;
+	return FALSE;
 
       sect->_raw_size = note->descsz;
       sect->filepos = note->descpos;
@@ -6718,14 +6747,14 @@ elfcore_grok_win32pstatus (abfd, note)
       break;
 
     default:
-      return true;
+      return TRUE;
     }
 
-  return true;
+  return TRUE;
 }
 #endif /* HAVE_WIN32_PSTATUS_T */
 
-static boolean
+static bfd_boolean
 elfcore_grok_note (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6735,16 +6764,16 @@ elfcore_grok_note (abfd, note)
   switch (note->type)
     {
     default:
-      return true;
+      return TRUE;
 
     case NT_PRSTATUS:
       if (bed->elf_backend_grok_prstatus)
 	if ((*bed->elf_backend_grok_prstatus) (abfd, note))
-	  return true;
+	  return TRUE;
 #if defined (HAVE_PRSTATUS_T)
       return elfcore_grok_prstatus (abfd, note);
 #else
-      return true;
+      return TRUE;
 #endif
 
 #if defined (HAVE_PSTATUS_T)
@@ -6770,22 +6799,22 @@ elfcore_grok_note (abfd, note)
 	  && strcmp (note->namedata, "LINUX") == 0)
 	return elfcore_grok_prxfpreg (abfd, note);
       else
-	return true;
+	return TRUE;
 
     case NT_PRPSINFO:
     case NT_PSINFO:
       if (bed->elf_backend_grok_psinfo)
 	if ((*bed->elf_backend_grok_psinfo) (abfd, note))
-	  return true;
+	  return TRUE;
 #if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
       return elfcore_grok_psinfo (abfd, note);
 #else
-      return true;
+      return TRUE;
 #endif
     }
 }
 
-static boolean
+static bfd_boolean
 elfcore_netbsd_get_lwpid (note, lwpidp)
      Elf_Internal_Note *note;
      int *lwpidp;
@@ -6796,12 +6825,12 @@ elfcore_netbsd_get_lwpid (note, lwpidp)
   if (cp != NULL)
     {
       *lwpidp = atoi(cp + 1);
-      return true;
+      return TRUE;
     }
-  return false;
+  return FALSE;
 }
 
-static boolean
+static bfd_boolean
 elfcore_grok_netbsd_procinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6819,10 +6848,10 @@ elfcore_grok_netbsd_procinfo (abfd, note)
   elf_tdata (abfd)->core_command
     = _bfd_elfcore_strndup (abfd, note->descdata + 0x7c, 31);
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elfcore_grok_netbsd_note (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -6848,7 +6877,7 @@ elfcore_grok_netbsd_note (abfd, note)
      understand it.  */
 
   if (note->type < NT_NETBSDCORE_FIRSTMACH)
-    return true;
+    return TRUE;
 
 
   switch (bfd_get_arch (abfd))
@@ -6867,7 +6896,7 @@ elfcore_grok_netbsd_note (abfd, note)
           return elfcore_make_note_pseudosection (abfd, ".reg2", note);
 
         default:
-          return true;
+          return TRUE;
         }
 
     /* On all other arch's, PT_GETREGS == mach+1 and
@@ -6883,7 +6912,7 @@ elfcore_grok_netbsd_note (abfd, note)
           return elfcore_make_note_pseudosection (abfd, ".reg2", note);
 
         default:
-          return true;
+          return TRUE;
         }
     }
     /* NOTREACHED */
@@ -7081,7 +7110,7 @@ elfcore_write_prxfpreg (abfd, buf, bufsiz, xfpregs, size)
 			     note_name, NT_PRXFPREG, xfpregs, size);
 }
 
-static boolean
+static bfd_boolean
 elfcore_read_notes (abfd, offset, size)
      bfd *abfd;
      file_ptr offset;
@@ -7091,20 +7120,20 @@ elfcore_read_notes (abfd, offset, size)
   char *p;
 
   if (size <= 0)
-    return true;
+    return TRUE;
 
   if (bfd_seek (abfd, offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   buf = bfd_malloc (size);
   if (buf == NULL)
-    return false;
+    return FALSE;
 
   if (bfd_bread (buf, size, abfd) != size)
     {
     error:
       free (buf);
-      return false;
+      return FALSE;
     }
 
   p = buf;
@@ -7138,7 +7167,7 @@ elfcore_read_notes (abfd, offset, size)
     }
 
   free (buf);
-  return true;
+  return TRUE;
 }
 
 /* Providing external access to the ELF program header table.  */
diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index c9428acc726..27c163981a0 100644
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -30,10 +30,10 @@ static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 static void arc_info_to_howto_rel
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean arc_elf_object_p
+static bfd_boolean arc_elf_object_p
   PARAMS ((bfd *));
 static void arc_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
+  PARAMS ((bfd *, bfd_boolean));
 static bfd_reloc_status_type arc_elf_b22_pcrel
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 
@@ -49,60 +49,60 @@ static reloc_howto_type elf_arc_howto_table[] =
 	 0,			/* rightshift  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long)  */
 	 32,			/* bitsize  */
-	 false,			/* pc_relative  */
+	 FALSE,			/* pc_relative  */
 	 0,			/* bitpos  */
 	 complain_overflow_bitfield, /* complain_on_overflow  */
 	 bfd_elf_generic_reloc,	/* special_function  */
 	 "R_ARC_NONE",		/* name  */
-	 true,			/* partial_inplace  */
+	 TRUE,			/* partial_inplace  */
 	 0,			/* src_mask  */
 	 0,			/* dst_mask  */
-	 false),		/* pcrel_offset  */
+	 FALSE),		/* pcrel_offset  */
 
   /* A standard 32 bit relocation.  */
   HOWTO (R_ARC_32,		/* type  */
 	 0,			/* rightshift  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long)  */
 	 32,			/* bitsize  */
-	 false,			/* pc_relative  */
+	 FALSE,			/* pc_relative  */
 	 0,			/* bitpos  */
 	 complain_overflow_bitfield, /* complain_on_overflow  */
 	 bfd_elf_generic_reloc,	/* special_function  */
 	 "R_ARC_32",		/* name  */
-	 true,			/* partial_inplace  */
+	 TRUE,			/* partial_inplace  */
 	 0xffffffff,		/* src_mask  */
 	 0xffffffff,		/* dst_mask  */
-	 false),		/* pcrel_offset  */
+	 FALSE),		/* pcrel_offset  */
 
   /* A 26 bit absolute branch, right shifted by 2.  */
   HOWTO (R_ARC_B26,		/* type  */
 	 2,			/* rightshift  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long)  */
 	 26,			/* bitsize  */
-	 false,			/* pc_relative  */
+	 FALSE,			/* pc_relative  */
 	 0,			/* bitpos  */
 	 complain_overflow_bitfield, /* complain_on_overflow  */
 	 bfd_elf_generic_reloc,	/* special_function  */
 	 "R_ARC_B26",		/* name  */
-	 true,			/* partial_inplace  */
+	 TRUE,			/* partial_inplace  */
 	 0x00ffffff,		/* src_mask  */
 	 0x00ffffff,		/* dst_mask  */
-	 false),		/* pcrel_offset  */
+	 FALSE),		/* pcrel_offset  */
 
   /* A relative 22 bit branch; bits 21-2 are stored in bits 26-7.  */
   HOWTO (R_ARC_B22_PCREL,	/* type  */
 	 2,			/* rightshift  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long)  */
 	 22,			/* bitsize  */
-	 true,			/* pc_relative  */
+	 TRUE,			/* pc_relative  */
 	 7,			/* bitpos  */
 	 complain_overflow_signed, /* complain_on_overflow  */
 	 arc_elf_b22_pcrel,	/* special_function  */
 	 "R_ARC_B22_PCREL",	/* name  */
-	 true,			/* partial_inplace  */
+	 TRUE,			/* partial_inplace  */
 	 0x07ffff80,		/* src_mask  */
 	 0x07ffff80,		/* dst_mask  */
-	 false),		/* pcrel_offset  */
+	 FALSE),		/* pcrel_offset  */
 };
 
 /* Map BFD reloc types to ARC ELF reloc types.  */
@@ -153,7 +153,7 @@ arc_info_to_howto_rel (abfd, cache_ptr, dst)
 
 /* Set the right machine number for an ARC ELF file.  */
 
-static boolean
+static bfd_boolean
 arc_elf_object_p (abfd)
      bfd *abfd;
 {
@@ -189,7 +189,7 @@ arc_elf_object_p (abfd)
 static void
 arc_elf_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
 
@@ -226,7 +226,7 @@ arc_elf_b22_pcrel (abfd, reloc_entry, symbol, data, input_section,
 {
   /* If linking, back up the final symbol address by the address of the
      reloc.  This cannot be accomplished by setting the pcrel_offset
-     field to true, as bfd_install_relocation will detect this and refuse
+     field to TRUE, as bfd_install_relocation will detect this and refuse
      to install the offset in the first place, but bfd_perform_relocation
      will still insist on removing it.  */
   if (output_bfd == (bfd *) NULL)
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 3c8adcd6760..48eb873846e 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -24,13 +24,13 @@
 typedef unsigned long int insn32;
 typedef unsigned short int insn16;
 
-static boolean elf32_arm_set_private_flags
+static bfd_boolean elf32_arm_set_private_flags
   PARAMS ((bfd *, flagword));
-static boolean elf32_arm_copy_private_bfd_data
+static bfd_boolean elf32_arm_copy_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean elf32_arm_merge_private_bfd_data
+static bfd_boolean elf32_arm_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean elf32_arm_print_private_bfd_data
+static bfd_boolean elf32_arm_print_private_bfd_data
   PARAMS ((bfd *, PTR));
 static int elf32_arm_get_symbol_type
   PARAMS (( Elf_Internal_Sym *, int));
@@ -54,29 +54,29 @@ static int elf32_arm_to_thumb_stub
 static int elf32_thumb_to_arm_stub
   PARAMS ((struct bfd_link_info *, const char *, bfd *, bfd *, asection *,
 	   bfd_byte *, asection *, bfd_vma, bfd_signed_vma, bfd_vma));
-static boolean elf32_arm_relocate_section
+static bfd_boolean elf32_arm_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 static asection * elf32_arm_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf32_arm_gc_sweep_hook
+static bfd_boolean elf32_arm_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf32_arm_check_relocs
+static bfd_boolean elf32_arm_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf32_arm_find_nearest_line
+static bfd_boolean elf32_arm_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
-static boolean elf32_arm_adjust_dynamic_symbol
+static bfd_boolean elf32_arm_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf32_arm_size_dynamic_sections
+static bfd_boolean elf32_arm_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf32_arm_finish_dynamic_symbol
+static bfd_boolean elf32_arm_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean elf32_arm_finish_dynamic_sections
+static bfd_boolean elf32_arm_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static struct bfd_hash_entry * elf32_arm_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
@@ -92,11 +92,11 @@ static void record_arm_to_thumb_glue
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 static void record_thumb_to_arm_glue
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-boolean bfd_elf32_arm_allocate_interworking_sections
+bfd_boolean bfd_elf32_arm_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
-boolean bfd_elf32_arm_get_bfd_for_interworking
+bfd_boolean bfd_elf32_arm_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
-boolean bfd_elf32_arm_process_before_allocation
+bfd_boolean bfd_elf32_arm_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 #endif
 
@@ -170,14 +170,14 @@ struct elf32_arm_link_hash_entry
   };
 
 /* Declare this now that the above structures are defined.  */
-static boolean elf32_arm_discard_copies
+static bfd_boolean elf32_arm_discard_copies
   PARAMS ((struct elf32_arm_link_hash_entry *, PTR));
 
 /* Traverse an arm ELF linker hash table.  */
 #define elf32_arm_link_hash_traverse(table, func, info)			\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the ARM elf linker hash table from a link_info structure.  */
@@ -285,7 +285,7 @@ find_thumb_glue (link_info, name, input_bfd)
   sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
 
   hash = elf_link_hash_lookup
-    (&(hash_table)->root, tmp_name, false, false, true);
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);
 
   if (hash == NULL)
     /* xgettext:c-format */
@@ -320,7 +320,7 @@ find_arm_glue (link_info, name, input_bfd)
   sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup
-    (&(hash_table)->root, tmp_name, false, false, true);
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);
 
   if (myh == NULL)
     /* xgettext:c-format */
@@ -368,7 +368,7 @@ static const insn16 t2a2_noop_insn = 0x46c0;
 static const insn32 t2a3_b_insn = 0xea000000;
 
 #ifndef ELFARM_NABI_C_INCLUDED
-boolean
+bfd_boolean
 bfd_elf32_arm_allocate_interworking_sections (info)
      struct bfd_link_info * info;
 {
@@ -412,7 +412,7 @@ bfd_elf32_arm_allocate_interworking_sections (info)
       s->contents = foo;
     }
 
-  return true;
+  return TRUE;
 }
 
 static void
@@ -446,7 +446,7 @@ record_arm_to_thumb_glue (link_info, h)
   sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup
-    (&(globals)->root, tmp_name, false, false, true);
+    (&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
 
   if (myh != NULL)
     {
@@ -462,7 +462,7 @@ record_arm_to_thumb_glue (link_info, h)
   val = globals->arm_glue_size + 1;
   _bfd_generic_link_add_one_symbol (link_info, globals->bfd_of_glue_owner,
 				    tmp_name, BSF_GLOBAL, s, val,
-				    NULL, true, false, &bh);
+				    NULL, TRUE, FALSE, &bh);
 
   free (tmp_name);
 
@@ -503,7 +503,7 @@ record_thumb_to_arm_glue (link_info, h)
   sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup
-    (&(hash_table)->root, tmp_name, false, false, true);
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);
 
   if (myh != NULL)
     {
@@ -516,7 +516,7 @@ record_thumb_to_arm_glue (link_info, h)
   val = hash_table->thumb_glue_size + 1;
   _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner,
 				    tmp_name, BSF_GLOBAL, s, val,
-				    NULL, true, false, &bh);
+				    NULL, TRUE, FALSE, &bh);
 
   /* If we mark it 'Thumb', the disassembler will do a better job.  */
   myh = (struct elf_link_hash_entry *) bh;
@@ -540,7 +540,7 @@ record_thumb_to_arm_glue (link_info, h)
   val = hash_table->thumb_glue_size + 4,
   _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner,
 				    tmp_name, BSF_LOCAL, s, val,
-				    NULL, true, false, &bh);
+				    NULL, TRUE, FALSE, &bh);
 
   free (tmp_name);
 
@@ -552,7 +552,7 @@ record_thumb_to_arm_glue (link_info, h)
 /* Add the glue sections to ABFD.  This function is called from the
    linker scripts in ld/emultempl/{armelf}.em.  */
 
-boolean
+bfd_boolean
 bfd_elf32_arm_add_glue_sections_to_bfd (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -563,7 +563,7 @@ bfd_elf32_arm_add_glue_sections_to_bfd (abfd, info)
   /* If we are only performing a partial
      link do not bother adding the glue.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
 
@@ -579,7 +579,7 @@ bfd_elf32_arm_add_glue_sections_to_bfd (abfd, info)
       if (sec == NULL
 	  || !bfd_set_section_flags (abfd, sec, flags)
 	  || !bfd_set_section_alignment (abfd, sec, 2))
-	return false;
+	return FALSE;
 
       /* Set the gc mark to prevent the section from being removed by garbage
 	 collection, despite the fact that no relocs refer to this section.  */
@@ -597,19 +597,19 @@ bfd_elf32_arm_add_glue_sections_to_bfd (abfd, info)
       if (sec == NULL
 	  || !bfd_set_section_flags (abfd, sec, flags)
 	  || !bfd_set_section_alignment (abfd, sec, 2))
-	return false;
+	return FALSE;
 
       sec->gc_mark = 1;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Select a BFD to be used to hold the sections used by the glue code.
    This function is called from the linker scripts in ld/emultempl/
    {armelf/pe}.em  */
 
-boolean
+bfd_boolean
 bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -619,22 +619,22 @@ bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
   /* If we are only performing a partial link
      do not bother getting a bfd to hold the glue.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   globals = elf32_arm_hash_table (info);
 
   BFD_ASSERT (globals != NULL);
 
   if (globals->bfd_of_glue_owner != NULL)
-    return true;
+    return TRUE;
 
   /* Save the bfd for later use.  */
   globals->bfd_of_glue_owner = abfd;
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
      bfd *abfd;
      struct bfd_link_info *link_info;
@@ -651,7 +651,7 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
   /* If we are only performing a partial link do not bother
      to construct any glue.  */
   if (link_info->relocateable)
-    return true;
+    return TRUE;
 
   /* Here we have a bfd that is to be included on the link.  We have a hook
      to do reloc rummaging, before section sizes are nailed down.  */
@@ -666,7 +666,7 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
   sec = abfd->sections;
 
   if (sec == NULL)
-    return true;
+    return TRUE;
 
   for (; sec != NULL; sec = sec->next)
     {
@@ -678,7 +678,7 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
       /* Load the relocs.  */
       internal_relocs
 	= _bfd_elf32_link_read_relocs (abfd, sec, (PTR) NULL,
-				       (Elf_Internal_Rela *) NULL, false);
+				       (Elf_Internal_Rela *) NULL, FALSE);
 
       if (internal_relocs == NULL)
 	goto error_return;
@@ -769,7 +769,7 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
       internal_relocs = NULL;
     }
 
-  return true;
+  return TRUE;
 
 error_return:
   if (contents != NULL
@@ -779,7 +779,7 @@ error_return:
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return false;
+  return FALSE;
 }
 #endif
 
@@ -864,7 +864,7 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
 
   myh = find_thumb_glue (info, name, input_bfd);
   if (myh == NULL)
-    return false;
+    return FALSE;
 
   globals = elf32_arm_hash_table (info);
 
@@ -893,7 +893,7 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
 	    (_("  first occurrence: %s: thumb call to arm"),
 	     bfd_archive_filename (input_bfd));
 
-	  return false;
+	  return FALSE;
 	}
 
       --my_offset;
@@ -942,7 +942,7 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
 	      (bfd_vma) insert_thumb_branch (tmp, ret_offset),
 	      hit_data - input_section->vma);
 
-  return true;
+  return TRUE;
 }
 
 /* Arm code calling a Thumb function.  */
@@ -970,7 +970,7 @@ elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
 
   myh = find_arm_glue (info, name, input_bfd);
   if (myh == NULL)
-    return false;
+    return FALSE;
 
   globals = elf32_arm_hash_table (info);
 
@@ -1030,7 +1030,7 @@ elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
 
   bfd_put_32 (output_bfd, (bfd_vma) tmp, hit_data - input_section->vma);
 
-  return true;
+  return TRUE;
 }
 
 /* Perform a relocation as part of a final link.  */
@@ -1130,7 +1130,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 	{
 	  Elf_Internal_Rela outrel;
 	  bfd_byte *loc;
-	  boolean skip, relocate;
+	  bfd_boolean skip, relocate;
 
 	  if (sreloc == NULL)
 	    {
@@ -1152,16 +1152,16 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 	      BFD_ASSERT (sreloc != NULL);
 	    }
 
-	  skip = false;
-	  relocate = false;
+	  skip = FALSE;
+	  relocate = FALSE;
 
 	  outrel.r_offset =
 	    _bfd_elf_section_offset (output_bfd, info, input_section,
 				     rel->r_offset);
 	  if (outrel.r_offset == (bfd_vma) -1)
-	    skip = true;
+	    skip = TRUE;
 	  else if (outrel.r_offset == (bfd_vma) -2)
-	    skip = true, relocate = true;
+	    skip = TRUE, relocate = TRUE;
 	  outrel.r_offset += (input_section->output_section->vma
 			      + input_section->output_offset);
 
@@ -1171,7 +1171,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 	    {
 	      BFD_ASSERT (h != NULL && h->dynindx != -1);
 	      if ((input_section->flags & SEC_ALLOC) == 0)
-		relocate = true;
+		relocate = TRUE;
 	      outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_PC24);
 	    }
 	  else
@@ -1181,14 +1181,14 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 		      && (h->elf_link_hash_flags
 			  & ELF_LINK_HASH_DEF_REGULAR) != 0))
 		{
-		  relocate = true;
+		  relocate = TRUE;
 		  outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
 		}
 	      else
 		{
 		  BFD_ASSERT (h->dynindx != -1);
 		  if ((input_section->flags & SEC_ALLOC) == 0)
-		    relocate = true;
+		    relocate = TRUE;
 		  outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_ABS32);
 		}
 	    }
@@ -1389,13 +1389,13 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
     case R_ARM_THM_PC22:
       /* Thumb BL (branch long instruction).  */
       {
-	bfd_vma        relocation;
-	boolean        overflow = false;
-	bfd_vma        upper_insn = bfd_get_16 (input_bfd, hit_data);
-	bfd_vma        lower_insn = bfd_get_16 (input_bfd, hit_data + 2);
+	bfd_vma relocation;
+	bfd_boolean overflow = FALSE;
+	bfd_vma upper_insn = bfd_get_16 (input_bfd, hit_data);
+	bfd_vma lower_insn = bfd_get_16 (input_bfd, hit_data + 2);
 	bfd_signed_vma reloc_signed_max = ((1 << (howto->bitsize - 1)) - 1) >> howto->rightshift;
 	bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
-	bfd_vma        check;
+	bfd_vma check;
 	bfd_signed_vma signed_check;
 
 #if USE_REL
@@ -1472,7 +1472,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 
 	/* Assumes two's complement.  */
 	if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
-	  overflow = true;
+	  overflow = TRUE;
 
 #ifndef OLD_ARM_ABI
 	if (r_type == R_ARM_THM_XPC22
@@ -1814,27 +1814,27 @@ arm_add_to_rel (abfd, address, howto, increment)
 #endif /* USE_REL */
 
 /* Relocate an ARM ELF section.  */
-static boolean
+static bfd_boolean
 elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 			    contents, relocs, local_syms, local_sections)
-     bfd *                  output_bfd;
-     struct bfd_link_info * info;
-     bfd *                  input_bfd;
-     asection *             input_section;
-     bfd_byte *             contents;
-     Elf_Internal_Rela *    relocs;
-     Elf_Internal_Sym *     local_syms;
-     asection **            local_sections;
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
 {
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
-  const char *                  name;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  const char *name;
 
 #if !USE_REL
   if (info->relocateable)
-    return true;
+    return TRUE;
 #endif
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
@@ -1914,7 +1914,7 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 		     bfd_archive_filename (input_bfd),
 		     bfd_get_section_name (input_bfd, input_section),
 		     (long) rel->r_offset, howto->name);
-		  return false;
+		  return FALSE;
 		}
 
 	      value = bfd_get_32 (input_bfd, contents + rel->r_offset);
@@ -2033,7 +2033,7 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 		     input_section, rel->r_offset,
 		     (!info->shared || info->no_undefined
 		      || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -2069,14 +2069,14 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 		  && (!((*info->callbacks->reloc_overflow)
 			(info, name, howto->name, (bfd_vma) 0,
 			 input_bfd, input_section, rel->r_offset))))
-		  return false;
+		  return FALSE;
 	      break;
 
 	    case bfd_reloc_undefined:
 	      if (!((*info->callbacks->undefined_symbol)
 		    (info, name, input_bfd, input_section,
-		     rel->r_offset, true)))
-		return false;
+		     rel->r_offset, TRUE)))
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -2099,17 +2099,17 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->warning)
 		    (info, msg, name, input_bfd, input_section,
 		     rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Function to keep ARM specific flags in the ELF header.  */
-static boolean
+static bfd_boolean
 elf32_arm_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -2132,15 +2132,15 @@ Warning: Clearing the interworking flag of %s due to outside request"),
   else
     {
       elf_elfheader (abfd)->e_flags = flags;
-      elf_flags_init (abfd) = true;
+      elf_flags_init (abfd) = TRUE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Copy backend specific data from one object module to another.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -2150,7 +2150,7 @@ elf32_arm_copy_private_bfd_data (ibfd, obfd)
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   in_flags  = elf_elfheader (ibfd)->e_flags;
   out_flags = elf_elfheader (obfd)->e_flags;
@@ -2161,11 +2161,11 @@ elf32_arm_copy_private_bfd_data (ibfd, obfd)
     {
       /* Cannot mix APCS26 and APCS32 code.  */
       if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))
-	return false;
+	return FALSE;
 
       /* Cannot mix float APCS and non-float APCS code.  */
       if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
-	return false;
+	return FALSE;
 
       /* If the src and dest have different interworking flags
          then turn off the interworking bit.  */
@@ -2186,32 +2186,32 @@ Warning: Clearing the interworking flag of %s because non-interworking code in %
     }
 
   elf_elfheader (obfd)->e_flags = in_flags;
-  elf_flags_init (obfd) = true;
+  elf_flags_init (obfd) = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_merge_private_bfd_data (ibfd, obfd)
      bfd * ibfd;
      bfd * obfd;
 {
   flagword out_flags;
   flagword in_flags;
-  boolean flags_compatible = true;
-  boolean null_input_bfd = true;
+  bfd_boolean flags_compatible = TRUE;
+  bfd_boolean null_input_bfd = TRUE;
   asection *sec;
 
   /* Check if we have the same endianess.  */
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   /* The input BFD must have had its flags initialised.  */
   /* The following seems bogus to me -- The flags are initialized in
@@ -2232,21 +2232,21 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd)
          to the default values.  */
       if (bfd_get_arch_info (ibfd)->the_default
 	  && elf_elfheader (ibfd)->e_flags == 0)
-	return true;
+	return TRUE;
 
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = in_flags;
 
       if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
 	  && bfd_get_arch_info (obfd)->the_default)
 	return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
 
-      return true;
+      return TRUE;
     }
 
   /* Identical flags must be compatible.  */
   if (in_flags == out_flags)
-    return true;
+    return TRUE;
 
   /* Check to see if the input BFD actually contains any sections.
      If not, its flags may not have been initialised either, but it cannot
@@ -2257,12 +2257,12 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd)
       if (strcmp (sec->name, ".glue_7")
 	  && strcmp (sec->name, ".glue_7t"))
 	{
-	  null_input_bfd = false;
+	  null_input_bfd = FALSE;
 	  break;
 	}
     }
   if (null_input_bfd)
-    return true;
+    return TRUE;
 
   /* Complain about various flag mismatches.  */
   if (EF_ARM_EABI_VERSION (in_flags) != EF_ARM_EABI_VERSION (out_flags))
@@ -2273,7 +2273,7 @@ ERROR: %s is compiled for EABI version %d, whereas %s is compiled for version %d
 			  (in_flags & EF_ARM_EABIMASK) >> 24,
 			  bfd_get_filename (obfd),
 			  (out_flags & EF_ARM_EABIMASK) >> 24);
-      return false;
+      return FALSE;
     }
 
   /* Not sure what needs to be checked for EABI versions >= 1.  */
@@ -2287,7 +2287,7 @@ ERROR: %s is compiled for APCS-%d, whereas target %s uses APCS-%d"),
 			      in_flags & EF_ARM_APCS_26 ? 26 : 32,
 			      bfd_get_filename (obfd),
 			      out_flags & EF_ARM_APCS_26 ? 26 : 32);
-	  flags_compatible = false;
+	  flags_compatible = FALSE;
 	}
 
       if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
@@ -2303,7 +2303,7 @@ ERROR: %s passes floats in integer registers, whereas %s passes them in float re
 				bfd_archive_filename (ibfd),
 				bfd_get_filename (obfd));
 
-	  flags_compatible = false;
+	  flags_compatible = FALSE;
 	}
 
       if ((in_flags & EF_ARM_VFP_FLOAT) != (out_flags & EF_ARM_VFP_FLOAT))
@@ -2319,7 +2319,7 @@ ERROR: %s uses FPA instructions, whereas %s uses VFP instructions"),
 				bfd_archive_filename (ibfd),
 				bfd_get_filename (obfd));
 
-	  flags_compatible = false;
+	  flags_compatible = FALSE;
 	}
 
 #ifdef EF_ARM_SOFT_FLOAT
@@ -2344,7 +2344,7 @@ ERROR: %s uses hardware FP, whereas %s uses software FP"),
 				    bfd_archive_filename (ibfd),
 				    bfd_get_filename (obfd));
 
-	      flags_compatible = false;
+	      flags_compatible = FALSE;
 	    }
 	}
 #endif
@@ -2374,7 +2374,7 @@ Warning: %s does not support interworking, whereas %s does"),
 
 /* Display the flags field.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -2482,7 +2482,7 @@ elf32_arm_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
 
 static int
@@ -2550,7 +2550,7 @@ elf32_arm_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -2558,29 +2558,29 @@ elf32_arm_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* We don't support garbage collection of GOT and PLT relocs yet.  */
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_check_relocs (abfd, info, sec, relocs)
-     bfd *                      abfd;
-     struct bfd_link_info *     info;
-     asection *                 sec;
-     const Elf_Internal_Rela *  relocs;
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
 {
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  struct elf_link_hash_entry ** sym_hashes_end;
-  const Elf_Internal_Rela *     rel;
-  const Elf_Internal_Rela *     rel_end;
-  bfd *                         dynobj;
-  asection * sgot, *srelgot, *sreloc;
-  bfd_vma * local_got_offsets;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **sym_hashes_end;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd *dynobj;
+  asection *sgot, *srelgot, *sreloc;
+  bfd_vma *local_got_offsets;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   sgot = srelgot = sreloc = NULL;
 
@@ -2617,7 +2617,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
 	    case R_ARM_GOTPC:
 	      elf_hash_table (info)->dynobj = dynobj = abfd;
 	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	      break;
 
 	    default:
@@ -2654,7 +2654,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
 						     | SEC_LINKER_CREATED
 						     | SEC_READONLY))
 		        || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		      return false;
+		      return FALSE;
 		  }
 	      }
 
@@ -2669,7 +2669,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
 	        /* Make sure this symbol is output as a dynamic symbol.  */
 	        if (h->dynindx == -1)
 		  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		    return false;
+		    return FALSE;
 
 	        srelgot->_raw_size += sizeof (Elf32_External_Rel);
 	      }
@@ -2686,7 +2686,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
 		    size *= sizeof (bfd_vma);
 		    local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
 		    if (local_got_offsets == NULL)
-		      return false;
+		      return FALSE;
 		    elf_local_got_offsets (abfd) = local_got_offsets;
 		    for (i = 0; i < symtab_hdr->sh_info; i++)
 		      local_got_offsets[i] = (bfd_vma) -1;
@@ -2758,7 +2758,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
 			     elf_elfheader (abfd)->e_shstrndx,
 			     elf_section_data (sec)->rel_hdr.sh_name));
 		    if (name == NULL)
-		      return false;
+		      return FALSE;
 
 		    BFD_ASSERT (strncmp (name, ".rel", 4) == 0
 			        && strcmp (bfd_get_section_name (abfd, sec),
@@ -2777,7 +2777,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
 		        if (sreloc == NULL
 			    || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			    || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			  return false;
+			  return FALSE;
 		      }
 		  if (sec->flags & SEC_READONLY)
 		    info->flags |= DF_TEXTREL;
@@ -2809,7 +2809,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
 		        p = ((struct elf32_arm_pcrel_relocs_copied *)
 			     bfd_alloc (dynobj, (bfd_size_type) sizeof * p));
 		        if (p == NULL)
-			  return false;
+			  return FALSE;
 		        p->next = eh->pcrel_relocs_copied;
 		        eh->pcrel_relocs_copied = p;
 		        p->section = sreloc;
@@ -2825,59 +2825,59 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_ARM_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_ARM_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Find the nearest line to a particular section and offset, for error
    reporting.   This code is a duplicate of the code in elf.c, except
    that it also accepts STT_ARM_TFUNC as a symbol that names a function.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_find_nearest_line
   (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)
-     bfd *          abfd;
-     asection *     section;
-     asymbol **     symbols;
-     bfd_vma        offset;
-     const char **  filename_ptr;
-     const char **  functionname_ptr;
-     unsigned int * line_ptr;
+     bfd *abfd;
+     asection *section;
+     asymbol **symbols;
+     bfd_vma offset;
+     const char **filename_ptr;
+     const char **functionname_ptr;
+     unsigned int *line_ptr;
 {
-  boolean      found;
-  const char * filename;
-  asymbol *    func;
-  bfd_vma      low_func;
-  asymbol **   p;
+  bfd_boolean found;
+  const char *filename;
+  asymbol *func;
+  bfd_vma low_func;
+  asymbol **p;
 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr, 0,
 				     &elf_tdata (abfd)->dwarf2_find_line_info))
-    return true;
+    return TRUE;
 
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
 					     &found, filename_ptr,
 					     functionname_ptr, line_ptr,
 					     &elf_tdata (abfd)->line_info))
-    return false;
+    return FALSE;
 
   if (found)
-    return true;
+    return TRUE;
 
   if (symbols == NULL)
-    return false;
+    return FALSE;
 
   filename = NULL;
   func = NULL;
@@ -2914,13 +2914,13 @@ elf32_arm_find_nearest_line
     }
 
   if (func == NULL)
-    return false;
+    return FALSE;
 
   *filename_ptr = filename;
   *functionname_ptr = bfd_asymbol_name (func);
   *line_ptr = 0;
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -2929,7 +2929,7 @@ elf32_arm_find_nearest_line
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_adjust_dynamic_symbol (info, h)
      struct bfd_link_info * info;
      struct elf_link_hash_entry * h;
@@ -2973,14 +2973,14 @@ elf32_arm_adjust_dynamic_symbol (info, h)
 	     instead.  */
 	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	  return true;
+	  return TRUE;
 	}
 
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = bfd_get_section_by_name (dynobj, ".plt");
@@ -3020,7 +3020,7 @@ elf32_arm_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf32_External_Rel);
 
-      return true;
+      return TRUE;
     }
 
   /* If this is a weak symbol, and there is a real definition, the
@@ -3032,7 +3032,7 @@ elf32_arm_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -3043,7 +3043,7 @@ elf32_arm_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -3083,7 +3083,7 @@ elf32_arm_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -3093,20 +3093,20 @@ elf32_arm_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_size_dynamic_sections (output_bfd, info)
      bfd * output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info * info;
 {
   bfd * dynobj;
   asection * s;
-  boolean plt;
-  boolean relocs;
+  bfd_boolean plt;
+  bfd_boolean relocs;
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
@@ -3146,12 +3146,12 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  plt = false;
-  relocs = false;
+  plt = FALSE;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char * name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -3160,7 +3160,7 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
-      strip = false;
+      strip = FALSE;
 
       if (strcmp (name, ".plt") == 0)
 	{
@@ -3168,12 +3168,12 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
 	    {
 	      /* Strip this section if we don't need it; see the
                  comment below.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      plt = TRUE;
 	    }
 	}
       else if (strncmp (name, ".rel", 4) == 0)
@@ -3189,14 +3189,14 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there are any reloc sections other
                  than .rel.plt.  */
 	      if (strcmp (name, ".rel.plt") != 0)
-		relocs = true;
+		relocs = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -3218,7 +3218,7 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
       /* Allocate memory for the section contents.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -3234,7 +3234,7 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (plt)
@@ -3243,7 +3243,7 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_REL)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -3251,19 +3251,19 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
 	  if (   !add_dynamic_entry (DT_REL, 0)
 	      || !add_dynamic_entry (DT_RELSZ, 0)
 	      || !add_dynamic_entry (DT_RELENT, sizeof (Elf32_External_Rel)))
-	    return false;
+	    return FALSE;
 	}
 
       if ((info->flags & DF_TEXTREL) != 0)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	  info->flags |= DF_TEXTREL;
 	}
     }
 #undef add_synamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via elf32_arm_link_hash_traverse if we are
@@ -3273,7 +3273,7 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
    check_relocs routine, but we won't fill them in in the
    relocate_section routine.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_discard_copies (h, ignore)
      struct elf32_arm_link_hash_entry * h;
      PTR ignore ATTRIBUTE_UNUSED;
@@ -3285,18 +3285,18 @@ elf32_arm_discard_copies (h, ignore)
 
   /* We only discard relocs for symbols defined in a regular object.  */
   if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
+    return TRUE;
 
   for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
     s->section->_raw_size -= s->count * sizeof (Elf32_External_Rel);
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd * output_bfd;
      struct bfd_link_info * info;
@@ -3446,12 +3446,12 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf32_arm_finish_dynamic_sections (output_bfd, info)
      bfd * output_bfd;
      struct bfd_link_info * info;
@@ -3548,12 +3548,12 @@ elf32_arm_finish_dynamic_sections (output_bfd, info)
 		  struct elf_link_hash_entry * eh;
 
 		  eh = elf_link_hash_lookup (elf_hash_table (info), name,
-					     false, false, true);
+					     FALSE, FALSE, TRUE);
 		  if (eh != (struct elf_link_hash_entry *) NULL
 		      && ELF_ST_TYPE (eh->type) == STT_ARM_TFUNC)
 		    {
 		      dyn.d_un.d_val |= 1;
-		      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);		
+		      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
 		    }
 		}
 	      break;
@@ -3589,7 +3589,7 @@ elf32_arm_finish_dynamic_sections (output_bfd, info)
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
 
-  return true;
+  return TRUE;
 }
 
 static void
diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
index b2c63356f4d..a701dc9d00e 100644
--- a/bfd/elf32-avr.c
+++ b/bfd/elf32-avr.c
@@ -31,20 +31,20 @@ static void avr_info_to_howto_rela
 static asection *elf32_avr_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf32_avr_gc_sweep_hook
+static bfd_boolean elf32_avr_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf32_avr_check_relocs
+static bfd_boolean elf32_avr_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static bfd_reloc_status_type avr_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, bfd_vma));
-static boolean elf32_avr_relocate_section
+static bfd_boolean elf32_avr_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static void bfd_elf_avr_final_write_processing PARAMS ((bfd *, boolean));
-static boolean elf32_avr_object_p PARAMS ((bfd *));
+static void bfd_elf_avr_final_write_processing PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean elf32_avr_object_p PARAMS ((bfd *));
 
 static reloc_howto_type elf_avr_howto_table[] =
 {
@@ -52,283 +52,283 @@ static reloc_howto_type elf_avr_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_AVR_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 7 bit PC relative relocation.  */
   HOWTO (R_AVR_7_PCREL,		/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 7,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 3,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_AVR_7_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 13 bit PC relative relocation.  */
   HOWTO (R_AVR_13_PCREL,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 13,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_AVR_13_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfff,			/* src_mask */
 	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 16 bit absolute relocation.  */
   HOWTO (R_AVR_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit absolute relocation for command address.  */
   HOWTO (R_AVR_16_PM,		/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_16_PM",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A low 8 bit absolute relocation of 16 bit address.
      For LDI command.  */
   HOWTO (R_AVR_LO8_LDI,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_LO8_LDI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A high 8 bit absolute relocation of 16 bit address.
      For LDI command.  */
   HOWTO (R_AVR_HI8_LDI,		/* type */
 	 8,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_HI8_LDI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A high 6 bit absolute relocation of 22 bit address.
      For LDI command.  */
   HOWTO (R_AVR_HH8_LDI,		/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_HH8_LDI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A negative low 8 bit absolute relocation of 16 bit address.
      For LDI command.  */
   HOWTO (R_AVR_LO8_LDI_NEG,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_LO8_LDI_NEG",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A hegative high 8 bit absolute relocation of 16 bit address.
      For LDI command.  */
   HOWTO (R_AVR_HI8_LDI_NEG,	/* type */
 	 8,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_HI8_LDI_NEG",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A hegative high 6 bit absolute relocation of 22 bit address.
      For LDI command.  */
   HOWTO (R_AVR_HH8_LDI_NEG,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_HH8_LDI_NEG",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A low 8 bit absolute relocation of 24 bit program memory address.
      For LDI command.  */
   HOWTO (R_AVR_LO8_LDI_PM,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_LO8_LDI_PM",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A high 8 bit absolute relocation of 16 bit program memory address.
      For LDI command.  */
   HOWTO (R_AVR_HI8_LDI_PM,	/* type */
 	 9,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_HI8_LDI_PM",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A high 8 bit absolute relocation of 24 bit program memory address.
      For LDI command.  */
   HOWTO (R_AVR_HH8_LDI_PM,	/* type */
 	 17,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_HH8_LDI_PM",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A low 8 bit absolute relocation of a negative 24 bit
      program memory address.  For LDI command.  */
   HOWTO (R_AVR_LO8_LDI_PM_NEG,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_LO8_LDI_PM_NEG", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A high 8 bit absolute relocation of a negative 16 bit
      program memory address.  For LDI command.  */
   HOWTO (R_AVR_HI8_LDI_PM_NEG,	/* type */
 	 9,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_HI8_LDI_PM_NEG", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* A high 8 bit absolute relocation of a negative 24 bit
      program memory address.  For LDI command.  */
   HOWTO (R_AVR_HH8_LDI_PM_NEG,	/* type */
 	 17,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_HH8_LDI_PM_NEG", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* Relocation for CALL command in ATmega.  */
   HOWTO (R_AVR_CALL,		/* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 23,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_AVR_CALL",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false)			/* pcrel_offset */
+	 FALSE)			/* pcrel_offset */
 };
 
 /* Map BFD reloc types to AVR ELF reloc types.  */
@@ -428,7 +428,7 @@ elf32_avr_gc_mark_hook (sec, info, rel, h, sym)
   return NULL;
 }
 
-static boolean
+static bfd_boolean
 elf32_avr_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -436,14 +436,14 @@ elf32_avr_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* We don't use got and plt entries for avr.  */
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 elf32_avr_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -456,7 +456,7 @@ elf32_avr_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -477,7 +477,7 @@ elf32_avr_check_relocs (abfd, info, sec, relocs)
         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Perform a single relocation.  By default we use the standard BFD
@@ -702,7 +702,7 @@ avr_final_link_relocate (howto, input_bfd, input_section,
 }
 
 /* Relocate an AVR ELF section.  */
-static boolean
+static bfd_boolean
 elf32_avr_relocate_section (output_bfd, info, input_bfd, input_section,
 			    contents, relocs, local_syms, local_sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -720,7 +720,7 @@ elf32_avr_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *           relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -782,8 +782,8 @@ elf32_avr_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -805,7 +805,7 @@ elf32_avr_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	    case bfd_reloc_undefined:
 	      r = info->callbacks->undefined_symbol
-		(info, name, input_bfd, input_section, rel->r_offset, true);
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -830,11 +830,11 @@ elf32_avr_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, name, input_bfd, input_section, rel->r_offset);
 
 	  if (! r)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The final processing done just before writing out a AVR ELF object
@@ -844,7 +844,7 @@ elf32_avr_relocate_section (output_bfd, info, input_bfd, input_section,
 static void
 bfd_elf_avr_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
 
@@ -879,7 +879,7 @@ bfd_elf_avr_final_write_processing (abfd, linker)
 
 /* Set the right machine number.  */
 
-static boolean
+static bfd_boolean
 elf32_avr_object_p (abfd)
      bfd *abfd;
 {
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 8db111504da..6b6c90681a7 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -33,13 +33,13 @@ static reloc_howto_type * cris_reloc_type_lookup
 static void cris_info_to_howto_rela
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 
-static boolean cris_elf_grok_prstatus
+static bfd_boolean cris_elf_grok_prstatus
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
 
-static boolean cris_elf_grok_psinfo
+static bfd_boolean cris_elf_grok_psinfo
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
 
-static boolean cris_elf_relocate_section
+static bfd_boolean cris_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 
@@ -47,7 +47,7 @@ static bfd_reloc_status_type cris_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, bfd_vma));
 
-static boolean cris_elf_gc_sweep_hook
+static bfd_boolean cris_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
@@ -55,42 +55,42 @@ static asection * cris_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 
-static boolean cris_elf_object_p PARAMS ((bfd *));
+static bfd_boolean cris_elf_object_p PARAMS ((bfd *));
 
-static void cris_elf_final_write_processing PARAMS ((bfd *, boolean));
+static void cris_elf_final_write_processing PARAMS ((bfd *, bfd_boolean));
 
-static boolean cris_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
+static bfd_boolean cris_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
 
-static boolean cris_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
+static bfd_boolean cris_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
 
 struct elf_cris_link_hash_entry;
-static boolean elf_cris_discard_excess_dso_dynamics
+static bfd_boolean elf_cris_discard_excess_dso_dynamics
   PARAMS ((struct elf_cris_link_hash_entry *, PTR));
-static boolean elf_cris_discard_excess_program_dynamics
+static bfd_boolean elf_cris_discard_excess_program_dynamics
   PARAMS ((struct elf_cris_link_hash_entry *, PTR));
-static boolean elf_cris_adjust_gotplt_to_got
+static bfd_boolean elf_cris_adjust_gotplt_to_got
   PARAMS ((struct elf_cris_link_hash_entry *, PTR));
-static boolean elf_cris_try_fold_plt_to_got
+static bfd_boolean elf_cris_try_fold_plt_to_got
   PARAMS ((struct elf_cris_link_hash_entry *, PTR));
 static struct bfd_hash_entry *elf_cris_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *elf_cris_link_hash_table_create
   PARAMS ((bfd *));
-static boolean elf_cris_adjust_dynamic_symbol
+static bfd_boolean elf_cris_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean cris_elf_check_relocs
+static bfd_boolean cris_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
-static boolean elf_cris_size_dynamic_sections
+static bfd_boolean elf_cris_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_cris_finish_dynamic_symbol
+static bfd_boolean elf_cris_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean elf_cris_finish_dynamic_sections
+static bfd_boolean elf_cris_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static void elf_cris_hide_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean));
 static enum elf_reloc_type_class elf_cris_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
 
@@ -101,135 +101,135 @@ static reloc_howto_type cris_elf_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 8 bit absolute relocation.  */
   HOWTO (R_CRIS_8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit absolute relocation.  */
   HOWTO (R_CRIS_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  */
   HOWTO (R_CRIS_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 8 bit PC-relative relocation.  */
   HOWTO (R_CRIS_8_PCREL,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_8_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 16 bit PC-relative relocation.  */
   HOWTO (R_CRIS_16_PCREL,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_16_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 32 bit PC-relative relocation.  */
   HOWTO (R_CRIS_32_PCREL,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_32_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy.  */
   HOWTO (R_CRIS_GNU_VTINHERIT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_CRIS_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage.  */
   HOWTO (R_CRIS_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
 	 "R_CRIS_GNU_VTENTRY",	 /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* This is used only by the dynamic linker.  The symbol should exist
      both in the object being run and in some shared library.  The
@@ -240,45 +240,45 @@ static reloc_howto_type cris_elf_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_COPY",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_CRIS_32, but used when setting global offset table entries.  */
   HOWTO (R_CRIS_GLOB_DAT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_GLOB_DAT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Marks a procedure linkage table entry for a symbol.  */
   HOWTO (R_CRIS_JUMP_SLOT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_JUMP_SLOT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used only by the dynamic linker.  When the object is run, this
      longword is set to the load address of the object, plus the
@@ -287,44 +287,44 @@ static reloc_howto_type cris_elf_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_RELATIVE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_CRIS_32, but referring to the GOT table entry for the symbol.  */
   HOWTO (R_CRIS_16_GOT,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_16_GOT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_CRIS_32_GOT,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_32_GOT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_CRIS_32_GOT, but referring to (and requesting a) PLT part of
      the GOT table for the symbol.  */
@@ -332,29 +332,29 @@ static reloc_howto_type cris_elf_howto_table [] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_16_GOTPLT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_CRIS_32_GOTPLT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_32_GOTPLT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32-bit offset from GOT to (local const) symbol: no GOT entry should
      be necessary.  */
@@ -362,15 +362,15 @@ static reloc_howto_type cris_elf_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_32_GOTREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32-bit offset from GOT to entry for this symbol in PLT and request
      to create PLT entry for symbol.  */
@@ -378,15 +378,15 @@ static reloc_howto_type cris_elf_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_32_PLT_GOTREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32-bit offset from PC (location after the relocation) + addend to
      entry for this symbol in PLT and request to create PLT entry for
@@ -395,15 +395,15 @@ static reloc_howto_type cris_elf_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_CRIS_32_PLT_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true)			/* pcrel_offset */
+	 TRUE)			/* pcrel_offset */
 };
 
 /* Map BFD reloc types to CRIS ELF reloc types.  */
@@ -469,7 +469,7 @@ cris_info_to_howto_rela (abfd, cache_ptr, dst)
 
 /* Support for core dump NOTE sections.  */
 
-static boolean
+static bfd_boolean
 cris_elf_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -480,7 +480,7 @@ cris_elf_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 214:		/* Linux/CRIS */
 	/* pr_cursig */
@@ -501,7 +501,7 @@ cris_elf_grok_prstatus (abfd, note)
 					  raw_size, note->descpos + offset);
 }
 
-static boolean
+static bfd_boolean
 cris_elf_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -509,7 +509,7 @@ cris_elf_grok_psinfo (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 124:		/* Linux/CRIS elf_prpsinfo */
 	elf_tdata (abfd)->core_program
@@ -530,7 +530,7 @@ cris_elf_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 
 /* The name of the dynamic interpreter.  This is put in the .interp
@@ -659,7 +659,7 @@ struct elf_cris_link_hash_table
 #define elf_cris_link_hash_traverse(table, func, info)			\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the CRIS ELF linker hash table from a link_info structure.  */
@@ -777,30 +777,30 @@ cris_final_link_relocate (howto, input_bfd, input_section, contents, rel,
 /* Relocate an CRIS ELF section.  See elf32-fr30.c, from where this was
    copied, for further comments.  */
 
-static boolean
+static bfd_boolean
 cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
-     bfd *                   output_bfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *  info;
-     bfd *                   input_bfd;
-     asection *              input_section;
-     bfd_byte *              contents;
-     Elf_Internal_Rela *     relocs;
-     Elf_Internal_Sym *      local_syms;
-     asection **             local_sections;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
 {
   bfd *dynobj;
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
   bfd_vma *local_got_offsets;
   asection *sgot;
   asection *splt;
   asection *sreloc;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   local_got_offsets = elf_local_got_offsets (input_bfd);
@@ -820,15 +820,15 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
   for (rel = relocs; rel < relend; rel ++)
     {
-      reloc_howto_type *           howto;
-      unsigned long                r_symndx;
-      Elf_Internal_Sym *           sym;
-      asection *                   sec;
-      struct elf_link_hash_entry * h;
-      bfd_vma                      relocation;
-      bfd_reloc_status_type        r;
-      const char *                 symname = NULL;
-      int                          r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *symname = NULL;
+      int r_type;
 
       r_type = ELF32_R_TYPE (rel->r_info);
 
@@ -859,7 +859,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	  /* It seems this can happen with erroneous or unsupported input
 	     (mixing a.out and elf in an archive, for example.)  */
 	  if (sym_hashes == NULL)
-	    return false;
+	    return FALSE;
 
 	  h = sym_hashes [r_symndx - symtab_hdr->sh_info];
 
@@ -934,7 +934,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		     symname,
 		     bfd_get_section_name (input_bfd, input_section));
 		  bfd_set_error (bfd_error_bad_value);
-		  return false;
+		  return FALSE;
 		}
 	    }
 	  else if (h->root.type == bfd_link_hash_undefweak)
@@ -951,7 +951,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		     input_section, rel->r_offset,
 		     (!info->shared || info->no_undefined
 		      || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1001,7 +1001,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		 do; this is probably an internal error.  But it is true
 		 that we didn't like that particular input.  */
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  /* Fall through.  */
 
@@ -1124,7 +1124,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		     bfd_get_section_name (input_bfd, input_section));
 
 		bfd_set_error (bfd_error_bad_value);
-		return false;
+		return FALSE;
 	      }
 	  }
 	  break;
@@ -1140,7 +1140,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		 symname,
 		 bfd_get_section_name (input_bfd, input_section));
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 
 	  /* This can happen if we get a link error with the input ELF
@@ -1154,7 +1154,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		 cris_elf_howto_table[r_type].name,
 		 bfd_get_section_name (input_bfd, input_section));
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 
 	  /* This relocation is like a PC-relative one, except the
@@ -1237,7 +1237,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      Elf_Internal_Rela outrel;
 	      bfd_byte *loc;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 
 	      /* When generating a shared object, these relocations
 		 are copied into the output file to be resolved at run
@@ -1252,7 +1252,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -1273,20 +1273,20 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			 name);
 
 		      bfd_set_error (bfd_error_bad_value);
-		      return false;
+		      return FALSE;
 		    }
 		}
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
 
@@ -1307,7 +1307,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		{
 		  if (r_type == R_CRIS_32)
 		    {
-		      relocate = true;
+		      relocate = TRUE;
 		      outrel.r_info = ELF32_R_INFO (0, R_CRIS_RELATIVE);
 		      outrel.r_addend = relocation + rel->r_addend;
 		    }
@@ -1329,7 +1329,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -1377,7 +1377,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    case bfd_reloc_undefined:
 	      r = info->callbacks->undefined_symbol
 		(info, symname, input_bfd, input_section, rel->r_offset,
-		 true);
+		 TRUE);
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -1402,17 +1402,17 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, symname, input_bfd, input_section, rel->r_offset);
 
 	  if (! r)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf_cris_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -1436,7 +1436,7 @@ elf_cris_finish_dynamic_symbol (output_bfd, info, h, sym)
 	= ((struct elf_cris_link_hash_entry *) h)->gotplt_offset;
       Elf_Internal_Rela rela;
       bfd_byte *loc;
-      boolean has_gotplt = gotplt_offset != 0;
+      bfd_boolean has_gotplt = gotplt_offset != 0;
 
       /* Get the index in the procedure linkage table which
 	 corresponds to this symbol.  This is the index of this symbol
@@ -1621,12 +1621,12 @@ elf_cris_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_cris_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -1746,7 +1746,7 @@ elf_cris_finish_dynamic_sections (output_bfd, info)
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -1754,11 +1754,11 @@ elf_cris_finish_dynamic_sections (output_bfd, info)
 
 static asection *
 cris_elf_gc_mark_hook (sec, info, rel, h, sym)
-     asection *                   sec;
-     struct bfd_link_info *       info ATTRIBUTE_UNUSED;
-     Elf_Internal_Rela *          rel;
-     struct elf_link_hash_entry * h;
-     Elf_Internal_Sym *           sym;
+     asection *sec;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     Elf_Internal_Rela *rel;
+     struct elf_link_hash_entry *h;
+     Elf_Internal_Sym *sym;
 {
   if (h != NULL)
     {
@@ -1791,12 +1791,12 @@ cris_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 cris_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *                     abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *    info ATTRIBUTE_UNUSED;
-     asection *                sec ATTRIBUTE_UNUSED;
-     const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     asection *sec ATTRIBUTE_UNUSED;
+     const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
@@ -1814,7 +1814,7 @@ cris_elf_gc_sweep_hook (abfd, info, sec, relocs)
 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj == NULL)
-    return true;
+    return TRUE;
 
   sgot = bfd_get_section_by_name (dynobj, ".got");
   srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
@@ -1892,7 +1892,7 @@ cris_elf_gc_sweep_hook (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Make sure we emit a GOT entry if the symbol was supposed to have a PLT
@@ -1902,7 +1902,7 @@ cris_elf_gc_sweep_hook (abfd, info, sec, relocs)
    or elf_cris_size_dynamic_sections if no dynamic sections will be
    created (we're only linking static objects).  */
 
-static boolean
+static bfd_boolean
 elf_cris_adjust_gotplt_to_got (h, p)
      struct elf_cris_link_hash_entry *h;
      PTR p;
@@ -1917,7 +1917,7 @@ elf_cris_adjust_gotplt_to_got (h, p)
 
   /* If nobody wanted a GOTPLT with this symbol, we're done.  */
   if (h->gotplt_refcount <= 0)
-    return true;
+    return TRUE;
 
   if (h->root.got.refcount > 0)
     {
@@ -1950,7 +1950,7 @@ elf_cris_adjust_gotplt_to_got (h, p)
       srelgot->_raw_size += sizeof (Elf32_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Try to fold PLT entries with GOT entries.  There are two cases when we
@@ -1971,7 +1971,7 @@ elf_cris_adjust_gotplt_to_got (h, p)
    version scripts.  The differing cases are handled by
    elf_cris_hide_symbol.  */
 
-static boolean
+static bfd_boolean
 elf_cris_try_fold_plt_to_got (h, p)
      struct elf_cris_link_hash_entry *h;
      PTR p;
@@ -1982,7 +1982,7 @@ elf_cris_try_fold_plt_to_got (h, p)
      other reference so there's nothing to do.  Likewise if there are no
      PLT references; GOTPLT references included.  */
   if (h->root.got.refcount <= 0 || h->root.plt.refcount <= 0)
-    return true;
+    return TRUE;
 
   /* GOTPLT relocs are supposed to be included into the PLT refcount.  */
   BFD_ASSERT (h->gotplt_refcount <= h->root.plt.refcount);
@@ -1992,13 +1992,13 @@ elf_cris_try_fold_plt_to_got (h, p)
       /* The only PLT references are GOTPLT references, and there are GOT
 	 references.  Convert PLT to GOT references.  */
       if (! elf_cris_adjust_gotplt_to_got (h, info))
-	return false;
+	return FALSE;
 
       /* Clear the PLT references, so no PLT will be created.  */
       h->root.plt.offset = (bfd_vma) -1;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Our own version of hide_symbol, so that we can adjust a GOTPLT reloc
@@ -2009,7 +2009,7 @@ static void
 elf_cris_hide_symbol (info, h, force_local)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
-     boolean force_local;
+     bfd_boolean force_local;
 {
   elf_cris_adjust_gotplt_to_got ((struct elf_cris_link_hash_entry *) h, info);
 
@@ -2022,7 +2022,7 @@ elf_cris_hide_symbol (info, h, force_local)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf_cris_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -2077,21 +2077,21 @@ elf_cris_adjust_dynamic_symbol (info, h)
 	 PLT entry, get rid of the PLT.  */
       if (! elf_cris_try_fold_plt_to_got ((struct elf_cris_link_hash_entry *)
 					  h, info))
-	return false;
+	return FALSE;
 
       /* GC or folding may have rendered this entry unused.  */
       if (h->plt.refcount <= 0)
 	{
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	  h->plt.offset = (bfd_vma) -1;
-	  return true;
+	  return TRUE;
 	}
 
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = bfd_get_section_by_name (dynobj, ".plt");
@@ -2135,7 +2135,7 @@ elf_cris_adjust_dynamic_symbol (info, h)
 	  /* Make room for this entry.  */
 	  s->_raw_size += PLT_ENTRY_SIZE;
 
-	  return true;
+	  return TRUE;
 	}
 
       /* No GOT reference for this symbol; prepare for an ordinary PLT.  */
@@ -2160,7 +2160,7 @@ elf_cris_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf32_External_Rela);
 
-      return true;
+      return TRUE;
     }
 
   /* Reinitialize the plt offset now that it is not used as a reference
@@ -2176,7 +2176,7 @@ elf_cris_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -2187,12 +2187,12 @@ elf_cris_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -2236,7 +2236,7 @@ elf_cris_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (!bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -2246,12 +2246,12 @@ elf_cris_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.  */
 
-static boolean
+static bfd_boolean
 cris_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2269,7 +2269,7 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -2317,7 +2317,7 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
 	      /* Create the .got section, so we can assume it's always
 		 present whenever there's a dynobj.  */
 	      if (!_bfd_elf_create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	    }
 	  break;
 
@@ -2356,7 +2356,7 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
 						  | SEC_LINKER_CREATED
 						  | SEC_READONLY))
 		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 	  /* Fall through.  */
@@ -2377,7 +2377,7 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
 	      amt *= sizeof (bfd_signed_vma);
 	      local_got_refcounts = ((bfd_signed_vma *) bfd_zalloc (abfd, amt));
 	      if (local_got_refcounts == NULL)
-		return false;
+		return FALSE;
 
 	      local_got_refcounts++;
 	      elf_local_got_refcounts (abfd) = local_got_refcounts;
@@ -2415,7 +2415,7 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
 		  if (h->dynindx == -1)
 		    {
 		      if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-			return false;
+			return FALSE;
 		    }
 
 		  /* Allocate space in the .got section.  */
@@ -2566,7 +2566,7 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
 		       elf_elfheader (abfd)->e_shstrndx,
 		       elf_section_data (sec)->rel_hdr.sh_name));
 	      if (name == NULL)
-		return false;
+		return FALSE;
 
 	      BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			  && strcmp (bfd_get_section_name (abfd, sec),
@@ -2585,7 +2585,7 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
 						  | SEC_LINKER_CREATED
 						  | SEC_READONLY))
 		      || !bfd_set_section_alignment (dynobj, sreloc, 2))
-		    return false;
+		    return FALSE;
 		}
 	      if (sec->flags & SEC_READONLY)
 		info->flags |= DF_TEXTREL;
@@ -2617,7 +2617,7 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
 		  p = ((struct elf_cris_pcrel_relocs_copied *)
 		       bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = eh->pcrel_relocs_copied;
 		  eh->pcrel_relocs_copied = p;
 		  p->section = sreloc;
@@ -2632,37 +2632,37 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_CRIS_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_CRIS_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
 
 	default:
 	  /* Other relocs do not appear here.  */
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_cris_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean plt;
-  boolean relocs;
+  bfd_boolean plt;
+  bfd_boolean relocs;
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
@@ -2714,12 +2714,12 @@ elf_cris_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  plt = false;
-  relocs = false;
+  plt = FALSE;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -2728,7 +2728,7 @@ elf_cris_size_dynamic_sections (output_bfd, info)
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
-      strip = false;
+      strip = FALSE;
 
       if (strcmp (name, ".plt") == 0)
 	{
@@ -2736,12 +2736,12 @@ elf_cris_size_dynamic_sections (output_bfd, info)
 	    {
 	      /* Strip this section if we don't need it; see the
                  comment below.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      plt = TRUE;
 	    }
 	}
       else if (strncmp (name, ".rela", 5) == 0)
@@ -2757,14 +2757,14 @@ elf_cris_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there are any reloc sections other
                  than .rela.plt.  */
 	      if (strcmp (name, ".rela.plt") != 0)
-		  relocs = true;
+		  relocs = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -2790,7 +2790,7 @@ elf_cris_size_dynamic_sections (output_bfd, info)
 	 this will make entries have the type R_CRIS_NONE.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -2806,7 +2806,7 @@ elf_cris_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (plt)
@@ -2815,7 +2815,7 @@ elf_cris_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -2823,19 +2823,19 @@ elf_cris_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	    return false;
+	    return FALSE;
 	}
 
       if ((info->flags & DF_TEXTREL) != 0)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	  info->flags |= DF_TEXTREL;
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via elf_cris_link_hash_traverse if we are
@@ -2847,7 +2847,7 @@ elf_cris_size_dynamic_sections (output_bfd, info)
    check_relocs routine, but we won't fill them in in the
    relocate_section routine.  */
 
-static boolean
+static bfd_boolean
 elf_cris_discard_excess_dso_dynamics (h, inf)
      struct elf_cris_link_hash_entry *h;
      PTR inf;
@@ -2869,14 +2869,14 @@ elf_cris_discard_excess_dso_dynamics (h, inf)
 	s->section->_raw_size -= s->count * sizeof (Elf32_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via elf_cris_link_hash_traverse if we are *not*
    creating a shared object.  We discard space for relocs for symbols put
    in the .got, but which we found we do not have to resolve at run-time.  */
 
-static boolean
+static bfd_boolean
 elf_cris_discard_excess_program_dynamics (h, inf)
      struct elf_cris_link_hash_entry *h;
      PTR inf;
@@ -2924,13 +2924,13 @@ elf_cris_discard_excess_program_dynamics (h, inf)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Reject a file depending on presence and expectation of prefixed
    underscores on symbols.  */
 
-static boolean
+static bfd_boolean
 cris_elf_object_p (abfd)
      bfd *abfd;
 {
@@ -2945,7 +2945,7 @@ cris_elf_object_p (abfd)
 static void
 cris_elf_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   if (bfd_get_symbol_leading_char (abfd) == '_')
     elf_elfheader (abfd)->e_flags |= EF_CRIS_UNDERSCORE;
@@ -2955,7 +2955,7 @@ cris_elf_final_write_processing (abfd, linker)
 
 /* Display the flags field.  */
 
-static boolean
+static bfd_boolean
 cris_elf_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -2972,12 +2972,12 @@ cris_elf_print_private_bfd_data (abfd, ptr)
     fprintf (file, _(" [symbols have a _ prefix]"));
 
   fputc ('\n', file);
-  return true;
+  return TRUE;
 }
 
 /* Don't mix files with and without a leading underscore.  */
 
-static boolean
+static bfd_boolean
 cris_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -2985,19 +2985,19 @@ cris_elf_merge_private_bfd_data (ibfd, obfd)
   flagword old_flags, new_flags;
 
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (! elf_flags_init (obfd))
     {
       /* This happens when ld starts out with a 'blank' output file.  */
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
 
       /* Set flags according to current bfd_target.  */
-      cris_elf_final_write_processing (obfd, false);
+      cris_elf_final_write_processing (obfd, FALSE);
     }
 
   old_flags = elf_elfheader (obfd)->e_flags;
@@ -3012,10 +3012,10 @@ cris_elf_merge_private_bfd_data (ibfd, obfd)
 	 : _("%s: uses non-prefixed symbols, but writing file with _-prefixed symbols"),
 	 bfd_archive_filename (ibfd));
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 
diff --git a/bfd/elf32-d10v.c b/bfd/elf32-d10v.c
index 43bd61dc31a..1d6912a0f4c 100644
--- a/bfd/elf32-d10v.c
+++ b/bfd/elf32-d10v.c
@@ -31,13 +31,13 @@ static void d10v_info_to_howto_rel
 static asection * elf32_d10v_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf32_d10v_gc_sweep_hook
+static bfd_boolean elf32_d10v_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf32_d10v_check_relocs
+static bfd_boolean elf32_d10v_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf32_d10v_relocate_section
+static bfd_boolean elf32_d10v_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
 	   bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *,
 	   asection **));
@@ -52,15 +52,15 @@ static reloc_howto_type elf_d10v_howto_table[] =
 	   0,			/* rightshift */
 	   2,			/* size (0 = byte, 1 = short, 2 = long) */
 	   32,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont, /* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_D10V_NONE",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0,			/* src_mask */
 	   0,			/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     /* An PC Relative 10-bit relocation, shifted by 2  */
     /* right container */
@@ -68,15 +68,15 @@ static reloc_howto_type elf_d10v_howto_table[] =
 	   2,	                /* rightshift */
 	   2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	   7,	                /* bitsize */
-	   true,	        /* pc_relative */
+	   TRUE,	        /* pc_relative */
 	   0,	                /* bitpos */
 	   complain_overflow_bitfield, /* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_D10V_10_PCREL_R",	/* name */
-	   false,	        /* partial_inplace */
+	   FALSE,	        /* partial_inplace */
 	   0xff,		/* src_mask */
 	   0xff,   		/* dst_mask */
-	   true),		/* pcrel_offset */
+	   TRUE),		/* pcrel_offset */
 
     /* An PC Relative 10-bit relocation, shifted by 2  */
     /* left container */
@@ -84,105 +84,105 @@ static reloc_howto_type elf_d10v_howto_table[] =
 	   2,	                /* rightshift */
 	   2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	   7,	                /* bitsize */
-	   true,	        /* pc_relative */
+	   TRUE,	        /* pc_relative */
 	   15,	                /* bitpos */
 	   complain_overflow_bitfield, /* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_D10V_10_PCREL_L",	/* name */
-	   false,	        /* partial_inplace */
+	   FALSE,	        /* partial_inplace */
 	   0x07f8000,		/* src_mask */
 	   0x07f8000,   	/* dst_mask */
-	   true),		/* pcrel_offset */
+	   TRUE),		/* pcrel_offset */
 
     /* A 16 bit absolute relocation */
     HOWTO (R_D10V_16,		/* type */
 	   0,			/* rightshift */
 	   1,			/* size (0 = byte, 1 = short, 2 = long) */
 	   16,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont, /* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_D10V_16",		/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0xffff,		/* src_mask */
 	   0xffff,		/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     /* An 18 bit absolute relocation, right shifted 2 */
     HOWTO (R_D10V_18,		/* type */
 	   2,			/* rightshift */
 	   1,			/* size (0 = byte, 1 = short, 2 = long) */
 	   16,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont, /* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_D10V_18",		/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0xffff,		/* src_mask */
 	   0xffff,		/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     /* A relative 18 bit relocation, right shifted by 2  */
     HOWTO (R_D10V_18_PCREL,	/* type */
 	   2,			/* rightshift */
 	   2,			/* size (0 = byte, 1 = short, 2 = long) */
 	   15,			/* bitsize */
-	   true,		/* pc_relative */
+	   TRUE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_bitfield, /* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_D10V_18_PCREL",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0xffff,		/* src_mask */
 	   0xffff,		/* dst_mask */
-	   true),			/* pcrel_offset */
+	   TRUE),			/* pcrel_offset */
 
     /* A 32 bit absolute relocation */
     HOWTO (R_D10V_32,		/* type */
 	   0,			/* rightshift */
 	   2,			/* size (0 = byte, 1 = short, 2 = long) */
 	   32,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont, /* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_D10V_32",		/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0xffffffff,		/* src_mask */
 	   0xffffffff,		/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     /* GNU extension to record C++ vtable hierarchy */
     HOWTO (R_D10V_GNU_VTINHERIT, /* type */
 	   0,                     /* rightshift */
 	   2,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   0,                     /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont, /* complain_on_overflow */
 	   NULL,                  /* special_function */
 	   "R_D10V_GNU_VTINHERIT", /* name */
-	   false,                 /* partial_inplace */
+	   FALSE,                 /* partial_inplace */
 	   0,                     /* src_mask */
 	   0,                     /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* GNU extension to record C++ vtable member usage */
     HOWTO (R_D10V_GNU_VTENTRY,     /* type */
 	   0,                     /* rightshift */
 	   2,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   0,                     /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont, /* complain_on_overflow */
 	   _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
 	   "R_D10V_GNU_VTENTRY",   /* name */
-	   false,                 /* partial_inplace */
+	   FALSE,                 /* partial_inplace */
 	   0,                     /* src_mask */
 	   0,                     /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
   };
 
 /* Map BFD reloc types to D10V ELF reloc types.  */
@@ -276,7 +276,7 @@ elf32_d10v_gc_mark_hook (sec, info, rel, h, sym)
   return NULL;
 }
 
-static boolean
+static bfd_boolean
 elf32_d10v_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -284,14 +284,14 @@ elf32_d10v_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* we don't use got and plt entries for d10v */
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 elf32_d10v_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -304,7 +304,7 @@ elf32_d10v_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -330,23 +330,23 @@ elf32_d10v_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_D10V_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_D10V_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate a D10V ELF section.  */
-static boolean
+static bfd_boolean
 elf32_d10v_relocate_section (output_bfd, info, input_bfd, input_section,
 			    contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -437,8 +437,8 @@ elf32_d10v_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (!((*info->callbacks->undefined_symbol)
 		    (info, h->root.root.string, input_bfd,
-		     input_section, rel->r_offset, true)))
-		return false;
+		     input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -467,14 +467,14 @@ elf32_d10v_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->reloc_overflow)
 		    (info, name, howto->name, (bfd_vma) 0,
 		     input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_undefined:
 	      if (!((*info->callbacks->undefined_symbol)
 		    (info, name, input_bfd, input_section,
-		     rel->r_offset, true)))
-		return false;
+		     rel->r_offset, TRUE)))
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -497,13 +497,13 @@ elf32_d10v_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->warning)
 		    (info, msg, name, input_bfd, input_section,
 		     rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 #define ELF_ARCH		bfd_arch_d10v
 #define ELF_MACHINE_CODE	EM_D10V
diff --git a/bfd/elf32-d30v.c b/bfd/elf32-d30v.c
index 8f281c67b1f..4b184d63554 100644
--- a/bfd/elf32-d30v.c
+++ b/bfd/elf32-d30v.c
@@ -55,195 +55,195 @@ static reloc_howto_type elf_d30v_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_D30V_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 6 bit absolute relocation */
   HOWTO (R_D30V_6,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_D30V_6",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x3f,			/* src_mask */
 	 0x3f,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A relative 9 bit relocation, right shifted by 3 */
   HOWTO (R_D30V_9_PCREL,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_d30v_reloc_21,	/* special_function */
 	 "R_D30V_9_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x3f,			/* src_mask */
 	 0x3f,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 9 bit relocation, right shifted by 3 */
   HOWTO (R_D30V_9_PCREL_R,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_d30v_reloc_21,	/* special_function */
 	 "R_D30V_9_PCREL_R",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x3f,			/* src_mask */
 	 0x3f,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* An absolute 15 bit relocation, right shifted by 3 */
   HOWTO (R_D30V_15,		/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_D30V_15",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfff,			/* src_mask */
 	 0xfff,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A relative 15 bit relocation, right shifted by 3 */
   HOWTO (R_D30V_15_PCREL,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_d30v_reloc_21,	/* special_function */
 	 "R_D30V_15_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfff,			/* src_mask */
 	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 15 bit relocation, right shifted by 3 */
   HOWTO (R_D30V_15_PCREL_R,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_d30v_reloc_21,	/* special_function */
 	 "R_D30V_15_PCREL_R",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfff,			/* src_mask */
 	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* An absolute 21 bit relocation, right shifted by 3 */
   HOWTO (R_D30V_21,		/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 18,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_D30V_21",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x3ffff,		/* src_mask */
 	 0x3ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A relative 21 bit relocation, right shifted by 3 */
   HOWTO (R_D30V_21_PCREL,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 18,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_d30v_reloc_21,	/* special_function */
 	 "R_D30V_21_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x3ffff,		/* src_mask */
 	 0x3ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 21 bit relocation, right shifted by 3, in the Right container */
   HOWTO (R_D30V_21_PCREL_R,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 18,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_d30v_reloc_21,	/* special_function */
 	 "R_D30V_21_PCREL_R",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x3ffff,		/* src_mask */
 	 0x3ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A D30V 32 bit absolute relocation */
   HOWTO (R_D30V_32,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_d30v_reloc,	/* special_function */
 	 "R_D30V_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A relative 32 bit relocation */
   HOWTO (R_D30V_32_PCREL,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_d30v_reloc,	/* special_function */
 	 "R_D30V_32_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A regular 32 bit absolute relocation */
   HOWTO (R_D30V_32_NORMAL,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_32_NORMAL",		/* name */
-	 false,			/* partial_inplace */
+	 "R_D30V_32_NORMAL",	/* name */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 };
 
diff --git a/bfd/elf32-dlx.c b/bfd/elf32-dlx.c
index 64dd04ecab0..a1f7d0d48f1 100644
--- a/bfd/elf32-dlx.c
+++ b/bfd/elf32-dlx.c
@@ -25,8 +25,9 @@
 
 int    set_dlx_skip_hi16_flag PARAMS ((int));
 
-static boolean elf32_dlx_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
+static bfd_boolean elf32_dlx_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
 static void elf32_dlx_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void elf32_dlx_info_to_howto_rel
@@ -57,45 +58,45 @@ static reloc_howto_type dlx_elf_howto_table[]=
 	   0,                     /* rightshift */
 	   0,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   0,                     /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_NONE",          /* name */
-	   false,                 /* partial_inplace */
+	   FALSE,                 /* partial_inplace */
 	   0,                     /* src_mask */
 	   0,                     /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* 8 bit relocation.  */
     HOWTO (R_DLX_RELOC_8,         /* type */
 	   0,                     /* rightshift */
 	   0,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   8,                     /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_RELOC_8",       /* name */
-	   true,                  /* partial_inplace */
+	   TRUE,                  /* partial_inplace */
 	   0xff,                  /* src_mask */
 	   0xff,                  /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* 16 bit relocation.  */
     HOWTO (R_DLX_RELOC_16,        /* type */
 	   0,                     /* rightshift */
 	   1,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   16,                    /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_RELOC_16",      /* name */
-	   true,                  /* partial_inplace */
+	   TRUE,                  /* partial_inplace */
 	   0xffff,                /* src_mask */
 	   0xffff,                /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
 #if 0
     /* 26 bit jump address.  */
@@ -103,17 +104,17 @@ static reloc_howto_type dlx_elf_howto_table[]=
 	   0,                     /* rightshift */
 	   2,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   26,                    /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   /* This needs complex overflow detection, because the upper four
 	      bits must match the PC + 4.  */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_RELOC_26",      /* name */
-	   true,                  /* partial_inplace */
+	   TRUE,                  /* partial_inplace */
 	   0x3ffffff,             /* src_mask */
 	   0x3ffffff,             /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 #endif
 
     /* 32 bit relocation.  */
@@ -121,45 +122,45 @@ static reloc_howto_type dlx_elf_howto_table[]=
 	   0,                     /* rightshift */
 	   2,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   32,                    /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_RELOC_32",      /* name */
-	   true,                  /* partial_inplace */
+	   TRUE,                  /* partial_inplace */
 	   0xffffffff,            /* src_mask */
 	   0xffffffff,            /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* GNU extension to record C++ vtable hierarchy */
     HOWTO (R_DLX_GNU_VTINHERIT,   /* type */
 	   0,			  /* rightshift */
 	   2,			  /* size (0 = byte, 1 = short, 2 = long) */
 	   0,			  /* bitsize */
-	   false,		  /* pc_relative */
+	   FALSE,		  /* pc_relative */
 	   0,			  /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   NULL,		  /* special_function */
 	   "R_DLX_GNU_VTINHERIT", /* name */
-	   false,		  /* partial_inplace */
+	   FALSE,		  /* partial_inplace */
 	   0,			  /* src_mask */
 	   0,			  /* dst_mask */
-	   false),		  /* pcrel_offset */
+	   FALSE),		  /* pcrel_offset */
 
     /* GNU extension to record C++ vtable member usage */
     HOWTO (R_DLX_GNU_VTENTRY,     /* type */
 	   0,			  /* rightshift */
 	   2,			  /* size (0 = byte, 1 = short, 2 = long) */
 	   0,			  /* bitsize */
-	   false,		  /* pc_relative */
+	   FALSE,		  /* pc_relative */
 	   0,			  /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   _bfd_elf_rel_vtable_reloc_fn,/* special_function */
 	   "R_DLX_GNU_VTENTRY",	  /* name */
-	   false,		  /* partial_inplace */
+	   FALSE,		  /* partial_inplace */
 	   0,			  /* src_mask */
 	   0,			  /* dst_mask */
-	   false)		  /* pcrel_offset */
+	   FALSE)		  /* pcrel_offset */
   };
 
 /* 16 bit offset for pc-relative branches.  */
@@ -168,15 +169,15 @@ HOWTO (R_DLX_RELOC_16_PCREL,  /* type */
        0,                     /* rightshift */
        1,                     /* size (0 = byte, 1 = short, 2 = long) */
        16,                    /* bitsize */
-       true,                  /* pc_relative */
+       TRUE,                  /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_signed, /* complain_on_overflow */
        elf32_dlx_relocate16,  /* special_function */
        "R_DLX_RELOC_16_PCREL",/* name */
-       true,                  /* partial_inplace */
+       TRUE,                  /* partial_inplace */
        0xffff,                /* src_mask */
        0xffff,                /* dst_mask */
-       true);                 /* pcrel_offset */
+       TRUE);                 /* pcrel_offset */
 
 /* 26 bit offset for pc-relative branches.  */
 static reloc_howto_type elf_dlx_gnu_rel26_s2 =
@@ -184,15 +185,15 @@ HOWTO (R_DLX_RELOC_26_PCREL,  /* type */
        0,                     /* rightshift */
        2,                     /* size (0 = byte, 1 = short, 2 = long) */
        26,                    /* bitsize */
-       true,                  /* pc_relative */
+       TRUE,                  /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_dont,/* complain_on_overflow */
        elf32_dlx_relocate26,  /* special_function */
        "R_DLX_RELOC_26_PCREL",/* name */
-       true,                  /* partial_inplace */
+       TRUE,                  /* partial_inplace */
        0xffff,                /* src_mask */
        0xffff,                /* dst_mask */
-       true);                 /* pcrel_offset */
+       TRUE);                 /* pcrel_offset */
 
 /* High 16 bits of symbol value.  */
 static reloc_howto_type elf_dlx_reloc_16_hi =
@@ -200,15 +201,15 @@ HOWTO (R_DLX_RELOC_16_HI,     /* type */
        16,                    /* rightshift */
        2,                     /* size (0 = byte, 1 = short, 2 = long) */
        32,                    /* bitsize */
-       false,                 /* pc_relative */
+       FALSE,                 /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_dont, /* complain_on_overflow */
        _bfd_dlx_elf_hi16_reloc,/* special_function */
        "R_DLX_RELOC_16_HI",   /* name */
-       true,                  /* partial_inplace */
+       TRUE,                  /* partial_inplace */
        0xFFFF,                /* src_mask */
        0xffff,                /* dst_mask */
-       false);                /* pcrel_offset */
+       FALSE);                /* pcrel_offset */
 
   /* Low 16 bits of symbol value.  */
 static reloc_howto_type elf_dlx_reloc_16_lo =
@@ -216,15 +217,15 @@ HOWTO (R_DLX_RELOC_16_LO,     /* type */
        0,                     /* rightshift */
        1,                     /* size (0 = byte, 1 = short, 2 = long) */
        16,                    /* bitsize */
-       false,                 /* pc_relative */
+       FALSE,                 /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_dont,/* complain_on_overflow */
        bfd_elf_generic_reloc, /* special_function */
        "R_DLX_RELOC_16_LO",   /* name */
-       true,                  /* partial_inplace */
+       TRUE,                  /* partial_inplace */
        0xffff,                /* src_mask */
        0xffff,                /* dst_mask */
-       false);                /* pcrel_offset */
+       FALSE);                /* pcrel_offset */
 
 
 /* The gas default beheaver is not to preform the %hi modifier so that the
@@ -519,7 +520,7 @@ static const struct elf_reloc_map dlx_reloc_map[] =
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 elf32_dlx_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -532,7 +533,7 @@ elf32_dlx_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -558,19 +559,19 @@ elf32_dlx_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_DLX_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_DLX_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Given a BFD reloc type, return a howto structure.  */
diff --git a/bfd/elf32-fr30.c b/bfd/elf32-fr30.c
index ec219cd3e6d..2311316498e 100644
--- a/bfd/elf32-fr30.c
+++ b/bfd/elf32-fr30.c
@@ -32,19 +32,19 @@ static reloc_howto_type * fr30_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 static void fr30_info_to_howto_rela
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean fr30_elf_relocate_section
+static bfd_boolean fr30_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 static bfd_reloc_status_type fr30_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, bfd_vma));
-static boolean fr30_elf_gc_sweep_hook
+static bfd_boolean fr30_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection * fr30_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean fr30_elf_check_relocs
+static bfd_boolean fr30_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
@@ -55,194 +55,194 @@ static reloc_howto_type fr30_elf_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FR30_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 8 bit absolute relocation.  */
   HOWTO (R_FR30_8,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 4,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FR30_8",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x0ff0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 20 bit absolute relocation.  */
   HOWTO (R_FR30_20,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 20,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 fr30_elf_i20_reloc,	/* special_function */
 	 "R_FR30_20",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x00f0ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  */
   HOWTO (R_FR30_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FR30_32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit into 48 bits absolute relocation.  */
   HOWTO (R_FR30_48,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 fr30_elf_i32_reloc,	/* special_function */
 	 "R_FR30_48",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 6 bit absolute relocation.  */
   HOWTO (R_FR30_6_IN_4,		/* type */
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 4,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FR30_6_IN_4",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x00f0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 8 bit absolute relocation.  */
   HOWTO (R_FR30_8_IN_8,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 4,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,/* special_function */
 	 "R_FR30_8_IN_8",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x0ff0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 9 bit absolute relocation.  */
   HOWTO (R_FR30_9_IN_8,		/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 9,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 4,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,/* special_function */
 	 "R_FR30_9_IN_8",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x0ff0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 10 bit absolute relocation.  */
   HOWTO (R_FR30_10_IN_8,	/* type */
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 10,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 4,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,/* special_function */
 	 "R_FR30_10_IN_8",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x0ff0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A PC relative 9 bit relocation, right shifted by 1.  */
   HOWTO (R_FR30_9_PCREL,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 9,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_FR30_9_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A PC relative 12 bit relocation, right shifted by 1.  */
   HOWTO (R_FR30_12_PCREL,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_FR30_12_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x07ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_FR30_GNU_VTINHERIT, /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_FR30_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_FR30_GNU_VTENTRY,     /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_FR30_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 };
 
 /* Utility to actually perform an R_FR30_20 reloc.  */
@@ -250,15 +250,15 @@ static reloc_howto_type fr30_elf_howto_table [] =
 static bfd_reloc_status_type
 fr30_elf_i20_reloc (abfd, reloc_entry, symbol, data,
 		    input_section, output_bfd, error_message)
-     bfd *      abfd;
-     arelent *  reloc_entry;
-     asymbol *  symbol;
-     PTR        data;
-     asection * input_section;
-     bfd *      output_bfd;
-     char **    error_message ATTRIBUTE_UNUSED;
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
 {
-  bfd_vma       relocation;
+  bfd_vma relocation;
   unsigned long x;
 
   /* This part is from bfd_elf_generic_reloc.  */
@@ -296,15 +296,15 @@ fr30_elf_i20_reloc (abfd, reloc_entry, symbol, data,
 static bfd_reloc_status_type
 fr30_elf_i32_reloc (abfd, reloc_entry, symbol, data,
 		    input_section, output_bfd, error_message)
-     bfd *      abfd;
-     arelent *  reloc_entry;
-     asymbol *  symbol;
-     PTR        data;
-     asection * input_section;
-     bfd *      output_bfd;
-     char **    error_message ATTRIBUTE_UNUSED;
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
 {
-  bfd_vma       relocation;
+  bfd_vma relocation;
 
   /* This part is from bfd_elf_generic_reloc.  */
   if (output_bfd != (bfd *) NULL
@@ -358,7 +358,7 @@ static const struct fr30_reloc_map fr30_reloc_map [] =
 
 static reloc_howto_type *
 fr30_reloc_type_lookup (abfd, code)
-     bfd * abfd ATTRIBUTE_UNUSED;
+     bfd *abfd ATTRIBUTE_UNUSED;
      bfd_reloc_code_real_type code;
 {
   unsigned int i;
@@ -375,9 +375,9 @@ fr30_reloc_type_lookup (abfd, code)
 
 static void
 fr30_info_to_howto_rela (abfd, cache_ptr, dst)
-     bfd * abfd ATTRIBUTE_UNUSED;
-     arelent * cache_ptr;
-     Elf_Internal_Rela * dst;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
 {
   unsigned int r_type;
 
@@ -390,17 +390,18 @@ fr30_info_to_howto_rela (abfd, cache_ptr, dst)
    routines, but a few relocs, we have to do them ourselves.  */
 
 static bfd_reloc_status_type
-fr30_final_link_relocate (howto, input_bfd, input_section, contents, rel, relocation)
-     reloc_howto_type *  howto;
-     bfd *               input_bfd;
-     asection *          input_section;
-     bfd_byte *          contents;
-     Elf_Internal_Rela * rel;
-     bfd_vma             relocation;
+fr30_final_link_relocate (howto, input_bfd, input_section, contents, rel,
+			  relocation)
+     reloc_howto_type *howto;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *rel;
+     bfd_vma relocation;
 {
   bfd_reloc_status_type r = bfd_reloc_ok;
-  bfd_vma               x;
-  bfd_signed_vma	srel;
+  bfd_vma x;
+  bfd_signed_vma srel;
 
   switch (howto->type)
     {
@@ -497,25 +498,25 @@ fr30_final_link_relocate (howto, input_bfd, input_section, contents, rel, reloca
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
-     bfd *                   output_bfd;
-     struct bfd_link_info *  info;
-     bfd *                   input_bfd;
-     asection *              input_section;
-     bfd_byte *              contents;
-     Elf_Internal_Rela *     relocs;
-     Elf_Internal_Sym *      local_syms;
-     asection **             local_sections;
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
 {
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -523,15 +524,15 @@ fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
   for (rel = relocs; rel < relend; rel ++)
     {
-      reloc_howto_type *           howto;
-      unsigned long                r_symndx;
-      Elf_Internal_Sym *           sym;
-      asection *                   sec;
-      struct elf_link_hash_entry * h;
-      bfd_vma                      relocation;
-      bfd_reloc_status_type        r;
-      const char *                 name = NULL;
-      int                          r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name = NULL;
+      int r_type;
 
       r_type = ELF32_R_TYPE (rel->r_info);
 
@@ -598,8 +599,8 @@ fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 #if 0
 	      fprintf (stderr, "unknown: name: %s\n", name);
 #endif
@@ -625,7 +626,7 @@ fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    case bfd_reloc_undefined:
 	      r = info->callbacks->undefined_symbol
 		(info, name, input_bfd, input_section, rel->r_offset,
-		 true);
+		 TRUE);
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -650,11 +651,11 @@ fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, name, input_bfd, input_section, rel->r_offset);
 
 	  if (! r)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -662,11 +663,11 @@ fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 static asection *
 fr30_elf_gc_mark_hook (sec, info, rel, h, sym)
-     asection *                   sec;
-     struct bfd_link_info *       info ATTRIBUTE_UNUSED;
-     Elf_Internal_Rela *          rel;
-     struct elf_link_hash_entry * h;
-     Elf_Internal_Sym *           sym;
+     asection *sec;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     Elf_Internal_Rela *rel;
+     struct elf_link_hash_entry *h;
+     Elf_Internal_Sym * sym;
 {
   if (h != NULL)
     {
@@ -699,21 +700,21 @@ fr30_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 fr30_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *                     abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *    info ATTRIBUTE_UNUSED;
-     asection *                sec ATTRIBUTE_UNUSED;
-     const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     asection *sec ATTRIBUTE_UNUSED;
+     const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 fr30_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -726,7 +727,7 @@ fr30_elf_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -752,19 +753,19 @@ fr30_elf_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_FR30_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_FR30_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 #define ELF_ARCH		bfd_arch_fr30
diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
index 4cacf366f7e..08dae266d61 100644
--- a/bfd/elf32-frv.c
+++ b/bfd/elf32-frv.c
@@ -1,5 +1,5 @@
 /* FRV-specific support for 32-bit ELF.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,35 +31,51 @@ static bfd_reloc_status_type elf32_frv_relocate_hi16
 static bfd_reloc_status_type elf32_frv_relocate_label24
   PARAMS ((bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, bfd_vma));
 static bfd_reloc_status_type elf32_frv_relocate_gprel12
-  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, bfd_vma));
+  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *,
+	   bfd_byte *, bfd_vma));
 static bfd_reloc_status_type elf32_frv_relocate_gprelu12
-  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, bfd_vma));
+  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *,
+	   bfd_byte *, bfd_vma));
 static bfd_reloc_status_type elf32_frv_relocate_gprello
-  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, bfd_vma));
+  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *,
+	   bfd_byte *, bfd_vma));
 static bfd_reloc_status_type elf32_frv_relocate_gprelhi
-  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, bfd_vma));
+  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *,
+	   bfd_byte *, bfd_vma));
 static reloc_howto_type *frv_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void frv_info_to_howto_rela 
+static void frv_info_to_howto_rela
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf32_frv_relocate_section 
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf32_frv_add_symbol_hook
-  PARAMS (( bfd *, struct bfd_link_info *, const Elf_Internal_Sym *, const char **, flagword *, asection **, bfd_vma *));
+static bfd_boolean elf32_frv_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static bfd_boolean elf32_frv_add_symbol_hook
+  PARAMS (( bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
+	    const char **, flagword *, asection **, bfd_vma *));
 static bfd_reloc_status_type frv_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, bfd_vma));
-static boolean elf32_frv_gc_sweep_hook
-  PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
+  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, bfd_vma));
+static bfd_boolean elf32_frv_gc_sweep_hook
+  PARAMS ((bfd *, struct bfd_link_info *, asection *, const
+	   Elf_Internal_Rela *));
 static asection * elf32_frv_gc_mark_hook
-  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *, struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf32_frv_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
-static int elf32_frv_machine PARAMS ((bfd *));
-static boolean elf32_frv_object_p PARAMS ((bfd *));
-static boolean frv_elf_set_private_flags PARAMS ((bfd *, flagword));
-static boolean frv_elf_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-static boolean frv_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-static boolean frv_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
+  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
+static bfd_boolean elf32_frv_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+static int elf32_frv_machine
+  PARAMS ((bfd *));
+static bfd_boolean elf32_frv_object_p
+  PARAMS ((bfd *));
+static bfd_boolean frv_elf_set_private_flags
+  PARAMS ((bfd *, flagword));
+static bfd_boolean frv_elf_copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean frv_elf_merge_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean frv_elf_print_private_bfd_data
+  PARAMS ((bfd *, PTR));
 
 static reloc_howto_type elf32_frv_howto_table [] =
 {
@@ -68,158 +84,158 @@ static reloc_howto_type elf32_frv_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  */
   HOWTO (R_FRV_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit pc-relative relocation.  */
   HOWTO (R_FRV_LABEL16,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_LABEL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   /* A 24-bit pc-relative relocation.  */
   HOWTO (R_FRV_LABEL24,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_LABEL24",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x7e03ffff,		/* src_mask */
 	 0x7e03ffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_FRV_LO16,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_LO16",		/* name */
-	false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_FRV_HI16,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_HI16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_FRV_GPREL12,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_GPREL12",       /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfff,		        /* src_mask */
 	 0xfff,		        /* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_FRV_GPRELU12,        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_GPRELU12",      /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfff,		        /* src_mask */
 	 0x3f03f,	        /* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_FRV_GPREL32,         /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_GPREL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_FRV_GPRELHI,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_GPRELHI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		        /* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_FRV_GPRELLO,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_FRV_GPRELLO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		        /* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 };
 
 /* GNU extension to record C++ vtable hierarchy.  */
@@ -228,15 +244,15 @@ static reloc_howto_type elf32_frv_vtinherit_howto =
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_FRV_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false);                /* pcrel_offset */
+         FALSE);                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage.  */
 static reloc_howto_type elf32_frv_vtentry_howto =
@@ -244,15 +260,15 @@ static reloc_howto_type elf32_frv_vtentry_howto =
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_FRV_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false);                /* pcrel_offset */
+         FALSE);                /* pcrel_offset */
 
 /* Map BFD reloc types to FRV ELF reloc types.  */
 #if 0
@@ -283,7 +299,8 @@ static const struct frv_reloc_map frv_reloc_map [] =
 /* Handle an FRV small data reloc.  */
 
 static bfd_reloc_status_type
-elf32_frv_relocate_gprel12 (info, input_bfd, input_section, relocation, contents, value)
+elf32_frv_relocate_gprel12 (info, input_bfd, input_section, relocation,
+			    contents, value)
      struct bfd_link_info *info;
      bfd *input_bfd;
      asection *input_section;
@@ -295,7 +312,7 @@ elf32_frv_relocate_gprel12 (info, input_bfd, input_section, relocation, contents
   bfd_vma gp;
   struct bfd_link_hash_entry *h;
 
-  h = bfd_link_hash_lookup (info->hash, "_gp", false, false, true);
+  h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
 
   gp = (h->u.def.value
 	+ h->u.def.section->output_section->vma
@@ -321,7 +338,8 @@ elf32_frv_relocate_gprel12 (info, input_bfd, input_section, relocation, contents
 /* Handle an FRV small data reloc. for the u12 field.  */
 
 static bfd_reloc_status_type
-elf32_frv_relocate_gprelu12 (info, input_bfd, input_section, relocation, contents, value)
+elf32_frv_relocate_gprelu12 (info, input_bfd, input_section, relocation,
+			     contents, value)
      struct bfd_link_info *info;
      bfd *input_bfd;
      asection *input_section;
@@ -334,12 +352,12 @@ elf32_frv_relocate_gprelu12 (info, input_bfd, input_section, relocation, content
   struct bfd_link_hash_entry *h;
   bfd_vma mask;
 
-  h = bfd_link_hash_lookup (info->hash, "_gp", false, false, true);
+  h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
 
   gp = (h->u.def.value
 	+ h->u.def.section->output_section->vma
 	+ h->u.def.section->output_offset);
- 
+
   value -= input_section->output_section->vma;
   value -= (gp - input_section->output_section->vma);
 
@@ -423,7 +441,7 @@ elf32_frv_relocate_label24 (input_bfd, input_section, rello, contents, value)
 
   /* The format for the call instruction is:
 
-    0 000000 0001111 000000000000000000 
+    0 000000 0001111 000000000000000000
       label6 opcode  label18
 
     The branch calculation is: pc + (4*label24)
@@ -453,7 +471,8 @@ elf32_frv_relocate_label24 (input_bfd, input_section, rello, contents, value)
 }
 
 static bfd_reloc_status_type
-elf32_frv_relocate_gprelhi (info, input_bfd, input_section, relocation, contents, value)
+elf32_frv_relocate_gprelhi (info, input_bfd, input_section, relocation,
+			    contents, value)
      struct bfd_link_info *info;
      bfd *input_bfd;
      asection *input_section;
@@ -465,7 +484,7 @@ elf32_frv_relocate_gprelhi (info, input_bfd, input_section, relocation, contents
   bfd_vma gp;
   struct bfd_link_hash_entry *h;
 
-  h = bfd_link_hash_lookup (info->hash, "_gp", false, false, true);
+  h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
 
   gp = (h->u.def.value
         + h->u.def.section->output_section->vma
@@ -487,7 +506,8 @@ elf32_frv_relocate_gprelhi (info, input_bfd, input_section, relocation, contents
 }
 
 static bfd_reloc_status_type
-elf32_frv_relocate_gprello (info, input_bfd, input_section, relocation, contents, value)
+elf32_frv_relocate_gprello (info, input_bfd, input_section, relocation,
+			    contents, value)
      struct bfd_link_info *info;
      bfd *input_bfd;
      asection *input_section;
@@ -499,7 +519,7 @@ elf32_frv_relocate_gprello (info, input_bfd, input_section, relocation, contents
   bfd_vma gp;
   struct bfd_link_hash_entry *h;
 
-  h = bfd_link_hash_lookup (info->hash, "_gp", false, false, true);
+  h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
 
   gp = (h->u.def.value
         + h->u.def.section->output_section->vma
@@ -523,7 +543,7 @@ elf32_frv_relocate_gprello (info, input_bfd, input_section, relocation, contents
 
 static reloc_howto_type *
 frv_reloc_type_lookup (abfd, code)
-     bfd * abfd ATTRIBUTE_UNUSED;
+     bfd *abfd ATTRIBUTE_UNUSED;
      bfd_reloc_code_real_type code;
 {
   switch (code)
@@ -533,7 +553,7 @@ frv_reloc_type_lookup (abfd, code)
 
     case BFD_RELOC_NONE:
       return &elf32_frv_howto_table[ (int) R_FRV_NONE];
-  
+
     case BFD_RELOC_32:
     case BFD_RELOC_CTOR:
       return &elf32_frv_howto_table[ (int) R_FRV_32];
@@ -579,9 +599,9 @@ frv_reloc_type_lookup (abfd, code)
 
 static void
 frv_info_to_howto_rela (abfd, cache_ptr, dst)
-     bfd * abfd ATTRIBUTE_UNUSED;
-     arelent * cache_ptr;
-     Elf_Internal_Rela * dst;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
 {
   unsigned int r_type;
 
@@ -606,13 +626,14 @@ frv_info_to_howto_rela (abfd, cache_ptr, dst)
    routines, but a few relocs, we have to do them ourselves.  */
 
 static bfd_reloc_status_type
-frv_final_link_relocate (howto, input_bfd, input_section, contents, rel, relocation)
-     reloc_howto_type *  howto;
-     bfd *               input_bfd;
-     asection *          input_section;
-     bfd_byte *          contents;
-     Elf_Internal_Rela * rel;
-     bfd_vma             relocation;
+frv_final_link_relocate (howto, input_bfd, input_section, contents, rel,
+			 relocation)
+     reloc_howto_type *howto;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *rel;
+     bfd_vma relocation;
 {
   return _bfd_final_link_relocate (howto, input_bfd, input_section,
 				   contents, rel->r_offset, relocation,
@@ -650,25 +671,25 @@ frv_final_link_relocate (howto, input_bfd, input_section, contents, rel, relocat
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
 			    contents, relocs, local_syms, local_sections)
-     bfd *                   output_bfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *  info;
-     bfd *                   input_bfd;
-     asection *              input_section;
-     bfd_byte *              contents;
-     Elf_Internal_Rela *     relocs;
-     Elf_Internal_Sym *      local_syms;
-     asection **             local_sections;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
 {
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -676,29 +697,29 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
 
   for (rel = relocs; rel < relend; rel ++)
     {
-      reloc_howto_type *           howto;
-      unsigned long                r_symndx;
-      Elf_Internal_Sym *           sym;
-      asection *                   sec;
-      struct elf_link_hash_entry * h;
-      bfd_vma                      relocation;
-      bfd_reloc_status_type        r;
-      const char *                 name = NULL;
-      int                          r_type;
-      
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char * name = NULL;
+      int r_type;
+
       r_type = ELF32_R_TYPE (rel->r_info);
-      
+
       if (   r_type == R_FRV_GNU_VTINHERIT
 	  || r_type == R_FRV_GNU_VTENTRY)
 	continue;
-      
+
       /* This is a final link.  */
       r_symndx = ELF32_R_SYM (rel->r_info);
       howto  = elf32_frv_howto_table + ELF32_R_TYPE (rel->r_info);
       h      = NULL;
       sym    = NULL;
       sec    = NULL;
-      
+
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -706,7 +727,7 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
 	  relocation = (sec->output_section->vma
 			+ sec->output_offset
 			+ sym->st_value);
-	  
+
 	  name = bfd_elf_string_from_elf_section
 	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
 	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
@@ -714,13 +735,13 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
       else
 	{
 	  h = sym_hashes [r_symndx - symtab_hdr->sh_info];
-	  
+
 	  while (h->root.type == bfd_link_hash_indirect
 		 || h->root.type == bfd_link_hash_warning)
 	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
 	  name = h->root.root.string;
-	  
+
 	  if (h->root.type == bfd_link_hash_defined
 	      || h->root.type == bfd_link_hash_defweak)
 	    {
@@ -737,12 +758,12 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
-      
+
      if (r_type == R_FRV_HI16)
        r = elf32_frv_relocate_hi16 (input_bfd, rel, contents, relocation);
 
@@ -750,22 +771,28 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
        r = elf32_frv_relocate_lo16 (input_bfd, rel, contents, relocation);
 
      else if (r_type == R_FRV_LABEL24)
-       r = elf32_frv_relocate_label24 (input_bfd, input_section, rel, contents, relocation);
+       r = elf32_frv_relocate_label24 (input_bfd, input_section, rel,
+				       contents, relocation);
 
      else if (r_type == R_FRV_GPREL12)
-       r = elf32_frv_relocate_gprel12 (info, input_bfd, input_section, rel, contents, relocation);
+       r = elf32_frv_relocate_gprel12 (info, input_bfd, input_section, rel,
+				       contents, relocation);
 
      else if (r_type == R_FRV_GPRELU12)
-       r = elf32_frv_relocate_gprelu12 (info, input_bfd, input_section, rel, contents, relocation);
+       r = elf32_frv_relocate_gprelu12 (info, input_bfd, input_section, rel,
+					contents, relocation);
 
      else if (r_type == R_FRV_GPRELLO)
-       r = elf32_frv_relocate_gprello (info, input_bfd, input_section, rel, contents, relocation);
+       r = elf32_frv_relocate_gprello (info, input_bfd, input_section, rel,
+				       contents, relocation);
 
      else if (r_type == R_FRV_GPRELHI)
-       r = elf32_frv_relocate_gprelhi (info, input_bfd, input_section, rel, contents, relocation);
+       r = elf32_frv_relocate_gprelhi (info, input_bfd, input_section, rel,
+				       contents, relocation);
 
      else
-       r = frv_final_link_relocate (howto, input_bfd, input_section, contents, rel, relocation);
+       r = frv_final_link_relocate (howto, input_bfd, input_section, contents,
+				    rel, relocation);
 
       if (r != bfd_reloc_ok)
 	{
@@ -778,12 +805,12 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
 		(info, name, howto->name, (bfd_vma) 0,
 		 input_bfd, input_section, rel->r_offset);
 	      break;
-	      
+
 	    case bfd_reloc_undefined:
 	      r = info->callbacks->undefined_symbol
-		(info, name, input_bfd, input_section, rel->r_offset, true);
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
 	      break;
-	      
+
 	    case bfd_reloc_outofrange:
 	      msg = _("internal error: out of range error");
 	      break;
@@ -806,11 +833,11 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, name, input_bfd, input_section, rel->r_offset);
 
 	  if (! r)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -818,11 +845,11 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
 
 static asection *
 elf32_frv_gc_mark_hook (sec, info, rel, h, sym)
-     asection *                   sec;
-     struct bfd_link_info *       info ATTRIBUTE_UNUSED;
-     Elf_Internal_Rela *          rel;
-     struct elf_link_hash_entry * h;
-     Elf_Internal_Sym *           sym;
+     asection *sec;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     Elf_Internal_Rela *rel;
+     struct elf_link_hash_entry *h;
+     Elf_Internal_Sym *sym;
 {
   if (h != NULL)
     {
@@ -855,21 +882,21 @@ elf32_frv_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 elf32_frv_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *                     abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *    info ATTRIBUTE_UNUSED;
-     asection *                sec ATTRIBUTE_UNUSED;
-     const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     asection *sec ATTRIBUTE_UNUSED;
+     const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 
 /* Hook called by the linker routine which adds symbols from an object
    file.  We use it to put .comm items in .scomm, and not .comm.  */
 
-static boolean
+static bfd_boolean
 elf32_frv_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -895,20 +922,20 @@ elf32_frv_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	      || !bfd_set_section_flags (abfd, scomm, (SEC_ALLOC
 						       | SEC_IS_COMMON
 						       | SEC_LINKER_CREATED)))
-	    return false;
+	    return FALSE;
 	}
 
       *secp = scomm;
       *valp = sym->st_size;
     }
 
-  return true;
+  return TRUE;
 }
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
- 
-static boolean
+
+static bfd_boolean
 elf32_frv_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -919,47 +946,47 @@ elf32_frv_check_relocs (abfd, info, sec, relocs)
   struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
- 
+
   if (info->relocateable)
-    return true;
- 
+    return TRUE;
+
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
   sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
   if (!elf_bad_symtab (abfd))
     sym_hashes_end -= symtab_hdr->sh_info;
- 
+
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
     {
       struct elf_link_hash_entry *h;
       unsigned long r_symndx;
- 
+
       r_symndx = ELF32_R_SYM (rel->r_info);
       if (r_symndx < symtab_hdr->sh_info)
         h = NULL;
       else
         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
- 
+
       switch (ELF32_R_TYPE (rel->r_info))
         {
         /* This relocation describes the C++ object vtable hierarchy.
            Reconstruct it for later use during GC.  */
         case R_FRV_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
- 
+
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_FRV_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
         }
     }
- 
-  return true;
+
+  return TRUE;
 }
 
 
@@ -984,56 +1011,56 @@ elf32_frv_machine (abfd)
 
 /* Set the right machine number for a FRV ELF file.  */
 
-static boolean
+static bfd_boolean
 elf32_frv_object_p (abfd)
      bfd *abfd;
 {
   bfd_default_set_arch_mach (abfd, bfd_arch_frv, elf32_frv_machine (abfd));
-  return true;
+  return TRUE;
 }
 
 /* Function to set the ELF flag bits.  */
 
-static boolean
+static bfd_boolean
 frv_elf_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
 {
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Copy backend specific data from one object module to another.  */
 
-static boolean
+static bfd_boolean
 frv_elf_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   BFD_ASSERT (!elf_flags_init (obfd)
 	      || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
 
   elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  elf_flags_init (obfd) = true;
-  return true;
+  elf_flags_init (obfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-static boolean
+static bfd_boolean
 frv_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   flagword old_flags, old_partial;
   flagword new_flags, new_partial;
-  boolean error = false;
+  bfd_boolean error = FALSE;
   char new_opt[80];
   char old_opt[80];
 
@@ -1049,7 +1076,7 @@ frv_elf_merge_private_bfd_data (ibfd, obfd)
 
   if (!elf_flags_init (obfd))			/* First call, no flags set.  */
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       old_flags = new_flags;
     }
 
@@ -1191,7 +1218,7 @@ frv_elf_merge_private_bfd_data (ibfd, obfd)
 	    {
 	      old_flags &= ~ EF_FRV_PIC_FLAGS;
 #ifndef FRV_NO_PIC_ERROR
-	      error = true;
+	      error = TRUE;
 	      (*_bfd_error_handler)
 		(_("%s: compiled with %s and linked with modules that use non-pic relocations"),
 		 bfd_get_filename (ibfd),
@@ -1237,11 +1264,11 @@ frv_elf_merge_private_bfd_data (ibfd, obfd)
 	    case EF_FRV_CPU_TOMCAT:  strcat (old_opt, " -mcpu=tomcat"); break;
 	    }
 	}
-      
+
       /* Print out any mismatches from above.  */
       if (new_opt[0])
 	{
-	  error = true;
+	  error = TRUE;
 	  (*_bfd_error_handler)
 	    (_("%s: compiled with %s and linked with modules compiled with %s"),
 	     bfd_get_filename (ibfd), new_opt, old_opt);
@@ -1253,7 +1280,7 @@ frv_elf_merge_private_bfd_data (ibfd, obfd)
       if (new_partial != old_partial)
 	{
 	  old_flags |= new_partial;
-	  error = true;
+	  error = TRUE;
 	  (*_bfd_error_handler)
 	    (_("%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"),
 	     bfd_get_filename (ibfd), (long)new_partial, (long)old_partial);
@@ -1277,7 +1304,7 @@ frv_elf_merge_private_bfd_data (ibfd, obfd)
 }
 
 
-boolean
+bfd_boolean
 frv_elf_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -1347,7 +1374,7 @@ frv_elf_print_private_bfd_data (abfd, ptr)
     fprintf (file, " -G0");
 
   fputc ('\n', file);
-  return true;
+  return TRUE;
 }
 
 
diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c
index c5d192d30d2..b1ad74486f4 100644
--- a/bfd/elf32-gen.c
+++ b/bfd/elf32-gen.c
@@ -1,5 +1,6 @@
 /* Generic support for 32-bit ELF
-   Copyright 1993, 1995, 1998, 1999, 2001 Free Software Foundation, Inc.
+   Copyright 1993, 1995, 1998, 1999, 2001, 2002
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -30,21 +31,21 @@ static reloc_howto_type dummy =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "UNKNOWN",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 static void elf_generic_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void elf_generic_info_to_howto_rel
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf32_generic_link_add_symbols
+static bfd_boolean elf32_generic_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
 
 static void
@@ -65,7 +66,7 @@ elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
   bfd_reloc->howto = &dummy;
 }
 
-static boolean
+static bfd_boolean
 elf32_generic_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -84,7 +85,7 @@ elf32_generic_link_add_symbols (abfd, info)
 			       ehdrp->e_machine);
 
 	bfd_set_error (bfd_error_wrong_format);
-	return false;
+	return FALSE;
       }
 
   return bfd_elf32_bfd_link_add_symbols (abfd, info);
diff --git a/bfd/elf32-h8300.c b/bfd/elf32-h8300.c
index 4f9c3cf2768..09604e78567 100644
--- a/bfd/elf32-h8300.c
+++ b/bfd/elf32-h8300.c
@@ -33,25 +33,25 @@ static void elf32_h8_info_to_howto_rel
 static unsigned long elf32_h8_mach
   PARAMS ((flagword));
 static void elf32_h8_final_write_processing
-  PARAMS ((bfd *, boolean));
-static boolean elf32_h8_object_p
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean elf32_h8_object_p
   PARAMS ((bfd *));
-static boolean elf32_h8_merge_private_bfd_data
+static bfd_boolean elf32_h8_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean elf32_h8_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static boolean elf32_h8_relax_delete_bytes
+static bfd_boolean elf32_h8_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean elf32_h8_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, int));
-static boolean elf32_h8_symbol_address_p
+static bfd_boolean elf32_h8_symbol_address_p
   PARAMS ((bfd *, asection *, bfd_vma));
 static bfd_byte *elf32_h8_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
+	   bfd_byte *, bfd_boolean, asymbol **));
 static bfd_reloc_status_type elf32_h8_final_link_relocate
   PARAMS ((unsigned long, bfd *, bfd *, asection *,
 	   bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
 	   struct bfd_link_info *, asection *, int));
-static boolean elf32_h8_relocate_section
+static bfd_boolean elf32_h8_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
 	   bfd_byte *, Elf_Internal_Rela *,
 	   Elf_Internal_Sym *, asection **));
@@ -67,155 +67,155 @@ static reloc_howto_type h8_elf_howto_table[] = {
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_DIR32_X (R_H8_NONE_X + 1)
   HOWTO (R_H8_DIR32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_DIR32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_DIR16_X (R_H8_DIR32_X + 1)
   HOWTO (R_H8_DIR16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_DIR16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_DIR8_X (R_H8_DIR16_X + 1)
   HOWTO (R_H8_DIR8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_DIR16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x000000ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_DIR16A8_X (R_H8_DIR8_X + 1)
   HOWTO (R_H8_DIR16A8,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_DIR16A8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_DIR16R8_X (R_H8_DIR16A8_X + 1)
   HOWTO (R_H8_DIR16R8,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_DIR16R8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_DIR24A8_X (R_H8_DIR16R8_X + 1)
   HOWTO (R_H8_DIR24A8,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_DIR24A8",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff000000,		/* src_mask */
 	 0x00ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_DIR24R8_X (R_H8_DIR24A8_X + 1)
   HOWTO (R_H8_DIR24R8,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_DIR24R8",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff000000,		/* src_mask */
 	 0x00ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_DIR32A16_X (R_H8_DIR24R8_X + 1)
   HOWTO (R_H8_DIR32A16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_DIR32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 #define R_H8_PCREL16_X (R_H8_DIR32A16_X + 1)
   HOWTO (R_H8_PCREL16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_PCREL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 #define R_H8_PCREL8_X (R_H8_PCREL16_X + 1)
   HOWTO (R_H8_PCREL8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 special,			/* special_function */
 	 "R_H8_PCREL8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 };
 
 /* This structure is used to map BFD reloc codes to H8 ELF relocs.  */
@@ -410,7 +410,7 @@ elf32_h8_final_link_relocate (r_type, input_bfd, output_bfd,
 }
 
 /* Relocate an H8 ELF section.  */
-static boolean
+static bfd_boolean
 elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -427,7 +427,7 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *rel, *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -476,8 +476,8 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -514,14 +514,14 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_undefined:
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, name, input_bfd, input_section,
-		      rel->r_offset, true)))
-		return false;
+		      rel->r_offset, TRUE)))
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -544,13 +544,13 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->warning)
 		    (info, msg, name, input_bfd, input_section,
 		     rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Object files encode the specific H8 model they were compiled
@@ -583,7 +583,7 @@ elf32_h8_mach (flags)
 static void
 elf32_h8_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
 
@@ -610,37 +610,37 @@ elf32_h8_final_write_processing (abfd, linker)
 /* Return nonzero if ABFD represents a valid H8 ELF object file; also
    record the encoded machine type found in the ELF flags.  */
 
-static boolean
+static bfd_boolean
 elf32_h8_object_p (abfd)
      bfd *abfd;
 {
   bfd_default_set_arch_mach (abfd, bfd_arch_h8300,
 			     elf32_h8_mach (elf_elfheader (abfd)->e_flags));
-  return true;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  The only data we need to copy at this
    time is the architecture/machine information.  */
 
-static boolean
+static bfd_boolean
 elf32_h8_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
       && bfd_get_mach (obfd) < bfd_get_mach (ibfd))
     {
       if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
                                bfd_get_mach (ibfd)))
-        return false;
+        return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This function handles relaxing for the H8..
@@ -660,12 +660,12 @@ elf32_h8_merge_private_bfd_data (ibfd, obfd)
 
      mov.[bwl]:24/32 ->    mov.[bwl]:16           2 bytes */
 
-static boolean
+static bfd_boolean
 elf32_h8_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
@@ -676,7 +676,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
   static Elf_Internal_Rela *last_reloc = NULL;
 
   /* Assume nothing changes.  */
-  *again = false;
+  *again = FALSE;
 
   /* We don't have to do anything for a relocateable link, if
      this section does not have relocs, or if this is not a
@@ -685,7 +685,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0
       || (sec->flags & SEC_CODE) == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -840,7 +840,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
 
 		   Only perform this optimisation for jumps (code 0x5a) not
 		   subroutine calls, as otherwise it could transform:
-		   
+
 		   	             mov.w   r0,r0
 		   	             beq     .L1
 		         	     jsr     @_bar
@@ -905,7 +905,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
 							  4))
 			  goto error_return;
 
-			*again = true;
+			*again = TRUE;
 			break;
 		      }
 		  }
@@ -928,7 +928,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
 
 		/* That will change things, so, we should relax again.
 		   Note that this is not required, and it may be slow.  */
-		*again = true;
+		*again = TRUE;
 	      }
 	    break;
 	  }
@@ -991,7 +991,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
 
 		/* That will change things, so, we should relax again.
 		   Note that this is not required, and it may be slow.  */
-		*again = true;
+		*again = TRUE;
 	      }
 	    break;
 	  }
@@ -1049,7 +1049,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
 
 		/* That will change things, so, we should relax again.
 		   Note that this is not required, and it may be slow.  */
-		*again = true;
+		*again = TRUE;
 	      }
 	    break;
 	  }
@@ -1106,7 +1106,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
 
 		/* That will change things, so, we should relax again.
 		   Note that this is not required, and it may be slow.  */
-		*again = true;
+		*again = TRUE;
 	      }
 	  }
 
@@ -1147,7 +1147,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
 
 		/* That will change things, so, we should relax again.
 		   Note that this is not required, and it may be slow.  */
-		*again = true;
+		*again = TRUE;
 	      }
 	    break;
 	  }
@@ -1182,7 +1182,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL
@@ -1194,12 +1194,12 @@ elf32_h8_relax_section (abfd, sec, link_info, again)
   if (internal_relocs != NULL
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
-  return false;
+  return FALSE;
 }
 
 /* Delete some bytes from a section while relaxing.  */
 
-static boolean
+static bfd_boolean
 elf32_h8_relax_delete_bytes (abfd, sec, addr, count)
      bfd *abfd;
      asection *sec;
@@ -1275,12 +1275,12 @@ elf32_h8_relax_delete_bytes (abfd, sec, addr, count)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
-/* Return true if a symbol exists at the given address, else return
-   false.  */
-static boolean
+/* Return TRUE if a symbol exists at the given address, else return
+   FALSE.  */
+static bfd_boolean
 elf32_h8_symbol_address_p (abfd, sec, addr)
      bfd *abfd;
      asection *sec;
@@ -1304,7 +1304,7 @@ elf32_h8_symbol_address_p (abfd, sec, addr)
     {
       if (isym->st_shndx == sec_shndx
 	  && isym->st_value == addr)
-	return true;
+	return TRUE;
     }
 
   symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
@@ -1318,10 +1318,10 @@ elf32_h8_symbol_address_p (abfd, sec, addr)
 	   || sym_hash->root.type == bfd_link_hash_defweak)
 	  && sym_hash->root.u.def.section == sec
 	  && sym_hash->root.u.def.value == addr)
-	return true;
+	return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
 
 /* This is a version of bfd_generic_get_relocated_section_contents
@@ -1334,7 +1334,7 @@ elf32_h8_get_relocated_section_contents (output_bfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   Elf_Internal_Shdr *symtab_hdr;
@@ -1367,7 +1367,7 @@ elf32_h8_get_relocated_section_contents (output_bfd, link_info, link_order,
 
       internal_relocs = (_bfd_elf32_link_read_relocs
 			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
+			  (Elf_Internal_Rela *) NULL, FALSE));
       if (internal_relocs == NULL)
 	goto error_return;
 
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 6df3803adf5..80c39cea554 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -310,27 +310,27 @@ static enum elf32_hppa_stub_type hppa_type_of_stub
   PARAMS ((asection *, const Elf_Internal_Rela *,
 	   struct elf32_hppa_link_hash_entry *, bfd_vma));
 
-static boolean hppa_build_one_stub
+static bfd_boolean hppa_build_one_stub
   PARAMS ((struct bfd_hash_entry *, PTR));
 
-static boolean hppa_size_one_stub
+static bfd_boolean hppa_size_one_stub
   PARAMS ((struct bfd_hash_entry *, PTR));
 
 /* BFD and elf backend functions.  */
-static boolean elf32_hppa_object_p PARAMS ((bfd *));
+static bfd_boolean elf32_hppa_object_p PARAMS ((bfd *));
 
-static boolean elf32_hppa_add_symbol_hook
+static bfd_boolean elf32_hppa_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
 
-static boolean elf32_hppa_create_dynamic_sections
+static bfd_boolean elf32_hppa_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
 static void elf32_hppa_copy_indirect_symbol
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
 
-static boolean elf32_hppa_check_relocs
+static bfd_boolean elf32_hppa_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *,
 	   asection *, const Elf_Internal_Rela *));
 
@@ -338,41 +338,41 @@ static asection *elf32_hppa_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 
-static boolean elf32_hppa_gc_sweep_hook
+static bfd_boolean elf32_hppa_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *,
 	   asection *, const Elf_Internal_Rela *));
 
 static void elf32_hppa_hide_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean));
 
-static boolean elf32_hppa_adjust_dynamic_symbol
+static bfd_boolean elf32_hppa_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 
-static boolean mark_PIC_calls
+static bfd_boolean mark_PIC_calls
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean allocate_plt_static
+static bfd_boolean allocate_plt_static
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean allocate_dynrelocs
+static bfd_boolean allocate_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean readonly_dynrelocs
+static bfd_boolean readonly_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean clobber_millicode_symbols
+static bfd_boolean clobber_millicode_symbols
   PARAMS ((struct elf_link_hash_entry *, struct bfd_link_info *));
 
-static boolean elf32_hppa_size_dynamic_sections
+static bfd_boolean elf32_hppa_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
 static void group_sections
-  PARAMS ((struct elf32_hppa_link_hash_table *, bfd_size_type, boolean));
+  PARAMS ((struct elf32_hppa_link_hash_table *, bfd_size_type, bfd_boolean));
 
 static int get_local_syms
   PARAMS ((bfd *, bfd *, struct bfd_link_info *));
 
-static boolean elf32_hppa_final_link
+static bfd_boolean elf32_hppa_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
 static void hppa_record_segment_addr
@@ -383,18 +383,18 @@ static bfd_reloc_status_type final_link_relocate
 	   bfd_vma, struct elf32_hppa_link_hash_table *, asection *,
 	   struct elf32_hppa_link_hash_entry *));
 
-static boolean elf32_hppa_relocate_section
+static bfd_boolean elf32_hppa_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
 	   bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 
-static boolean elf32_hppa_finish_dynamic_symbol
+static bfd_boolean elf32_hppa_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 
 static enum elf_reloc_type_class elf32_hppa_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
 
-static boolean elf32_hppa_finish_dynamic_sections
+static bfd_boolean elf32_hppa_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
 static void elf32_hppa_post_process_headers
@@ -614,7 +614,7 @@ hppa_get_stub_entry (input_section, sym_sec, hash, rel, htab)
 	return NULL;
 
       stub_entry = hppa_stub_hash_lookup (&htab->stub_hash_table,
-					  stub_name, false, false);
+					  stub_name, FALSE, FALSE);
       if (hash != NULL)
 	hash->stub_cache = stub_entry;
 
@@ -666,7 +666,7 @@ hppa_add_stub (stub_name, section, htab)
 
   /* Enter this entry into the linker stub hash table.  */
   stub_entry = hppa_stub_hash_lookup (&htab->stub_hash_table, stub_name,
-				      true, false);
+				      TRUE, FALSE);
   if (stub_entry == NULL)
     {
       (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
@@ -776,7 +776,7 @@ hppa_type_of_stub (input_sec, rel, hash, destination)
 #define LDW_R1_DLT	LDW_R1_DP
 #endif
 
-static boolean
+static bfd_boolean
 hppa_build_one_stub (gen_entry, in_arg)
      struct bfd_hash_entry *gen_entry;
      PTR in_arg;
@@ -960,7 +960,7 @@ hppa_build_one_stub (gen_entry, in_arg)
 	     (long) stub_entry->stub_offset,
 	     stub_entry->root.string);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       val = hppa_field_adjust (sym_value, (bfd_signed_vma) -8, e_fsel) >> 2;
@@ -985,11 +985,11 @@ hppa_build_one_stub (gen_entry, in_arg)
 
     default:
       BFD_FAIL ();
-      return false;
+      return FALSE;
     }
 
   stub_sec->_raw_size += size;
-  return true;
+  return TRUE;
 }
 
 #undef LDIL_R1
@@ -1017,7 +1017,7 @@ hppa_build_one_stub (gen_entry, in_arg)
 /* As above, but don't actually build the stub.  Just bump offset so
    we know stub section sizes.  */
 
-static boolean
+static bfd_boolean
 hppa_size_one_stub (gen_entry, in_arg)
      struct bfd_hash_entry *gen_entry;
      PTR in_arg;
@@ -1045,13 +1045,13 @@ hppa_size_one_stub (gen_entry, in_arg)
     }
 
   stub_entry->stub_sec->_raw_size += size;
-  return true;
+  return TRUE;
 }
 
 /* Return nonzero if ABFD represents an HPPA ELF32 file.
    Additionally we set the default architecture and machine.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_object_p (abfd)
      bfd *abfd;
 {
@@ -1062,12 +1062,12 @@ elf32_hppa_object_p (abfd)
   if (strcmp (bfd_get_target (abfd), "elf32-hppa-linux") == 0)
     {
       if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_LINUX)
-	return false;
+	return FALSE;
     }
   else
     {
       if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_HPUX)
-	return false;
+	return FALSE;
     }
 
   flags = i_ehdrp->e_flags;
@@ -1082,13 +1082,13 @@ elf32_hppa_object_p (abfd)
     case EFA_PARISC_2_0 | EF_PARISC_WIDE:
       return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 25);
     }
-  return true;
+  return TRUE;
 }
 
 /* Undo the generic ELF code's subtraction of section->vma from the
    value of each external symbol.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1099,13 +1099,13 @@ elf32_hppa_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd_vma *valp;
 {
   *valp += (*secp)->vma;
-  return true;
+  return TRUE;
 }
 
 /* Create the .plt and .got sections, and set up our hash table
    short-cuts to various dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1115,11 +1115,11 @@ elf32_hppa_create_dynamic_sections (abfd, info)
   /* Don't try to create the .plt and .got twice.  */
   htab = hppa_link_hash_table (info);
   if (htab->splt != NULL)
-    return true;
+    return TRUE;
 
   /* Call the generic code to do most of the work.  */
   if (! _bfd_elf_create_dynamic_sections (abfd, info))
-    return false;
+    return FALSE;
 
   htab->splt = bfd_get_section_by_name (abfd, ".plt");
   htab->srelplt = bfd_get_section_by_name (abfd, ".rela.plt");
@@ -1135,12 +1135,12 @@ elf32_hppa_create_dynamic_sections (abfd, info)
 				   | SEC_LINKER_CREATED
 				   | SEC_READONLY))
       || ! bfd_set_section_alignment (abfd, htab->srelgot, 2))
-    return false;
+    return FALSE;
 
   htab->sdynbss = bfd_get_section_by_name (abfd, ".dynbss");
   htab->srelbss = bfd_get_section_by_name (abfd, ".rela.bss");
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
@@ -1199,7 +1199,7 @@ elf32_hppa_copy_indirect_symbol (bed, dir, ind)
    table, and dynamic reloc sections.  At this point we haven't
    necessarily read all the input files.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1215,7 +1215,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
   asection *stubreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = hppa_link_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -1341,7 +1341,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 		 bfd_archive_filename (abfd),
 		 elf_hppa_howto_table[r_type].name);
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  /* Fall through.  */
 
@@ -1374,7 +1374,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 	case R_PARISC_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec,
 					       &h->elf, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  continue;
 
 	  /* This relocation describes which C++ vtable entries are actually
@@ -1382,7 +1382,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 	case R_PARISC_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec,
 					     &h->elf, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  continue;
 
 	default:
@@ -1399,7 +1399,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 	      if (htab->elf.dynobj == NULL)
 		htab->elf.dynobj = abfd;
 	      if (!elf32_hppa_create_dynamic_sections (htab->elf.dynobj, info))
-		return false;
+		return FALSE;
 	    }
 
 	  if (h != NULL)
@@ -1425,7 +1425,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 		  local_got_refcounts = ((bfd_signed_vma *)
 					 bfd_zalloc (abfd, size));
 		  if (local_got_refcounts == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 		}
 	      local_got_refcounts[r_symndx] += 1;
@@ -1472,7 +1472,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 		      local_got_refcounts = ((bfd_signed_vma *)
 					     bfd_zalloc (abfd, size));
 		      if (local_got_refcounts == NULL)
-			return false;
+			return FALSE;
 		      elf_local_got_refcounts (abfd) = local_got_refcounts;
 		    }
 		  local_plt_refcounts = (local_got_refcounts
@@ -1553,7 +1553,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 			(_("Could not find relocation section for %s"),
 			 sec->name);
 		      bfd_set_error (bfd_error_bad_value);
-		      return false;
+		      return FALSE;
 		    }
 
 		  if (htab->elf.dynobj == NULL)
@@ -1573,7 +1573,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || !bfd_set_section_flags (dynobj, sreloc, flags)
 			  || !bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 
 		  elf_section_data (sec)->sreloc = sreloc;
@@ -1595,7 +1595,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 		  s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
 						 sec, r_symndx);
 		  if (s == NULL)
-		    return false;
+		    return FALSE;
 
 		  head = ((struct elf32_hppa_dyn_reloc_entry **)
 			  &elf_section_data (s)->local_dynrel);
@@ -1608,7 +1608,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 		       bfd_alloc (htab->elf.dynobj,
 				  (bfd_size_type) sizeof *p));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = *head;
 		  *head = p;
 		  p->sec = sec;
@@ -1627,7 +1627,7 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against garbage collection
@@ -1673,7 +1673,7 @@ elf32_hppa_gc_mark_hook (sec, info, rel, h, sym)
 /* Update the got and plt entry reference counts for the section being
    removed.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1701,7 +1701,7 @@ elf32_hppa_gc_sweep_hook (abfd, info, sec, relocs)
   htab = hppa_link_hash_table (info);
   dynobj = htab->elf.dynobj;
   if (dynobj == NULL)
-    return true;
+    return TRUE;
 
   relend = relocs + sec->reloc_count;
   for (rel = relocs; rel < relend; rel++)
@@ -1805,7 +1805,7 @@ elf32_hppa_gc_sweep_hook (abfd, info, sec, relocs)
 	break;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Our own version of hide_symbol, so that we can keep plt entries for
@@ -1815,7 +1815,7 @@ static void
 elf32_hppa_hide_symbol (info, h, force_local)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
-     boolean force_local;
+     bfd_boolean force_local;
 {
   if (force_local)
     {
@@ -1852,7 +1852,7 @@ elf32_hppa_hide_symbol (info, h, force_local)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -1896,7 +1896,7 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
 	    }
 	}
 
-      return true;
+      return TRUE;
     }
   else
     h->plt.offset = (bfd_vma) -1;
@@ -1911,7 +1911,7 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
 	abort ();
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1922,12 +1922,12 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   eh = (struct elf32_hppa_link_hash_entry *) h;
   for (p = eh->dyn_relocs; p != NULL; p = p->next)
@@ -1942,7 +1942,7 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
   if (p == NULL)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   /* We must allocate the symbol in our .dynbss section, which will
@@ -1980,7 +1980,7 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
       if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1990,14 +1990,14 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Called via elf_link_hash_traverse to create .plt entries for an
    application that uses statically linked PIC functions.  Similar to
    the first part of elf32_hppa_adjust_dynamic_symbol.  */
 
-static boolean
+static bfd_boolean
 mark_PIC_calls (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf ATTRIBUTE_UNUSED;
@@ -2012,19 +2012,19 @@ mark_PIC_calls (h, inf)
     {
       h->plt.offset = (bfd_vma) -1;
       h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-      return true;
+      return TRUE;
     }
 
   h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
   ((struct elf32_hppa_link_hash_entry *) h)->pic_call = 1;
 
-  return true;
+  return TRUE;
 }
 
 /* Allocate space in the .plt for entries that won't have relocations.
    ie. pic_call and plabel entries.  */
 
-static boolean
+static bfd_boolean
 allocate_plt_static (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -2034,7 +2034,7 @@ allocate_plt_static (h, inf)
   asection *s;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -2060,7 +2060,7 @@ allocate_plt_static (h, inf)
 	  && h->type != STT_PARISC_MILLI)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
@@ -2092,13 +2092,13 @@ allocate_plt_static (h, inf)
       h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Allocate space in .plt, .got and associated reloc sections for
    global syms.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -2110,7 +2110,7 @@ allocate_dynrelocs (h, inf)
   struct elf32_hppa_dyn_reloc_entry *p;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -2141,7 +2141,7 @@ allocate_dynrelocs (h, inf)
 	  && h->type != STT_PARISC_MILLI)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = htab->sgot;
@@ -2160,7 +2160,7 @@ allocate_dynrelocs (h, inf)
 
   eh = (struct elf32_hppa_link_hash_entry *) h;
   if (eh->dyn_relocs == NULL)
-    return true;
+    return TRUE;
 
   /* If this is a -Bsymbolic shared link, then we need to discard all
      space allocated for dynamic pc-relative relocs against symbols
@@ -2207,7 +2207,7 @@ allocate_dynrelocs (h, inf)
 	      && h->type != STT_PARISC_MILLI)
 	    {
 	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  /* If that succeeded, we know we'll be keeping all the
@@ -2217,7 +2217,7 @@ allocate_dynrelocs (h, inf)
 	}
 
       eh->dyn_relocs = NULL;
-      return true;
+      return TRUE;
 
     keep: ;
     }
@@ -2229,7 +2229,7 @@ allocate_dynrelocs (h, inf)
       sreloc->_raw_size += p->count * sizeof (Elf32_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via elf_link_hash_traverse to force
@@ -2239,7 +2239,7 @@ allocate_dynrelocs (h, inf)
    for all dynamic symbols.  Arguably, this is a bug in
    elf_adjust_dynamic_symbol.  */
 
-static boolean
+static bfd_boolean
 clobber_millicode_symbols (h, info)
      struct elf_link_hash_entry *h;
      struct bfd_link_info *info;
@@ -2250,14 +2250,14 @@ clobber_millicode_symbols (h, info)
   if (h->type == STT_PARISC_MILLI
       && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
     {
-      elf32_hppa_hide_symbol (info, h, true);
+      elf32_hppa_hide_symbol (info, h, TRUE);
     }
-  return true;
+  return TRUE;
 }
 
 /* Find any dynamic relocs that apply to read-only sections.  */
 
-static boolean
+static bfd_boolean
 readonly_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -2280,15 +2280,15 @@ readonly_dynrelocs (h, inf)
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
-	  return false;
+	  return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -2297,7 +2297,7 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
   bfd *dynobj;
   bfd *ibfd;
   asection *s;
-  boolean relocs;
+  bfd_boolean relocs;
 
   htab = hppa_link_hash_table (info);
   dynobj = htab->elf.dynobj;
@@ -2433,7 +2433,7 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  relocs = false;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       if ((s->flags & SEC_LINKER_CREATED) == 0)
@@ -2465,7 +2465,7 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
 	      /* Remember whether there are any reloc sections other
 		 than .rela.plt.  */
 	      if (s != htab->srelplt)
-		relocs = true;
+		relocs = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -2497,7 +2497,7 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
 	 we may not fill in all the reloc sections.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (htab->elf.dynamic_sections_created)
@@ -2510,7 +2510,7 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
   bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL))
 
       if (!add_dynamic_entry (DT_PLTGOT, 0))
-	return false;
+	return FALSE;
 
       /* Add some entries to the .dynamic section.  We fill in the
 	 values later, in elf32_hppa_finish_dynamic_sections, but we
@@ -2520,7 +2520,7 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (htab->srelplt->_raw_size != 0)
@@ -2528,7 +2528,7 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -2536,7 +2536,7 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	    return false;
+	    return FALSE;
 
 	  /* If any dynamic relocs apply to a read-only section,
 	     then we need a DT_TEXTREL entry.  */
@@ -2547,13 +2547,13 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
 	  if ((info->flags & DF_TEXTREL) != 0)
 	    {
 	      if (!add_dynamic_entry (DT_TEXTREL, 0))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* External entry points for sizing and building linker stubs.  */
@@ -2673,7 +2673,7 @@ static void
 group_sections (htab, stub_group_size, stubs_always_before_branch)
      struct elf32_hppa_link_hash_table *htab;
      bfd_size_type stub_group_size;
-     boolean stubs_always_before_branch;
+     bfd_boolean stubs_always_before_branch;
 {
   asection **list = htab->input_list + htab->top_index;
   do
@@ -2839,7 +2839,7 @@ get_local_syms (output_bfd, input_bfd, info)
 		  stub_name = hash->elf.root.root.string;
 		  stub_entry = hppa_stub_hash_lookup (&htab->stub_hash_table,
 						      stub_name,
-						      false, false);
+						      FALSE, FALSE);
 		  if (stub_entry == NULL)
 		    {
 		      stub_entry = hppa_add_stub (stub_name, sec, htab);
@@ -2872,20 +2872,20 @@ get_local_syms (output_bfd, input_bfd, info)
    PC-relative calls to a target that is unreachable with a "bl"
    instruction.  */
 
-boolean
+bfd_boolean
 elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
 		       add_stub_section, layout_sections_again)
      bfd *output_bfd;
      bfd *stub_bfd;
      struct bfd_link_info *info;
-     boolean multi_subspace;
+     bfd_boolean multi_subspace;
      bfd_signed_vma group_size;
      asection * (*add_stub_section) PARAMS ((const char *, asection *));
      void (*layout_sections_again) PARAMS ((void));
 {
   bfd_size_type stub_group_size;
-  boolean stubs_always_before_branch;
-  boolean stub_changed;
+  bfd_boolean stubs_always_before_branch;
+  bfd_boolean stub_changed;
   struct elf32_hppa_link_hash_table *htab = hppa_link_hash_table (info);
 
   /* Stash our params away.  */
@@ -2915,14 +2915,14 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
     default:
       if (htab->all_local_syms)
 	goto error_ret_free_local;
-      return false;
+      return FALSE;
 
     case 0:
-      stub_changed = false;
+      stub_changed = FALSE;
       break;
 
     case 1:
-      stub_changed = true;
+      stub_changed = TRUE;
       break;
     }
 
@@ -3089,7 +3089,7 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
 
 		  stub_entry = hppa_stub_hash_lookup (&htab->stub_hash_table,
 						      stub_name,
-						      false, false);
+						      FALSE, FALSE);
 		  if (stub_entry != NULL)
 		    {
 		      /* The proper stub has already been created.  */
@@ -3115,7 +3115,7 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
 			stub_entry->stub_type = hppa_stub_long_branch_shared;
 		    }
 		  stub_entry->h = hash;
-		  stub_changed = true;
+		  stub_changed = TRUE;
 		}
 
 	      /* We're done with the internal relocs, free them.  */
@@ -3141,21 +3141,21 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
 
       /* Ask the linker to do its stuff.  */
       (*htab->layout_sections_again) ();
-      stub_changed = false;
+      stub_changed = FALSE;
     }
 
   free (htab->all_local_syms);
-  return true;
+  return TRUE;
 
  error_ret_free_local:
   free (htab->all_local_syms);
-  return false;
+  return FALSE;
 }
 
 /* For a final link, this function is called after we have sized the
    stubs to provide a value for __gp.  */
 
-boolean
+bfd_boolean
 elf32_hppa_set_gp (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3166,7 +3166,7 @@ elf32_hppa_set_gp (abfd, info)
   struct elf32_hppa_link_hash_table *htab;
 
   htab = hppa_link_hash_table (info);
-  h = bfd_link_hash_lookup (&htab->elf.root, "$global$", false, false, false);
+  h = bfd_link_hash_lookup (&htab->elf.root, "$global$", FALSE, FALSE, FALSE);
 
   if (h != NULL
       && (h->type == bfd_link_hash_defined
@@ -3242,7 +3242,7 @@ elf32_hppa_set_gp (abfd, info)
     gp_val += sec->output_section->vma + sec->output_offset;
 
   elf_gp (abfd) = gp_val;
-  return true;
+  return TRUE;
 }
 
 /* Build all the stubs associated with the current output file.  The
@@ -3251,7 +3251,7 @@ elf32_hppa_set_gp (abfd, info)
    functions here.  This function is called via hppaelf_finish in the
    linker.  */
 
-boolean
+bfd_boolean
 elf32_hppa_build_stubs (info)
      struct bfd_link_info *info;
 {
@@ -3271,7 +3271,7 @@ elf32_hppa_build_stubs (info)
       size = stub_sec->_raw_size;
       stub_sec->contents = (unsigned char *) bfd_zalloc (htab->stub_bfd, size);
       if (stub_sec->contents == NULL && size != 0)
-	return false;
+	return FALSE;
       stub_sec->_raw_size = 0;
     }
 
@@ -3279,19 +3279,19 @@ elf32_hppa_build_stubs (info)
   table = &htab->stub_hash_table;
   bfd_hash_traverse (table, hppa_build_one_stub, info);
 
-  return true;
+  return TRUE;
 }
 
 /* Perform a final link.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   /* Invoke the regular ELF linker to do all the work.  */
   if (!bfd_elf32_bfd_final_link (abfd, info))
-    return false;
+    return FALSE;
 
   /* If we're producing a final executable, sort the contents of the
      unwind section.  */
@@ -3594,7 +3594,7 @@ final_link_relocate (input_section, contents, rel, value, htab, sym_sec, h)
 
 /* Relocate an HPPA ELF section.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 			     contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -3613,7 +3613,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
 
@@ -3633,14 +3633,14 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
       bfd_vma relocation;
       bfd_reloc_status_type r;
       const char *sym_name;
-      boolean plabel;
-      boolean warned_undef;
+      bfd_boolean plabel;
+      bfd_boolean warned_undef;
 
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       if (r_type == (unsigned int) R_PARISC_GNU_VTENTRY
 	  || r_type == (unsigned int) R_PARISC_GNU_VTINHERIT)
@@ -3651,7 +3651,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sym_sec = NULL;
-      warned_undef = false;
+      warned_undef = FALSE;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  /* This is a local symbol, h defaults to NULL.  */
@@ -3693,18 +3693,18 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 		{
 		  if (!((*info->callbacks->undefined_symbol)
 			(info, h->elf.root.root.string, input_bfd,
-			 input_section, rel->r_offset, false)))
-		    return false;
-		  warned_undef = true;
+			 input_section, rel->r_offset, FALSE)))
+		    return FALSE;
+		  warned_undef = TRUE;
 		}
 	    }
 	  else
 	    {
 	      if (!((*info->callbacks->undefined_symbol)
 		    (info, h->elf.root.root.string, input_bfd,
-		     input_section, rel->r_offset, true)))
-		return false;
-	      warned_undef = true;
+		     input_section, rel->r_offset, TRUE)))
+		return FALSE;
+	      warned_undef = TRUE;
 	    }
 	}
 
@@ -3719,13 +3719,13 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 	case R_PARISC_DLTIND21L:
 	  {
 	    bfd_vma off;
-	    boolean do_got = 0;
+	    bfd_boolean do_got = 0;
 
 	    /* Relocation is to the entry for this symbol in the
 	       global offset table.  */
 	    if (h != NULL)
 	      {
-		boolean dyn;
+		bfd_boolean dyn;
 
 		off = h->elf.got.offset;
 		dyn = htab->elf.dynamic_sections_created;
@@ -3814,7 +3814,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 	  if (htab->elf.dynamic_sections_created)
 	    {
 	      bfd_vma off;
-	      boolean do_plt = 0;
+	      bfd_boolean do_plt = 0;
 
 	      /* If we have a global symbol with a PLT slot, then
 		 redirect this relocation to it.  */
@@ -3956,7 +3956,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 		      || h->elf.root.type == bfd_link_hash_undefined)))
 	    {
 	      Elf_Internal_Rela outrel;
-	      boolean skip;
+	      bfd_boolean skip;
 	      asection *sreloc;
 	      bfd_byte *loc;
 
@@ -4051,7 +4051,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 						      symtab_hdr->sh_link,
 						      sym->st_name);
 	  if (sym_name == NULL)
-	    return false;
+	    return FALSE;
 	  if (*sym_name == '\0')
 	    sym_name = bfd_section_name (input_bfd, sym_sec);
 	}
@@ -4070,7 +4070,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 		 howto->name,
 		 sym_name);
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	}
       else
@@ -4078,17 +4078,17 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 	  if (!((*info->callbacks->reloc_overflow)
 		(info, sym_name, howto->name, (bfd_vma) 0,
 		 input_bfd, input_section, rel->r_offset)))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -4241,7 +4241,7 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
       sym->st_shndx = SHN_ABS;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Used to decide how to sort relocs in an optimal manner for the
@@ -4267,7 +4267,7 @@ elf32_hppa_reloc_type_class (rela)
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf32_hppa_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -4377,12 +4377,12 @@ elf32_hppa_finish_dynamic_sections (output_bfd, info)
 	    {
 	      (*_bfd_error_handler)
 		(_(".got section not immediately after .plt section"));
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Tweak the OSABI field of the elf header.  */
diff --git a/bfd/elf32-hppa.h b/bfd/elf32-hppa.h
index 720cd087ae0..7c8c687c499 100644
--- a/bfd/elf32-hppa.h
+++ b/bfd/elf32-hppa.h
@@ -4,8 +4,8 @@
    in the Stratus FTX/Golf Object File Format (SED-1762) dated
    February 1994.
 
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+   2002 Free Software Foundation, Inc.
 
    Written by:
 
@@ -42,15 +42,15 @@ int elf32_hppa_setup_section_lists
 void elf32_hppa_next_input_section
   PARAMS ((struct bfd_link_info *, asection *));
 
-boolean elf32_hppa_size_stubs
-  PARAMS ((bfd *, bfd *, struct bfd_link_info *, boolean, bfd_signed_vma,
+bfd_boolean elf32_hppa_size_stubs
+  PARAMS ((bfd *, bfd *, struct bfd_link_info *, bfd_boolean, bfd_signed_vma,
 	   asection * (*) PARAMS ((const char *, asection *)),
 	   void (*) PARAMS ((void))));
 
-boolean elf32_hppa_set_gp
+bfd_boolean elf32_hppa_set_gp
   PARAMS ((bfd *, struct bfd_link_info *));
 
-boolean elf32_hppa_build_stubs
+bfd_boolean elf32_hppa_build_stubs
   PARAMS ((struct bfd_link_info *));
 
 elf_hppa_reloc_type elf32_hppa_reloc_final_type
diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c
index f9a94a138f6..8b74baa93c4 100644
--- a/bfd/elf32-i370.c
+++ b/bfd/elf32-i370.c
@@ -43,150 +43,150 @@ static reloc_howto_type i370_elf_howto_raw[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 31 bit relocation.  */
   HOWTO (R_I370_ADDR31,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 31,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_ADDR31",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x7fffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 32 bit relocation.  */
   HOWTO (R_I370_ADDR32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_ADDR32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 16 bit relocation.  */
   HOWTO (R_I370_ADDR16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_ADDR16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 31-bit PC relative */
   HOWTO (R_I370_REL31,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 31,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_REL31",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x7fffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 32-bit PC relative */
   HOWTO (R_I370_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_REL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A standard 12 bit relocation.  */
   HOWTO (R_I370_ADDR12,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_ADDR12",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfff,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 12-bit PC relative */
   HOWTO (R_I370_REL12,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_REL12",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A standard 8 bit relocation.  */
   HOWTO (R_I370_ADDR8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_ADDR8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 8-bit PC relative */
   HOWTO (R_I370_REL8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_I370_REL8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* This is used only by the dynamic linker.  The symbol should exist
      both in the object being run and in some shared library.  The
@@ -197,15 +197,15 @@ static reloc_howto_type i370_elf_howto_raw[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	 /* special_function */
 	 "R_I370_COPY",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used only by the dynamic linker.  When the object is run, this
      longword is set to the load address of the object, plus the
@@ -214,25 +214,26 @@ static reloc_howto_type i370_elf_howto_raw[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	 /* special_function */
 	 "R_I370_RELATIVE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 };
 
-static void i370_elf_howto_init PARAMS ((void));
+static void i370_elf_howto_init
+  PARAMS ((void));
 static reloc_howto_type *i370_elf_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-
-static void i370_elf_info_to_howto PARAMS ((bfd *abfd, arelent *cache_ptr,
-					    Elf_Internal_Rela *dst));
-static boolean i370_elf_set_private_flags PARAMS ((bfd *, flagword));
+static void i370_elf_info_to_howto
+  PARAMS ((bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst));
+static bfd_boolean i370_elf_set_private_flags
+  PARAMS ((bfd *, flagword));
 
 /* Initialize the i370_elf_howto_table, so that linear accesses can be done.  */
 
@@ -275,47 +276,36 @@ i370_elf_reloc_type_lookup (abfd, code)
   return i370_elf_howto_table[ (int)i370_reloc ];
 };
 
-static boolean i370_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-
-static boolean i370_elf_relocate_section PARAMS ((bfd *,
-						  struct bfd_link_info *info,
-						  bfd *,
-						  asection *,
-						  bfd_byte *,
-						  Elf_Internal_Rela *relocs,
-						  Elf_Internal_Sym *local_syms,
-						  asection **));
+static bfd_boolean i370_elf_merge_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean i370_elf_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *info, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *relocs, Elf_Internal_Sym *local_syms,
+	   asection **));
 static void i370_elf_post_process_headers
   PARAMS ((bfd *, struct bfd_link_info *));
-
-static boolean i370_elf_create_dynamic_sections PARAMS ((bfd *,
-							 struct bfd_link_info *));
-
-static boolean i370_elf_section_from_shdr PARAMS ((bfd *,
-						   Elf_Internal_Shdr *,
-						   const char *));
-static boolean i370_elf_fake_sections PARAMS ((bfd *,
-					       Elf_Internal_Shdr *,
-					       asection *));
+static bfd_boolean i370_elf_create_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean i370_elf_section_from_shdr
+  PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
+static bfd_boolean i370_elf_fake_sections
+  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
 #if 0
 static elf_linker_section_t *i370_elf_create_linker_section
-  PARAMS ((bfd *abfd,
-	   struct bfd_link_info *info,
+  PARAMS ((bfd *abfd, struct bfd_link_info *info,
 	   enum elf_linker_section_enum));
 #endif
-static boolean i370_elf_check_relocs PARAMS ((bfd *,
-					     struct bfd_link_info *,
-					     asection *,
-					     const Elf_Internal_Rela *));
-
-static boolean i370_elf_adjust_dynamic_symbol PARAMS ((struct bfd_link_info *,
-						      struct elf_link_hash_entry *));
-
-static boolean i370_elf_adjust_dynindx PARAMS ((struct elf_link_hash_entry *, PTR));
-
-static boolean i370_elf_size_dynamic_sections PARAMS ((bfd *, struct bfd_link_info *));
-
-static boolean i370_elf_finish_dynamic_sections PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean i370_elf_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+static bfd_boolean i370_elf_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static bfd_boolean i370_elf_adjust_dynindx
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+static bfd_boolean i370_elf_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean i370_elf_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
 
 /* The name of the dynamic interpreter.  This is put in the .interp
     section.  */
@@ -341,7 +331,7 @@ i370_elf_info_to_howto (abfd, cache_ptr, dst)
  * why are we bothering with them ???
  */
 /* Function to set whether a module needs the -mrelocatable bit set.  */
-static boolean
+static bfd_boolean
 i370_elf_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -350,13 +340,13 @@ i370_elf_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking */
-static boolean
+static bfd_boolean
 i370_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -366,13 +356,13 @@ i370_elf_merge_private_bfd_data (ibfd, obfd)
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   new_flags = elf_elfheader (ibfd)->e_flags;
   old_flags = elf_elfheader (obfd)->e_flags;
   if (!elf_flags_init (obfd))	/* First call, no flags set */
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = new_flags;
     }
 
@@ -386,10 +376,10 @@ i370_elf_merge_private_bfd_data (ibfd, obfd)
 	 bfd_archive_filename (ibfd), (long) new_flags, (long) old_flags);
 
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Handle an i370 specific section when reading an object file.  This
@@ -399,7 +389,7 @@ i370_elf_merge_private_bfd_data (ibfd, obfd)
  * just enough to allow glibc-2.1 ld.so to compile & link.
  */
 
-static boolean
+static bfd_boolean
 i370_elf_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -409,7 +399,7 @@ i370_elf_section_from_shdr (abfd, hdr, name)
   flagword flags;
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
 
   newsect = hdr->bfd_section;
   flags = bfd_get_section_flags (abfd, newsect);
@@ -420,7 +410,7 @@ i370_elf_section_from_shdr (abfd, hdr, name)
     flags |= SEC_SORT_ENTRIES;
 
   bfd_set_section_flags (abfd, newsect, flags);
-  return true;
+  return TRUE;
 }
 
 /* Set up any other section flags and such that may be necessary.  */
@@ -429,7 +419,7 @@ i370_elf_section_from_shdr (abfd, hdr, name)
  * just enough to allow glibc-2.1 ld.so to compile & link.
  */
 
-static boolean
+static bfd_boolean
 i370_elf_fake_sections (abfd, shdr, asect)
      bfd *abfd ATTRIBUTE_UNUSED;
      Elf_Internal_Shdr *shdr;
@@ -441,7 +431,7 @@ i370_elf_fake_sections (abfd, shdr, asect)
   if ((asect->flags & SEC_SORT_ENTRIES) != 0)
     shdr->sh_type = SHT_ORDERED;
 
-  return true;
+  return TRUE;
 }
 
 #if 0
@@ -473,7 +463,7 @@ i370_elf_create_linker_section (abfd, info, which)
 
       defaults = zero_section;
       defaults.which = which;
-      defaults.hole_written_p = false;
+      defaults.hole_written_p = FALSE;
       defaults.alignment = 2;
 
       /* Both of these sections are (technically) created by the user
@@ -530,7 +520,7 @@ i370_elf_create_linker_section (abfd, info, which)
  * just enough to allow glibc-2.1 ld.so to compile & link.
  */
 
-static boolean
+static bfd_boolean
 i370_elf_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -539,7 +529,7 @@ i370_elf_create_dynamic_sections (abfd, info)
   flagword flags;
 
   if (!_bfd_elf_create_dynamic_sections(abfd, info))
-    return false;
+    return FALSE;
 
   flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
 	   | SEC_LINKER_CREATED);
@@ -547,7 +537,7 @@ i370_elf_create_dynamic_sections (abfd, info)
   s = bfd_make_section (abfd, ".dynsbss");
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, SEC_ALLOC))
-    return false;
+    return FALSE;
 
   if (! info->shared)
     {
@@ -555,7 +545,7 @@ i370_elf_create_dynamic_sections (abfd, info)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
     }
 
    /* xxx beats me, seem to need a rela.text ...  */
@@ -563,8 +553,8 @@ i370_elf_create_dynamic_sections (abfd, info)
    if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, 2))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -577,7 +567,7 @@ i370_elf_create_dynamic_sections (abfd, info)
  * just enough to allow glibc-2.1 ld.so to compile & link.
  */
 
-static boolean
+static bfd_boolean
 i370_elf_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -615,7 +605,7 @@ i370_elf_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -626,7 +616,7 @@ i370_elf_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -677,7 +667,7 @@ i370_elf_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -687,7 +677,7 @@ i370_elf_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Increment the index of a dynamic symbol by a given amount.  Called
@@ -697,7 +687,7 @@ i370_elf_adjust_dynamic_symbol (info, h)
  * just enough to allow glibc-2.1 ld.so to compile & link.
  */
 
-static boolean
+static bfd_boolean
 i370_elf_adjust_dynindx (h, cparg)
      struct elf_link_hash_entry *h;
      PTR cparg;
@@ -716,7 +706,7 @@ i370_elf_adjust_dynindx (h, cparg)
   if (h->dynindx != -1)
     h->dynindx += *cp;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
@@ -725,16 +715,16 @@ i370_elf_adjust_dynindx (h, cparg)
  * just enough to allow glibc-2.1 ld.so to compile & link.
  */
 
-static boolean
+static bfd_boolean
 i370_elf_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean plt;
-  boolean relocs;
-  boolean reltext;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
 
 #ifdef DEBUG
   fprintf (stderr, "i370_elf_size_dynamic_sections called\n");
@@ -777,13 +767,13 @@ i370_elf_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  plt = false;
-  relocs = false;
-  reltext = false;
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -791,7 +781,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
       /* It's OK to base decisions on the section name, because none
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
-      strip = false;
+      strip = FALSE;
 
       if (strcmp (name, ".plt") == 0)
 	{
@@ -799,12 +789,12 @@ i370_elf_size_dynamic_sections (output_bfd, info)
 	    {
 	      /* Strip this section if we don't need it; see the
                  comment below.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      plt = TRUE;
 	    }
 	}
       else if (strncmp (name, ".rela", 5) == 0)
@@ -820,7 +810,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
@@ -828,7 +818,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
 	      const char *outname;
 
 	      /* Remember whether there are any relocation sections.  */
-	      relocs = true;
+	      relocs = TRUE;
 
 	      /* If this relocation section applies to a read only
 		 section, then we probably need a DT_TEXTREL entry.  */
@@ -838,7 +828,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
 	      if (target != NULL
 		  && (target->flags & SEC_READONLY) != 0
 		  && (target->flags & SEC_ALLOC) != 0)
-		reltext = true;
+		reltext = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -873,7 +863,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
       /* Allocate memory for the section contents.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -889,7 +879,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (plt)
@@ -898,7 +888,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -906,13 +896,13 @@ i370_elf_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	    return false;
+	    return FALSE;
 	}
 
       if (reltext)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	  info->flags |= DF_TEXTREL;
 	}
     }
@@ -955,7 +945,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
       elf_hash_table (info)->dynsymcount += c;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase, and
@@ -966,7 +956,7 @@ i370_elf_size_dynamic_sections (output_bfd, info)
  * just enough to allow glibc-2.1 ld.so to compile & link.
  */
 
-static boolean
+static bfd_boolean
 i370_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -982,7 +972,7 @@ i370_elf_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
 #ifdef DEBUG
   fprintf (stderr, "i370_elf_check_relocs called for section %s in %s\n",
@@ -1026,7 +1016,7 @@ i370_elf_check_relocs (abfd, info, sec, relocs)
 		       elf_elfheader (abfd)->e_shstrndx,
 		       elf_section_data (sec)->rel_hdr.sh_name));
 	      if (name == NULL)
-		return false;
+		return FALSE;
 
 	      BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			  && strcmp (bfd_get_section_name (abfd, sec), name + 5) == 0);
@@ -1044,7 +1034,7 @@ i370_elf_check_relocs (abfd, info, sec, relocs)
 		  if (sreloc == NULL
 		      || ! bfd_set_section_flags (dynobj, sreloc, flags)
 		      || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -1059,7 +1049,7 @@ i370_elf_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
@@ -1068,7 +1058,7 @@ i370_elf_check_relocs (abfd, info, sec, relocs)
  * just enough to allow glibc-2.1 ld.so to compile & link.
  */
 
-static boolean
+static bfd_boolean
 i370_elf_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -1097,16 +1087,16 @@ i370_elf_finish_dynamic_sections (output_bfd, info)
 	{
 	  Elf_Internal_Dyn dyn;
 	  const char *name;
-	  boolean size;
+	  bfd_boolean size;
 
 	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
 
 	  switch (dyn.d_tag)
 	    {
-	    case DT_PLTGOT:   name = ".plt";	  size = false; break;
-	    case DT_PLTRELSZ: name = ".rela.plt"; size = true;  break;
-	    case DT_JMPREL:   name = ".rela.plt"; size = false; break;
-	    default:	      name = NULL;	  size = false; break;
+	    case DT_PLTGOT:   name = ".plt";	  size = FALSE; break;
+	    case DT_PLTRELSZ: name = ".rela.plt"; size = TRUE;  break;
+	    case DT_JMPREL:   name = ".rela.plt"; size = FALSE; break;
+	    default:	      name = NULL;	  size = FALSE; break;
 	    }
 
 	  if (name != NULL)
@@ -1198,7 +1188,7 @@ i370_elf_finish_dynamic_sections (output_bfd, info)
 	maxdindx + 1;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The RELOCATE_SECTION function is called by the ELF backend linker
@@ -1230,9 +1220,9 @@ i370_elf_finish_dynamic_sections (output_bfd, info)
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			  contents, relocs, local_syms, local_sections)
+			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
      struct bfd_link_info *info;
      bfd *input_bfd;
@@ -1242,17 +1232,17 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
      Elf_Internal_Sym *local_syms;
      asection **local_sections;
 {
-  Elf_Internal_Shdr *symtab_hdr		  = &elf_tdata (input_bfd)->symtab_hdr;
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
-  bfd *dynobj				  = elf_hash_table (info)->dynobj;
-  Elf_Internal_Rela *rel		  = relocs;
-  Elf_Internal_Rela *relend		  = relocs + input_section->reloc_count;
-  asection *sreloc			  = NULL;
+  bfd *dynobj = elf_hash_table (info)->dynobj;
+  Elf_Internal_Rela *rel = relocs;
+  Elf_Internal_Rela *relend = relocs + input_section->reloc_count;
+  asection *sreloc = NULL;
   bfd_vma *local_got_offsets;
-  boolean ret				  = true;
+  bfd_boolean ret = TRUE;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
 #ifdef DEBUG
   fprintf (stderr, "i370_elf_relocate_section called for %s section %s, %ld relocations%s\n",
@@ -1290,7 +1280,7 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				 (int) r_type);
 
 	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 	}
 
@@ -1349,8 +1339,8 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 						    input_bfd,
 						    input_section,
 						    rel->r_offset,
-						    true);
-	      ret = false;
+						    TRUE);
+	      ret = FALSE;
 	      continue;
 	    }
 	}
@@ -1364,7 +1354,7 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	     (int) r_type, sym_name);
 
 	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 
 	case (int)R_I370_NONE:
@@ -1410,7 +1400,7 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -1470,7 +1460,7 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -1517,7 +1507,7 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	     sym_name);
 
 	  bfd_set_error (bfd_error_invalid_operation);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 	}
 
@@ -1541,7 +1531,7 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
       if (r != bfd_reloc_ok)
 	{
-	  ret = false;
+	  ret = FALSE;
 	  switch (r)
 	    {
 	    default:
@@ -1636,7 +1626,8 @@ i370_elf_post_process_headers (abfd, link_info)
 
 #define elf_backend_post_process_headers	i370_elf_post_process_headers
 
-static int i370_noop PARAMS ((void));
+static int i370_noop
+  PARAMS ((void));
 
 static int i370_noop ()
 {
@@ -1646,16 +1637,16 @@ static int i370_noop ()
 /* we need to define these at least as no-ops to link glibc ld.so */
 
 #define elf_backend_add_symbol_hook \
-  (boolean (*) PARAMS ((bfd *, struct bfd_link_info *, \
-			const Elf_Internal_Sym *, const char **, flagword *, \
-			asection **, bfd_vma *)))		i370_noop
+  (bfd_boolean (*) \
+     PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *, \
+	      const char **, flagword *, asection **, bfd_vma *))) i370_noop
 #define elf_backend_finish_dynamic_symbol \
-  (boolean (*) PARAMS ((bfd *, struct bfd_link_info *, \
-			struct elf_link_hash_entry *, \
-			Elf_Internal_Sym *)))			i370_noop
+  (bfd_boolean (*) \
+     PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *, \
+	      Elf_Internal_Sym *))) i370_noop
 #define elf_backend_additional_program_headers \
-  (int (*) PARAMS ((bfd *)))					i370_noop
+  (int (*) PARAMS ((bfd *))) i370_noop
 #define elf_backend_modify_segment_map \
-  (boolean (*) PARAMS ((bfd *)))				i370_noop
+  (bfd_boolean (*) PARAMS ((bfd *))) i370_noop
 
 #include "elf32-target.h"
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index d9491285dfe..a6e39932ca1 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -30,19 +30,19 @@ static void elf_i386_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void elf_i386_info_to_howto_rel
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf_i386_is_local_label_name
+static bfd_boolean elf_i386_is_local_label_name
   PARAMS ((bfd *, const char *));
-static boolean elf_i386_grok_prstatus
+static bfd_boolean elf_i386_grok_prstatus
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
-static boolean elf_i386_grok_psinfo
+static bfd_boolean elf_i386_grok_psinfo
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
 static struct bfd_hash_entry *link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *elf_i386_link_hash_table_create
   PARAMS ((bfd *));
-static boolean create_got_section
+static bfd_boolean create_got_section
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf_i386_create_dynamic_sections
+static bfd_boolean elf_i386_create_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
 static void elf_i386_copy_indirect_symbol
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
@@ -50,42 +50,42 @@ static void elf_i386_copy_indirect_symbol
 static int elf_i386_tls_transition
   PARAMS ((struct bfd_link_info *, int, int));
 
-static boolean elf_i386_mkobject
+static bfd_boolean elf_i386_mkobject
   PARAMS((bfd *));
-static boolean elf_i386_object_p
+static bfd_boolean elf_i386_object_p
   PARAMS((bfd *));
-static boolean elf_i386_check_relocs
+static bfd_boolean elf_i386_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection *elf_i386_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf_i386_gc_sweep_hook
+static bfd_boolean elf_i386_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf_i386_adjust_dynamic_symbol
+static bfd_boolean elf_i386_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean allocate_dynrelocs
+static bfd_boolean allocate_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean readonly_dynrelocs
+static bfd_boolean readonly_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_i386_fake_sections
+static bfd_boolean elf_i386_fake_sections
   PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
-static boolean elf_i386_size_dynamic_sections
+static bfd_boolean elf_i386_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static bfd_vma dtpoff_base
   PARAMS ((struct bfd_link_info *));
 static bfd_vma tpoff
   PARAMS ((struct bfd_link_info *, bfd_vma));
-static boolean elf_i386_relocate_section
+static bfd_boolean elf_i386_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf_i386_finish_dynamic_symbol
+static bfd_boolean elf_i386_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
 static enum elf_reloc_type_class elf_i386_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
-static boolean elf_i386_finish_dynamic_sections
+static bfd_boolean elf_i386_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
 #define USE_REL	1		/* 386 uses REL relocations instead of RELA */
@@ -94,39 +94,39 @@ static boolean elf_i386_finish_dynamic_sections
 
 static reloc_howto_type elf_howto_table[]=
 {
-  HOWTO(R_386_NONE, 0, 0, 0, false, 0, complain_overflow_bitfield,
+  HOWTO(R_386_NONE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_NONE",
-	true, 0x00000000, 0x00000000, false),
-  HOWTO(R_386_32, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0x00000000, 0x00000000, FALSE),
+  HOWTO(R_386_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_32",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_PC32, 0, 2, 32, true, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_PC32, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_PC32",
-	true, 0xffffffff, 0xffffffff, true),
-  HOWTO(R_386_GOT32, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(R_386_GOT32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_GOT32",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_PLT32, 0, 2, 32, true, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_PLT32, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_PLT32",
-	true, 0xffffffff, 0xffffffff, true),
-  HOWTO(R_386_COPY, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(R_386_COPY, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_COPY",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_GLOB_DAT, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_GLOB_DAT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_GLOB_DAT",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_JUMP_SLOT, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_JUMP_SLOT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_JUMP_SLOT",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_RELATIVE, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_RELATIVE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_RELATIVE",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_GOTOFF, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_GOTOFF, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_GOTOFF",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_GOTPC, 0, 2, 32, true, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_GOTPC, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_GOTPC",
-	true, 0xffffffff, 0xffffffff, true),
+	TRUE, 0xffffffff, 0xffffffff, TRUE),
 
   /* We have a gap in the reloc numbers here.
      R_386_standard counts the number up to this point, and
@@ -136,58 +136,58 @@ static reloc_howto_type elf_howto_table[]=
 #define R_386_ext_offset ((unsigned int) R_386_TLS_TPOFF - R_386_standard)
 
   /* These relocs are a GNU extension.  */
-  HOWTO(R_386_TLS_TPOFF, 0, 2, 32, false, 0, complain_overflow_bitfield,
+  HOWTO(R_386_TLS_TPOFF, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_TPOFF",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_IE, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_IE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_IE",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_GOTIE, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_GOTIE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_GOTIE",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_LE, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_LE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_LE",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_GD, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_GD, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_GD",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_LDM, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_LDM, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_LDM",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_16, 0, 1, 16, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_16",
-	true, 0xffff, 0xffff, false),
-  HOWTO(R_386_PC16, 0, 1, 16, true, 0, complain_overflow_bitfield,
+	TRUE, 0xffff, 0xffff, FALSE),
+  HOWTO(R_386_PC16, 0, 1, 16, TRUE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_PC16",
-	true, 0xffff, 0xffff, true),
-  HOWTO(R_386_8, 0, 0, 8, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffff, 0xffff, TRUE),
+  HOWTO(R_386_8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_8",
-	true, 0xff, 0xff, false),
-  HOWTO(R_386_PC8, 0, 0, 8, true, 0, complain_overflow_signed,
+	TRUE, 0xff, 0xff, FALSE),
+  HOWTO(R_386_PC8, 0, 0, 8, TRUE, 0, complain_overflow_signed,
 	bfd_elf_generic_reloc, "R_386_PC8",
-	true, 0xff, 0xff, true),
+	TRUE, 0xff, 0xff, TRUE),
 
 #define R_386_ext ((unsigned int) R_386_PC8 + 1 - R_386_ext_offset)
 #define R_386_tls_offset ((unsigned int) R_386_TLS_LDO_32 - R_386_ext)
   /* These are common with Solaris TLS implementation.  */
-  HOWTO(R_386_TLS_LDO_32, 0, 2, 32, false, 0, complain_overflow_bitfield,
+  HOWTO(R_386_TLS_LDO_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_LDO_32",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_IE_32, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_IE_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_IE_32",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_LE_32, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_LE_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_LE_32",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_DTPMOD32, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_DTPMOD32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_DTPMOD32",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_DTPOFF32, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_DTPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_DTPOFF32",
-	true, 0xffffffff, 0xffffffff, false),
-  HOWTO(R_386_TLS_TPOFF32, 0, 2, 32, false, 0, complain_overflow_bitfield,
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_TPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
 	bfd_elf_generic_reloc, "R_386_TLS_TPOFF32",
-	true, 0xffffffff, 0xffffffff, false),
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
 
   /* Another gap.  */
 #define R_386_tls ((unsigned int) R_386_TLS_TPOFF32 + 1 - R_386_tls_offset)
@@ -198,30 +198,30 @@ static reloc_howto_type elf_howto_table[]=
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_386_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 /* GNU extension to record C++ vtable member usage.  */
   HOWTO (R_386_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
 	 "R_386_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false)			/* pcrel_offset */
+	 FALSE)			/* pcrel_offset */
 
 #define R_386_vt ((unsigned int) R_386_GNU_VTENTRY + 1 - R_386_vt_offset)
 
@@ -411,19 +411,19 @@ elf_i386_info_to_howto_rel (abfd, cache_ptr, dst)
    If so, we should move the .X recognition into
    _bfd_elf_is_local_label_name.  */
 
-static boolean
+static bfd_boolean
 elf_i386_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == '.' && name[1] == 'X')
-    return true;
+    return TRUE;
 
   return _bfd_elf_is_local_label_name (abfd, name);
 }
 
 /* Support for core dump NOTE sections.  */
-static boolean
+static bfd_boolean
 elf_i386_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -434,7 +434,7 @@ elf_i386_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 144:		/* Linux/i386 */
 	/* pr_cursig */
@@ -455,7 +455,7 @@ elf_i386_grok_prstatus (abfd, note)
 					  raw_size, note->descpos + offset);
 }
 
-static boolean
+static bfd_boolean
 elf_i386_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -463,7 +463,7 @@ elf_i386_grok_psinfo (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 124:		/* Linux/i386 elf_prpsinfo */
 	elf_tdata (abfd)->core_program
@@ -484,7 +484,7 @@ elf_i386_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 
 /* Functions for the i386 ELF linker.
@@ -611,18 +611,18 @@ struct elf_i386_obj_tdata
 #define elf_i386_local_got_tls_type(abfd) \
   (elf_i386_tdata (abfd)->local_got_tls_type)
 
-static boolean
+static bfd_boolean
 elf_i386_mkobject (abfd)
      bfd *abfd;
 {
   bfd_size_type amt = sizeof (struct elf_i386_obj_tdata);
   abfd->tdata.any = bfd_zalloc (abfd, amt);
   if (abfd->tdata.any == NULL)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf_i386_object_p (abfd)
   bfd *abfd;
 {
@@ -631,10 +631,10 @@ elf_i386_object_p (abfd)
   bfd_size_type amt = sizeof (struct elf_i386_obj_tdata);
   new_tdata = bfd_zalloc (abfd, amt);
   if (new_tdata == NULL)
-    return false;
+    return FALSE;
   new_tdata->root = *abfd->tdata.elf_obj_data;
   abfd->tdata.any = new_tdata;
-  return true;
+  return TRUE;
 }
 
 /* i386 ELF linker hash table.  */
@@ -733,7 +733,7 @@ elf_i386_link_hash_table_create (abfd)
 /* Create .got, .gotplt, and .rel.got sections in DYNOBJ, and set up
    shortcuts to them in our hash table.  */
 
-static boolean
+static bfd_boolean
 create_got_section (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -741,7 +741,7 @@ create_got_section (dynobj, info)
   struct elf_i386_link_hash_table *htab;
 
   if (! _bfd_elf_create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   htab = elf_i386_hash_table (info);
   htab->sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -756,15 +756,15 @@ create_got_section (dynobj, info)
 				   | SEC_IN_MEMORY | SEC_LINKER_CREATED
 				   | SEC_READONLY))
       || ! bfd_set_section_alignment (dynobj, htab->srelgot, 2))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Create .plt, .rel.plt, .got, .got.plt, .rel.got, .dynbss, and
    .rel.bss sections in DYNOBJ, and set up shortcuts to them in our
    hash table.  */
 
-static boolean
+static bfd_boolean
 elf_i386_create_dynamic_sections (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -773,10 +773,10 @@ elf_i386_create_dynamic_sections (dynobj, info)
 
   htab = elf_i386_hash_table (info);
   if (!htab->sgot && !create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   if (!_bfd_elf_create_dynamic_sections (dynobj, info))
-    return false;
+    return FALSE;
 
   htab->splt = bfd_get_section_by_name (dynobj, ".plt");
   htab->srelplt = bfd_get_section_by_name (dynobj, ".rel.plt");
@@ -788,7 +788,7 @@ elf_i386_create_dynamic_sections (dynobj, info)
       || (!info->shared && !htab->srelbss))
     abort ();
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
@@ -878,7 +878,7 @@ elf_i386_tls_transition (info, r_type, is_local)
    calculate needed space in the global offset table, procedure linkage
    table, and dynamic reloc sections.  */
 
-static boolean
+static bfd_boolean
 elf_i386_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -893,7 +893,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = elf_i386_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -916,7 +916,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 	  (*_bfd_error_handler) (_("%s: bad symbol index: %d"),
 				 bfd_archive_filename (abfd),
 				 r_symndx);
-	  return false;
+	  return FALSE;
 	}
 
       if (r_symndx < symtab_hdr->sh_info)
@@ -1000,7 +1000,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 		    local_got_refcounts = ((bfd_signed_vma *)
 					   bfd_zalloc (abfd, size));
 		    if (local_got_refcounts == NULL)
-		      return false;
+		      return FALSE;
 		    elf_local_got_refcounts (abfd) = local_got_refcounts;
 		    elf_i386_local_got_tls_type (abfd)
 		      = (char *) (local_got_refcounts + symtab_hdr->sh_info);
@@ -1025,7 +1025,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 		      (_("%s: `%s' accessed both as normal and thread local symbol"),
 		       bfd_archive_filename (abfd),
 		       h ? h->root.root.string : "<local>");
-		    return false;
+		    return FALSE;
 		  }
 	      }
 
@@ -1047,7 +1047,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 	      if (htab->elf.dynobj == NULL)
 		htab->elf.dynobj = abfd;
 	      if (!create_got_section (htab->elf.dynobj, info))
-		return false;
+		return FALSE;
 	    }
 	  if (r_type != R_386_TLS_IE)
 	    break;
@@ -1058,7 +1058,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 	  if (!info->shared)
 	    break;
 	  info->flags |= DF_STATIC_TLS;
-	  /* Fall through */	    
+	  /* Fall through */
 
 	case R_386_32:
 	case R_386_PC32:
@@ -1128,7 +1128,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 
 		  name = bfd_elf_string_from_elf_section (abfd, strndx, shnam);
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  if (strncmp (name, ".rel", 4) != 0
 		      || strcmp (bfd_get_section_name (abfd, sec),
@@ -1156,7 +1156,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		  elf_section_data (sec)->sreloc = sreloc;
 		}
@@ -1177,7 +1177,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 		  s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
 						 sec, r_symndx);
 		  if (s == NULL)
-		    return false;
+		    return FALSE;
 
 		  head = ((struct elf_i386_dyn_relocs **)
 			  &elf_section_data (s)->local_dynrel);
@@ -1190,7 +1190,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 		  p = ((struct elf_i386_dyn_relocs *)
 		       bfd_alloc (htab->elf.dynobj, amt));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = *head;
 		  *head = p;
 		  p->sec = sec;
@@ -1208,14 +1208,14 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_386_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_386_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	default:
@@ -1223,7 +1223,7 @@ elf_i386_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -1268,7 +1268,7 @@ elf_i386_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 elf_i386_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1371,7 +1371,7 @@ elf_i386_gc_sweep_hook (abfd, info, sec, relocs)
 	break;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -1380,7 +1380,7 @@ elf_i386_gc_sweep_hook (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf_i386_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -1413,7 +1413,7 @@ elf_i386_adjust_dynamic_symbol (info, h)
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	}
 
-      return true;
+      return TRUE;
     }
   else
     /* It's possible that we incorrectly decided a .plt reloc was
@@ -1432,7 +1432,7 @@ elf_i386_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1443,18 +1443,18 @@ elf_i386_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   /* If -z nocopyreloc was given, we won't generate them either.  */
   if (info->nocopyreloc)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   eh = (struct elf_i386_link_hash_entry *) h;
@@ -1470,7 +1470,7 @@ elf_i386_adjust_dynamic_symbol (info, h)
   if (p == NULL)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   /* We must allocate the symbol in our .dynbss section, which will
@@ -1506,7 +1506,7 @@ elf_i386_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
       if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1516,7 +1516,7 @@ elf_i386_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* This is the condition under which elf_i386_finish_dynamic_symbol
@@ -1533,7 +1533,7 @@ elf_i386_adjust_dynamic_symbol (info, h)
 /* Allocate space in .plt, .got and associated reloc sections for
    dynamic relocs.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -1544,7 +1544,7 @@ allocate_dynrelocs (h, inf)
   struct elf_i386_dyn_relocs *p;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     /* When warning symbols are created, they **replace** the "real"
@@ -1564,7 +1564,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
@@ -1622,7 +1622,7 @@ allocate_dynrelocs (h, inf)
   else if (h->got.refcount > 0)
     {
       asection *s;
-      boolean dyn;
+      bfd_boolean dyn;
       int tls_type = elf_i386_hash_entry(h)->tls_type;
 
       /* Make sure this symbol is output as a dynamic symbol.
@@ -1631,7 +1631,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = htab->sgot;
@@ -1661,7 +1661,7 @@ allocate_dynrelocs (h, inf)
 
   eh = (struct elf_i386_link_hash_entry *) h;
   if (eh->dyn_relocs == NULL)
-    return true;
+    return TRUE;
 
   /* In the shared -Bsymbolic case, discard space allocated for
      dynamic pc-relative relocs against symbols which turn out to be
@@ -1707,7 +1707,7 @@ allocate_dynrelocs (h, inf)
 	      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	    {
 	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  /* If that succeeded, we know we'll be keeping all the
@@ -1728,12 +1728,12 @@ allocate_dynrelocs (h, inf)
       sreloc->_raw_size += p->count * sizeof (Elf32_External_Rel);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Find any dynamic relocs that apply to read-only sections.  */
 
-static boolean
+static bfd_boolean
 readonly_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -1756,15 +1756,15 @@ readonly_dynrelocs (h, inf)
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
-	  return false;
+	  return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_i386_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -1772,7 +1772,7 @@ elf_i386_size_dynamic_sections (output_bfd, info)
   struct elf_i386_link_hash_table *htab;
   bfd *dynobj;
   asection *s;
-  boolean relocs;
+  bfd_boolean relocs;
   bfd *ibfd;
 
   htab = elf_i386_hash_table (info);
@@ -1885,7 +1885,7 @@ elf_i386_size_dynamic_sections (output_bfd, info)
 
   /* We now have determined the sizes of the various dynamic sections.
      Allocate memory for them.  */
-  relocs = false;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       if ((s->flags & SEC_LINKER_CREATED) == 0)
@@ -1901,7 +1901,7 @@ elf_i386_size_dynamic_sections (output_bfd, info)
       else if (strncmp (bfd_get_section_name (dynobj, s), ".rel", 4) == 0)
 	{
 	  if (s->_raw_size != 0 && s != htab->srelplt)
-	    relocs = true;
+	    relocs = TRUE;
 
 	  /* We use the reloc_count field as a counter if we need
 	     to copy relocs into the output file.  */
@@ -1936,7 +1936,7 @@ elf_i386_size_dynamic_sections (output_bfd, info)
 	 of garbage.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
     }
 
   if (htab->elf.dynamic_sections_created)
@@ -1952,7 +1952,7 @@ elf_i386_size_dynamic_sections (output_bfd, info)
       if (! info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (htab->splt->_raw_size != 0)
@@ -1961,7 +1961,7 @@ elf_i386_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_REL)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -1969,7 +1969,7 @@ elf_i386_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_REL, 0)
 	      || !add_dynamic_entry (DT_RELSZ, 0)
 	      || !add_dynamic_entry (DT_RELENT, sizeof (Elf32_External_Rel)))
-	    return false;
+	    return FALSE;
 
 	  /* If any dynamic relocs apply to a read-only section,
 	     then we need a DT_TEXTREL entry.  */
@@ -1980,19 +1980,19 @@ elf_i386_size_dynamic_sections (output_bfd, info)
 	  if ((info->flags & DF_TEXTREL) != 0)
 	    {
 	      if (!add_dynamic_entry (DT_TEXTREL, 0))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Set the correct type for an x86 ELF section.  We do this by the
    section name, which is a hack, but ought to work.  */
 
-static boolean
+static bfd_boolean
 elf_i386_fake_sections (abfd, hdr, sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      Elf_Internal_Shdr *hdr;
@@ -2021,7 +2021,7 @@ elf_i386_fake_sections (abfd, hdr, sec)
   if (strcmp (name, ".reloc") == 0)
     hdr->sh_type = SHT_PROGBITS;
 
-  return true;
+  return TRUE;
 }
 
 /* Return the base VMA address which should be subtracted from real addresses
@@ -2058,7 +2058,7 @@ tpoff (info, address)
 
 /* Relocate an i386 ELF section.  */
 
-static boolean
+static bfd_boolean
 elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -2094,7 +2094,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
       asection *sec;
       bfd_vma off;
       bfd_vma relocation;
-      boolean unresolved_reloc;
+      bfd_boolean unresolved_reloc;
       bfd_reloc_status_type r;
       unsigned int indx;
       int tls_type;
@@ -2111,7 +2111,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 	      >= R_386_tls - R_386_ext))
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       howto = elf_howto_table + indx;
 
@@ -2164,7 +2164,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sec = NULL;
-      unresolved_reloc = false;
+      unresolved_reloc = FALSE;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -2252,7 +2252,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 		   relocation value for this symbol.  output_section
 		   is typically NULL for symbols satisfied by a shared
 		   library.  */
-		unresolved_reloc = true;
+		unresolved_reloc = TRUE;
 	      else
 		relocation = (h->root.u.def.value
 			      + sec->output_section->vma
@@ -2272,7 +2272,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 		      input_section, rel->r_offset,
 		      (!info->shared || info->no_undefined
 		       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	    }
 	}
 
@@ -2286,7 +2286,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	  if (h != NULL)
 	    {
-	      boolean dyn;
+	      bfd_boolean dyn;
 
 	      off = h->got.offset;
 	      dyn = htab->elf.dynamic_sections_created;
@@ -2319,7 +2319,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 		    }
 		}
 	      else
-		unresolved_reloc = false;
+		unresolved_reloc = FALSE;
 	    }
 	  else
 	    {
@@ -2382,7 +2382,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 	case R_386_GOTPC:
 	  /* Use global offset table as symbol value.  */
 	  relocation = htab->sgot->output_section->vma;
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  break;
 
 	case R_386_PLT32:
@@ -2406,7 +2406,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 	  relocation = (htab->splt->output_section->vma
 			+ htab->splt->output_offset
 			+ h->plt.offset);
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  break;
 
 	case R_386_32:
@@ -2438,23 +2438,23 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      Elf_Internal_Rela outrel;
 	      bfd_byte *loc;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 	      asection *sreloc;
 
 	      /* When generating a shared object, these relocations
 		 are copied into the output file to be resolved at run
 		 time.  */
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
 
@@ -2471,7 +2471,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 	      else
 		{
 		  /* This symbol is local, or marked to become local.  */
-		  relocate = true;
+		  relocate = TRUE;
 		  outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
 		}
 
@@ -2806,7 +2806,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 		relocation += 4;
 	      if (r_type == R_386_TLS_IE)
 		relocation += htab->sgot->output_section->vma;
-	      unresolved_reloc = false;
+	      unresolved_reloc = FALSE;
 	    }
 	  else
 	    {
@@ -2925,7 +2925,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 	      htab->tls_ldm_got.offset |= 1;
 	    }
 	  relocation = htab->sgot->output_offset + off;
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  break;
 
 	case R_386_TLS_LDO_32:
@@ -2992,7 +2992,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 	     bfd_get_section_name (input_bfd, input_section),
 	     (long) rel->r_offset,
 	     h->root.root.string);
-	  return false;
+	  return FALSE;
 	}
 
       r = _bfd_final_link_relocate (howto, input_bfd, input_section,
@@ -3011,7 +3011,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 						      symtab_hdr->sh_link,
 						      sym->st_name);
 	      if (name == NULL)
-		return false;
+		return FALSE;
 	      if (*name == '\0')
 		name = bfd_section_name (input_bfd, sec);
 	    }
@@ -3021,7 +3021,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
@@ -3030,18 +3030,18 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
 		 bfd_archive_filename (input_bfd),
 		 bfd_get_section_name (input_bfd, input_section),
 		 (long) rel->r_offset, name, (int) r);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf_i386_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -3201,7 +3201,7 @@ elf_i386_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Used to decide how to sort relocs in an optimal manner for the
@@ -3226,7 +3226,7 @@ elf_i386_reloc_type_class (rela)
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_i386_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -3344,7 +3344,7 @@ elf_i386_finish_dynamic_sections (output_bfd, info)
 
       elf_section_data (htab->sgotplt->output_section)->this_hdr.sh_entsize = 4;
     }
-  return true;
+  return TRUE;
 }
 
 #define TARGET_LITTLE_SYM		bfd_elf32_i386_vec
diff --git a/bfd/elf32-i860.c b/bfd/elf32-i860.c
index 8069ec3d5c6..d24a29d8a63 100644
--- a/bfd/elf32-i860.c
+++ b/bfd/elf32-i860.c
@@ -48,7 +48,7 @@ static bfd_reloc_status_type elf32_i860_relocate_pc26
 static bfd_reloc_status_type elf32_i860_relocate_highadj
   PARAMS ((bfd *,  Elf_Internal_Rela *, bfd_byte *, bfd_vma));
 
-static boolean elf32_i860_relocate_section
+static bfd_boolean elf32_i860_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 
@@ -56,7 +56,7 @@ static bfd_reloc_status_type i860_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, bfd_vma));
 
-static boolean elf32_i860_is_local_label_name
+static bfd_boolean elf32_i860_is_local_label_name
   PARAMS ((bfd *, const char *));
 
 /* This howto table is preliminary.  */
@@ -67,480 +67,480 @@ static reloc_howto_type elf32_i860_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32-bit absolute relocation.  */
   HOWTO (R_860_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_860_COPY,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_COPY",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_860_GLOB_DAT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_GLOB_DAT",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_860_JUMP_SLOT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_JUMP_SLOT",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_860_RELATIVE,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_RELATIVE",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 26-bit PC-relative relocation.  */
   HOWTO (R_860_PC26,	        /* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_PC26",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_PLT26,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_PLT26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   /* A 16-bit PC-relative relocation.  */
   HOWTO (R_860_PC16,	        /* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_PC16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x1f07ff,		/* src_mask */
 	 0x1f07ff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_LOW0,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOW0",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_SPLIT0,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_SPLIT0",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x1f07ff,		/* src_mask */
 	 0x1f07ff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_LOW1,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOW1",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfffe,		/* src_mask */
 	 0xfffe,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_SPLIT1,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_SPLIT1",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x1f07fe,		/* src_mask */
 	 0x1f07fe,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_LOW2,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOW2",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfffc,		/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_SPLIT2,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_SPLIT2",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x1f07fc,		/* src_mask */
 	 0x1f07fc,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_LOW3,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOW3",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xfff8,		/* src_mask */
 	 0xfff8,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_LOGOT0,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOGOT0",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_SPGOT0,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_SPGOT0",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_LOGOT1,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOGOT1",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_SPGOT1,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_SPGOT1",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_LOGOTOFF0,        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOGOTOFF0",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_SPGOTOFF0,        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_SPGOTOFF0",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_LOGOTOFF1,        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOGOTOFF1",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_SPGOTOFF1,       /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_SPGOTOFF1",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_LOGOTOFF2,        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOGOTOFF2",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_LOGOTOFF3,        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOGOTOFF3",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_LOPC,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_LOPC",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_HIGHADJ,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_HIGHADJ",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_HAGOT,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_HAGOT",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_HAGOTOFF,        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_HAGOTOFF",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_HAPC,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_HAPC",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_HIGH,	        /* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_HIGH",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 
   HOWTO (R_860_HIGOT,	        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_HIGOT",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),		        /* pcrel_offset */
+	 TRUE),		        /* pcrel_offset */
 
   HOWTO (R_860_HIGOTOFF,        /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_860_HIGOTOFF",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),	        /* pcrel_offset */
+	 FALSE),	        /* pcrel_offset */
 };
 
 static unsigned char elf_code_to_howto_index[R_860_max + 1];
@@ -859,25 +859,25 @@ i860_final_link_relocate (howto, input_bfd, input_section, contents, rel, reloca
    going to be the section symbol corresponding to the output
    section, which means that the addend must be adjusted
    accordingly.  */
-static boolean
+static bfd_boolean
 elf32_i860_relocate_section (output_bfd, info, input_bfd, input_section,
 			     contents, relocs, local_syms, local_sections)
-     bfd *                   output_bfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *  info;
-     bfd *                   input_bfd;
-     asection *              input_section;
-     bfd_byte *              contents;
-     Elf_Internal_Rela *     relocs;
-     Elf_Internal_Sym *      local_syms;
-     asection **             local_sections;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
 {
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -946,8 +946,8 @@ elf32_i860_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1021,7 +1021,7 @@ elf32_i860_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	    case bfd_reloc_undefined:
 	      r = info->callbacks->undefined_symbol
-		(info, name, input_bfd, input_section, rel->r_offset, true);
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -1046,11 +1046,11 @@ elf32_i860_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, name, input_bfd, input_section, rel->r_offset);
 
 	  if (! r)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return whether a symbol name implies a local label.  SVR4/860 compilers
@@ -1058,13 +1058,13 @@ elf32_i860_relocate_section (output_bfd, info, input_bfd, input_section,
    function prolog. These should be local.
    ??? Do any other SVR4 compilers have this convention? If so, this should
    be added to the generic routine.  */
-static boolean
+static bfd_boolean
 elf32_i860_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == '.' && name[1] == 'e' && name[2] == 'p' && name[3] == '.')
-    return true;
+    return TRUE;
 
   return _bfd_elf_is_local_label_name (abfd, name);
 }
diff --git a/bfd/elf32-i960.c b/bfd/elf32-i960.c
index 0655d940e88..4a1e931f293 100644
--- a/bfd/elf32-i960.c
+++ b/bfd/elf32-i960.c
@@ -1,5 +1,5 @@
 /* Intel 860 specific support for 32-bit ELF
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -40,16 +40,16 @@ static void elf32_i960_info_to_howto_rel
 
 static reloc_howto_type elf_howto_table[]=
 {
-  HOWTO(R_960_NONE, 0, 0, 0, false, 0, complain_overflow_bitfield,
-	elf32_i960_relocate, "R_960_NONE", true,
-	0x00000000, 0x00000000, false),
+  HOWTO(R_960_NONE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+	elf32_i960_relocate, "R_960_NONE", TRUE,
+	0x00000000, 0x00000000, FALSE),
   EMPTY_HOWTO (1),
-  HOWTO (R_960_32, 0, 2, 32, false, 0, complain_overflow_bitfield,
-	elf32_i960_relocate, "R_960_32", true,
-	0xffffffff, 0xffffffff, false),
-  HOWTO (R_960_IP24, 0, 2, 24, true, 0, complain_overflow_signed,
-	elf32_i960_relocate, "R_960_IP24 ", true,
-	0x00ffffff, 0x00ffffff, false),
+  HOWTO (R_960_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	elf32_i960_relocate, "R_960_32", TRUE,
+	0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_960_IP24, 0, 2, 24, TRUE, 0, complain_overflow_signed,
+	elf32_i960_relocate, "R_960_IP24 ", TRUE,
+	0x00ffffff, 0x00ffffff, FALSE),
   EMPTY_HOWTO (4),
   EMPTY_HOWTO (5),
   EMPTY_HOWTO (6),
diff --git a/bfd/elf32-ip2k.c b/bfd/elf32-ip2k.c
index 91819822b0a..dd2bb97f61f 100644
--- a/bfd/elf32-ip2k.c
+++ b/bfd/elf32-ip2k.c
@@ -34,25 +34,49 @@ struct misc
 };
 
 /* Prototypes.  */
-static reloc_howto_type *    ip2k_reloc_type_lookup               PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void                  ip2k_info_to_howto_rela              PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static asection *            ip2k_elf_gc_mark_hook                PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *, struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean               ip2k_elf_gc_sweep_hook               PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
-static bfd_vma               symbol_value                         PARAMS ((bfd *, Elf_Internal_Shdr *, Elf_Internal_Sym *, Elf_Internal_Rela *));
-static void                  adjust_all_relocations               PARAMS ((bfd *, asection *, bfd_vma, bfd_vma, int, int));
-static boolean               ip2k_elf_relax_delete_bytes          PARAMS ((bfd *, asection *, bfd_vma, int));
-static boolean               ip2k_elf_relax_add_bytes             PARAMS ((bfd *, asection *, bfd_vma, const bfd_byte *, int, int));
-static boolean               add_page_insn                        PARAMS ((bfd *, asection *, Elf_Internal_Rela *, struct misc *));
-static boolean               ip2k_elf_relax_section               PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static boolean               relax_switch_dispatch_tables_pass1   PARAMS ((bfd *, asection *, bfd_vma, struct misc *));
-static boolean               unrelax_dispatch_table_entries       PARAMS ((bfd *, asection *, bfd_vma, bfd_vma, boolean *, struct misc *));
-static boolean               unrelax_switch_dispatch_tables_passN PARAMS ((bfd *, asection *, bfd_vma, boolean *, struct misc *));
-static boolean               is_switch_128_dispatch_table_p       PARAMS ((bfd *, bfd_vma, boolean, struct misc *));
-static boolean               is_switch_256_dispatch_table_p       PARAMS ((bfd *, bfd_vma, boolean, struct misc *));
-static boolean               ip2k_elf_relax_section_pass1         PARAMS ((bfd *, asection *, boolean *, struct misc *));
-static boolean               ip2k_elf_relax_section_passN         PARAMS ((bfd *, asection *, boolean *, boolean *, struct misc *));
-static bfd_reloc_status_type ip2k_final_link_relocate             PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, bfd_vma));
-static boolean               ip2k_elf_relocate_section            PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static reloc_howto_type *ip2k_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void ip2k_info_to_howto_rela
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static asection * ip2k_elf_gc_mark_hook
+  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
+static bfd_boolean ip2k_elf_gc_sweep_hook
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+static bfd_vma symbol_value
+  PARAMS ((bfd *, Elf_Internal_Shdr *, Elf_Internal_Sym *,
+	   Elf_Internal_Rela *));
+static void adjust_all_relocations
+  PARAMS ((bfd *, asection *, bfd_vma, bfd_vma, int, int));
+static bfd_boolean ip2k_elf_relax_delete_bytes
+  PARAMS ((bfd *, asection *, bfd_vma, int));
+static bfd_boolean ip2k_elf_relax_add_bytes
+  PARAMS ((bfd *, asection *, bfd_vma, const bfd_byte *, int, int));
+static bfd_boolean add_page_insn
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, struct misc *));
+static bfd_boolean ip2k_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean relax_switch_dispatch_tables_pass1
+  PARAMS ((bfd *, asection *, bfd_vma, struct misc *));
+static bfd_boolean unrelax_dispatch_table_entries
+  PARAMS ((bfd *, asection *, bfd_vma, bfd_vma, bfd_boolean *, struct misc *));
+static bfd_boolean unrelax_switch_dispatch_tables_passN
+  PARAMS ((bfd *, asection *, bfd_vma, bfd_boolean *, struct misc *));
+static bfd_boolean is_switch_128_dispatch_table_p
+  PARAMS ((bfd *, bfd_vma, bfd_boolean, struct misc *));
+static bfd_boolean is_switch_256_dispatch_table_p
+  PARAMS ((bfd *, bfd_vma, bfd_boolean, struct misc *));
+static bfd_boolean ip2k_elf_relax_section_pass1
+  PARAMS ((bfd *, asection *, bfd_boolean *, struct misc *));
+static bfd_boolean ip2k_elf_relax_section_passN
+  PARAMS ((bfd *, asection *, bfd_boolean *, bfd_boolean *, struct misc *));
+static bfd_reloc_status_type ip2k_final_link_relocate
+  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, bfd_vma));
+static bfd_boolean ip2k_elf_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 
 #define IS_OPCODE(CODE0,CODE1,OPCODE) \
   ((CODE0) == (OPCODE)[0] && (CODE1) == (OPCODE)[1])
@@ -158,40 +182,40 @@ static reloc_howto_type ip2k_elf_howto_table [] =
           complain_overflow_dont,/* complain_on_overflow */ \
           bfd_elf_generic_reloc,/* special_function */ \
           name,                 /* name */ \
-          false,                /* partial_inplace */ \
+          FALSE,                /* partial_inplace */ \
           sm,                   /* src_mask */ \
           dm,                   /* dst_mask */ \
           pr)                   /* pcrel_offset */
 
   /* This reloc does nothing. */
-  IP2K_HOWTO (R_IP2K_NONE, 0,2,32, false, 0, "R_IP2K_NONE", 0, 0), 
+  IP2K_HOWTO (R_IP2K_NONE, 0,2,32, FALSE, 0, "R_IP2K_NONE", 0, 0),
   /* A 16 bit absolute relocation.  */
-  IP2K_HOWTO (R_IP2K_16, 0,1,16, false, 0, "R_IP2K_16", 0, 0xffff),
+  IP2K_HOWTO (R_IP2K_16, 0,1,16, FALSE, 0, "R_IP2K_16", 0, 0xffff),
   /* A 32 bit absolute relocation.  */
-  IP2K_HOWTO (R_IP2K_32, 0,2,32, false, 0, "R_IP2K_32", 0, 0xffffffff),
+  IP2K_HOWTO (R_IP2K_32, 0,2,32, FALSE, 0, "R_IP2K_32", 0, 0xffffffff),
   /* A 8-bit data relocation for the FR9 field.  Ninth bit is computed specially.  */
-  IP2K_HOWTO (R_IP2K_FR9, 0,1,9, false, 0, "R_IP2K_FR9", 0, 0x00ff),
+  IP2K_HOWTO (R_IP2K_FR9, 0,1,9, FALSE, 0, "R_IP2K_FR9", 0, 0x00ff),
   /* A 4-bit data relocation.  */
-  IP2K_HOWTO (R_IP2K_BANK, 8,1,4, false, 0, "R_IP2K_BANK", 0, 0x000f),
+  IP2K_HOWTO (R_IP2K_BANK, 8,1,4, FALSE, 0, "R_IP2K_BANK", 0, 0x000f),
   /* A 13-bit insn relocation - word address => right-shift 1 bit extra.  */
-  IP2K_HOWTO (R_IP2K_ADDR16CJP, 1,1,13, false, 0, "R_IP2K_ADDR16CJP", 0, 0x1fff),
+  IP2K_HOWTO (R_IP2K_ADDR16CJP, 1,1,13, FALSE, 0, "R_IP2K_ADDR16CJP", 0, 0x1fff),
   /* A 3-bit insn relocation - word address => right-shift 1 bit extra.  */
-  IP2K_HOWTO (R_IP2K_PAGE3, 14,1,3, false, 0, "R_IP2K_PAGE3", 0, 0x0007),
+  IP2K_HOWTO (R_IP2K_PAGE3, 14,1,3, FALSE, 0, "R_IP2K_PAGE3", 0, 0x0007),
   /* Two 8-bit data relocations.  */
-  IP2K_HOWTO (R_IP2K_LO8DATA, 0,1,8, false, 0, "R_IP2K_LO8DATA", 0, 0x00ff),
-  IP2K_HOWTO (R_IP2K_HI8DATA, 8,1,8, false, 0, "R_IP2K_HI8DATA", 0, 0x00ff),
+  IP2K_HOWTO (R_IP2K_LO8DATA, 0,1,8, FALSE, 0, "R_IP2K_LO8DATA", 0, 0x00ff),
+  IP2K_HOWTO (R_IP2K_HI8DATA, 8,1,8, FALSE, 0, "R_IP2K_HI8DATA", 0, 0x00ff),
   /* Two 8-bit insn relocations.  word address => right-shift 1 bit extra.  */
-  IP2K_HOWTO (R_IP2K_LO8INSN, 1,1,8, false, 0, "R_IP2K_LO8INSN", 0, 0x00ff),
-  IP2K_HOWTO (R_IP2K_HI8INSN, 9,1,8, false, 0, "R_IP2K_HI8INSN", 0, 0x00ff),
+  IP2K_HOWTO (R_IP2K_LO8INSN, 1,1,8, FALSE, 0, "R_IP2K_LO8INSN", 0, 0x00ff),
+  IP2K_HOWTO (R_IP2K_HI8INSN, 9,1,8, FALSE, 0, "R_IP2K_HI8INSN", 0, 0x00ff),
 
   /* Special 1 bit relocation for SKIP instructions.  */
-  IP2K_HOWTO (R_IP2K_PC_SKIP, 1,1,1, false, 12, "R_IP2K_PC_SKIP", 0xfffe, 0x1000),
+  IP2K_HOWTO (R_IP2K_PC_SKIP, 1,1,1, FALSE, 12, "R_IP2K_PC_SKIP", 0xfffe, 0x1000),
   /* 16 bit word address.  */
-  IP2K_HOWTO (R_IP2K_TEXT, 1,1,16, false, 0, "R_IP2K_TEXT", 0, 0xffff),
+  IP2K_HOWTO (R_IP2K_TEXT, 1,1,16, FALSE, 0, "R_IP2K_TEXT", 0, 0xffff),
   /* A 7-bit offset relocation for the FR9 field.  Eigth and ninth bit comes from insn.  */
-  IP2K_HOWTO (R_IP2K_FR_OFFSET, 0,1,9, false, 0, "R_IP2K_FR_OFFSET", 0x180, 0x007f),
+  IP2K_HOWTO (R_IP2K_FR_OFFSET, 0,1,9, FALSE, 0, "R_IP2K_FR_OFFSET", 0x180, 0x007f),
   /* Bits 23:16 of an address.  */
-  IP2K_HOWTO (R_IP2K_EX8DATA, 16,1,8, false, 0, "R_IP2K_EX8DATA", 0, 0x00ff),
+  IP2K_HOWTO (R_IP2K_EX8DATA, 16,1,8, FALSE, 0, "R_IP2K_EX8DATA", 0, 0x00ff),
 };
 
 
@@ -257,7 +281,7 @@ symbol_value (abfd, symtab_hdr, isymbuf, irel)
      bfd *abfd;
      Elf_Internal_Shdr *symtab_hdr;
      Elf_Internal_Sym *isymbuf;
-     Elf_Internal_Rela *irel;   
+     Elf_Internal_Rela *irel;
 {
   if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
     {
@@ -296,7 +320,7 @@ symbol_value (abfd, symtab_hdr, isymbuf, irel)
 /* Determine if the instruction sequence matches that for
    the prologue of a switch dispatch table with fewer than
    128 entries.
- 
+
           sc
           page    $nnn0
           jmp     $nnn0
@@ -310,7 +334,7 @@ symbol_value (abfd, symtab_hdr, isymbuf, irel)
  	   ...
  	   page    $nnnN
  	   jmp     $nnnN
- 
+
   After relaxation.
   	   sc
  	   page    $nnn0
@@ -322,24 +346,24 @@ symbol_value (abfd, symtab_hdr, isymbuf, irel)
  	   ...
           jmp     $nnnN  */
 
-static boolean 
+static bfd_boolean
 is_switch_128_dispatch_table_p (abfd, addr, relaxed, misc)
-     bfd *abfd ATTRIBUTE_UNUSED;                
+     bfd *abfd ATTRIBUTE_UNUSED;
      bfd_vma addr;
-     boolean relaxed;
+     bfd_boolean relaxed;
      struct misc *misc;
 {
   bfd_byte code0, code1;
 
   if (addr < (3 * 2))
-    return false;
+    return FALSE;
 
   code0 = bfd_get_8 (abfd, misc->contents + addr - 2);
   code1 = bfd_get_8 (abfd, misc->contents + addr - 1);
 
   /* Is it ADD PCL,W */
   if (! IS_ADD_PCL_W_OPCODE (code0, code1))
-    return false;
+    return FALSE;
 
   code0 = bfd_get_8 (abfd, misc->contents + addr - 4);
   code1 = bfd_get_8 (abfd, misc->contents + addr - 3);
@@ -352,25 +376,25 @@ is_switch_128_dispatch_table_p (abfd, addr, relaxed, misc)
     {
       /* Is it ADD W,WREG  */
       if (! IS_ADD_W_WREG_OPCODE (code0, code1))
-	return false;
+	return FALSE;
 
       code0 = bfd_get_8 (abfd, misc->contents + addr - 6);
       code1 = bfd_get_8 (abfd, misc->contents + addr - 5);
 
       /* Is it JMP $nnnn  */
       if (! IS_JMP_OPCODE (code0, code1))
-        return false;
+        return FALSE;
     }
 
   /* It looks like we've found the prologue for
      a 1-127 entry switch dispatch table.  */
-  return true;
+  return TRUE;
 }
 
 /* Determine if the instruction sequence matches that for
    the prologue switch dispatch table with fewer than
    256 entries but more than 127.
- 
+
    Before relaxation.
           push    %lo8insn(label) ; Push address of table
           push    %hi8insn(label)
@@ -391,7 +415,7 @@ is_switch_128_dispatch_table_p (abfd, addr, relaxed, misc)
  	   ...
  	   page    $nnnN
  	   jmp	   $nnnN
- 
+
   After relaxation.
           push    %lo8insn(label) ; Push address of table
           push    %hi8insn(label)
@@ -407,38 +431,38 @@ is_switch_128_dispatch_table_p (abfd, addr, relaxed, misc)
           ...
           jmp     $nnnN  */
 
-static boolean 
+static bfd_boolean
 is_switch_256_dispatch_table_p (abfd, addr, relaxed,  misc)
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd_vma addr;
-     boolean relaxed;
+     bfd_boolean relaxed;
      struct misc *misc;
 {
   bfd_byte code0, code1;
 
   if (addr < (8 * 2))
-    return false;
+    return FALSE;
 
   code0 = bfd_get_8 (abfd, misc->contents + addr - 2);
   code1 = bfd_get_8 (abfd, misc->contents + addr - 1);
 
   /* Is it INC 1(SP).  */
   if (! IS_INC_1_SP_OPCODE (code0, code1))
-    return false;
+    return FALSE;
 
   code0 = bfd_get_8 (abfd, misc->contents + addr - 4);
   code1 = bfd_get_8 (abfd, misc->contents + addr - 3);
 
   /* Is it SNC.  */
   if (! IS_SNC_OPCODE (code0, code1))
-    return false;
+    return FALSE;
 
   code0 = bfd_get_8 (abfd, misc->contents + addr - 6);
   code1 = bfd_get_8 (abfd, misc->contents + addr - 5);
 
   /* Is it ADD 2(SP),W.  */
   if (! IS_ADD_2_SP_W_OPCODE (code0, code1))
-    return false;
+    return FALSE;
 
   code0 = bfd_get_8 (abfd, misc->contents + addr - 8);
   code1 = bfd_get_8 (abfd, misc->contents + addr - 7);
@@ -451,29 +475,29 @@ is_switch_256_dispatch_table_p (abfd, addr, relaxed,  misc)
     {
       /* Is it INC 1(SP).  */
       if (! IS_INC_1_SP_OPCODE (code0, code1))
-	return false;
+	return FALSE;
 
       code0 = bfd_get_8 (abfd, misc->contents + addr - 10);
       code1 = bfd_get_8 (abfd, misc->contents + addr - 9);
- 
+
       /* Is it SNC.  */
       if (! IS_SNC_OPCODE (code0, code1))
-        return false;
+        return FALSE;
 
       code0 = bfd_get_8 (abfd, misc->contents + addr - 12);
       code1 = bfd_get_8 (abfd, misc->contents + addr - 11);
 
       /* Is it ADD W,WREG.  */
       if (! IS_ADD_W_WREG_OPCODE (code0, code1))
-	return false;
+	return FALSE;
     }
 
   /* It looks like we've found the prologue for
      a 128-255 entry switch dispatch table.  */
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 relax_switch_dispatch_tables_pass1 (abfd, sec, addr, misc)
      bfd *abfd;
      asection *sec;
@@ -486,32 +510,32 @@ relax_switch_dispatch_tables_pass1 (abfd, sec, addr, misc)
       bfd_byte code1 = bfd_get_8 (abfd, misc->contents + addr + 3);
 
       if (IS_JMP_OPCODE (code0, code1)
-	  && is_switch_128_dispatch_table_p (abfd, addr, false, misc))
+	  && is_switch_128_dispatch_table_p (abfd, addr, FALSE, misc))
 	{
 	  /* Delete ADD W,WREG from prologue.  */
 	  ip2k_elf_relax_delete_bytes (abfd, sec, addr - (2 * 2), (1 * 2));
-	  return true;
+	  return TRUE;
 	}
 
       if (IS_JMP_OPCODE (code0, code1)
-	  && is_switch_256_dispatch_table_p (abfd, addr, false, misc))
+	  && is_switch_256_dispatch_table_p (abfd, addr, FALSE, misc))
 	{
 	  /* Delete ADD W,WREG; SNC ; INC 1(SP) from prologue.  */
 	  ip2k_elf_relax_delete_bytes (abfd, sec, addr - 6 * 2, 3 * 2);
-	  return true;
+	  return TRUE;
 	}
     }
- 
-  return true;
+
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 unrelax_dispatch_table_entries (abfd, sec, first, last, changed, misc)
      bfd *abfd;
      asection *sec;
      bfd_vma first;
      bfd_vma last;
-     boolean *changed;
+     bfd_boolean *changed;
      struct misc *misc;
 {
   bfd_vma addr = first;
@@ -543,9 +567,9 @@ unrelax_dispatch_table_entries (abfd, sec, first, last, changed, misc)
                     {
                       if (! add_page_insn (abfd, sec, irel, misc))
 			/* Something has gone wrong.  */
-                        return false;
+                        return FALSE;
 
-		      *changed = true;
+		      *changed = TRUE;
 		      break;
                     }
                }
@@ -553,7 +577,7 @@ unrelax_dispatch_table_entries (abfd, sec, first, last, changed, misc)
 	    /* If we fell off the end something has gone wrong.  */
 	    if (irel >= irelend)
 	      /* Something has gone wrong.  */
-	      return false;
+	      return FALSE;
 
 	    /* Skip the PAGE and JMP isns.  */
 	    addr += 4;
@@ -562,18 +586,18 @@ unrelax_dispatch_table_entries (abfd, sec, first, last, changed, misc)
           }
        else
 	 /* Something has gone wrong.  */
-	 return false;
+	 return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean 
+static bfd_boolean
 unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
      bfd *abfd;
      asection *sec;
      bfd_vma addr;
-     boolean *changed;
+     bfd_boolean *changed;
      struct misc *misc;
 {
   if (2 <= addr && (addr + 3) < sec->_cooked_size)
@@ -594,11 +618,11 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 	}
 
       if (IS_JMP_OPCODE (code0, code1)
-          && is_switch_128_dispatch_table_p (abfd, addr, true, misc))
+          && is_switch_128_dispatch_table_p (abfd, addr, TRUE, misc))
         {
 	  bfd_vma first = addr;
 	  bfd_vma last  = first;
-	  boolean relaxed = true;
+	  bfd_boolean relaxed = TRUE;
 
 	  /* On the final pass we must check if *all* entries in the
 	     dispatch table are relaxed. If *any* are not relaxed
@@ -612,7 +636,7 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 	        code1 = bfd_get_8 (abfd, misc->contents + last + 1);
 
 		if (IS_PAGE_OPCODE (code0, code1))
-		  relaxed = false;
+		  relaxed = FALSE;
 		else if (! IS_JMP_OPCODE (code0, code1))
 		    break;
 
@@ -625,7 +649,7 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 	     cause the link to be aborted.  */
 	  if (last >= sec->_cooked_size)
 	    /* Something has gone wrong.  */
-	    return false;
+	    return FALSE;
 
 	  /* If we found an unrelaxed entry then
 	     unlrelax all the switch table entries.  */
@@ -634,12 +658,12 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 	      if (! unrelax_dispatch_table_entries (abfd, sec, first,
 						    last, changed, misc))
 		/* Something has gone wrong.  */
-	        return false;
+	        return FALSE;
 
-	      if (! is_switch_128_dispatch_table_p (abfd, addr, true, misc))
+	      if (! is_switch_128_dispatch_table_p (abfd, addr, TRUE, misc))
 		/* Something has gone wrong.  */
-		return false;
-		
+		return FALSE;
+
               /* Unrelax the prologue.  */
 
               /* Insert an ADD W,WREG insnstruction.  */
@@ -649,18 +673,18 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 					      sizeof (add_w_wreg_opcode),
 					      0))
 		/* Something has gone wrong.  */
-                return false;
+                return FALSE;
 	    }
 
-          return true;
+          return TRUE;
         }
 
       if (IS_JMP_OPCODE (code0, code1)
-          && is_switch_256_dispatch_table_p (abfd, addr, true, misc))
+          && is_switch_256_dispatch_table_p (abfd, addr, TRUE, misc))
         {
           bfd_vma first = addr;
           bfd_vma last;
-          boolean relaxed = true;
+          bfd_boolean relaxed = TRUE;
 
           /* On the final pass we must check if *all* entries in the
              dispatch table are relaxed. If *any* are not relaxed
@@ -682,10 +706,10 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 
           if (! IS_JMP_OPCODE (code0, code1))
 	    /* Something has gone wrong.  */
-	    return false;
+	    return FALSE;
 
           first += 2;
-	  last = first; 
+	  last = first;
 
           /* Find the last entry in the dispach table.  */
           while (last < sec->_cooked_size)
@@ -694,7 +718,7 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
                 code1 = bfd_get_8 (abfd, misc->contents + last + 1);
 
                 if (IS_PAGE_OPCODE (code0, code1))
-                  relaxed = false;
+                  relaxed = FALSE;
                 else if (! IS_JMP_OPCODE (code0, code1))
                     break;
 
@@ -706,7 +730,7 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
              reached the end of the section then fail the
 	     relaxation.  */
           if (last >= sec->_cooked_size)
-            return false;
+            return FALSE;
 
           /* If we found an unrelaxed entry then
               unrelax all the switch table entries.  */
@@ -714,10 +738,10 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 	    {
 	      if (! unrelax_dispatch_table_entries (abfd, sec, first,
 						    last, changed, misc))
-		return false;
+		return FALSE;
 
-              if (! is_switch_256_dispatch_table_p (abfd, addr, true, misc))
-		return false;
+              if (! is_switch_256_dispatch_table_p (abfd, addr, TRUE, misc))
+		return FALSE;
 
               /* Unrelax the prologue.  */
 
@@ -727,7 +751,7 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
                                               inc_1_sp_opcode,
                                               sizeof (inc_1_sp_opcode),
 					      0))
-		return false;
+		return FALSE;
 
               /* Insert an SNC insnstruction.  */
               if (! ip2k_elf_relax_add_bytes (abfd, sec,
@@ -735,7 +759,7 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 					      snc_opcode,
 					      sizeof (snc_opcode),
 					      0))
-		return false;
+		return FALSE;
 
 	      /* Insert an ADD W,WREG insnstruction.  */
               if (! ip2k_elf_relax_add_bytes (abfd, sec,
@@ -743,24 +767,24 @@ unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
 				 	     add_w_wreg_opcode,
 					     sizeof (add_w_wreg_opcode),
 					     0))
-		return false;
+		return FALSE;
 	    }
 
-          return true;
+          return TRUE;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This function handles relaxing for the ip2k.  */
 
-static boolean
+static bfd_boolean
 ip2k_elf_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
@@ -768,21 +792,21 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
   Elf_Internal_Sym *isymbuf = NULL;
   static asection * first_section = NULL;
   static asection * last_section = NULL;
-  static boolean changed = false;
-  static boolean final_pass = false;
+  static bfd_boolean changed = FALSE;
+  static bfd_boolean final_pass = FALSE;
   static unsigned int pass = 0;
   struct misc misc;
   asection *stab;
 
   /* Assume nothing changes.  */
-  *again = false;
+  *again = FALSE;
 
   if (first_section == NULL)
     first_section = sec;
 
   if (first_section == sec)
     {
-      changed = false;
+      changed = FALSE;
       pass++;
     }
 
@@ -791,7 +815,7 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
      Note if everything is working correctly then the
      relaxation should converge reasonably quickly.  */
   if (pass == 4096)
-    return false;
+    return FALSE;
 
   /* We don't have to do anything for a relocatable link,
      if this section does not have relocs, or if this is
@@ -800,7 +824,7 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0
       || (sec->flags & SEC_CODE) == 0)
-    return true;
+    return TRUE;
 
   if (pass == 1)
     last_section = sec;
@@ -849,7 +873,7 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
 	    goto error_return;
 	}
     }
-      
+
   /* Read this BFD's symbols cached copy if it exists.  */
   if (isymbuf == NULL && symtab_hdr->sh_info != 0)
     {
@@ -866,7 +890,7 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
   misc.isymbuf = isymbuf;
   misc.irelbase = internal_relocs;
   misc.contents = contents;
-  
+
   /* This is where all the relaxation actually get done.  */
 
   if (pass == 1)
@@ -883,7 +907,7 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
     }
   else
     {
-      /* Add page instructions back in as needed but we ignore 
+      /* Add page instructions back in as needed but we ignore
 	 the issue with sections (functions) crossing a page
 	 boundary until we have converged to an approximate
 	 solution (i.e. nothing has changed on this relaxation
@@ -911,18 +935,18 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
 	  pass restart the final relaxaton pass.  */
       if (! changed && last_section == sec)
 	{
-	  /* If this was the final pass and we didn't reset 
+	  /* If this was the final pass and we didn't reset
 	     the final pass flag then we are done, otherwise
 	     do another final pass.  */
 	  if (! final_pass)
 	    {
-	      final_pass = true;
-	      *again = true;
+	      final_pass = TRUE;
+	      *again = TRUE;
 	    }
 	}
     }
 
-  /* Perform some house keeping after relaxing the section.  */  
+  /* Perform some house keeping after relaxing the section.  */
 
   if (isymbuf != NULL
       && symtab_hdr->contents != (unsigned char *) isymbuf)
@@ -949,7 +973,7 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL
@@ -961,16 +985,16 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
   if (internal_relocs != NULL
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
-  return false;
+  return FALSE;
 }
 
 /* This function handles relaxation during the first pass.  */
 
-static boolean
+static bfd_boolean
 ip2k_elf_relax_section_pass1 (abfd, sec, again, misc)
      bfd *abfd;
      asection *sec;
-     boolean *again;
+     bfd_boolean *again;
      struct misc * misc;
 {
   Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
@@ -997,8 +1021,8 @@ ip2k_elf_relax_section_pass1 (abfd, sec, again, misc)
 	    /* Handle switch dispatch tables/prologues.  */
 	    if (!  relax_switch_dispatch_tables_pass1 (abfd, sec,
 						       irel->r_offset, misc))
-	      return false;
-	    
+	      return FALSE;
+
 	    /* Fix the relocation's type.  */
 	    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
 				         R_IP2K_NONE);
@@ -1007,31 +1031,31 @@ ip2k_elf_relax_section_pass1 (abfd, sec, again, misc)
 	    if (! ip2k_elf_relax_delete_bytes (abfd, sec,
 					       irel->r_offset,
 					       sizeof (page_opcode)))
-	      return false;
+	      return FALSE;
 
 	    /* That will change things, so, we should relax again.
 	       Note that this is not required, and it may be slow.  */
-	    *again = true;
+	    *again = TRUE;
 	  }
       }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This function handles relaxation for 2nd and subsequent passes.  */
 
-static boolean
+static bfd_boolean
 ip2k_elf_relax_section_passN (abfd, sec, again, final_pass, misc)
      bfd *abfd;
      asection *sec;
-     boolean *again;
-     boolean *final_pass;
+     bfd_boolean *again;
+     bfd_boolean *final_pass;
      struct misc * misc;
 {
   Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
   Elf_Internal_Rela *irel;
-  boolean add_all;
+  bfd_boolean add_all;
 
   /* If we are on the final relaxation pass and the section crosses
      then set a flag to indicate that *all* page instructions need
@@ -1055,12 +1079,12 @@ ip2k_elf_relax_section_passN (abfd, sec, again, final_pass, misc)
 	    {
 	      sec->userdata = NULL;
 	      if (! ip2k_elf_relax_section_pass1 (abfd, sec, again, misc))
-		return false;
+		return FALSE;
 	    }
 	}
     }
   else
-    add_all = false;
+    add_all = FALSE;
 
   /* Walk thru the section looking for call/jmp
       instructions which need a page instruction.  */
@@ -1100,10 +1124,10 @@ ip2k_elf_relax_section_passN (abfd, sec, again, final_pass, misc)
 		if (! unrelax_switch_dispatch_tables_passN (abfd, sec,
 						            irel->r_offset,
                                                             again, misc))
-		  return false;
+		  return FALSE;
 
                 if (*again)
-		  add_all = false;
+		  add_all = FALSE;
 	      }
 
 	    code0 = bfd_get_8 (abfd, misc->contents + irel->r_offset - 2);
@@ -1117,21 +1141,21 @@ ip2k_elf_relax_section_passN (abfd, sec, again, final_pass, misc)
 		if (add_all || PAGENO (addr) != PAGENO (value))
 		  {
 		    if (! add_page_insn (abfd, sec, irel, misc))
-		      return false;
+		      return FALSE;
 
 		    /* That will have changed things, so,  we must relax again.  */
-		    *again = true;
+		    *again = TRUE;
 		  }
 	       }
 	   }
         }
     }
-      
+
   /* If anything changed reset the final pass flag.  */
   if (*again)
-    *final_pass = false;
+    *final_pass = FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Parts of a Stabs entry.  */
@@ -1162,7 +1186,7 @@ adjust_all_relocations (abfd, sec, addr, endaddr, count, noadj)
   struct elf_link_hash_entry **sym_hashes;
   struct elf_link_hash_entry **end_hashes;
   unsigned int symcount;
-    
+
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
 
@@ -1245,7 +1269,7 @@ adjust_all_relocations (abfd, sec, addr, endaddr, count, noadj)
   return;
 }
 
-static boolean
+static bfd_boolean
 add_page_insn (abfd, sec, irel, misc)
       bfd *abfd;
       asection *sec;
@@ -1262,7 +1286,7 @@ add_page_insn (abfd, sec, irel, misc)
                                   page_opcode,
                                   sizeof (page_opcode),
 				  sizeof (page_opcode)))
-    return false;
+    return FALSE;
   else
     {
        Elf_Internal_Rela * jrel = irel - 1;
@@ -1272,7 +1296,7 @@ add_page_insn (abfd, sec, irel, misc)
 	 {
 	   bfd_byte code0, code1;
 	   char *msg = NULL;
-	   
+
 	   /* Get the opcode.  */
 	   code0 = bfd_get_8 (abfd, misc->contents + irel->r_offset);
 	   code1 = bfd_get_8 (abfd, misc->contents + irel->r_offset + 1);
@@ -1289,7 +1313,7 @@ add_page_insn (abfd, sec, irel, misc)
 	       fprintf (stderr, msg, sec->owner->filename);
 	     }
 
-	   return false;
+	   return FALSE;
 	 }
 
        jrel->r_addend = irel->r_addend;
@@ -1298,12 +1322,12 @@ add_page_insn (abfd, sec, irel, misc)
                                     R_IP2K_PAGE3);
      }
 
-   return true;
+   return TRUE;
 }
 
 /* Insert bytes into a section while relaxing.  */
 
-static boolean
+static bfd_boolean
 ip2k_elf_relax_add_bytes (abfd, sec, addr, bytes, count, noadj)
      bfd *abfd;
      asection *sec;
@@ -1320,16 +1344,16 @@ ip2k_elf_relax_add_bytes (abfd, sec, addr, bytes, count, noadj)
 
   /* Insert the bytes into the section.  */
   memcpy  (contents + addr, bytes, count);
-  
+
   sec->_cooked_size += count;
 
   adjust_all_relocations (abfd, sec, addr, endaddr, count, noadj);
-  return true;
+  return TRUE;
 }
 
 /* Delete some bytes from a section while relaxing.  */
 
-static boolean
+static bfd_boolean
 ip2k_elf_relax_delete_bytes (abfd, sec, addr, count)
      bfd *abfd;
      asection *sec;
@@ -1346,7 +1370,7 @@ ip2k_elf_relax_delete_bytes (abfd, sec, addr, count)
   sec->_cooked_size -= count;
 
   adjust_all_relocations (abfd, sec, addr + count, endaddr, -count, 0);
-  return true;
+  return TRUE;
 }
 
 /* -------------------------------------------------------------------- */
@@ -1467,25 +1491,25 @@ ip2k_final_link_relocate (howto, input_bfd, input_section, contents, rel,
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 ip2k_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
-     bfd *                   output_bfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *  info;
-     bfd *                   input_bfd;
-     asection *              input_section;
-     bfd_byte *              contents;
-     Elf_Internal_Rela *     relocs;
-     Elf_Internal_Sym *      local_syms;
-     asection **             local_sections;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
 {
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -1502,7 +1526,7 @@ ip2k_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       bfd_reloc_status_type        r;
       const char *                 name = NULL;
       int                          r_type;
-      
+
       /* This is a final link.  */
       r_type = ELF32_R_TYPE (rel->r_info);
       r_symndx = ELF32_R_SYM (rel->r_info);
@@ -1510,13 +1534,13 @@ ip2k_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       h      = NULL;
       sym    = NULL;
       sec    = NULL;
-      
+
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
 	  sec = local_sections [r_symndx];
 	  relocation = BASEADDR (sec) + sym->st_value;
-	  
+
 	  name = bfd_elf_string_from_elf_section
 	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
 	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
@@ -1524,13 +1548,13 @@ ip2k_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       else
 	{
 	  h = sym_hashes [r_symndx - symtab_hdr->sh_info];
-	  
+
 	  while (h->root.type == bfd_link_hash_indirect
 		 || h->root.type == bfd_link_hash_warning)
 	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
 	  name = h->root.root.string;
-	  
+
 	  if (h->root.type == bfd_link_hash_defined
 	      || h->root.type == bfd_link_hash_defweak)
 	    {
@@ -1547,7 +1571,7 @@ ip2k_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		     (info, h->root.root.string, input_bfd,
 		      input_section, rel->r_offset,
 		     (! info->shared || info->no_undefined))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1567,12 +1591,12 @@ ip2k_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		(info, name, howto->name, (bfd_vma) 0,
 		 input_bfd, input_section, rel->r_offset);
 	      break;
-	      
+
 	    case bfd_reloc_undefined:
 	      r = info->callbacks->undefined_symbol
-		(info, name, input_bfd, input_section, rel->r_offset, true);
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
 	      break;
-	      
+
 	    case bfd_reloc_outofrange:
 	      msg = _("internal error: out of range error");
 	      break;
@@ -1598,11 +1622,11 @@ ip2k_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, name, input_bfd, input_section, rel->r_offset);
 
 	  if (! r)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 static asection *
@@ -1617,7 +1641,7 @@ ip2k_elf_gc_mark_hook (sec, info, rel, h, sym)
     {
       switch (ELF32_R_TYPE (rel->r_info))
       {
-#if 0 
+#if 0
       case R_IP2K_GNU_VTINHERIT:
       case R_IP2K_GNU_VTENTRY:
         break;
@@ -1651,7 +1675,7 @@ ip2k_elf_gc_mark_hook (sec, info, rel, h, sym)
   return NULL;
 }
 
-static boolean
+static bfd_boolean
 ip2k_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1659,7 +1683,7 @@ ip2k_elf_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* we don't use got and plt entries for ip2k */
-  return true;
+  return TRUE;
 }
 
 
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index d395f1c44da..8bfe91a1f76 100644
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -44,36 +44,36 @@ static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 static void m32r_info_to_howto_rel
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-boolean _bfd_m32r_elf_section_from_bfd_section
+bfd_boolean _bfd_m32r_elf_section_from_bfd_section
   PARAMS ((bfd *, asection *, int *));
 void _bfd_m32r_elf_symbol_processing
   PARAMS ((bfd *, asymbol *));
-static boolean m32r_elf_add_symbol_hook
+static bfd_boolean m32r_elf_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
-static boolean m32r_elf_relocate_section
+static bfd_boolean m32r_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 #if 0 /* not yet */
-static boolean m32r_elf_relax_delete_bytes
+static bfd_boolean m32r_elf_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, int));
 #endif
 static bfd_reloc_status_type m32r_elf_final_sda_base
   PARAMS ((bfd *, struct bfd_link_info *, const char **, bfd_vma *));
-static boolean m32r_elf_object_p
+static bfd_boolean m32r_elf_object_p
   PARAMS ((bfd *));
 static void m32r_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
-static boolean m32r_elf_set_private_flags
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean m32r_elf_set_private_flags
   PARAMS ((bfd *, flagword));
-static boolean m32r_elf_merge_private_bfd_data
+static bfd_boolean m32r_elf_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean m32r_elf_print_private_bfd_data
+static bfd_boolean m32r_elf_print_private_bfd_data
   PARAMS ((bfd *, PTR));
-static boolean m32r_elf_gc_sweep_hook
+static bfd_boolean m32r_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean m32r_elf_check_relocs
+static bfd_boolean m32r_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
@@ -101,60 +101,60 @@ static reloc_howto_type m32r_elf_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M32R_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit absolute relocation.  */
   HOWTO (R_M32R_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 m32r_elf_generic_reloc,/* special_function */
 	 "R_M32R_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  */
   HOWTO (R_M32R_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 m32r_elf_generic_reloc,/* special_function */
 	 "R_M32R_32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 24 bit address.  */
   HOWTO (R_M32R_24,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 m32r_elf_generic_reloc,/* special_function */
 	 "R_M32R_24",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffff,		/* src_mask */
 	 0xffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An PC Relative 10-bit relocation, shifted by 2.
      This reloc is complicated because relocations are relative to pc & -4.
@@ -168,30 +168,30 @@ static reloc_howto_type m32r_elf_howto_table[] =
 	 2,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 10,	                /* bitsize */
-	 true,	                /* pc_relative */
+	 TRUE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 m32r_elf_10_pcrel_reloc, /* special_function */
 	 "R_M32R_10_PCREL",	/* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0xff,		        /* src_mask */
 	 0xff,   		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 18 bit relocation, right shifted by 2.  */
   HOWTO (R_M32R_18_PCREL,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M32R_18_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 26 bit relocation, right shifted by 2.  */
   /* ??? It's not clear whether this should have partial_inplace set or not.
@@ -202,105 +202,105 @@ static reloc_howto_type m32r_elf_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M32R_26_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffff,		/* src_mask */
 	 0xffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* High 16 bits of address when lower 16 is or'd in.  */
   HOWTO (R_M32R_HI16_ULO,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 m32r_elf_hi16_reloc,	/* special_function */
 	 "R_M32R_HI16_ULO",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of address when lower 16 is added in.  */
   HOWTO (R_M32R_HI16_SLO,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 m32r_elf_hi16_reloc,	/* special_function */
 	 "R_M32R_HI16_SLO",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Lower 16 bits of address.  */
   HOWTO (R_M32R_LO16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 m32r_elf_lo16_reloc,	/* special_function */
 	 "R_M32R_LO16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Small data area 16 bits offset.  */
   HOWTO (R_M32R_SDA16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 m32r_elf_sda16_reloc,	/* special_function */
 	 "R_M32R_SDA16",	/* name */
-	 true,			/* partial_inplace */  /* FIXME: correct? */
+	 TRUE,			/* partial_inplace */  /* FIXME: correct? */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_M32R_GNU_VTINHERIT, /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_M32R_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_M32R_GNU_VTENTRY,     /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_M32R_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
 };
 
@@ -768,7 +768,7 @@ m32r_info_to_howto_rel (abfd, cache_ptr, dst)
 /* Given a BFD section, try to locate the corresponding ELF section
    index.  */
 
-boolean
+bfd_boolean
 _bfd_m32r_elf_section_from_bfd_section (abfd, sec, retval)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec;
@@ -777,9 +777,9 @@ _bfd_m32r_elf_section_from_bfd_section (abfd, sec, retval)
   if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
     {
       *retval = SHN_M32R_SCOMMON;
-      return true;
+      return TRUE;
     }
-  return false;
+  return FALSE;
 }
 
 /* M32R ELF uses two common sections.  One is the usual one, and the other
@@ -830,7 +830,7 @@ _bfd_m32r_elf_symbol_processing (abfd, asym)
    We also keep watching for whether we need to create the sdata special
    linker sections.  */
 
-static boolean
+static bfd_boolean
 m32r_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -863,13 +863,13 @@ m32r_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
 	  s = bfd_make_section_anyway (abfd, ".sdata");
 	  if (s == NULL)
-	    return false;
+	    return FALSE;
 	  bfd_set_section_flags (abfd, s, flags);
 	  bfd_set_section_alignment (abfd, s, 2);
 	}
 
       bh = bfd_link_hash_lookup (info->hash, "_SDA_BASE_",
-				 false, false, false);
+				 FALSE, FALSE, FALSE);
 
       if ((bh == NULL || bh->type == bfd_link_hash_undefined)
 	  && !(_bfd_generic_link_add_one_symbol (info,
@@ -879,10 +879,10 @@ m32r_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 						 s,
 						 (bfd_vma) 32768,
 						 (const char *) NULL,
-						 false,
+						 FALSE,
 						 get_elf_backend_data (abfd)->collect,
 						 &bh)))
-	return false;
+	return FALSE;
       h = (struct elf_link_hash_entry *) bh;
       h->type = STT_OBJECT;
     }
@@ -896,7 +896,7 @@ m32r_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We have to figure out the SDA_BASE value, so that we can adjust the
@@ -916,7 +916,7 @@ m32r_elf_final_sda_base (output_bfd, info, error_message, psb)
     {
       struct bfd_link_hash_entry *h;
 
-      h = bfd_link_hash_lookup (info->hash, "_SDA_BASE_", false, false, true);
+      h = bfd_link_hash_lookup (info->hash, "_SDA_BASE_", FALSE, FALSE, TRUE);
       if (h != (struct bfd_link_hash_entry *) NULL
 	  && h->type == bfd_link_hash_defined)
 	elf_gp (output_bfd) = (h->u.def.value
@@ -968,7 +968,7 @@ m32r_elf_final_sda_base (output_bfd, info, error_message, psb)
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -984,11 +984,11 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
   Elf_Internal_Rela *rel, *relend;
   /* Assume success.  */
-  boolean ret = true;
+  bfd_boolean ret = TRUE;
 
 #if !USE_REL
   if (info->relocateable)
-    return true;
+    return TRUE;
 #endif
 
   rel = relocs;
@@ -1019,7 +1019,7 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				 bfd_archive_filename (input_bfd),
 				 (int) r_type);
 	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 	}
 
@@ -1143,8 +1143,8 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		{
 		  if (! ((*info->callbacks->undefined_symbol)
 			 (info, h->root.root.string, input_bfd,
-			  input_section, offset, true)))
-		    return false;
+			  input_section, offset, TRUE)))
+		    return FALSE;
 		  relocation = 0;
 		}
 	    }
@@ -1211,7 +1211,7 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 						 &sda_base);
 		    if (r != bfd_reloc_ok)
 		      {
-			ret = false;
+			ret = FALSE;
 			goto check_reloc;
 		      }
 
@@ -1229,7 +1229,7 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		       m32r_elf_howto_table[(int) r_type].name,
 		       bfd_get_section_name (abfd, sec));
 		    /*bfd_set_error (bfd_error_bad_value); ??? why? */
-		    ret = false;
+		    ret = FALSE;
 		    continue;
 		  }
 	      }
@@ -1269,14 +1269,14 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, offset)))
-		return false;
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_undefined:
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, name, input_bfd, input_section,
-		      offset, true)))
-		return false;
+		      offset, TRUE)))
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -1299,7 +1299,7 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->warning)
 		    (info, errmsg, name, input_bfd, input_section,
 		     offset)))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
@@ -1331,12 +1331,12 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
    When the chip supports parallel 16 bit insns, things may change.
 */
 
-static boolean
+static bfd_boolean
 m32r_elf_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   /* The Rela structures are used here because that's what
@@ -1348,7 +1348,7 @@ m32r_elf_relax_section (abfd, sec, link_info, again)
   Elf_Internal_Sym *isymbuf = NULL;
 
   /* Assume nothing changes.  */
-  *again = false;
+  *again = FALSE;
 
   /* We don't have to do anything for a relocateable link, if
      this section does not have relocs, or if this is not a
@@ -1358,7 +1358,7 @@ m32r_elf_relax_section (abfd, sec, link_info, again)
       || sec->reloc_count == 0
       || (sec->flags & SEC_CODE) == 0
       || 0 /* FIXME: check SHF_M32R_CAN_RELAX */)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -1608,7 +1608,7 @@ m32r_elf_relax_section (abfd, sec, link_info, again)
 
 	  /* That will change things, so we should relax again.
 	     Note that this is not required, and it may be slow.  */
-	  *again = true;
+	  *again = TRUE;
 
 	  continue;
 	}
@@ -1644,7 +1644,7 @@ m32r_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL
@@ -1657,12 +1657,12 @@ m32r_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return false;
+  return FALSE;
 }
 
 /* Delete some bytes from a section while relaxing.  */
 
-static boolean
+static bfd_boolean
 m32r_elf_relax_delete_bytes (abfd, sec, addr, count)
      bfd *abfd;
      asection *sec;
@@ -1736,7 +1736,7 @@ m32r_elf_relax_delete_bytes (abfd, sec, addr, count)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is a version of bfd_generic_get_relocated_section_contents
@@ -1749,7 +1749,7 @@ m32r_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   Elf_Internal_Shdr *symtab_hdr;
@@ -1783,7 +1783,7 @@ m32r_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
 
       internal_relocs = (_bfd_elf32_link_read_relocs
 			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
+			  (Elf_Internal_Rela *) NULL, FALSE));
       if (internal_relocs == NULL)
 	goto error_return;
 
@@ -1854,7 +1854,7 @@ m32r_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
 #endif /* #if 0 */
 
 /* Set the right machine number.  */
-static boolean
+static bfd_boolean
 m32r_elf_object_p (abfd)
      bfd *abfd;
 {
@@ -1864,14 +1864,14 @@ m32r_elf_object_p (abfd)
     case E_M32R_ARCH:   (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32r);  break;
     case E_M32RX_ARCH:  (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32rx); break;
     }
-  return true;
+  return TRUE;
 }
 
 /* Store the machine number in the flags field.  */
 static void
 m32r_elf_final_write_processing (abfd, linker)
-     bfd *   abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd *abfd;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
 
@@ -1887,32 +1887,32 @@ m32r_elf_final_write_processing (abfd, linker)
 }
 
 /* Function to keep M32R specific file flags.  */
-static boolean
+static bfd_boolean
 m32r_elf_set_private_flags (abfd, flags)
-     bfd *    abfd;
+     bfd *abfd;
      flagword flags;
 {
   BFD_ASSERT (!elf_flags_init (abfd)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
-static boolean
+static bfd_boolean
 m32r_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
+     bfd *ibfd;
+     bfd *obfd;
 {
   flagword out_flags;
   flagword in_flags;
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   in_flags  = elf_elfheader (ibfd)->e_flags;
   out_flags = elf_elfheader (obfd)->e_flags;
@@ -1926,9 +1926,9 @@ m32r_elf_merge_private_bfd_data (ibfd, obfd)
 	 unitialised values, which surprise surprise, correspond
 	 to the default values.  */
       if (bfd_get_arch_info (ibfd)->the_default)
-	return true;
+	return TRUE;
 
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = in_flags;
 
       if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
@@ -1937,12 +1937,12 @@ m32r_elf_merge_private_bfd_data (ibfd, obfd)
 	  return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
 	}
 
-      return true;
+      return TRUE;
     }
 
   /* Check flag compatibility.  */
   if (in_flags == out_flags)
-    return true;
+    return TRUE;
 
   if ((in_flags & EF_M32R_ARCH) != (out_flags & EF_M32R_ARCH))
     {
@@ -1953,18 +1953,18 @@ m32r_elf_merge_private_bfd_data (ibfd, obfd)
 	     bfd_archive_filename (ibfd));
 
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Display the flags field */
-static boolean
+static bfd_boolean
 m32r_elf_print_private_bfd_data (abfd, ptr)
-     bfd *   abfd;
-     PTR     ptr;
+     bfd *abfd;
+     PTR ptr;
 {
   FILE * file = (FILE *) ptr;
 
@@ -1983,7 +1983,7 @@ m32r_elf_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
 
 asection *
@@ -2023,7 +2023,7 @@ m32r_elf_gc_mark_hook (sec, info, rel, h, sym)
   return NULL;
 }
 
-static boolean
+static bfd_boolean
 m32r_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -2031,14 +2031,14 @@ m32r_elf_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* we don't use got and plt entries for m32r */
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 m32r_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2051,7 +2051,7 @@ m32r_elf_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -2077,19 +2077,19 @@ m32r_elf_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_M32R_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_M32R_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 #define ELF_ARCH		bfd_arch_m32r
diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
index 836602404d1..aa6cb515161 100644
--- a/bfd/elf32-m68hc11.c
+++ b/bfd/elf32-m68hc11.c
@@ -38,17 +38,17 @@ static bfd_reloc_status_type m68hc11_elf_ignore_reloc
 static asection *elf32_m68hc11_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf32_m68hc11_gc_sweep_hook
+static bfd_boolean elf32_m68hc11_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf32_m68hc11_check_relocs
+static bfd_boolean elf32_m68hc11_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf32_m68hc11_relocate_section
+static bfd_boolean elf32_m68hc11_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean m68hc11_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
+static bfd_boolean m68hc11_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
 static void m68hc11_elf_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, int));
 static void m68hc11_relax_group
@@ -57,9 +57,9 @@ static void m68hc11_relax_group
 static int compare_reloc PARAMS ((const void *, const void *));
 
 
-boolean _bfd_m68hc11_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-boolean _bfd_m68hc11_elf_set_private_flags PARAMS ((bfd *, flagword));
-boolean _bfd_m68hc11_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
+bfd_boolean _bfd_m68hc11_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
+bfd_boolean _bfd_m68hc11_elf_set_private_flags PARAMS ((bfd *, flagword));
+bfd_boolean _bfd_m68hc11_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
 
 /* Use REL instead of RELA to save space */
 #define USE_REL	1
@@ -75,90 +75,90 @@ static reloc_howto_type elf_m68hc11_howto_table[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_NONE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 8 bit absolute relocation */
   HOWTO (R_M68HC11_8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 8 bit absolute relocation (upper address) */
   HOWTO (R_M68HC11_HI8,		/* type */
 	 8,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_HI8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 8 bit absolute relocation (upper address) */
   HOWTO (R_M68HC11_LO8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_LO8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 8 bit PC-rel relocation */
   HOWTO (R_M68HC11_PCREL_8,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_PCREL_8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit absolute relocation */
   HOWTO (R_M68HC11_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont /*bitfield */ ,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  This one is never used for the
      code relocation.  It's used by gas for -gstabs generation.  */
@@ -166,120 +166,120 @@ static reloc_howto_type elf_m68hc11_howto_table[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 3 bit absolute relocation */
   HOWTO (R_M68HC11_3B,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 3,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_4B",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x003,			/* src_mask */
 	 0x003,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit PC-rel relocation */
   HOWTO (R_M68HC11_PCREL_16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_PCREL_16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_M68HC11_GNU_VTINHERIT,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_M68HC11_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_M68HC11_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
 	 "R_M68HC11_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 24 bit relocation */
   HOWTO (R_M68HC11_24,	        /* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_24",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-  
+	 FALSE),		/* pcrel_offset */
+
   /* A 16-bit low relocation */
   HOWTO (R_M68HC11_LO16,        /* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_LO16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A page relocation */
   HOWTO (R_M68HC11_PAGE,        /* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC11_PAGE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (14),
   EMPTY_HOWTO (15),
@@ -287,36 +287,36 @@ static reloc_howto_type elf_m68hc11_howto_table[] = {
   EMPTY_HOWTO (17),
   EMPTY_HOWTO (18),
   EMPTY_HOWTO (19),
-  
+
   /* Mark beginning of a jump instruction (any form).  */
   HOWTO (R_M68HC11_RL_JUMP,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m68hc11_elf_ignore_reloc,	/* special_function */
 	 "R_M68HC11_RL_JUMP",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),                 /* pcrel_offset */
+	 TRUE),                 /* pcrel_offset */
 
   /* Mark beginning of Gcc relaxation group instruction.  */
   HOWTO (R_M68HC11_RL_GROUP,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m68hc11_elf_ignore_reloc,	/* special_function */
 	 "R_M68HC11_RL_GROUP",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),                 /* pcrel_offset */
+	 TRUE),                 /* pcrel_offset */
 };
 
 /* Map BFD reloc types to M68HC11 ELF reloc types.  */
@@ -434,7 +434,7 @@ elf32_m68hc11_gc_mark_hook (sec, info, rel, h, sym)
   return NULL;
 }
 
-static boolean
+static bfd_boolean
 elf32_m68hc11_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -442,10 +442,10 @@ elf32_m68hc11_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* We don't use got and plt entries for 68hc11/68hc12.  */
-  return true;
+  return TRUE;
 }
 
-struct m68hc11_direct_relax 
+struct m68hc11_direct_relax
 {
   const char *name;
   unsigned char code;
@@ -629,15 +629,15 @@ m68hc11_relax_group (abfd, sec, contents, value, offset, end_group)
 
 /* This function handles relaxing for the 68HC11.
 
-   
+
 	and somewhat more difficult to support.  */
 
-static boolean
+static bfd_boolean
 m68hc11_elf_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Shdr *shndx_hdr;
@@ -653,7 +653,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
   Elf_Internal_Sym *isymbuf = NULL;
 
   /* Assume nothing changes.  */
-  *again = false;
+  *again = FALSE;
 
   /* We don't have to do anything for a relocateable link, if
      this section does not have relocs, or if this is not a
@@ -662,7 +662,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0
       || (sec->flags & SEC_CODE) == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -745,7 +745,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
 
           prev_insn_branch = 0;
           prev_insn_group = 0;
-          
+
 	  /* Do nothing if this reloc is the last byte in the section.  */
 	  if (irel->r_offset == sec->_cooked_size)
 	    continue;
@@ -829,7 +829,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
 	{
           prev_insn_branch = 0;
           prev_insn_group = 0;
-          
+
 	  /* Do nothing if this reloc is the last byte in the section.  */
 	  if (irel->r_offset == sec->_cooked_size)
 	    continue;
@@ -864,7 +864,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
           prev_insn_branch = 0;
           continue;
         }
-      
+
       value = symval;
       /* Try to turn a far branch to a near branch.  */
       if (ELF32_R_TYPE (irel->r_info) == (int) R_M68HC11_16
@@ -910,7 +910,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
                                               irel->r_offset - 1, 3);
             }
           prev_insn_branch = 0;
-          *again = true;
+          *again = TRUE;
         }
 
       /* Try to turn a 16 bit address into a 8 bit page0 address.  */
@@ -933,7 +933,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
           if (prev_insn_group)
             {
               unsigned long old_sec_size = sec->_cooked_size;
-              
+
               /* Note that we've changed the reldection contents, etc.  */
               elf_section_data (sec)->relocs = internal_relocs;
               free_relocs = NULL;
@@ -952,10 +952,10 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
               irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
                                            R_M68HC11_NONE);
               if (sec->_cooked_size != old_sec_size)
-                *again = true;
+                *again = TRUE;
               continue;
             }
-          
+
           /* Get the opcode.  */
           code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
           rinfo = find_relaxable_insn (code);
@@ -989,7 +989,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
                                        R_M68HC11_8);
 
           /* That will change things, so, we should relax again.  */
-          *again = true;
+          *again = TRUE;
         }
       else if (ELF32_R_TYPE (irel->r_info) == R_M68HC11_16)
         {
@@ -1013,10 +1013,10 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
                   /* Note that we've changed the reldection contents, etc.  */
                   elf_section_data (sec)->relocs = internal_relocs;
                   free_relocs = NULL;
-                  
+
                   elf_section_data (sec)->this_hdr.contents = contents;
                   free_contents = NULL;
-                  
+
                   symtab_hdr->contents = (bfd_byte *) isymbuf;
                   free_extsyms = NULL;
 
@@ -1031,7 +1031,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
                   m68hc11_elf_relax_delete_bytes (abfd, sec,
                                                   irel->r_offset + 1, 1);
                   /* That will change things, so, we should relax again.  */
-                  *again = true;
+                  *again = TRUE;
                 }
             }
         }
@@ -1068,7 +1068,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
       free_extsyms = NULL;
     }
 
-  return true;
+  return TRUE;
 
  error_return:
   if (free_relocs != NULL)
@@ -1077,7 +1077,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again)
     free (free_contents);
   if (free_extsyms != NULL)
     free (free_extsyms);
-  return false;
+  return FALSE;
 }
 
 /* Delete some bytes from a section while relaxing.  */
@@ -1116,7 +1116,7 @@ m68hc11_elf_relax_delete_bytes (abfd, sec, addr, count)
 	   (size_t) (toaddr - addr - count));
 
   sec->_cooked_size -= count;
-  
+
   /* Adjust all the relocs.  */
   for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
     {
@@ -1209,7 +1209,7 @@ m68hc11_elf_relax_delete_bytes (abfd, sec, addr, count)
               /*printf ("Not adjusted 0x%04x [0x%4x 0x%4x]\n", raddr,
                 irel->r_offset, addr);*/
             }
-          
+
           break;
 	}
     }
@@ -1247,7 +1247,7 @@ m68hc11_elf_relax_delete_bytes (abfd, sec, addr, count)
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 elf32_m68hc11_check_relocs (abfd, info, sec, relocs)
      bfd * abfd;
      struct bfd_link_info * info;
@@ -1261,7 +1261,7 @@ elf32_m68hc11_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *     rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -1289,23 +1289,23 @@ elf32_m68hc11_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_M68HC11_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_M68HC11_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate a 68hc11/68hc12 ELF section.  */
-static boolean
+static bfd_boolean
 elf32_m68hc11_relocate_section (output_bfd, info, input_bfd, input_section,
                                 contents, relocs, local_syms, local_sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -1398,8 +1398,8 @@ elf32_m68hc11_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (!((*info->callbacks->undefined_symbol)
 		    (info, h->root.root.string, input_bfd,
-		     input_section, rel->r_offset, true)))
-		return false;
+		     input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1428,14 +1428,14 @@ elf32_m68hc11_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->reloc_overflow)
 		    (info, name, howto->name, (bfd_vma) 0,
 		     input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_undefined:
 	      if (!((*info->callbacks->undefined_symbol)
 		    (info, name, input_bfd, input_section,
-		     rel->r_offset, true)))
-		return false;
+		     rel->r_offset, TRUE)))
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -1458,20 +1458,20 @@ elf32_m68hc11_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->warning)
 		    (info, msg, name, input_bfd, input_section,
 		     rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 
 
 /* Set and control ELF flags in ELF header.  */
 
-boolean
+bfd_boolean
 _bfd_m68hc11_elf_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -1480,29 +1480,29 @@ _bfd_m68hc11_elf_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-boolean
+bfd_boolean
 _bfd_m68hc11_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   flagword old_flags;
   flagword new_flags;
-  boolean ok = true;
+  bfd_boolean ok = TRUE;
 
   /* Check if we have the same endianess */
-  if (_bfd_generic_verify_endian_match (ibfd, obfd) == false)
-    return false;
+  if (!_bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   new_flags = elf_elfheader (ibfd)->e_flags;
   elf_elfheader (obfd)->e_flags |= new_flags & EF_M68HC11_ABI;
@@ -1510,7 +1510,7 @@ _bfd_m68hc11_elf_merge_private_bfd_data (ibfd, obfd)
 
   if (! elf_flags_init (obfd))
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = new_flags;
       elf_elfheader (obfd)->e_ident[EI_CLASS]
 	= elf_elfheader (ibfd)->e_ident[EI_CLASS];
@@ -1520,10 +1520,10 @@ _bfd_m68hc11_elf_merge_private_bfd_data (ibfd, obfd)
 	{
 	  if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
 				   bfd_get_mach (ibfd)))
-	    return false;
+	    return FALSE;
 	}
 
-      return true;
+      return TRUE;
     }
 
   /* Check ABI compatibility.  */
@@ -1533,7 +1533,7 @@ _bfd_m68hc11_elf_merge_private_bfd_data (ibfd, obfd)
 	(_("%s: linking files compiled for 16-bit integers (-mshort) "
            "and others for 32-bit integers"),
 	 bfd_archive_filename (ibfd));
-      ok = false;
+      ok = FALSE;
     }
   if ((new_flags & E_M68HC11_F64) != (old_flags & E_M68HC11_F64))
     {
@@ -1541,7 +1541,7 @@ _bfd_m68hc11_elf_merge_private_bfd_data (ibfd, obfd)
 	(_("%s: linking files compiled for 32-bit double (-fshort-double) "
            "and others for 64-bit double"),
 	 bfd_archive_filename (ibfd));
-      ok = false;
+      ok = FALSE;
     }
   new_flags &= ~EF_M68HC11_ABI;
   old_flags &= ~EF_M68HC11_ABI;
@@ -1553,19 +1553,19 @@ _bfd_m68hc11_elf_merge_private_bfd_data (ibfd, obfd)
 	(_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
 	 bfd_archive_filename (ibfd), (unsigned long) new_flags,
 	 (unsigned long) old_flags);
-      ok = false;
+      ok = FALSE;
     }
 
   if (! ok)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 _bfd_m68hc11_elf_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -1597,7 +1597,7 @@ _bfd_m68hc11_elf_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
 
 /* Below is the only difference between elf32-m68hc12.c and elf32-m68hc11.c.
diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
index 44a28476fb3..3dba14ca9de 100644
--- a/bfd/elf32-m68hc12.c
+++ b/bfd/elf32-m68hc12.c
@@ -43,13 +43,13 @@ static bfd_vma m68hc12_phys_page PARAMS ((bfd_vma));
 static asection *elf32_m68hc11_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf32_m68hc11_gc_sweep_hook
+static bfd_boolean elf32_m68hc11_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
-boolean _bfd_m68hc12_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-boolean _bfd_m68hc12_elf_set_private_flags PARAMS ((bfd *, flagword));
-boolean _bfd_m68hc12_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
+bfd_boolean _bfd_m68hc12_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
+bfd_boolean _bfd_m68hc12_elf_set_private_flags PARAMS ((bfd *, flagword));
+bfd_boolean _bfd_m68hc12_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
 
 
 
@@ -120,7 +120,7 @@ boolean _bfd_m68hc12_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
 
 
    The 'call _foo' must be relocated with page 3 and 16-bit address
-   mapped at 0x8000.  
+   mapped at 0x8000.
 
    The 3-bit and 16-bit PC rel relocation is only used by 68HC12.  */
 static reloc_howto_type elf_m68hc11_howto_table[] = {
@@ -129,90 +129,90 @@ static reloc_howto_type elf_m68hc11_howto_table[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC12_NONE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 8 bit absolute relocation */
   HOWTO (R_M68HC11_8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC12_8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 8 bit absolute relocation (upper address) */
   HOWTO (R_M68HC11_HI8,		/* type */
 	 8,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC12_HI8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 8 bit absolute relocation (upper address) */
   HOWTO (R_M68HC11_LO8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC12_LO8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 8 bit PC-rel relocation */
   HOWTO (R_M68HC11_PCREL_8,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC12_PCREL_8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit absolute relocation */
   HOWTO (R_M68HC11_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont /*bitfield */ ,	/* complain_on_overflow */
 	 m68hc12_elf_special_reloc,	/* special_function */
 	 "R_M68HC12_16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  This one is never used for the
      code relocation.  It's used by gas for -gstabs generation.  */
@@ -220,120 +220,120 @@ static reloc_howto_type elf_m68hc11_howto_table[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC12_32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 3 bit absolute relocation */
   HOWTO (R_M68HC11_3B,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 3,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC12_4B",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x003,			/* src_mask */
 	 0x003,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit PC-rel relocation */
   HOWTO (R_M68HC11_PCREL_16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_M68HC12_PCREL_16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_M68HC11_GNU_VTINHERIT,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_M68HC11_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_M68HC11_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
 	 "R_M68HC11_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 24 bit relocation */
   HOWTO (R_M68HC11_24,	        /* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m68hc12_elf_special_reloc,	/* special_function */
 	 "R_M68HC12_24",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-  
+	 FALSE),		/* pcrel_offset */
+
   /* A 16-bit low relocation */
   HOWTO (R_M68HC11_LO16,        /* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m68hc12_elf_special_reloc,/* special_function */
 	 "R_M68HC12_LO16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A page relocation */
   HOWTO (R_M68HC11_PAGE,        /* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m68hc12_elf_special_reloc,/* special_function */
 	 "R_M68HC12_PAGE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ff,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (14),
   EMPTY_HOWTO (15),
@@ -341,36 +341,36 @@ static reloc_howto_type elf_m68hc11_howto_table[] = {
   EMPTY_HOWTO (17),
   EMPTY_HOWTO (18),
   EMPTY_HOWTO (19),
-  
+
   /* Mark beginning of a jump instruction (any form).  */
   HOWTO (R_M68HC11_RL_JUMP,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m68hc11_elf_ignore_reloc,	/* special_function */
 	 "R_M68HC12_RL_JUMP",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),                 /* pcrel_offset */
+	 TRUE),                 /* pcrel_offset */
 
   /* Mark beginning of Gcc relaxation group instruction.  */
   HOWTO (R_M68HC11_RL_GROUP,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 m68hc11_elf_ignore_reloc,	/* special_function */
 	 "R_M68HC12_RL_GROUP",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),                 /* pcrel_offset */
+	 TRUE),                 /* pcrel_offset */
 };
 
 /* Map BFD reloc types to M68HC11 ELF reloc types.  */
@@ -495,7 +495,7 @@ m68hc12_elf_special_reloc (abfd, reloc_entry, symbol, data, input_section,
   bfd_vma phys_page;
   bfd_vma insn_page;
   bfd_vma insn_addr;
-  
+
   if (output_bfd != (bfd *) NULL
       && (symbol->flags & BSF_SECTION_SYM) == 0
       && (! reloc_entry->howto->partial_inplace
@@ -551,7 +551,7 @@ m68hc12_elf_special_reloc (abfd, reloc_entry, symbol, data, input_section,
                                "the normal address space");
             return bfd_reloc_dangerous;
          }
-      
+
     case R_M68HC11_LO16:
       bfd_put_16 (abfd, phys_addr, (bfd_byte*) data + reloc_entry->address);
       break;
@@ -569,7 +569,7 @@ m68hc12_elf_special_reloc (abfd, reloc_entry, symbol, data, input_section,
        abort ();
        break;
     }
-  
+
   return bfd_reloc_ok;
 }
 
@@ -621,7 +621,7 @@ elf32_m68hc11_gc_mark_hook (sec, info, rel, h, sym)
   return NULL;
 }
 
-static boolean
+static bfd_boolean
 elf32_m68hc11_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -629,13 +629,13 @@ elf32_m68hc11_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* We don't use got and plt entries for 68hc11/68hc12.  */
-  return true;
+  return TRUE;
 }
 
 
 /* Set and control ELF flags in ELF header.  */
 
-boolean
+bfd_boolean
 _bfd_m68hc12_elf_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -644,29 +644,29 @@ _bfd_m68hc12_elf_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-boolean
+bfd_boolean
 _bfd_m68hc12_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   flagword old_flags;
   flagword new_flags;
-  boolean ok = true;
+  bfd_boolean ok = TRUE;
 
   /* Check if we have the same endianess */
-  if (_bfd_generic_verify_endian_match (ibfd, obfd) == false)
-    return false;
+  if (!_bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   new_flags = elf_elfheader (ibfd)->e_flags;
   elf_elfheader (obfd)->e_flags |= new_flags & EF_M68HC11_ABI;
@@ -674,7 +674,7 @@ _bfd_m68hc12_elf_merge_private_bfd_data (ibfd, obfd)
 
   if (! elf_flags_init (obfd))
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = new_flags;
       elf_elfheader (obfd)->e_ident[EI_CLASS]
 	= elf_elfheader (ibfd)->e_ident[EI_CLASS];
@@ -684,10 +684,10 @@ _bfd_m68hc12_elf_merge_private_bfd_data (ibfd, obfd)
 	{
 	  if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
 				   bfd_get_mach (ibfd)))
-	    return false;
+	    return FALSE;
 	}
 
-      return true;
+      return TRUE;
     }
 
   /* Check ABI compatibility.  */
@@ -697,7 +697,7 @@ _bfd_m68hc12_elf_merge_private_bfd_data (ibfd, obfd)
 	(_("%s: linking files compiled for 16-bit integers (-mshort) "
            "and others for 32-bit integers"),
 	 bfd_archive_filename (ibfd));
-      ok = false;
+      ok = FALSE;
     }
   if ((new_flags & E_M68HC11_F64) != (old_flags & E_M68HC11_F64))
     {
@@ -705,7 +705,7 @@ _bfd_m68hc12_elf_merge_private_bfd_data (ibfd, obfd)
 	(_("%s: linking files compiled for 32-bit double (-fshort-double) "
            "and others for 64-bit double"),
 	 bfd_archive_filename (ibfd));
-      ok = false;
+      ok = FALSE;
     }
   new_flags &= ~EF_M68HC11_ABI;
   old_flags &= ~EF_M68HC11_ABI;
@@ -717,19 +717,19 @@ _bfd_m68hc12_elf_merge_private_bfd_data (ibfd, obfd)
 	(_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
 	 bfd_archive_filename (ibfd), (unsigned long) new_flags,
 	 (unsigned long) old_flags);
-      ok = false;
+      ok = FALSE;
     }
 
   if (! ok)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 _bfd_m68hc12_elf_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -756,7 +756,7 @@ _bfd_m68hc12_elf_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
 
 /* Below is the only difference between elf32-m68hc12.c and elf32-m68hc11.c.
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index a8b5c6e51be..a40f09ede96 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -33,89 +33,89 @@ static struct bfd_hash_entry *elf_m68k_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *elf_m68k_link_hash_table_create
   PARAMS ((bfd *));
-static boolean elf_m68k_check_relocs
+static bfd_boolean elf_m68k_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection *elf_m68k_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf_m68k_gc_sweep_hook
+static bfd_boolean elf_m68k_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf_m68k_adjust_dynamic_symbol
+static bfd_boolean elf_m68k_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf_m68k_size_dynamic_sections
+static bfd_boolean elf_m68k_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_m68k_relocate_section
+static bfd_boolean elf_m68k_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf_m68k_finish_dynamic_symbol
+static bfd_boolean elf_m68k_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean elf_m68k_finish_dynamic_sections
+static bfd_boolean elf_m68k_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
-static boolean elf32_m68k_set_private_flags
+static bfd_boolean elf32_m68k_set_private_flags
   PARAMS ((bfd *, flagword));
-static boolean elf32_m68k_merge_private_bfd_data
+static bfd_boolean elf32_m68k_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean elf32_m68k_print_private_bfd_data
+static bfd_boolean elf32_m68k_print_private_bfd_data
   PARAMS ((bfd *, PTR));
 static enum elf_reloc_type_class elf32_m68k_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
 
 static reloc_howto_type howto_table[] = {
-  HOWTO(R_68K_NONE,       0, 0, 0, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_NONE",      false, 0, 0x00000000,false),
-  HOWTO(R_68K_32,         0, 2,32, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_32",        false, 0, 0xffffffff,false),
-  HOWTO(R_68K_16,         0, 1,16, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_16",        false, 0, 0x0000ffff,false),
-  HOWTO(R_68K_8,          0, 0, 8, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_8",         false, 0, 0x000000ff,false),
-  HOWTO(R_68K_PC32,       0, 2,32, true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PC32",      false, 0, 0xffffffff,true),
-  HOWTO(R_68K_PC16,       0, 1,16, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PC16",      false, 0, 0x0000ffff,true),
-  HOWTO(R_68K_PC8,        0, 0, 8, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PC8",       false, 0, 0x000000ff,true),
-  HOWTO(R_68K_GOT32,      0, 2,32, true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_GOT32",     false, 0, 0xffffffff,true),
-  HOWTO(R_68K_GOT16,      0, 1,16, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT16",     false, 0, 0x0000ffff,true),
-  HOWTO(R_68K_GOT8,       0, 0, 8, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT8",      false, 0, 0x000000ff,true),
-  HOWTO(R_68K_GOT32O,     0, 2,32, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_GOT32O",    false, 0, 0xffffffff,false),
-  HOWTO(R_68K_GOT16O,     0, 1,16, false,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT16O",    false, 0, 0x0000ffff,false),
-  HOWTO(R_68K_GOT8O,      0, 0, 8, false,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT8O",     false, 0, 0x000000ff,false),
-  HOWTO(R_68K_PLT32,      0, 2,32, true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PLT32",     false, 0, 0xffffffff,true),
-  HOWTO(R_68K_PLT16,      0, 1,16, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT16",     false, 0, 0x0000ffff,true),
-  HOWTO(R_68K_PLT8,       0, 0, 8, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT8",      false, 0, 0x000000ff,true),
-  HOWTO(R_68K_PLT32O,     0, 2,32, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PLT32O",    false, 0, 0xffffffff,false),
-  HOWTO(R_68K_PLT16O,     0, 1,16, false,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT16O",    false, 0, 0x0000ffff,false),
-  HOWTO(R_68K_PLT8O,      0, 0, 8, false,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT8O",     false, 0, 0x000000ff,false),
-  HOWTO(R_68K_COPY,       0, 0, 0, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_COPY",      false, 0, 0xffffffff,false),
-  HOWTO(R_68K_GLOB_DAT,   0, 2,32, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_GLOB_DAT",  false, 0, 0xffffffff,false),
-  HOWTO(R_68K_JMP_SLOT,   0, 2,32, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_JMP_SLOT",  false, 0, 0xffffffff,false),
-  HOWTO(R_68K_RELATIVE,   0, 2,32, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_RELATIVE",  false, 0, 0xffffffff,false),
+  HOWTO(R_68K_NONE,       0, 0, 0, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_NONE",      FALSE, 0, 0x00000000,FALSE),
+  HOWTO(R_68K_32,         0, 2,32, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_32",        FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_16,         0, 1,16, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_16",        FALSE, 0, 0x0000ffff,FALSE),
+  HOWTO(R_68K_8,          0, 0, 8, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_8",         FALSE, 0, 0x000000ff,FALSE),
+  HOWTO(R_68K_PC32,       0, 2,32, TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PC32",      FALSE, 0, 0xffffffff,TRUE),
+  HOWTO(R_68K_PC16,       0, 1,16, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PC16",      FALSE, 0, 0x0000ffff,TRUE),
+  HOWTO(R_68K_PC8,        0, 0, 8, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PC8",       FALSE, 0, 0x000000ff,TRUE),
+  HOWTO(R_68K_GOT32,      0, 2,32, TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_GOT32",     FALSE, 0, 0xffffffff,TRUE),
+  HOWTO(R_68K_GOT16,      0, 1,16, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT16",     FALSE, 0, 0x0000ffff,TRUE),
+  HOWTO(R_68K_GOT8,       0, 0, 8, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT8",      FALSE, 0, 0x000000ff,TRUE),
+  HOWTO(R_68K_GOT32O,     0, 2,32, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_GOT32O",    FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_GOT16O,     0, 1,16, FALSE,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT16O",    FALSE, 0, 0x0000ffff,FALSE),
+  HOWTO(R_68K_GOT8O,      0, 0, 8, FALSE,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT8O",     FALSE, 0, 0x000000ff,FALSE),
+  HOWTO(R_68K_PLT32,      0, 2,32, TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PLT32",     FALSE, 0, 0xffffffff,TRUE),
+  HOWTO(R_68K_PLT16,      0, 1,16, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT16",     FALSE, 0, 0x0000ffff,TRUE),
+  HOWTO(R_68K_PLT8,       0, 0, 8, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT8",      FALSE, 0, 0x000000ff,TRUE),
+  HOWTO(R_68K_PLT32O,     0, 2,32, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PLT32O",    FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_PLT16O,     0, 1,16, FALSE,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT16O",    FALSE, 0, 0x0000ffff,FALSE),
+  HOWTO(R_68K_PLT8O,      0, 0, 8, FALSE,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT8O",     FALSE, 0, 0x000000ff,FALSE),
+  HOWTO(R_68K_COPY,       0, 0, 0, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_COPY",      FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_GLOB_DAT,   0, 2,32, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_GLOB_DAT",  FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_JMP_SLOT,   0, 2,32, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_JMP_SLOT",  FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_RELATIVE,   0, 2,32, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_RELATIVE",  FALSE, 0, 0xffffffff,FALSE),
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_68K_GNU_VTINHERIT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_68K_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),
+	 FALSE),
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_68K_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
 	 "R_68K_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),
+	 FALSE),
 };
 
 static void
@@ -281,7 +281,7 @@ struct elf_m68k_link_hash_table
 
 /* Declare this now that the above structures are defined.  */
 
-static boolean elf_m68k_discard_copies
+static bfd_boolean elf_m68k_discard_copies
   PARAMS ((struct elf_m68k_link_hash_entry *, PTR));
 
 /* Traverse an m68k ELF linker hash table.  */
@@ -289,7 +289,7 @@ static boolean elf_m68k_discard_copies
 #define elf_m68k_link_hash_traverse(table, func, info)			\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the m68k ELF linker hash table from a link_info structure.  */
@@ -353,19 +353,19 @@ elf_m68k_link_hash_table_create (abfd)
 }
 
 /* Keep m68k-specific flags in the ELF header */
-static boolean
+static bfd_boolean
 elf32_m68k_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
 {
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
-static boolean
+static bfd_boolean
 elf32_m68k_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -375,22 +375,22 @@ elf32_m68k_merge_private_bfd_data (ibfd, obfd)
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   in_flags  = elf_elfheader (ibfd)->e_flags;
   out_flags = elf_elfheader (obfd)->e_flags;
 
   if (!elf_flags_init (obfd))
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = in_flags;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Display the flags field */
-static boolean
+static bfd_boolean
 elf32_m68k_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -415,13 +415,13 @@ elf32_m68k_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
    table.  */
 
-static boolean
+static bfd_boolean
 elf_m68k_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -439,7 +439,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -482,7 +482,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 	      /* Create the .got section.  */
 	      elf_hash_table (info)->dynobj = dynobj = abfd;
 	      if (!_bfd_elf_create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	    }
 
 	  if (sgot == NULL)
@@ -507,7 +507,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 						  | SEC_LINKER_CREATED
 						  | SEC_READONLY))
 		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -519,7 +519,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 		  if (h->dynindx == -1)
 		    {
 		      if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-			return false;
+			return FALSE;
 		    }
 
 		  /* Allocate space in the .got section.  */
@@ -541,7 +541,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 		  local_got_refcounts = ((bfd_signed_vma *)
 					 bfd_zalloc (abfd, size));
 		  if (local_got_refcounts == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 		}
 	      if (local_got_refcounts[r_symndx] == 0)
@@ -589,14 +589,14 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 		 local symbol.  FIXME: does it?  How to handle it if
 		 it does make sense?  */
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 
 	  /* Make sure this symbol is output as a dynamic symbol.  */
 	  if (h->dynindx == -1)
 	    {
 	      if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
@@ -660,7 +660,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (abfd, sec),
@@ -679,7 +679,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 						      | SEC_LINKER_CREATED
 						      | SEC_READONLY))
 			  || !bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		  if (sec->flags & SEC_READONLY)
 		    info->flags |= DF_TEXTREL;
@@ -713,7 +713,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 		      p = ((struct elf_m68k_pcrel_relocs_copied *)
 			   bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
 		      if (p == NULL)
-			return false;
+			return FALSE;
 		      p->next = eh->pcrel_relocs_copied;
 		      eh->pcrel_relocs_copied = p;
 		      p->section = sreloc;
@@ -730,14 +730,14 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_68K_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_68K_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 
 	default:
@@ -745,7 +745,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -790,7 +790,7 @@ elf_m68k_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 elf_m68k_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -813,7 +813,7 @@ elf_m68k_gc_sweep_hook (abfd, info, sec, relocs)
 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj == NULL)
-    return true;
+    return TRUE;
 
   sgot = bfd_get_section_by_name (dynobj, ".got");
   srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
@@ -886,7 +886,7 @@ elf_m68k_gc_sweep_hook (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -895,7 +895,7 @@ elf_m68k_gc_sweep_hook (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf_m68k_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -938,7 +938,7 @@ elf_m68k_adjust_dynamic_symbol (info, h)
 	     reloc instead.  */
 	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
 	  h->plt.offset = (bfd_vma) -1;
-	  return true;
+	  return TRUE;
 	}
 
       /* GC may have rendered this entry unused.  */
@@ -946,14 +946,14 @@ elf_m68k_adjust_dynamic_symbol (info, h)
 	{
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	  h->plt.offset = (bfd_vma) -1;
-	  return true;
+	  return TRUE;
 	}
 
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = bfd_get_section_by_name (dynobj, ".plt");
@@ -1002,7 +1002,7 @@ elf_m68k_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf32_External_Rela);
 
-      return true;
+      return TRUE;
     }
 
   /* Reinitialize the plt offset now that it is not used as a reference
@@ -1018,7 +1018,7 @@ elf_m68k_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1029,7 +1029,7 @@ elf_m68k_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -1070,7 +1070,7 @@ elf_m68k_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (!bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1080,20 +1080,20 @@ elf_m68k_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_m68k_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean plt;
-  boolean relocs;
+  bfd_boolean plt;
+  bfd_boolean relocs;
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
@@ -1133,12 +1133,12 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  plt = false;
-  relocs = false;
+  plt = FALSE;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -1147,7 +1147,7 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
-      strip = false;
+      strip = FALSE;
 
       if (strcmp (name, ".plt") == 0)
 	{
@@ -1155,12 +1155,12 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
 	    {
 	      /* Strip this section if we don't need it; see the
                  comment below.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      plt = TRUE;
 	    }
 	}
       else if (strncmp (name, ".rela", 5) == 0)
@@ -1176,11 +1176,11 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
-	      relocs = true;
+	      relocs = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -1207,7 +1207,7 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
 	 contents to zero.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -1223,7 +1223,7 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (plt)
@@ -1232,7 +1232,7 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -1240,18 +1240,18 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	    return false;
+	    return FALSE;
 	}
 
       if ((info->flags & DF_TEXTREL) != 0)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via elf_m68k_link_hash_traverse if we are
@@ -1260,7 +1260,7 @@ elf_m68k_size_dynamic_sections (output_bfd, info)
    in regular objects.  We allocated space for them in the check_relocs
    routine, but we won't fill them in in the relocate_section routine.  */
 
-static boolean
+static bfd_boolean
 elf_m68k_discard_copies (h, ignore)
      struct elf_m68k_link_hash_entry *h;
      PTR ignore ATTRIBUTE_UNUSED;
@@ -1272,17 +1272,17 @@ elf_m68k_discard_copies (h, ignore)
 
   /* We only discard relocs for symbols defined in a regular object.  */
   if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
+    return TRUE;
 
   for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
     s->section->_raw_size -= s->count * sizeof (Elf32_External_Rela);
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate an M68K ELF section.  */
 
-static boolean
+static bfd_boolean
 elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -1305,7 +1305,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -1333,7 +1333,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r_type < 0 || r_type >= (int) R_68K_max)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       howto = howto_table + r_type;
 
@@ -1422,7 +1422,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 		     input_section, rel->r_offset,
 		     (!info->shared || info->no_undefined
 		      || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1609,7 +1609,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      Elf_Internal_Rela outrel;
 	      bfd_byte *loc;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 
 	      /* When generating a shared object, these relocations
 		 are copied into the output file to be resolved at run
@@ -1624,7 +1624,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -1635,16 +1635,16 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 		  BFD_ASSERT (sreloc != NULL);
 		}
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
 
@@ -1665,7 +1665,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 		{
 		  if (r_type == R_68K_32)
 		    {
-		      relocate = true;
+		      relocate = TRUE;
 		      outrel.r_info = ELF32_R_INFO (0, R_68K_RELATIVE);
 		      outrel.r_addend = relocation + rel->r_addend;
 		    }
@@ -1687,7 +1687,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -1749,27 +1749,27 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 							    symtab_hdr->sh_link,
 							    sym->st_name);
 		    if (name == NULL)
-		      return false;
+		      return FALSE;
 		    if (*name == '\0')
 		      name = bfd_section_name (input_bfd, sec);
 		  }
 		if (!(info->callbacks->reloc_overflow
 		      (info, name, howto->name, (bfd_vma) 0,
 		       input_bfd, input_section, rel->r_offset)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf_m68k_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -1948,12 +1948,12 @@ elf_m68k_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_m68k_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2087,7 +2087,7 @@ elf_m68k_finish_dynamic_sections (output_bfd, info)
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
 
-  return true;
+  return TRUE;
 }
 
 /* Given a .data section and a .emreloc in-memory section, store
@@ -2097,7 +2097,7 @@ elf_m68k_finish_dynamic_sections (output_bfd, info)
    after the add_symbols entry point has been called for all the
    objects, and before the final_link entry point is called.  */
 
-boolean
+bfd_boolean
 bfd_m68k_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2117,7 +2117,7 @@ bfd_m68k_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
   *errmsg = NULL;
 
   if (datasec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
 
@@ -2202,7 +2202,7 @@ bfd_m68k_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
   if (internal_relocs != NULL
       && elf_section_data (datasec)->relocs != internal_relocs)
     free (internal_relocs);
-  return true;
+  return TRUE;
 
 error_return:
   if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
@@ -2210,7 +2210,7 @@ error_return:
   if (internal_relocs != NULL
       && elf_section_data (datasec)->relocs != internal_relocs)
     free (internal_relocs);
-  return false;
+  return FALSE;
 }
 
 static enum elf_reloc_type_class
diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c
index 1cd7791bbb3..927418e03e5 100644
--- a/bfd/elf32-mcore.c
+++ b/bfd/elf32-mcore.c
@@ -37,22 +37,22 @@ static reloc_howto_type * mcore_elf_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void mcore_elf_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean mcore_elf_set_private_flags
+static bfd_boolean mcore_elf_set_private_flags
   PARAMS ((bfd *, flagword));
-static boolean mcore_elf_merge_private_bfd_data
+static bfd_boolean mcore_elf_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
 static bfd_reloc_status_type mcore_elf_unsupported_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean mcore_elf_relocate_section
+static bfd_boolean mcore_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 static asection * mcore_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean mcore_elf_gc_sweep_hook
+static bfd_boolean mcore_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean mcore_elf_check_relocs
+static bfd_boolean mcore_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
@@ -65,30 +65,30 @@ static reloc_howto_type mcore_elf_howto_raw[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,  /* complain_on_overflow */
 	 NULL,                  /* special_function */
 	 "R_MCORE_NONE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 32 bit relocation.  */
   HOWTO (R_MCORE_ADDR32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "ADDR32",		/* name *//* For compatability with coff/pe port.  */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 8 bits + 2 zero bits; jmpi/jsri/lrw instructions.
      Should not appear in object files.  */
@@ -96,15 +96,15 @@ static reloc_howto_type mcore_elf_howto_raw[] =
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mcore_elf_unsupported_reloc,	/* special_function */
 	 "R_MCORE_PCRELIMM8BY4",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* bsr/bt/bf/br instructions; 11 bits + 1 zero bit
      Span 2k instructions == 4k bytes.
@@ -113,45 +113,45 @@ static reloc_howto_type mcore_elf_howto_raw[] =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 11,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MCORE_PCRELIMM11BY2",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0,			/* src_mask */
 	 0x7ff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 4 bits + 1 zero bit; 'loopt' instruction only; unsupported.  */
   HOWTO (R_MCORE_PCRELIMM4BY2,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 4,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mcore_elf_unsupported_reloc,/* special_function */
 	 "R_MCORE_PCRELIMM4BY2",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 32-bit pc-relative. Eventually this will help support PIC code.  */
   HOWTO (R_MCORE_PCREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MCORE_PCREL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Like PCRELIMM11BY2, this relocation indicates that there is a
      'jsri' at the specified address. There is a separate relocation
@@ -164,59 +164,59 @@ static reloc_howto_type mcore_elf_howto_raw[] =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 11,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MCORE_PCRELJSR_IMM11BY2", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0,			/* src_mask */
 	 0x7ff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_MCORE_GNU_VTINHERIT, /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_MCORE_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_MCORE_GNU_VTENTRY,   /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont,/* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_MCORE_GNU_VTENTRY", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   HOWTO (R_MCORE_RELATIVE,      /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 NULL,                  /* special_function */
 	 "R_MCORE_RELATIVE",    /* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false)			/* pcrel_offset */
+	 FALSE)			/* pcrel_offset */
 };
 
 #ifndef NUM_ELEM
@@ -286,7 +286,7 @@ mcore_elf_info_to_howto (abfd, cache_ptr, dst)
 }
 
 /* Function to set whether a module needs the -mrelocatable bit set.  */
-static boolean
+static bfd_boolean
 mcore_elf_set_private_flags (abfd, flags)
      bfd * abfd;
      flagword flags;
@@ -295,13 +295,13 @@ mcore_elf_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
-static boolean
+static bfd_boolean
 mcore_elf_merge_private_bfd_data (ibfd, obfd)
      bfd * ibfd;
      bfd * obfd;
@@ -311,18 +311,18 @@ mcore_elf_merge_private_bfd_data (ibfd, obfd)
 
   /* Check if we have the same endianess */
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   new_flags = elf_elfheader (ibfd)->e_flags;
   old_flags = elf_elfheader (obfd)->e_flags;
 
   if (! elf_flags_init (obfd))	/* First call, no flags set */
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = new_flags;
     }
   else if (new_flags == old_flags)	/* Compatible flags are ok */
@@ -332,7 +332,7 @@ mcore_elf_merge_private_bfd_data (ibfd, obfd)
       /* FIXME */
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Don't pretend we can deal with unsupported relocs.  */
@@ -387,9 +387,9 @@ mcore_elf_unsupported_reloc (abfd, reloc_entry, symbol, data, input_section,
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			  contents, relocs, local_syms, local_sections)
+			    contents, relocs, local_syms, local_sections)
      bfd * output_bfd;
      struct bfd_link_info * info;
      bfd * input_bfd;
@@ -399,11 +399,11 @@ mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
      Elf_Internal_Sym * local_syms;
      asection ** local_sections;
 {
-  Elf_Internal_Shdr *           symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  Elf_Internal_Shdr * symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   struct elf_link_hash_entry ** sym_hashes = elf_sym_hashes (input_bfd);
-  Elf_Internal_Rela *           rel = relocs;
-  Elf_Internal_Rela *           relend = relocs + input_section->reloc_count;
-  boolean ret = true;
+  Elf_Internal_Rela * rel = relocs;
+  Elf_Internal_Rela * relend = relocs + input_section->reloc_count;
+  bfd_boolean ret = TRUE;
 
 #ifdef DEBUG
   fprintf (stderr,
@@ -415,7 +415,7 @@ mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 #endif
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   if (! mcore_elf_howto_table [R_MCORE_PCRELIMM8BY4])	/* Initialize howto table if needed */
     mcore_elf_howto_init ();
@@ -443,7 +443,7 @@ mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			      (int) r_type);
 
 	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 	}
 
@@ -459,7 +459,7 @@ mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			      (int)r_type);
 
 	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 	}
 
@@ -490,10 +490,10 @@ mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 			(info, h->root.root.string, input_bfd,
-		 	 input_section, rel->r_offset, true)))
-		return false;
+		 	 input_section, rel->r_offset, TRUE)))
+		return FALSE;
 
-	      ret = false;
+	      ret = FALSE;
 	      continue;
 	    }
 	}
@@ -527,7 +527,7 @@ mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
       if (r != bfd_reloc_ok)
 	{
-	  ret = false;
+	  ret = FALSE;
 
 	  switch (r)
 	    {
@@ -610,35 +610,35 @@ mcore_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 mcore_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *                     abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *    info ATTRIBUTE_UNUSED;
-     asection *                sec ATTRIBUTE_UNUSED;
+     bfd * abfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info * info ATTRIBUTE_UNUSED;
+     asection * sec ATTRIBUTE_UNUSED;
      const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 mcore_elf_check_relocs (abfd, info, sec, relocs)
      bfd * abfd;
      struct bfd_link_info * info;
      asection * sec;
      const Elf_Internal_Rela * relocs;
 {
-  Elf_Internal_Shdr *           symtab_hdr;
+  Elf_Internal_Shdr * symtab_hdr;
   struct elf_link_hash_entry ** sym_hashes;
   struct elf_link_hash_entry ** sym_hashes_end;
-  const Elf_Internal_Rela *     rel;
-  const Elf_Internal_Rela *     rel_end;
+  const Elf_Internal_Rela * rel;
+  const Elf_Internal_Rela * rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -666,19 +666,19 @@ mcore_elf_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_MCORE_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_MCORE_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 #define TARGET_BIG_SYM		bfd_elf32_mcore_big_vec
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 875e316bf72..485bd2cc2ff 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -60,25 +60,28 @@ static bfd_reloc_status_type mips32_64bit_reloc
 static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static reloc_howto_type *mips_elf32_rtype_to_howto
-  PARAMS ((unsigned int, boolean));
+  PARAMS ((unsigned int, bfd_boolean));
 static void mips_info_to_howto_rel
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void mips_info_to_howto_rela
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean mips_elf_sym_is_global PARAMS ((bfd *, asymbol *));
-static boolean mips_elf32_object_p PARAMS ((bfd *));
-static boolean mips_elf_is_local_label_name
+static bfd_boolean mips_elf_sym_is_global
+  PARAMS ((bfd *, asymbol *));
+static bfd_boolean mips_elf32_object_p
+  PARAMS ((bfd *));
+static bfd_boolean mips_elf_is_local_label_name
   PARAMS ((bfd *, const char *));
 static bfd_reloc_status_type mips16_jump_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type mips16_gprel_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type mips_elf_final_gp
-  PARAMS ((bfd *, asymbol *, boolean, char **, bfd_vma *));
-static boolean mips_elf_assign_gp PARAMS ((bfd *, bfd_vma *));
-static boolean elf32_mips_grok_prstatus
+  PARAMS ((bfd *, asymbol *, bfd_boolean, char **, bfd_vma *));
+static bfd_boolean mips_elf_assign_gp
+  PARAMS ((bfd *, bfd_vma *));
+static bfd_boolean elf32_mips_grok_prstatus
   PARAMS ((bfd *, Elf_Internal_Note *));
-static boolean elf32_mips_grok_psinfo
+static bfd_boolean elf32_mips_grok_psinfo
   PARAMS ((bfd *, Elf_Internal_Note *));
 static irix_compat_t elf32_mips_irix_compat
   PARAMS ((bfd *));
@@ -110,67 +113,67 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit relocation.  */
   HOWTO (R_MIPS_16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit relocation.  */
   HOWTO (R_MIPS_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit symbol relative relocation.  */
   HOWTO (R_MIPS_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_REL32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 26 bit jump address.  */
   HOWTO (R_MIPS_26,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 			/* This needs complex overflow
@@ -178,130 +181,130 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 				   bits must match the PC + 4.  */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03ffffff,		/* src_mask */
 	 0x03ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of symbol value.  */
   HOWTO (R_MIPS_HI16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_hi16_reloc,	/* special_function */
 	 "R_MIPS_HI16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of symbol value.  */
   HOWTO (R_MIPS_LO16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_lo16_reloc,	/* special_function */
 	 "R_MIPS_LO16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GP relative reference.  */
   HOWTO (R_MIPS_GPREL16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
 	 "R_MIPS_GPREL16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to literal section.  */
   HOWTO (R_MIPS_LITERAL,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
 	 "R_MIPS_LITERAL",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to global offset table.  */
   HOWTO (R_MIPS_GOT16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_got16_reloc,	/* special_function */
 	 "R_MIPS_GOT16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit PC relative reference.  */
   HOWTO (R_MIPS_PC16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_PC16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 16 bit call through global offset table.  */
   HOWTO (R_MIPS_CALL16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit GP relative reference.  */
   HOWTO (R_MIPS_GPREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_gprel32_reloc, /* special_function */
 	 "R_MIPS_GPREL32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The remaining relocs are defined on Irix 5, although they are
      not defined by the ABI.  */
@@ -314,15 +317,15 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 5,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SHIFT5",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000007c0,		/* src_mask */
 	 0x000007c0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 6 bit shift field.  */
   /* FIXME: This is not handled correctly; a special function is
@@ -331,120 +334,120 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SHIFT6",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000007c4,		/* src_mask */
 	 0x000007c4,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit relocation.  */
   HOWTO (R_MIPS_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips32_64bit_reloc,	/* special_function */
 	 "R_MIPS_64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement in the global offset table.  */
   HOWTO (R_MIPS_GOT_DISP,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_DISP",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement to page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_PAGE,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_PAGE",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Offset from page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_OFST,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_OFST",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_HI16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_HI16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_LO16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit subtraction.  Used in the N32 ABI.  */
   HOWTO (R_MIPS_SUB,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SUB",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used to cause the linker to insert and delete instructions?  */
   EMPTY_HOWTO (R_MIPS_INSERT_A),
@@ -456,75 +459,75 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_HIGHER",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Get the highest value of a 64 bit addend.  */
   HOWTO (R_MIPS_HIGHEST,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_HIGHEST",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_CALL_HI16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL_HI16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_CALL_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL_LO16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Section displacement.  */
   HOWTO (R_MIPS_SCN_DISP,       /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SCN_DISP",     /* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (R_MIPS_REL16),
   EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
@@ -537,15 +540,15 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_JALR",	        /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 /* The reloc used for BFD_RELOC_CTOR when doing a 64 bit link.  This
@@ -555,15 +558,15 @@ static reloc_howto_type elf_mips_ctor64_howto =
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips32_64bit_reloc,	/* special_function */
 	 "R_MIPS_64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* The reloc used for the mips16 jump instruction.  */
 static reloc_howto_type elf_mips16_jump_howto =
@@ -571,7 +574,7 @@ static reloc_howto_type elf_mips16_jump_howto =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 			/* This needs complex overflow
@@ -579,10 +582,10 @@ static reloc_howto_type elf_mips16_jump_howto =
 				   bits must match the PC.  */
 	 mips16_jump_reloc,	/* special_function */
 	 "R_MIPS16_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* The reloc used for the mips16 gprel instruction.  */
 static reloc_howto_type elf_mips16_gprel_howto =
@@ -590,15 +593,15 @@ static reloc_howto_type elf_mips16_gprel_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips16_gprel_reloc,	/* special_function */
 	 "R_MIPS16_GPREL",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x07ff001f,		/* src_mask */
 	 0x07ff001f,	        /* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* GNU extensions for embedded-pic.  */
 /* High 16 bits of symbol value, pc-relative.  */
@@ -607,15 +610,15 @@ static reloc_howto_type elf_mips_gnu_rel_hi16 =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_hi16_reloc,	/* special_function */
 	 "R_MIPS_GNU_REL_HI16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true);			/* pcrel_offset */
+	 TRUE);			/* pcrel_offset */
 
 /* Low 16 bits of symbol value, pc-relative.  */
 static reloc_howto_type elf_mips_gnu_rel_lo16 =
@@ -623,15 +626,15 @@ static reloc_howto_type elf_mips_gnu_rel_lo16 =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_lo16_reloc,	/* special_function */
 	 "R_MIPS_GNU_REL_LO16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true);			/* pcrel_offset */
+	 TRUE);			/* pcrel_offset */
 
 /* 16 bit offset for pc-relative branches.  */
 static reloc_howto_type elf_mips_gnu_rel16_s2 =
@@ -639,15 +642,15 @@ static reloc_howto_type elf_mips_gnu_rel16_s2 =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GNU_REL16_S2",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true);			/* pcrel_offset */
+	 TRUE);			/* pcrel_offset */
 
 /* 64 bit pc-relative.  */
 static reloc_howto_type elf_mips_gnu_pcrel64 =
@@ -655,15 +658,15 @@ static reloc_howto_type elf_mips_gnu_pcrel64 =
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_PC64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 true);			/* pcrel_offset */
+	 TRUE);			/* pcrel_offset */
 
 /* 32 bit pc-relative.  */
 static reloc_howto_type elf_mips_gnu_pcrel32 =
@@ -671,15 +674,15 @@ static reloc_howto_type elf_mips_gnu_pcrel32 =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_PC32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true);			/* pcrel_offset */
+	 TRUE);			/* pcrel_offset */
 
 /* GNU extension to record C++ vtable hierarchy */
 static reloc_howto_type elf_mips_gnu_vtinherit_howto =
@@ -687,15 +690,15 @@ static reloc_howto_type elf_mips_gnu_vtinherit_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_MIPS_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* GNU extension to record C++ vtable member usage */
 static reloc_howto_type elf_mips_gnu_vtentry_howto =
@@ -703,15 +706,15 @@ static reloc_howto_type elf_mips_gnu_vtentry_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
 	 "R_MIPS_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* Do a R_MIPS_HI16 relocation.  This has to be done in combination
    with a R_MIPS_LO16 reloc, because there is a carry from the LO16 to
@@ -768,17 +771,17 @@ mips_elf_hi16_reloc (abfd, reloc_entry, symbol, data, input_section,
 
   if (strcmp (bfd_asymbol_name (symbol), "_gp_disp") == 0)
     {
-      boolean relocateable;
+      bfd_boolean relocateable;
       bfd_vma gp;
 
       if (ret == bfd_reloc_undefined)
 	abort ();
 
       if (output_bfd != NULL)
-	relocateable = true;
+	relocateable = TRUE;
       else
 	{
-	  relocateable = false;
+	  relocateable = FALSE;
 	  output_bfd = symbol->section->output_section->owner;
 	}
 
@@ -902,7 +905,7 @@ mips_elf_lo16_reloc (abfd, reloc_entry, symbol, data, input_section,
 
       /* FIXME: Does this case ever occur?  */
 
-      ret = mips_elf_final_gp (output_bfd, symbol, true, error_message, &gp);
+      ret = mips_elf_final_gp (output_bfd, symbol, TRUE, error_message, &gp);
       if (ret != bfd_reloc_ok)
 	return ret;
 
@@ -969,10 +972,10 @@ mips_elf_got16_reloc (abfd, reloc_entry, symbol, data, input_section,
   abort ();
 }
 
-/* Set the GP value for OUTPUT_BFD.  Returns false if this is a
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
    dangerous relocation.  */
 
-static boolean
+static bfd_boolean
 mips_elf_assign_gp (output_bfd, pgp)
      bfd *output_bfd;
      bfd_vma *pgp;
@@ -984,7 +987,7 @@ mips_elf_assign_gp (output_bfd, pgp)
   /* If we've already figured out what GP will be, just return it.  */
   *pgp = _bfd_get_gp_value (output_bfd);
   if (*pgp)
-    return true;
+    return TRUE;
 
   count = bfd_get_symcount (output_bfd);
   sym = bfd_get_outsymbols (output_bfd);
@@ -1014,10 +1017,10 @@ mips_elf_assign_gp (output_bfd, pgp)
       /* Only get the error once.  */
       *pgp = 4;
       _bfd_set_gp_value (output_bfd, *pgp);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We have to figure out the gp value, so that we can adjust the
@@ -1030,7 +1033,7 @@ static bfd_reloc_status_type
 mips_elf_final_gp (output_bfd, symbol, relocateable, error_message, pgp)
      bfd *output_bfd;
      asymbol *symbol;
-     boolean relocateable;
+     bfd_boolean relocateable;
      char **error_message;
      bfd_vma *pgp;
 {
@@ -1080,7 +1083,7 @@ _bfd_mips_elf32_gprel16_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
 
@@ -1097,10 +1100,10 @@ _bfd_mips_elf32_gprel16_reloc (abfd, reloc_entry, symbol, data, input_section,
     }
 
   if (output_bfd != (bfd *) NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1117,9 +1120,9 @@ _bfd_mips_elf32_gprel16_reloc (abfd, reloc_entry, symbol, data, input_section,
 /* Do a R_MIPS_GPREL32 relocation.  This is a 32 bit value which must
    become the offset from the gp register.  */
 
-static bfd_reloc_status_type gprel32_with_gp PARAMS ((bfd *, asymbol *,
-						      arelent *, asection *,
-						      boolean, PTR, bfd_vma));
+static bfd_reloc_status_type gprel32_with_gp
+  PARAMS ((bfd *, asymbol *, arelent *, asection *, bfd_boolean, PTR,
+	   bfd_vma));
 
 static bfd_reloc_status_type
 mips_elf_gprel32_reloc (abfd, reloc_entry, symbol, data, input_section,
@@ -1132,7 +1135,7 @@ mips_elf_gprel32_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
 
@@ -1151,12 +1154,12 @@ mips_elf_gprel32_reloc (abfd, reloc_entry, symbol, data, input_section,
 
   if (output_bfd != (bfd *) NULL)
     {
-      relocateable = true;
+      relocateable = TRUE;
       gp = _bfd_get_gp_value (output_bfd);
     }
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
 
       ret = mips_elf_final_gp (output_bfd, symbol, relocateable,
@@ -1176,7 +1179,7 @@ gprel32_with_gp (abfd, symbol, reloc_entry, input_section, relocateable, data,
      asymbol *symbol;
      arelent *reloc_entry;
      asection *input_section;
-     boolean relocateable;
+     bfd_boolean relocateable;
      PTR data;
      bfd_vma gp;
 {
@@ -1290,13 +1293,13 @@ mips16_jump_reloc (abfd, reloc_entry, symbol, data, input_section,
 
   /* FIXME.  */
   {
-    static boolean warned;
+    static bfd_boolean warned;
 
     if (! warned)
       (*_bfd_error_handler)
 	(_("Linking mips16 objects into %s format is not supported"),
 	 bfd_get_target (input_section->output_section->owner));
-    warned = true;
+    warned = TRUE;
   }
 
   return bfd_reloc_undefined;
@@ -1315,7 +1318,7 @@ mips16_gprel_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
   unsigned short extend, insn;
@@ -1334,10 +1337,10 @@ mips16_gprel_reloc (abfd, reloc_entry, symbol, data, input_section,
     }
 
   if (output_bfd != NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1469,7 +1472,7 @@ bfd_elf32_bfd_reloc_type_lookup (abfd, code)
 static reloc_howto_type *
 mips_elf32_rtype_to_howto (r_type, rela_p)
      unsigned int r_type;
-     boolean rela_p ATTRIBUTE_UNUSED;
+     bfd_boolean rela_p ATTRIBUTE_UNUSED;
 {
   switch (r_type)
     {
@@ -1508,7 +1511,7 @@ mips_info_to_howto_rel (abfd, cache_ptr, dst)
   unsigned int r_type;
 
   r_type = ELF32_R_TYPE (dst->r_info);
-  cache_ptr->howto = mips_elf32_rtype_to_howto (r_type, false);
+  cache_ptr->howto = mips_elf32_rtype_to_howto (r_type, FALSE);
 
   /* The addend for a GPREL16 or LITERAL relocation comes from the GP
      value for the object file.  We get the addend now, rather than
@@ -1540,7 +1543,7 @@ mips_info_to_howto_rela (abfd, cache_ptr, dst)
    symbols.  On most ELF targets the split is between static symbols
    and externally visible symbols.  */
 
-static boolean
+static bfd_boolean
 mips_elf_sym_is_global (abfd, sym)
      bfd *abfd ATTRIBUTE_UNUSED;
      asymbol *sym;
@@ -1555,7 +1558,7 @@ mips_elf_sym_is_global (abfd, sym)
 
 /* Set the right machine number for a MIPS ELF file.  */
 
-static boolean
+static bfd_boolean
 mips_elf32_object_p (abfd)
      bfd *abfd;
 {
@@ -1565,26 +1568,26 @@ mips_elf32_object_p (abfd)
      sorted correctly such that local symbols precede global symbols,
      and the sh_info field in the symbol table is not always right.  */
   if (SGI_COMPAT (abfd))
-    elf_bad_symtab (abfd) = true;
+    elf_bad_symtab (abfd) = TRUE;
 
   if (ABI_N32_P (abfd))
-    return false;
+    return FALSE;
 
   mach = _bfd_elf_mips_mach (elf_elfheader (abfd)->e_flags);
   bfd_default_set_arch_mach (abfd, bfd_arch_mips, mach);
 
-  return true;
+  return TRUE;
 }
 
 /* MIPS ELF local labels start with '$', not 'L'.  */
 
-static boolean
+static bfd_boolean
 mips_elf_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == '$')
-    return true;
+    return TRUE;
 
   /* On Irix 6, the labels go back to starting with '.', so we accept
      the generic ELF local label syntax as well.  */
@@ -1592,7 +1595,7 @@ mips_elf_is_local_label_name (abfd, name)
 }
 
 /* Support for core dump NOTE sections.  */
-static boolean
+static bfd_boolean
 elf32_mips_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -1603,7 +1606,7 @@ elf32_mips_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 256:		/* Linux/MIPS */
 	/* pr_cursig */
@@ -1624,7 +1627,7 @@ elf32_mips_grok_prstatus (abfd, note)
 					  raw_size, note->descpos + offset);
 }
 
-static boolean
+static bfd_boolean
 elf32_mips_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -1632,7 +1635,7 @@ elf32_mips_grok_psinfo (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 128:		/* Linux/MIPS elf_prpsinfo */
 	elf_tdata (abfd)->core_program
@@ -1653,7 +1656,7 @@ elf32_mips_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 
 /* Depending on the target vector we generate some version of Irix
@@ -1676,7 +1679,7 @@ elf32_mips_irix_compat (abfd)
    after the add_symbols entry point has been called for all the
    objects, and before the final_link entry point is called.  */
 
-boolean
+bfd_boolean
 bfd_mips_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1695,7 +1698,7 @@ bfd_mips_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
   *errmsg = NULL;
 
   if (datasec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   /* Read this BFD's symbols if we haven't done so already, or get the cached
      copy if it exists.  */
@@ -1794,7 +1797,7 @@ bfd_mips_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
   if (isymbuf != NULL
       && symtab_hdr->contents != (unsigned char *) isymbuf)
     free (isymbuf);
-  return true;
+  return TRUE;
 
  error_return:
   if (internal_relocs != NULL
@@ -1803,7 +1806,7 @@ bfd_mips_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
   if (isymbuf != NULL
       && symtab_hdr->contents != (unsigned char *) isymbuf)
     free (isymbuf);
-  return false;
+  return FALSE;
 }
 
 /* ECOFF swapping routines.  These are used when dealing with the
@@ -1855,9 +1858,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
    a value of 0x1000, and we are compatible.  */
 #define ELF_MAXPAGESIZE			0x1000
 
-#define elf_backend_collect		true
-#define elf_backend_type_change_ok	true
-#define elf_backend_can_gc_sections	true
+#define elf_backend_collect		TRUE
+#define elf_backend_type_change_ok	TRUE
+#define elf_backend_can_gc_sections	TRUE
 #define elf_info_to_howto		mips_info_to_howto_rela
 #define elf_info_to_howto_rel		mips_info_to_howto_rel
 #define elf_backend_sym_is_global	mips_elf_sym_is_global
@@ -1904,7 +1907,7 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
 #define elf_backend_may_use_rel_p	1
 #define elf_backend_may_use_rela_p	0
 #define elf_backend_default_use_rela_p	0
-#define elf_backend_sign_extend_vma	true
+#define elf_backend_sign_extend_vma	TRUE
 
 #define elf_backend_discard_info	_bfd_mips_elf_discard_info
 #define elf_backend_ignore_discarded_relocs \
diff --git a/bfd/elf32-openrisc.c b/bfd/elf32-openrisc.c
index 156b24fe108..8e8d0bc52fa 100644
--- a/bfd/elf32-openrisc.c
+++ b/bfd/elf32-openrisc.c
@@ -31,25 +31,25 @@ static reloc_howto_type *openrisc_reloc_type_lookup
   PARAMS ((bfd * , bfd_reloc_code_real_type));
 static void openrisc_info_to_howto_rela
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean openrisc_elf_relocate_section
+static bfd_boolean openrisc_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 static bfd_reloc_status_type openrisc_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
            Elf_Internal_Rela *, bfd_vma));
-static boolean openrisc_elf_gc_sweep_hook
+static bfd_boolean openrisc_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
            const Elf_Internal_Rela *));
 static asection * openrisc_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean openrisc_elf_check_relocs
+static bfd_boolean openrisc_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean openrisc_elf_object_p
+static bfd_boolean openrisc_elf_object_p
   PARAMS ((bfd *));
 static void openrisc_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
+  PARAMS ((bfd *, bfd_boolean));
 
 
 static reloc_howto_type openrisc_elf_howto_table[] =
@@ -59,148 +59,148 @@ static reloc_howto_type openrisc_elf_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OPENRISC_NONE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A PC relative 26 bit relocation, right shifted by 2.  */
   HOWTO (R_OPENRISC_INSN_REL_26, /* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OPENRISC_INSN_REL_26", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x03ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A absolute 26 bit relocation, right shifted by 2.  */
   HOWTO (R_OPENRISC_INSN_ABS_26, /* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OPENRISC_INSN_ABS_26", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x03ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_OPENRISC_LO_16_IN_INSN, /* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OPENRISC_LO_16_IN_INSN", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_OPENRISC_HI_16_IN_INSN, /* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OPENRISC_HI_16_IN_INSN",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 8 bit absolute relocation.  */
   HOWTO (R_OPENRISC_8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OPENRISC_8",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000,		/* src_mask */
 	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit absolute relocation.  */
   HOWTO (R_OPENRISC_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OPENRISC_16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  */
   HOWTO (R_OPENRISC_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OPENRISC_32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_OPENRISC_GNU_VTINHERIT, /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_OPENRISC_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_OPENRISC_GNU_VTENTRY, /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
 	 "R_OPENRISC_GNU_VTENTRY", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 /* Map BFD reloc types to OpenRISC ELF reloc types.  */
@@ -318,7 +318,7 @@ openrisc_final_link_relocate (howto, input_bfd, input_section, contents, rel,
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 openrisc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			       contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -336,7 +336,7 @@ openrisc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -406,8 +406,8 @@ openrisc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (!((*info->callbacks->undefined_symbol)
 		    (info, h->root.root.string, input_bfd,
-		     input_section, rel->r_offset, true)))
-		return false;
+		     input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -429,7 +429,7 @@ openrisc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	    case bfd_reloc_undefined:
 	      r = info->callbacks->undefined_symbol
-		(info, name, input_bfd, input_section, rel->r_offset, true);
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -454,11 +454,11 @@ openrisc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, name, input_bfd, input_section, rel->r_offset);
 
 	  if (!r)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -503,21 +503,21 @@ openrisc_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 openrisc_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 openrisc_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -530,7 +530,7 @@ openrisc_elf_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -557,24 +557,24 @@ openrisc_elf_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_OPENRISC_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_OPENRISC_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the right machine number.  */
 
-static boolean
+static bfd_boolean
 openrisc_elf_object_p (abfd)
      bfd *abfd;
 {
@@ -584,7 +584,7 @@ openrisc_elf_object_p (abfd)
       (void) bfd_default_set_arch_mach (abfd, bfd_arch_openrisc, 0);
       break;
     }
-  return true;
+  return TRUE;
 }
 
 /* Store the machine number in the flags field.  */
@@ -592,7 +592,7 @@ openrisc_elf_object_p (abfd)
 static void
 openrisc_elf_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
 
diff --git a/bfd/elf32-or32.c b/bfd/elf32-or32.c
index a5214adae26..65f8e2617d3 100644
--- a/bfd/elf32-or32.c
+++ b/bfd/elf32-or32.c
@@ -1,5 +1,5 @@
 /* OR32-specific support for 32-bit ELF
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright 2002 Free Software Foundation, Inc.
    Contributed by Ivan Guzvinec  <ivang@opencores.org>
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -25,16 +25,26 @@
 #include "elf/or32.h"
 #include "libiberty.h"
 
-static reloc_howto_type *     bfd_elf32_bfd_reloc_type_lookup  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void                   or32_info_to_howto_rel           PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean                or32_elf_object_p                PARAMS ((bfd *));
-static void                   or32_elf_final_write_processing  PARAMS ((bfd *, boolean));
-static bfd_reloc_status_type  or32_elf_32_reloc                PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type  or32_elf_16_reloc                PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type  or32_elf_8_reloc                 PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type  or32_elf_const_reloc             PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type  or32_elf_consth_reloc            PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type  or32_elf_jumptarg_reloc          PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void or32_info_to_howto_rel
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static bfd_boolean or32_elf_object_p
+  PARAMS ((bfd *));
+static void or32_elf_final_write_processing
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_reloc_status_type or32_elf_32_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type or32_elf_16_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type or32_elf_8_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type or32_elf_const_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type or32_elf_consth_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type or32_elf_jumptarg_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 
 /* Try to minimize the amount of space occupied by relocation tables
    on the ROM (not that the ROM won't be swamped by other ELF overhead).  */
@@ -47,135 +57,135 @@ static reloc_howto_type elf_or32_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_OR32_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 32 bit relocation.  */
   HOWTO (R_OR32_32,		/* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 or32_elf_32_reloc, 	/* special_function */
 	 "R_OR32_32",		/* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,   		/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* A standard 16 bit relocation.  */
   HOWTO (R_OR32_16,		/* type */
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 or32_elf_16_reloc, 	/* special_function */
 	 "R_OR32_16",		/* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0x0000ffff,	        /* src_mask */
 	 0x0000ffff,   		/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* A standard 8 bit relocation.  */
   HOWTO (R_OR32_8,		/* type */
 	 0,	                /* rightshift */
 	 0,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 8,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 or32_elf_8_reloc, 	/* special_function */
 	 "R_OR32_8",		/* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0x000000ff,	        /* src_mask */
 	 0x000000ff,   		/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* A standard low 16 bit relocation.  */
   HOWTO (R_OR32_CONST,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 or32_elf_const_reloc,	/* special_function */
 	 "R_OR32_CONST",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard high 16 bit relocation.  */
   HOWTO (R_OR32_CONSTH,		/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 or32_elf_consth_reloc,	/* special_function */
 	 "R_OR32_CONSTH",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff0000,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard branch relocation.  */
   HOWTO (R_OR32_JUMPTARG,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 28,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 or32_elf_jumptarg_reloc,/* special_function */
 	 "R_OR32_JUMPTARG",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x03ffffff,		/* dst_mask */
-	 true), 		/* pcrel_offset */
+	 TRUE), 		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy.  */
   HOWTO (R_OR32_GNU_VTINHERIT, /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_OR32_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage.  */
   HOWTO (R_OR32_GNU_VTENTRY,     /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_OR32_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 };
 
 /* Map BFD reloc types to OR32 ELF reloc types.  */
@@ -232,12 +242,12 @@ or32_info_to_howto_rel (abfd, cache_ptr, dst)
 
 /* Set the right machine number for an OR32 ELF file.  */
 
-static boolean
+static bfd_boolean
 or32_elf_object_p (abfd)
      bfd *abfd;
 {
   (void) bfd_default_set_arch_mach (abfd, bfd_arch_or32, 0);
-  return true;
+  return TRUE;
 }
 
 /* The final processing done just before writing out an OR32 ELF object file.
@@ -246,7 +256,7 @@ or32_elf_object_p (abfd)
 static void
 or32_elf_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   int mach;
   unsigned long val;
diff --git a/bfd/elf32-pj.c b/bfd/elf32-pj.c
index 5620b5b7830..c8127931a2a 100644
--- a/bfd/elf32-pj.c
+++ b/bfd/elf32-pj.c
@@ -1,5 +1,5 @@
 /* picoJava specific support for 32-bit ELF
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Steve Chamberlan of Transmeta (sac@pobox.com).
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -32,7 +32,7 @@ static reloc_howto_type *pj_elf_reloc_type_lookup
 static void pj_elf_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void pj_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
+  PARAMS ((bfd *, bfd_boolean));
 
 static reloc_howto_type pj_elf_howto_table[] =
 {
@@ -41,76 +41,76 @@ static reloc_howto_type pj_elf_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 pj_elf_reloc,		/* special_function */
 	 "R_PJ_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
-  /* 32 bit absolute relocation.  Setting partial_inplace to true and
+  /* 32 bit absolute relocation.  Setting partial_inplace to TRUE and
      src_mask to a non-zero value is similar to the COFF toolchain.  */
   HOWTO (R_PJ_DATA_DIR32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 pj_elf_reloc,		/* special_function */
 	 "R_PJ_DIR32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit PC relative relocation.  */
   HOWTO (R_PJ_CODE_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 pj_elf_reloc,		/* special_function */
 	 "R_PJ_REL32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
 /* 16 bit PC relative relocation.  */
   HOWTO (R_PJ_CODE_REL16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overf6w */
 	 pj_elf_reloc,		/* special_function */
 	 "R_PJ_REL16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
   EMPTY_HOWTO (4),
   EMPTY_HOWTO (5),
   HOWTO (R_PJ_CODE_DIR32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 pj_elf_reloc,		/* special_function */
 	 "R_PJ_CODE_DIR32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (7),
   EMPTY_HOWTO (8),
@@ -123,60 +123,59 @@ static reloc_howto_type pj_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 pj_elf_reloc,		/* special_function */
 	 "R_PJ_LO16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
     HOWTO (R_PJ_CODE_HI16,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 pj_elf_reloc,		/* special_function */
 	 "R_PJ_HI16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_PJ_GNU_VTINHERIT,    /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_PJ_GNU_VTINHERIT",  /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_PJ_GNU_VTENTRY,     /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_PJ_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
+         FALSE),                /* pcrel_offset */
 };
 
 /* This function is used for normal relocs.  This is like the COFF
@@ -329,7 +328,7 @@ pj_elf_info_to_howto (abfd, cache_ptr, dst)
 static void
 pj_elf_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
     elf_elfheader (abfd)->e_flags |= EF_PICOJAVA_ARCH;
     elf_elfheader (abfd)->e_flags |= EF_PICOJAVA_GNUCALLS;
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index fbc880d06ca..0c33a905c14 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -37,84 +37,65 @@ static reloc_howto_type *ppc_elf_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 static void ppc_elf_info_to_howto
   PARAMS ((bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst));
-static void ppc_elf_howto_init PARAMS ((void));
-static int ppc_elf_sort_rela PARAMS ((const PTR, const PTR));
-static boolean ppc_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
+static void ppc_elf_howto_init
+  PARAMS ((void));
+static int ppc_elf_sort_rela
+  PARAMS ((const PTR, const PTR));
+static bfd_boolean ppc_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
 static bfd_reloc_status_type ppc_elf_addr16_ha_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean ppc_elf_object_p PARAMS ((bfd *));
-static boolean ppc_elf_set_private_flags PARAMS ((bfd *, flagword));
-static boolean ppc_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-
-static int ppc_elf_additional_program_headers PARAMS ((bfd *));
-static boolean ppc_elf_modify_segment_map PARAMS ((bfd *));
-
+static bfd_boolean ppc_elf_object_p
+  PARAMS ((bfd *));
+static bfd_boolean ppc_elf_set_private_flags
+  PARAMS ((bfd *, flagword));
+static bfd_boolean ppc_elf_merge_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static int ppc_elf_additional_program_headers
+  PARAMS ((bfd *));
+static bfd_boolean ppc_elf_modify_segment_map
+  PARAMS ((bfd *));
 static asection *ppc_elf_create_got
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean ppc_elf_create_dynamic_sections
+static bfd_boolean ppc_elf_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-
-static boolean ppc_elf_section_from_shdr PARAMS ((bfd *,
-						  Elf_Internal_Shdr *,
-						  const char *));
-static boolean ppc_elf_fake_sections
+static bfd_boolean ppc_elf_section_from_shdr
+  PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
+static bfd_boolean ppc_elf_fake_sections
   PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
-
 static elf_linker_section_t *ppc_elf_create_linker_section
-  PARAMS ((bfd *abfd,
-	   struct bfd_link_info *info,
+  PARAMS ((bfd *abfd, struct bfd_link_info *info,
 	   enum elf_linker_section_enum));
-
-static boolean ppc_elf_check_relocs PARAMS ((bfd *,
-					     struct bfd_link_info *,
-					     asection *,
-					     const Elf_Internal_Rela *));
-
-static asection * ppc_elf_gc_mark_hook PARAMS ((asection *sec,
-						struct bfd_link_info *info,
-						Elf_Internal_Rela *rel,
-						struct elf_link_hash_entry *h,
-						Elf_Internal_Sym *sym));
-
-static boolean ppc_elf_gc_sweep_hook PARAMS ((bfd *abfd,
-					      struct bfd_link_info *info,
-					      asection *sec,
-					      const Elf_Internal_Rela *relocs));
-
-static boolean ppc_elf_adjust_dynamic_symbol PARAMS ((struct bfd_link_info *,
-						      struct elf_link_hash_entry *));
-
-static boolean ppc_elf_size_dynamic_sections PARAMS ((bfd *, struct bfd_link_info *));
-
-static boolean ppc_elf_relocate_section PARAMS ((bfd *,
-						 struct bfd_link_info *info,
-						 bfd *,
-						 asection *,
-						 bfd_byte *,
-						 Elf_Internal_Rela *relocs,
-						 Elf_Internal_Sym *local_syms,
-						 asection **));
-
-static boolean ppc_elf_add_symbol_hook  PARAMS ((bfd *,
-						 struct bfd_link_info *,
-						 const Elf_Internal_Sym *,
-						 const char **,
-						 flagword *,
-						 asection **,
-						 bfd_vma *));
-
-static boolean ppc_elf_finish_dynamic_symbol PARAMS ((bfd *,
-						      struct bfd_link_info *,
-						      struct elf_link_hash_entry *,
-						      Elf_Internal_Sym *));
-
-static boolean ppc_elf_finish_dynamic_sections PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean ppc_elf_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+static asection * ppc_elf_gc_mark_hook
+  PARAMS ((asection *sec, struct bfd_link_info *info, Elf_Internal_Rela *rel,
+	   struct elf_link_hash_entry *h, Elf_Internal_Sym *sym));
+static bfd_boolean ppc_elf_gc_sweep_hook
+  PARAMS ((bfd *abfd, struct bfd_link_info *info, asection *sec,
+	   const Elf_Internal_Rela *relocs));
+static bfd_boolean ppc_elf_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static bfd_boolean ppc_elf_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean ppc_elf_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *info, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *relocs, Elf_Internal_Sym *local_syms,
+	   asection **));
+static bfd_boolean ppc_elf_add_symbol_hook
+  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
+	   const char **, flagword *, asection **, bfd_vma *));
+static bfd_boolean ppc_elf_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+	   Elf_Internal_Sym *));
+static bfd_boolean ppc_elf_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
 static enum elf_reloc_type_class ppc_elf_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
-static boolean ppc_elf_grok_prstatus
+static bfd_boolean ppc_elf_grok_prstatus
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
-static boolean ppc_elf_grok_psinfo
+static bfd_boolean ppc_elf_grok_psinfo
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
 
 #define BRANCH_PREDICT_BIT 0x200000		/* branch prediction bit for branch taken relocs */
@@ -161,30 +142,30 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 32 bit relocation.  */
   HOWTO (R_PPC_ADDR32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_ADDR32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An absolute 26 bit branch; the lower two bits must be zero.
      FIXME: we don't check that, we just clear them.  */
@@ -192,60 +173,60 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_ADDR24",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 16 bit relocation.  */
   HOWTO (R_PPC_ADDR16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_ADDR16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit relocation without overflow.  */
   HOWTO (R_PPC_ADDR16_LO,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_ADDR16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The high order 16 bits of an address.  */
   HOWTO (R_PPC_ADDR16_HI,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_ADDR16_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The high order 16 bits of an address, plus 1 if the contents of
      the low 16 bits, treated as a signed number, is negative.  */
@@ -253,15 +234,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc_elf_addr16_ha_reloc, /* special_function */
 	 "R_PPC_ADDR16_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An absolute 16 bit branch; the lower two bits must be zero.
      FIXME: we don't check that, we just clear them.  */
@@ -269,15 +250,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_ADDR14",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An absolute 16 bit branch, for which bit 10 should be set to
      indicate that the branch is expected to be taken.	The lower two
@@ -286,15 +267,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_ADDR14_BRTAKEN",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An absolute 16 bit branch, for which bit 10 should be set to
      indicate that the branch is not expected to be taken.  The lower
@@ -303,45 +284,45 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_ADDR14_BRNTAKEN",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A relative 26 bit branch; the lower two bits must be zero.  */
   HOWTO (R_PPC_REL24,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_REL24",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 16 bit branch; the lower two bits must be zero.  */
   HOWTO (R_PPC_REL14,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_REL14",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 16 bit branch.  Bit 10 should be set to indicate that
      the branch is expected to be taken.  The lower two bits must be
@@ -350,15 +331,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_REL14_BRTAKEN",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 16 bit branch.  Bit 10 should be set to indicate that
      the branch is not expected to be taken.  The lower two bits must
@@ -367,15 +348,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_REL14_BRNTAKEN",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Like R_PPC_ADDR16, but referring to the GOT table entry for the
      symbol.  */
@@ -383,15 +364,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_GOT16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC_ADDR16_LO, but referring to the GOT table entry for
      the symbol.  */
@@ -399,15 +380,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_GOT16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC_ADDR16_HI, but referring to the GOT table entry for
      the symbol.  */
@@ -415,15 +396,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_GOT16_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		 /* pcrel_offset */
+	 FALSE),		 /* pcrel_offset */
 
   /* Like R_PPC_ADDR16_HA, but referring to the GOT table entry for
      the symbol.  */
@@ -431,15 +412,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc_elf_addr16_ha_reloc, /* special_function */
 	 "R_PPC_GOT16_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC_REL24, but referring to the procedure linkage table
      entry for the symbol.  */
@@ -447,15 +428,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,  /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_PLTREL24",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* This is used only by the dynamic linker.  The symbol should exist
      both in the object being run and in some shared library.  The
@@ -466,15 +447,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	 /* special_function */
 	 "R_PPC_COPY",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC_ADDR32, but used when setting global offset table
      entries.  */
@@ -482,30 +463,30 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	 /* special_function */
 	 "R_PPC_GLOB_DAT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Marks a procedure linkage table entry for a symbol.  */
   HOWTO (R_PPC_JMP_SLOT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	 /* special_function */
 	 "R_PPC_JMP_SLOT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used only by the dynamic linker.  When the object is run, this
      longword is set to the load address of the object, plus the
@@ -514,15 +495,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	 /* special_function */
 	 "R_PPC_RELATIVE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC_REL24, but uses the value of the symbol within the
      object rather than the final value.  Normally used for
@@ -531,60 +512,60 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_LOCAL24PC",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Like R_PPC_ADDR32, but may be unaligned.  */
   HOWTO (R_PPC_UADDR32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_UADDR32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC_ADDR16, but may be unaligned.  */
   HOWTO (R_PPC_UADDR16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_UADDR16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32-bit PC relative */
   HOWTO (R_PPC_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_REL32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 32-bit relocation to the symbol's procedure linkage table.
      FIXME: not supported.  */
@@ -592,15 +573,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_PLT32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32-bit PC relative relocation to the symbol's procedure linkage table.
      FIXME: not supported.  */
@@ -608,15 +589,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_PLTREL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Like R_PPC_ADDR16_LO, but referring to the PLT table entry for
      the symbol.  */
@@ -624,15 +605,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_PLT16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC_ADDR16_HI, but referring to the PLT table entry for
      the symbol.  */
@@ -640,15 +621,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_PLT16_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		 /* pcrel_offset */
+	 FALSE),		 /* pcrel_offset */
 
   /* Like R_PPC_ADDR16_HA, but referring to the PLT table entry for
      the symbol.  */
@@ -656,15 +637,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc_elf_addr16_ha_reloc, /* special_function */
 	 "R_PPC_PLT16_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A sign-extended 16 bit value relative to _SDA_BASE_, for use with
      small data items.  */
@@ -672,75 +653,75 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_SDAREL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16-bit section relative relocation.  */
   HOWTO (R_PPC_SECTOFF,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_SECTOFF",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16-bit lower half section relative relocation.  */
   HOWTO (R_PPC_SECTOFF_LO,	  /* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_SECTOFF_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16-bit upper half section relative relocation.  */
   HOWTO (R_PPC_SECTOFF_HI,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_SECTOFF_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		 /* pcrel_offset */
+	 FALSE),		 /* pcrel_offset */
 
   /* 16-bit upper half adjusted section relative relocation.  */
   HOWTO (R_PPC_SECTOFF_HA,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc_elf_addr16_ha_reloc, /* special_function */
 	 "R_PPC_SECTOFF_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The remaining relocs are from the Embedded ELF ABI, and are not
      in the SVR4 ELF ABI.  */
@@ -750,60 +731,60 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_NADDR32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit value resulting from the addend minus the symbol */
   HOWTO (R_PPC_EMB_NADDR16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_NADDR16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit value resulting from the addend minus the symbol */
   HOWTO (R_PPC_EMB_NADDR16_LO,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_ADDR16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The high order 16 bits of the addend minus the symbol */
   HOWTO (R_PPC_EMB_NADDR16_HI,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_NADDR16_HI", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The high order 16 bits of the result of the addend minus the address,
      plus 1 if the contents of the low 16 bits, treated as a signed number,
@@ -812,15 +793,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc_elf_addr16_ha_reloc, /* special_function */
 	 "R_PPC_EMB_NADDR16_HA", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit value resulting from allocating a 4 byte word to hold an
      address in the .sdata section, and returning the offset from
@@ -829,15 +810,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_SDAI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit value resulting from allocating a 4 byte word to hold an
      address in the .sdata2 section, and returning the offset from
@@ -846,15 +827,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_SDA2I16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A sign-extended 16 bit value relative to _SDA2_BASE_, for use with
      small data items.	 */
@@ -862,15 +843,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_SDA2REL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Relocate against either _SDA_BASE_ or _SDA2_BASE_, filling in the 16 bit
      signed offset from the appropriate base, and filling in the register
@@ -879,15 +860,15 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_SDA21",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Relocation not handled: R_PPC_EMB_MRKREF */
   /* Relocation not handled: R_PPC_EMB_RELSEC16 */
@@ -903,60 +884,60 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_EMB_RELSDA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_PPC_GNU_VTINHERIT,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_PPC_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_PPC_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_PPC_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Phony reloc to handle AIX style TOC entries */
   HOWTO (R_PPC_TOC16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC_TOC16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 /* Initialize the ppc_elf_howto_table, so that linear accesses can be done.  */
@@ -977,7 +958,7 @@ ppc_elf_howto_init ()
 /* This function handles relaxing for the PPC with option --mpc860c0[=<n>].
 
    The MPC860, revision C0 or earlier contains a bug in the die.
-   If all of the following conditions are true, the next instruction
+   If all of the following conditions are TRUE, the next instruction
    to be executed *may* be treated as a no-op.
    1/ A forward branch is executed.
    2/ The branch is predicted as not taken.
@@ -1010,12 +991,12 @@ ppc_elf_sort_rela (arg1, arg2)
   return ((*rela1)->r_offset - (*rela2)->r_offset);
 }
 
-static boolean
+static bfd_boolean
 ppc_elf_relax_section (abfd, isec, link_info, again)
      bfd *abfd;
      asection *isec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
 #define PAGESIZE 0x1000
 
@@ -1027,7 +1008,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
   int comb_curr, comb_count;
 
   /* We never have to do this more than once per input section.  */
-  *again = false;
+  *again = FALSE;
 
   /* If needed, initialize this section's cooked size.  */
   if (isec->_cooked_size == 0)
@@ -1038,7 +1019,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
   if (link_info->mpc860c0 && (isec->flags & SEC_CODE) && isec->_cooked_size)
     {
       bfd_vma dot, end_page, end_section;
-      boolean section_modified;
+      bfd_boolean section_modified;
 
       /* Get the section contents.  */
       /* Get cached copy if it exists.  */
@@ -1116,7 +1097,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
       end_section = isec->vma + isec->_cooked_size;
       dot = end_page = (isec->vma | (PAGESIZE - 1)) + 1;
       dot -= link_info->mpc860c0;
-      section_modified = false;
+      section_modified = FALSE;
       if (dot < isec->vma)      /* Increment the start position if this section */
           dot = isec->vma;      /* begins in the middle of its first EOP region.  */
       for (;
@@ -1129,11 +1110,11 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
             {
               bfd_vma isec_offset;
               unsigned long insn;
-              boolean skip, modified;
+              bfd_boolean skip, modified;
 
               /* Don't process this word if there is a relocation for it and
               the relocation indicates the word is not a conditional branch.  */
-              skip = false;
+              skip = FALSE;
               isec_offset = dot - isec->vma;
               for (; comb_curr<comb_count; ++comb_curr)
                 {
@@ -1142,7 +1123,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
                   r_offset = rela_comb[comb_curr]->r_offset;
                   if (r_offset >= isec_offset)
                     {
-                      if (r_offset == isec_offset) skip = true;
+                      if (r_offset == isec_offset) skip = TRUE;
                       break;
                     }
                 }
@@ -1153,7 +1134,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
 #define BO2(insn) ((insn) & 0x00800000)
 #define BO4(insn) ((insn) & 0x00200000)
               insn = (unsigned long) bfd_get_32 (abfd, contents + isec_offset);
-              modified = false;
+              modified = FALSE;
               if ((insn & 0xFc000000) == 0x40000000)
                 {
                   /* Instruction is BCx */
@@ -1170,7 +1151,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
                       if (target > dot)
                         {
                           insn |= 0x00200000;   /* set the prediction bit */
-                          modified = true;
+                          modified = TRUE;
                         }
                     }
                 }
@@ -1184,7 +1165,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
                       Since we can't tell statically if it will branch forward,
                       always set the prediction bit.  */
                       insn |= 0x00200000;   /* set the prediction bit */
-                      modified = true;
+                      modified = TRUE;
 		    }
                 }
               else if ((insn & 0xFc00Fffe) == 0x4c000020)
@@ -1197,7 +1178,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
                       Since we can't tell statically if it will branch forward,
                       always set the prediction bit.  */
                       insn |= 0x00200000;   /* set the prediction bit */
-                      modified = true;
+                      modified = TRUE;
 		    }
                 }
 #undef BO0
@@ -1206,7 +1187,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
               if (modified)
 	        {
                   bfd_put_32 (abfd, (bfd_vma) insn, contents + isec_offset);
-		  section_modified = true;
+		  section_modified = TRUE;
 	        }
             }
         }
@@ -1241,7 +1222,7 @@ ppc_elf_relax_section (abfd, isec, link_info, again)
       free_contents = NULL;
     }
 
-  return true;
+  return TRUE;
 
 error_return:
   if (rela_comb != NULL)
@@ -1250,7 +1231,7 @@ error_return:
     free (free_relocs);
   if (free_contents != NULL)
     free (free_contents);
-  return false;
+  return FALSE;
 }
 
 static reloc_howto_type *
@@ -1384,7 +1365,7 @@ ppc_elf_addr16_ha_reloc (abfd, reloc_entry, symbol, data, input_section,
 /* Fix bad default arch selected for a 32 bit input bfd when the
    default is 64 bit.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_object_p (abfd)
      bfd *abfd;
 {
@@ -1399,12 +1380,12 @@ ppc_elf_object_p (abfd)
 	  BFD_ASSERT (abfd->arch_info->bits_per_word == 32);
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Function to set whether a module needs the -mrelocatable bit set.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -1413,34 +1394,34 @@ ppc_elf_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking */
-static boolean
+static bfd_boolean
 ppc_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   flagword old_flags;
   flagword new_flags;
-  boolean error;
+  bfd_boolean error;
 
   /* Check if we have the same endianess */
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   new_flags = elf_elfheader (ibfd)->e_flags;
   old_flags = elf_elfheader (obfd)->e_flags;
   if (!elf_flags_init (obfd))	/* First call, no flags set */
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = new_flags;
     }
 
@@ -1451,11 +1432,11 @@ ppc_elf_merge_private_bfd_data (ibfd, obfd)
     {
       /* Warn about -mrelocatable mismatch.  Allow -mrelocatable-lib to be linked
          with either.  */
-      error = false;
+      error = FALSE;
       if ((new_flags & EF_PPC_RELOCATABLE) != 0
 	  && (old_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0)
 	{
-	  error = true;
+	  error = TRUE;
 	  (*_bfd_error_handler)
 	    (_("%s: compiled with -mrelocatable and linked with modules compiled normally"),
 	     bfd_archive_filename (ibfd));
@@ -1463,7 +1444,7 @@ ppc_elf_merge_private_bfd_data (ibfd, obfd)
       else if ((new_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0
 	       && (old_flags & EF_PPC_RELOCATABLE) != 0)
 	{
-	  error = true;
+	  error = TRUE;
 	  (*_bfd_error_handler)
 	    (_("%s: compiled normally and linked with modules compiled with -mrelocatable"),
 	     bfd_archive_filename (ibfd));
@@ -1489,7 +1470,7 @@ ppc_elf_merge_private_bfd_data (ibfd, obfd)
       /* Warn about any other mismatches */
       if (new_flags != old_flags)
 	{
-	  error = true;
+	  error = TRUE;
 	  (*_bfd_error_handler)
 	    (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
 	     bfd_archive_filename (ibfd), (long) new_flags, (long) old_flags);
@@ -1498,17 +1479,17 @@ ppc_elf_merge_private_bfd_data (ibfd, obfd)
       if (error)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Handle a PowerPC specific section when reading an object file.  This
    is called when elfcode.h finds a section with an unknown type.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -1518,7 +1499,7 @@ ppc_elf_section_from_shdr (abfd, hdr, name)
   flagword flags;
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
 
   newsect = hdr->bfd_section;
   flags = bfd_get_section_flags (abfd, newsect);
@@ -1529,12 +1510,12 @@ ppc_elf_section_from_shdr (abfd, hdr, name)
     flags |= SEC_SORT_ENTRIES;
 
   bfd_set_section_flags (abfd, newsect, flags);
-  return true;
+  return TRUE;
 }
 
 /* Set up any other section flags and such that may be necessary.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_fake_sections (abfd, shdr, asect)
      bfd *abfd ATTRIBUTE_UNUSED;
      Elf_Internal_Shdr *shdr;
@@ -1546,7 +1527,7 @@ ppc_elf_fake_sections (abfd, shdr, asect)
   if ((asect->flags & SEC_SORT_ENTRIES) != 0)
     shdr->sh_type = SHT_ORDERED;
 
-  return true;
+  return TRUE;
 }
 
 /* Create a special linker section */
@@ -1572,7 +1553,7 @@ ppc_elf_create_linker_section (abfd, info, which)
 
       defaults = zero_section;
       defaults.which = which;
-      defaults.hole_written_p = false;
+      defaults.hole_written_p = FALSE;
       defaults.alignment = 2;
 
       /* Both of these sections are (technically) created by the user
@@ -1649,11 +1630,11 @@ ppc_elf_additional_program_headers (abfd)
 
 /* Modify the segment map if needed.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_modify_segment_map (abfd)
      bfd *abfd ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* The powerpc .got has a blrl instruction in it.  Mark it executable.  */
@@ -1684,7 +1665,7 @@ ppc_elf_create_got (abfd, info)
    to output sections (just like _bfd_elf_create_dynamic_sections has
    to create .dynbss and .rela.bss).  */
 
-static boolean
+static bfd_boolean
 ppc_elf_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1693,10 +1674,10 @@ ppc_elf_create_dynamic_sections (abfd, info)
   flagword flags;
 
   if (!ppc_elf_create_got (abfd, info))
-    return false;
+    return FALSE;
 
   if (!_bfd_elf_create_dynamic_sections (abfd, info))
-    return false;
+    return FALSE;
 
   flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
 	   | SEC_LINKER_CREATED);
@@ -1704,7 +1685,7 @@ ppc_elf_create_dynamic_sections (abfd, info)
   s = bfd_make_section (abfd, ".dynsbss");
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, SEC_ALLOC))
-    return false;
+    return FALSE;
 
   if (! info->shared)
     {
@@ -1712,7 +1693,7 @@ ppc_elf_create_dynamic_sections (abfd, info)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
     }
 
   s = bfd_get_section_by_name (abfd, ".plt");
@@ -1729,7 +1710,7 @@ ppc_elf_create_dynamic_sections (abfd, info)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -1779,14 +1760,14 @@ ppc_elf_adjust_dynamic_symbol (info, h)
 	     all uses of the symbol, not just those to the GOT or PLT.  */
 	  h->plt.offset = (bfd_vma) -1;
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	  return true;
+	  return TRUE;
 	}
 
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
       BFD_ASSERT (h->dynindx != -1);
 
@@ -1833,7 +1814,7 @@ ppc_elf_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf32_External_Rela);
 
-      return true;
+      return TRUE;
     }
   else
     h->plt.offset = (bfd_vma) -1;
@@ -1847,7 +1828,7 @@ ppc_elf_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1858,7 +1839,7 @@ ppc_elf_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -1909,7 +1890,7 @@ ppc_elf_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1919,20 +1900,20 @@ ppc_elf_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean plt;
-  boolean relocs;
+  bfd_boolean plt;
+  bfd_boolean relocs;
 
 #ifdef DEBUG
   fprintf (stderr, "ppc_elf_size_dynamic_sections called\n");
@@ -1975,12 +1956,12 @@ ppc_elf_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  plt = false;
-  relocs = false;
+  plt = FALSE;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -1989,7 +1970,7 @@ ppc_elf_size_dynamic_sections (output_bfd, info)
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
-      strip = false;
+      strip = FALSE;
 
       if (strcmp (name, ".plt") == 0)
 	{
@@ -1997,12 +1978,12 @@ ppc_elf_size_dynamic_sections (output_bfd, info)
 	    {
 	      /* Strip this section if we don't need it; see the
                  comment below.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      plt = TRUE;
 	    }
 	}
       else if (strncmp (name, ".rela", 5) == 0)
@@ -2018,12 +1999,12 @@ ppc_elf_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there are any relocation sections.  */
-	      relocs = true;
+	      relocs = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -2047,7 +2028,7 @@ ppc_elf_size_dynamic_sections (output_bfd, info)
       /* Allocate memory for the section contents.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -2063,7 +2044,7 @@ ppc_elf_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (plt)
@@ -2072,7 +2053,7 @@ ppc_elf_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -2080,26 +2061,26 @@ ppc_elf_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	    return false;
+	    return FALSE;
 	}
 
       if ((info->flags & DF_TEXTREL) != 0)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	  info->flags |= DF_TEXTREL;
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
    table.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2119,7 +2100,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
   asection *srelgot = NULL;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
 #ifdef DEBUG
   fprintf (stderr, "ppc_elf_check_relocs called for section %s in %s\n",
@@ -2134,14 +2115,14 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
     {
       sdata = ppc_elf_create_linker_section (abfd, info, LINKER_SECTION_SDATA);
       if (!sdata)
-	return false;
+	return FALSE;
     }
 
   if ((sdata2 = elf_linker_section (abfd, LINKER_SECTION_SDATA2)) == NULL)
     {
       sdata2 = ppc_elf_create_linker_section (abfd, info, LINKER_SECTION_SDATA2);
       if (!sdata2)
-	return false;
+	return FALSE;
     }
 
   dynobj = elf_hash_table (info)->dynobj;
@@ -2178,7 +2159,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 		elf_hash_table (info)->dynobj = dynobj = abfd;
 	      sgot = ppc_elf_create_got (dynobj, info);
 	      if (sgot == NULL)
-		return false;
+		return FALSE;
 	    }
 	}
 
@@ -2197,7 +2178,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 		elf_hash_table (info)->dynobj = dynobj = abfd;
 	      sgot = ppc_elf_create_got (dynobj, info);
 	      if (sgot == NULL)
-		return false;
+		return FALSE;
 	    }
 
 	  if (srelgot == NULL
@@ -2216,7 +2197,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 						   | SEC_LINKER_CREATED
 						   | SEC_READONLY))
 		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -2227,7 +2208,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 		  /* Make sure this symbol is output as a dynamic symbol.  */
 		  if (h->dynindx == -1)
 		    if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-		      return false;
+		      return FALSE;
 
 		  /* Allocate space in the .got.  */
 		  sgot->_raw_size += 4;
@@ -2248,7 +2229,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 		  local_got_refcounts
 		    = (bfd_signed_vma *) bfd_zalloc (abfd, size);
 		  if (local_got_refcounts == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 		}
 	      if (local_got_refcounts[r_symndx] == 0)
@@ -2272,7 +2253,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 	      ((*_bfd_error_handler)
 	       (_("%s: relocation %s cannot be used when making a shared object"),
 		bfd_archive_filename (abfd), "R_PPC_EMB_SDAI16"));
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (srelgot == NULL && (h != NULL || info->shared))
@@ -2290,12 +2271,12 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 						   | SEC_LINKER_CREATED
 						   | SEC_READONLY))
 		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
 	  if (!bfd_elf32_create_pointer_linker_section (abfd, info, sdata, h, rel))
-	    return false;
+	    return FALSE;
 
 	  break;
 
@@ -2306,7 +2287,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 	      ((*_bfd_error_handler)
 	       (_("%s: relocation %s cannot be used when making a shared object"),
 		bfd_archive_filename (abfd), "R_PPC_EMB_SDA2I16"));
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (srelgot == NULL && (h != NULL || info->shared))
@@ -2324,12 +2305,12 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 						   | SEC_LINKER_CREATED
 						   | SEC_READONLY))
 		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
 	  if (!bfd_elf32_create_pointer_linker_section (abfd, info, sdata2, h, rel))
-	    return false;
+	    return FALSE;
 
 	  break;
 
@@ -2342,7 +2323,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 	       (_("%s: relocation %s cannot be used when making a shared object"),
 		bfd_archive_filename (abfd),
 		ppc_elf_howto_table[(int) ELF32_R_TYPE (rel->r_info)]->name));
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 
@@ -2365,14 +2346,14 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 	      /* It does not make sense to have a procedure linkage
                  table entry for a local symbol.  */
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 
 	  /* Make sure this symbol is output as a dynamic symbol.  */
 	  if (h->dynindx == -1)
 	    {
 	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
 	  h->plt.refcount++;
@@ -2395,14 +2376,14 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_PPC_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_PPC_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* When creating a shared object, we must copy these
@@ -2435,7 +2416,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (abfd, sec),
@@ -2454,7 +2435,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		  if (sec->flags & SEC_READONLY)
 		    info->flags |= DF_TEXTREL;
@@ -2474,7 +2455,7 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -2519,7 +2500,7 @@ ppc_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -2577,13 +2558,13 @@ ppc_elf_gc_sweep_hook (abfd, info, sec, relocs)
 	break;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Hook called by the linker routine which adds symbols from an object
    file.  We use it to put .comm items in .sbss, and not .bss.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2614,7 +2595,7 @@ ppc_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	  amt = sizeof (asection);
 	  sdata->bss_section = (asection *) bfd_zalloc (abfd, amt);
 	  if (sdata->bss_section == NULL)
-	    return false;
+	    return FALSE;
 	  sdata->bss_section->name = sdata->bss_name;
 	  sdata->bss_section->flags = SEC_IS_COMMON;
 	  sdata->bss_section->output_section = sdata->bss_section;
@@ -2625,7 +2606,7 @@ ppc_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	    (asymbol **) bfd_zalloc (abfd, amt);
 	  if (sdata->bss_section->symbol == NULL
 	      || sdata->bss_section->symbol_ptr_ptr == NULL)
-	    return false;
+	    return FALSE;
 	  sdata->bss_section->symbol->name = sdata->bss_name;
 	  sdata->bss_section->symbol->flags = BSF_SECTION_SYM;
 	  sdata->bss_section->symbol->section = sdata->bss_section;
@@ -2636,13 +2617,13 @@ ppc_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       *valp = sym->st_size;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2795,12 +2776,12 @@ ppc_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2829,16 +2810,16 @@ ppc_elf_finish_dynamic_sections (output_bfd, info)
 	{
 	  Elf_Internal_Dyn dyn;
 	  const char *name;
-	  boolean size;
+	  bfd_boolean size;
 
 	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
 
 	  switch (dyn.d_tag)
 	    {
-	    case DT_PLTGOT:   name = ".plt";	  size = false; break;
-	    case DT_PLTRELSZ: name = ".rela.plt"; size = true;  break;
-	    case DT_JMPREL:   name = ".rela.plt"; size = false; break;
-	    default:	      name = NULL;	  size = false; break;
+	    case DT_PLTGOT:   name = ".plt";	  size = FALSE; break;
+	    case DT_PLTRELSZ: name = ".rela.plt"; size = TRUE;  break;
+	    case DT_JMPREL:   name = ".rela.plt"; size = FALSE; break;
+	    default:	      name = NULL;	  size = FALSE; break;
 	    }
 
 	  if (name != NULL)
@@ -2882,7 +2863,7 @@ ppc_elf_finish_dynamic_sections (output_bfd, info)
       elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The RELOCATE_SECTION function is called by the ELF backend linker
@@ -2914,7 +2895,7 @@ ppc_elf_finish_dynamic_sections (output_bfd, info)
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			  contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -2926,20 +2907,26 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
      Elf_Internal_Sym *local_syms;
      asection **local_sections;
 {
-  Elf_Internal_Shdr *symtab_hdr		  = &elf_tdata (input_bfd)->symtab_hdr;
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
-  bfd *dynobj				  = elf_hash_table (info)->dynobj;
-  elf_linker_section_t *sdata		  = (dynobj) ? elf_linker_section (dynobj, LINKER_SECTION_SDATA)  : NULL;
-  elf_linker_section_t *sdata2		  = (dynobj) ? elf_linker_section (dynobj, LINKER_SECTION_SDATA2) : NULL;
-  Elf_Internal_Rela *rel		  = relocs;
-  Elf_Internal_Rela *relend		  = relocs + input_section->reloc_count;
-  asection *sreloc			  = NULL;
+  bfd *dynobj = elf_hash_table (info)->dynobj;
+  elf_linker_section_t *sdata = NULL;
+  elf_linker_section_t *sdata2 = NULL;
+  Elf_Internal_Rela *rel = relocs;
+  Elf_Internal_Rela *relend = relocs + input_section->reloc_count;
+  asection *sreloc = NULL;
   asection *splt;
   asection *sgot;
   bfd_vma *local_got_offsets;
-  boolean ret				  = true;
+  bfd_boolean ret = TRUE;
   long insn;
 
+  if (dynobj)
+    {
+      sdata = elf_linker_section (dynobj, LINKER_SECTION_SDATA);
+      sdata2 = elf_linker_section (dynobj, LINKER_SECTION_SDATA2);
+    }
+
 #ifdef DEBUG
   fprintf (stderr, "ppc_elf_relocate_section called for %s section %s, %ld relocations%s\n",
 	   bfd_archive_filename (input_bfd),
@@ -2949,7 +2936,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 #endif
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   if (!ppc_elf_howto_table[R_PPC_ADDR32])
     /* Initialize howto table if needed.  */
@@ -2988,7 +2975,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				 (int) r_type);
 
 	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 	}
 
@@ -3114,7 +3101,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 							 (!info->shared
 							  || info->no_undefined
 							  || ELF_ST_VISIBILITY (h->other))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -3127,7 +3114,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				 (int) r_type, sym_name);
 
 	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 
 	case (int) R_PPC_NONE:
@@ -3147,8 +3134,8 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 							  input_bfd,
 							  input_section,
 							  rel->r_offset,
-							  true))
-		return false;
+							  TRUE))
+		return FALSE;
 	      continue;
 	    }
 	  break;
@@ -3201,7 +3188,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -3257,7 +3244,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -3514,7 +3501,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				       name);
 
 		bfd_set_error (bfd_error_bad_value);
-		ret = false;
+		ret = FALSE;
 		continue;
 	      }
 	    addend -= (sdata2->sym_hash->root.u.def.value
@@ -3532,7 +3519,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	    BFD_ASSERT (sec != (asection *) 0);
 	    name = bfd_get_section_name (abfd, sec->output_section);
-	    if (((strncmp (name, ".sdata", 6) == 0	
+	    if (((strncmp (name, ".sdata", 6) == 0
 		  && (name[6] == 0 || name[6] == '.'))
 		 || (strncmp (name, ".sbss", 5) == 0
 		     && (name[5] == 0 || name[5] == '.'))))
@@ -3567,7 +3554,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				       name);
 
 		bfd_set_error (bfd_error_bad_value);
-		ret = false;
+		ret = FALSE;
 		continue;
 	      }
 
@@ -3632,7 +3619,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				 sym_name);
 
 	  bfd_set_error (bfd_error_invalid_operation);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 
 	case (int) R_PPC_GNU_VTINHERIT:
@@ -3699,10 +3686,10 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 						   input_bfd,
 						   input_section,
 						   offset))
-	    return false;
+	    return FALSE;
 	}
       else
-	ret = false;
+	ret = FALSE;
     }
 
 #ifdef DEBUG
@@ -3732,7 +3719,7 @@ ppc_elf_reloc_type_class (rela)
 }
 
 /* Support for core dump NOTE sections */
-static boolean
+static bfd_boolean
 ppc_elf_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -3743,7 +3730,7 @@ ppc_elf_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 268:		/* Linux/PPC */
 	/* pr_cursig */
@@ -3764,7 +3751,7 @@ ppc_elf_grok_prstatus (abfd, note)
 					  raw_size, note->descpos + offset);
 }
 
-static boolean
+static bfd_boolean
 ppc_elf_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -3772,7 +3759,7 @@ ppc_elf_grok_psinfo (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 128:		/* Linux/PPC elf_prpsinfo */
 	elf_tdata (abfd)->core_program
@@ -3793,7 +3780,7 @@ ppc_elf_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 
 #define TARGET_LITTLE_SYM	bfd_elf32_powerpcle_vec
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index e9ec7387bd0..d9859b821d0 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -29,48 +29,50 @@ static reloc_howto_type *elf_s390_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void elf_s390_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf_s390_is_local_label_name
+static bfd_boolean elf_s390_is_local_label_name
   PARAMS ((bfd *, const char *));
 static struct bfd_hash_entry *link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *elf_s390_link_hash_table_create
   PARAMS ((bfd *));
-static boolean create_got_section
+static bfd_boolean create_got_section
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf_s390_create_dynamic_sections
+static bfd_boolean elf_s390_create_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
 static void elf_s390_copy_indirect_symbol
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
-static boolean elf_s390_check_relocs
+static bfd_boolean elf_s390_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection *elf_s390_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf_s390_gc_sweep_hook
+static bfd_boolean elf_s390_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf_s390_adjust_dynamic_symbol
+static bfd_boolean elf_s390_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean allocate_dynrelocs
+static bfd_boolean allocate_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean readonly_dynrelocs
+static bfd_boolean readonly_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_s390_size_dynamic_sections
+static bfd_boolean elf_s390_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_s390_relocate_section
+static bfd_boolean elf_s390_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf_s390_finish_dynamic_symbol
+static bfd_boolean elf_s390_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
 static enum elf_reloc_type_class elf_s390_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
-static boolean elf_s390_finish_dynamic_sections
+static bfd_boolean elf_s390_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_s390_object_p PARAMS ((bfd *));
-static boolean elf_s390_grok_prstatus PARAMS ((bfd *, Elf_Internal_Note *));
+static bfd_boolean elf_s390_object_p
+  PARAMS ((bfd *));
+static bfd_boolean elf_s390_grok_prstatus
+  PARAMS ((bfd *, Elf_Internal_Note *));
 
 #include "elf/s390.h"
 
@@ -82,45 +84,45 @@ static reloc_howto_type elf_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_390_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO(R_390_8,         0, 0,  8, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_8",       false, 0,0x000000ff, false),
-  HOWTO(R_390_12,        0, 1, 12, false, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_12",      false, 0,0x00000fff, false),
-  HOWTO(R_390_16,        0, 1, 16, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_16",      false, 0,0x0000ffff, false),
-  HOWTO(R_390_32,        0, 2, 32, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_32",      false, 0,0xffffffff, false),
-  HOWTO(R_390_PC32,	 0, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32",    false, 0,0xffffffff,  true),
-  HOWTO(R_390_GOT12,	 0, 1, 12, false, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_GOT12",   false, 0,0x00000fff, false),
-  HOWTO(R_390_GOT32,	 0, 2, 32, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT32",   false, 0,0xffffffff, false),
-  HOWTO(R_390_PLT32,	 0, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32",   false, 0,0xffffffff,  true),
-  HOWTO(R_390_COPY,      0, 2, 32, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_COPY",    false, 0,0xffffffff, false),
-  HOWTO(R_390_GLOB_DAT,  0, 2, 32, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GLOB_DAT",false, 0,0xffffffff, false),
-  HOWTO(R_390_JMP_SLOT,  0, 2, 32, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_JMP_SLOT",false, 0,0xffffffff, false),
-  HOWTO(R_390_RELATIVE,  0, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_RELATIVE",false, 0,0xffffffff, false),
-  HOWTO(R_390_GOTOFF,    0, 2, 32, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTOFF",  false, 0,0xffffffff, false),
-  HOWTO(R_390_GOTPC,     0, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPC",   false, 0,0xffffffff,  true),
-  HOWTO(R_390_GOT16,     0, 1, 16, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT16",   false, 0,0x0000ffff, false),
-  HOWTO(R_390_PC16,      0, 1, 16,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16",    false, 0,0x0000ffff,  true),
-  HOWTO(R_390_PC16DBL,   1, 1, 16,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16DBL", false, 0,0x0000ffff,  true),
-  HOWTO(R_390_PLT16DBL,  1, 1, 16,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT16DBL", false, 0,0x0000ffff,  true),
-  HOWTO(R_390_PC32DBL,	 1, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32DBL", false, 0,0xffffffff,  true),
-  HOWTO(R_390_PLT32DBL,	 1, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32DBL", false, 0,0xffffffff,  true),
-  HOWTO(R_390_GOTPCDBL,  1, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPCDBL", false, 0,0xffffffff,  true),
-  HOWTO(R_390_GOTENT,	 1, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTENT",   false, 0,0xffffffff,  true),
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO(R_390_8,         0, 0,  8, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_8",       FALSE, 0,0x000000ff, FALSE),
+  HOWTO(R_390_12,        0, 1, 12, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_12",      FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_16,        0, 1, 16, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_16",      FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_32,        0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_32",      FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PC32,	 0, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32",    FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_GOT12,	 0, 1, 12, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_GOT12",   FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_GOT32,	 0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT32",   FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PLT32,	 0, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32",   FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_COPY,      0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_COPY",    FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_GLOB_DAT,  0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GLOB_DAT",FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_JMP_SLOT,  0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_JMP_SLOT",FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_RELATIVE,  0, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_RELATIVE",FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_GOTOFF,    0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTOFF",  FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_GOTPC,     0, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPC",   FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_GOT16,     0, 1, 16, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT16",   FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_PC16,      0, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16",    FALSE, 0,0x0000ffff,  TRUE),
+  HOWTO(R_390_PC16DBL,   1, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16DBL", FALSE, 0,0x0000ffff,  TRUE),
+  HOWTO(R_390_PLT16DBL,  1, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT16DBL", FALSE, 0,0x0000ffff,  TRUE),
+  HOWTO(R_390_PC32DBL,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32DBL", FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_PLT32DBL,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32DBL", FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_GOTPCDBL,  1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPCDBL", FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_GOTENT,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTENT",   FALSE, 0,0xffffffff,  TRUE),
 };
 
 /* GNU extension to record C++ vtable hierarchy.  */
 static reloc_howto_type elf32_s390_vtinherit_howto =
-  HOWTO (R_390_GNU_VTINHERIT, 0,2,0,false,0,complain_overflow_dont, NULL, "R_390_GNU_VTINHERIT", false,0, 0, false);
+  HOWTO (R_390_GNU_VTINHERIT, 0,2,0,FALSE,0,complain_overflow_dont, NULL, "R_390_GNU_VTINHERIT", FALSE,0, 0, FALSE);
 static reloc_howto_type elf32_s390_vtentry_howto =
-  HOWTO (R_390_GNU_VTENTRY, 0,2,0,false,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_390_GNU_VTENTRY", false,0,0, false);
+  HOWTO (R_390_GNU_VTENTRY, 0,2,0,FALSE,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_390_GNU_VTENTRY", FALSE,0,0, FALSE);
 
 static reloc_howto_type *
 elf_s390_reloc_type_lookup (abfd, code)
@@ -212,13 +214,13 @@ elf_s390_info_to_howto (abfd, cache_ptr, dst)
     }
 }
 
-static boolean
+static bfd_boolean
 elf_s390_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == '.' && (name[1] == 'X' || name[1] == 'L'))
-    return true;
+    return TRUE;
 
   return _bfd_elf_is_local_label_name (abfd, name);
 }
@@ -502,7 +504,7 @@ elf_s390_link_hash_table_create (abfd)
 /* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
    shortcuts to them in our hash table.  */
 
-static boolean
+static bfd_boolean
 create_got_section (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -510,7 +512,7 @@ create_got_section (dynobj, info)
   struct elf_s390_link_hash_table *htab;
 
   if (! _bfd_elf_create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   htab = elf_s390_hash_table (info);
   htab->sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -525,15 +527,15 @@ create_got_section (dynobj, info)
 				   | SEC_IN_MEMORY | SEC_LINKER_CREATED
 				   | SEC_READONLY))
       || ! bfd_set_section_alignment (dynobj, htab->srelgot, 2))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
    .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
    hash table.  */
 
-static boolean
+static bfd_boolean
 elf_s390_create_dynamic_sections (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -542,10 +544,10 @@ elf_s390_create_dynamic_sections (dynobj, info)
 
   htab = elf_s390_hash_table (info);
   if (!htab->sgot && !create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   if (!_bfd_elf_create_dynamic_sections (dynobj, info))
-    return false;
+    return FALSE;
 
   htab->splt = bfd_get_section_by_name (dynobj, ".plt");
   htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
@@ -557,7 +559,7 @@ elf_s390_create_dynamic_sections (dynobj, info)
       || (!info->shared && !htab->srelbss))
     abort ();
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
@@ -613,7 +615,7 @@ elf_s390_copy_indirect_symbol (bed, dir, ind)
    allocate space in the global offset table or procedure linkage
    table.  */
 
-static boolean
+static bfd_boolean
 elf_s390_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -628,7 +630,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = elf_s390_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -649,7 +651,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	  (*_bfd_error_handler) (_("%s: bad symbol index: %d"),
 				 bfd_archive_filename (abfd),
 				 r_symndx);
-	  return false;
+	  return FALSE;
 	}
 
       if (r_symndx < symtab_hdr->sh_info)
@@ -683,7 +685,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		  local_got_refcounts = ((bfd_signed_vma *)
 					 bfd_zalloc (abfd, size));
 		  if (local_got_refcounts == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 		}
 	      local_got_refcounts[r_symndx] += 1;
@@ -698,7 +700,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	      if (htab->elf.dynobj == NULL)
 		htab->elf.dynobj = abfd;
 	      if (!create_got_section (htab->elf.dynobj, info))
-		return false;
+		return FALSE;
 	    }
 	  break;
 
@@ -798,7 +800,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  if (strncmp (name, ".rela", 5) != 0
 		      || strcmp (bfd_get_section_name (abfd, sec),
@@ -826,7 +828,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		  elf_section_data (sec)->sreloc = sreloc;
 		}
@@ -847,7 +849,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		  s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
 						 sec, r_symndx);
 		  if (s == NULL)
-		    return false;
+		    return FALSE;
 
 		  head = ((struct elf_s390_dyn_relocs **)
 			  &elf_section_data (s)->local_dynrel);
@@ -860,7 +862,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		  p = ((struct elf_s390_dyn_relocs *)
 		       bfd_alloc (htab->elf.dynobj, amt));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = *head;
 		  *head = p;
 		  p->sec = sec;
@@ -881,14 +883,14 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
         case R_390_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
         case R_390_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
 
 	default:
@@ -896,7 +898,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -941,7 +943,7 @@ elf_s390_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1040,7 +1042,7 @@ elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
 	break;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -1049,7 +1051,7 @@ elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf_s390_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -1082,7 +1084,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	}
 
-      return true;
+      return TRUE;
     }
   else
     /* It's possible that we incorrectly decided a .plt reloc was
@@ -1101,7 +1103,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1112,18 +1114,18 @@ elf_s390_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   /* If -z nocopyreloc was given, we won't generate them either.  */
   if (info->nocopyreloc)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   eh = (struct elf_s390_link_hash_entry *) h;
@@ -1139,7 +1141,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
   if (p == NULL)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   /* We must allocate the symbol in our .dynbss section, which will
@@ -1175,7 +1177,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
       if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1185,7 +1187,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* This is the condition under which elf_s390_finish_dynamic_symbol
@@ -1202,7 +1204,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
 /* Allocate space in .plt, .got and associated reloc sections for
    dynamic relocs.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -1213,7 +1215,7 @@ allocate_dynrelocs (h, inf)
   struct elf_s390_dyn_relocs *p;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -1230,7 +1232,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
@@ -1281,7 +1283,7 @@ allocate_dynrelocs (h, inf)
   if (h->got.refcount > 0)
     {
       asection *s;
-      boolean dyn;
+      bfd_boolean dyn;
 
       /* Make sure this symbol is output as a dynamic symbol.
 	 Undefined weak syms won't yet be marked as dynamic.  */
@@ -1289,7 +1291,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = htab->sgot;
@@ -1304,7 +1306,7 @@ allocate_dynrelocs (h, inf)
 
   eh = (struct elf_s390_link_hash_entry *) h;
   if (eh->dyn_relocs == NULL)
-    return true;
+    return TRUE;
 
   /* In the shared -Bsymbolic case, discard space allocated for
      dynamic pc-relative relocs against symbols which turn out to be
@@ -1350,7 +1352,7 @@ allocate_dynrelocs (h, inf)
 	      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	    {
 	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  /* If that succeeded, we know we'll be keeping all the
@@ -1371,12 +1373,12 @@ allocate_dynrelocs (h, inf)
       sreloc->_raw_size += p->count * sizeof (Elf32_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Find any dynamic relocs that apply to read-only sections.  */
 
-static boolean
+static bfd_boolean
 readonly_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -1399,15 +1401,15 @@ readonly_dynrelocs (h, inf)
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
-	  return false;
+	  return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_s390_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -1415,7 +1417,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
   struct elf_s390_link_hash_table *htab;
   bfd *dynobj;
   asection *s;
-  boolean relocs;
+  bfd_boolean relocs;
   bfd *ibfd;
 
   htab = elf_s390_hash_table (info);
@@ -1505,7 +1507,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 
   /* We now have determined the sizes of the various dynamic sections.
      Allocate memory for them.  */
-  relocs = false;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       if ((s->flags & SEC_LINKER_CREATED) == 0)
@@ -1521,7 +1523,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
       else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
 	{
 	  if (s->_raw_size != 0 && s != htab->srelplt)
-	    relocs = true;
+	    relocs = TRUE;
 
 	  /* We use the reloc_count field as a counter if we need
 	     to copy relocs into the output file.  */
@@ -1556,7 +1558,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	 of garbage.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
     }
 
   if (htab->elf.dynamic_sections_created)
@@ -1572,7 +1574,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
       if (! info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (htab->splt->_raw_size != 0)
@@ -1581,7 +1583,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -1589,7 +1591,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
           if (!add_dynamic_entry (DT_RELA, 0)
               || !add_dynamic_entry (DT_RELASZ, 0)
               || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	    return false;
+	    return FALSE;
 
 	  /* If any dynamic relocs apply to a read-only section,
 	     then we need a DT_TEXTREL entry.  */
@@ -1600,18 +1602,18 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	  if ((info->flags & DF_TEXTREL) != 0)
 	    {
 	      if (!add_dynamic_entry (DT_TEXTREL, 0))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate a 390 ELF section.  */
 
-static boolean
+static bfd_boolean
 elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 			      contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -1631,7 +1633,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = elf_s390_hash_table (info);
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -1650,7 +1652,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       asection *sec;
       bfd_vma off;
       bfd_vma relocation;
-      boolean unresolved_reloc;
+      bfd_boolean unresolved_reloc;
       bfd_reloc_status_type r;
 
       r_type = ELF32_R_TYPE (rel->r_info);
@@ -1660,7 +1662,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r_type < 0 || r_type >= (int) R_390_max)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       howto = elf_howto_table + r_type;
@@ -1668,7 +1670,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sec = NULL;
-      unresolved_reloc = false;
+      unresolved_reloc = FALSE;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -1692,7 +1694,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		     relocation value for this symbol.  output_section
 		     is typically NULL for symbols satisfied by a shared
 		     library.  */
-		  unresolved_reloc = true;
+		  unresolved_reloc = TRUE;
 		  relocation = 0;
 		}
 	      else
@@ -1714,7 +1716,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
           	      input_section, rel->r_offset,
 		      (!info->shared || info->no_undefined
 		       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1732,7 +1734,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 
           if (h != NULL)
             {
-	      boolean dyn;
+	      bfd_boolean dyn;
 
               off = h->got.offset;
 	      dyn = htab->elf.dynamic_sections_created;
@@ -1765,7 +1767,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
                     }
                 }
 	      else
-		unresolved_reloc = false;
+		unresolved_reloc = FALSE;
             }
           else
             {
@@ -1840,7 +1842,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	case R_390_GOTPCDBL:
           /* Use global offset table as symbol value.  */
           relocation = htab->sgot->output_section->vma;
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
           break;
 
         case R_390_PLT16DBL:
@@ -1866,7 +1868,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
           relocation = (htab->splt->output_section->vma
                         + htab->splt->output_offset
                         + h->plt.offset);
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
           break;
 
         case R_390_8:
@@ -1905,7 +1907,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		      || h->root.type == bfd_link_hash_undefined)))
             {
               Elf_Internal_Rela outrel;
-              boolean skip, relocate;
+              bfd_boolean skip, relocate;
 	      asection *sreloc;
 	      bfd_byte *loc;
 
@@ -1913,16 +1915,16 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		 are copied into the output file to be resolved at run
 		 time.  */
 
-              skip = false;
-              relocate = false;
+              skip = FALSE;
+              relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
               outrel.r_offset += (input_section->output_section->vma
                                   + input_section->output_offset);
 
@@ -1945,7 +1947,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
               else
                 {
 		  /* This symbol is local, or marked to become local.  */
-		  relocate = true;
+		  relocate = TRUE;
 		  outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
 		  outrel.r_addend = relocation + rel->r_addend;
                 }
@@ -2000,7 +2002,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 						      symtab_hdr->sh_link,
 						      sym->st_name);
 	      if (name == NULL)
-		return false;
+		return FALSE;
 	      if (*name == '\0')
 		name = bfd_section_name (input_bfd, sec);
 	    }
@@ -2011,7 +2013,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
@@ -2020,18 +2022,18 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		 bfd_archive_filename (input_bfd),
 		 bfd_get_section_name (input_bfd, input_section),
 		 (long) rel->r_offset, name, (int) r);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2255,7 +2257,7 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Used to decide how to sort relocs in an optimal manner for the
@@ -2280,7 +2282,7 @@ elf_s390_reloc_type_class (rela)
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_s390_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2394,17 +2396,17 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
       elf_section_data (htab->sgotplt->output_section)
 	->this_hdr.sh_entsize = 4;
     }
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf_s390_object_p (abfd)
      bfd *abfd;
 {
   return bfd_default_set_arch_mach (abfd, bfd_arch_s390, bfd_mach_s390_31);
 }
 
-static boolean
+static bfd_boolean
 elf_s390_grok_prstatus (abfd, note)
      bfd * abfd;
      Elf_Internal_Note * note;
@@ -2415,7 +2417,7 @@ elf_s390_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 224:		/* S/390 Linux.  */
 	/* pr_cursig */
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index a3b8cd727c2..96cd77831a8 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -34,80 +34,80 @@ static reloc_howto_type *sh_elf_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void sh_elf_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean sh_elf_set_private_flags
+static bfd_boolean sh_elf_set_private_flags
   PARAMS ((bfd *, flagword));
-static boolean sh_elf_copy_private_data
+static bfd_boolean sh_elf_copy_private_data
   PARAMS ((bfd *, bfd *));
-static boolean sh_elf_merge_private_data
+static bfd_boolean sh_elf_merge_private_data
   PARAMS ((bfd *, bfd *));
-static boolean sh_elf_set_mach_from_flags
+static bfd_boolean sh_elf_set_mach_from_flags
   PARAMS ((bfd *));
-static boolean sh_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static boolean sh_elf_relax_delete_bytes
+static bfd_boolean sh_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean sh_elf_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, int));
-static boolean sh_elf_align_loads
-  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, boolean *));
-static boolean sh_elf_swap_insns
+static bfd_boolean sh_elf_align_loads
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, bfd_boolean *));
+static bfd_boolean sh_elf_swap_insns
   PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
-static boolean sh_elf_relocate_section
+static bfd_boolean sh_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 static bfd_byte *sh_elf_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
+	   bfd_byte *, bfd_boolean, asymbol **));
 static void sh_elf_copy_indirect_symbol
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
 static int sh_elf_optimized_tls_reloc
   PARAMS ((struct bfd_link_info *, int, int));
-static boolean sh_elf_mkobject
+static bfd_boolean sh_elf_mkobject
   PARAMS((bfd *));
-static boolean sh_elf_object_p
+static bfd_boolean sh_elf_object_p
   PARAMS((bfd *));
-static boolean sh_elf_check_relocs
+static bfd_boolean sh_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static struct bfd_hash_entry *sh_elf_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *sh_elf_link_hash_table_create
   PARAMS ((bfd *));
-static boolean sh_elf_adjust_dynamic_symbol
+static bfd_boolean sh_elf_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean sh_elf_size_dynamic_sections
+static bfd_boolean sh_elf_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean sh_elf_finish_dynamic_symbol
+static bfd_boolean sh_elf_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean sh_elf_finish_dynamic_sections
+static bfd_boolean sh_elf_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static bfd_reloc_status_type sh_elf_reloc_loop
   PARAMS ((int, bfd *, asection *, bfd_byte *, bfd_vma, asection *,
 	   bfd_vma, bfd_vma));
-static boolean create_got_section
+static bfd_boolean create_got_section
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean sh_elf_create_dynamic_sections
+static bfd_boolean sh_elf_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static bfd_vma dtpoff_base
   PARAMS ((struct bfd_link_info *));
 static asection * sh_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean sh_elf_gc_sweep_hook
+static bfd_boolean sh_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean allocate_dynrelocs
+static bfd_boolean allocate_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean readonly_dynrelocs
+static bfd_boolean readonly_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
 static enum elf_reloc_type_class sh_elf_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
 #ifdef INCLUDE_SHMEDIA
 inline static void movi_shori_putval PARAMS ((bfd *, unsigned long, char *));
 #endif
-static boolean elf32_shlin_grok_prstatus
+static bfd_boolean elf32_shlin_grok_prstatus
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
-static boolean elf32_shlin_grok_psinfo
+static bfd_boolean elf32_shlin_grok_psinfo
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
 
 /* The name of the dynamic interpreter.  This is put in the .interp
@@ -122,106 +122,106 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
-  /* 32 bit absolute relocation.  Setting partial_inplace to true and
+  /* 32 bit absolute relocation.  Setting partial_inplace to TRUE and
      src_mask to a non-zero value is similar to the COFF toolchain.  */
   HOWTO (R_SH_DIR32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_elf_reloc,		/* special_function */
 	 "R_SH_DIR32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit PC relative relocation.  */
   HOWTO (R_SH_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_REL32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 8 bit PC relative branch divided by 2.  */
   HOWTO (R_SH_DIR8WPN,		/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_DIR8WPN",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 12 bit PC relative branch divided by 2.  */
   HOWTO (R_SH_IND12W,		/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 sh_elf_reloc,		/* special_function */
 	 "R_SH_IND12W",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xfff,			/* src_mask */
 	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 8 bit unsigned PC relative divided by 4.  */
   HOWTO (R_SH_DIR8WPL,		/* type */
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_DIR8WPL",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 8 bit unsigned PC relative divided by 2.  */
   HOWTO (R_SH_DIR8WPZ,		/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_DIR8WPZ",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 8 bit GBR relative.  FIXME: This only makes sense if we have some
      special symbol for the GBR relative area, and that is not
@@ -230,15 +230,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_DIR8BP",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 8 bit GBR relative divided by 2.  FIXME: This only makes sense if
      we have some special symbol for the GBR relative area, and that
@@ -247,15 +247,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_DIR8W",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 8 bit GBR relative divided by 4.  FIXME: This only makes sense if
      we have some special symbol for the GBR relative area, and that
@@ -264,15 +264,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_DIR8L",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   EMPTY_HOWTO (10),
   EMPTY_HOWTO (11),
@@ -302,15 +302,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_SWITCH16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 32 bit switch table entry.  This is generated for an expression
      such as ``.long L1 - L2''.  The offset holds the difference
@@ -319,15 +319,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_SWITCH32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Indicates a .uses pseudo-op.  The compiler will generate .uses
      pseudo-ops when it finds a function call which can be relaxed.
@@ -337,15 +337,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_USES",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* The assembler will generate this reloc for addresses referred to
      by the register loads associated with USES relocs.  The offset
@@ -355,15 +355,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_COUNT",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Indicates an alignment statement.  The offset field is the power
      of 2 to which subsequent portions of the object file must be
@@ -372,15 +372,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_ALIGN",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* The assembler will generate this reloc before a block of
      instructions.  A section should be processed as assumining it
@@ -389,15 +389,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_CODE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* The assembler will generate this reloc after a block of
      instructions when it sees data that is not instructions.  */
@@ -405,15 +405,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_DATA",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* The assembler generates this reloc for each label within a block
      of instructions.  This permits the linker to avoid swapping
@@ -422,15 +422,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_LABEL",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* An 8 bit switch table entry.  This is generated for an expression
      such as ``.word L1 - L2''.  The offset holds the difference
@@ -439,75 +439,75 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_SWITCH8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_SH_GNU_VTINHERIT, /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_SH_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_SH_GNU_VTENTRY,     /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
 	 "R_SH_GNU_VTENTRY",   /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 8 bit PC relative divided by 2 - but specified in a very odd way.  */
   HOWTO (R_SH_LOOP_START,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_LOOP_START",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 8 bit PC relative divided by 2 - but specified in a very odd way.  */
   HOWTO (R_SH_LOOP_END,		/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_LOOP_END",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xff,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   EMPTY_HOWTO (38),
   EMPTY_HOWTO (39),
@@ -523,105 +523,105 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 5,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR5U",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in SHARI, SHLLI et al.  */
   HOWTO (R_SH_DIR6U,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR6U",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in BxxI, LDHI.L et al.  */
   HOWTO (R_SH_DIR6S,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR6S",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in ADDI, ANDI et al.  */
   HOWTO (R_SH_DIR10S,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 10,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR10S",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in LD.UW, ST.W et al.	 */
   HOWTO (R_SH_DIR10SW,	/* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 11,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR10SW",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in LD.L, FLD.S et al.	 */
   HOWTO (R_SH_DIR10SL,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR10SL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in FLD.D, FST.P et al.  */
   HOWTO (R_SH_DIR10SQ,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 13,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR10SQ",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 #else
   EMPTY_HOWTO (45),
@@ -730,113 +730,113 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* */
 	 "R_SH_TLS_GD_32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_TLS_LD_32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* */
 	 "R_SH_TLS_LD_32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_TLS_LDO_32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* */
 	 "R_SH_TLS_LDO_32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_TLS_IE_32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* */
 	 "R_SH_TLS_IE_32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_TLS_LE_32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* */
 	 "R_SH_TLS_LE_32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_TLS_DTPMOD32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* */
 	 "R_SH_TLS_DTPMOD32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_TLS_DTPOFF32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* */
 	 "R_SH_TLS_DTPOFF32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_TLS_TPOFF32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* */
 	 "R_SH_TLS_TPOFF32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (152),
   EMPTY_HOWTO (153),
@@ -851,127 +851,127 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_GOT32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_PLT32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_PLT32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_SH_COPY,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_COPY",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_GLOB_DAT,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_GLOB_DAT",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_JMP_SLOT,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_JMP_SLOT",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_RELATIVE,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_RELATIVE",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_GOTOFF,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_GOTOFF",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_GOTPC,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_GOTPC",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_SH_GOTPLT32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* */
 	 "R_SH_GOTPLT32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 #ifdef INCLUDE_SHMEDIA
   /* Used in MOVI and SHORI (x & 65536).  */
@@ -979,416 +979,416 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT_LOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_GOT_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT_MEDLOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_GOT_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_GOT_HI16,		/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_GOTPLT_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT_LOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_GOTPLT_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT_MEDLOW16", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_GOTPLT_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_GOTPLT_HI16,	/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_PLT_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PLT_LOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_PLT_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PLT_MEDLOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_PLT_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PLT_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_PLT_HI16,		/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PLT_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_GOTOFF_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTOFF_LOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_GOTOFF_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTOFF_MEDLOW16", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_GOTOFF_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTOFF_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_GOTOFF_HI16,	/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTOFF_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_GOTPC_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPC_LOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_GOTPC_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPC_MEDLOW16", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_GOTPC_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPC_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_GOTPC_HI16,	/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPC_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in LD.L, FLD.S et al.	 */
   HOWTO (R_SH_GOT10BY4,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT10BY4",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in LD.L, FLD.S et al.	 */
   HOWTO (R_SH_GOTPLT10BY4,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT10BY4",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in FLD.D, FST.P et al.  */
   HOWTO (R_SH_GOT10BY8,		/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 13,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT10BY8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in FLD.D, FST.P et al.  */
   HOWTO (R_SH_GOTPLT10BY8,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 13,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT10BY8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_COPY64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_COPY64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_GLOB_DAT64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GLOB_DAT64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_JMP_SLOT64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_JMP_SLOT64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_SH_RELATIVE64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_RELATIVE64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (197),
   EMPTY_HOWTO (198),
@@ -1449,15 +1449,15 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf_ignore_reloc,	/* special_function */
 	 "R_SH_SHMEDIA_CODE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The assembler will generate this reloc at a PTA or PTB instruction,
      and the linker checks the right type of target, or changes a PTA to a
@@ -1466,195 +1466,195 @@ static reloc_howto_type sh_elf_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 18,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PT_16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in unexpanded MOVI.  */
   HOWTO (R_SH_IMMS16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMMS16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in SHORI.  */
   HOWTO (R_SH_IMMU16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMMU16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_IMM_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_LOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x - $) & 65536).  */
   HOWTO (R_SH_IMM_LOW16_PCREL,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_LOW16_PCREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_IMM_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_MEDLOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI (((x - $) >> 16) & 65536).  */
   HOWTO (R_SH_IMM_MEDLOW16_PCREL, /* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_MEDLOW16_PCREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_IMM_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI (((x - $) >> 32) & 65536).  */
   HOWTO (R_SH_IMM_MEDHI16_PCREL, /* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_MEDHI16_PCREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_IMM_HI16,		/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used in MOVI and SHORI (((x - $) >> 48) & 65536).  */
   HOWTO (R_SH_IMM_HI16_PCREL,	/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_HI16_PCREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* For the .uaquad pseudo.  */
   HOWTO (R_SH_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* For the .uaquad pseudo, (x - $).  */
   HOWTO (R_SH_64_PCREL,		/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_64_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
 #endif
 };
@@ -2014,32 +2014,32 @@ sh_elf_info_to_howto (abfd, cache_ptr, dst)
    values; in coff-sh.c they come from include/coff/sh.h, whereas here
    they come from enum elf_sh_reloc_type in include/elf/sh.h.  */
 
-static boolean
+static bfd_boolean
 sh_elf_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
-  boolean have_code;
+  bfd_boolean have_code;
   Elf_Internal_Rela *irel, *irelend;
   bfd_byte *contents = NULL;
   Elf_Internal_Sym *isymbuf = NULL;
 
-  *again = false;
+  *again = FALSE;
 
   if (link_info->relocateable
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0)
-    return true;
+    return TRUE;
 
 #ifdef INCLUDE_SHMEDIA
   if (elf_section_data (sec)->this_hdr.sh_flags
       & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED))
     {
-      return true;
+      return TRUE;
     }
 #endif
 
@@ -2056,7 +2056,7 @@ sh_elf_relax_section (abfd, sec, link_info, again)
   if (internal_relocs == NULL)
     goto error_return;
 
-  have_code = false;
+  have_code = FALSE;
 
   irelend = internal_relocs + sec->reloc_count;
   for (irel = internal_relocs; irel < irelend; irel++)
@@ -2067,7 +2067,7 @@ sh_elf_relax_section (abfd, sec, link_info, again)
       bfd_signed_vma foff;
 
       if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_CODE)
-	have_code = true;
+	have_code = TRUE;
 
       if (ELF32_R_TYPE (irel->r_info) != (int) R_SH_USES)
 	continue;
@@ -2279,7 +2279,7 @@ sh_elf_relax_section (abfd, sec, link_info, again)
       /* That will change things, so, just in case it permits some
 	 other function call to come within range, we should relax
 	 again.  Note that this is not required, and it may be slow.  */
-      *again = true;
+      *again = TRUE;
 
       /* Now check whether we got a COUNT reloc.  */
       if (irelcount >= irelend)
@@ -2318,7 +2318,7 @@ sh_elf_relax_section (abfd, sec, link_info, again)
      byte boundaries.  */
   if (have_code)
     {
-      boolean swapped;
+      bfd_boolean swapped;
 
       /* Get the section contents.  */
       if (contents == NULL)
@@ -2377,7 +2377,7 @@ sh_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL
@@ -2390,14 +2390,14 @@ sh_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return false;
+  return FALSE;
 }
 
 /* Delete some bytes from a section while relaxing.  FIXME: There is a
    lot of duplication between this function and sh_relax_delete_bytes
    in coff-sh.c.  */
 
-static boolean
+static bfd_boolean
 sh_elf_relax_delete_bytes (abfd, sec, addr, count)
      bfd *abfd;
      asection *sec;
@@ -2467,7 +2467,7 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
       int insn = 0;
       int off, adjust, oinsn;
       bfd_signed_vma voff = 0;
-      boolean overflow;
+      bfd_boolean overflow;
 
       /* Get the new reloc address.  */
       nraddr = irel->r_offset;
@@ -2619,7 +2619,7 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
       if (adjust != 0)
 	{
 	  oinsn = insn;
-	  overflow = false;
+	  overflow = FALSE;
 	  switch ((enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info))
 	    {
 	    default:
@@ -2630,14 +2630,14 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
 	    case R_SH_DIR8WPZ:
 	      insn += adjust / 2;
 	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
 	      break;
 
 	    case R_SH_IND12W:
 	      insn += adjust / 2;
 	      if ((oinsn & 0xf000) != (insn & 0xf000))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
 	      break;
 
@@ -2651,21 +2651,21 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
 		    ++insn;
 		}
 	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
 	      break;
 
 	    case R_SH_SWITCH8:
 	      voff += adjust;
 	      if (voff < 0 || voff >= 0xff)
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_8 (abfd, voff, contents + nraddr);
 	      break;
 
 	    case R_SH_SWITCH16:
 	      voff += adjust;
 	      if (voff < - 0x8000 || voff >= 0x8000)
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_signed_16 (abfd, (bfd_vma) voff, contents + nraddr);
 	      break;
 
@@ -2685,7 +2685,7 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
 	       (_("%s: 0x%lx: fatal: reloc overflow while relaxing"),
 		bfd_archive_filename (abfd), (unsigned long) irel->r_offset));
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	}
 
@@ -2707,13 +2707,13 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
 	continue;
 
       /* We always cache the relocs.  Perhaps, if info->keep_memory is
-	 false, we should free them, if we are permitted to, when we
+	 FALSE, we should free them, if we are permitted to, when we
 	 leave sh_coff_relax_section.  */
       internal_relocs = (_bfd_elf32_link_read_relocs
 			 (abfd, o, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-			  true));
+			  TRUE));
       if (internal_relocs == NULL)
-	return false;
+	return FALSE;
 
       ocontents = NULL;
       irelscanend = internal_relocs + o->reloc_count;
@@ -2732,16 +2732,16 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
 		  else
 		    {
 		      /* We always cache the section contents.
-			 Perhaps, if info->keep_memory is false, we
+			 Perhaps, if info->keep_memory is FALSE, we
 			 should free them, if we are permitted to,
 			 when we leave sh_coff_relax_section.  */
 		      ocontents = (bfd_byte *) bfd_malloc (o->_raw_size);
 		      if (ocontents == NULL)
-			return false;
+			return FALSE;
 		      if (! bfd_get_section_contents (abfd, o, ocontents,
 						      (file_ptr) 0,
 						      o->_raw_size))
-			return false;
+			return FALSE;
 		      elf_section_data (o)->this_hdr.contents = ocontents;
 		    }
 		}
@@ -2790,16 +2790,16 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
 		  else
 		    {
 		      /* We always cache the section contents.
-			 Perhaps, if info->keep_memory is false, we
+			 Perhaps, if info->keep_memory is FALSE, we
 			 should free them, if we are permitted to,
 			 when we leave sh_coff_relax_section.  */
 		      ocontents = (bfd_byte *) bfd_malloc (o->_raw_size);
 		      if (ocontents == NULL)
-			return false;
+			return FALSE;
 		      if (! bfd_get_section_contents (abfd, o, ocontents,
 						      (file_ptr) 0,
 						      o->_raw_size))
-			return false;
+			return FALSE;
 		      elf_section_data (o)->this_hdr.contents = ocontents;
 		    }
 		}
@@ -2858,26 +2858,26 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Look for loads and stores which we can align to four byte
    boundaries.  This is like sh_align_loads in coff-sh.c.  */
 
-static boolean
+static bfd_boolean
 sh_elf_align_loads (abfd, sec, internal_relocs, contents, pswapped)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec;
      Elf_Internal_Rela *internal_relocs;
      bfd_byte *contents ATTRIBUTE_UNUSED;
-     boolean *pswapped;
+     bfd_boolean *pswapped;
 {
   Elf_Internal_Rela *irel, *irelend;
   bfd_vma *labels = NULL;
   bfd_vma *label, *label_end;
   bfd_size_type amt;
 
-  *pswapped = false;
+  *pswapped = FALSE;
 
   irelend = internal_relocs + sec->reloc_count;
 
@@ -2928,17 +2928,17 @@ sh_elf_align_loads (abfd, sec, internal_relocs, contents, pswapped)
 
   free (labels);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (labels != NULL)
     free (labels);
-  return false;
+  return FALSE;
 }
 
 /* Swap two SH instructions.  This is like sh_swap_insns in coff-sh.c.  */
 
-static boolean
+static bfd_boolean
 sh_elf_swap_insns (abfd, sec, relocs, contents, addr)
      bfd *abfd;
      asection *sec;
@@ -3007,10 +3007,10 @@ sh_elf_swap_insns (abfd, sec, relocs, contents, addr)
 	{
 	  bfd_byte *loc;
 	  unsigned short insn, oinsn;
-	  boolean overflow;
+	  bfd_boolean overflow;
 
 	  loc = contents + irel->r_offset;
-	  overflow = false;
+	  overflow = FALSE;
 	  switch (type)
 	    {
 	    default:
@@ -3022,7 +3022,7 @@ sh_elf_swap_insns (abfd, sec, relocs, contents, addr)
 	      oinsn = insn;
 	      insn += add / 2;
 	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, loc);
 	      break;
 
@@ -3031,7 +3031,7 @@ sh_elf_swap_insns (abfd, sec, relocs, contents, addr)
 	      oinsn = insn;
 	      insn += add / 2;
 	      if ((oinsn & 0xf000) != (insn & 0xf000))
-		overflow = true;
+		overflow = TRUE;
 	      bfd_put_16 (abfd, (bfd_vma) insn, loc);
 	      break;
 
@@ -3048,7 +3048,7 @@ sh_elf_swap_insns (abfd, sec, relocs, contents, addr)
 		  oinsn = insn;
 		  insn += add / 2;
 		  if ((oinsn & 0xff00) != (insn & 0xff00))
-		    overflow = true;
+		    overflow = TRUE;
 		  bfd_put_16 (abfd, (bfd_vma) insn, loc);
 		}
 
@@ -3061,12 +3061,12 @@ sh_elf_swap_insns (abfd, sec, relocs, contents, addr)
 	       (_("%s: 0x%lx: fatal: reloc overflow while relaxing"),
 		bfd_archive_filename (abfd), (unsigned long) irel->r_offset));
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 #ifdef INCLUDE_SHMEDIA
@@ -3525,8 +3525,8 @@ struct elf_sh_link_hash_entry
     GOT_UNKNOWN = 0, GOT_NORMAL, GOT_TLS_GD, GOT_TLS_IE
   } tls_type;
 
-  /* If true, R_SH_TLS_TPOFF32 relocation is generated.  */
-  boolean tls_tpoff32;
+  /* If TRUE, R_SH_TLS_TPOFF32 relocation is generated.  */
+  bfd_boolean tls_tpoff32;
 };
 
 #define sh_elf_hash_entry(ent) ((struct elf_sh_link_hash_entry *)(ent))
@@ -3548,17 +3548,17 @@ struct sh_elf_obj_tdata
 /* Override the generic function because we need to store sh_elf_obj_tdata
    as the specific tdata.  */
 
-static boolean
+static bfd_boolean
 sh_elf_mkobject (abfd)
      bfd *abfd;
 {
   bfd_size_type amt = sizeof (struct sh_elf_obj_tdata);
   abfd->tdata.any = bfd_zalloc (abfd, amt);
   if (abfd->tdata.any == NULL)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
-                 
+
 /* sh ELF linker hash table.  */
 
 struct elf_sh_link_hash_table
@@ -3590,7 +3590,7 @@ struct elf_sh_link_hash_table
 #define sh_elf_link_hash_traverse(table, func, info)			\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the sh ELF linker hash table from a link_info structure.  */
@@ -3630,7 +3630,7 @@ sh_elf_link_hash_newfunc (entry, table, string)
       ret->datalabel_got.refcount = ret->root.got.refcount;
 #endif
       ret->tls_type = GOT_UNKNOWN;
-      ret->tls_tpoff32 = false;
+      ret->tls_tpoff32 = FALSE;
     }
 
   return (struct bfd_hash_entry *) ret;
@@ -3672,7 +3672,7 @@ sh_elf_link_hash_table_create (abfd)
 /* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
    shortcuts to them in our hash table.  */
 
-static boolean
+static bfd_boolean
 create_got_section (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -3680,7 +3680,7 @@ create_got_section (dynobj, info)
   struct elf_sh_link_hash_table *htab;
 
   if (! _bfd_elf_create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   htab = sh_elf_hash_table (info);
   htab->sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -3698,13 +3698,13 @@ create_got_section (dynobj, info)
 				   | SEC_LINKER_CREATED
 				   | SEC_READONLY))
       || ! bfd_set_section_alignment (dynobj, htab->srelgot, 2))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Create dynamic sections when linking against a dynamic object.  */
 
-static boolean
+static bfd_boolean
 sh_elf_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3727,7 +3727,7 @@ sh_elf_create_dynamic_sections (abfd, info)
 
     default:
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   htab = sh_elf_hash_table (info);
@@ -3750,7 +3750,7 @@ sh_elf_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, pltflags)
       || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
-    return false;
+    return FALSE;
 
   if (bed->want_plt_sym)
     {
@@ -3761,9 +3761,9 @@ sh_elf_create_dynamic_sections (abfd, info)
 
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
-	      (bfd_vma) 0, (const char *) NULL, false,
+	      (bfd_vma) 0, (const char *) NULL, FALSE,
 	      get_elf_backend_data (abfd)->collect, &bh)))
-	return false;
+	return FALSE;
 
       h = (struct elf_link_hash_entry *) bh;
       h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
@@ -3771,7 +3771,7 @@ sh_elf_create_dynamic_sections (abfd, info)
 
       if (info->shared
 	  && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-	return false;
+	return FALSE;
     }
 
   s = bfd_make_section (abfd,
@@ -3780,10 +3780,10 @@ sh_elf_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, ptralign))
-    return false;
+    return FALSE;
 
   if (! create_got_section (abfd, info))
-    return false;
+    return FALSE;
 
   {
     const char *secname;
@@ -3805,7 +3805,7 @@ sh_elf_create_dynamic_sections (abfd, info)
 	if (s == NULL
 	    || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	    || ! bfd_set_section_alignment (abfd, s, ptralign))
-	  return false;
+	  return FALSE;
       }
   }
 
@@ -3821,7 +3821,7 @@ sh_elf_create_dynamic_sections (abfd, info)
       htab->sdynbss = s;
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, SEC_ALLOC))
-	return false;
+	return FALSE;
 
       /* The .rel[a].bss section holds copy relocs.  This section is not
 	 normally needed.  We need to create it here, though, so that the
@@ -3843,11 +3843,11 @@ sh_elf_create_dynamic_sections (abfd, info)
 	  if (s == NULL
 	      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	      || ! bfd_set_section_alignment (abfd, s, ptralign))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -3856,7 +3856,7 @@ sh_elf_create_dynamic_sections (abfd, info)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 sh_elf_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -3903,7 +3903,7 @@ sh_elf_adjust_dynamic_symbol (info, h)
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	}
 
-      return true;
+      return TRUE;
     }
   else
     h->plt.offset = (bfd_vma) -1;
@@ -3917,7 +3917,7 @@ sh_elf_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -3928,18 +3928,18 @@ sh_elf_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   /* If -z nocopyreloc was given, we won't generate them either.  */
   if (info->nocopyreloc)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   eh = (struct elf_sh_link_hash_entry *) h;
@@ -3956,7 +3956,7 @@ sh_elf_adjust_dynamic_symbol (info, h)
   if (p == NULL)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   /* We must allocate the symbol in our .dynbss section, which will
@@ -3998,7 +3998,7 @@ sh_elf_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -4008,7 +4008,7 @@ sh_elf_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* This is the condition under which sh_elf_finish_dynamic_symbol
@@ -4025,7 +4025,7 @@ sh_elf_adjust_dynamic_symbol (info, h)
 /* Allocate space in .plt, .got and associated reloc sections for
    dynamic relocs.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -4036,7 +4036,7 @@ allocate_dynrelocs (h, inf)
   struct elf_sh_dyn_relocs *p;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     /* When warning symbols are created, they **replace** the "real"
@@ -4068,7 +4068,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
@@ -4119,7 +4119,7 @@ allocate_dynrelocs (h, inf)
   if (h->got.refcount > 0)
     {
       asection *s;
-      boolean dyn;
+      bfd_boolean dyn;
       int tls_type = sh_elf_hash_entry (h)->tls_type;
 
       /* Make sure this symbol is output as a dynamic symbol.
@@ -4128,7 +4128,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = htab->sgot;
@@ -4155,7 +4155,7 @@ allocate_dynrelocs (h, inf)
   if (eh->datalabel_got.refcount > 0)
     {
       asection *s;
-      boolean dyn;
+      bfd_boolean dyn;
 
       /* Make sure this symbol is output as a dynamic symbol.
 	 Undefined weak syms won't yet be marked as dynamic.  */
@@ -4163,7 +4163,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = htab->sgot;
@@ -4178,7 +4178,7 @@ allocate_dynrelocs (h, inf)
 #endif
 
   if (eh->dyn_relocs == NULL)
-    return true;
+    return TRUE;
 
   /* In the shared -Bsymbolic case, discard space allocated for
      dynamic pc-relative relocs against symbols which turn out to be
@@ -4227,7 +4227,7 @@ allocate_dynrelocs (h, inf)
 	      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	    {
 	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  /* If that succeeded, we know we'll be keeping all the
@@ -4248,12 +4248,12 @@ allocate_dynrelocs (h, inf)
       sreloc->_raw_size += p->count * sizeof (Elf32_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Find any dynamic relocs that apply to read-only sections.  */
 
-static boolean
+static bfd_boolean
 readonly_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -4276,15 +4276,15 @@ readonly_dynrelocs (h, inf)
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
-	  return false;
+	  return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 sh_elf_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -4292,7 +4292,7 @@ sh_elf_size_dynamic_sections (output_bfd, info)
   struct elf_sh_link_hash_table *htab;
   bfd *dynobj;
   asection *s;
-  boolean relocs;
+  bfd_boolean relocs;
   bfd *ibfd;
 
   htab = sh_elf_hash_table (info);
@@ -4400,7 +4400,7 @@ sh_elf_size_dynamic_sections (output_bfd, info)
 
   /* We now have determined the sizes of the various dynamic sections.
      Allocate memory for them.  */
-  relocs = false;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       if ((s->flags & SEC_LINKER_CREATED) == 0)
@@ -4416,7 +4416,7 @@ sh_elf_size_dynamic_sections (output_bfd, info)
       else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
 	{
 	  if (s->_raw_size != 0 && s != htab->srelplt)
-	    relocs = true;
+	    relocs = TRUE;
 
 	  /* We use the reloc_count field as a counter if we need
 	     to copy relocs into the output file.  */
@@ -4451,7 +4451,7 @@ sh_elf_size_dynamic_sections (output_bfd, info)
 	 of garbage.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
     }
 
   if (htab->root.dynamic_sections_created)
@@ -4467,7 +4467,7 @@ sh_elf_size_dynamic_sections (output_bfd, info)
       if (! info->shared)
 	{
 	  if (! add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (htab->splt->_raw_size != 0)
@@ -4476,7 +4476,7 @@ sh_elf_size_dynamic_sections (output_bfd, info)
 	      || ! add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || ! add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || ! add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -4485,7 +4485,7 @@ sh_elf_size_dynamic_sections (output_bfd, info)
 	      || ! add_dynamic_entry (DT_RELASZ, 0)
 	      || ! add_dynamic_entry (DT_RELAENT,
 				      sizeof (Elf32_External_Rela)))
-	    return false;
+	    return FALSE;
 
 	  /* If any dynamic relocs apply to a read-only section,
 	     then we need a DT_TEXTREL entry.  */
@@ -4496,18 +4496,18 @@ sh_elf_size_dynamic_sections (output_bfd, info)
 	  if ((info->flags & DF_TEXTREL) != 0)
 	    {
 	      if (! add_dynamic_entry (DT_TEXTREL, 0))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate an SH ELF section.  */
 
-static boolean
+static bfd_boolean
 sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			 contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -4586,7 +4586,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      && r_type <= (int) R_SH_LAST_INVALID_RELOC_2))
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       howto = sh_elf_howto_table + r_type;
@@ -4668,7 +4668,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		     bfd_archive_filename (input_bfd),
 		     bfd_get_section_name (input_bfd, input_section),
 		     (long) rel->r_offset, howto->name);
-		  return false;
+		  return FALSE;
 		}
 
 	      addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
@@ -4704,7 +4704,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	  if (h->root.type == bfd_link_hash_defined
 	      || h->root.type == bfd_link_hash_defweak)
 	    {
-	      boolean dyn;
+	      bfd_boolean dyn;
 
 	      dyn = htab->root.dynamic_sections_created;
 	      sec = h->root.u.def.section;
@@ -4770,7 +4770,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		    (_("%s: unresolvable relocation against symbol `%s' from %s section"),
 		     bfd_archive_filename (input_bfd), h->root.root.string,
 		     bfd_get_section_name (input_bfd, input_section));
-		  return false;
+		  return FALSE;
 		}
 	      else
 		relocation = ((h->root.u.def.value
@@ -4796,7 +4796,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      input_section, rel->r_offset,
 		      (!info->shared || info->no_undefined
 		       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -4845,7 +4845,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		    bfd_archive_filename (input_section->owner),
 		    (unsigned long) rel->r_offset));
 		  bfd_set_error (bfd_error_bad_value);
-		  return false;
+		  return FALSE;
 		}
 	      relocation -= 4;
 	      goto final_link_relocate;
@@ -4860,7 +4860,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    goto final_link_relocate;
 #endif
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 
 	case R_SH_DIR32:
 	case R_SH_REL32:
@@ -4876,7 +4876,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      Elf_Internal_Rela outrel;
 	      bfd_byte *loc;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 
 	      /* When generating a shared object, these relocations
 		 are copied into the output file to be resolved at run
@@ -4891,7 +4891,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -4902,16 +4902,16 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		  BFD_ASSERT (sreloc != NULL);
 		}
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
 
@@ -4933,7 +4933,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			  && (h->elf_link_hash_flags
 			      & ELF_LINK_HASH_DEF_REGULAR) != 0))
 		    {
-		      relocate = true;
+		      relocate = TRUE;
 		      outrel.r_info = ELF32_R_INFO (0, R_SH_RELATIVE);
 		      outrel.r_addend
 			= relocation + bfd_get_32 (input_bfd,
@@ -5014,7 +5014,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	  if (h != NULL)
 	    {
-	      boolean dyn;
+	      bfd_boolean dyn;
 
 	      off = h->got.offset;
 #ifdef INCLUDE_SHMEDIA
@@ -5277,7 +5277,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		{
 		  /* GD->LE transition:
 		       mov.l 1f,r4; mova 2f,r0; mov.l 2f,r1; add r0,r1;
-		       jsr @r1; add r12,r4; bra 3f; nop; .align 2; 
+		       jsr @r1; add r12,r4; bra 3f; nop; .align 2;
 		       1: .long x$TLSGD; 2: .long __tls_get_addr@PLT; 3:
 		     We change it into:
 		       mov.l 1f,r4; stc gbr,r0; add r4,r0; nop;
@@ -5357,7 +5357,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -5611,7 +5611,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -5658,7 +5658,7 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			 elf_elfheader (input_bfd)->e_shstrndx,
 			 elf_section_data (input_section)->rel_hdr.sh_name));
 		if (name == NULL)
-		  return false;
+		  return FALSE;
 
 		BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			    && strcmp (bfd_get_section_name (input_bfd,
@@ -5705,21 +5705,21 @@ sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		    name = (bfd_elf_string_from_elf_section
 			    (input_bfd, symtab_hdr->sh_link, sym->st_name));
 		    if (name == NULL)
-		      return false;
+		      return FALSE;
 		    if (*name == '\0')
 		      name = bfd_section_name (input_bfd, sec);
 		  }
 		if (! ((*info->callbacks->reloc_overflow)
 		       (info, name, howto->name, (bfd_vma) 0,
 			input_bfd, input_section, rel->r_offset)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is a version of bfd_generic_get_relocated_section_contents
@@ -5732,7 +5732,7 @@ sh_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   Elf_Internal_Shdr *symtab_hdr;
@@ -5765,7 +5765,7 @@ sh_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
 
       internal_relocs = (_bfd_elf32_link_read_relocs
 			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
+			  (Elf_Internal_Rela *) NULL, FALSE));
       if (internal_relocs == NULL)
 	goto error_return;
 
@@ -5889,7 +5889,7 @@ sh_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 sh_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -6077,7 +6077,7 @@ sh_elf_gc_sweep_hook (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
@@ -6177,7 +6177,7 @@ sh_elf_optimized_tls_reloc (info, r_type, is_local)
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 sh_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -6202,7 +6202,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
   sreloc = NULL;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -6288,7 +6288,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 	      if (dynobj == NULL)
 		htab->root.dynobj = dynobj = abfd;
 	      if (! create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	      break;
 
 	    default:
@@ -6302,14 +6302,14 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_SH_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_SH_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 
 	force_got:
@@ -6346,8 +6346,8 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 #ifdef INCLUDE_SHMEDIA
 	      if (seen_stt_datalabel)
 		{
-		  struct elf_sh_link_hash_entry *eh = 
-		    (struct elf_sh_link_hash_entry *)h;
+		  struct elf_sh_link_hash_entry *eh
+		    = (struct elf_sh_link_hash_entry *) h;
 
 		  eh->datalabel_got.refcount += 1;
 		}
@@ -6378,7 +6378,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 		  local_got_refcounts = ((bfd_signed_vma *)
 					 bfd_zalloc (abfd, size));
 		  if (local_got_refcounts == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 #ifdef 	INCLUDE_SHMEDIA
 		  /* Take care of both the datalabel and codelabel local
@@ -6411,7 +6411,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 		  (*_bfd_error_handler)
 		    (_("%s: `%s' accessed both as normal and thread local symbol"),
 		     bfd_archive_filename (abfd), h->root.root.string);
-		  return false;
+		  return FALSE;
 		}
 	    }
 
@@ -6540,7 +6540,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (abfd, sec),
@@ -6559,7 +6559,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		  if (sec->flags & SEC_READONLY)
 		    info->flags |= DF_TEXTREL;
@@ -6578,7 +6578,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 		  s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
 						 sec, r_symndx);
 		  if (s == NULL)
-		    return false;
+		    return FALSE;
 
 		  head = ((struct elf_sh_dyn_relocs **)
 			  &elf_section_data (s)->local_dynrel);
@@ -6590,7 +6590,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 		  bfd_size_type amt = sizeof (*p);
 		  p = ((struct elf_sh_dyn_relocs *) bfd_alloc (dynobj, amt));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = *head;
 		  *head = p;
 		  p->sec = sec;
@@ -6610,7 +6610,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 	    {
 	      (*_bfd_error_handler) (_("%s: TLS local exec code cannot be linked into shared objects"),
 				     bfd_archive_filename (abfd));
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (ELF32_R_TYPE (rel->r_info) == R_SH_TLS_LD_32)
@@ -6637,7 +6637,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (abfd, sec),
@@ -6656,7 +6656,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		  elf_section_data (sec)->sreloc = sreloc;
 		  if (sec->flags & SEC_READONLY)
@@ -6675,7 +6675,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 		  s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
 						 sec, r_symndx);
 		  if (s == NULL)
-		    return false;
+		    return FALSE;
 
 		  head = ((struct elf_sh_dyn_relocs **)
 			  &elf_section_data (s)->local_dynrel);
@@ -6687,7 +6687,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 		  bfd_size_type amt = sizeof (*p);
 		  p = ((struct elf_sh_dyn_relocs *) bfd_alloc (dynobj, amt));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = *head;
 		  *head = p;
 		  p->sec = sec;
@@ -6697,7 +6697,7 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 
 	      p->count += 1;
 	      if (h)
-		sh_elf_hash_entry (h)->tls_tpoff32 = true;
+		sh_elf_hash_entry (h)->tls_tpoff32 = TRUE;
 	    }
 	  break;
 
@@ -6706,11 +6706,11 @@ sh_elf_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 #ifndef sh_elf_set_mach_from_flags
-static boolean
+static bfd_boolean
 sh_elf_set_mach_from_flags (abfd)
      bfd *abfd;
 {
@@ -6741,16 +6741,16 @@ sh_elf_set_mach_from_flags (abfd)
       bfd_default_set_arch_mach (abfd, bfd_arch_sh, bfd_mach_sh4);
       break;
     default:
-      return false;
+      return FALSE;
     }
-  return true;
+  return TRUE;
 }
 #endif /* not sh_elf_set_mach_from_flags */
 
 #ifndef sh_elf_set_private_flags
 /* Function to keep SH specific file flags.  */
 
-static boolean
+static bfd_boolean
 sh_elf_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -6759,7 +6759,7 @@ sh_elf_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
+  elf_flags_init (abfd) = TRUE;
   return sh_elf_set_mach_from_flags (abfd);
 }
 #endif /* not sh_elf_set_private_flags */
@@ -6767,14 +6767,14 @@ sh_elf_set_private_flags (abfd, flags)
 #ifndef sh_elf_copy_private_data
 /* Copy backend specific data from one object module to another */
 
-static boolean
+static bfd_boolean
 sh_elf_copy_private_data (ibfd, obfd)
      bfd * ibfd;
      bfd * obfd;
 {
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   return sh_elf_set_private_flags (obfd, elf_elfheader (ibfd)->e_flags);
 }
@@ -6784,7 +6784,7 @@ sh_elf_copy_private_data (ibfd, obfd)
 /* This routine checks for linking big and little endian objects
    together, and for linking sh-dsp with sh3e / sh4 objects.  */
 
-static boolean
+static bfd_boolean
 sh_elf_merge_private_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -6792,16 +6792,16 @@ sh_elf_merge_private_data (ibfd, obfd)
   flagword old_flags, new_flags;
 
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (! elf_flags_init (obfd))
     {
       /* This happens when ld starts out with a 'blank' output file.  */
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = EF_SH1;
     }
   old_flags = elf_elfheader (obfd)->e_flags;
@@ -6815,7 +6815,7 @@ sh_elf_merge_private_data (ibfd, obfd)
 	 EF_SH_HAS_DSP (new_flags) ? "dsp" : "floating point",
 	 EF_SH_HAS_DSP (new_flags) ? "floating point" : "dsp");
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
   elf_elfheader (obfd)->e_flags = EF_SH_MERGE_MACH (old_flags, new_flags);
 
@@ -6827,29 +6827,29 @@ sh_elf_merge_private_data (ibfd, obfd)
    as the specific tdata.  We set also the machine architecture from flags
    here.  */
 
-static boolean
+static bfd_boolean
 sh_elf_object_p (abfd)
   bfd *abfd;
 {
   struct sh_elf_obj_tdata *new_tdata;
   bfd_size_type amt = sizeof (struct sh_elf_obj_tdata);
 
-  if (sh_elf_set_mach_from_flags (abfd) == false)
-    return false;
+  if (!sh_elf_set_mach_from_flags (abfd))
+    return FALSE;
 
   /* Allocate our special target data.  */
   new_tdata = bfd_zalloc (abfd, amt);
   if (new_tdata == NULL)
-    return false;
+    return FALSE;
   new_tdata->root = *abfd->tdata.elf_obj_data;
   abfd->tdata.any = new_tdata;
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 sh_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -7134,12 +7134,12 @@ sh_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 sh_elf_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -7192,7 +7192,7 @@ sh_elf_finish_dynamic_sections (output_bfd, info)
 		  struct elf_link_hash_entry *h;
 
 		  h = elf_link_hash_lookup (&htab->root, name,
-					    false, false, true);
+					    FALSE, FALSE, TRUE);
 		  if (h != NULL && (h->other & STO_SH5_ISA32))
 		    {
 		      dyn.d_un.d_val |= 1;
@@ -7308,7 +7308,7 @@ sh_elf_finish_dynamic_sections (output_bfd, info)
       elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
     }
 
-  return true;
+  return TRUE;
 }
 
 static enum elf_reloc_type_class
@@ -7329,7 +7329,7 @@ sh_elf_reloc_type_class (rela)
 }
 
 /* Support for Linux core dump NOTE sections */
-static boolean
+static bfd_boolean
 elf32_shlin_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -7340,7 +7340,7 @@ elf32_shlin_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 168:		/* Linux/SH */
 	/* pr_cursig */
@@ -7361,7 +7361,7 @@ elf32_shlin_grok_prstatus (abfd, note)
 					  raw_size, note->descpos + offset);
 }
 
-static boolean
+static bfd_boolean
 elf32_shlin_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -7369,7 +7369,7 @@ elf32_shlin_grok_psinfo (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 124:		/* Linux/SH elf_prpsinfo */
 	elf_tdata (abfd)->core_program
@@ -7390,7 +7390,7 @@ elf32_shlin_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 
 #define TARGET_BIG_SYM		bfd_elf32_sh_vec
diff --git a/bfd/elf32-sh64-com.c b/bfd/elf32-sh64-com.c
index df0c463e263..d89d7c7fc5d 100644
--- a/bfd/elf32-sh64-com.c
+++ b/bfd/elf32-sh64-com.c
@@ -1,18 +1,18 @@
 /* Hitachi SH64-specific support for 32-bit ELF
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. 
-      
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+
    This file is part of BFD, the Binary File Descriptor library.
-  
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-                      
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-    
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
@@ -26,7 +26,7 @@
 #include "elf/sh.h"
 #include "../opcodes/sh64-opc.h"
 
-static boolean sh64_address_in_cranges
+static bfd_boolean sh64_address_in_cranges
   PARAMS ((asection *cranges, bfd_vma, sh64_elf_crange *));
 
 /* Ordering functions of a crange, for the qsort and bsearch calls and for
@@ -100,7 +100,7 @@ _bfd_sh64_crange_bsearch_cmpl (p1, p2)
    section.  Return FALSE if not found, and TRUE if found, and the region
    filled into RANGEP if non-NULL.  */
 
-static boolean
+static bfd_boolean
 sh64_address_in_cranges (cranges, addr, rangep)
      asection *cranges;
      bfd_vma addr;
@@ -113,11 +113,11 @@ sh64_address_in_cranges (cranges, addr, rangep)
   /* If the size is not a multiple of the cranges entry size, then
      something is badly wrong.  */
   if ((cranges_size % SH64_CRANGE_SIZE) != 0)
-    return false;
+    return FALSE;
 
   /* If this section has relocations, then we can't do anything sane.  */
   if (bfd_get_section_flags (cranges->owner, cranges) & SEC_RELOC)
-    return false;
+    return FALSE;
 
   /* Has some kind soul (or previous call) left processed, sorted contents
      for us?  */
@@ -130,7 +130,7 @@ sh64_address_in_cranges (cranges, addr, rangep)
 	= bfd_malloc (cranges->_cooked_size != 0
 		      ? cranges->_cooked_size : cranges->_raw_size);
       if (cranges_contents == NULL)
-	return false;
+	return FALSE;
 
       if (! bfd_get_section_contents (cranges->owner, cranges,
 				      cranges_contents, (file_ptr) 0,
@@ -183,16 +183,16 @@ sh64_address_in_cranges (cranges, addr, rangep)
       rangep->cr_size = cr_size;
       rangep->cr_type = cr_type;
 
-      return true;
+      return TRUE;
     }
 
   /* There is a .cranges section, but it does not have a descriptor
      matching this address.  */
-  return false;
+  return FALSE;
 
 error_return:
   free (cranges_contents);
-  return false;
+  return FALSE;
 }
 
 /* Determine what ADDR points to in SEC, and fill in a range descriptor in
@@ -215,7 +215,7 @@ sh64_get_contents_type (sec, addr, rangep)
       rangep->cr_type = CRT_NONE;
     }
   else
-    return false;
+    return FALSE;
 
   /* If none of the pertinent bits are set, then it's a SHcompact (or at
      least not SHmedia).  */
@@ -254,7 +254,7 @@ sh64_get_contents_type (sec, addr, rangep)
 
 /* This is a simpler exported interface for the benefit of gdb et al.  */
 
-boolean
+bfd_boolean
 sh64_address_is_shmedia (sec, addr)
      asection *sec;
      bfd_vma addr;
diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index c0df73d4d82..a6638e9b2bf 100644
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -1,5 +1,5 @@
 /* Hitachi SH64-specific support for 32-bit ELF
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -37,28 +37,35 @@ struct sh64_find_section_vma_data
    bfd_vma addr;
  };
 
-static boolean sh64_elf_copy_private_data PARAMS ((bfd *, bfd *));
-static boolean sh64_elf_merge_private_data PARAMS ((bfd *, bfd *));
-static boolean sh64_elf_fake_sections PARAMS ((bfd *, Elf_Internal_Shdr *,
-					      asection *));
-static boolean sh64_elf_set_private_flags PARAMS ((bfd *, flagword));
-static boolean sh64_elf_set_mach_from_flags PARAMS ((bfd *));
-static boolean shmedia_prepare_reloc
+static bfd_boolean sh64_elf_copy_private_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean sh64_elf_merge_private_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean sh64_elf_fake_sections
+  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
+static bfd_boolean sh64_elf_set_private_flags
+  PARAMS ((bfd *, flagword));
+static bfd_boolean sh64_elf_set_mach_from_flags
+  PARAMS ((bfd *));
+static bfd_boolean shmedia_prepare_reloc
   PARAMS ((struct bfd_link_info *, bfd *, asection *,
 	   bfd_byte *, const Elf_Internal_Rela *, bfd_vma *));
-static int sh64_elf_get_symbol_type PARAMS ((Elf_Internal_Sym *, int));
-static boolean sh64_elf_add_symbol_hook
+static int sh64_elf_get_symbol_type
+  PARAMS ((Elf_Internal_Sym *, int));
+static bfd_boolean sh64_elf_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
-static boolean sh64_elf_link_output_symbol_hook
+static bfd_boolean sh64_elf_link_output_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const char *, Elf_Internal_Sym *,
 	   asection *));
-static boolean sh64_backend_section_from_shdr
+static bfd_boolean sh64_backend_section_from_shdr
   PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
-static void sh64_elf_final_write_processing PARAMS ((bfd *, boolean));
-static boolean sh64_bfd_elf_copy_private_section_data
+static void sh64_elf_final_write_processing
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean sh64_bfd_elf_copy_private_section_data
   PARAMS ((bfd *, asection *, bfd *, asection *));
-static void sh64_find_section_for_address PARAMS ((bfd *, asection *, PTR));
+static void sh64_find_section_for_address
+  PARAMS ((bfd *, asection *, PTR));
 
 /* Let elf32-sh.c handle the "bfd_" definitions, so we only have to
    intrude with an #ifndef around the function definition.  */
@@ -85,9 +92,9 @@ static void sh64_find_section_for_address PARAMS ((bfd *, asection *, PTR));
 	sh64_bfd_elf_copy_private_section_data
 
 /* This COFF-only function (only compiled with COFF support, making
-   ELF-only chains problematic) returns true early for SH4, so let's just
-   define it true here.  */
-#define _bfd_sh_align_load_span(a,b,c,d,e,f,g,h,i,j) true
+   ELF-only chains problematic) returns TRUE early for SH4, so let's just
+   define it TRUE here.  */
+#define _bfd_sh_align_load_span(a,b,c,d,e,f,g,h,i,j) TRUE
 
 #define GOT_BIAS (-((long)-32768))
 #define INCLUDE_SHMEDIA
@@ -96,7 +103,7 @@ static void sh64_find_section_for_address PARAMS ((bfd *, asection *, PTR));
 /* Set the SHF_SH5_ISA32 flag for ISA SHmedia code sections, and pass
    through SHT_SH5_CR_SORTED on a sorted .cranges section.  */
 
-boolean
+bfd_boolean
 sh64_elf_fake_sections (output_bfd, elf_section_hdr, asect)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      Elf_Internal_Shdr *elf_section_hdr;
@@ -113,10 +120,10 @@ sh64_elf_fake_sections (output_bfd, elf_section_hdr, asect)
 		 SH64_CRANGES_SECTION_NAME) == 0)
     elf_section_hdr->sh_type = SHT_SH5_CR_SORTED;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 sh64_elf_set_mach_from_flags (abfd)
      bfd *abfd;
 {
@@ -133,7 +140,7 @@ sh64_elf_set_mach_from_flags (abfd)
 
     default:
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
   /* We also need to set SEC_DEBUGGING on an incoming .cranges section.
@@ -146,29 +153,29 @@ sh64_elf_set_mach_from_flags (abfd)
       && ! bfd_set_section_flags (abfd, cranges,
 				  bfd_get_section_flags (abfd, cranges)
 				  | SEC_DEBUGGING))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 sh64_elf_copy_private_data (ibfd, obfd)
      bfd * ibfd;
      bfd * obfd;
 {
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   BFD_ASSERT (!elf_flags_init (obfd)
 	      || (elf_elfheader (obfd)->e_flags
 		  == elf_elfheader (ibfd)->e_flags));
 
   elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 sh64_elf_merge_private_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -176,11 +183,11 @@ sh64_elf_merge_private_data (ibfd, obfd)
   flagword old_flags, new_flags;
 
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (bfd_get_arch_size (ibfd) != bfd_get_arch_size (obfd))
     {
@@ -198,7 +205,7 @@ sh64_elf_merge_private_data (ibfd, obfd)
       (*_bfd_error_handler) (msg, bfd_get_filename (ibfd),
 			     bfd_get_filename (obfd));
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
   old_flags = elf_elfheader (obfd)->e_flags;
@@ -206,7 +213,7 @@ sh64_elf_merge_private_data (ibfd, obfd)
   if (! elf_flags_init (obfd))
     {
       /* This happens when ld starts out with a 'blank' output file.  */
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = old_flags = new_flags;
     }
   /* We don't allow linking in non-SH64 code.  */
@@ -216,7 +223,7 @@ sh64_elf_merge_private_data (ibfd, obfd)
 	("%s: uses non-SH64 instructions while previous modules use SH64 instructions",
 	 bfd_get_filename (ibfd));
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   /* I can't think of anything sane other than old_flags being EF_SH5 and
@@ -230,7 +237,7 @@ sh64_elf_merge_private_data (ibfd, obfd)
 
    We only recognize SHT_SH5_CR_SORTED, on the .cranges section.  */
 
-boolean
+bfd_boolean
 sh64_backend_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -239,13 +246,13 @@ sh64_backend_section_from_shdr (abfd, hdr, name)
   flagword flags = 0;
 
   /* We do like MIPS with a bit switch for recognized types, and returning
-     false for a recognized section type with an unexpected name.  Right
+     FALSE for a recognized section type with an unexpected name.  Right
      now we only have one recognized type, but that might change.  */
   switch (hdr->sh_type)
     {
     case SHT_SH5_CR_SORTED:
       if (strcmp (name, SH64_CRANGES_SECTION_NAME) != 0)
-	return false;
+	return FALSE;
 
       /* We set the SEC_SORT_ENTRIES flag so it can be passed on to
 	 sh64_elf_fake_sections, keeping SHT_SH5_CR_SORTED if this object
@@ -256,20 +263,20 @@ sh64_backend_section_from_shdr (abfd, hdr, name)
       break;
 
     default:
-      return false;
+      return FALSE;
     }
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
 
   if (flags
       && ! bfd_set_section_flags (abfd, hdr->bfd_section,
 				  bfd_get_section_flags (abfd,
 							 hdr->bfd_section)
 				  | flags))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* In contrast to sh64_backend_section_from_shdr, this is called for all
@@ -277,7 +284,7 @@ sh64_backend_section_from_shdr (abfd, hdr, name)
    assembling.  We need to set up the sh64_elf_section_data (asection *)
    structure for the SH64 ELF section flags to be copied correctly.  */
 
-boolean
+bfd_boolean
 sh64_bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
      bfd *ibfd;
      asection *isec;
@@ -288,10 +295,10 @@ sh64_bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
 
   if (ibfd->xvec->flavour != bfd_target_elf_flavour
       || obfd->xvec->flavour != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (! _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec))
-    return false;
+    return FALSE;
 
   sh64_sec_data = sh64_elf_section_data (isec);
   if (sh64_sec_data == NULL)
@@ -299,7 +306,7 @@ sh64_bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
       sh64_sec_data = bfd_zmalloc (sizeof (struct sh64_section_data));
 
       if (sh64_sec_data == NULL)
-	return false;
+	return FALSE;
 
       sh64_sec_data->contents_flags
 	= (elf_section_data (isec)->this_hdr.sh_flags
@@ -308,12 +315,12 @@ sh64_bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
       sh64_elf_section_data (osec) = sh64_sec_data;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Function to keep SH64 specific file flags.  */
 
-static boolean
+static bfd_boolean
 sh64_elf_set_private_flags (abfd, flags)
      bfd *    abfd;
      flagword flags;
@@ -322,7 +329,7 @@ sh64_elf_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
+  elf_flags_init (abfd) = TRUE;
   return sh64_elf_set_mach_from_flags (abfd);
 }
 
@@ -357,7 +364,7 @@ sh64_elf_get_symbol_type (elf_sym, type)
    or the hash entry, alternatively adding the index to Elf_Internal_Sym
    (not so good).  */
 
-static boolean
+static bfd_boolean
 sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -388,13 +395,13 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
       /* Allocation may fail.  */
       if (dl_name == NULL)
-	return false;
+	return FALSE;
 
       strcpy (dl_name, *namep);
       strcat (dl_name, DATALABEL_SUFFIX);
 
       h = (struct elf_link_hash_entry *)
-	bfd_link_hash_lookup (info->hash, dl_name, false, false, false);
+	bfd_link_hash_lookup (info->hash, dl_name, FALSE, FALSE, FALSE);
 
       if (h == NULL)
 	{
@@ -404,11 +411,11 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
 	  if (! _bfd_generic_link_add_one_symbol (info, abfd, dl_name,
 						  flags, *secp, *valp,
-						  *namep, false,
+						  *namep, FALSE,
 						  bed->collect, &bh))
 	    {
 	      free (dl_name);
-	      return false;
+	      return FALSE;
 	    }
 
 	  h = (struct elf_link_hash_entry *) bh;
@@ -431,7 +438,7 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	    (_("%s: encountered datalabel symbol in input"),
 	     bfd_get_filename (abfd));
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       /* Now find the hash-table slot for this entry and fill it in.  */
@@ -443,7 +450,7 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       *namep = NULL;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This hook function is called before the linker writes out a global
@@ -458,7 +465,7 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
    we don't need to look up and make sure to emit the main symbol for each
    DataLabel symbol.  */
 
-boolean
+bfd_boolean
 sh64_elf_link_output_symbol_hook (abfd, info, cname, sym, input_sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -474,14 +481,14 @@ sh64_elf_link_output_symbol_hook (abfd, info, cname, sym, input_sec)
 	name[strlen (name) - strlen (DATALABEL_SUFFIX)] = 0;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Check a SH64-specific reloc and put the value to relocate to into
    RELOCATION, ready to pass to _bfd_final_link_relocate.  Return FALSE if
    bad value, TRUE if ok.  */
 
-static boolean
+static bfd_boolean
 shmedia_prepare_reloc (info, abfd, input_section,
 		       contents, rel, relocation)
      struct bfd_link_info *info;
@@ -520,7 +527,7 @@ shmedia_prepare_reloc (info, abfd, input_section,
 		&& ! ((*info->callbacks->reloc_dangerous)
 		      (info, msg, abfd, input_section,
 		       rel->r_offset)))
-	      return false;
+	      return FALSE;
 	  }
 	else
 	  {
@@ -534,7 +541,7 @@ shmedia_prepare_reloc (info, abfd, input_section,
 		(*_bfd_error_handler)
 		  (_("%s: GAS error: unexpected PTB insn with R_SH_PT_16"),
 		   bfd_get_filename (input_section->owner));
-		return false;
+		return FALSE;
 	      }
 
 	    /* Change the PTA to a PTB, if destination indicates so.  */
@@ -567,7 +574,7 @@ shmedia_prepare_reloc (info, abfd, input_section,
       break;
 
     default:
-      return false;
+      return FALSE;
     }
 
   disp = (*relocation & 0xf);
@@ -584,10 +591,10 @@ shmedia_prepare_reloc (info, abfd, input_section,
 	(_("%s: error: unaligned relocation type %d at %08x reloc %08x\n"),
 	 bfd_get_filename (input_section->owner), ELF32_R_TYPE (rel->r_info),
 	 (unsigned)rel->r_offset, (unsigned)relocation);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Helper function to locate the section holding a certain address.  This
@@ -634,8 +641,8 @@ sh64_find_section_for_address (abfd, section, data)
 
 static void
 sh64_elf_final_write_processing (abfd, linker)
-     bfd *   abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd *abfd;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   bfd_vma ld_generated_cranges_size;
   asection *cranges
diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c
index be2733d36bb..07137baef33 100644
--- a/bfd/elf32-sparc.c
+++ b/bfd/elf32-sparc.c
@@ -30,34 +30,35 @@ static reloc_howto_type *elf32_sparc_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void elf32_sparc_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf32_sparc_check_relocs
+static bfd_boolean elf32_sparc_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf32_sparc_adjust_dynamic_symbol
+static bfd_boolean elf32_sparc_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf32_sparc_size_dynamic_sections
+static bfd_boolean elf32_sparc_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf32_sparc_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static boolean elf32_sparc_relocate_section
+static bfd_boolean elf32_sparc_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean elf32_sparc_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf32_sparc_finish_dynamic_symbol
+static bfd_boolean elf32_sparc_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean elf32_sparc_finish_dynamic_sections
+static bfd_boolean elf32_sparc_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf32_sparc_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-static boolean elf32_sparc_object_p
+static bfd_boolean elf32_sparc_merge_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean elf32_sparc_object_p
   PARAMS ((bfd *));
 static void elf32_sparc_final_write_processing
-  PARAMS ((bfd *, boolean));
+  PARAMS ((bfd *, bfd_boolean));
 static enum elf_reloc_type_class elf32_sparc_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
 static asection * elf32_sparc_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf32_sparc_gc_sweep_hook
+static bfd_boolean elf32_sparc_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
@@ -70,72 +71,72 @@ static bfd_reloc_status_type sparc_elf_wdisp16_reloc
 
 reloc_howto_type _bfd_sparc_elf_howto_table[] =
 {
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_8,         0,0, 8,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_8",       false,0,0x000000ff,true),
-  HOWTO(R_SPARC_16,        0,1,16,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_16",      false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_32,        0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_32",      false,0,0xffffffff,true),
-  HOWTO(R_SPARC_DISP8,     0,0, 8,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP8",   false,0,0x000000ff,true),
-  HOWTO(R_SPARC_DISP16,    0,1,16,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP16",  false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_DISP32,    0,2,32,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP32",  false,0,0xffffffff,true),
-  HOWTO(R_SPARC_WDISP30,   2,2,30,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP30", false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_WDISP22,   2,2,22,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP22", false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HI22,     10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HI22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_22,        0,2,22,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_22",      false,0,0x003fffff,true),
-  HOWTO(R_SPARC_13,        0,2,13,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_13",      false,0,0x00001fff,true),
-  HOWTO(R_SPARC_LO10,      0,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LO10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT10,     0,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT10",   false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT13,     0,2,13,false,0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_GOT13",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_GOT22,    10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT22",   false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC10,      0,2,10,true, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC22,     10,2,22,true, 0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PC22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WPLT30,    2,2,30,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WPLT30",  false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_COPY,      0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_COPY",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_GLOB_DAT,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GLOB_DAT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_JMP_SLOT,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_SLOT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_RELATIVE,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_RELATIVE",false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA32,      0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA32",    false,0,0xffffffff,true),
-  HOWTO(R_SPARC_PLT32,     0,0,00,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PLT32",   false,0,0xffffffff,true),
-  HOWTO(R_SPARC_HIPLT22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HIPLT22",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_LOPLT10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_LOPLT10",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT32,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT32",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT22",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT10",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_10,        0,2,10,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_10",      false,0,0x000003ff,true),
-  HOWTO(R_SPARC_11,        0,2,11,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_11",      false,0,0x000007ff,true),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_8,         0,0, 8,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_8",       FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_16,        0,1,16,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_16",      FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_32,        0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_32",      FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_DISP8,     0,0, 8,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP8",   FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_DISP16,    0,1,16,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP16",  FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_DISP32,    0,2,32,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP32",  FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_WDISP30,   2,2,30,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP30", FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_WDISP22,   2,2,22,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP22", FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_HI22,     10,2,22,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HI22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_22,        0,2,22,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_22",      FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_13,        0,2,13,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_13",      FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_LO10,      0,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LO10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT10,     0,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT10",   FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT13,     0,2,13,FALSE,0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_GOT13",   FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_GOT22,    10,2,22,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT22",   FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC10,      0,2,10,TRUE, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_PC22,     10,2,22,TRUE, 0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PC22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_WPLT30,    2,2,30,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WPLT30",  FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_COPY,      0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_COPY",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_GLOB_DAT,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GLOB_DAT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_JMP_SLOT,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_SLOT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_RELATIVE,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_RELATIVE",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_UA32,      0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA32",    FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_PLT32,     0,0,00,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PLT32",   FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_HIPLT22,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HIPLT22",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_LOPLT10,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_LOPLT10",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT32,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT32",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT22,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT22",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT10,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT10",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_10,        0,2,10,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_10",      FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_11,        0,2,11,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_11",      FALSE,0,0x000007ff,TRUE),
   /* These are for sparc64 in a 64 bit environment.
      Values need to be here because the table is indexed by reloc number.  */
-  HOWTO(R_SPARC_64,        0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_64",      false,0,0x00000000,true),
-  HOWTO(R_SPARC_OLO10,     0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_OLO10",   false,0,0x00000000,true),
-  HOWTO(R_SPARC_HH22,      0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HH22",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_HM10,      0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HM10",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_LM22,      0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_LM22",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_PC_HH22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_HH22", false,0,0x00000000,true),
-  HOWTO(R_SPARC_PC_HM10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_HM10", false,0,0x00000000,true),
-  HOWTO(R_SPARC_PC_LM22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_LM22", false,0,0x00000000,true),
+  HOWTO(R_SPARC_64,        0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_64",      FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_OLO10,     0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_OLO10",   FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_HH22,      0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HH22",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_HM10,      0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HM10",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_LM22,      0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_LM22",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PC_HH22,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_HH22", FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PC_HM10,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_HM10", FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PC_LM22,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_LM22", FALSE,0,0x00000000,TRUE),
   /* End sparc64 in 64 bit environment values.
      The following are for sparc64 in a 32 bit environment.  */
-  HOWTO(R_SPARC_WDISP16,   2,2,16,true, 0,complain_overflow_signed,  sparc_elf_wdisp16_reloc,"R_SPARC_WDISP16", false,0,0x00000000,true),
-  HOWTO(R_SPARC_WDISP19,   2,2,19,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP19", false,0,0x0007ffff,true),
-  HOWTO(R_SPARC_UNUSED_42, 0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UNUSED_42",false,0,0x00000000,true),
-  HOWTO(R_SPARC_7,         0,2, 7,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_7",       false,0,0x0000007f,true),
-  HOWTO(R_SPARC_5,         0,2, 5,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_5",       false,0,0x0000001f,true),
-  HOWTO(R_SPARC_6,         0,2, 6,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_6",       false,0,0x0000003f,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA64,      0,0, 0,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_UA64",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA16,      0,1,16,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA16",    false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_REV32,     0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_REV32",   false,0,0xffffffff,true),
+  HOWTO(R_SPARC_WDISP16,   2,2,16,TRUE, 0,complain_overflow_signed,  sparc_elf_wdisp16_reloc,"R_SPARC_WDISP16", FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_WDISP19,   2,2,19,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP19", FALSE,0,0x0007ffff,TRUE),
+  HOWTO(R_SPARC_UNUSED_42, 0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UNUSED_42",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_7,         0,2, 7,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_7",       FALSE,0,0x0000007f,TRUE),
+  HOWTO(R_SPARC_5,         0,2, 5,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_5",       FALSE,0,0x0000001f,TRUE),
+  HOWTO(R_SPARC_6,         0,2, 6,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_6",       FALSE,0,0x0000003f,TRUE),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_UA64,      0,0, 0,FALSE,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_UA64",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_UA16,      0,1,16,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA16",    FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_REV32,     0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_REV32",   FALSE,0,0xffffffff,TRUE),
 };
 static reloc_howto_type elf32_sparc_vtinherit_howto =
-  HOWTO (R_SPARC_GNU_VTINHERIT, 0,2,0,false,0,complain_overflow_dont, NULL, "R_SPARC_GNU_VTINHERIT", false,0, 0, false);
+  HOWTO (R_SPARC_GNU_VTINHERIT, 0,2,0,FALSE,0,complain_overflow_dont, NULL, "R_SPARC_GNU_VTINHERIT", FALSE,0, 0, FALSE);
 static reloc_howto_type elf32_sparc_vtentry_howto =
-  HOWTO (R_SPARC_GNU_VTENTRY, 0,2,0,false,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_SPARC_GNU_VTENTRY", false,0,0, false);
+  HOWTO (R_SPARC_GNU_VTENTRY, 0,2,0,FALSE,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_SPARC_GNU_VTENTRY", FALSE,0,0, FALSE);
 
 struct elf_reloc_map {
   bfd_reloc_code_real_type bfd_reloc_val;
@@ -351,7 +352,7 @@ sparc_elf_wdisp16_reloc (abfd,
    allocate space in the global offset table or procedure linkage
    table.  */
 
-static boolean
+static bfd_boolean
 elf32_sparc_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -369,7 +370,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -404,7 +405,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 	      /* Create the .got section.  */
 	      elf_hash_table (info)->dynobj = dynobj = abfd;
 	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	    }
 
 	  if (sgot == NULL)
@@ -429,7 +430,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 						   | SEC_LINKER_CREATED
 						   | SEC_READONLY))
 		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -446,7 +447,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 	      if (h->dynindx == -1)
 		{
 		  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		    return false;
+		    return FALSE;
 		}
 
 	      srelgot->_raw_size += sizeof (Elf32_External_Rela);
@@ -464,7 +465,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 		  size *= sizeof (bfd_vma);
 		  local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
 		  if (local_got_offsets == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_offsets (abfd) = local_got_offsets;
 		  for (i = 0; i < symtab_hdr->sh_info; i++)
 		    local_got_offsets[i] = (bfd_vma) -1;
@@ -519,7 +520,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 	  if (h->dynindx == -1)
 	    {
 	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
@@ -588,7 +589,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (abfd, sec),
@@ -607,7 +608,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		  if (sec->flags & SEC_READONLY)
 		    info->flags |= DF_TEXTREL;
@@ -620,12 +621,12 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 
         case R_SPARC_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         case R_SPARC_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
 
 	default:
@@ -633,7 +634,7 @@ elf32_sparc_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 static asection *
@@ -674,7 +675,7 @@ elf32_sparc_gc_mark_hook (sec, info, rel, h, sym)
 }
 
 /* Update the got entry reference counts for the section being removed.  */
-static boolean
+static bfd_boolean
 elf32_sparc_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -732,7 +733,7 @@ elf32_sparc_gc_sweep_hook (abfd, info, sec, relocs)
 	break;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -741,7 +742,7 @@ elf32_sparc_gc_sweep_hook (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf32_sparc_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -793,7 +794,7 @@ elf32_sparc_adjust_dynamic_symbol (info, h)
 	     table, and we can just do a WDISP30 reloc instead.  */
 
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	  return true;
+	  return TRUE;
 	}
 
       s = bfd_get_section_by_name (dynobj, ".plt");
@@ -807,7 +808,7 @@ elf32_sparc_adjust_dynamic_symbol (info, h)
       if (s->_raw_size >= 0x400000)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
      /* If this symbol is not defined in a regular file, and we are
@@ -833,7 +834,7 @@ elf32_sparc_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf32_External_Rela);
 
-      return true;
+      return TRUE;
     }
 
   /* If this is a weak symbol, and there is a real definition, the
@@ -845,7 +846,7 @@ elf32_sparc_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -856,12 +857,12 @@ elf32_sparc_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -902,7 +903,7 @@ elf32_sparc_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -912,19 +913,19 @@ elf32_sparc_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf32_sparc_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean relplt;
+  bfd_boolean relplt;
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
@@ -961,11 +962,11 @@ elf32_sparc_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  relplt = false;
+  relplt = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -974,7 +975,7 @@ elf32_sparc_size_dynamic_sections (output_bfd, info)
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
-      strip = false;
+      strip = FALSE;
 
       if (strncmp (name, ".rela", 5) == 0)
 	{
@@ -989,12 +990,12 @@ elf32_sparc_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      if (strcmp (name, ".rela.plt") == 0)
-		relplt = true;
+		relplt = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -1022,7 +1023,7 @@ elf32_sparc_size_dynamic_sections (output_bfd, info)
 	 contents to zero.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -1038,7 +1039,7 @@ elf32_sparc_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relplt)
@@ -1047,38 +1048,38 @@ elf32_sparc_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (!add_dynamic_entry (DT_RELA, 0)
 	  || !add_dynamic_entry (DT_RELASZ, 0)
 	  || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	return false;
+	return FALSE;
 
       if (info->flags & DF_TEXTREL)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 #define SET_SEC_DO_RELAX(section) do { elf_section_data(section)->tdata = (void *)1; } while (0)
 #define SEC_DO_RELAX(section) (elf_section_data(section)->tdata == (void *)1)
 
-static boolean
+static bfd_boolean
 elf32_sparc_relax_section (abfd, section, link_info, again)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
-     boolean *again;
+     bfd_boolean *again;
 {
-  *again = false;
+  *again = FALSE;
   SET_SEC_DO_RELAX (section);
-  return true;
+  return TRUE;
 }
 
 /* This is the condition under which finish_dynamic_symbol will be called
@@ -1094,7 +1095,7 @@ elf32_sparc_relax_section (abfd, section, link_info, again)
 
 /* Relocate a SPARC ELF section.  */
 
-static boolean
+static bfd_boolean
 elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 			      contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -1118,7 +1119,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -1146,8 +1147,8 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
       asection *sec;
       bfd_vma relocation, off;
       bfd_reloc_status_type r;
-      boolean is_plt = false;
-      boolean unresolved_reloc;
+      bfd_boolean is_plt = FALSE;
+      bfd_boolean unresolved_reloc;
 
       r_type = ELF32_R_TYPE (rel->r_info);
 
@@ -1158,7 +1159,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r_type < 0 || r_type >= (int) R_SPARC_max_std)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       howto = _bfd_sparc_elf_howto_table + r_type;
 
@@ -1167,7 +1168,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sec = NULL;
-      unresolved_reloc = false;
+      unresolved_reloc = FALSE;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -1191,7 +1192,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 		   relocation value for this symbol.  output_section
 		   is typically NULL for symbols satisfied by a shared
 		   library.  */
-		unresolved_reloc = true;
+		unresolved_reloc = TRUE;
 	      else
 		relocation = (h->root.u.def.value
 			      + sec->output_section->vma
@@ -1211,7 +1212,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 		      input_section, rel->r_offset,
 		      (!info->shared || info->no_undefined
 		       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	    }
 	}
 
@@ -1230,7 +1231,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	  if (h != NULL)
 	    {
-	      boolean dyn;
+	      bfd_boolean dyn;
 
 	      off = h->got.offset;
 	      BFD_ASSERT (off != (bfd_vma) -1);
@@ -1265,7 +1266,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 		    }
 		}
 	      else
-		unresolved_reloc = false;
+		unresolved_reloc = FALSE;
 	    }
 	  else
 	    {
@@ -1284,13 +1285,14 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 
 		  if (info->shared)
 		    {
-		      asection *srelgot;
+		      asection *s;
 		      Elf_Internal_Rela outrel;
+		      bfd_byte *loc;
 
 		      /* We need to generate a R_SPARC_RELATIVE reloc
 			 for the dynamic linker.  */
-		      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-		      BFD_ASSERT (srelgot != NULL);
+		      s = bfd_get_section_by_name (dynobj, ".rela.got");
+		      BFD_ASSERT (s != NULL);
 
 		      outrel.r_offset = (sgot->output_section->vma
 					 + sgot->output_offset
@@ -1298,11 +1300,9 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 		      outrel.r_info = ELF32_R_INFO (0, R_SPARC_RELATIVE);
 		      outrel.r_addend = relocation;
 		      relocation = 0;
-		      bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-						 (((Elf32_External_Rela *)
-						   srelgot->contents)
-						  + srelgot->reloc_count));
-		      ++srelgot->reloc_count;
+		      loc = s->contents;
+		      loc += s->reloc_count++ * sizeof (Elf32_External_Rela);
+		      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
 		    }
 
 		  bfd_put_32 (output_bfd, relocation, sgot->contents + off);
@@ -1347,11 +1347,11 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 	  relocation = (splt->output_section->vma
 			+ splt->output_offset
 			+ h->plt.offset);
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  if (r_type == R_SPARC_PLT32)
 	    {
 	      r_type = R_SPARC_32;
-	      is_plt = true;
+	      is_plt = TRUE;
 	      goto r_sparc_plt32;
 	    }
 	  break;
@@ -1390,7 +1390,8 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 	      && (input_section->flags & SEC_ALLOC))
 	    {
 	      Elf_Internal_Rela outrel;
-	      boolean skip, relocate = false;
+	      bfd_byte *loc;
+	      bfd_boolean skip, relocate = FALSE;
 
 	      /* When generating a shared object, these relocations
                  are copied into the output file to be resolved at run
@@ -1405,7 +1406,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -1416,15 +1417,15 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 		  BFD_ASSERT (sreloc != NULL);
 		}
 
-	      skip = false;
+	      skip = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
 
@@ -1457,7 +1458,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 		     FIXME: Add code tracking needed dynamic relocs as
 		     e.g. i386 has.  */
 		  if (h->dynindx == -1)
-		    skip = true, relocate = true;
+		    skip = TRUE, relocate = TRUE;
 		  break;
 		}
 
@@ -1501,7 +1502,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -1519,7 +1520,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 				(_("%s: probably compiled without -fPIC?"),
 				 bfd_archive_filename (input_bfd));
 			      bfd_set_error (bfd_error_bad_value);
-			      return false;
+			      return FALSE;
 			    }
 			}
 
@@ -1528,11 +1529,9 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 		    }
 		}
 
-	      bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-					 (((Elf32_External_Rela *)
-					   sreloc->contents)
-					  + sreloc->reloc_count));
-	      ++sreloc->reloc_count;
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
 
 	      /* This reloc will be computed at runtime, so there's no
                  need to do anything now.  */
@@ -1704,27 +1703,27 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
 							    symtab_hdr->sh_link,
 							    sym->st_name);
 		    if (name == NULL)
-		      return false;
+		      return FALSE;
 		    if (*name == '\0')
 		      name = bfd_section_name (input_bfd, sec);
 		  }
 		if (! ((*info->callbacks->reloc_overflow)
 		       (info, name, howto->name, (bfd_vma) 0,
 			input_bfd, input_section, rel->r_offset)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -1740,6 +1739,7 @@ elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym)
       asection *splt;
       asection *srela;
       Elf_Internal_Rela rela;
+      bfd_byte *loc;
 
       /* This symbol has an entry in the procedure linkage table.  Set
          it up.  */
@@ -1767,9 +1767,9 @@ elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym)
 		       + h->plt.offset);
       rela.r_info = ELF32_R_INFO (h->dynindx, R_SPARC_JMP_SLOT);
       rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + h->plt.offset / PLT_ENTRY_SIZE - 4));
+      loc = srela->contents;
+      loc += (h->plt.offset / PLT_ENTRY_SIZE - 4) * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
 
       if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
 	{
@@ -1791,6 +1791,7 @@ elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym)
       asection *sgot;
       asection *srela;
       Elf_Internal_Rela rela;
+      bfd_byte *loc;
 
       /* This symbol has an entry in the global offset table.  Set it
          up.  */
@@ -1826,16 +1827,16 @@ elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym)
 
       bfd_put_32 (output_bfd, (bfd_vma) 0,
 		  sgot->contents + (h->got.offset &~ (bfd_vma) 1));
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + srela->reloc_count));
-      ++srela->reloc_count;
+      loc = srela->contents;
+      loc += srela->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
     }
 
   if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
     {
       asection *s;
       Elf_Internal_Rela rela;
+      bfd_byte *loc;
 
       /* This symbols needs a copy reloc.  Set it up.  */
 
@@ -1850,10 +1851,8 @@ elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym)
 		       + h->root.u.def.section->output_offset);
       rela.r_info = ELF32_R_INFO (h->dynindx, R_SPARC_COPY);
       rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) s->contents
-				  + s->reloc_count));
-      ++s->reloc_count;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
     }
 
   /* Mark some specially defined symbols as absolute.  */
@@ -1862,12 +1861,12 @@ elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf32_sparc_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -1894,16 +1893,16 @@ elf32_sparc_finish_dynamic_sections (output_bfd, info)
 	{
 	  Elf_Internal_Dyn dyn;
 	  const char *name;
-	  boolean size;
+	  bfd_boolean size;
 
 	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
 
 	  switch (dyn.d_tag)
 	    {
-	    case DT_PLTGOT:   name = ".plt"; size = false; break;
-	    case DT_PLTRELSZ: name = ".rela.plt"; size = true; break;
-	    case DT_JMPREL:   name = ".rela.plt"; size = false; break;
-	    default:	  name = NULL; size = false; break;
+	    case DT_PLTGOT:   name = ".plt"; size = FALSE; break;
+	    case DT_PLTRELSZ: name = ".rela.plt"; size = TRUE; break;
+	    case DT_JMPREL:   name = ".rela.plt"; size = FALSE; break;
+	    default:	  name = NULL; size = FALSE; break;
 	    }
 
 	  if (name != NULL)
@@ -1958,7 +1957,7 @@ elf32_sparc_finish_dynamic_sections (output_bfd, info)
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
 
-  return true;
+  return TRUE;
 }
 
 /* Functions for dealing with the e_flags field.
@@ -1971,24 +1970,24 @@ elf32_sparc_finish_dynamic_sections (output_bfd, info)
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-static boolean
+static bfd_boolean
 elf32_sparc_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
-  boolean error;
+  bfd_boolean error;
   /* FIXME: This should not be static.  */
   static unsigned long previous_ibfd_e_flags = (unsigned long) -1;
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
-  error = false;
+  error = FALSE;
 
   if (bfd_get_mach (ibfd) >= bfd_mach_sparc_v9)
     {
-      error = true;
+      error = TRUE;
       (*_bfd_error_handler)
 	(_("%s: compiled for a 64 bit system and target is 32 bit"),
 	 bfd_archive_filename (ibfd));
@@ -2006,22 +2005,22 @@ elf32_sparc_merge_private_bfd_data (ibfd, obfd)
       (*_bfd_error_handler)
 	(_("%s: linking little endian files with big endian files"),
 	 bfd_archive_filename (ibfd));
-      error = true;
+      error = TRUE;
     }
   previous_ibfd_e_flags = elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA;
 
   if (error)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the right machine number.  */
 
-static boolean
+static bfd_boolean
 elf32_sparc_object_p (abfd)
      bfd *abfd;
 {
@@ -2037,7 +2036,7 @@ elf32_sparc_object_p (abfd)
 	return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
 					  bfd_mach_sparc_v8plus);
       else
-	return false;
+	return FALSE;
     }
   else if (elf_elfheader (abfd)->e_flags & EF_SPARC_LEDATA)
     return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
@@ -2052,7 +2051,7 @@ elf32_sparc_object_p (abfd)
 static void
 elf32_sparc_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   switch (bfd_get_mach (abfd))
     {
diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index ee3b14e2b5b..26201f5e8ec 100644
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -40,47 +40,47 @@ static void v850_elf_info_to_howto_rela
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static bfd_reloc_status_type v850_elf_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean v850_elf_is_local_label_name
+static bfd_boolean v850_elf_is_local_label_name
   PARAMS ((bfd *, const char *));
-static boolean v850_elf_relocate_section
+static bfd_boolean v850_elf_relocate_section
   PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	  Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 static bfd_reloc_status_type v850_elf_perform_relocation
   PARAMS ((bfd *, unsigned int, bfd_vma, bfd_byte *));
-static boolean v850_elf_check_relocs
+static bfd_boolean v850_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
 static void remember_hi16s_reloc
   PARAMS ((bfd *, bfd_vma, bfd_byte *));
 static bfd_byte * find_remembered_hi16s_reloc
-  PARAMS ((bfd_vma, boolean *));
+  PARAMS ((bfd_vma, bfd_boolean *));
 static bfd_reloc_status_type v850_elf_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *, bfd_vma,
 	   bfd_vma, bfd_vma, struct bfd_link_info *, asection *, int));
-static boolean v850_elf_object_p
+static bfd_boolean v850_elf_object_p
   PARAMS ((bfd *));
-static boolean v850_elf_fake_sections
+static bfd_boolean v850_elf_fake_sections
   PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
 static void v850_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
-static boolean v850_elf_set_private_flags
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean v850_elf_set_private_flags
   PARAMS ((bfd *, flagword));
-static boolean v850_elf_merge_private_bfd_data
+static bfd_boolean v850_elf_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean v850_elf_print_private_bfd_data
+static bfd_boolean v850_elf_print_private_bfd_data
   PARAMS ((bfd *, PTR));
-static boolean v850_elf_section_from_bfd_section
+static bfd_boolean v850_elf_section_from_bfd_section
   PARAMS ((bfd *, asection *, int *));
 static void v850_elf_symbol_processing
   PARAMS ((bfd *, asymbol *));
-static boolean v850_elf_add_symbol_hook
+static bfd_boolean v850_elf_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
-static boolean v850_elf_link_output_symbol_hook
+static bfd_boolean v850_elf_link_output_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const char *,
 	   Elf_Internal_Sym *, asection *));
-static boolean v850_elf_section_from_shdr
+static bfd_boolean v850_elf_section_from_shdr
   PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
-static boolean v850_elf_gc_sweep_hook
+static bfd_boolean v850_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection * v850_elf_gc_mark_hook
@@ -89,10 +89,10 @@ static asection * v850_elf_gc_mark_hook
 	   Elf_Internal_Sym *));
 static bfd_reloc_status_type v850_elf_ignore_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean v850_elf_relax_delete_bytes
+static bfd_boolean v850_elf_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, bfd_vma, int));
-static boolean v850_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
+static bfd_boolean v850_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
 
 /* Note: It is REQUIRED that the 'type' value of each entry
    in this array match the index of the entry in the array.  */
@@ -103,375 +103,375 @@ static reloc_howto_type v850_elf_howto_table[] =
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 32,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,		/* special_function */
 	 "R_V850_NONE",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0,				/* src_mask */
 	 0,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* A PC relative 9 bit branch.  */
   HOWTO (R_V850_9_PCREL,		/* type */
 	 2,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 26,				/* bitsize */
-	 true,				/* pc_relative */
+	 TRUE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_bitfield,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_9_PCREL",		/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x00ffffff,			/* src_mask */
 	 0x00ffffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 
   /* A PC relative 22 bit branch.  */
   HOWTO (R_V850_22_PCREL,		/* type */
 	 2,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 22,				/* bitsize */
-	 true,				/* pc_relative */
+	 TRUE,				/* pc_relative */
 	 7,				/* bitpos */
 	 complain_overflow_signed,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_22_PCREL",		/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x07ffff80,			/* src_mask */
 	 0x07ffff80,			/* dst_mask */
-	 true),				/* pcrel_offset */
+	 TRUE),				/* pcrel_offset */
 
   /* High 16 bits of symbol value.  */
   HOWTO (R_V850_HI16_S,			/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_HI16_S",		/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* High 16 bits of symbol value.  */
   HOWTO (R_V850_HI16,			/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_HI16",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* Low 16 bits of symbol value.  */
   HOWTO (R_V850_LO16,			/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_LO16",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* Simple 32bit reloc.  */
   HOWTO (R_V850_32,			/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 32,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_32",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffffffff,			/* src_mask */
 	 0xffffffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* Simple 16bit reloc.  */
   HOWTO (R_V850_16,			/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,		/* special_function */
 	 "R_V850_16",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* Simple 8bit reloc.	 */
   HOWTO (R_V850_8,			/* type */
 	 0,				/* rightshift */
 	 0,				/* size (0 = byte, 1 = short, 2 = long) */
 	 8,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,		/* special_function */
 	 "R_V850_8",			/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xff,				/* src_mask */
 	 0xff,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 16 bit offset from the short data area pointer.  */
   HOWTO (R_V850_SDA_16_16_OFFSET,	/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_SDA_16_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 15 bit offset from the short data area pointer.  */
   HOWTO (R_V850_SDA_15_16_OFFSET,	/* type */
 	 1,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 1,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_SDA_15_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xfffe,			/* src_mask */
 	 0xfffe,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 16 bit offset from the zero data area pointer.  */
   HOWTO (R_V850_ZDA_16_16_OFFSET,	/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_ZDA_16_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 15 bit offset from the zero data area pointer.  */
   HOWTO (R_V850_ZDA_15_16_OFFSET,	/* type */
 	 1,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 1,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_ZDA_15_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xfffe,			/* src_mask */
 	 0xfffe,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 6 bit offset from the tiny data area pointer.  */
   HOWTO (R_V850_TDA_6_8_OFFSET,		/* type */
 	 2,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 8,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 1,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_TDA_6_8_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x7e,				/* src_mask */
 	 0x7e,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 8 bit offset from the tiny data area pointer.  */
   HOWTO (R_V850_TDA_7_8_OFFSET,		/* type */
 	 1,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 8,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_TDA_7_8_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x7f,				/* src_mask */
 	 0x7f,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 7 bit offset from the tiny data area pointer.  */
   HOWTO (R_V850_TDA_7_7_OFFSET,		/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 7,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_TDA_7_7_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x7f,				/* src_mask */
 	 0x7f,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 16 bit offset from the tiny data area pointer!  */
   HOWTO (R_V850_TDA_16_16_OFFSET,	/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_TDA_16_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xfff,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 5 bit offset from the tiny data area pointer.  */
   HOWTO (R_V850_TDA_4_5_OFFSET,		/* type */
 	 1,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 5,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_TDA_4_5_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x0f,				/* src_mask */
 	 0x0f,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 4 bit offset from the tiny data area pointer.  */
   HOWTO (R_V850_TDA_4_4_OFFSET,		/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 4,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_TDA_4_4_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x0f,				/* src_mask */
 	 0x0f,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 16 bit offset from the short data area pointer.  */
   HOWTO (R_V850_SDA_16_16_SPLIT_OFFSET,	/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_SDA_16_16_SPLIT_OFFSET",/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xfffe0020,			/* src_mask */
 	 0xfffe0020,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 16 bit offset from the zero data area pointer.  */
   HOWTO (R_V850_ZDA_16_16_SPLIT_OFFSET,	/* type */
 	 0,				/* rightshift */
 	 2,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_ZDA_16_16_SPLIT_OFFSET",/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xfffe0020,			/* src_mask */
 	 0xfffe0020,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 6 bit offset from the call table base pointer.  */
   HOWTO (R_V850_CALLT_6_7_OFFSET,	/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 7,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_CALLT_6_7_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0x3f,				/* src_mask */
 	 0x3f,				/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* 16 bit offset from the call table base pointer.  */
   HOWTO (R_V850_CALLT_16_16_OFFSET,	/* type */
 	 0,				/* rightshift */
 	 1,				/* size (0 = byte, 1 = short, 2 = long) */
 	 16,				/* bitsize */
-	 false,				/* pc_relative */
+	 FALSE,				/* pc_relative */
 	 0,				/* bitpos */
 	 complain_overflow_dont,	/* complain_on_overflow */
 	 v850_elf_reloc,		/* special_function */
 	 "R_V850_CALLT_16_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
+	 FALSE,				/* partial_inplace */
 	 0xffff,			/* src_mask */
 	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
+	 FALSE),			/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_V850_GNU_VTINHERIT, /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_V850_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_V850_GNU_VTENTRY,     /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_V850_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* Indicates a .longcall pseudo-op.  The compiler will generate a .longcall
      pseudo-op when it finds a function call which can be relaxed.  */
@@ -479,15 +479,15 @@ static reloc_howto_type v850_elf_howto_table[] =
        0,                     /* rightshift */
        2,                     /* size (0 = byte, 1 = short, 2 = long) */
        32,                    /* bitsize */
-       true,                  /* pc_relative */
+       TRUE,                  /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_signed, /* complain_on_overflow */
        v850_elf_ignore_reloc, /* special_function */
        "R_V850_LONGCALL",     /* name */
-       false,                 /* partial_inplace */
+       FALSE,                 /* partial_inplace */
        0,                     /* src_mask */
        0,                     /* dst_mask */
-       true),                 /* pcrel_offset */
+       TRUE),                 /* pcrel_offset */
 
   /* Indicates a .longjump pseudo-op.  The compiler will generate a
      .longjump pseudo-op when it finds a branch which can be relaxed.  */
@@ -495,29 +495,29 @@ static reloc_howto_type v850_elf_howto_table[] =
        0,                     /* rightshift */
        2,                     /* size (0 = byte, 1 = short, 2 = long) */
        32,                    /* bitsize */
-       true,                  /* pc_relative */
+       TRUE,                  /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_signed, /* complain_on_overflow */
        v850_elf_ignore_reloc, /* special_function */
        "R_V850_LONGJUMP",     /* name */
-       false,                 /* partial_inplace */
+       FALSE,                 /* partial_inplace */
        0,                     /* src_mask */
        0,                     /* dst_mask */
-       true),                 /* pcrel_offset */
+       TRUE),                 /* pcrel_offset */
 
   HOWTO (R_V850_ALIGN,        /* type */
        0,                     /* rightshift */
        1,                     /* size (0 = byte, 1 = short, 2 = long) */
        0,                     /* bitsize */
-       false,                 /* pc_relative */
+       FALSE,                 /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_unsigned, /* complain_on_overflow */
        v850_elf_ignore_reloc, /* special_function */
        "R_V850_ALIGN",        /* name */
-       false,                 /* partial_inplace */
+       FALSE,                 /* partial_inplace */
        0,                     /* src_mask */
        0,                     /* dst_mask */
-       true),                 /* pcrel_offset */
+       TRUE),                 /* pcrel_offset */
 };
 
 /* Map BFD reloc types to V850 ELF reloc types.  */
@@ -567,8 +567,8 @@ static const struct v850_elf_reloc_map v850_elf_reloc_map[] =
 
 static reloc_howto_type *
 v850_elf_reloc_type_lookup (abfd, code)
-     bfd *                     abfd ATTRIBUTE_UNUSED;
-     bfd_reloc_code_real_type  code;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
 {
   unsigned int i;
 
@@ -589,9 +589,9 @@ v850_elf_reloc_type_lookup (abfd, code)
 
 static void
 v850_elf_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *               abfd ATTRIBUTE_UNUSED;
-     arelent *           cache_ptr;
-     Elf_Internal_Rela * dst;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
 {
   unsigned int r_type;
 
@@ -603,9 +603,9 @@ v850_elf_info_to_howto_rel (abfd, cache_ptr, dst)
 /* Set the howto pointer for a V850 ELF reloc (type RELA).  */
 static void
 v850_elf_info_to_howto_rela (abfd, cache_ptr, dst)
-     bfd *               abfd ATTRIBUTE_UNUSED;
-     arelent *           cache_ptr;
-     Elf_Internal_Rela * dst;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent * cache_ptr;
+     Elf_Internal_Rela *dst;
 {
   unsigned int r_type;
 
@@ -618,14 +618,14 @@ v850_elf_info_to_howto_rela (abfd, cache_ptr, dst)
    allocate space in the global offset table or procedure linkage
    table.  */
 
-static boolean
+static bfd_boolean
 v850_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *                      abfd;
-     struct bfd_link_info *     info;
-     asection *                 sec;
-     const Elf_Internal_Rela *  relocs;
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
 {
-  boolean ret = true;
+  bfd_boolean ret = TRUE;
   bfd *dynobj;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
@@ -637,7 +637,7 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
   const char *common = (const char *)0;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
 #ifdef DEBUG
   fprintf (stderr, "v850_elf_check_relocs called for section %s in %s\n",
@@ -683,14 +683,14 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_V850_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries
 	   are actually used.  Record for later use during GC.  */
         case R_V850_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
 
 	case R_V850_SDA_16_16_SPLIT_OFFSET:
@@ -756,7 +756,7 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
 
 		  bfd_set_error (bfd_error_bad_value);
 		  h->other |= V850_OTHER_ERROR;
-		  ret = false;
+		  ret = FALSE;
 		}
 	    }
 
@@ -788,7 +788,7 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
    more than once, as the second attempted retry failed.
 
    In the current version, the entry is not deleted, instead we set
-   the field 'found' to true.  If a second lookup matches the same
+   the field 'found' to TRUE.  If a second lookup matches the same
    entry, then we know that the hi16s reloc has already been updated
    and does not need to be updated a second time.
 
@@ -798,23 +798,23 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
 
 typedef struct hi16s_location
 {
-  bfd_vma       addend;
-  bfd_byte *    address;
+  bfd_vma addend;
+  bfd_byte *address;
   unsigned long counter;
-  boolean       found;
-  struct hi16s_location * next;
+  bfd_boolean found;
+  struct hi16s_location *next;
 }
 hi16s_location;
 
-static hi16s_location *  previous_hi16s;
-static hi16s_location *  free_hi16s;
-static unsigned long     hi16s_counter;
+static hi16s_location *previous_hi16s;
+static hi16s_location *free_hi16s;
+static unsigned long hi16s_counter;
 
 static void
 remember_hi16s_reloc (abfd, addend, address)
-     bfd *      abfd;
-     bfd_vma    addend;
-     bfd_byte * address;
+     bfd *abfd;
+     bfd_vma addend;
+     bfd_byte *address;
 {
   hi16s_location * entry = NULL;
   bfd_size_type amt = sizeof (* free_hi16s);
@@ -829,7 +829,7 @@ remember_hi16s_reloc (abfd, addend, address)
   entry->addend  = addend;
   entry->address = address;
   entry->counter = hi16s_counter ++;
-  entry->found   = false;
+  entry->found   = FALSE;
   entry->next    = previous_hi16s;
   previous_hi16s = entry;
 
@@ -848,14 +848,14 @@ remember_hi16s_reloc (abfd, addend, address)
 
 static bfd_byte *
 find_remembered_hi16s_reloc (addend, already_found)
-     bfd_vma   addend;
-     boolean * already_found;
+     bfd_vma addend;
+     bfd_boolean *already_found;
 {
-  hi16s_location * match = NULL;
-  hi16s_location * entry;
-  hi16s_location * previous = NULL;
-  hi16s_location * prev;
-  bfd_byte *       addr;
+  hi16s_location *match = NULL;
+  hi16s_location *entry;
+  hi16s_location *previous = NULL;
+  hi16s_location *prev;
+  bfd_byte *addr;
 
   /* Search the table.  Record the most recent entry that matches.  */
   for (entry = previous_hi16s; entry; entry = entry->next)
@@ -881,7 +881,7 @@ find_remembered_hi16s_reloc (addend, already_found)
     * already_found = match->found;
 
   /* Note that this entry has now been used.  */
-  match->found = true;
+  match->found = TRUE;
 
   return addr;
 }
@@ -1107,8 +1107,8 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
 	    || (OVERFLOWS (addend, insn)
 		&& ((! BIT15_SET (insn)) || (BIT15_SET (addend)))))
 	  {
-	    boolean already_updated;
-	    bfd_byte * hi16s_address = find_remembered_hi16s_reloc
+	    bfd_boolean already_updated;
+	    bfd_byte *hi16s_address = find_remembered_hi16s_reloc
 	      (addend, & already_updated);
 
 	    /* Amend the matching HI16_S relocation.  */
@@ -1308,13 +1308,13 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
 
 static bfd_reloc_status_type
 v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
-     bfd *       abfd ATTRIBUTE_UNUSED;
-     arelent *   reloc;
-     asymbol *   symbol;
-     PTR         data ATTRIBUTE_UNUSED;
-     asection *  isection;
-     bfd *       obfd;
-     char **     err ATTRIBUTE_UNUSED;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc;
+     asymbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *isection;
+     bfd *obfd;
+     char **err ATTRIBUTE_UNUSED;
 {
   long relocation;
 
@@ -1347,7 +1347,7 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
   /* Work out which section the relocation is targetted at and the
      initial relocation command value.  */
 
-  if (reloc->howto->pc_relative == true)
+  if (reloc->howto->pc_relative)
     return bfd_reloc_ok;
 
   /* Get symbol value.  (Common symbols are special.)  */
@@ -1395,13 +1395,13 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
 static bfd_reloc_status_type
 v850_elf_ignore_reloc (abfd, reloc_entry, symbol, data, input_section,
                        output_bfd, error_message)
-     bfd *      abfd ATTRIBUTE_UNUSED;
-     arelent *  reloc_entry;
-     asymbol *  symbol ATTRIBUTE_UNUSED;
-     PTR        data ATTRIBUTE_UNUSED;
-     asection * input_section;
-     bfd *      output_bfd;
-     char **    error_message ATTRIBUTE_UNUSED;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
 {
   if (output_bfd != NULL)
     reloc_entry->address += input_section->output_offset;
@@ -1409,10 +1409,10 @@ v850_elf_ignore_reloc (abfd, reloc_entry, symbol, data, input_section,
   return bfd_reloc_ok;
 }
 
-static boolean
+static bfd_boolean
 v850_elf_is_local_label_name (abfd, name)
-     bfd *         abfd ATTRIBUTE_UNUSED;
-     const char *  name;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     const char *name;
 {
   return (   (name[0] == '.' && (name[1] == 'L' || name[1] == '.'))
 	  || (name[0] == '_' &&  name[1] == '.' && name[2] == 'L' && name[3] == '_'));
@@ -1429,20 +1429,20 @@ static bfd_reloc_status_type
 v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 			      input_section, contents, offset, value,
 			      addend, info, sym_sec, is_local)
-     reloc_howto_type *      howto;
-     bfd *                   input_bfd;
-     bfd *                   output_bfd ATTRIBUTE_UNUSED;
-     asection *              input_section;
-     bfd_byte *              contents;
-     bfd_vma                 offset;
-     bfd_vma                 value;
-     bfd_vma                 addend;
-     struct bfd_link_info *  info;
-     asection *              sym_sec;
-     int                     is_local ATTRIBUTE_UNUSED;
+     reloc_howto_type *howto;
+     bfd *input_bfd;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd_byte *contents;
+     bfd_vma offset;
+     bfd_vma value;
+     bfd_vma addend;
+     struct bfd_link_info *info;
+     asection *sym_sec;
+     int is_local ATTRIBUTE_UNUSED;
 {
-  unsigned int   r_type   = howto->type;
-  bfd_byte *     hit_data = contents + offset;
+  unsigned int r_type = howto->type;
+  bfd_byte *hit_data = contents + offset;
 
   /* Adjust the value according to the relocation.  */
   switch (r_type)
@@ -1494,7 +1494,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 	  return bfd_reloc_undefined;
 
 	/* Get the value of __gp.  */
-	h = bfd_link_hash_lookup (info->hash, "__gp", false, false, true);
+	h = bfd_link_hash_lookup (info->hash, "__gp", FALSE, FALSE, TRUE);
 	if (h == (struct bfd_link_hash_entry *) NULL
 	    || h->type != bfd_link_hash_defined)
 	  return bfd_reloc_gp_not_found;
@@ -1519,7 +1519,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 	struct bfd_link_hash_entry * h;
 
 	/* Get the value of __ep.  */
-	h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true);
+	h = bfd_link_hash_lookup (info->hash, "__ep", FALSE, FALSE, TRUE);
 	if (h == (struct bfd_link_hash_entry *) NULL
 	    || h->type != bfd_link_hash_defined)
 	  return bfd_reloc_ep_not_found;
@@ -1538,7 +1538,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 	struct bfd_link_hash_entry * h;
 
 	/* Get the value of __ctbp.  */
-	h = bfd_link_hash_lookup (info->hash, "__ctbp", false, false, true);
+	h = bfd_link_hash_lookup (info->hash, "__ctbp", FALSE, FALSE, TRUE);
 	if (h == (struct bfd_link_hash_entry *) NULL
 	    || h->type != bfd_link_hash_defined)
 	  return bfd_reloc_ctbp_not_found;
@@ -1559,7 +1559,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 	  return bfd_reloc_undefined;
 
 	/* Get the value of __ctbp.  */
-	h = bfd_link_hash_lookup (info->hash, "__ctbp", false, false, true);
+	h = bfd_link_hash_lookup (info->hash, "__ctbp", FALSE, FALSE, TRUE);
 	if (h == (struct bfd_link_hash_entry *) NULL
 	    || h->type != bfd_link_hash_defined)
 	  return bfd_reloc_ctbp_not_found;
@@ -1591,25 +1591,25 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 
 /* Relocate an V850 ELF section.  */
 
-static boolean
+static bfd_boolean
 v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
-     bfd *                  output_bfd;
-     struct bfd_link_info * info;
-     bfd *                  input_bfd;
-     asection *             input_section;
-     bfd_byte *             contents;
-     Elf_Internal_Rela *    relocs;
-     Elf_Internal_Sym *     local_syms;
-     asection **            local_sections;
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
 {
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -1620,7 +1620,7 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	(info, "no hash table available",
 	 NULL, input_bfd, input_section, (bfd_vma) 0);
 
-      return false;
+      return FALSE;
     }
 
   /* Reset the list of remembered HI16S relocs to empty.  */
@@ -1632,14 +1632,14 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   relend = relocs + input_section->reloc_count;
   for (; rel < relend; rel++)
     {
-      int                          r_type;
-      reloc_howto_type *           howto;
-      unsigned long                r_symndx;
-      Elf_Internal_Sym *           sym;
-      asection *                   sec;
-      struct elf_link_hash_entry * h;
-      bfd_vma                      relocation;
-      bfd_reloc_status_type        r;
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       r_type   = ELF32_R_TYPE (rel->r_info);
@@ -1702,8 +1702,8 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 #if 0
 	      fprintf (stderr, "unknown: name: %s\n", h->root.root.string);
 #endif
@@ -1739,14 +1739,14 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_undefined:
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, name, input_bfd, input_section,
-		      rel->r_offset, true)))
-		return false;
+		      rel->r_offset, TRUE)))
+		return FALSE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -1781,16 +1781,16 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->warning)
 		    (info, msg, name, input_bfd, input_section,
 		     rel->r_offset)))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 v850_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1798,7 +1798,7 @@ v850_elf_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* No got and plt entries for v850-elf.  */
-  return true;
+  return TRUE;
 }
 
 static asection *
@@ -1840,7 +1840,7 @@ v850_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Set the right machine number.  */
 
-static boolean
+static bfd_boolean
 v850_elf_object_p (abfd)
      bfd *abfd;
 {
@@ -1854,21 +1854,21 @@ v850_elf_object_p (abfd)
       bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e);
       break;
     }
-  return true;
+  return TRUE;
 }
 
 /* Store the machine number in the flags field.  */
 
 static void
 v850_elf_final_write_processing (abfd, linker)
-     bfd *   abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd *abfd;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
 
   switch (bfd_get_mach (abfd))
     {
-    default:		 
+    default:
     case bfd_mach_v850:  val = E_V850_ARCH; break;
     case bfd_mach_v850e: val = E_V850E_ARCH; break;
     }
@@ -1879,32 +1879,32 @@ v850_elf_final_write_processing (abfd, linker)
 
 /* Function to keep V850 specific file flags.  */
 
-static boolean
+static bfd_boolean
 v850_elf_set_private_flags (abfd, flags)
-     bfd *    abfd;
+     bfd *abfd;
      flagword flags;
 {
   BFD_ASSERT (!elf_flags_init (abfd)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file
    to the output object file when linking.  */
-static boolean
+static bfd_boolean
 v850_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
+     bfd *ibfd;
+     bfd *obfd;
 {
   flagword out_flags;
   flagword in_flags;
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   in_flags = elf_elfheader (ibfd)->e_flags;
   out_flags = elf_elfheader (obfd)->e_flags;
@@ -1918,36 +1918,36 @@ v850_elf_merge_private_bfd_data (ibfd, obfd)
 	 unitialised values, which surprise surprise, correspond
 	 to the default values.  */
       if (bfd_get_arch_info (ibfd)->the_default)
-	return true;
+	return TRUE;
 
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = in_flags;
 
       if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
 	  && bfd_get_arch_info (obfd)->the_default)
 	return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
 
-      return true;
+      return TRUE;
     }
 
   /* Check flag compatibility.  */
   if (in_flags == out_flags)
-    return true;
+    return TRUE;
 
   if ((in_flags & EF_V850_ARCH) != (out_flags & EF_V850_ARCH)
       && (in_flags & EF_V850_ARCH) != E_V850_ARCH)
     _bfd_error_handler (_("%s: Architecture mismatch with previous modules"),
 			bfd_archive_filename (ibfd));
 
-  return true;
+  return TRUE;
 }
 
 /* Display the flags field.  */
 
-static boolean
+static bfd_boolean
 v850_elf_print_private_bfd_data (abfd, ptr)
-     bfd *   abfd;
-     PTR     ptr;
+     bfd *abfd;
+     PTR ptr;
 {
   FILE * file = (FILE *) ptr;
 
@@ -1967,7 +1967,7 @@ v850_elf_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
 
 /* V850 ELF uses four common sections.  One is the usual one, and the
@@ -1990,11 +1990,11 @@ static asymbol * v850_elf_zcom_symbol_ptr;
 /* Given a BFD section, try to locate the
    corresponding ELF section index.  */
 
-static boolean
+static bfd_boolean
 v850_elf_section_from_bfd_section (abfd, sec, retval)
-     bfd *                 abfd ATTRIBUTE_UNUSED;
-     asection *            sec;
-     int *                 retval;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     int *retval;
 {
   if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
     *retval = SHN_V850_SCOMMON;
@@ -2003,17 +2003,17 @@ v850_elf_section_from_bfd_section (abfd, sec, retval)
   else if (strcmp (bfd_get_section_name (abfd, sec), ".zcommon") == 0)
     *retval = SHN_V850_ZCOMMON;
   else
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Handle the special V850 section numbers that a symbol may use.  */
 
 static void
 v850_elf_symbol_processing (abfd, asym)
-     bfd *     abfd;
-     asymbol * asym;
+     bfd *abfd;
+     asymbol *asym;
 {
   elf_symbol_type * elfsym = (elf_symbol_type *) asym;
   unsigned int indx;
@@ -2106,15 +2106,15 @@ v850_elf_symbol_processing (abfd, asym)
 /* Hook called by the linker routine which adds symbols from an object
    file.  We must handle the special v850 section numbers here.  */
 
-static boolean
+static bfd_boolean
 v850_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *                    abfd;
-     struct bfd_link_info *   info ATTRIBUTE_UNUSED;
-     const Elf_Internal_Sym * sym;
-     const char **            namep ATTRIBUTE_UNUSED;
-     flagword *               flagsp ATTRIBUTE_UNUSED;
-     asection **              secp;
-     bfd_vma *                valp;
+     bfd *abfd;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     const Elf_Internal_Sym *sym;
+     const char **namep ATTRIBUTE_UNUSED;
+     flagword *flagsp ATTRIBUTE_UNUSED;
+     asection **secp;
+     bfd_vma *valp;
 {
   unsigned int indx = sym->st_shndx;
 
@@ -2164,16 +2164,16 @@ v850_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 v850_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec)
-     bfd *                  abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info * info ATTRIBUTE_UNUSED;
-     const char *           name ATTRIBUTE_UNUSED;
-     Elf_Internal_Sym *     sym;
-     asection *             input_sec;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     const char *name ATTRIBUTE_UNUSED;
+     Elf_Internal_Sym *sym;
+     asection *input_sec;
 {
   /* If we see a common symbol, which implies a relocatable link, then
      if a symbol was in a special common section in an input file, mark
@@ -2189,21 +2189,21 @@ v850_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec)
 	sym->st_shndx = SHN_V850_ZCOMMON;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 v850_elf_section_from_shdr (abfd, hdr, name)
-     bfd *               abfd;
-     Elf_Internal_Shdr * hdr;
-     const char *        name;
+     bfd *abfd;
+     Elf_Internal_Shdr *hdr;
+     const char *name;
 {
   /* There ought to be a place to keep ELF backend specific flags, but
      at the moment there isn't one.  We just keep track of the
      sections by their name, instead.  */
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
 
   switch (hdr->sh_type)
     {
@@ -2214,20 +2214,20 @@ v850_elf_section_from_shdr (abfd, hdr, name)
 				   (bfd_get_section_flags (abfd,
 							   hdr->bfd_section)
 				    | SEC_IS_COMMON)))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the correct type for a V850 ELF section.  We do this
    by the section name, which is a hack, but ought to work.  */
 
-static boolean
+static bfd_boolean
 v850_elf_fake_sections (abfd, hdr, sec)
-     bfd *               abfd ATTRIBUTE_UNUSED;
-     Elf_Internal_Shdr * hdr;
-     asection *          sec;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     Elf_Internal_Shdr *hdr;
+     asection *sec;
 {
   register const char * name;
 
@@ -2244,31 +2244,31 @@ v850_elf_fake_sections (abfd, hdr, sec)
   else if (strcmp (name, ".zcommon") == 0)
     hdr->sh_type = SHT_V850_ZCOMMON;
 
-  return true;
+  return TRUE;
 }
 
 /* Delete some bytes from a section while relaxing.  */
 
-static boolean
+static bfd_boolean
 v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
-     bfd *      abfd;
-     asection * sec;
-     bfd_vma    addr;
-     bfd_vma    toaddr;
-     int        count;
+     bfd *abfd;
+     asection *sec;
+     bfd_vma addr;
+     bfd_vma toaddr;
+     int count;
 {
-  Elf_Internal_Shdr *		symtab_hdr;
-  Elf32_External_Sym *		extsyms;
-  Elf32_External_Sym *         	esym;
-  Elf32_External_Sym *         	esymend;
-  int 				index;
-  unsigned int 			sec_shndx;
-  bfd_byte *                   	contents;
-  Elf_Internal_Rela *          	irel;
-  Elf_Internal_Rela *          	irelend;
-  struct elf_link_hash_entry * 	sym_hash;
-  Elf_Internal_Shdr *           shndx_hdr;
-  Elf_External_Sym_Shndx *      shndx;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf32_External_Sym *extsyms;
+  Elf32_External_Sym *esym;
+  Elf32_External_Sym *esymend;
+  int index;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel;
+  Elf_Internal_Rela *irelend;
+  struct elf_link_hash_entry *sym_hash;
+  Elf_Internal_Shdr *shndx_hdr;
+  Elf_External_Sym_Shndx *shndx;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
@@ -2303,7 +2303,7 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
       /* Get the new reloc address.  */
       raddr = irel->r_offset;
       if ((raddr >= (addr + count) && raddr < toaddr))
-	irel->r_offset -= count;	
+	irel->r_offset -= count;
 
       if (raddr >= addr && raddr < addr + count)
 	{
@@ -2311,7 +2311,7 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
 				       (int) R_V850_NONE);
 	  continue;
 	}
-      
+
       if (ELF32_R_TYPE (irel->r_info) == (int) R_V850_ALIGN)
 	continue;
 
@@ -2319,7 +2319,7 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
 				extsyms + ELF32_R_SYM (irel->r_info),
 				shndx ? shndx + ELF32_R_SYM (irel->r_info) : NULL,
 				& isym);
-      
+
       if (isym.st_shndx != sec_shndx)
 	continue;
 
@@ -2358,9 +2358,9 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
 		   sec->output_section->vma, sec->output_offset, irel->r_addend);
 #endif
 	}
-	      
+
       paddr = symval + irel->r_addend;
-      
+
       if ( (symval >= addr + count && symval < toaddr)
 	  && (paddr < addr + count || paddr >= toaddr))
 	irel->r_addend += count;
@@ -2386,8 +2386,8 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
 	  isym.st_value -= count;
 
 	  if (isym.st_value + isym.st_size >= toaddr)
-	    isym.st_size += count;	    
-	  
+	    isym.st_size += count;
+
 	  bfd_elf32_swap_symbol_out (abfd, & isym, esym, shndx);
 	}
       else if (isym.st_shndx == sec_shndx
@@ -2452,13 +2452,13 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
 	++ shndx;
     }
 
-  return true;
+  return TRUE;
 }
 
 #define NOP_OPCODE 	(0x0000)
-#define MOVHI	    	0x0640				/* 4byte */ 
+#define MOVHI	    	0x0640				/* 4byte */
 #define MOVHI_MASK  	0x07e0
-#define MOVHI_R1(insn)	((insn) & 0x1f)			/* 4byte */ 
+#define MOVHI_R1(insn)	((insn) & 0x1f)			/* 4byte */
 #define MOVHI_R2(insn)	((insn) >> 11)
 #define MOVEA	    	0x0620				/* 2byte */
 #define MOVEA_MASK  	0x07e0
@@ -2475,31 +2475,31 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
 #define JMP_R_MASK 	0xFFE0
 #define JMP_R1(insn)	((insn) & 0x1f)
 
-static boolean 
+static bfd_boolean
 v850_elf_relax_section (abfd, sec, link_info, again)
-     bfd *			abfd;
-     asection *			sec;
-     struct bfd_link_info *	link_info;
-     boolean *			again;
+     bfd *abfd;
+     asection *sec;
+     struct bfd_link_info *link_info;
+     bfd_boolean *again;
 {
-  Elf_Internal_Shdr *	    symtab_hdr;
-  Elf_Internal_Rela *	    internal_relocs;
-  Elf_Internal_Rela *	    irel;
-  Elf_Internal_Rela *	    irelend;
-  Elf_Internal_Rela *	    irelalign = NULL;
-  Elf_Internal_Sym *	    isymbuf = NULL;
-  bfd_byte *		    contents = NULL;
-  bfd_vma 		    addr = 0;
-  bfd_vma		    toaddr;
-  int 			    align_pad_size = 0;
-  boolean                   result = true;
-
-  * again = false;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel;
+  Elf_Internal_Rela *irelend;
+  Elf_Internal_Rela *irelalign = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+  bfd_byte *contents = NULL;
+  bfd_vma addr = 0;
+  bfd_vma toaddr;
+  int align_pad_size = 0;
+  bfd_boolean result = TRUE;
+
+  *again = FALSE;
 
   if (link_info->relocateable
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called
      for this section, initialize the cooked size.  */
@@ -2515,7 +2515,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
     goto error_return;
 
   irelend = internal_relocs + sec->reloc_count;
-  
+
   while (addr < sec->_cooked_size)
     {
       toaddr = sec->_cooked_size;
@@ -2525,7 +2525,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 	    && irel->r_offset > addr
 	    && irel->r_offset < toaddr)
 	  toaddr = irel->r_offset;
-      
+
 #ifdef DEBUG_RELAX
       fprintf (stderr, "relax region 0x%x to 0x%x align pad %d\n",
 	       addr, toaddr, align_pad_size);
@@ -2549,7 +2549,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 #endif
 	      if (!v850_elf_relax_delete_bytes (abfd, sec, alignmoveto,
 						toaddr, align_pad_size))
-		goto error_return;		
+		goto error_return;
 
 	      for (i  = BFD_ALIGN (toaddr - align_pad_size, 1);
 		   (i + 1) < toaddr; i += 2)
@@ -2563,15 +2563,15 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 
       for (irel = internal_relocs; irel < irelend; irel++)
 	{
-	  bfd_vma 	      laddr;
-	  bfd_vma	      addend;
-	  bfd_vma	      symval;
-	  int 		      insn[5];
-	  int 		      no_match = -1;
-	  Elf_Internal_Rela * hi_irelfn;
-	  Elf_Internal_Rela * lo_irelfn;
-	  Elf_Internal_Rela * irelcall;
-	  bfd_signed_vma      foff;
+	  bfd_vma laddr;
+	  bfd_vma addend;
+	  bfd_vma symval;
+	  int insn[5];
+	  int no_match = -1;
+	  Elf_Internal_Rela *hi_irelfn;
+	  Elf_Internal_Rela *lo_irelfn;
+	  Elf_Internal_Rela *irelcall;
+	  bfd_signed_vma foff;
 
 	  if (! (irel->r_offset >= addr && irel->r_offset < toaddr
 		 && (ELF32_R_TYPE (irel->r_info) == (int) R_V850_LONGCALL
@@ -2626,7 +2626,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 		  insn[2] = bfd_get_32 (abfd, contents + laddr + 8);
 		  insn[3] = bfd_get_16 (abfd, contents + laddr + 12);
 		  insn[4] = bfd_get_16 (abfd, contents + laddr + 14);
-	  
+
 		  if ((insn[0] & MOVHI_MASK) != MOVHI
 		       || MOVHI_R1 (insn[0]) != 0)
 		    no_match = 0;
@@ -2667,14 +2667,14 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 		    bfd_get_filename (abfd), (unsigned long) irel->r_offset+no_match, insn[no_match]));
 
 		  continue;
-		}      
+		}
 
 	      /* Get the reloc for the address from which the register is
 	         being loaded.  This reloc will tell us which function is
 	         actually being called.  */
 	      for (hi_irelfn = internal_relocs; hi_irelfn < irelend; hi_irelfn ++)
 		if (hi_irelfn->r_offset == laddr + 2
-		    && ELF32_R_TYPE (hi_irelfn->r_info) 
+		    && ELF32_R_TYPE (hi_irelfn->r_info)
 		        == (int) R_V850_HI16_S)
 		  break;
 
@@ -2700,7 +2700,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 
 		  continue;
 		}
-	
+
 	      if (ELF32_R_SYM (irelcall->r_info) < symtab_hdr->sh_info)
 		{
 		  Elf_Internal_Sym *  isym;
@@ -2742,12 +2742,12 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 	      /* Get the value of the symbol referred to by the reloc.  */
 	      if (ELF32_R_SYM (hi_irelfn->r_info) < symtab_hdr->sh_info)
 		{
-		  Elf_Internal_Sym * isym;
-		  asection *         sym_sec;
+		  Elf_Internal_Sym *isym;
+		  asection *sym_sec;
 
 		  /* A local symbol.  */
 		  isym = isymbuf + ELF32_R_SYM (hi_irelfn->r_info);
-          
+
 		  if (isym->st_shndx == SHN_UNDEF)
 		    sym_sec = bfd_und_section_ptr;
 		  else if (isym->st_shndx == SHN_ABS)
@@ -2763,7 +2763,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 	      else
 		{
 		  unsigned long indx;
-		  struct elf_link_hash_entry * h;
+		  struct elf_link_hash_entry *h;
 
 		  /* An external symbol.  */
 		  indx = ELF32_R_SYM (hi_irelfn->r_info) - symtab_hdr->sh_info;
@@ -2812,7 +2812,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 	      elf_section_data (sec)->relocs = internal_relocs;
 	      elf_section_data (sec)->this_hdr.contents = contents;
 	      symtab_hdr->contents = (bfd_byte *) isymbuf;
-      
+
 	      /* Replace the long call with a jarl.  */
 	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (hi_irelfn->r_info), R_V850_22_PCREL);
 
@@ -2832,7 +2832,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 		bfd_put_32 (abfd, 0x00000780 | (JARL_R2 (insn[2])<<11),
 			    contents + irel->r_offset);
 
-	      hi_irelfn->r_info = 
+	      hi_irelfn->r_info =
 		ELF32_R_INFO (ELF32_R_SYM (hi_irelfn->r_info), R_V850_NONE);
 	      lo_irelfn->r_info =
 		ELF32_R_INFO (ELF32_R_SYM (lo_irelfn->r_info), R_V850_NONE);
@@ -2891,7 +2891,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 	         actually being called.  */
 	      for (hi_irelfn = internal_relocs; hi_irelfn < irelend; hi_irelfn ++)
 		if (hi_irelfn->r_offset == laddr + 2
-		    && ELF32_R_TYPE (hi_irelfn->r_info) == (int) R_V850_HI16_S) 
+		    && ELF32_R_TYPE (hi_irelfn->r_info) == (int) R_V850_HI16_S)
 		  break;
 
 	      for (lo_irelfn = internal_relocs; lo_irelfn < irelend; lo_irelfn ++)
@@ -2908,7 +2908,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 
 		  continue;
 		}
-	
+
 	      /* Get the value of the symbol referred to by the reloc.  */
 	      if (ELF32_R_SYM (hi_irelfn->r_info) < symtab_hdr->sh_info)
 		{
@@ -3005,8 +3005,8 @@ v850_elf_relax_section (abfd, sec, link_info, again)
 		  /* Replace the long jump with a jr.  */
 
 		  irel->r_info =
-			ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_V850_22_PCREL);
-  
+		    ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_V850_22_PCREL);
+
 		  irel->r_addend = addend;
 		  addend = 0;
 
@@ -3112,7 +3112,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
   return result;
 
  error_return:
-  result = false;
+  result = FALSE;
   goto finish;
 }
 
diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c
index 4cc18e56745..20716fab524 100644
--- a/bfd/elf32-vax.c
+++ b/bfd/elf32-vax.c
@@ -34,33 +34,33 @@ static struct bfd_hash_entry *elf_vax_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *elf_vax_link_hash_table_create
   PARAMS ((bfd *));
-static boolean elf_vax_check_relocs
+static bfd_boolean elf_vax_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection *elf_vax_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf_vax_gc_sweep_hook
+static bfd_boolean elf_vax_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf_vax_adjust_dynamic_symbol
+static bfd_boolean elf_vax_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf_vax_size_dynamic_sections
+static bfd_boolean elf_vax_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_vax_relocate_section
+static bfd_boolean elf_vax_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf_vax_finish_dynamic_symbol
+static bfd_boolean elf_vax_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean elf_vax_finish_dynamic_sections
+static bfd_boolean elf_vax_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
-static boolean elf32_vax_set_private_flags
+static bfd_boolean elf32_vax_set_private_flags
   PARAMS ((bfd *, flagword));
-static boolean elf32_vax_merge_private_bfd_data
+static bfd_boolean elf32_vax_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
-static boolean elf32_vax_print_private_bfd_data
+static bfd_boolean elf32_vax_print_private_bfd_data
   PARAMS ((bfd *, PTR));
 
 static reloc_howto_type howto_table[] = {
@@ -68,113 +68,113 @@ static reloc_howto_type howto_table[] = {
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_VAX_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_VAX_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_VAX_8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x000000ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_VAX_PC32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_PC32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_VAX_PC16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_PC16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_VAX_PC8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_PC8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x000000ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_VAX_GOT32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_GOT32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   EMPTY_HOWTO (-1),
   EMPTY_HOWTO (-1),
@@ -186,15 +186,15 @@ static reloc_howto_type howto_table[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_PLT32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   EMPTY_HOWTO (-1),
   EMPTY_HOWTO (-1),
@@ -206,87 +206,87 @@ static reloc_howto_type howto_table[] = {
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_COPY",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_VAX_GLOB_DAT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_GLOB_DAT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_VAX_JMP_SLOT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_JMP_SLOT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_VAX_RELATIVE,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_VAX_RELATIVE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_VAX_GNU_VTINHERIT,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_VAX_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_VAX_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
 	 "R_VAX_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 static void
@@ -414,12 +414,12 @@ struct elf_vax_link_hash_table
 
 /* Declare this now that the above structures are defined.  */
 
-static boolean elf_vax_discard_copies
+static bfd_boolean elf_vax_discard_copies
   PARAMS ((struct elf_vax_link_hash_entry *, PTR));
 
 /* Declare this now that the above structures are defined.  */
 
-static boolean elf_vax_instantiate_got_entries
+static bfd_boolean elf_vax_instantiate_got_entries
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
 /* Traverse an VAX ELF linker hash table.  */
@@ -427,7 +427,7 @@ static boolean elf_vax_instantiate_got_entries
 #define elf_vax_link_hash_traverse(table, func, info)			\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the VAX ELF linker hash table from a link_info structure.  */
@@ -491,19 +491,19 @@ elf_vax_link_hash_table_create (abfd)
 }
 
 /* Keep vax-specific flags in the ELF header */
-static boolean
+static bfd_boolean
 elf32_vax_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
 {
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
-static boolean
+static bfd_boolean
 elf32_vax_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -513,22 +513,22 @@ elf32_vax_merge_private_bfd_data (ibfd, obfd)
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   in_flags  = elf_elfheader (ibfd)->e_flags;
   out_flags = elf_elfheader (obfd)->e_flags;
 
   if (!elf_flags_init (obfd))
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = in_flags;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Display the flags field */
-static boolean
+static bfd_boolean
 elf32_vax_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -556,13 +556,13 @@ elf32_vax_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
    table.  */
 
-static boolean
+static bfd_boolean
 elf_vax_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -579,7 +579,7 @@ elf_vax_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -616,7 +616,7 @@ elf_vax_check_relocs (abfd, info, sec, relocs)
 	      /* Create the .got section.  */
 	      elf_hash_table (info)->dynobj = dynobj = abfd;
 	      if (!_bfd_elf_create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	    }
 
 	  if (sgot == NULL)
@@ -641,7 +641,7 @@ elf_vax_check_relocs (abfd, info, sec, relocs)
 						  | SEC_LINKER_CREATED
 						  | SEC_READONLY))
 		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -752,7 +752,7 @@ elf_vax_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (abfd, sec),
@@ -771,7 +771,7 @@ elf_vax_check_relocs (abfd, info, sec, relocs)
 						      | SEC_LINKER_CREATED
 						      | SEC_READONLY))
 			  || !bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		  if (sec->flags & SEC_READONLY)
 		    info->flags |= DF_TEXTREL;
@@ -805,7 +805,7 @@ elf_vax_check_relocs (abfd, info, sec, relocs)
 		      p = ((struct elf_vax_pcrel_relocs_copied *)
 			   bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
 		      if (p == NULL)
-			return false;
+			return FALSE;
 		      p->next = eh->pcrel_relocs_copied;
 		      eh->pcrel_relocs_copied = p;
 		      p->section = sreloc;
@@ -822,14 +822,14 @@ elf_vax_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_VAX_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_VAX_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 
 	default:
@@ -837,7 +837,7 @@ elf_vax_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -882,7 +882,7 @@ elf_vax_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 elf_vax_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -901,7 +901,7 @@ elf_vax_gc_sweep_hook (abfd, info, sec, relocs)
 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj == NULL)
-    return true;
+    return TRUE;
 
   relend = relocs + sec->reloc_count;
   for (rel = relocs; rel < relend; rel++)
@@ -939,7 +939,7 @@ elf_vax_gc_sweep_hook (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -948,7 +948,7 @@ elf_vax_gc_sweep_hook (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf_vax_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -991,7 +991,7 @@ elf_vax_adjust_dynamic_symbol (info, h)
 	     reloc instead.  */
 	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
 	  h->plt.offset = (bfd_vma) -1;
-	  return true;
+	  return TRUE;
 	}
 
       /* GC may have rendered this entry unused.  */
@@ -999,14 +999,14 @@ elf_vax_adjust_dynamic_symbol (info, h)
 	{
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	  h->plt.offset = (bfd_vma) -1;
-	  return true;
+	  return TRUE;
 	}
 
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
 	{
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = bfd_get_section_by_name (dynobj, ".plt");
@@ -1049,7 +1049,7 @@ elf_vax_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf32_External_Rela);
 
-      return true;
+      return TRUE;
     }
 
   /* Reinitialize the plt offset now that it is not used as a reference
@@ -1065,7 +1065,7 @@ elf_vax_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1076,7 +1076,7 @@ elf_vax_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -1117,7 +1117,7 @@ elf_vax_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (!bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1127,21 +1127,21 @@ elf_vax_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_vax_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean plt;
-  boolean relocs;
-  boolean reltext;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
@@ -1184,7 +1184,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
 				elf_vax_discard_copies,
 				(PTR) NULL);
 
-  /* If this is a -Bsymbolic shared link or a static link, we need to 
+  /* If this is a -Bsymbolic shared link or a static link, we need to
      discard all the got entries we've recorded.  Otherwise, we need to
      instantiate (allocate space for them).  */
   elf_link_hash_traverse (elf_hash_table (info),
@@ -1194,13 +1194,13 @@ elf_vax_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  plt = false;
-  relocs = false;
-  reltext = false;
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -1209,7 +1209,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
-      strip = false;
+      strip = FALSE;
 
       if (strcmp (name, ".plt") == 0)
 	{
@@ -1217,12 +1217,12 @@ elf_vax_size_dynamic_sections (output_bfd, info)
 	    {
 	      /* Strip this section if we don't need it; see the
                  comment below.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      plt = TRUE;
 	    }
 	}
       else if (strncmp (name, ".rela", 5) == 0)
@@ -1238,7 +1238,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
@@ -1250,7 +1250,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
 		{
 		  const char *outname;
 
-		  relocs = true;
+		  relocs = TRUE;
 
 		  /* If this relocation section applies to a read only
 		     section, then we probably need a DT_TEXTREL
@@ -1262,7 +1262,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
 		  if (target != NULL
 		      && (target->flags & SEC_READONLY) != 0
 		      && (target->flags & SEC_ALLOC) != 0)
-		    reltext = true;
+		    reltext = TRUE;
 		}
 
 	      /* We use the reloc_count field as a counter if we need
@@ -1285,7 +1285,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
       /* Allocate memory for the section contents.  */
       s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -1301,7 +1301,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (plt)
@@ -1310,7 +1310,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -1318,18 +1318,18 @@ elf_vax_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	    return false;
+	    return FALSE;
 	}
 
       if (reltext || (info->flags & DF_TEXTREL) != 0)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via elf_vax_link_hash_traverse if we are
@@ -1339,7 +1339,7 @@ elf_vax_size_dynamic_sections (output_bfd, info)
    routine, but we won't fill them in in the relocate_section routine.  */
 
 /*ARGSUSED*/
-static boolean
+static bfd_boolean
 elf_vax_discard_copies (h, ignore)
      struct elf_vax_link_hash_entry *h;
      PTR ignore ATTRIBUTE_UNUSED;
@@ -1351,12 +1351,12 @@ elf_vax_discard_copies (h, ignore)
 
   /* We only discard relocs for symbols defined in a regular object.  */
   if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
+    return TRUE;
 
   for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
     s->section->_raw_size -= s->count * sizeof (Elf32_External_Rela);
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via elf_link_hash_traverse.  It looks for entries
@@ -1367,7 +1367,7 @@ elf_vax_discard_copies (h, ignore)
    will be reserved for the symbol.  */
 
 /*ARGSUSED*/
-static boolean
+static bfd_boolean
 elf_vax_instantiate_got_entries (h, infoptr)
      struct elf_link_hash_entry *h;
      PTR infoptr;
@@ -1376,14 +1376,14 @@ elf_vax_instantiate_got_entries (h, infoptr)
   bfd *dynobj;
   asection *sgot;
   asection *srelgot;
-  
+
   /* We don't care about non-GOT (and non-PLT) entries.  */
   if (h->got.refcount <= 0 && h->plt.refcount <= 0)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj == NULL)
-    return true;
+    return TRUE;
 
   sgot = bfd_get_section_by_name (dynobj, ".got");
   srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
@@ -1402,7 +1402,7 @@ elf_vax_instantiate_got_entries (h, infoptr)
       if (h->dynindx == -1)
 	{
 	  if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       /* Allocate space in the .got and .rela.got sections.  */
@@ -1410,12 +1410,12 @@ elf_vax_instantiate_got_entries (h, infoptr)
       srelgot->_raw_size += sizeof (Elf32_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate an VAX ELF section.  */
 
-static boolean
+static bfd_boolean
 elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -1441,7 +1441,7 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -1470,7 +1470,7 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r_type < 0 || r_type >= (int) R_VAX_max)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       howto = howto_table + r_type;
 
@@ -1550,7 +1550,7 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 		     input_section, rel->r_offset,
 		     (!info->shared || info->no_undefined
 		      || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1694,7 +1694,7 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      Elf_Internal_Rela outrel;
 	      bfd_byte *loc;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 
 	      /* When generating a shared object, these relocations
 		 are copied into the output file to be resolved at run
@@ -1709,7 +1709,7 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -1720,16 +1720,16 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 		  BFD_ASSERT (sreloc != NULL);
 		}
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
 
@@ -1750,7 +1750,7 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 		{
 		  if (r_type == R_VAX_32)
 		    {
-		      relocate = true;
+		      relocate = TRUE;
 		      outrel.r_info = ELF32_R_INFO (0, R_VAX_RELATIVE);
 		      BFD_ASSERT (bfd_get_signed_32 (input_bfd,
 						     &contents[rel->r_offset]) == 0);
@@ -1774,7 +1774,7 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -1835,7 +1835,7 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 	  break;
 	}
 
-      /* VAX PCREL relocations are from the end of relocation, not the start.  
+      /* VAX PCREL relocations are from the end of relocation, not the start.
          So subtract the difference from the relocation amount since we can't
          add it to the offset.  */
       if (howto->pc_relative && howto->pcrel_offset)
@@ -1864,27 +1864,27 @@ elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
 							    symtab_hdr->sh_link,
 							    sym->st_name);
 		    if (name == NULL)
-		      return false;
+		      return FALSE;
 		    if (*name == '\0')
 		      name = bfd_section_name (input_bfd, sec);
 		  }
 		if (!(info->callbacks->reloc_overflow
 		      (info, name, howto->name, (bfd_vma) 0,
 		       input_bfd, input_section, rel->r_offset)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf_vax_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2037,12 +2037,12 @@ elf_vax_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_vax_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2157,7 +2157,7 @@ elf_vax_finish_dynamic_sections (output_bfd, info)
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
 
-  return true;
+  return TRUE;
 }
 
 #define TARGET_LITTLE_SYM		bfd_elf32_vax_vec
diff --git a/bfd/elf32-xstormy16.c b/bfd/elf32-xstormy16.c
index 30b152eb6ec..a729514b5e0 100644
--- a/bfd/elf32-xstormy16.c
+++ b/bfd/elf32-xstormy16.c
@@ -1,5 +1,5 @@
 /* XSTORMY16-specific support for 32-bit ELF.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -33,24 +33,24 @@ static bfd_reloc_status_type xstormy16_elf_24_reloc
   PARAMS ((bfd *abfd, arelent *reloc_entry, asymbol *symbol,
 	   PTR data, asection *input_section, bfd *output_bfd,
 	   char **error_message));
-static boolean xstormy16_elf_check_relocs
+static bfd_boolean xstormy16_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean xstormy16_relax_plt_check
+static bfd_boolean xstormy16_relax_plt_check
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean xstormy16_relax_plt_realloc
+static bfd_boolean xstormy16_relax_plt_realloc
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean xstormy16_elf_relax_section
+static bfd_boolean xstormy16_elf_relax_section
   PARAMS ((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
-	   boolean *again));
-static boolean xstormy16_elf_always_size_sections
+	   bfd_boolean *again));
+static bfd_boolean xstormy16_elf_always_size_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xstormy16_elf_relocate_section
+static bfd_boolean xstormy16_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean xstormy16_elf_finish_dynamic_sections
+static bfd_boolean xstormy16_elf_finish_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean xstormy16_elf_gc_sweep_hook
+static bfd_boolean xstormy16_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection * xstormy16_elf_gc_mark_hook
@@ -64,150 +64,150 @@ static reloc_howto_type xstormy16_elf_howto_table [] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_NONE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  */
   HOWTO (R_XSTORMY16_32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit absolute relocation.  */
   HOWTO (R_XSTORMY16_16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 8 bit absolute relocation.  */
   HOWTO (R_XSTORMY16_8,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit pc-relative relocation.  */
   HOWTO (R_XSTORMY16_PC32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_PC32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),		/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 16 bit pc-relative relocation.  */
   HOWTO (R_XSTORMY16_PC16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_PC16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),		/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* An 8 bit pc-relative relocation.  */
   HOWTO (R_XSTORMY16_PC8,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_PC8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),		/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 12-bit pc-relative relocation suitable for the branch instructions.  */
   HOWTO (R_XSTORMY16_REL_12,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 11,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 1,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_REL_12",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0fff,		/* dst_mask */
-	 true),		/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 24-bit absolute relocation suitable for the jump instructions.  */
   HOWTO (R_XSTORMY16_24,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 xstormy16_elf_24_reloc,	/* special_function */
 	 "R_XSTORMY16_24",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff00ff,		/* dst_mask */
-	 true),		/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 16 bit absolute relocation to a function pointer.  */
   HOWTO (R_XSTORMY16_FPTR16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_XSTORMY16_FPTR16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 static reloc_howto_type xstormy16_elf_howto_table2 [] =
@@ -217,30 +217,30 @@ static reloc_howto_type xstormy16_elf_howto_table2 [] =
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_XSTORMY16_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_XSTORMY16_GNU_VTENTRY,     /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_XSTORMY16_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
 };
 
@@ -361,7 +361,7 @@ xstormy16_elf_24_reloc (abfd, reloc_entry, symbol, data, input_section,
    -relax switch is given, as otherwise we have no idea where the
    sections will fall in the address space.  */
 
-static boolean
+static bfd_boolean
 xstormy16_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -376,7 +376,7 @@ xstormy16_elf_check_relocs (abfd, info, sec, relocs)
   bfd *dynobj;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -433,7 +433,7 @@ xstormy16_elf_check_relocs (abfd, info, sec, relocs)
 						   | SEC_READONLY
 						   | SEC_CODE))
 		      || ! bfd_set_section_alignment (dynobj, splt, 1))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -449,7 +449,7 @@ xstormy16_elf_check_relocs (abfd, info, sec, relocs)
 		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
 		  local_plt_offsets = (bfd_vma *) bfd_alloc (abfd, size);
 		  if (local_plt_offsets == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_offsets (abfd) = local_plt_offsets;
 
 		  for (i = 0; i < symtab_hdr->sh_info; i++)
@@ -469,19 +469,19 @@ xstormy16_elf_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
         case R_XSTORMY16_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
         case R_XSTORMY16_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* A subroutine of xstormy16_elf_relax_section.  If the global symbol H
@@ -490,10 +490,10 @@ xstormy16_elf_check_relocs (abfd, info, sec, relocs)
 struct relax_plt_data
 {
   asection *splt;
-  boolean *again;
+  bfd_boolean *again;
 };
 
-static boolean
+static bfd_boolean
 xstormy16_relax_plt_check (h, xdata)
      struct elf_link_hash_entry *h;
      PTR xdata;
@@ -519,17 +519,17 @@ xstormy16_relax_plt_check (h, xdata)
 	{
 	  h->plt.offset = -1;
 	  data->splt->_cooked_size -= 4;
-	  *data->again = true;
+	  *data->again = TRUE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* A subroutine of xstormy16_elf_relax_section.  If the global symbol H
    previously had a plt entry, give it a new entry offset.  */
 
-static boolean
+static bfd_boolean
 xstormy16_relax_plt_realloc (h, xdata)
      struct elf_link_hash_entry *h;
      PTR xdata;
@@ -545,33 +545,33 @@ xstormy16_relax_plt_realloc (h, xdata)
       *entry += 4;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 xstormy16_elf_relax_section (dynobj, splt, info, again)
      bfd *dynobj;
      asection *splt;
      struct bfd_link_info *info;
-     boolean *again;
+     bfd_boolean *again;
 {
   struct relax_plt_data relax_plt_data;
   bfd *ibfd;
 
   /* Assume nothing changes.  */
-  *again = false;
+  *again = FALSE;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   /* We only relax the .plt section at the moment.  */
   if (dynobj != elf_hash_table (info)->dynobj
       || strcmp (splt->name, ".plt") != 0)
-    return true;
+    return TRUE;
 
   /* Quick check for an empty plt.  */
   if (splt->_raw_size == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -606,7 +606,7 @@ xstormy16_elf_relax_section (dynobj, splt, info, again)
 					    symtab_hdr->sh_info, 0,
 					    NULL, NULL, NULL);
 	  if (isymbuf == NULL)
-	    return false;
+	    return FALSE;
 	}
 
       for (idx = 0; idx < symtab_hdr->sh_info; ++idx)
@@ -635,7 +635,7 @@ xstormy16_elf_relax_section (dynobj, splt, info, again)
 	    {
 	      local_plt_offsets[idx] = -1;
 	      splt->_cooked_size -= 4;
-	      *again = true;
+	      *again = TRUE;
 	    }
 	}
 
@@ -680,10 +680,10 @@ xstormy16_elf_relax_section (dynobj, splt, info, again)
     }
 
   splt->_raw_size = splt->_cooked_size;
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 xstormy16_elf_always_size_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -692,20 +692,20 @@ xstormy16_elf_always_size_sections (output_bfd, info)
   asection *splt;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj == NULL)
-    return true;
+    return TRUE;
 
   splt = bfd_get_section_by_name (dynobj, ".plt");
   BFD_ASSERT (splt != NULL);
 
   splt->contents = (bfd_byte *) bfd_zalloc (dynobj, splt->_raw_size);
   if (splt->contents == NULL)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate an XSTORMY16 ELF section.
@@ -738,7 +738,7 @@ xstormy16_elf_always_size_sections (output_bfd, info)
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *                   output_bfd ATTRIBUTE_UNUSED;
@@ -758,7 +758,7 @@ xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   asection *splt;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -831,8 +831,8 @@ xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -923,7 +923,7 @@ xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    case bfd_reloc_undefined:
 	      r = info->callbacks->undefined_symbol
 		(info, name, input_bfd, input_section, rel->r_offset,
-		 true);
+		 TRUE);
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -948,16 +948,16 @@ xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, name, input_bfd, input_section, rel->r_offset);
 
 	  if (! r)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This must exist if dynobj is ever set.  */
 
-static boolean
+static bfd_boolean
 xstormy16_elf_finish_dynamic_sections (abfd, info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -980,7 +980,7 @@ xstormy16_elf_finish_dynamic_sections (abfd, info)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -1025,14 +1025,14 @@ xstormy16_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 xstormy16_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *                     abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *    info ATTRIBUTE_UNUSED;
      asection *                sec ATTRIBUTE_UNUSED;
      const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 #define ELF_ARCH		bfd_arch_xstormy16
diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index e48202860f9..ac9822ac98d 100644
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -68,26 +68,26 @@ static reloc_howto_type * elf64_alpha_bfd_reloc_type_lookup
 static void elf64_alpha_info_to_howto
   PARAMS((bfd *, arelent *, Elf_Internal_Rela *));
 
-static boolean elf64_alpha_mkobject
+static bfd_boolean elf64_alpha_mkobject
   PARAMS((bfd *));
-static boolean elf64_alpha_object_p
+static bfd_boolean elf64_alpha_object_p
   PARAMS((bfd *));
-static boolean elf64_alpha_section_from_shdr
+static bfd_boolean elf64_alpha_section_from_shdr
   PARAMS((bfd *, Elf_Internal_Shdr *, const char *));
-static boolean elf64_alpha_section_flags
+static bfd_boolean elf64_alpha_section_flags
   PARAMS((flagword *, Elf_Internal_Shdr *));
-static boolean elf64_alpha_fake_sections
+static bfd_boolean elf64_alpha_fake_sections
   PARAMS((bfd *, Elf_Internal_Shdr *, asection *));
-static boolean elf64_alpha_create_got_section
+static bfd_boolean elf64_alpha_create_got_section
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_create_dynamic_sections
+static bfd_boolean elf64_alpha_create_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
 
-static boolean elf64_alpha_read_ecoff_info
+static bfd_boolean elf64_alpha_read_ecoff_info
   PARAMS((bfd *, asection *, struct ecoff_debug_info *));
-static boolean elf64_alpha_is_local_label_name
+static bfd_boolean elf64_alpha_is_local_label_name
   PARAMS((bfd *, const char *));
-static boolean elf64_alpha_find_nearest_line
+static bfd_boolean elf64_alpha_find_nearest_line
   PARAMS((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	  const char **, unsigned int *));
 
@@ -95,59 +95,60 @@ static boolean elf64_alpha_find_nearest_line
 struct alpha_elf_link_hash_entry;
 #endif
 
-static boolean elf64_alpha_output_extsym
+static bfd_boolean elf64_alpha_output_extsym
   PARAMS((struct alpha_elf_link_hash_entry *, PTR));
 
-static boolean elf64_alpha_can_merge_gots
+static bfd_boolean elf64_alpha_can_merge_gots
   PARAMS((bfd *, bfd *));
 static void elf64_alpha_merge_gots
   PARAMS((bfd *, bfd *));
-static boolean elf64_alpha_calc_got_offsets_for_symbol
+static bfd_boolean elf64_alpha_calc_got_offsets_for_symbol
   PARAMS ((struct alpha_elf_link_hash_entry *, PTR));
-static void elf64_alpha_calc_got_offsets PARAMS ((struct bfd_link_info *));
-static boolean elf64_alpha_size_got_sections
+static void elf64_alpha_calc_got_offsets
   PARAMS ((struct bfd_link_info *));
-static boolean elf64_alpha_size_plt_section
+static bfd_boolean elf64_alpha_size_got_sections
   PARAMS ((struct bfd_link_info *));
-static boolean elf64_alpha_size_plt_section_1
+static bfd_boolean elf64_alpha_size_plt_section
+  PARAMS ((struct bfd_link_info *));
+static bfd_boolean elf64_alpha_size_plt_section_1
   PARAMS ((struct alpha_elf_link_hash_entry *, PTR));
-static boolean elf64_alpha_always_size_sections
+static bfd_boolean elf64_alpha_always_size_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static int alpha_dynamic_entries_for_reloc
   PARAMS ((int, int, int));
-static boolean elf64_alpha_calc_dynrel_sizes
+static bfd_boolean elf64_alpha_calc_dynrel_sizes
   PARAMS ((struct alpha_elf_link_hash_entry *, struct bfd_link_info *));
-static boolean elf64_alpha_size_rela_got_section
+static bfd_boolean elf64_alpha_size_rela_got_section
   PARAMS ((struct bfd_link_info *));
-static boolean elf64_alpha_size_rela_got_1
+static bfd_boolean elf64_alpha_size_rela_got_1
   PARAMS ((struct alpha_elf_link_hash_entry *, struct bfd_link_info *));
-static boolean elf64_alpha_add_symbol_hook
+static bfd_boolean elf64_alpha_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
 static struct alpha_elf_got_entry *get_got_entry
   PARAMS ((bfd *, struct alpha_elf_link_hash_entry *, unsigned long,
 	   unsigned long, bfd_vma));
-static boolean elf64_alpha_check_relocs
+static bfd_boolean elf64_alpha_check_relocs
   PARAMS((bfd *, struct bfd_link_info *, asection *sec,
 	  const Elf_Internal_Rela *));
-static boolean elf64_alpha_adjust_dynamic_symbol
+static bfd_boolean elf64_alpha_adjust_dynamic_symbol
   PARAMS((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf64_alpha_size_dynamic_sections
+static bfd_boolean elf64_alpha_size_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_relocate_section_r
+static bfd_boolean elf64_alpha_relocate_section_r
   PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	  Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf64_alpha_relocate_section
+static bfd_boolean elf64_alpha_relocate_section
   PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	  Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf64_alpha_finish_dynamic_symbol
+static bfd_boolean elf64_alpha_finish_dynamic_symbol
   PARAMS((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	  Elf_Internal_Sym *));
-static boolean elf64_alpha_finish_dynamic_sections
+static bfd_boolean elf64_alpha_finish_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_final_link
+static bfd_boolean elf64_alpha_final_link
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_merge_ind_symbols
+static bfd_boolean elf64_alpha_merge_ind_symbols
   PARAMS((struct alpha_elf_link_hash_entry *, PTR));
 static Elf_Internal_Rela * elf64_alpha_find_reloc_at_ofs
   PARAMS ((Elf_Internal_Rela *, Elf_Internal_Rela *, bfd_vma, int));
@@ -247,7 +248,7 @@ struct alpha_elf_link_hash_table
 #define alpha_elf_link_hash_traverse(table, func, info)			\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the Alpha ELF linker hash table from a link_info structure.  */
@@ -268,18 +269,18 @@ alpha_elf_dynamic_symbol_p (h, info)
      struct bfd_link_info *info;
 {
   if (h == NULL)
-    return false;
+    return FALSE;
 
   while (h->root.type == bfd_link_hash_indirect
 	 || h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
   if (h->dynindx == -1)
-    return false;
+    return FALSE;
 
   if (h->root.type == bfd_link_hash_undefweak
       || h->root.type == bfd_link_hash_defweak)
-    return true;
+    return TRUE;
 
   switch (ELF_ST_VISIBILITY (h->other))
     {
@@ -287,10 +288,10 @@ alpha_elf_dynamic_symbol_p (h, info)
       break;
     case STV_HIDDEN:
     case STV_INTERNAL:
-      return false;
+      return FALSE;
     case STV_PROTECTED:
       if (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
-        return false;
+        return FALSE;
       break;
     }
 
@@ -298,9 +299,9 @@ alpha_elf_dynamic_symbol_p (h, info)
       || ((h->elf_link_hash_flags
 	   & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR))
 	  == (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR)))
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* Create an entry in a Alpha ELF linker hash table.  */
@@ -399,18 +400,18 @@ struct alpha_elf_obj_tdata
 #define alpha_elf_tdata(abfd) \
   ((struct alpha_elf_obj_tdata *) (abfd)->tdata.any)
 
-static boolean
+static bfd_boolean
 elf64_alpha_mkobject (abfd)
      bfd *abfd;
 {
   bfd_size_type amt = sizeof (struct alpha_elf_obj_tdata);
   abfd->tdata.any = bfd_zalloc (abfd, amt);
   if (abfd->tdata.any == NULL)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_object_p (abfd)
      bfd *abfd;
 {
@@ -419,7 +420,7 @@ elf64_alpha_object_p (abfd)
   bfd_size_type amt = sizeof (struct alpha_elf_obj_tdata);
   new_tdata = bfd_zalloc (abfd, amt);
   if (new_tdata == NULL)
-    return false;
+    return FALSE;
   new_tdata->root = *abfd->tdata.elf_obj_data;
   abfd->tdata.any = new_tdata;
 
@@ -440,45 +441,45 @@ static reloc_howto_type elf64_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 elf64_alpha_reloc_nil,	/* special_function */
 	 "NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 32 bit reference to a symbol.  */
   HOWTO (R_ALPHA_REFLONG,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "REFLONG",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit reference to a symbol.  */
   HOWTO (R_ALPHA_REFQUAD,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "REFQUAD",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit GP relative offset.  This is just like REFLONG except
      that when the value is used the value of the gp register will be
@@ -487,30 +488,30 @@ static reloc_howto_type elf64_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPREL32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used for an instruction that refers to memory off the GP register.  */
   HOWTO (R_ALPHA_LITERAL,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "ELF_LITERAL",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* This reloc only appears immediately following an ELF_LITERAL reloc.
      It identifies a use of the literal.  The symbol index is special:
@@ -523,15 +524,15 @@ static reloc_howto_type elf64_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 elf64_alpha_reloc_nil,	/* special_function */
 	 "LITUSE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Load the gp register.  This is always used for a ldah instruction
      which loads the upper 16 bits of the gp register.  The symbol
@@ -553,90 +554,90 @@ static reloc_howto_type elf64_alpha_howto_table[] =
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 elf64_alpha_reloc_gpdisp, /* special_function */
 	 "GPDISP",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 21 bit branch.  */
   HOWTO (R_ALPHA_BRADDR,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 21,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "BRADDR",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x1fffff,		/* src_mask */
 	 0x1fffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A hint for a jump to a register.  */
   HOWTO (R_ALPHA_HINT,		/* type */
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 14,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "HINT",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x3fff,		/* src_mask */
 	 0x3fff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 16 bit PC relative offset.  */
   HOWTO (R_ALPHA_SREL16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 32 bit PC relative offset.  */
   HOWTO (R_ALPHA_SREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 64 bit PC relative offset.  */
   HOWTO (R_ALPHA_SREL64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Skip 12 - 16; deprecated ECOFF relocs.  */
   SKIP_HOWTO (12),
@@ -650,45 +651,45 @@ static reloc_howto_type elf64_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPRELHIGH",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The low 16 bits of the displacement from GP to the target.  */
   HOWTO (R_ALPHA_GPRELLOW,
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPRELLOW",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16-bit displacement from the GP to the target.  */
   HOWTO (R_ALPHA_GPREL16,
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPREL16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Skip 20 - 23; deprecated ECOFF relocs.  */
   SKIP_HOWTO (20),
@@ -706,120 +707,120 @@ static reloc_howto_type elf64_alpha_howto_table[] =
 	 0,
 	 0,
 	 0,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_dont,
 	 bfd_elf_generic_reloc,
 	 "COPY",
-	 false,
+	 FALSE,
 	 0,
 	 0,
-	 true),
+	 TRUE),
 
   /* A dynamic relocation for a .got entry.  */
   HOWTO (R_ALPHA_GLOB_DAT,
 	 0,
 	 0,
 	 0,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_dont,
 	 bfd_elf_generic_reloc,
 	 "GLOB_DAT",
-	 false,
+	 FALSE,
 	 0,
 	 0,
-	 true),
+	 TRUE),
 
   /* A dynamic relocation for a .plt entry.  */
   HOWTO (R_ALPHA_JMP_SLOT,
 	 0,
 	 0,
 	 0,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_dont,
 	 bfd_elf_generic_reloc,
 	 "JMP_SLOT",
-	 false,
+	 FALSE,
 	 0,
 	 0,
-	 true),
+	 TRUE),
 
   /* A dynamic relocation to add the base of the DSO to a 64-bit field.  */
   HOWTO (R_ALPHA_RELATIVE,
 	 0,
 	 0,
 	 0,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_dont,
 	 bfd_elf_generic_reloc,
 	 "RELATIVE",
-	 false,
+	 FALSE,
 	 0,
 	 0,
-	 true),
+	 TRUE),
 
   /* A 21 bit branch that adjusts for gp loads.  */
   HOWTO (R_ALPHA_BRSGP,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 21,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "BRSGP",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x1fffff,		/* src_mask */
 	 0x1fffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Creates a tls_index for the symbol in the got.  */
   HOWTO (R_ALPHA_TLSGD,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "TLSGD",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Creates a tls_index for the (current) module in the got.  */
   HOWTO (R_ALPHA_TLSLDM,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "TLSLDM",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A dynamic relocation for a DTP module entry.  */
   HOWTO (R_ALPHA_DTPMOD64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "DTPMOD64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Creates a 64-bit offset in the got for the displacement
      from DTP to the target.  */
@@ -827,75 +828,75 @@ static reloc_howto_type elf64_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GOTDTPREL",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A dynamic relocation for a displacement from DTP to the target.  */
   HOWTO (R_ALPHA_DTPREL64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "DTPREL64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The high 16 bits of the displacement from DTP to the target.  */
   HOWTO (R_ALPHA_DTPRELHI,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "DTPRELHI",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The low 16 bits of the displacement from DTP to the target.  */
   HOWTO (R_ALPHA_DTPRELLO,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "DTPRELLO",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16-bit displacement from DTP to the target.  */
   HOWTO (R_ALPHA_DTPREL16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "DTPREL16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Creates a 64-bit offset in the got for the displacement
      from TP to the target.  */
@@ -903,75 +904,75 @@ static reloc_howto_type elf64_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GOTTPREL",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A dynamic relocation for a displacement from TP to the target.  */
   HOWTO (R_ALPHA_TPREL64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "TPREL64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The high 16 bits of the displacement from TP to the target.  */
   HOWTO (R_ALPHA_TPRELHI,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "TPRELHI",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The low 16 bits of the displacement from TP to the target.  */
   HOWTO (R_ALPHA_TPRELLO,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "TPRELLO",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16-bit displacement from TP to the target.  */
   HOWTO (R_ALPHA_TPREL16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "TPREL16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 /* A relocation function which doesn't do anything.  */
@@ -1226,30 +1227,30 @@ struct alpha_relax_info
   struct alpha_elf_link_hash_entry *h;
   struct alpha_elf_got_entry **first_gotent;
   struct alpha_elf_got_entry *gotent;
-  boolean changed_contents;
-  boolean changed_relocs;
+  bfd_boolean changed_contents;
+  bfd_boolean changed_relocs;
   unsigned char other;
 };
 
-static boolean elf64_alpha_relax_with_lituse
+static bfd_boolean elf64_alpha_relax_with_lituse
   PARAMS((struct alpha_relax_info *info, bfd_vma symval,
           Elf_Internal_Rela *irel));
 static bfd_vma elf64_alpha_relax_opt_call
   PARAMS((struct alpha_relax_info *info, bfd_vma symval));
-static boolean elf64_alpha_relax_got_load
+static bfd_boolean elf64_alpha_relax_got_load
   PARAMS((struct alpha_relax_info *info, bfd_vma symval,
           Elf_Internal_Rela *irel, unsigned long));
-static boolean elf64_alpha_relax_gprelhilo
+static bfd_boolean elf64_alpha_relax_gprelhilo
   PARAMS((struct alpha_relax_info *info, bfd_vma symval,
-          Elf_Internal_Rela *irel, boolean));
-static boolean elf64_alpha_relax_tls_get_addr
+          Elf_Internal_Rela *irel, bfd_boolean));
+static bfd_boolean elf64_alpha_relax_tls_get_addr
   PARAMS((struct alpha_relax_info *info, bfd_vma symval,
-          Elf_Internal_Rela *irel, boolean));
+          Elf_Internal_Rela *irel, bfd_boolean));
 static struct elf_link_tls_segment *elf64_alpha_relax_find_tls_segment
   PARAMS((struct alpha_relax_info *, struct elf_link_tls_segment *));
-static boolean elf64_alpha_relax_section
+static bfd_boolean elf64_alpha_relax_section
   PARAMS((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
-	  boolean *again));
+	  bfd_boolean *again));
 
 static Elf_Internal_Rela *
 elf64_alpha_find_reloc_at_ofs (rel, relend, offset, type)
@@ -1267,7 +1268,7 @@ elf64_alpha_find_reloc_at_ofs (rel, relend, offset, type)
   return NULL;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_relax_with_lituse (info, symval, irel)
      struct alpha_relax_info *info;
      bfd_vma symval;
@@ -1276,10 +1277,10 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
   Elf_Internal_Rela *urel, *irelend = info->relend;
   int flags, count, i;
   bfd_signed_vma disp;
-  boolean fits16;
-  boolean fits32;
-  boolean lit_reused = false;
-  boolean all_optimized = true;
+  bfd_boolean fits16;
+  bfd_boolean fits32;
+  bfd_boolean lit_reused = FALSE;
+  bfd_boolean all_optimized = TRUE;
   unsigned int lit_insn;
 
   lit_insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
@@ -1289,12 +1290,12 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
        ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
 	bfd_archive_filename (info->abfd), info->sec->name,
 	(unsigned long) irel->r_offset));
-      return true;
+      return TRUE;
     }
 
   /* Can't relax dynamic symbols.  */
   if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
-    return true;
+    return TRUE;
 
   /* Summarize how this particular LITERAL is used.  */
   for (urel = irel+1, flags = count = 0; urel < irelend; ++urel, ++count)
@@ -1322,7 +1323,7 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
 	default:
 	  /* This type is really just a placeholder to note that all
 	     uses cannot be optimized, but to still allow some.  */
-	  all_optimized = false;
+	  all_optimized = FALSE;
 	  break;
 
 	case LITUSE_ALPHA_BASE:
@@ -1348,11 +1349,11 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
 	      urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
 					   R_ALPHA_GPREL16);
 	      urel->r_addend = irel->r_addend;
-	      info->changed_relocs = true;
+	      info->changed_relocs = TRUE;
 
 	      bfd_put_32 (info->abfd, (bfd_vma) insn,
 			  info->contents + urel->r_offset);
-	      info->changed_contents = true;
+	      info->changed_contents = TRUE;
 	    }
 
 	  /* If all mem+byte, we can optimize 32-bit mem displacements.  */
@@ -1365,16 +1366,16 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
 	      lit_insn = (OP_LDAH << 26) | (lit_insn & 0x03ff0000);
 	      bfd_put_32 (info->abfd, (bfd_vma) lit_insn,
 			  info->contents + irel->r_offset);
-	      lit_reused = true;
-	      info->changed_contents = true;
+	      lit_reused = TRUE;
+	      info->changed_contents = TRUE;
 
 	      urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
 					   R_ALPHA_GPRELLOW);
 	      urel->r_addend = irel->r_addend;
-	      info->changed_relocs = true;
+	      info->changed_relocs = TRUE;
 	    }
 	  else
-	    all_optimized = false;
+	    all_optimized = FALSE;
 	  break;
 
 	case LITUSE_ALPHA_BYTOFF:
@@ -1388,11 +1389,11 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
 
 	  urel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
 	  urel->r_addend = 0;
-	  info->changed_relocs = true;
+	  info->changed_relocs = TRUE;
 
 	  bfd_put_32 (info->abfd, (bfd_vma) insn,
 		      info->contents + urel->r_offset);
-	  info->changed_contents = true;
+	  info->changed_contents = TRUE;
 	  break;
 
 	case LITUSE_ALPHA_JSR:
@@ -1426,7 +1427,7 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
 		if (optdest)
 		  urel->r_addend += optdest - symval;
 		else
-		  all_optimized = false;
+		  all_optimized = FALSE;
 
 		bfd_put_32 (info->abfd, (bfd_vma) insn,
 			    info->contents + urel->r_offset);
@@ -1438,11 +1439,11 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
 		if (xrel)
 		  xrel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
 
-		info->changed_contents = true;
-		info->changed_relocs = true;
+		info->changed_contents = TRUE;
+		info->changed_relocs = TRUE;
 	      }
 	    else
-	      all_optimized = false;
+	      all_optimized = FALSE;
 
 	    /* Even if the target is not in range for a direct branch,
 	       if we share a GP, we can eliminate the gp reload.  */
@@ -1470,8 +1471,8 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
 			bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, p_lda);
 
 			gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-			info->changed_contents = true;
-			info->changed_relocs = true;
+			info->changed_contents = TRUE;
+			info->changed_relocs = TRUE;
 		      }
 		  }
 	      }
@@ -1499,15 +1500,15 @@ elf64_alpha_relax_with_lituse (info, symval, irel)
       if (!lit_reused)
 	{
 	  irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-	  info->changed_relocs = true;
+	  info->changed_relocs = TRUE;
 
 	  bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP,
 		      info->contents + irel->r_offset);
-	  info->changed_contents = true;
+	  info->changed_contents = TRUE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 static bfd_vma
@@ -1582,7 +1583,7 @@ elf64_alpha_relax_opt_call (info, symval)
   return symval + 8;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_relax_got_load (info, symval, irel, r_type)
      struct alpha_relax_info *info;
      bfd_vma symval;
@@ -1602,16 +1603,16 @@ elf64_alpha_relax_got_load (info, symval, irel, r_type)
        ("%s: %s+0x%lx: warning: %s relocation against unexpected insn",
 	bfd_archive_filename (info->abfd), info->sec->name,
 	(unsigned long) irel->r_offset, howto->name));
-      return true;
+      return TRUE;
     }
 
   /* Can't relax dynamic symbols.  */
   if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
-    return true;
+    return TRUE;
 
   /* Can't use local-exec relocations in shared libraries.  */
   if (r_type == R_ALPHA_GOTTPREL && info->link_info->shared)
-    return true;
+    return TRUE;
 
   if (r_type == R_ALPHA_LITERAL)
     disp = symval - info->gp;
@@ -1626,7 +1627,7 @@ elf64_alpha_relax_got_load (info, symval, irel, r_type)
     }
 
   if (disp < -0x8000 || disp >= 0x8000)
-    return true;
+    return TRUE;
 
   /* Exchange LDQ for LDA.  In the case of the TLS relocs, we're loading
      a constant, so force the base register to be $31.  */
@@ -1635,7 +1636,7 @@ elf64_alpha_relax_got_load (info, symval, irel, r_type)
   else
     insn = (OP_LDA << 26) | (insn & (31 << 21)) | (31 << 16);
   bfd_put_32 (info->abfd, (bfd_vma) insn, info->contents + irel->r_offset);
-  info->changed_contents = true;
+  info->changed_contents = TRUE;
 
   switch (r_type)
     {
@@ -1650,11 +1651,11 @@ elf64_alpha_relax_got_load (info, symval, irel, r_type)
       break;
     default:
       BFD_ASSERT (0);
-      return false;
+      return FALSE;
     }
 
   irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), r_type);
-  info->changed_relocs = true;
+  info->changed_relocs = TRUE;
 
   /* Reduce the use count on this got entry by one, possibly
      eliminating it.  */
@@ -1679,15 +1680,15 @@ elf64_alpha_relax_got_load (info, symval, irel, r_type)
      This would mean that we'd have to _add_ relocations, the pain of
      which gives one pause.  */
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_relax_gprelhilo (info, symval, irel, hi)
      struct alpha_relax_info *info;
      bfd_vma symval;
      Elf_Internal_Rela *irel;
-     boolean hi;
+     bfd_boolean hi;
 {
   unsigned int insn;
   bfd_signed_vma disp;
@@ -1703,22 +1704,22 @@ elf64_alpha_relax_gprelhilo (info, symval, irel, hi)
 
      which would indeed be the most efficient way to implement this.  */
 
-  return true;
+  return TRUE;
 
   disp = symval - info->gp;
   if (disp < -0x8000 || disp >= 0x8000)
-    return true;
+    return TRUE;
 
   if (hi)
     {
       /* Nop out the high instruction.  */
 
       bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos);
-      info->changed_contents = true;
+      info->changed_contents = TRUE;
 
       irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
       irel->r_addend = 0;
-      info->changed_relocs = true;
+      info->changed_relocs = TRUE;
     }
   else
     {
@@ -1727,34 +1728,34 @@ elf64_alpha_relax_gprelhilo (info, symval, irel, hi)
       insn = bfd_get_32 (info->abfd, pos);
       insn = (insn & 0xffe00000) | (29 << 16);
       bfd_put_32 (info->abfd, (bfd_vma) insn, pos);
-      info->changed_contents = true;
+      info->changed_contents = TRUE;
 
       irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
 				   R_ALPHA_GPREL16);
-      info->changed_relocs = true;
+      info->changed_relocs = TRUE;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
      struct alpha_relax_info *info;
      bfd_vma symval;
      Elf_Internal_Rela *irel;
-     boolean is_gd;
+     bfd_boolean is_gd;
 {
   bfd_byte *pos[5];
   unsigned int insn;
   Elf_Internal_Rela *gpdisp, *hint;
-  boolean dynamic, use_gottprel;
+  bfd_boolean dynamic, use_gottprel;
 
   dynamic = alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info);
 
   /* ??? For LD relaxation, we need a symbol referencing the beginning
      of the TLS segment.  */
   if (!is_gd)
-    return true;
+    return TRUE;
 
   /* If a TLS symbol is accessed using IE at least once, there is no point
      to use dynamic model for it.  */
@@ -1769,23 +1770,23 @@ elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
 
   /* Otherwise we must be building an executable to do anything.  */
   else if (info->link_info->shared)
-    return true;
+    return TRUE;
 
   /* The TLSGD/TLSLDM relocation must be followed by a LITERAL and
      the matching LITUSE_TLS relocations.  */
   if (irel + 2 >= info->relend)
-    return true;
+    return TRUE;
   if (ELF64_R_TYPE (irel[1].r_info) != R_ALPHA_LITERAL
       || ELF64_R_TYPE (irel[2].r_info) != R_ALPHA_LITUSE
       || irel[2].r_addend != (is_gd ? LITUSE_ALPHA_TLSGD : LITUSE_ALPHA_TLSLDM))
-    return true;
+    return TRUE;
 
   /* There must be a GPDISP relocation positioned immediately after the
      LITUSE relocation.  */
   gpdisp = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend,
 					  irel[2].r_offset + 4, R_ALPHA_GPDISP);
   if (!gpdisp)
-    return true;
+    return TRUE;
 
   pos[0] = info->contents + irel[0].r_offset;
   pos[1] = info->contents + irel[1].r_offset;
@@ -1801,7 +1802,7 @@ elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
       pos[1] = tmp;
     }
   if (pos[1] >= pos[2] || pos[2] >= pos[3] || pos[3] >= pos[4])
-    return true;
+    return TRUE;
 
   /* Reduce the use count on the LITERAL relocation.  Do this before we
      smash the symndx when we adjust the relocations below.  */
@@ -1855,7 +1856,7 @@ elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
 
      as appropriate.  */
 
-  use_gottprel = false;
+  use_gottprel = FALSE;
   switch (!dynamic && !info->link_info->shared)
     {
     case 1:
@@ -1899,7 +1900,7 @@ elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
       /* FALLTHRU */
 
     default:
-      use_gottprel = true;
+      use_gottprel = TRUE;
 
       insn = (OP_LDQ << 26) | (16 << 21) | (29 << 16);
       bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
@@ -1927,8 +1928,8 @@ elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
   if (hint)
     hint->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
 
-  info->changed_contents = true;
-  info->changed_relocs = true;
+  info->changed_contents = TRUE;
+  info->changed_relocs = TRUE;
 
   /* Reduce the use count on the TLSGD/TLSLDM relocation.  */
   if (--info->gotent->use_count == 0)
@@ -1962,7 +1963,7 @@ elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
 	      tprel_gotent = (struct alpha_elf_got_entry *)
 		bfd_alloc (info->abfd, sizeof (struct alpha_elf_got_entry));
 	      if (!tprel_gotent)
-		return false;
+		return FALSE;
 
 	      tprel_gotent->next = *info->first_gotent;
 	      *info->first_gotent = tprel_gotent;
@@ -1979,7 +1980,7 @@ elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 static struct elf_link_tls_segment *
@@ -2029,12 +2030,12 @@ elf64_alpha_relax_find_tls_segment (info, seg)
   return seg;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
@@ -2045,12 +2046,12 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
   struct elf_link_tls_segment tls_segment;
 
   /* We are not currently changing any sizes, so only one pass.  */
-  *again = false;
+  *again = FALSE;
 
   if (link_info->relocateable
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -2065,7 +2066,7 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
 		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
 		      link_info->keep_memory));
   if (internal_relocs == NULL)
-    return false;
+    return FALSE;
 
   memset(&info, 0, sizeof (info));
   info.abfd = abfd;
@@ -2246,11 +2247,11 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
     }
 
   if (!elf64_alpha_size_plt_section (link_info))
-    return false;
+    return FALSE;
   if (!elf64_alpha_size_got_sections (link_info))
-    return false;
+    return FALSE;
   if (!elf64_alpha_size_rela_got_section (link_info))
-    return false;
+    return FALSE;
 
   if (isymbuf != NULL
       && symtab_hdr->contents != (unsigned char *) isymbuf)
@@ -2286,7 +2287,7 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
 
   *again = info.changed_contents || info.changed_relocs;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL
@@ -2298,7 +2299,7 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
   if (internal_relocs != NULL
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
-  return false;
+  return FALSE;
 }
 
 /* PLT/GOT Stuff */
@@ -2322,7 +2323,7 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
    FIXME: We need to handle the SHF_ALPHA_GPREL flag, but I'm not sure
    how to.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -2339,14 +2340,14 @@ elf64_alpha_section_from_shdr (abfd, hdr, name)
     {
     case SHT_ALPHA_DEBUG:
       if (strcmp (name, ".mdebug") != 0)
-	return false;
+	return FALSE;
       break;
     default:
-      return false;
+      return FALSE;
     }
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
   newsect = hdr->bfd_section;
 
   if (hdr->sh_type == SHT_ALPHA_DEBUG)
@@ -2354,15 +2355,15 @@ elf64_alpha_section_from_shdr (abfd, hdr, name)
       if (! bfd_set_section_flags (abfd, newsect,
 				   (bfd_get_section_flags (abfd, newsect)
 				    | SEC_DEBUGGING)))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Convert Alpha specific section flags to bfd internal section flags.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_section_flags (flags, hdr)
      flagword *flags;
      Elf_Internal_Shdr *hdr;
@@ -2370,13 +2371,13 @@ elf64_alpha_section_flags (flags, hdr)
   if (hdr->sh_flags & SHF_ALPHA_GPREL)
     *flags |= SEC_SMALL_DATA;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the correct type for an Alpha ELF section.  We do this by the
    section name, which is a hack, but ought to work.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_fake_sections (abfd, hdr, sec)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -2403,13 +2404,13 @@ elf64_alpha_fake_sections (abfd, hdr, sec)
 	   || strcmp (name, ".lit8") == 0)
     hdr->sh_flags |= SHF_ALPHA_GPREL;
 
-  return true;
+  return TRUE;
 }
 
 /* Hook called by the linker routine which adds symbols from an object
    file.  We use it to put .comm items in .sbss, and not .bss.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2435,19 +2436,19 @@ elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	      || !bfd_set_section_flags (abfd, scomm, (SEC_ALLOC
 						       | SEC_IS_COMMON
 						       | SEC_LINKER_CREATED)))
-	    return false;
+	    return FALSE;
 	}
 
       *secp = scomm;
       *valp = sym->st_size;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Create the .got section.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_create_got_section(abfd, info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -2455,7 +2456,7 @@ elf64_alpha_create_got_section(abfd, info)
   asection *s;
 
   if (bfd_get_section_by_name (abfd, ".got"))
-    return true;
+    return TRUE;
 
   s = bfd_make_section (abfd, ".got");
   if (s == NULL
@@ -2464,16 +2465,16 @@ elf64_alpha_create_got_section(abfd, info)
 					   | SEC_IN_MEMORY
 					   | SEC_LINKER_CREATED))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
 
   alpha_elf_tdata (abfd)->got = s;
 
-  return true;
+  return TRUE;
 }
 
 /* Create all the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2492,23 +2493,23 @@ elf64_alpha_create_dynamic_sections (abfd, info)
 					    | SEC_LINKER_CREATED
 					    | SEC_CODE))
       || ! bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
 
   /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
      .plt section.  */
   bh = NULL;
   if (! (_bfd_generic_link_add_one_symbol
 	 (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
-	  (bfd_vma) 0, (const char *) NULL, false,
+	  (bfd_vma) 0, (const char *) NULL, FALSE,
 	  get_elf_backend_data (abfd)->collect, &bh)))
-    return false;
+    return FALSE;
   h = (struct elf_link_hash_entry *) bh;
   h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
   h->type = STT_OBJECT;
 
   if (info->shared
       && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
+    return FALSE;
 
   s = bfd_make_section (abfd, ".rela.plt");
   if (s == NULL
@@ -2518,13 +2519,13 @@ elf64_alpha_create_dynamic_sections (abfd, info)
 					   | SEC_LINKER_CREATED
 					   | SEC_READONLY))
       || ! bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
 
   /* We may or may not have created a .got section for this object, but
      we definitely havn't done the rest of the work.  */
 
   if (!elf64_alpha_create_got_section (abfd, info))
-    return false;
+    return FALSE;
 
   s = bfd_make_section(abfd, ".rela.got");
   if (s == NULL
@@ -2534,7 +2535,7 @@ elf64_alpha_create_dynamic_sections (abfd, info)
 					   | SEC_LINKER_CREATED
 					   | SEC_READONLY))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
 
   /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the
      dynobj's .got section.  We don't do this in the linker script
@@ -2544,25 +2545,25 @@ elf64_alpha_create_dynamic_sections (abfd, info)
   if (!(_bfd_generic_link_add_one_symbol
 	(info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL,
 	 alpha_elf_tdata(abfd)->got, (bfd_vma) 0, (const char *) NULL,
-	 false, get_elf_backend_data (abfd)->collect, &bh)))
-    return false;
+	 FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+    return FALSE;
   h = (struct elf_link_hash_entry *) bh;
   h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
   h->type = STT_OBJECT;
 
   if (info->shared
       && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
+    return FALSE;
 
   elf_hash_table (info)->hgot = h;
 
-  return true;
+  return TRUE;
 }
 
 /* Read ECOFF debugging information from a .mdebug section into a
    ecoff_debug_info structure.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_read_ecoff_info (abfd, section, debug)
      bfd *abfd;
      asection *section;
@@ -2619,7 +2620,7 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
   debug->fdr = NULL;
   debug->adjust = NULL;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (ext_hdr != NULL)
@@ -2646,12 +2647,12 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
     free (debug->external_rfd);
   if (debug->external_ext != NULL)
     free (debug->external_ext);
-  return false;
+  return FALSE;
 }
 
 /* Alpha ELF local labels start with '$'.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -2670,7 +2671,7 @@ struct mips_elf_find_line
   struct ecoff_find_line i;
 };
 
-static boolean
+static bfd_boolean
 elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 			       functionname_ptr, line_ptr)
      bfd *abfd;
@@ -2687,7 +2688,7 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 				     filename_ptr, functionname_ptr,
 				     line_ptr, 0,
 				     &elf_tdata (abfd)->dwarf2_find_line_info))
-    return true;
+    return TRUE;
 
   msec = bfd_get_section_by_name (abfd, ".mdebug");
   if (msec != NULL)
@@ -2717,13 +2718,13 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 	  if (fi == NULL)
 	    {
 	      msec->flags = origflags;
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (!elf64_alpha_read_ecoff_info (abfd, msec, &fi->d))
 	    {
 	      msec->flags = origflags;
-	      return false;
+	      return FALSE;
 	    }
 
 	  /* Swap in the FDR information.  */
@@ -2732,7 +2733,7 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 	  if (fi->d.fdr == NULL)
 	    {
 	      msec->flags = origflags;
-	      return false;
+	      return FALSE;
 	    }
 	  external_fdr_size = swap->external_fdr_size;
 	  fdr_ptr = fi->d.fdr;
@@ -2757,7 +2758,7 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 				  line_ptr))
 	{
 	  msec->flags = origflags;
-	  return true;
+	  return TRUE;
 	}
 
       msec->flags = origflags;
@@ -2778,39 +2779,39 @@ struct extsym_info
   struct bfd_link_info *info;
   struct ecoff_debug_info *debug;
   const struct ecoff_debug_swap *swap;
-  boolean failed;
+  bfd_boolean failed;
 };
 
-static boolean
+static bfd_boolean
 elf64_alpha_output_extsym (h, data)
      struct alpha_elf_link_hash_entry *h;
      PTR data;
 {
   struct extsym_info *einfo = (struct extsym_info *) data;
-  boolean strip;
+  bfd_boolean strip;
   asection *sec, *output_section;
 
   if (h->root.root.type == bfd_link_hash_warning)
     h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link;
 
   if (h->root.indx == -2)
-    strip = false;
+    strip = FALSE;
   else if (((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
 	    || (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0)
 	   && (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
 	   && (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
-    strip = true;
+    strip = TRUE;
   else if (einfo->info->strip == strip_all
 	   || (einfo->info->strip == strip_some
 	       && bfd_hash_lookup (einfo->info->keep_hash,
 				   h->root.root.root.string,
-				   false, false) == NULL))
-    strip = true;
+				   FALSE, FALSE) == NULL))
+    strip = TRUE;
   else
-    strip = false;
+    strip = FALSE;
 
   if (strip)
-    return true;
+    return TRUE;
 
   if (h->esym.ifd == -2)
     {
@@ -2908,11 +2909,11 @@ elf64_alpha_output_extsym (h, data)
 				      h->root.root.root.string,
 				      &h->esym))
     {
-      einfo->failed = true;
-      return false;
+      einfo->failed = TRUE;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Search for and possibly create a got entry.  */
@@ -2996,7 +2997,7 @@ get_got_entry (abfd, h, r_type, r_symndx, r_addend)
 
 /* Handle dynamic relocations when doing an Alpha ELF link.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3009,11 +3010,11 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
   Elf_Internal_Shdr *symtab_hdr;
   struct alpha_elf_link_hash_entry **sym_hashes;
   const Elf_Internal_Rela *rel, *relend;
-  boolean got_created;
+  bfd_boolean got_created;
   bfd_size_type amt;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table(info)->dynobj;
   if (dynobj == NULL)
@@ -3023,7 +3024,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
   rel_sec_name = NULL;
   symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
   sym_hashes = alpha_elf_sym_hashes(abfd);
-  got_created = false;
+  got_created = FALSE;
 
   relend = relocs + sec->reloc_count;
   for (rel = relocs; rel < relend; ++rel)
@@ -3037,7 +3038,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
       unsigned long r_symndx, r_type;
       struct alpha_elf_link_hash_entry *h;
       unsigned int gotent_flags;
-      boolean maybe_dynamic;
+      bfd_boolean maybe_dynamic;
       unsigned int need;
       bfd_vma addend;
 
@@ -3059,12 +3060,12 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
          locally or externally defined, as not all of the input files
          have yet been processed.  Do something with what we know, as
          this may help reduce memory usage and processing time later.  */
-      maybe_dynamic = false;
+      maybe_dynamic = FALSE;
       if (h && ((info->shared
 		 && (!info->symbolic || info->allow_shlib_undefined))
 		|| ! (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
 		|| h->root.root.type == bfd_link_hash_defweak))
-        maybe_dynamic = true;
+        maybe_dynamic = TRUE;
 
       need = 0;
       gotent_flags = 0;
@@ -3130,7 +3131,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 	  if (!got_created)
 	    {
 	      if (!elf64_alpha_create_got_section (abfd, info))
-		return false;
+		return FALSE;
 
 	      /* Make sure the object's gotobj is set to itself so
 		 that we default to every object with its own .got.
@@ -3148,7 +3149,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 
 	  gotent = get_got_entry (abfd, h, r_type, r_symndx, addend);
 	  if (!gotent)
-	    return false;
+	    return FALSE;
 
 	  if (gotent_flags)
 	    {
@@ -3176,7 +3177,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 			      (abfd, elf_elfheader(abfd)->e_shstrndx,
 			       elf_section_data(sec)->rel_hdr.sh_name));
 	      if (rel_sec_name == NULL)
-		return false;
+		return FALSE;
 
 	      BFD_ASSERT (strncmp (rel_sec_name, ".rela", 5) == 0
 			  && strcmp (bfd_get_section_name (abfd, sec),
@@ -3202,7 +3203,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 		  if (sreloc == NULL
 		      || !bfd_set_section_flags (dynobj, sreloc, flags)
 		      || !bfd_set_section_alignment (dynobj, sreloc, 3))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -3225,7 +3226,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 		  amt = sizeof (struct alpha_elf_reloc_entry);
 		  rent = (struct alpha_elf_reloc_entry *) bfd_alloc (abfd, amt);
 		  if (!rent)
-		    return false;
+		    return FALSE;
 
 		  rent->srel = sreloc;
 		  rent->rtype = r_type;
@@ -3251,7 +3252,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -3260,7 +3261,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -3291,7 +3292,7 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
 
       s = bfd_get_section_by_name(dynobj, ".plt");
       if (!s && !elf64_alpha_create_dynamic_sections (dynobj, info))
-	return false;
+	return FALSE;
 
       /* The first bit of the .plt is reserved.  */
       if (s->_raw_size == 0)
@@ -3316,7 +3317,7 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf64_External_Rela);
 
-      return true;
+      return TRUE;
     }
   else
     h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
@@ -3330,7 +3331,7 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -3338,14 +3339,14 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
      symbols even in regular objects, does not need the hackery of a
      .dynbss section and COPY dynamic relocations.  */
 
-  return true;
+  return TRUE;
 }
 
 /* Symbol versioning can create new symbols, and make our old symbols
    indirect to the new ones.  Consolidate the got and reloc information
    in these situations.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_merge_ind_symbols (hi, dummy)
      struct alpha_elf_link_hash_entry *hi;
      PTR dummy ATTRIBUTE_UNUSED;
@@ -3353,7 +3354,7 @@ elf64_alpha_merge_ind_symbols (hi, dummy)
   struct alpha_elf_link_hash_entry *hs;
 
   if (hi->root.root.type != bfd_link_hash_indirect)
-    return true;
+    return TRUE;
   hs = hi;
   do {
     hs = (struct alpha_elf_link_hash_entry *)hs->root.root.u.i.link;
@@ -3416,12 +3417,12 @@ elf64_alpha_merge_ind_symbols (hi, dummy)
     }
   hi->reloc_entries = NULL;
 
-  return true;
+  return TRUE;
 }
 
 /* Is it possible to merge two object file's .got tables?  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_can_merge_gots (a, b)
      bfd *a, *b;
 {
@@ -3430,11 +3431,11 @@ elf64_alpha_can_merge_gots (a, b)
 
   /* Trivial quick fallout test.  */
   if (total + alpha_elf_tdata (b)->total_got_size <= MAX_GOT_SIZE)
-    return true;
+    return TRUE;
 
   /* By their nature, local .got entries cannot be merged.  */
   if ((total += alpha_elf_tdata (b)->local_got_size) > MAX_GOT_SIZE)
-    return false;
+    return FALSE;
 
   /* Failing the common trivial comparison, we must effectively
      perform the merge.  Not actually performing the merge means that
@@ -3471,13 +3472,13 @@ elf64_alpha_can_merge_gots (a, b)
 
 	      total += alpha_got_entry_size (be->reloc_type);
 	      if (total > MAX_GOT_SIZE)
-	        return false;
+	        return FALSE;
 	    global_found:;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Actually merge two .got tables.  */
@@ -3577,7 +3578,7 @@ elf64_alpha_merge_gots (a, b)
 
 /* Calculate the offsets for the got entries.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_calc_got_offsets_for_symbol (h, arg)
      struct alpha_elf_link_hash_entry *h;
      PTR arg ATTRIBUTE_UNUSED;
@@ -3597,7 +3598,7 @@ elf64_alpha_calc_got_offsets_for_symbol (h, arg)
 	*plge += alpha_got_entry_size (gotent->reloc_type);
       }
 
-  return true;
+  return TRUE;
 }
 
 static void
@@ -3647,7 +3648,7 @@ elf64_alpha_calc_got_offsets (info)
 
 /* Constructs the gots.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_size_got_sections (info)
      struct bfd_link_info *info;
 {
@@ -3676,7 +3677,7 @@ elf64_alpha_size_got_sections (info)
 	        (_("%s: .got subsegment exceeds 64K (size %d)"),
 	         bfd_archive_filename (i),
 	         alpha_elf_tdata (this_got)->total_got_size);
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (got_list == NULL)
@@ -3688,7 +3689,7 @@ elf64_alpha_size_got_sections (info)
 
       /* Strange degenerate case of no got references.  */
       if (got_list == NULL)
-	return true;
+	return TRUE;
 
       alpha_elf_hash_table (info)->got_list = got_list;
 
@@ -3719,13 +3720,13 @@ elf64_alpha_size_got_sections (info)
   if (1 || something_changed)
     elf64_alpha_calc_got_offsets (info);
 
-  return true;
+  return TRUE;
 }
 
 /* Called from relax_section to rebuild the PLT in light of
    potential changes in the function's status.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_size_plt_section (info)
      struct bfd_link_info *info;
 {
@@ -3736,7 +3737,7 @@ elf64_alpha_size_plt_section (info)
   dynobj = elf_hash_table(info)->dynobj;
   splt = bfd_get_section_by_name(dynobj, ".plt");
   if (splt == NULL)
-    return true;
+    return TRUE;
 
   splt->_raw_size = 0;
 
@@ -3754,10 +3755,10 @@ elf64_alpha_size_plt_section (info)
   spltrel->_raw_size = entries * sizeof (Elf64_External_Rela);
   spltrel->_cooked_size = spltrel->_raw_size;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_size_plt_section_1 (h, data)
      struct alpha_elf_link_hash_entry *h;
      PTR data;
@@ -3767,7 +3768,7 @@ elf64_alpha_size_plt_section_1 (h, data)
 
   /* If we didn't need an entry before, we still don't.  */
   if (!(h->root.elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT))
-    return true;
+    return TRUE;
 
   /* There must still be a LITERAL got entry for the function.  */
   for (gotent = h->got_entries; gotent ; gotent = gotent->next)
@@ -3790,10 +3791,10 @@ elf64_alpha_size_plt_section_1 (h, data)
       h->root.plt.offset = -1;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_always_size_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -3801,7 +3802,7 @@ elf64_alpha_always_size_sections (output_bfd, info)
   bfd *i;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   /* First, take care of the indirect symbols created by versioning.  */
   alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
@@ -3809,7 +3810,7 @@ elf64_alpha_always_size_sections (output_bfd, info)
 				NULL);
 
   if (!elf64_alpha_size_got_sections (info))
-    return false;
+    return FALSE;
 
   /* Allocate space for all of the .got subsections.  */
   i = alpha_elf_hash_table (info)->got_list;
@@ -3820,11 +3821,11 @@ elf64_alpha_always_size_sections (output_bfd, info)
 	{
 	  s->contents = (bfd_byte *) bfd_zalloc (i, s->_raw_size);
 	  if (s->contents == NULL)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The number of dynamic relocations required by a static relocation.  */
@@ -3863,12 +3864,12 @@ alpha_dynamic_entries_for_reloc (r_type, dynamic, shared)
 
 /* Work out the sizes of the dynamic relocation entries.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_calc_dynrel_sizes (h, info)
      struct alpha_elf_link_hash_entry *h;
      struct bfd_link_info *info;
 {
-  boolean dynamic;
+  bfd_boolean dynamic;
   struct alpha_elf_reloc_entry *relent;
   unsigned long entries;
 
@@ -3911,12 +3912,12 @@ elf64_alpha_calc_dynrel_sizes (h, info)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic relocation sections.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_size_rela_got_section (info)
      struct bfd_link_info *info;
 {
@@ -3956,7 +3957,7 @@ elf64_alpha_size_rela_got_section (info)
   if (!srel)
     {
       BFD_ASSERT (entries == 0);
-      return true;
+      return TRUE;
     }
   srel->_raw_size = sizeof (Elf64_External_Rela) * entries;
 
@@ -3966,18 +3967,18 @@ elf64_alpha_size_rela_got_section (info)
 
   srel->_cooked_size = srel->_raw_size;
 
-  return true;
+  return TRUE;
 }
 
 /* Subroutine of elf64_alpha_size_rela_got_section for doing the
    global symbols.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_size_rela_got_1 (h, info)
      struct alpha_elf_link_hash_entry *h;
      struct bfd_link_info *info;
 {
-  boolean dynamic;
+  bfd_boolean dynamic;
   struct alpha_elf_got_entry *gotent;
   unsigned long entries;
 
@@ -4009,19 +4010,19 @@ elf64_alpha_size_rela_got_1 (h, info)
       srel->_raw_size += sizeof (Elf64_External_Rela) * entries;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean relplt;
+  bfd_boolean relplt;
 
   dynobj = elf_hash_table(info)->dynobj;
   BFD_ASSERT(dynobj != NULL);
@@ -4051,11 +4052,11 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  relplt = false;
+  relplt = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if (!(s->flags & SEC_LINKER_CREATED))
 	continue;
@@ -4072,7 +4073,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
 	 it is that function which decides whether anything needs to
 	 go into these sections.  */
 
-      strip = false;
+      strip = FALSE;
 
       if (strncmp (name, ".rela", 5) == 0)
 	{
@@ -4081,7 +4082,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
 	  if (!strip)
 	    {
 	      if (strcmp(name, ".rela.plt") == 0)
-		relplt = true;
+		relplt = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -4101,7 +4102,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
 	  /* Allocate memory for the section contents.  */
 	  s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
 	  if (s->contents == NULL && s->_raw_size != 0)
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -4118,7 +4119,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relplt)
@@ -4127,23 +4128,23 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (!add_dynamic_entry (DT_RELA, 0)
 	  || !add_dynamic_entry (DT_RELASZ, 0)
 	  || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
-	return false;
+	return FALSE;
 
       if (info->flags & DF_TEXTREL)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate an Alpha ELF section for a relocatable link.
@@ -4152,7 +4153,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
    symbol, in which case we have to adjust according to where the section
    symbol winds up in the output section.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section,
 			        contents, relocs, local_syms, local_sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -4167,7 +4168,7 @@ elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section,
   unsigned long symtab_hdr_sh_info;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
-  boolean ret_val = true;
+  bfd_boolean ret_val = TRUE;
 
   symtab_hdr_sh_info = elf_tdata (input_bfd)->symtab_hdr.sh_info;
 
@@ -4186,7 +4187,7 @@ elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section,
 	    (_("%s: unknown relocation type %d"),
 	     bfd_archive_filename (input_bfd), (int)r_type);
 	  bfd_set_error (bfd_error_bad_value);
-	  ret_val = false;
+	  ret_val = FALSE;
 	  continue;
 	}
 
@@ -4213,7 +4214,7 @@ elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section,
 
 /* Relocate an Alpha ELF section.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 			      contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -4233,7 +4234,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
   bfd *dynobj, *gotobj;
   bfd_vma gp, tp_base, dtp_base;
   struct alpha_elf_got_entry **local_got_entries;
-  boolean ret_val;
+  bfd_boolean ret_val;
   const char *section_name;
 
   /* Handle relocatable links with a smaller loop.  */
@@ -4244,7 +4245,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 
   /* This is a final link.  */
 
-  ret_val = true;
+  ret_val = TRUE;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
 
@@ -4303,8 +4304,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
       asection *sec = NULL;
       bfd_vma value;
       bfd_vma addend;
-      boolean dynamic_symbol_p;
-      boolean undef_weak_ref = false;
+      bfd_boolean dynamic_symbol_p;
+      bfd_boolean undef_weak_ref = FALSE;
       unsigned long r_type;
 
       r_type = ELF64_R_TYPE(rel->r_info);
@@ -4314,7 +4315,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 	    (_("%s: unknown relocation type %d"),
 	     bfd_archive_filename (input_bfd), (int)r_type);
 	  bfd_set_error (bfd_error_bad_value);
-	  ret_val = false;
+	  ret_val = FALSE;
 	  continue;
 	}
 
@@ -4364,7 +4365,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		}
 	    }
 
-	  dynamic_symbol_p = false;
+	  dynamic_symbol_p = FALSE;
 	}
       else
 	{
@@ -4394,7 +4395,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 			      + sec->output_offset);
 	    }
 	  else if (h->root.root.type == bfd_link_hash_undefweak)
-	    undef_weak_ref = true;
+	    undef_weak_ref = TRUE;
 	  else if (info->shared
 		   && (!info->symbolic || info->allow_shlib_undefined)
 		   && !info->no_undefined
@@ -4407,8 +4408,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		     input_section, rel->r_offset,
 		     (!info->shared || info->no_undefined
 		      || ELF_ST_VISIBILITY (h->root.other)))))
-		return false;
-	      ret_val = false;
+		return FALSE;
+	      ret_val = FALSE;
 	      continue;
 	    }
 
@@ -4498,7 +4499,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
               (*_bfd_error_handler)
                 (_("%s: gp-relative relocation against dynamic symbol %s"),
                  bfd_archive_filename (input_bfd), h->root.root.root.string);
-              ret_val = false;
+              ret_val = FALSE;
             }
 	  BFD_ASSERT(gp != 0);
 	  value -= gp;
@@ -4510,7 +4511,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
               (*_bfd_error_handler)
                 (_("%s: gp-relative relocation against dynamic symbol %s"),
                  bfd_archive_filename (input_bfd), h->root.root.root.string);
-              ret_val = false;
+              ret_val = FALSE;
             }
 	  BFD_ASSERT(gp != 0);
 	  value -= gp;
@@ -4536,7 +4537,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
               (*_bfd_error_handler)
                 (_("%s: pc-relative relocation against dynamic symbol %s"),
                  bfd_archive_filename (input_bfd), h->root.root.root.string);
-              ret_val = false;
+              ret_val = FALSE;
             }
 	  /* The regular PC-relative stuff measures from the start of
 	     the instruction rather than the end.  */
@@ -4564,7 +4565,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		(*_bfd_error_handler)
 		  (_("%s: change in gp: BRSGP %s"),
 		   bfd_archive_filename (input_bfd), h->root.root.root.string);
-		ret_val = false;
+		ret_val = FALSE;
 	      }
 
 	    /* The symbol should be marked either NOPV or STD_GPLOAD.  */
@@ -4594,7 +4595,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		(*_bfd_error_handler)
 		  (_("%s: !samegp reloc against symbol without .prologue: %s"),
 		   bfd_archive_filename (input_bfd), name);
-		ret_val = false;
+		ret_val = FALSE;
 		break;
 	      }
 
@@ -4641,7 +4642,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		      (_("%s: unhandled dynamic relocation against %s"),
 		       bfd_archive_filename (input_bfd),
 		       h->root.root.root.string);
-		    ret_val = false;
+		    ret_val = FALSE;
 		  }
 		outrel.r_info = ELF64_R_INFO (0, R_ALPHA_RELATIVE);
 		outrel.r_addend = value;
@@ -4676,7 +4677,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
               (*_bfd_error_handler)
                 (_("%s: pc-relative relocation against dynamic symbol %s"),
                  bfd_archive_filename (input_bfd), h->root.root.root.string);
-              ret_val = false;
+              ret_val = FALSE;
             }
 
 	  /* ??? .eh_frame references to discarded sections will be smashed
@@ -4752,7 +4753,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
               (*_bfd_error_handler)
                 (_("%s: dtp-relative relocation against dynamic symbol %s"),
                  bfd_archive_filename (input_bfd), h->root.root.root.string);
-              ret_val = false;
+              ret_val = FALSE;
             }
 	  BFD_ASSERT(tls_segment != NULL);
 	  value -= dtp_base;
@@ -4768,14 +4769,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (*_bfd_error_handler)
 		(_("%s: TLS local exec code cannot be linked into shared objects"),
 		bfd_archive_filename (input_bfd));
-              ret_val = false;
+              ret_val = FALSE;
 	    }
 	  else if (dynamic_symbol_p)
             {
               (*_bfd_error_handler)
                 (_("%s: tp-relative relocation against dynamic symbol %s"),
                  bfd_archive_filename (input_bfd), h->root.root.root.string);
-              ret_val = false;
+              ret_val = FALSE;
             }
 	  BFD_ASSERT(tls_segment != NULL);
 	  value -= tp_base;
@@ -4843,14 +4844,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 		name = (bfd_elf_string_from_elf_section
 			(input_bfd, symtab_hdr->sh_link, sym->st_name));
 		if (name == NULL)
-		  return false;
+		  return FALSE;
 		if (*name == '\0')
 		  name = bfd_section_name (input_bfd, sec);
 	      }
 	    if (! ((*info->callbacks->reloc_overflow)
 		   (info, name, howto->name, (bfd_vma) 0,
 		    input_bfd, input_section, rel->r_offset)))
-	      ret_val = false;
+	      ret_val = FALSE;
 	  }
 	  break;
 
@@ -4866,7 +4867,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -5049,12 +5050,12 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -5141,14 +5142,14 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We need to use a special link routine to handle the .mdebug section.
    We need to merge all instances of these sections together, not write
    them all out sequentially.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -5205,7 +5206,7 @@ elf64_alpha_final_link (abfd, info)
 
 	  mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);
 	  if (mdebug_handle == (PTR) NULL)
-	    return false;
+	    return FALSE;
 
 	  if (1)
 	    {
@@ -5244,7 +5245,7 @@ elf64_alpha_final_link (abfd, info)
 
 		  if (! bfd_ecoff_debug_one_external (abfd, &debug, swap,
 						      name[i], &esym))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -5289,12 +5290,12 @@ elf64_alpha_final_link (abfd, info)
 		 ecoff_debug_info structure, so we do that now.  */
 	      if (!elf64_alpha_read_ecoff_info (input_bfd, input_section,
 						&input_debug))
-		return false;
+		return FALSE;
 
 	      if (! (bfd_ecoff_debug_accumulate
 		     (mdebug_handle, abfd, &debug, swap, input_bfd,
 		      &input_debug, input_swap, info)))
-		return false;
+		return FALSE;
 
 	      /* Loop through the external symbols.  For each one with
 		 interesting information, try to find the symbol in
@@ -5320,7 +5321,7 @@ elf64_alpha_final_link (abfd, info)
 
 		  name = input_debug.ssext + ext.asym.iss;
 		  h = alpha_elf_link_hash_lookup (alpha_elf_hash_table (info),
-						  name, false, false, true);
+						  name, FALSE, FALSE, TRUE);
 		  if (h == NULL || h->esym.ifd != -2)
 		    continue;
 
@@ -5357,12 +5358,12 @@ elf64_alpha_final_link (abfd, info)
 	  einfo.info = info;
 	  einfo.debug = &debug;
 	  einfo.swap = swap;
-	  einfo.failed = false;
+	  einfo.failed = FALSE;
 	  elf_link_hash_traverse (elf_hash_table (info),
 				  elf64_alpha_output_extsym,
 				  (PTR) &einfo);
 	  if (einfo.failed)
-	    return false;
+	    return FALSE;
 
 	  /* Set the size of the .mdebug section.  */
 	  o->_raw_size = bfd_ecoff_debug_size (abfd, &debug, swap);
@@ -5377,7 +5378,7 @@ elf64_alpha_final_link (abfd, info)
 
   /* Invoke the regular ELF backend linker to do all the work.  */
   if (! bfd_elf64_bfd_final_link (abfd, info))
-    return false;
+    return FALSE;
 
   /* Now write out the computed sections.  */
 
@@ -5399,7 +5400,7 @@ elf64_alpha_final_link (abfd, info)
 					sgot->contents,
 					(file_ptr) sgot->output_offset,
 					sgot->_raw_size))
-	  return false;
+	  return FALSE;
       }
   }
 
@@ -5409,12 +5410,12 @@ elf64_alpha_final_link (abfd, info)
       if (! bfd_ecoff_write_accumulated_debug (mdebug_handle, abfd, &debug,
 					       swap, info,
 					       mdebug_sec->filepos))
-	return false;
+	return FALSE;
 
       bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info);
     }
 
-  return true;
+  return TRUE;
 }
 
 static enum elf_reloc_type_class
diff --git a/bfd/elf64-gen.c b/bfd/elf64-gen.c
index f0f897edb19..590456ccbf6 100644
--- a/bfd/elf64-gen.c
+++ b/bfd/elf64-gen.c
@@ -1,5 +1,5 @@
 /* Generic support for 64-bit ELF
-   Copyright 1993, 1995, 1998, 1999, 2001 Free Software Foundation, Inc.
+   Copyright 1993, 1995, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -30,21 +30,21 @@ static reloc_howto_type dummy =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "UNKNOWN",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 static void elf_generic_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void elf_generic_info_to_howto_rel
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf64_generic_link_add_symbols
+static bfd_boolean elf64_generic_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
 
 static void
@@ -65,7 +65,7 @@ elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
   bfd_reloc->howto = &dummy;
 }
 
-static boolean
+static bfd_boolean
 elf64_generic_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -84,7 +84,7 @@ elf64_generic_link_add_symbols (abfd, info)
 			       ehdrp->e_machine);
 
 	bfd_set_error (bfd_error_wrong_format);
-	return false;
+	return FALSE;
       }
 
   return bfd_elf64_bfd_link_add_symbols (abfd, info);
diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c
index 2a4ff10688e..98f46dc8fc0 100644
--- a/bfd/elf64-hppa.c
+++ b/bfd/elf64-hppa.c
@@ -156,7 +156,7 @@ struct elf64_hppa_link_hash_table
 typedef struct bfd_hash_entry *(*new_hash_entry_func)
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 
-static boolean elf64_hppa_dyn_hash_table_init
+static bfd_boolean elf64_hppa_dyn_hash_table_init
   PARAMS ((struct elf64_hppa_dyn_hash_table *ht, bfd *abfd,
 	   new_hash_entry_func new));
 static struct bfd_hash_entry *elf64_hppa_new_dyn_hash_entry
@@ -166,10 +166,10 @@ static struct bfd_link_hash_table *elf64_hppa_hash_table_create
   PARAMS ((bfd *abfd));
 static struct elf64_hppa_dyn_hash_entry *elf64_hppa_dyn_hash_lookup
   PARAMS ((struct elf64_hppa_dyn_hash_table *table, const char *string,
-	   boolean create, boolean copy));
+	   bfd_boolean create, bfd_boolean copy));
 static void elf64_hppa_dyn_hash_traverse
   PARAMS ((struct elf64_hppa_dyn_hash_table *table,
-	   boolean (*func) (struct elf64_hppa_dyn_hash_entry *, PTR),
+	   bfd_boolean (*func) (struct elf64_hppa_dyn_hash_entry *, PTR),
 	   PTR info));
 
 static const char *get_dyn_name
@@ -180,102 +180,104 @@ static const char *get_dyn_name
    hash tables and shared functions.  */
 #include "elf-hppa.h"
 
-static boolean elf64_hppa_object_p
+static bfd_boolean elf64_hppa_object_p
   PARAMS ((bfd *));
 
-static boolean elf64_hppa_section_from_shdr
+static bfd_boolean elf64_hppa_section_from_shdr
   PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
 
 static void elf64_hppa_post_process_headers
   PARAMS ((bfd *, struct bfd_link_info *));
 
-static boolean elf64_hppa_create_dynamic_sections
+static bfd_boolean elf64_hppa_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
-static boolean elf64_hppa_adjust_dynamic_symbol
+static bfd_boolean elf64_hppa_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 
-static boolean elf64_hppa_mark_milli_and_exported_functions
+static bfd_boolean elf64_hppa_mark_milli_and_exported_functions
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean elf64_hppa_size_dynamic_sections
+static bfd_boolean elf64_hppa_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
-static boolean elf64_hppa_link_output_symbol_hook
-PARAMS ((bfd *abfd, struct bfd_link_info *, const char *,
-	 Elf_Internal_Sym *, asection *input_sec));
+static bfd_boolean elf64_hppa_link_output_symbol_hook
+  PARAMS ((bfd *abfd, struct bfd_link_info *, const char *,
+	   Elf_Internal_Sym *, asection *input_sec));
 
-static boolean elf64_hppa_finish_dynamic_symbol
+static bfd_boolean elf64_hppa_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 
-static int elf64_hppa_additional_program_headers PARAMS ((bfd *));
+static int elf64_hppa_additional_program_headers
+  PARAMS ((bfd *));
 
-static boolean elf64_hppa_modify_segment_map PARAMS ((bfd *));
+static bfd_boolean elf64_hppa_modify_segment_map
+  PARAMS ((bfd *));
 
 static enum elf_reloc_type_class elf64_hppa_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
 
-static boolean elf64_hppa_finish_dynamic_sections
+static bfd_boolean elf64_hppa_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
-static boolean elf64_hppa_check_relocs
+static bfd_boolean elf64_hppa_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *,
 	   asection *, const Elf_Internal_Rela *));
 
-static boolean elf64_hppa_dynamic_symbol_p
+static bfd_boolean elf64_hppa_dynamic_symbol_p
   PARAMS ((struct elf_link_hash_entry *, struct bfd_link_info *));
 
-static boolean elf64_hppa_mark_exported_functions
+static bfd_boolean elf64_hppa_mark_exported_functions
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean elf64_hppa_finalize_opd
+static bfd_boolean elf64_hppa_finalize_opd
   PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
 
-static boolean elf64_hppa_finalize_dlt
+static bfd_boolean elf64_hppa_finalize_dlt
   PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
 
-static boolean allocate_global_data_dlt
+static bfd_boolean allocate_global_data_dlt
   PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
 
-static boolean allocate_global_data_plt
+static bfd_boolean allocate_global_data_plt
   PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
 
-static boolean allocate_global_data_stub
+static bfd_boolean allocate_global_data_stub
   PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
 
-static boolean allocate_global_data_opd
+static bfd_boolean allocate_global_data_opd
   PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
 
-static boolean get_reloc_section
+static bfd_boolean get_reloc_section
   PARAMS ((bfd *, struct elf64_hppa_link_hash_table *, asection *));
 
-static boolean count_dyn_reloc
+static bfd_boolean count_dyn_reloc
   PARAMS ((bfd *, struct elf64_hppa_dyn_hash_entry *,
 	   int, asection *, int, bfd_vma, bfd_vma));
 
-static boolean allocate_dynrel_entries
+static bfd_boolean allocate_dynrel_entries
   PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
 
-static boolean elf64_hppa_finalize_dynreloc
+static bfd_boolean elf64_hppa_finalize_dynreloc
   PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
 
-static boolean get_opd
+static bfd_boolean get_opd
   PARAMS ((bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *));
 
-static boolean get_plt
+static bfd_boolean get_plt
   PARAMS ((bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *));
 
-static boolean get_dlt
+static bfd_boolean get_dlt
   PARAMS ((bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *));
 
-static boolean get_stub
+static bfd_boolean get_stub
   PARAMS ((bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *));
 
 static int elf64_hppa_elf_get_symbol_type
   PARAMS ((Elf_Internal_Sym *, int));
 
-static boolean
+static bfd_boolean
 elf64_hppa_dyn_hash_table_init (ht, abfd, new)
      struct elf64_hppa_dyn_hash_table *ht;
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -345,7 +347,7 @@ static struct elf64_hppa_dyn_hash_entry *
 elf64_hppa_dyn_hash_lookup(table, string, create, copy)
      struct elf64_hppa_dyn_hash_table *table;
      const char *string;
-     boolean create, copy;
+     bfd_boolean create, copy;
 {
   return ((struct elf64_hppa_dyn_hash_entry *)
 	  bfd_hash_lookup (&table->root, string, create, copy));
@@ -356,19 +358,19 @@ elf64_hppa_dyn_hash_lookup(table, string, create, copy)
 static void
 elf64_hppa_dyn_hash_traverse (table, func, info)
      struct elf64_hppa_dyn_hash_table *table;
-     boolean (*func) PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
+     bfd_boolean (*func) PARAMS ((struct elf64_hppa_dyn_hash_entry *, PTR));
      PTR info;
 {
   (bfd_hash_traverse
    (&table->root,
-    (boolean (*) PARAMS ((struct bfd_hash_entry *, PTR))) func,
+    (bfd_boolean (*) PARAMS ((struct bfd_hash_entry *, PTR))) func,
     info));
 }
 
 /* Return nonzero if ABFD represents a PA2.0 ELF64 file.
 
    Additionally we set the default architecture and machine.  */
-static boolean
+static bfd_boolean
 elf64_hppa_object_p (abfd)
      bfd *abfd;
 {
@@ -379,12 +381,12 @@ elf64_hppa_object_p (abfd)
   if (strcmp (bfd_get_target (abfd), "elf64-hppa-linux") == 0)
     {
       if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_LINUX)
-	return false;
+	return FALSE;
     }
   else
     {
       if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_HPUX)
-	return false;
+	return FALSE;
     }
 
   flags = i_ehdrp->e_flags;
@@ -400,12 +402,12 @@ elf64_hppa_object_p (abfd)
       return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 25);
     }
   /* Don't be fussy.  */
-  return true;
+  return TRUE;
 }
 
 /* Given section type (hdr->sh_type), return a boolean indicating
    whether or not the section is an elf64-hppa specific section.  */
-static boolean
+static bfd_boolean
 elf64_hppa_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -417,23 +419,23 @@ elf64_hppa_section_from_shdr (abfd, hdr, name)
     {
     case SHT_PARISC_EXT:
       if (strcmp (name, ".PARISC.archext") != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_PARISC_UNWIND:
       if (strcmp (name, ".PARISC.unwind") != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_PARISC_DOC:
     case SHT_PARISC_ANNOT:
     default:
-      return false;
+      return FALSE;
     }
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
   newsect = hdr->bfd_section;
 
-  return true;
+  return TRUE;
 }
 
 /* Construct a string for use in the elf64_hppa_dyn_hash_table.  The
@@ -497,7 +499,7 @@ get_dyn_name (sec, h, rel, pbuf, plen)
 /* SEC is a section containing relocs for an input BFD when linking; return
    a suitable section for holding relocs in the output BFD for a link.  */
 
-static boolean
+static bfd_boolean
 get_reloc_section (abfd, hppa_info, sec)
      bfd *abfd;
      struct elf64_hppa_link_hash_table *hppa_info;
@@ -511,7 +513,7 @@ get_reloc_section (abfd, hppa_info, sec)
 	       (abfd, elf_elfheader(abfd)->e_shstrndx,
 		elf_section_data(sec)->rel_hdr.sh_name));
   if (srel_name == NULL)
-    return false;
+    return FALSE;
 
   BFD_ASSERT ((strncmp (srel_name, ".rela", 5) == 0
 	       && strcmp (bfd_get_section_name (abfd, sec),
@@ -537,11 +539,11 @@ get_reloc_section (abfd, hppa_info, sec)
 				      | SEC_LINKER_CREATED
 				      | SEC_READONLY))
 	  || !bfd_set_section_alignment (dynobj, srel, 3))
-	return false;
+	return FALSE;
     }
 
   hppa_info->other_rel_sec = srel;
-  return true;
+  return TRUE;
 }
 
 /* Add a new entry to the list of dynamic relocations against DYN_H.
@@ -550,7 +552,7 @@ get_reloc_section (abfd, hppa_info, sec)
    particular symbol so that we can create FPTR relocations in the
    output file.  */
 
-static boolean
+static bfd_boolean
 count_dyn_reloc (abfd, dyn_h, type, sec, sec_symndx, offset, addend)
      bfd *abfd;
      struct elf64_hppa_dyn_hash_entry *dyn_h;
@@ -565,7 +567,7 @@ count_dyn_reloc (abfd, dyn_h, type, sec, sec_symndx, offset, addend)
   rent = (struct elf64_hppa_dyn_reloc_entry *)
   bfd_alloc (abfd, (bfd_size_type) sizeof (*rent));
   if (!rent)
-    return false;
+    return FALSE;
 
   rent->next = dyn_h->reloc_entries;
   rent->type = type;
@@ -575,13 +577,13 @@ count_dyn_reloc (abfd, dyn_h, type, sec, sec_symndx, offset, addend)
   rent->addend = addend;
   dyn_h->reloc_entries = rent;
 
-  return true;
+  return TRUE;
 }
 
 /* Scan the RELOCS and record the type of dynamic entries that each
    referenced symbol needs.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -598,14 +600,14 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
   int sec_symndx;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   /* If this is the first dynamic object found in the link, create
      the special sections required for dynamic linking.  */
   if (! elf_hash_table (info)->dynamic_sections_created)
     {
       if (! bfd_elf64_link_create_dynamic_sections (abfd, info))
-	return false;
+	return FALSE;
     }
 
   hppa_info = elf64_hppa_hash_table (info);
@@ -639,7 +641,7 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
 					       symtab_hdr->sh_info, 0,
 					       NULL, NULL, NULL);
 	  if (local_syms == NULL)
-	    return false;
+	    return FALSE;
 	}
 
       /* Record the highest section index referenced by the local symbols.  */
@@ -694,7 +696,7 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
       /* If we did not find a section symbol for this section, then
 	 something went terribly wrong above.  */
       if (sec_symndx == -1)
-	return false;
+	return FALSE;
 
       sec_symndx = hppa_info->section_syms[sec_symndx];
     }
@@ -721,7 +723,7 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
       struct elf64_hppa_dyn_hash_entry *dyn_h;
       int need_entry;
       const char *addr_name;
-      boolean maybe_dynamic;
+      bfd_boolean maybe_dynamic;
       int dynrel_type = R_PARISC_NONE;
       static reloc_howto_type *howto;
 
@@ -742,12 +744,12 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
 	 locally or externally defined, as not all of the input files
 	 have yet been processed.  Do something with what we know, as
 	 this may help reduce memory usage and processing time later.  */
-      maybe_dynamic = false;
+      maybe_dynamic = FALSE;
       if (h && ((info->shared
 		    && (!info->symbolic || info->allow_shlib_undefined) )
 		|| ! (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
 		|| h->root.type == bfd_link_hash_defweak))
-	maybe_dynamic = true;
+	maybe_dynamic = TRUE;
 
       howto = elf_hppa_howto_table + ELF64_R_TYPE (rel->r_info);
       need_entry = 0;
@@ -856,7 +858,7 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
 
       /* Collect the canonical entry data for this address.  */
       dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-					  addr_name, true, true);
+					  addr_name, TRUE, TRUE);
       BFD_ASSERT (dyn_h);
 
       /* Stash away enough information to be able to find this symbol
@@ -927,18 +929,18 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
 	  if (info->shared && dynrel_type == R_PARISC_FPTR64
 	      && ! (_bfd_elf64_link_record_local_dynamic_symbol
 		    (info, abfd, sec_symndx)))
-	    return false;
+	    return FALSE;
 	}
     }
 
   if (buf)
     free (buf);
-  return true;
+  return TRUE;
 
  err_out:
   if (buf)
     free (buf);
-  return false;
+  return FALSE;
 }
 
 struct elf64_hppa_allocate_data
@@ -949,41 +951,41 @@ struct elf64_hppa_allocate_data
 
 /* Should we do dynamic things to this symbol?  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_dynamic_symbol_p (h, info)
      struct elf_link_hash_entry *h;
      struct bfd_link_info *info;
 {
   if (h == NULL)
-    return false;
+    return FALSE;
 
   while (h->root.type == bfd_link_hash_indirect
 	 || h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
   if (h->dynindx == -1)
-    return false;
+    return FALSE;
 
   if (h->root.type == bfd_link_hash_undefweak
       || h->root.type == bfd_link_hash_defweak)
-    return true;
+    return TRUE;
 
   if (h->root.root.string[0] == '$' && h->root.root.string[1] == '$')
-    return false;
+    return FALSE;
 
   if ((info->shared && (!info->symbolic || info->allow_shlib_undefined))
       || ((h->elf_link_hash_flags
 	   & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR))
 	  == (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR)))
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
 /* Mark all funtions exported by this file so that we can later allocate
    entries in .opd for them.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_mark_exported_functions (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -1006,13 +1008,13 @@ elf64_hppa_mark_exported_functions (h, data)
 
       /* Add this symbol to the PA64 linker hash table.  */
       dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-					  h->root.root.string, true, true);
+					  h->root.root.string, TRUE, TRUE);
       BFD_ASSERT (dyn_h);
       dyn_h->h = h;
 
       if (! hppa_info->opd_sec
 	  && ! get_opd (hppa_info->root.dynobj, info, hppa_info))
-	return false;
+	return FALSE;
 
       dyn_h->want_opd = 1;
       /* Put a flag here for output_symbol_hook.  */
@@ -1020,12 +1022,12 @@ elf64_hppa_mark_exported_functions (h, data)
       h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Allocate space for a DLT entry.  */
 
-static boolean
+static bfd_boolean
 allocate_global_data_dlt (dyn_h, data)
      struct elf64_hppa_dyn_hash_entry *dyn_h;
      PTR data;
@@ -1049,19 +1051,19 @@ allocate_global_data_dlt (dyn_h, data)
 
 	      if (! (_bfd_elf64_link_record_local_dynamic_symbol
 		     (x->info, owner, dyn_h->sym_indx)))
-		return false;
+		return FALSE;
 	    }
 	}
 
       dyn_h->dlt_offset = x->ofs;
       x->ofs += DLT_ENTRY_SIZE;
     }
-  return true;
+  return TRUE;
 }
 
 /* Allocate space for a DLT.PLT entry.  */
 
-static boolean
+static bfd_boolean
 allocate_global_data_plt (dyn_h, data)
      struct elf64_hppa_dyn_hash_entry *dyn_h;
      PTR data;
@@ -1082,12 +1084,12 @@ allocate_global_data_plt (dyn_h, data)
   else
     dyn_h->want_plt = 0;
 
-  return true;
+  return TRUE;
 }
 
 /* Allocate space for a STUB entry.  */
 
-static boolean
+static bfd_boolean
 allocate_global_data_stub (dyn_h, data)
      struct elf64_hppa_dyn_hash_entry *dyn_h;
      PTR data;
@@ -1105,12 +1107,12 @@ allocate_global_data_stub (dyn_h, data)
     }
   else
     dyn_h->want_stub = 0;
-  return true;
+  return TRUE;
 }
 
 /* Allocate space for a FPTR entry.  */
 
-static boolean
+static bfd_boolean
 allocate_global_data_opd (dyn_h, data)
      struct elf64_hppa_dyn_hash_entry *dyn_h;
      PTR data;
@@ -1153,7 +1155,7 @@ allocate_global_data_opd (dyn_h, data)
 
 	      if (!_bfd_elf64_link_record_local_dynamic_symbol
 		    (x->info, owner, dyn_h->sym_indx))
-		return false;
+		return FALSE;
 	    }
 
 	  /* This may not be necessary or desirable anymore now that
@@ -1171,14 +1173,14 @@ allocate_global_data_opd (dyn_h, data)
 	      strcpy (new_name + 1, h->root.root.string);
 
 	      nh = elf_link_hash_lookup (elf_hash_table (x->info),
-					 new_name, true, true, true);
+					 new_name, TRUE, TRUE, TRUE);
 
 	      nh->root.type = h->root.type;
 	      nh->root.u.def.value = h->root.u.def.value;
 	      nh->root.u.def.section = h->root.u.def.section;
 
 	      if (! bfd_elf64_link_record_dynamic_symbol (x->info, nh))
-		return false;
+		return FALSE;
 
 	     }
 	  dyn_h->opd_offset = x->ofs;
@@ -1189,7 +1191,7 @@ allocate_global_data_opd (dyn_h, data)
       else
 	dyn_h->want_opd = 0;
     }
-  return true;
+  return TRUE;
 }
 
 /* HP requires the EI_OSABI field to be filled in.  The assignment to
@@ -1220,7 +1222,7 @@ elf64_hppa_post_process_headers (abfd, link_info)
    refers to the fact that these descriptors are used when taking the address
    of a procedure, thus ensuring a unique address for each procedure.  */
 
-static boolean
+static bfd_boolean
 get_opd (abfd, info, hppa_info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1247,18 +1249,18 @@ get_opd (abfd, info, hppa_info)
 	  || !bfd_set_section_alignment (abfd, opd, 3))
 	{
 	  BFD_ASSERT (0);
-	  return false;
+	  return FALSE;
 	}
 
       hppa_info->opd_sec = opd;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Create the PLT section.  */
 
-static boolean
+static bfd_boolean
 get_plt (abfd, info, hppa_info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1285,18 +1287,18 @@ get_plt (abfd, info, hppa_info)
 	  || !bfd_set_section_alignment (abfd, plt, 3))
 	{
 	  BFD_ASSERT (0);
-	  return false;
+	  return FALSE;
 	}
 
       hppa_info->plt_sec = plt;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Create the DLT section.  */
 
-static boolean
+static bfd_boolean
 get_dlt (abfd, info, hppa_info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1323,18 +1325,18 @@ get_dlt (abfd, info, hppa_info)
 	  || !bfd_set_section_alignment (abfd, dlt, 3))
 	{
 	  BFD_ASSERT (0);
-	  return false;
+	  return FALSE;
 	}
 
       hppa_info->dlt_sec = dlt;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Create the stubs section.  */
 
-static boolean
+static bfd_boolean
 get_stub (abfd, info, hppa_info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1362,13 +1364,13 @@ get_stub (abfd, info, hppa_info)
 	  || !bfd_set_section_alignment (abfd, stub, 3))
 	{
 	  BFD_ASSERT (0);
-	  return false;
+	  return FALSE;
 	}
 
       hppa_info->stub_sec = stub;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Create sections necessary for dynamic linking.  This is only a rough
@@ -1409,7 +1411,7 @@ get_stub (abfd, info, hppa_info)
    .rela.opd:
 	EPLT relocations for symbols exported from shared libraries.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1417,16 +1419,16 @@ elf64_hppa_create_dynamic_sections (abfd, info)
   asection *s;
 
   if (! get_stub (abfd, info, elf64_hppa_hash_table (info)))
-    return false;
+    return FALSE;
 
   if (! get_dlt (abfd, info, elf64_hppa_hash_table (info)))
-    return false;
+    return FALSE;
 
   if (! get_plt (abfd, info, elf64_hppa_hash_table (info)))
-    return false;
+    return FALSE;
 
   if (! get_opd (abfd, info, elf64_hppa_hash_table (info)))
-    return false;
+    return FALSE;
 
   s = bfd_make_section(abfd, ".rela.dlt");
   if (s == NULL
@@ -1436,7 +1438,7 @@ elf64_hppa_create_dynamic_sections (abfd, info)
 					   | SEC_READONLY
 					   | SEC_LINKER_CREATED))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
   elf64_hppa_hash_table (info)->dlt_rel_sec = s;
 
   s = bfd_make_section(abfd, ".rela.plt");
@@ -1447,7 +1449,7 @@ elf64_hppa_create_dynamic_sections (abfd, info)
 					   | SEC_READONLY
 					   | SEC_LINKER_CREATED))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
   elf64_hppa_hash_table (info)->plt_rel_sec = s;
 
   s = bfd_make_section(abfd, ".rela.data");
@@ -1458,7 +1460,7 @@ elf64_hppa_create_dynamic_sections (abfd, info)
 					   | SEC_READONLY
 					   | SEC_LINKER_CREATED))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
   elf64_hppa_hash_table (info)->other_rel_sec = s;
 
   s = bfd_make_section(abfd, ".rela.opd");
@@ -1469,16 +1471,16 @@ elf64_hppa_create_dynamic_sections (abfd, info)
 					   | SEC_READONLY
 					   | SEC_LINKER_CREATED))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
   elf64_hppa_hash_table (info)->opd_rel_sec = s;
 
-  return true;
+  return TRUE;
 }
 
 /* Allocate dynamic relocations for those symbols that turned out
    to be dynamic.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrel_entries (dyn_h, data)
      struct elf64_hppa_dyn_hash_entry *dyn_h;
      PTR data;
@@ -1486,7 +1488,7 @@ allocate_dynrel_entries (dyn_h, data)
   struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
   struct elf64_hppa_link_hash_table *hppa_info;
   struct elf64_hppa_dyn_reloc_entry *rent;
-  boolean dynamic_symbol, shared;
+  bfd_boolean dynamic_symbol, shared;
 
   hppa_info = elf64_hppa_hash_table (x->info);
   dynamic_symbol = elf64_hppa_dynamic_symbol_p (dyn_h->h, x->info);
@@ -1495,7 +1497,7 @@ allocate_dynrel_entries (dyn_h, data)
   /* We may need to allocate relocations for a non-dynamic symbol
      when creating a shared library.  */
   if (!dynamic_symbol && !shared)
-    return true;
+    return TRUE;
 
   /* Take care of the normal data relocations.  */
 
@@ -1515,7 +1517,7 @@ allocate_dynrel_entries (dyn_h, data)
 	  || (dyn_h->h->dynindx == -1 && dyn_h->h->type != STT_PARISC_MILLI))
 	if (!_bfd_elf64_link_record_local_dynamic_symbol
 	    (x->info, rent->sec->owner, dyn_h->sym_indx))
-	  return false;
+	  return FALSE;
     }
 
   /* Take care of the GOT and PLT relocations.  */
@@ -1544,13 +1546,13 @@ allocate_dynrel_entries (dyn_h, data)
       hppa_info->plt_rel_sec->_raw_size += t;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
    regular object.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      struct elf_link_hash_entry *h;
@@ -1567,7 +1569,7 @@ elf64_hppa_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* If this is a reference to a symbol defined by a dynamic object which
@@ -1577,7 +1579,7 @@ elf64_hppa_adjust_dynamic_symbol (info, h)
      But PA64 code is canonically PIC, so as a rule we can avoid this sort
      of hackery.  */
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via elf_link_hash_traverse to mark millicode
@@ -1585,7 +1587,7 @@ elf64_hppa_adjust_dynamic_symbol (info, h)
    from the dynamic symbol table.  If the symbol is not a millicode symbol,
    elf64_hppa_mark_exported_functions is called.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_mark_milli_and_exported_functions (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -1604,7 +1606,7 @@ elf64_hppa_mark_milli_and_exported_functions (h, data)
 	  _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
 				  elf->dynstr_index);
 	}
-      return true;
+      return TRUE;
     }
 
   return elf64_hppa_mark_exported_functions (h, data);
@@ -1613,16 +1615,16 @@ elf64_hppa_mark_milli_and_exported_functions (h, data)
 /* Set the final sizes of the dynamic sections and allocate memory for
    the contents of our special sections.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean plt;
-  boolean relocs;
-  boolean reltext;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
   struct elf64_hppa_allocate_data data;
   struct elf64_hppa_link_hash_table *hppa_info;
 
@@ -1703,13 +1705,13 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 				  allocate_dynrel_entries, &data);
 
   /* The sizes of all the sections are set.  Allocate memory for them.  */
-  plt = false;
-  relocs = false;
-  reltext = false;
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -1725,12 +1727,12 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 	  /* Strip this section if we don't need it; see the comment below.  */
 	  if (s->_raw_size == 0)
 	    {
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      plt = TRUE;
 	    }
 	}
       else if (strcmp (name, ".dlt") == 0)
@@ -1738,7 +1740,7 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 	  /* Strip this section if we don't need it; see the comment below.  */
 	  if (s->_raw_size == 0)
 	    {
-	      strip = true;
+	      strip = TRUE;
 	    }
 	}
       else if (strcmp (name, ".opd") == 0)
@@ -1746,7 +1748,7 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 	  /* Strip this section if we don't need it; see the comment below.  */
 	  if (s->_raw_size == 0)
 	    {
-	      strip = true;
+	      strip = TRUE;
 	    }
 	}
       else if (strncmp (name, ".rela", 5) == 0)
@@ -1769,7 +1771,7 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
@@ -1781,7 +1783,7 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 		{
 		  const char *outname;
 
-		  relocs = true;
+		  relocs = TRUE;
 
 		  /* If this relocation section applies to a read only
 		     section, then we probably need a DT_TEXTREL
@@ -1794,7 +1796,7 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 		  if (target != NULL
 		      && (target->flags & SEC_READONLY) != 0
 		      && (target->flags & SEC_ALLOC) != 0)
-		    reltext = true;
+		    reltext = TRUE;
 		}
 
 	      /* We use the reloc_count field as a counter if we need
@@ -1826,7 +1828,7 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 	{
 	  s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
 	  if (s->contents == NULL && s->_raw_size != 0)
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -1840,7 +1842,7 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 
       if (!add_dynamic_entry (DT_HP_DLD_FLAGS, 0)
 	  || !add_dynamic_entry (DT_PLTGOT, 0))
-	return false;
+	return FALSE;
 
       /* Add some entries to the .dynamic section.  We fill in the
 	 values later, in elf64_hppa_finish_dynamic_sections, but we
@@ -1852,20 +1854,20 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_DEBUG, 0)
 	      || !add_dynamic_entry (DT_HP_DLD_HOOK, 0)
 	      || !add_dynamic_entry (DT_HP_LOAD_MAP, 0))
-	    return false;
+	    return FALSE;
 	}
 
       /* Force DT_FLAGS to always be set.
 	 Required by HPUX 11.00 patch PHSS_26559.  */
       if (!add_dynamic_entry (DT_FLAGS, (info)->flags))
-	return false;
+	return FALSE;
 
       if (plt)
 	{
 	  if (!add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -1873,19 +1875,19 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
-	    return false;
+	    return FALSE;
 	}
 
       if (reltext)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	  info->flags |= DF_TEXTREL;
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Called after we have output the symbol into the dynamic symbol
@@ -1897,7 +1899,7 @@ elf64_hppa_size_dynamic_sections (output_bfd, info)
    the symbols have their expected value in the normal symbol
    table.  Ick.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_link_output_symbol_hook (abfd, info, name, sym, input_sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -1911,12 +1913,12 @@ elf64_hppa_link_output_symbol_hook (abfd, info, name, sym, input_sec)
   /* We may be called with the file symbol or section symbols.
      They never need munging, so it is safe to ignore them.  */
   if (!name)
-    return true;
+    return TRUE;
 
   /* Get the PA dyn_symbol (if any) associated with NAME.  */
   hppa_info = elf64_hppa_hash_table (info);
   dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-				      name, false, false);
+				      name, FALSE, FALSE);
 
   /* Function symbols for which we created .opd entries *may* have been
      munged by finish_dynamic_symbol and have to be un-munged here.
@@ -1932,13 +1934,13 @@ elf64_hppa_link_output_symbol_hook (abfd, info, name, sym, input_sec)
       sym->st_shndx = dyn_h->st_shndx;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -1951,7 +1953,7 @@ elf64_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
 
   hppa_info = elf64_hppa_hash_table (info);
   dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-				      h->root.root.string, false, false);
+				      h->root.root.string, FALSE, FALSE);
 
   stub = hppa_info->stub_sec;
   splt = hppa_info->plt_sec;
@@ -2084,7 +2086,7 @@ elf64_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
 	  (*_bfd_error_handler) (_("stub entry for %s cannot load .plt, dp offset = %ld"),
 				 dyn_h->root.string,
 				 (long) value);
-	  return false;
+	  return FALSE;
 	}
 
       bfd_put_32 (stub->owner, (bfd_vma) insn,
@@ -2107,13 +2109,13 @@ elf64_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
 		  stub->contents + dyn_h->stub_offset + 8);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The .opd section contains FPTRs for each function this file
    exports.  Initialize the FPTR entries.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_finalize_opd (dyn_h, data)
      struct elf64_hppa_dyn_hash_entry *dyn_h;
      PTR data;
@@ -2211,7 +2213,7 @@ elf64_hppa_finalize_opd (dyn_h, data)
 	  strcpy (new_name + 1, h->root.root.string);
 
 	  nh = elf_link_hash_lookup (elf_hash_table (info),
-				     new_name, false, false, false);
+				     new_name, FALSE, FALSE, FALSE);
 
 	  /* All we really want from the new symbol is its dynamic
 	     symbol index.  */
@@ -2225,14 +2227,14 @@ elf64_hppa_finalize_opd (dyn_h, data)
       loc += sopdrel->reloc_count++ * sizeof (Elf64_External_Rela);
       bfd_elf64_swap_reloca_out (sopd->output_section->owner, &rel, loc);
     }
-  return true;
+  return TRUE;
 }
 
 /* The .dlt section contains addresses for items referenced through the
    dlt.  Note that we can have a DLTIND relocation for a local symbol, thus
    we can not depend on finish_dynamic_symbol to initialize the .dlt.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_finalize_dlt (dyn_h, data)
      struct elf64_hppa_dyn_hash_entry *dyn_h;
      PTR data;
@@ -2318,13 +2320,13 @@ elf64_hppa_finalize_dlt (dyn_h, data)
       loc += sdltrel->reloc_count++ * sizeof (Elf64_External_Rela);
       bfd_elf64_swap_reloca_out (sdlt->output_section->owner, &rel, loc);
     }
-  return true;
+  return TRUE;
 }
 
 /* Finalize the dynamic relocations.  Specifically the FPTR relocations
    for dynamic functions used to initialize static data.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_finalize_dynreloc (dyn_h, data)
      struct elf64_hppa_dyn_hash_entry *dyn_h;
      PTR data;
@@ -2337,7 +2339,7 @@ elf64_hppa_finalize_dynreloc (dyn_h, data)
   dynamic_symbol = elf64_hppa_dynamic_symbol_p (dyn_h->h, info);
 
   if (!dynamic_symbol && !info->shared)
-    return true;
+    return TRUE;
 
   if (dyn_h->reloc_entries)
     {
@@ -2435,7 +2437,7 @@ elf64_hppa_finalize_dynreloc (dyn_h, data)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Used to decide how to sort relocs in an optimal manner for the
@@ -2461,7 +2463,7 @@ elf64_hppa_reloc_type_class (rela)
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2569,7 +2571,7 @@ elf64_hppa_finish_dynamic_sections (output_bfd, info)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the number of additional phdrs we will need.
@@ -2611,7 +2613,7 @@ elf64_hppa_additional_program_headers (abfd)
    to guess whether or not we are building a shared library based on the
    existence of a .interp section.  */
 
-static boolean
+static bfd_boolean
 elf64_hppa_modify_segment_map (abfd)
      bfd *abfd;
 {
@@ -2629,7 +2631,7 @@ elf64_hppa_modify_segment_map (abfd)
 	  m = ((struct elf_segment_map *)
 	       bfd_zalloc (abfd, (bfd_size_type) sizeof *m));
 	  if (m == NULL)
-	    return false;
+	    return FALSE;
 
 	  m->p_type = PT_PHDR;
 	  m->p_flags = PF_R | PF_X;
@@ -2660,7 +2662,7 @@ elf64_hppa_modify_segment_map (abfd)
 	  }
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Called when writing out an object file to decide the type of a
@@ -2769,10 +2771,10 @@ const struct elf_size_info hppa64_elf_size_info =
 #define elf_backend_want_plt_sym	0
 #define elf_backend_got_header_size     0
 #define elf_backend_plt_header_size     0
-#define elf_backend_type_change_ok true
-#define elf_backend_get_symbol_type	     elf64_hppa_elf_get_symbol_type
-#define elf_backend_reloc_type_class	     elf64_hppa_reloc_type_class
-#define elf_backend_rela_normal		     1
+#define elf_backend_type_change_ok	TRUE
+#define elf_backend_get_symbol_type	elf64_hppa_elf_get_symbol_type
+#define elf_backend_reloc_type_class	elf64_hppa_reloc_type_class
+#define elf_backend_rela_normal		1
 
 #include "elf64-target.h"
 
diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index 2d7cb63af05..fda989fde98 100644
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -84,17 +84,19 @@ static void mips_elf64_be_swap_reloca_out
 static reloc_howto_type *bfd_elf64_bfd_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static reloc_howto_type *mips_elf64_rtype_to_howto
-  PARAMS ((unsigned int, boolean));
+  PARAMS ((unsigned int, bfd_boolean));
 static void mips_elf64_info_to_howto_rel
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void mips_elf64_info_to_howto_rela
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static long mips_elf64_get_reloc_upper_bound PARAMS ((bfd *, asection *));
-static boolean mips_elf64_slurp_one_reloc_table
+static long mips_elf64_get_reloc_upper_bound
+  PARAMS ((bfd *, asection *));
+static bfd_boolean mips_elf64_slurp_one_reloc_table
   PARAMS ((bfd *, asection *, asymbol **, const Elf_Internal_Shdr *));
-static boolean mips_elf64_slurp_reloc_table
-  PARAMS ((bfd *, asection *, asymbol **, boolean));
-static void mips_elf64_write_relocs PARAMS ((bfd *, asection *, PTR));
+static bfd_boolean mips_elf64_slurp_reloc_table
+  PARAMS ((bfd *, asection *, asymbol **, bfd_boolean));
+static void mips_elf64_write_relocs
+  PARAMS ((bfd *, asection *, PTR));
 static void mips_elf64_write_rel
   PARAMS((bfd *, asection *, Elf_Internal_Shdr *, int *, PTR));
 static void mips_elf64_write_rela
@@ -115,11 +117,14 @@ static bfd_reloc_status_type mips16_jump_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type mips16_gprel_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean mips_elf64_assign_gp PARAMS ((bfd *, bfd_vma *));
+static bfd_boolean mips_elf64_assign_gp
+  PARAMS ((bfd *, bfd_vma *));
 static bfd_reloc_status_type mips_elf64_final_gp
-  PARAMS ((bfd *, asymbol *, boolean, char **, bfd_vma *));
-static boolean mips_elf64_object_p PARAMS ((bfd *));
-static irix_compat_t elf64_mips_irix_compat PARAMS ((bfd *));
+  PARAMS ((bfd *, asymbol *, bfd_boolean, char **, bfd_vma *));
+static bfd_boolean mips_elf64_object_p
+  PARAMS ((bfd *));
+static irix_compat_t elf64_mips_irix_compat
+  PARAMS ((bfd *));
 
 extern const bfd_target bfd_elf64_bigmips_vec;
 extern const bfd_target bfd_elf64_littlemips_vec;
@@ -140,67 +145,67 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit relocation.  */
   HOWTO (R_MIPS_16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit relocation.  */
   HOWTO (R_MIPS_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit symbol relative relocation.  */
   HOWTO (R_MIPS_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_REL32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 26 bit jump address.  */
   HOWTO (R_MIPS_26,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 				/* This needs complex overflow
@@ -208,10 +213,10 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 				   bits must match the PC + 4.  */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03ffffff,		/* src_mask */
 	 0x03ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* R_MIPS_HI16 and R_MIPS_LO16 are unsupported for NewABI REL.
      However, the native IRIX6 tools use them, so we try our best. */
@@ -221,120 +226,120 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf64_hi16_reloc,	/* special_function */
 	 "R_MIPS_HI16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of symbol value.  */
   HOWTO (R_MIPS_LO16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_LO16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GP relative reference.  */
   HOWTO (R_MIPS_GPREL16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf64_gprel16_reloc, /* special_function */
 	 "R_MIPS_GPREL16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to literal section.  */
   HOWTO (R_MIPS_LITERAL,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf64_literal_reloc, /* special_function */
 	 "R_MIPS_LITERAL",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to global offset table.  */
   HOWTO (R_MIPS_GOT16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf64_got16_reloc, /* special_function */
 	 "R_MIPS_GOT16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit PC relative reference.  */
   HOWTO (R_MIPS_PC16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_PC16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 16 bit call through global offset table.  */
   HOWTO (R_MIPS_CALL16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit GP relative reference.  */
   HOWTO (R_MIPS_GPREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf64_gprel32_reloc, /* special_function */
 	 "R_MIPS_GPREL32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (13),
   EMPTY_HOWTO (14),
@@ -345,135 +350,135 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 5,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SHIFT5",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000007c0,		/* src_mask */
 	 0x000007c0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 6 bit shift field.  */
   HOWTO (R_MIPS_SHIFT6,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_elf64_shift6_reloc, /* special_function */
 	 "R_MIPS_SHIFT6",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000007c4,		/* src_mask */
 	 0x000007c4,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit relocation.  */
   HOWTO (R_MIPS_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement in the global offset table.  */
   HOWTO (R_MIPS_GOT_DISP,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_DISP",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement to page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_PAGE,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_PAGE",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Offset from page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_OFST,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_OFST",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_HI16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_HI16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_LO16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit substraction.  */
   HOWTO (R_MIPS_SUB,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SUB",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Insert the addend as an instruction.  */
   /* FIXME: Not handled correctly.  */
@@ -481,15 +486,15 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_INSERT_A",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Insert the addend as an instruction, and change all relocations
      to refer to the old instruction at the address.  */
@@ -498,15 +503,15 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_INSERT_B",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Delete a 32 bit instruction.  */
   /* FIXME: Not handled correctly.  */
@@ -514,15 +519,15 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_DELETE",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The MIPS ELF64 ABI Draft wants us to support these for REL relocations.
      We don't, because
@@ -538,59 +543,59 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL_HI16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_CALL_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL_LO16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Section displacement, used by an associated event location section.  */
   HOWTO (R_MIPS_SCN_DISP,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SCN_DISP",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_MIPS_REL16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_REL16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* These two are obsolete.  */
   EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
@@ -602,15 +607,15 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_RELGOT",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Protected jump conversion.  This is an optimization hint.  No
      relocation is required for correctness.  */
@@ -618,15 +623,15 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_JALR",	        /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 /* The relocation table used for SHT_RELA sections.  */
@@ -638,67 +643,67 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit relocation.  */
   HOWTO (R_MIPS_16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit relocation.  */
   HOWTO (R_MIPS_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit symbol relative relocation.  */
   HOWTO (R_MIPS_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_REL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 26 bit jump address.  */
   HOWTO (R_MIPS_26,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 				/* This needs complex overflow
@@ -706,130 +711,130 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 				   bits must match the PC + 4.  */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_26",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x03ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of symbol value.  */
   HOWTO (R_MIPS_HI16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_HI16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of symbol value.  */
   HOWTO (R_MIPS_LO16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_LO16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GP relative reference.  */
   HOWTO (R_MIPS_GPREL16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf64_gprel16_reloc, /* special_function */
 	 "R_MIPS_GPREL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to literal section.  */
   HOWTO (R_MIPS_LITERAL,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf64_literal_reloc, /* special_function */
 	 "R_MIPS_LITERAL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to global offset table.  */
   HOWTO (R_MIPS_GOT16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf64_got16_reloc, /* special_function */
 	 "R_MIPS_GOT16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit PC relative reference.  */
   HOWTO (R_MIPS_PC16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_PC16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 16 bit call through global offset table.  */
   HOWTO (R_MIPS_CALL16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit GP relative reference.  */
   HOWTO (R_MIPS_GPREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf64_gprel32_reloc, /* special_function */
 	 "R_MIPS_GPREL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (13),
   EMPTY_HOWTO (14),
@@ -840,135 +845,135 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 5,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SHIFT5",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x000007c0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 6 bit shift field.  */
   HOWTO (R_MIPS_SHIFT6,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_elf64_shift6_reloc, /* special_function */
 	 "R_MIPS_SHIFT6",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x000007c4,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit relocation.  */
   HOWTO (R_MIPS_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement in the global offset table.  */
   HOWTO (R_MIPS_GOT_DISP,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_DISP",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement to page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_PAGE,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_PAGE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Offset from page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_OFST,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_OFST",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_HI16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_GOT_LO16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit substraction.  */
   HOWTO (R_MIPS_SUB,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SUB",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Insert the addend as an instruction.  */
   /* FIXME: Not handled correctly.  */
@@ -976,15 +981,15 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_INSERT_A",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Insert the addend as an instruction, and change all relocations
      to refer to the old instruction at the address.  */
@@ -993,15 +998,15 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_INSERT_B",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Delete a 32 bit instruction.  */
   /* FIXME: Not handled correctly.  */
@@ -1009,104 +1014,104 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_DELETE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Get the higher value of a 64 bit addend.  */
   HOWTO (R_MIPS_HIGHER,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_MIPS_HIGHER",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Get the highest value of a 64 bit addend.  */
   HOWTO (R_MIPS_HIGHEST,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_MIPS_HIGHEST",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_CALL_HI16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_CALL_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_CALL_LO16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Section displacement, used by an associated event location section.  */
   HOWTO (R_MIPS_SCN_DISP,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_SCN_DISP",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_MIPS_REL16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_REL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* These two are obsolete.  */
   EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
@@ -1118,15 +1123,15 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_RELGOT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Protected jump conversion.  This is an optimization hint.  No
      relocation is required for correctness.  */
@@ -1134,15 +1139,15 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MIPS_JALR",	        /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 /* The reloc used for the mips16 jump instruction.  */
@@ -1151,7 +1156,7 @@ static reloc_howto_type elf_mips16_jump_howto =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 			/* This needs complex overflow
@@ -1159,10 +1164,10 @@ static reloc_howto_type elf_mips16_jump_howto =
 				   bits must match the PC.  */
 	 mips16_jump_reloc,	/* special_function */
 	 "R_MIPS16_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* The reloc used for the mips16 gprel instruction.  */
 static reloc_howto_type elf_mips16_gprel_howto =
@@ -1170,15 +1175,15 @@ static reloc_howto_type elf_mips16_gprel_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips16_gprel_reloc,	/* special_function */
 	 "R_MIPS16_GPREL",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x07ff001f,		/* src_mask */
 	 0x07ff001f,	        /* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* GNU extension to record C++ vtable hierarchy */
 static reloc_howto_type elf_mips_gnu_vtinherit_howto =
@@ -1186,15 +1191,15 @@ static reloc_howto_type elf_mips_gnu_vtinherit_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_MIPS_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* GNU extension to record C++ vtable member usage */
 static reloc_howto_type elf_mips_gnu_vtentry_howto =
@@ -1202,15 +1207,15 @@ static reloc_howto_type elf_mips_gnu_vtentry_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
 	 "R_MIPS_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* Swap in a MIPS 64-bit Rel reloc.  */
 
@@ -1341,7 +1346,7 @@ mips_elf64_be_swap_reloc_out (abfd, src, dst)
 
   mirel.r_offset = src[0].r_offset;
   BFD_ASSERT(src[0].r_offset == src[1].r_offset);
-#if 0  
+#if 0
   BFD_ASSERT(src[0].r_offset == src[2].r_offset);
 #endif
 
@@ -1451,10 +1456,10 @@ mips_elf64_got16_reloc (abfd, reloc_entry, symbol, data, input_section,
 				input_section, output_bfd, error_message);
 }
 
-/* Set the GP value for OUTPUT_BFD.  Returns false if this is a
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
    dangerous relocation.  */
 
-static boolean
+static bfd_boolean
 mips_elf64_assign_gp (output_bfd, pgp)
      bfd *output_bfd;
      bfd_vma *pgp;
@@ -1466,7 +1471,7 @@ mips_elf64_assign_gp (output_bfd, pgp)
   /* If we've already figured out what GP will be, just return it.  */
   *pgp = _bfd_get_gp_value (output_bfd);
   if (*pgp)
-    return true;
+    return TRUE;
 
   count = bfd_get_symcount (output_bfd);
   sym = bfd_get_outsymbols (output_bfd);
@@ -1496,10 +1501,10 @@ mips_elf64_assign_gp (output_bfd, pgp)
       /* Only get the error once.  */
       *pgp = 4;
       _bfd_set_gp_value (output_bfd, *pgp);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We have to figure out the gp value, so that we can adjust the
@@ -1512,7 +1517,7 @@ static bfd_reloc_status_type
 mips_elf64_final_gp (output_bfd, symbol, relocateable, error_message, pgp)
      bfd *output_bfd;
      asymbol *symbol;
-     boolean relocateable;
+     bfd_boolean relocateable;
      char **error_message;
      bfd_vma *pgp;
 {
@@ -1559,7 +1564,7 @@ mips_elf64_gprel16_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
 
@@ -1577,10 +1582,10 @@ mips_elf64_gprel16_reloc (abfd, reloc_entry, symbol, data, input_section,
     }
 
   if (output_bfd != (bfd *) NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1607,7 +1612,7 @@ mips_elf64_literal_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
 
@@ -1624,10 +1629,10 @@ mips_elf64_literal_reloc (abfd, reloc_entry, symbol, data, input_section,
 
   /* FIXME: The entries in the .lit8 and .lit4 sections should be merged.  */
   if (output_bfd != (bfd *) NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1655,7 +1660,7 @@ mips_elf64_gprel32_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
   bfd_vma relocation;
@@ -1676,12 +1681,12 @@ mips_elf64_gprel32_reloc (abfd, reloc_entry, symbol, data, input_section,
 
   if (output_bfd != (bfd *) NULL)
     {
-      relocateable = true;
+      relocateable = TRUE;
       gp = _bfd_get_gp_value (output_bfd);
     }
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
 
       ret = mips_elf64_final_gp (output_bfd, symbol, relocateable,
@@ -1782,13 +1787,13 @@ mips16_jump_reloc (abfd, reloc_entry, symbol, data, input_section,
 
   /* FIXME.  */
   {
-    static boolean warned;
+    static bfd_boolean warned;
 
     if (! warned)
       (*_bfd_error_handler)
 	(_("Linking mips16 objects into %s format is not supported"),
 	 bfd_get_target (input_section->output_section->owner));
-    warned = true;
+    warned = TRUE;
   }
 
   return bfd_reloc_undefined;
@@ -1807,7 +1812,7 @@ mips16_gprel_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
   unsigned short extend, insn;
@@ -1826,10 +1831,10 @@ mips16_gprel_reloc (abfd, reloc_entry, symbol, data, input_section,
     }
 
   if (output_bfd != NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1956,7 +1961,7 @@ bfd_elf64_bfd_reloc_type_lookup (abfd, code)
 static reloc_howto_type *
 mips_elf64_rtype_to_howto (r_type, rela_p)
      unsigned int r_type;
-     boolean rela_p;
+     bfd_boolean rela_p;
 {
   switch (r_type)
     {
@@ -2011,7 +2016,7 @@ mips_elf64_get_reloc_upper_bound (abfd, sec)
 
 /* Read the relocations from one reloc section.  */
 
-static boolean
+static bfd_boolean
 mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, rel_hdr)
      bfd *abfd;
      asection *asect;
@@ -2029,7 +2034,7 @@ mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, rel_hdr)
 
   allocated = (PTR) bfd_malloc (rel_hdr->sh_size);
   if (allocated == NULL)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, rel_hdr->sh_offset, SEEK_SET) != 0
       || (bfd_bread (allocated, rel_hdr->sh_size, abfd) != rel_hdr->sh_size))
@@ -2054,7 +2059,7 @@ mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, rel_hdr)
   for (i = 0; i < count; i++, native_relocs += entsize)
     {
       Elf64_Mips_Internal_Rela rela;
-      boolean used_sym, used_ssym;
+      bfd_boolean used_sym, used_ssym;
       int ir;
 
       if (entsize == sizeof (Elf64_Mips_External_Rela))
@@ -2068,8 +2073,8 @@ mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, rel_hdr)
 
       /* Each entry represents exactly three actual relocations.  */
 
-      used_sym = false;
-      used_ssym = false;
+      used_sym = FALSE;
+      used_ssym = FALSE;
       for (ir = 0; ir < 3; ir++)
 	{
 	  enum elf_mips_reloc_type type;
@@ -2117,7 +2122,7 @@ mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, rel_hdr)
 			relent->sym_ptr_ptr = s->section->symbol_ptr_ptr;
 		    }
 
-		  used_sym = true;
+		  used_sym = TRUE;
 		}
 	      else if (! used_ssym)
 		{
@@ -2141,7 +2146,7 @@ mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, rel_hdr)
 		      break;
 		    }
 
-		  used_ssym = true;
+		  used_ssym = TRUE;
 		}
 	      else
 		relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
@@ -2171,23 +2176,23 @@ mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, rel_hdr)
   if (allocated != NULL)
     free (allocated);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (allocated != NULL)
     free (allocated);
-  return false;
+  return FALSE;
 }
 
 /* Read the relocations.  On Irix 6, there can be two reloc sections
    associated with a single data section.  */
 
-static boolean
+static bfd_boolean
 mips_elf64_slurp_reloc_table (abfd, asect, symbols, dynamic)
      bfd *abfd;
      asection *asect;
      asymbol **symbols;
-     boolean dynamic;
+     bfd_boolean dynamic;
 {
   bfd_size_type amt;
   struct bfd_elf_section_data * const d = elf_section_data (asect);
@@ -2195,34 +2200,34 @@ mips_elf64_slurp_reloc_table (abfd, asect, symbols, dynamic)
   if (dynamic)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (asect->relocation != NULL
       || (asect->flags & SEC_RELOC) == 0
       || asect->reloc_count == 0)
-    return true;
+    return TRUE;
 
   /* Allocate space for 3 arelent structures for each Rel structure.  */
   amt = asect->reloc_count;
   amt *= 3 * sizeof (arelent);
   asect->relocation = (arelent *) bfd_alloc (abfd, amt);
   if (asect->relocation == NULL)
-    return false;
+    return FALSE;
 
   /* The slurp_one_reloc_table routine increments reloc_count.  */
   asect->reloc_count = 0;
 
   if (! mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, &d->rel_hdr))
-    return false;
+    return FALSE;
   if (d->rel_hdr2 != NULL)
     {
       if (! mips_elf64_slurp_one_reloc_table (abfd, asect, symbols,
 					      d->rel_hdr2))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out the relocations.  */
@@ -2233,7 +2238,7 @@ mips_elf64_write_relocs (abfd, sec, data)
      asection *sec;
      PTR data;
 {
-  boolean *failedp = (boolean *) data;
+  bfd_boolean *failedp = (bfd_boolean *) data;
   int count;
   Elf_Internal_Shdr *rel_hdr;
   unsigned int idx;
@@ -2301,7 +2306,7 @@ mips_elf64_write_rel (abfd, sec, rel_hdr, count, data)
      int *count;
      PTR data;
 {
-  boolean *failedp = (boolean *) data;
+  bfd_boolean *failedp = (bfd_boolean *) data;
   Elf64_Mips_External_Rel *ext_rel;
   unsigned int idx;
   asymbol *last_sym = 0;
@@ -2311,7 +2316,7 @@ mips_elf64_write_rel (abfd, sec, rel_hdr, count, data)
   rel_hdr->contents = (PTR) bfd_alloc (abfd, rel_hdr->sh_size);
   if (rel_hdr->contents == NULL)
     {
-      *failedp = true;
+      *failedp = TRUE;
       return;
     }
 
@@ -2343,7 +2348,7 @@ mips_elf64_write_rel (abfd, sec, rel_hdr, count, data)
 	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
 	  if (n < 0)
 	    {
-	      *failedp = true;
+	      *failedp = TRUE;
 	      return;
 	    }
 	  last_sym_idx = n;
@@ -2355,7 +2360,7 @@ mips_elf64_write_rel (abfd, sec, rel_hdr, count, data)
       if ((*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
 	  && ! _bfd_elf_validate_reloc (abfd, ptr))
 	{
-	  *failedp = true;
+	  *failedp = TRUE;
 	  return;
 	}
 
@@ -2400,7 +2405,7 @@ mips_elf64_write_rela (abfd, sec, rela_hdr, count, data)
      int *count;
      PTR data;
 {
-  boolean *failedp = (boolean *) data;
+  bfd_boolean *failedp = (bfd_boolean *) data;
   Elf64_Mips_External_Rela *ext_rela;
   unsigned int idx;
   asymbol *last_sym = 0;
@@ -2410,7 +2415,7 @@ mips_elf64_write_rela (abfd, sec, rela_hdr, count, data)
   rela_hdr->contents = (PTR) bfd_alloc (abfd, rela_hdr->sh_size);
   if (rela_hdr->contents == NULL)
     {
-      *failedp = true;
+      *failedp = TRUE;
       return;
     }
 
@@ -2442,7 +2447,7 @@ mips_elf64_write_rela (abfd, sec, rela_hdr, count, data)
 	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
 	  if (n < 0)
 	    {
-	      *failedp = true;
+	      *failedp = TRUE;
 	      return;
 	    }
 	  last_sym_idx = n;
@@ -2455,7 +2460,7 @@ mips_elf64_write_rela (abfd, sec, rela_hdr, count, data)
       if ((*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
 	  && ! _bfd_elf_validate_reloc (abfd, ptr))
 	{
-	  *failedp = true;
+	  *failedp = TRUE;
 	  return;
 	}
 
@@ -2494,7 +2499,7 @@ mips_elf64_write_rela (abfd, sec, rela_hdr, count, data)
 
 /* Set the right machine number for a MIPS ELF file.  */
 
-static boolean
+static bfd_boolean
 mips_elf64_object_p (abfd)
      bfd *abfd;
 {
@@ -2504,11 +2509,11 @@ mips_elf64_object_p (abfd)
      sorted correctly such that local symbols precede global symbols,
      and the sh_info field in the symbol table is not always right.  */
   if (elf64_mips_irix_compat (abfd) != ict_none)
-    elf_bad_symtab (abfd) = true;
+    elf_bad_symtab (abfd) = TRUE;
 
   mach = _bfd_elf_mips_mach (elf_elfheader (abfd)->e_flags);
   bfd_default_set_arch_mach (abfd, bfd_arch_mips, mach);
-  return true;
+  return TRUE;
 }
 
 /* Depending on the target vector we generate some version of Irix
@@ -2610,9 +2615,9 @@ const struct elf_size_info mips_elf64_size_info =
    FIXME: How does this affect NewABI?  */
 #define ELF_MAXPAGESIZE			0x1000
 
-#define elf_backend_collect		true
-#define elf_backend_type_change_ok	true
-#define elf_backend_can_gc_sections	true
+#define elf_backend_collect		TRUE
+#define elf_backend_type_change_ok	TRUE
+#define elf_backend_can_gc_sections	TRUE
 #define elf_info_to_howto		mips_elf64_info_to_howto_rela
 #define elf_info_to_howto_rel		mips_elf64_info_to_howto_rel
 #define elf_backend_object_p		mips_elf64_object_p
@@ -2685,10 +2690,10 @@ const struct elf_size_info mips_elf64_size_info =
 
 /* MIPS ELF64 archive functions.  */
 #define bfd_elf64_archive_functions
-extern boolean bfd_elf64_archive_slurp_armap
-  PARAMS((bfd *));
-extern boolean bfd_elf64_archive_write_armap
-  PARAMS((bfd *, unsigned int, struct orl *, unsigned int, int));
+extern bfd_boolean bfd_elf64_archive_slurp_armap
+  PARAMS ((bfd *));
+extern bfd_boolean bfd_elf64_archive_write_armap
+  PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
 #define bfd_elf64_archive_slurp_extended_name_table \
 			_bfd_archive_coff_slurp_extended_name_table
 #define bfd_elf64_archive_construct_extended_name_table \
diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
index 57d6258a672..d9ad982fc7f 100644
--- a/bfd/elf64-mmix.c
+++ b/bfd/elf64-mmix.c
@@ -78,9 +78,9 @@ struct bpo_reloc_request
     size_t bpo_reloc_no;
 
     /* Set when the value is computed.  Better than coding "guard values"
-       into the other members.  Is false only for BPO relocs in a GC:ed
+       into the other members.  Is FALSE only for BPO relocs in a GC:ed
        section.  */
-    boolean valid;
+    bfd_boolean valid;
   };
 
 /* We attach this as elf_section_data (sec)->tdata in the linker-allocated
@@ -120,7 +120,7 @@ struct bpo_greg_section_info
     struct bpo_reloc_request *reloc_request;
   };
 
-static boolean mmix_elf_link_output_symbol_hook
+static bfd_boolean mmix_elf_link_output_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const char *,
 	   Elf_Internal_Sym *, asection *));
 
@@ -135,15 +135,15 @@ static void mmix_info_to_howto_rela
 
 static int mmix_elf_sort_relocs PARAMS ((const PTR, const PTR));
 
-static boolean mmix_elf_check_relocs
+static bfd_boolean mmix_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
-static boolean mmix_elf_check_common_relocs
+static bfd_boolean mmix_elf_check_common_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
-static boolean mmix_elf_relocate_section
+static bfd_boolean mmix_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 
@@ -151,7 +151,7 @@ static asection * mmix_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 
-static boolean mmix_elf_gc_sweep_hook
+static bfd_boolean mmix_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
@@ -162,23 +162,23 @@ static bfd_reloc_status_type mmix_final_link_relocate
 static bfd_reloc_status_type mmix_elf_perform_relocation
   PARAMS ((asection *, reloc_howto_type *, PTR, bfd_vma, bfd_vma));
 
-static boolean mmix_elf_section_from_bfd_section
+static bfd_boolean mmix_elf_section_from_bfd_section
   PARAMS ((bfd *, asection *, int *));
 
-static boolean mmix_elf_add_symbol_hook
+static bfd_boolean mmix_elf_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
 
-static boolean mmix_elf_is_local_label_name
+static bfd_boolean mmix_elf_is_local_label_name
   PARAMS ((bfd *, const char *));
 
 static int bpo_reloc_request_sort_fn PARAMS ((const PTR, const PTR));
 
-static boolean mmix_elf_relax_section
+static bfd_boolean mmix_elf_relax_section
   PARAMS ((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
-	   boolean *again));
+	   bfd_boolean *again));
 
-extern boolean mmix_elf_final_link PARAMS ((bfd *, struct bfd_link_info *));
+extern bfd_boolean mmix_elf_final_link PARAMS ((bfd *, struct bfd_link_info *));
 
 extern void mmix_elf_symbol_processing PARAMS ((bfd *, asymbol *));
 
@@ -195,195 +195,195 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 8 bit absolute relocation.  */
   HOWTO (R_MMIX_8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 16 bit absolute relocation.  */
   HOWTO (R_MMIX_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 24 bit absolute relocation.  */
   HOWTO (R_MMIX_24,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_24",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0xffffff,		/* src_mask */
 	 0xffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit absolute relocation.  */
   HOWTO (R_MMIX_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit relocation.  */
   HOWTO (R_MMIX_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An 8 bit PC-relative relocation.  */
   HOWTO (R_MMIX_PC_8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_PC_8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* An 16 bit PC-relative relocation.  */
   HOWTO (R_MMIX_PC_16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_PC_16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* An 24 bit PC-relative relocation.  */
   HOWTO (R_MMIX_PC_24,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_PC_24",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0xffffff,		/* src_mask */
 	 0xffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 32 bit absolute PC-relative relocation.  */
   HOWTO (R_MMIX_PC_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_PC_32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 64 bit PC-relative relocation.  */
   HOWTO (R_MMIX_PC_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_MMIX_PC_64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy.  */
   HOWTO (R_MMIX_GNU_VTINHERIT, /* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_MMIX_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage.  */
   HOWTO (R_MMIX_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
 	 "R_MMIX_GNU_VTENTRY", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The GETA relocation is supposed to get any address that could
      possibly be reached by the GETA instruction.  It can silently expand
@@ -393,57 +393,57 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_GETA",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_GETA_1,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_GETA_1",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_GETA_2,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_GETA_2",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_GETA_3,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_GETA_3",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* The conditional branches are supposed to reach any (code) address.
      It can silently expand to a 64-bit operand, but will emit an error if
@@ -453,71 +453,71 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_CBRANCH",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   HOWTO (R_MMIX_CBRANCH_J,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_CBRANCH_J",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_CBRANCH_1,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_CBRANCH_1",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_CBRANCH_2,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_CBRANCH_2",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_CBRANCH_3,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_CBRANCH_3",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* The PUSHJ instruction can reach any (code) address, as long as it's
      the beginning of a function (no usable restriction).  It can silently
@@ -528,57 +528,57 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_PUSHJ",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_PUSHJ_1,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_PUSHJ_1",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_PUSHJ_2,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_PUSHJ_2",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_PUSHJ_3,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_PUSHJ_3",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A JMP is supposed to reach any (code) address.  By itself, it can
      reach +-64M; the expansion can reach all 64 bits.  Note that the 64M
@@ -588,57 +588,57 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 27,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_JMP",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x1ffffff,		/* src_mask */
 	 0x1ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_JMP_1,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 27,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_JMP_1",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x1ffffff,		/* src_mask */
 	 0x1ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_JMP_2,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 27,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_JMP_2",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x1ffffff,		/* src_mask */
 	 0x1ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_MMIX_JMP_3,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 27,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_JMP_3",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x1ffffff,		/* src_mask */
 	 0x1ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* When we don't emit link-time-relaxable code from the assembler, or
      when relaxation has done all it can do, these relocs are used.  For
@@ -647,30 +647,30 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 19,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_ADDR19",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x0100ffff,		/* src_mask */
 	 0x0100ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* For JMP.  */
   HOWTO (R_MMIX_ADDR27,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 27,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_ADDR27",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 ~0x1ffffff,		/* src_mask */
 	 0x1ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A general register or the value 0..255.  If a value, then the
      instruction (offset -3) needs adjusting.  */
@@ -678,30 +678,30 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_REG_OR_BYTE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A general register.  */
   HOWTO (R_MMIX_REG,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_REG",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xff,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A register plus an index, corresponding to the relocation expression.
      The sizes must correspond to the valid range of the expression, while
@@ -710,15 +710,15 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_BASE_PLUS_OFFSET", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A "magic" relocation for a LOCAL expression, asserting that the
      expression is less than the number of global registers.  No actual
@@ -729,15 +729,15 @@ static reloc_howto_type elf_mmix_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mmix_elf_reloc,	/* special_function */
 	 "R_MMIX_LOCAL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
  };
 
 
@@ -1157,7 +1157,7 @@ mmix_elf_reloc (abfd, reloc_entry, symbol, data, input_section,
 /* Relocate an MMIX ELF section.  Modified from elf32-fr30.c; look to it
    for guidance if you're thinking of copying this.  */
 
-static boolean
+static bfd_boolean
 mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -1189,7 +1189,7 @@ mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       bfd_reloc_status_type r;
       const char *name = NULL;
       int r_type;
-      boolean undefined_signalled = false;
+      bfd_boolean undefined_signalled = FALSE;
 
       r_type = ELF64_R_TYPE (rel->r_info);
 
@@ -1265,9 +1265,9 @@ mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! undefined_signalled
 		  && ! ((*info->callbacks->undefined_symbol)
 			(info, h->root.root.string, input_bfd,
-			 input_section, rel->r_offset, true)))
-		return false;
-	      undefined_signalled = true;
+			 input_section, rel->r_offset, TRUE)))
+		return FALSE;
+	      undefined_signalled = TRUE;
 	      relocation = 0;
 	    }
 	}
@@ -1278,7 +1278,7 @@ mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
       if (r != bfd_reloc_ok)
 	{
-	  boolean check_ok = true;
+	  bfd_boolean check_ok = TRUE;
 	  const char * msg = (const char *) NULL;
 
 	  switch (r)
@@ -1294,8 +1294,8 @@ mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! undefined_signalled)
 		check_ok = info->callbacks->undefined_symbol
 		  (info, name, input_bfd, input_section, rel->r_offset,
-		   true);
-	      undefined_signalled = true;
+		   TRUE);
+	      undefined_signalled = TRUE;
 	      break;
 
 	    case bfd_reloc_outofrange:
@@ -1320,11 +1320,11 @@ mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (info, msg, name, input_bfd, input_section, rel->r_offset);
 
 	  if (! check_ok)
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Perform a single relocation.  By default we use the standard BFD
@@ -1565,7 +1565,7 @@ mmix_elf_gc_mark_hook (sec, info, rel, h, sym)
    GC (or section merge) and the point when all input sections must be
    present.  Better to waste some memory and (perhaps) a little time.  */
 
-static boolean
+static bfd_boolean
 mmix_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1579,7 +1579,7 @@ mmix_elf_gc_sweep_hook (abfd, info, sec, relocs)
 
   /* If no bpodata here, we have nothing to do.  */
   if (bpodata == NULL)
-    return true;
+    return TRUE;
 
   allocated_gregs_section = bpodata->bpo_greg_section;
 
@@ -1588,7 +1588,7 @@ mmix_elf_gc_sweep_hook (abfd, info, sec, relocs)
     ->n_bpo_relocs
     -= bpodata->n_bpo_relocs_this_section;
 
-  return true;
+  return TRUE;
 }
 
 /* Sort register relocs to come before expanding relocs.  */
@@ -1628,7 +1628,7 @@ mmix_elf_sort_relocs (p1, p2)
 
 /* Subset of mmix_elf_check_relocs, common to ELF and mmo linking.  */
 
-static boolean
+static bfd_boolean
 mmix_elf_check_common_relocs  (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1643,7 +1643,7 @@ mmix_elf_check_common_relocs  (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   /* We currently have to abuse this COFF-specific member, since there's
      no target-machine-dedicated member.  There's no alternative outside
@@ -1692,12 +1692,12 @@ mmix_elf_check_common_relocs  (abfd, info, sec, relocs)
 		  || !bfd_set_section_alignment (bpo_greg_owner,
 						 allocated_gregs_section,
 						 3))
-		return false;
+		return FALSE;
 
 	      gregdata = (struct bpo_greg_section_info *)
 		bfd_zalloc (bpo_greg_owner, sizeof (struct bpo_greg_section_info));
 	      if (gregdata == NULL)
-		return false;
+		return FALSE;
 	      elf_section_data (allocated_gregs_section)->tdata = gregdata;
 	    }
 	  else if (gregdata == NULL)
@@ -1713,7 +1713,7 @@ mmix_elf_check_common_relocs  (abfd, info, sec, relocs)
 			   sizeof (struct bpo_reloc_section_info)
 			   * (sec->reloc_count + 1));
 	      if (bpodata == NULL)
-		return false;
+		return FALSE;
 	      elf_section_data (sec)->tdata = bpodata;
 	      bpodata->first_base_plus_offset_reloc
 		= bpodata->bpo_index
@@ -1734,12 +1734,12 @@ mmix_elf_check_common_relocs  (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.  */
 
-static boolean
+static bfd_boolean
 mmix_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1752,7 +1752,7 @@ mmix_elf_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -1767,7 +1767,7 @@ mmix_elf_check_relocs (abfd, info, sec, relocs)
 
   /* Do the common part.  */
   if (!mmix_elf_check_common_relocs (abfd, info, sec, relocs))
-    return false;
+    return FALSE;
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
@@ -1787,25 +1787,25 @@ mmix_elf_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_MMIX_GNU_VTINHERIT:
           if (!_bfd_elf64_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_MMIX_GNU_VTENTRY:
           if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Wrapper for mmix_elf_check_common_relocs, called when linking to mmo.
    Copied from elf_link_add_object_symbols.  */
 
-boolean
+bfd_boolean
 _bfd_mmix_check_all_relocs (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1815,7 +1815,7 @@ _bfd_mmix_check_all_relocs (abfd, info)
   for (o = abfd->sections; o != NULL; o = o->next)
     {
       Elf_Internal_Rela *internal_relocs;
-      boolean ok;
+      bfd_boolean ok;
 
       if ((o->flags & SEC_RELOC) == 0
 	  || o->reloc_count == 0
@@ -1829,7 +1829,7 @@ _bfd_mmix_check_all_relocs (abfd, info)
 				       (Elf_Internal_Rela *) NULL,
 				       info->keep_memory);
       if (internal_relocs == NULL)
-	return false;
+	return FALSE;
 
       ok = mmix_elf_check_common_relocs (abfd, info, o, internal_relocs);
 
@@ -1837,17 +1837,17 @@ _bfd_mmix_check_all_relocs (abfd, info)
 	free (internal_relocs);
 
       if (! ok)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Change symbols relative to the reg contents section to instead be to
    the register section, and scale them down to correspond to the register
    number.  */
 
-static boolean
+static bfd_boolean
 mmix_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1864,7 +1864,7 @@ mmix_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec)
       sym->st_shndx = SHN_REGISTER;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We fake a register section that holds values that are register numbers.
@@ -1913,7 +1913,7 @@ mmix_elf_symbol_processing (abfd, asym)
 /* Given a BFD section, try to locate the corresponding ELF section
    index.  */
 
-static boolean
+static bfd_boolean
 mmix_elf_section_from_bfd_section (abfd, sec, retval)
      bfd *                 abfd ATTRIBUTE_UNUSED;
      asection *            sec;
@@ -1922,9 +1922,9 @@ mmix_elf_section_from_bfd_section (abfd, sec, retval)
   if (strcmp (bfd_get_section_name (abfd, sec), MMIX_REG_SECTION_NAME) == 0)
     *retval = SHN_REGISTER;
   else
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Hook called by the linker routine which adds symbols from an object
@@ -1934,7 +1934,7 @@ mmix_elf_section_from_bfd_section (abfd, sec, retval)
    symbols, since otherwise having two with the same value would cause
    them to be "merged", but with the contents serialized.  */
 
-boolean
+bfd_boolean
 mmix_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1953,9 +1953,9 @@ mmix_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       /* See if we have another one.  */
       struct bfd_link_hash_entry *h = bfd_link_hash_lookup (info->hash,
 							    *namep,
-							    false,
-							    false,
-							    false);
+							    FALSE,
+							    FALSE,
+							    FALSE);
 
       if (h != NULL && h->type != bfd_link_hash_undefined)
 	{
@@ -1966,16 +1966,16 @@ mmix_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	    bfd_get_filename (abfd), *namep,
 	    *namep + strlen (MMIX_LOC_SECTION_START_SYMBOL_PREFIX)));
 	   bfd_set_error (bfd_error_bad_value);
-	   return false;
+	   return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We consider symbols matching "L.*:[0-9]+" to be local symbols.  */
 
-boolean
+bfd_boolean
 mmix_elf_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
@@ -1985,19 +1985,19 @@ mmix_elf_is_local_label_name (abfd, name)
 
   /* Also include the default local-label definition.  */
   if (_bfd_elf_is_local_label_name (abfd, name))
-    return true;
+    return TRUE;
 
   if (*name != 'L')
-    return false;
+    return FALSE;
 
   /* If there's no ":", or more than one, it's not a local symbol.  */
   colpos = strchr (name, ':');
   if (colpos == NULL || strchr (colpos + 1, ':') != NULL)
-    return false;
+    return FALSE;
 
   /* Check that there are remaining characters and that they are digits.  */
   if (colpos[1] == 0)
-    return false;
+    return FALSE;
 
   digits = strspn (colpos + 1, "0123456789");
   return digits != 0 && colpos[1 + digits] == 0;
@@ -2005,7 +2005,7 @@ mmix_elf_is_local_label_name (abfd, name)
 
 /* We get rid of the register section here.  */
 
-boolean
+bfd_boolean
 mmix_elf_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2033,7 +2033,7 @@ mmix_elf_final_link (abfd, info)
     }
 
   if (! bfd_elf64_bfd_final_link (abfd, info))
-    return false;
+    return FALSE;
 
   /* Since this section is marked SEC_LINKER_CREATED, it isn't output by
      the regular linker machinery.  We do it here, like other targets with
@@ -2048,15 +2048,15 @@ mmix_elf_final_link (abfd, info)
 				     greg_section->contents,
 				     (file_ptr) greg_section->output_offset,
 				     greg_section->_cooked_size))
-	return false;
+	return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 /* Initialize stuff for the linker-generated GREGs to match
    R_MMIX_BASE_PLUS_OFFSET relocs seen by the linker.  */
 
-boolean
+bfd_boolean
 _bfd_mmix_prepare_linker_allocated_gregs (abfd, info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -2074,20 +2074,20 @@ _bfd_mmix_prepare_linker_allocated_gregs (abfd, info)
      If there is no such object, there was no R_MMIX_BASE_PLUS_OFFSET.  */
   bpo_greg_owner = (bfd *) info->base_file;
   if (bpo_greg_owner == NULL)
-    return true;
+    return TRUE;
 
   bpo_gregs_section
     = bfd_get_section_by_name (bpo_greg_owner,
 			       MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME);
 
   if (bpo_gregs_section == NULL)
-    return true;
+    return TRUE;
 
   /* We use the target-data handle in the ELF section data.  */
   gregdata = (struct bpo_greg_section_info *)
     elf_section_data (bpo_gregs_section)->tdata;
   if (gregdata == NULL)
-    return false;
+    return FALSE;
 
   n_gregs = gregdata->n_bpo_relocs;
   gregdata->n_allocated_bpo_gregs = n_gregs;
@@ -2100,7 +2100,7 @@ _bfd_mmix_prepare_linker_allocated_gregs (abfd, info)
   gregs_size = n_gregs * 8;
 
   if (!bfd_set_section_size (bpo_greg_owner, bpo_gregs_section, gregs_size))
-    return false;
+    return FALSE;
 
   /* Allocate and set up the GREG arrays.  They're filled in at relaxation
      time.  Note that we must use the max number ever noted for the array,
@@ -2116,7 +2116,7 @@ _bfd_mmix_prepare_linker_allocated_gregs (abfd, info)
 		 gregdata->n_max_bpo_relocs
 		 * sizeof (size_t));
   if (bpo_reloc_indexes == NULL)
-    return false;
+    return FALSE;
 
   /* The default order is an identity mapping.  */
   for (i = 0; i < gregdata->n_max_bpo_relocs; i++)
@@ -2125,13 +2125,13 @@ _bfd_mmix_prepare_linker_allocated_gregs (abfd, info)
       gregdata->reloc_request[i].bpo_reloc_no = i;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Fill in contents in the linker allocated gregs.  Everything is
    calculated at this point; we just move the contents into place here.  */
 
-boolean
+bfd_boolean
 _bfd_mmix_finalize_linker_allocated_gregs (abfd, link_info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info;
@@ -2149,7 +2149,7 @@ _bfd_mmix_finalize_linker_allocated_gregs (abfd, link_info)
      object, there was no R_MMIX_BASE_PLUS_OFFSET.  */
   bpo_greg_owner = (bfd *) link_info->base_file;
   if (bpo_greg_owner == NULL)
-    return true;
+    return TRUE;
 
   bpo_gregs_section
     = bfd_get_section_by_name (bpo_greg_owner,
@@ -2159,14 +2159,14 @@ _bfd_mmix_finalize_linker_allocated_gregs (abfd, link_info)
      without any R_MMIX_BASE_PLUS_OFFSET seen, there will be no such
      section.  */
   if (bpo_gregs_section == NULL)
-    return true;
+    return TRUE;
 
   /* We use the target-data handle in the ELF section data.  */
 
   gregdata = (struct bpo_greg_section_info *)
     elf_section_data (bpo_gregs_section)->tdata;
   if (gregdata == NULL)
-    return false;
+    return FALSE;
 
   n_gregs = gregdata->n_allocated_bpo_gregs;
 
@@ -2176,7 +2176,7 @@ _bfd_mmix_finalize_linker_allocated_gregs (abfd, link_info)
   bpo_gregs_section->contents
     = contents = bfd_alloc (bpo_greg_owner, bpo_gregs_section->_raw_size);
   if (contents == NULL)
-    return false;
+    return FALSE;
 
   /* Sanity check: If these numbers mismatch, some relocation has not been
      accounted for and the rest of gregdata is probably inconsistent.
@@ -2190,7 +2190,7 @@ _bfd_mmix_finalize_linker_allocated_gregs (abfd, link_info)
   Please report this bug."),
 	 gregdata->n_remaining_bpo_relocs_this_relaxation_round,
 	 gregdata->n_bpo_relocs);
-      return false;
+      return FALSE;
     }
 
   for (lastreg = 255, i = 0, j = 0; j < n_gregs; i++)
@@ -2202,7 +2202,7 @@ _bfd_mmix_finalize_linker_allocated_gregs (abfd, link_info)
 	j++;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Sort valid relocs to come before non-valid relocs, then on increasing
@@ -2300,12 +2300,12 @@ mmix_dump_bpo_gregs (link_info, pf)
 
    Symbol- and reloc-reading infrastructure copied from elf-m10200.c.  */
 
-static boolean
+static bfd_boolean
 mmix_elf_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
@@ -2320,7 +2320,7 @@ mmix_elf_relax_section (abfd, sec, link_info, again)
   Elf_Internal_Sym *isymbuf = NULL;
 
   /* Assume nothing changes.  */
-  *again = false;
+  *again = FALSE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -2337,7 +2337,7 @@ mmix_elf_relax_section (abfd, sec, link_info, again)
       || (sec->flags & SEC_LINKER_CREATED) != 0
       /* If no R_MMIX_BASE_PLUS_OFFSET relocs, then nothing to do.  */
       || bpodata == NULL)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
 
@@ -2425,7 +2425,7 @@ mmix_elf_relax_section (abfd, sec, link_info, again)
 
       gregdata->reloc_request[gregdata->bpo_reloc_indexes[bpono]].value
 	= symval + irel->r_addend;
-      gregdata->reloc_request[gregdata->bpo_reloc_indexes[bpono++]].valid = true;
+      gregdata->reloc_request[gregdata->bpo_reloc_indexes[bpono++]].valid = TRUE;
       gregdata->n_remaining_bpo_relocs_this_relaxation_round--;
     }
 
@@ -2458,7 +2458,7 @@ mmix_elf_relax_section (abfd, sec, link_info, again)
 	  {
 	    gregdata->bpo_reloc_indexes[gregdata->reloc_request[i].bpo_reloc_no]
 	      = i;
-	    *again = true;
+	    *again = TRUE;
 	  }
 
       /* Allocate register numbers (indexing from 0).  Stop at the first
@@ -2484,7 +2484,7 @@ mmix_elf_relax_section (abfd, sec, link_info, again)
       if (gregdata->n_allocated_bpo_gregs != regindex + 1)
 	{
 	  gregdata->n_allocated_bpo_gregs = regindex + 1;
-	  *again = true;
+	  *again = TRUE;
 	}
 
       bpo_gregs_section->_cooked_size = (regindex + 1) * 8;
@@ -2505,7 +2505,7 @@ mmix_elf_relax_section (abfd, sec, link_info, again)
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL && (unsigned char *) isymbuf != symtab_hdr->contents)
@@ -2513,7 +2513,7 @@ mmix_elf_relax_section (abfd, sec, link_info, again)
   if (internal_relocs != NULL
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
-  return false;
+  return FALSE;
 }
 
 #define ELF_ARCH		bfd_arch_mmix
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index f572ffed46c..6dcdedb29b6 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -52,9 +52,9 @@ static bfd_reloc_status_type ppc64_elf_toc64_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type ppc64_elf_unhandled_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean ppc64_elf_object_p
+static bfd_boolean ppc64_elf_object_p
   PARAMS ((bfd *));
-static boolean ppc64_elf_merge_private_bfd_data
+static bfd_boolean ppc64_elf_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
 
 
@@ -124,7 +124,7 @@ static boolean ppc64_elf_merge_private_bfd_data
 #endif
 
 #define ONES(n) (((bfd_vma) 1 << ((n) - 1) << 1) - 1)
- 
+
 /* Relocation HOWTO's.  */
 static reloc_howto_type *ppc64_elf_howto_table[(int) R_PPC_max];
 
@@ -134,30 +134,30 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_NONE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 32 bit relocation.  */
   HOWTO (R_PPC64_ADDR32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An absolute 26 bit branch; the lower two bits must be zero.
      FIXME: we don't check that, we just clear them.  */
@@ -165,60 +165,60 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR24",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A standard 16 bit relocation.  */
   HOWTO (R_PPC64_ADDR16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit relocation without overflow.  */
   HOWTO (R_PPC64_ADDR16_LO,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Bits 16-31 of an address.  */
   HOWTO (R_PPC64_ADDR16_HI,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Bits 16-31 of an address, plus 1 if the contents of the low 16
      bits, treated as a signed number, is negative.  */
@@ -226,15 +226,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_ha_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An absolute 16 bit branch; the lower two bits must be zero.
      FIXME: we don't check that, we just clear them.  */
@@ -242,15 +242,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR14",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000fffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An absolute 16 bit branch, for which bit 10 should be set to
      indicate that the branch is expected to be taken.  The lower two
@@ -259,15 +259,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc64_elf_brtaken_reloc, /* special_function */
 	 "R_PPC64_ADDR14_BRTAKEN",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000fffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* An absolute 16 bit branch, for which bit 10 should be set to
      indicate that the branch is not expected to be taken.  The lower
@@ -276,45 +276,45 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc64_elf_brtaken_reloc, /* special_function */
 	 "R_PPC64_ADDR14_BRNTAKEN",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000fffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A relative 26 bit branch; the lower two bits must be zero.  */
   HOWTO (R_PPC64_REL24,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_REL24",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x03fffffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 16 bit branch; the lower two bits must be zero.  */
   HOWTO (R_PPC64_REL14,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_REL14",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000fffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 16 bit branch.  Bit 10 should be set to indicate that
      the branch is expected to be taken.  The lower two bits must be
@@ -323,15 +323,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc64_elf_brtaken_reloc, /* special_function */
 	 "R_PPC64_REL14_BRTAKEN", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000fffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A relative 16 bit branch.  Bit 10 should be set to indicate that
      the branch is not expected to be taken.  The lower two bits must
@@ -340,15 +340,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc64_elf_brtaken_reloc, /* special_function */
 	 "R_PPC64_REL14_BRNTAKEN",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000fffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16, but referring to the GOT table entry for the
      symbol.  */
@@ -356,15 +356,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_GOT16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16_LO, but referring to the GOT table entry for
      the symbol.  */
@@ -372,15 +372,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_GOT16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16_HI, but referring to the GOT table entry for
      the symbol.  */
@@ -388,15 +388,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_GOT16_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16_HA, but referring to the GOT table entry for
      the symbol.  */
@@ -404,15 +404,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_GOT16_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* This is used only by the dynamic linker.  The symbol should exist
      both in the object being run and in some shared library.  The
@@ -423,15 +423,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 0,			/* this one is variable size */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_COPY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR64, but used when setting global offset table
      entries.  */
@@ -439,15 +439,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc,  /* special_function */
 	 "R_PPC64_GLOB_DAT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ONES (64),		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Created by the link editor.  Marks a procedure linkage table
      entry for a symbol.  */
@@ -455,15 +455,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_JMP_SLOT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used only by the dynamic linker.  When the object is run, this
      doubleword64 is set to the load address of the object, plus the
@@ -472,76 +472,76 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_RELATIVE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ONES (64),		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR32, but may be unaligned.  */
   HOWTO (R_PPC64_UADDR32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_UADDR32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16, but may be unaligned.  */
   HOWTO (R_PPC64_UADDR16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_UADDR16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32-bit PC relative.  */
   HOWTO (R_PPC64_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 /* FIXME: Verify.  Was complain_overflow_bitfield.  */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_REL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 32-bit relocation to the symbol's procedure linkage table.  */
   HOWTO (R_PPC64_PLT32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLT32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32-bit PC relative relocation to the symbol's procedure linkage table.
      FIXME: R_PPC64_PLTREL32 not supported.  */
@@ -549,15 +549,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_PLTREL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16_LO, but referring to the PLT table entry for
      the symbol.  */
@@ -565,15 +565,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLT16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16_HI, but referring to the PLT table entry for
      the symbol.  */
@@ -581,15 +581,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLT16_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16_HA, but referring to the PLT table entry for
      the symbol.  */
@@ -597,75 +597,75 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLT16_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16-bit section relative relocation.  */
   HOWTO (R_PPC64_SECTOFF,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc64_elf_sectoff_reloc, /* special_function */
 	 "R_PPC64_SECTOFF",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_SECTOFF, but no overflow warning.  */
   HOWTO (R_PPC64_SECTOFF_LO,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_sectoff_reloc, /* special_function */
 	 "R_PPC64_SECTOFF_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16-bit upper half section relative relocation.  */
   HOWTO (R_PPC64_SECTOFF_HI,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_sectoff_reloc, /* special_function */
 	 "R_PPC64_SECTOFF_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16-bit upper half adjusted section relative relocation.  */
   HOWTO (R_PPC64_SECTOFF_HA,	/* type */
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_sectoff_ha_reloc, /* special_function */
 	 "R_PPC64_SECTOFF_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_REL24 without touching the two least significant
      bits.  Should have been named R_PPC64_REL30!  */
@@ -673,15 +673,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 30,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_PPC64_ADDR30",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffffffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Relocs in the 64-bit PowerPC ELF ABI, not in the 32-bit ABI.  */
 
@@ -690,30 +690,30 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ONES (64),		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The bits 32-47 of an address.  */
   HOWTO (R_PPC64_ADDR16_HIGHER,	/* type */
 	 32,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_HIGHER", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The bits 32-47 of an address, plus 1 if the contents of the low
      16 bits, treated as a signed number, is negative.  */
@@ -721,30 +721,30 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 32,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_ha_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_HIGHERA", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The bits 48-63 of an address.  */
   HOWTO (R_PPC64_ADDR16_HIGHEST,/* type */
 	 48,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_HIGHEST", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The bits 48-63 of an address, plus 1 if the contents of the low
      16 bits, treated as a signed number, is negative.  */
@@ -752,60 +752,60 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 48,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_ha_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_HIGHESTA", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like ADDR64, but may be unaligned.  */
   HOWTO (R_PPC64_UADDR64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_UADDR64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ONES (64),		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64-bit relative relocation.  */
   HOWTO (R_PPC64_REL64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_REL64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ONES (64),		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 64-bit relocation to the symbol's procedure linkage table.  */
   HOWTO (R_PPC64_PLT64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLT64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ONES (64),		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64-bit PC relative relocation to the symbol's procedure linkage
      table.  */
@@ -814,15 +814,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLTREL64",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ONES (64),		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 16 bit TOC-relative relocation.  */
 
@@ -831,15 +831,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc64_elf_toc_reloc,	/* special_function */
 	 "R_PPC64_TOC16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit TOC-relative relocation without overflow.  */
 
@@ -848,15 +848,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_toc_reloc,	/* special_function */
 	 "R_PPC64_TOC16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit TOC-relative relocation, high 16 bits.  */
 
@@ -865,15 +865,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_toc_reloc,	/* special_function */
 	 "R_PPC64_TOC16_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit TOC-relative relocation, high 16 bits, plus 1 if the
      contents of the low 16 bits, treated as a signed number, is
@@ -884,15 +884,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_toc_ha_reloc, /* special_function */
 	 "R_PPC64_TOC16_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64-bit relocation; insert value of TOC base (.TOC.).  */
 
@@ -901,15 +901,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc64_elf_toc64_reloc,	/* special_function */
 	 "R_PPC64_TOC",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ONES (64),		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_GOT16, but also informs the link editor that the
      value to relocate may (!) refer to a PLT entry which the link
@@ -924,15 +924,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLTGOT16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_PLTGOT16, but without overflow.  */
   /* FIXME: R_PPC64_PLTGOT16_LO not implemented.  */
@@ -940,15 +940,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLTGOT16_LO",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_PLT_GOT16, but using bits 16-31 of the address.  */
   /* FIXME: R_PPC64_PLTGOT16_HI not implemented.  */
@@ -956,15 +956,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLTGOT16_HI",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_PLT_GOT16, but using bits 16-31 of the address, plus
      1 if the contents of the low 16 bits, treated as a signed number,
@@ -974,150 +974,150 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 16,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLTGOT16_HA",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16, but for instructions with a DS field.  */
   HOWTO (R_PPC64_ADDR16_DS,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_DS",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_ADDR16_LO, but for instructions with a DS field.  */
   HOWTO (R_PPC64_ADDR16_LO_DS,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_PPC64_ADDR16_LO_DS",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_GOT16, but for instructions with a DS field.  */
   HOWTO (R_PPC64_GOT16_DS,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_GOT16_DS",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_GOT16_LO, but for instructions with a DS field.  */
   HOWTO (R_PPC64_GOT16_LO_DS,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_GOT16_LO_DS",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_PLT16_LO, but for instructions with a DS field.  */
   HOWTO (R_PPC64_PLT16_LO_DS,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLT16_LO_DS",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_SECTOFF, but for instructions with a DS field.  */
   HOWTO (R_PPC64_SECTOFF_DS,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 ppc64_elf_sectoff_reloc, /* special_function */
 	 "R_PPC64_SECTOFF_DS",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_SECTOFF_LO, but for instructions with a DS field.  */
   HOWTO (R_PPC64_SECTOFF_LO_DS, /* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_sectoff_reloc, /* special_function */
 	 "R_PPC64_SECTOFF_LO_DS",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_TOC16, but for instructions with a DS field.  */
   HOWTO (R_PPC64_TOC16_DS,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc64_elf_toc_reloc,	/* special_function */
 	 "R_PPC64_TOC16_DS",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_TOC16_LO, but for instructions with a DS field.  */
   HOWTO (R_PPC64_TOC16_LO_DS,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_toc_reloc,	/* special_function */
 	 "R_PPC64_TOC16_LO_DS",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_PLTGOT16, but for instructions with a DS field.  */
   /* FIXME: R_PPC64_PLTGOT16_DS not implemented.  */
@@ -1125,15 +1125,15 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLTGOT16_DS",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Like R_PPC64_PLTGOT16_LO, but for instructions with a DS field.  */
   /* FIXME: R_PPC64_PLTGOT16_LO not implemented.  */
@@ -1141,45 +1141,45 @@ static reloc_howto_type ppc64_elf_howto_raw[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 ppc64_elf_unhandled_reloc, /* special_function */
 	 "R_PPC64_PLTGOT16_LO_DS",/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy.  */
   HOWTO (R_PPC64_GNU_VTINHERIT,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_PPC64_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage.  */
   HOWTO (R_PPC64_GNU_VTENTRY,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_PPC64_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 
@@ -1407,7 +1407,7 @@ ppc64_elf_brtaken_reloc (abfd, reloc_entry, symbol, data,
   enum elf_ppc_reloc_type r_type;
   bfd_size_type octets;
   /* Disabled until we sort out how ld should choose 'y' vs 'at'.  */
-  boolean is_power4 = false;
+  bfd_boolean is_power4 = FALSE;
 
   /* If this is a relocatable link (output_bfd test tells us), just
      call the generic function.  Any adjustment will be done at final
@@ -1630,7 +1630,7 @@ ppc64_elf_unhandled_reloc (abfd, reloc_entry, symbol, data,
 /* Fix bad default arch selected for a 64 bit input bfd when the
    default is 32 bit.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_object_p (abfd)
      bfd *abfd;
 {
@@ -1645,13 +1645,13 @@ ppc64_elf_object_p (abfd)
 	  BFD_ASSERT (abfd->arch_info->bits_per_word == 64);
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -1671,10 +1671,10 @@ ppc64_elf_merge_private_bfd_data (ibfd, obfd)
       (*_bfd_error_handler) (msg, bfd_archive_filename (ibfd));
 
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The following functions are specific to the ELF linker, while
@@ -1946,59 +1946,59 @@ static struct ppc_stub_hash_entry *ppc_get_stub_entry
 	   const Elf_Internal_Rela *, struct ppc_link_hash_table *));
 static struct ppc_stub_hash_entry *ppc_add_stub
   PARAMS ((const char *, asection *, struct ppc_link_hash_table *));
-static boolean create_linkage_sections
+static bfd_boolean create_linkage_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean create_got_section
+static bfd_boolean create_got_section
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean ppc64_elf_create_dynamic_sections
+static bfd_boolean ppc64_elf_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static void ppc64_elf_copy_indirect_symbol
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
-static boolean ppc64_elf_check_relocs
+static bfd_boolean ppc64_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection * ppc64_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean ppc64_elf_gc_sweep_hook
+static bfd_boolean ppc64_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean func_desc_adjust
+static bfd_boolean func_desc_adjust
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean ppc64_elf_func_desc_adjust
+static bfd_boolean ppc64_elf_func_desc_adjust
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean ppc64_elf_adjust_dynamic_symbol
+static bfd_boolean ppc64_elf_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 static void ppc64_elf_hide_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
-static boolean allocate_dynrelocs
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean));
+static bfd_boolean allocate_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean readonly_dynrelocs
+static bfd_boolean readonly_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
 static enum elf_reloc_type_class ppc64_elf_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
-static boolean ppc64_elf_size_dynamic_sections
+static bfd_boolean ppc64_elf_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static INLINE enum ppc_stub_type ppc_type_of_stub
   PARAMS ((asection *, const Elf_Internal_Rela *,
 	   struct ppc_link_hash_entry **, bfd_vma));
 static bfd_byte *build_plt_stub
   PARAMS ((bfd *, bfd_byte *, int, int));
-static boolean ppc_build_one_stub
+static bfd_boolean ppc_build_one_stub
   PARAMS ((struct bfd_hash_entry *, PTR));
-static boolean ppc_size_one_stub
+static bfd_boolean ppc_size_one_stub
   PARAMS ((struct bfd_hash_entry *, PTR));
 static void group_sections
-  PARAMS ((struct ppc_link_hash_table *, bfd_size_type, boolean));
-static boolean ppc64_elf_relocate_section
+  PARAMS ((struct ppc_link_hash_table *, bfd_size_type, bfd_boolean));
+static bfd_boolean ppc64_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *info, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *relocs, Elf_Internal_Sym *local_syms,
 	   asection **));
-static boolean ppc64_elf_finish_dynamic_symbol
+static bfd_boolean ppc64_elf_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean ppc64_elf_finish_dynamic_sections
+static bfd_boolean ppc64_elf_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Get the ppc64 ELF linker hash table from a link_info structure.  */
@@ -2262,7 +2262,7 @@ ppc_get_stub_entry (input_section, sym_sec, hash, rel, htab)
 	return NULL;
 
       stub_entry = ppc_stub_hash_lookup (&htab->stub_hash_table,
-					 stub_name, false, false);
+					 stub_name, FALSE, FALSE);
       if (h != NULL)
 	h->stub_cache = stub_entry;
 
@@ -2314,7 +2314,7 @@ ppc_add_stub (stub_name, section, htab)
 
   /* Enter this entry into the linker stub hash table.  */
   stub_entry = ppc_stub_hash_lookup (&htab->stub_hash_table, stub_name,
-				     true, false);
+				     TRUE, FALSE);
   if (stub_entry == NULL)
     {
       (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
@@ -2331,7 +2331,7 @@ ppc_add_stub (stub_name, section, htab)
 
 /* Create sections for linker generated code.  */
 
-static boolean
+static bfd_boolean
 create_linkage_sections (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -2348,14 +2348,14 @@ create_linkage_sections (dynobj, info)
   if (htab->sfpr == NULL
       || ! bfd_set_section_flags (dynobj, htab->sfpr, flags)
       || ! bfd_set_section_alignment (dynobj, htab->sfpr, 2))
-    return false;
+    return FALSE;
 
   /* Create .glink for lazy dynamic linking support.  */
   htab->sglink = bfd_make_section_anyway (dynobj, ".glink");
   if (htab->sglink == NULL
       || ! bfd_set_section_flags (dynobj, htab->sglink, flags)
       || ! bfd_set_section_alignment (dynobj, htab->sglink, 2))
-    return false;
+    return FALSE;
 
   /* Create .branch_lt for plt_branch stubs.  */
   flags = (SEC_ALLOC | SEC_LOAD
@@ -2364,7 +2364,7 @@ create_linkage_sections (dynobj, info)
   if (htab->sbrlt == NULL
       || ! bfd_set_section_flags (dynobj, htab->sbrlt, flags)
       || ! bfd_set_section_alignment (dynobj, htab->sbrlt, 3))
-    return false;
+    return FALSE;
 
   if (info->shared)
     {
@@ -2374,15 +2374,15 @@ create_linkage_sections (dynobj, info)
       if (!htab->srelbrlt
 	  || ! bfd_set_section_flags (dynobj, htab->srelbrlt, flags)
 	  || ! bfd_set_section_alignment (dynobj, htab->srelbrlt, 3))
-	return false;
+	return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 /* Create .got and .rela.got sections in DYNOBJ, and set up
    shortcuts to them in our hash table.  */
 
-static boolean
+static bfd_boolean
 create_got_section (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -2390,7 +2390,7 @@ create_got_section (dynobj, info)
   struct ppc_link_hash_table *htab;
 
   if (! _bfd_elf_create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   htab = ppc_hash_table (info);
   htab->sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -2404,13 +2404,13 @@ create_got_section (dynobj, info)
 				   | SEC_IN_MEMORY | SEC_LINKER_CREATED
 				   | SEC_READONLY))
       || ! bfd_set_section_alignment (dynobj, htab->srelgot, 3))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Create the dynamic sections, and set up shortcuts.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_create_dynamic_sections (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -2419,10 +2419,10 @@ ppc64_elf_create_dynamic_sections (dynobj, info)
 
   htab = ppc_hash_table (info);
   if (!htab->sgot && !create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   if (!_bfd_elf_create_dynamic_sections (dynobj, info))
-    return false;
+    return FALSE;
 
   htab->splt = bfd_get_section_by_name (dynobj, ".plt");
   htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
@@ -2434,7 +2434,7 @@ ppc64_elf_create_dynamic_sections (dynobj, info)
       || (!info->shared && !htab->srelbss))
     abort ();
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
@@ -2493,7 +2493,7 @@ ppc64_elf_copy_indirect_symbol (bed, dir, ind)
 /* Set a flag, used by ppc64_elf_gc_mark_hook, on the entry symbol and
    symbols undefined on the command-line.  */
 
-boolean
+bfd_boolean
 ppc64_elf_mark_entry_syms (info)
      struct bfd_link_info *info;
 {
@@ -2505,18 +2505,18 @@ ppc64_elf_mark_entry_syms (info)
     {
       struct elf_link_hash_entry *h;
 
-      h = elf_link_hash_lookup (&htab->elf, sym->name, false, false, false);
+      h = elf_link_hash_lookup (&htab->elf, sym->name, FALSE, FALSE, FALSE);
       if (h != NULL)
 	((struct ppc_link_hash_entry *) h)->is_entry = 1;
     }
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase, and
    calculate needed space in the global offset table, procedure
    linkage table, and dynamic reloc sections.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2532,7 +2532,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
   asection **opd_sym_map;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = ppc_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -2564,7 +2564,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
       amt = sec->_raw_size * sizeof (union opd_info) / 24;
       opd_sym_map = (asection **) bfd_zalloc (abfd, amt);
       if (opd_sym_map == NULL)
-	return false;
+	return FALSE;
       elf_section_data (sec)->tdata = opd_sym_map;
     }
 
@@ -2572,7 +2572,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
     htab->elf.dynobj = abfd;
   if (htab->sfpr == NULL
       && !create_linkage_sections (htab->elf.dynobj, info))
-    return false;
+    return FALSE;
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
@@ -2601,7 +2601,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 	  /* This symbol requires a global offset table entry.  */
 	  if (htab->sgot == NULL
 	      && !create_got_section (htab->elf.dynobj, info))
-	    return false;
+	    return FALSE;
 
 	  if (h != NULL)
 	    {
@@ -2622,7 +2622,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 		  local_got_refcounts = ((bfd_signed_vma *)
 					 bfd_zalloc (abfd, size));
 		  if (local_got_refcounts == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 		}
 	      local_got_refcounts[r_symndx] += 1;
@@ -2644,7 +2644,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 	      /* It does not make sense to have a procedure linkage
 		 table entry for a local symbol.  */
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 
 	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
@@ -2673,14 +2673,14 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_PPC64_GNU_VTINHERIT:
 	  if (!_bfd_elf64_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_PPC64_GNU_VTENTRY:
 	  if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 
 	case R_PPC64_REL14:
@@ -2711,7 +2711,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 	      struct elf_link_hash_entry *fdh;
 
 	      fdh = elf_link_hash_lookup (&htab->elf, h->root.root.string + 1,
-					  false, false, false);
+					  FALSE, FALSE, FALSE);
 	      if (fdh != NULL)
 		{
 		  ((struct ppc_link_hash_entry *) fdh)->is_func_descriptor = 1;
@@ -2731,7 +2731,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 	      s = bfd_section_from_r_symndx (abfd, &htab->sym_sec, sec,
 					     r_symndx);
 	      if (s == NULL)
-		return false;
+		return FALSE;
 	      else if (s != sec)
 		opd_sym_map[rel->r_offset / 24] = s;
 	    }
@@ -2815,7 +2815,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  if (strncmp (name, ".rela", 5) != 0
 		      || strcmp (bfd_get_section_name (abfd, sec),
@@ -2841,7 +2841,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 3))
-			return false;
+			return FALSE;
 		    }
 		  elf_section_data (sec)->sreloc = sreloc;
 		}
@@ -2862,7 +2862,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 		  s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
 						 sec, r_symndx);
 		  if (s == NULL)
-		    return false;
+		    return FALSE;
 
 		  head = ((struct ppc_dyn_relocs **)
 			  &elf_section_data (s)->local_dynrel);
@@ -2875,7 +2875,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 		       bfd_alloc (htab->elf.dynobj,
 				  (bfd_size_type) sizeof *p));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = *head;
 		  *head = p;
 		  p->sec = sec;
@@ -2894,7 +2894,7 @@ ppc64_elf_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -2937,7 +2937,7 @@ ppc64_elf_gc_mark_hook (sec, info, rel, h, sym)
 	      /* Function entry syms return NULL if they are in .opd
 		 and are not ._start (or others undefined on the ld
 		 command line).  Thus we avoid marking all function
-		 sections, as all functions are referenced in .opd.  */ 
+		 sections, as all functions are referenced in .opd.  */
 	      else if ((fdh->oh != NULL
 			&& ((struct ppc_link_hash_entry *) fdh->oh)->is_entry)
 		       || elf_section_data (sec)->tdata == NULL)
@@ -2971,7 +2971,7 @@ ppc64_elf_gc_mark_hook (sec, info, rel, h, sym)
 /* Update the .got, .plt. and dynamic reloc reference counts for the
    section being removed.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -3112,13 +3112,13 @@ ppc64_elf_gc_sweep_hook (abfd, info, sec, relocs)
 	  break;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Called via elf_link_hash_traverse to transfer dynamic linking
    information on function code symbol entries to their corresponding
    function descriptor symbol entries.  */
-static boolean
+static bfd_boolean
 func_desc_adjust (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -3127,7 +3127,7 @@ func_desc_adjust (h, inf)
   struct ppc_link_hash_table *htab;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -3138,25 +3138,25 @@ func_desc_adjust (h, inf)
   /* If this is a function code symbol, transfer dynamic linking
      information to the function descriptor symbol.  */
   if (!((struct ppc_link_hash_entry *) h)->is_func)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_undefweak
       && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR))
-    htab->have_undefweak = true;
+    htab->have_undefweak = TRUE;
 
   if (h->plt.refcount > 0
       && h->root.root.string[0] == '.'
       && h->root.root.string[1] != '\0')
     {
       struct elf_link_hash_entry *fdh = ((struct ppc_link_hash_entry *) h)->oh;
-      boolean force_local;
+      bfd_boolean force_local;
 
       /* Find the corresponding function descriptor symbol.  Create it
 	 as undefined if necessary.  */
 
       if (fdh == NULL)
 	fdh = elf_link_hash_lookup (&htab->elf, h->root.root.string + 1,
-				    false, false, true);
+				    FALSE, FALSE, TRUE);
 
       if (fdh == NULL
 	  && info->shared
@@ -3179,9 +3179,9 @@ func_desc_adjust (h, inf)
 	  bh = &fdh->root;
 	  if ( !(_bfd_generic_link_add_one_symbol
 		 (info, abfd, newsym->name, newsym->flags,
-		  newsym->section, newsym->value, NULL, false, false, &bh)))
+		  newsym->section, newsym->value, NULL, FALSE, FALSE, &bh)))
 	    {
-	      return false;
+	      return FALSE;
 	    }
 	  fdh = (struct elf_link_hash_entry *) bh;
 	  fdh->elf_link_hash_flags &= ~ELF_LINK_NON_ELF;
@@ -3195,7 +3195,7 @@ func_desc_adjust (h, inf)
 	{
 	  if (fdh->dynindx == -1)
 	    if (! bfd_elf64_link_record_dynamic_symbol (info, fdh))
-	      return false;
+	      return FALSE;
 	  fdh->elf_link_hash_flags |= (h->elf_link_hash_flags
 				       & (ELF_LINK_HASH_REF_REGULAR
 					  | ELF_LINK_HASH_REF_DYNAMIC
@@ -3229,7 +3229,7 @@ func_desc_adjust (h, inf)
       _bfd_elf_link_hash_hide_symbol (info, h, force_local);
     }
 
-  return true;
+  return TRUE;
 }
 
 #define MIN_SAVE_FPR 14
@@ -3239,7 +3239,7 @@ func_desc_adjust (h, inf)
    this hook to a) provide some gcc support functions, and b) transfer
    dynamic linking information gathered so far on function code symbol
    entries, to their corresponding function descriptor symbol entries.  */
-static boolean
+static bfd_boolean
 ppc64_elf_func_desc_adjust (obfd, info)
      bfd *obfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -3256,7 +3256,7 @@ ppc64_elf_func_desc_adjust (obfd, info)
 
   if (htab->sfpr == NULL)
     /* We don't have any relocs.  */
-    return true;
+    return TRUE;
 
   /* First provide any missing ._savef* and ._restf* functions.  */
   memcpy (sym, "._savef14", 10);
@@ -3264,7 +3264,7 @@ ppc64_elf_func_desc_adjust (obfd, info)
     {
       sym[7] = i / 10 + '0';
       sym[8] = i % 10 + '0';
-      h = elf_link_hash_lookup (&htab->elf, sym, false, false, true);
+      h = elf_link_hash_lookup (&htab->elf, sym, FALSE, FALSE, TRUE);
       if (h != NULL
 	  && h->root.type == bfd_link_hash_undefined)
 	{
@@ -3284,7 +3284,7 @@ ppc64_elf_func_desc_adjust (obfd, info)
     {
       sym[7] = i / 10 + '0';
       sym[8] = i % 10 + '0';
-      h = elf_link_hash_lookup (&htab->elf, sym, false, false, true);
+      h = elf_link_hash_lookup (&htab->elf, sym, FALSE, FALSE, TRUE);
       if (h != NULL
 	  && h->root.type == bfd_link_hash_undefined)
 	{
@@ -3310,7 +3310,7 @@ ppc64_elf_func_desc_adjust (obfd, info)
       if (!htab->have_undefweak)
 	{
 	  _bfd_strip_section_from_output (info, htab->sfpr);
-	  return true;
+	  return TRUE;
 	}
 
       htab->sfpr->_raw_size = 4;
@@ -3318,7 +3318,7 @@ ppc64_elf_func_desc_adjust (obfd, info)
 
   p = (bfd_byte *) bfd_alloc (htab->elf.dynobj, htab->sfpr->_raw_size);
   if (p == NULL)
-    return false;
+    return FALSE;
   htab->sfpr->contents = p;
 
   for (i = lowest_savef; i <= MAX_SAVE_FPR; i++)
@@ -3347,7 +3347,7 @@ ppc64_elf_func_desc_adjust (obfd, info)
       bfd_put_32 (htab->elf.dynobj, BLR, p);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -3356,7 +3356,7 @@ ppc64_elf_func_desc_adjust (obfd, info)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -3385,7 +3385,7 @@ ppc64_elf_adjust_dynamic_symbol (info, h)
 	  h->plt.offset = (bfd_vma) -1;
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	}
-      return true;
+      return TRUE;
     }
   else
     h->plt.offset = (bfd_vma) -1;
@@ -3399,7 +3399,7 @@ ppc64_elf_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -3410,12 +3410,12 @@ ppc64_elf_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   eh = (struct ppc_link_hash_entry *) h;
   for (p = eh->dyn_relocs; p != NULL; p = p->next)
@@ -3430,7 +3430,7 @@ ppc64_elf_adjust_dynamic_symbol (info, h)
   if (p == NULL)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   /* We must allocate the symbol in our .dynbss section, which will
@@ -3465,7 +3465,7 @@ ppc64_elf_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
       if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -3475,7 +3475,7 @@ ppc64_elf_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* If given a function descriptor symbol, hide both the function code
@@ -3484,7 +3484,7 @@ static void
 ppc64_elf_hide_symbol (info, h, force_local)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
-     boolean force_local;
+     bfd_boolean force_local;
 {
   _bfd_elf_link_hash_hide_symbol (info, h, force_local);
 
@@ -3511,7 +3511,7 @@ ppc64_elf_hide_symbol (info, h, force_local)
 	  save = *p;
 	  *(char *) p = '.';
 	  htab = ppc_hash_table (info);
-	  fh = elf_link_hash_lookup (&htab->elf, p, false, false, false);
+	  fh = elf_link_hash_lookup (&htab->elf, p, FALSE, FALSE, FALSE);
 	  *(char *) p = save;
 
 	  /* Unfortunately, if it so happens that the string we were
@@ -3524,7 +3524,7 @@ ppc64_elf_hide_symbol (info, h, force_local)
 	      while (q >= h->root.root.string && *q == *p)
 		--q, --p;
 	      if (q < h->root.root.string && *p == '.')
-		fh = elf_link_hash_lookup (&htab->elf, p, false, false, false);
+		fh = elf_link_hash_lookup (&htab->elf, p, FALSE, FALSE, FALSE);
 	    }
 	  if (fh != NULL)
 	    {
@@ -3537,7 +3537,7 @@ ppc64_elf_hide_symbol (info, h, force_local)
     }
 }
 
-boolean
+bfd_boolean
 ppc64_elf_edit_opd (obfd, info)
      bfd *obfd;
      struct bfd_link_info *info;
@@ -3557,7 +3557,7 @@ ppc64_elf_edit_opd (obfd, info)
       bfd_vma offset;
       bfd_size_type amt;
       long *adjust;
-      boolean need_edit;
+      bfd_boolean need_edit;
 
       sec = bfd_get_section_by_name (ibfd, ".opd");
       if (sec == NULL)
@@ -3590,11 +3590,11 @@ ppc64_elf_edit_opd (obfd, info)
 					      (Elf_Internal_Rela *) NULL,
 					      info->keep_memory);
       if (relstart == NULL)
-	return false;
+	return FALSE;
 
       /* First run through the relocs to check they are sane, and to
 	 determine whether we need to edit this opd section.  */
-      need_edit = false;
+      need_edit = FALSE;
       offset = 0;
       relend = relstart + sec->reloc_count;
       for (rel = relstart; rel < relend; rel++)
@@ -3617,7 +3617,7 @@ ppc64_elf_edit_opd (obfd, info)
 	      (*_bfd_error_handler)
 		(_("%s: unexpected reloc type %u in .opd section"),
 		 bfd_archive_filename (ibfd), r_type);
-	      need_edit = false;
+	      need_edit = FALSE;
 	      break;
 	    }
 
@@ -3633,11 +3633,11 @@ ppc64_elf_edit_opd (obfd, info)
 		 "ld -r" we might have padding in the middle of .opd.
 		 Also, there's nothing to prevent someone putting
 		 something silly in .opd with the assembler.  No .opd
-		 optimization for them!  */ 
+		 optimization for them!  */
 	      (*_bfd_error_handler)
 		(_("%s: .opd is not a regular array of opd entries"),
 		 bfd_archive_filename (ibfd));
-	      need_edit = false;
+	      need_edit = FALSE;
 	      break;
 	    }
 
@@ -3680,7 +3680,7 @@ ppc64_elf_edit_opd (obfd, info)
 		(_("%s: undefined sym `%s' in .opd section"),
 		 bfd_archive_filename (ibfd),
 		 h != NULL ? h->root.root.string : "<local symbol>");
-	      need_edit = false;
+	      need_edit = FALSE;
 	      break;
 	    }
 
@@ -3693,7 +3693,7 @@ ppc64_elf_edit_opd (obfd, info)
 	     which we test for via the output_section.  */
 	  if (sym_sec->owner != ibfd
 	      || sym_sec->output_section == bfd_abs_section_ptr)
-	    need_edit = true;
+	    need_edit = TRUE;
 
 	  offset += 24;
 	}
@@ -3702,7 +3702,7 @@ ppc64_elf_edit_opd (obfd, info)
 	{
 	  Elf_Internal_Rela *write_rel;
 	  bfd_byte *rptr, *wptr;
-	  boolean skip;
+	  bfd_boolean skip;
 
 	  /* This seems a waste of time as input .opd sections are all
 	     zeros as generated by gcc, but I suppose there's no reason
@@ -3721,7 +3721,7 @@ ppc64_elf_edit_opd (obfd, info)
 		error_free_rel:
 		  if (elf_section_data (sec)->relocs != relstart)
 		    free (relstart);
-		  return false;
+		  return FALSE;
 		}
 	      sec->contents = loc;
 	      sec->flags |= (SEC_IN_MEMORY | SEC_HAS_CONTENTS);
@@ -3732,7 +3732,7 @@ ppc64_elf_edit_opd (obfd, info)
 	  wptr = sec->contents;
 	  rptr = sec->contents;
 	  write_rel = relstart;
-	  skip = false;
+	  skip = FALSE;
 	  offset = 0;
 	  for (rel = relstart; rel < relend; rel++)
 	    {
@@ -3789,7 +3789,7 @@ ppc64_elf_edit_opd (obfd, info)
 			      htab = ppc_hash_table (info);
 			      fdh = (struct ppc_link_hash_entry *)
 				elf_link_hash_lookup (&htab->elf, fd_name,
-						      false, false, false);
+						      FALSE, FALSE, FALSE);
 			      fdh->is_func_descriptor = 1;
 			      fdh->oh = &fh->elf;
 			      fh->is_func = 1;
@@ -3824,7 +3824,7 @@ ppc64_elf_edit_opd (obfd, info)
 			      htab = ppc_hash_table (info);
 			      fdh = (struct ppc_link_hash_entry *)
 				elf_link_hash_lookup (&htab->elf, fd_name,
-						      false, false, false);
+						      FALSE, FALSE, FALSE);
 			      fdh->is_func_descriptor = 1;
 			      fdh->oh = &fh->elf;
 			      fh->is_func = 1;
@@ -3840,7 +3840,7 @@ ppc64_elf_edit_opd (obfd, info)
 			     we'd need to look through the local syms
 			     for the function descriptor sym which we
 			     don't have at the moment.  So keep an
-			     array of adjustments.  */ 
+			     array of adjustments.  */
 			  adjust[rel->r_offset / 24] = wptr - rptr;
 			}
 
@@ -3885,9 +3885,9 @@ ppc64_elf_edit_opd (obfd, info)
 	}
     }
 
-  return true;
+  return TRUE;
 }
-     
+
 /* This is the condition under which ppc64_elf_finish_dynamic_symbol
    will be called from elflink.h.  If elflink.h doesn't call our
    finish_dynamic_symbol routine, we'll need to do something about
@@ -3902,7 +3902,7 @@ ppc64_elf_edit_opd (obfd, info)
 /* Allocate space in .plt, .got and associated reloc sections for
    dynamic relocs.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -3914,7 +3914,7 @@ allocate_dynrelocs (h, inf)
   struct ppc_dyn_relocs *p;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -3968,7 +3968,7 @@ allocate_dynrelocs (h, inf)
 
   if (h->got.refcount > 0)
     {
-      boolean dyn;
+      bfd_boolean dyn;
 
       /* Make sure this symbol is output as a dynamic symbol.
 	 Undefined weak syms won't yet be marked as dynamic.  */
@@ -3976,7 +3976,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = htab->sgot;
@@ -3991,7 +3991,7 @@ allocate_dynrelocs (h, inf)
 
   eh = (struct ppc_link_hash_entry *) h;
   if (eh->dyn_relocs == NULL)
-    return true;
+    return TRUE;
 
   /* In the shared -Bsymbolic case, discard space allocated for
      dynamic pc-relative relocs against symbols which turn out to be
@@ -4037,7 +4037,7 @@ allocate_dynrelocs (h, inf)
 	      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	    {
 	      if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  /* If that succeeded, we know we'll be keeping all the
@@ -4058,12 +4058,12 @@ allocate_dynrelocs (h, inf)
       sreloc->_raw_size += p->count * sizeof (Elf64_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Find any dynamic relocs that apply to read-only sections.  */
 
-static boolean
+static bfd_boolean
 readonly_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -4086,15 +4086,15 @@ readonly_dynrelocs (h, inf)
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
-	  return false;
+	  return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -4102,7 +4102,7 @@ ppc64_elf_size_dynamic_sections (output_bfd, info)
   struct ppc_link_hash_table *htab;
   bfd *dynobj;
   asection *s;
-  boolean relocs;
+  bfd_boolean relocs;
   bfd *ibfd;
 
   htab = ppc_hash_table (info);
@@ -4192,7 +4192,7 @@ ppc64_elf_size_dynamic_sections (output_bfd, info)
 
   /* We now have determined the sizes of the various dynamic sections.
      Allocate memory for them.  */
-  relocs = false;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       if ((s->flags & SEC_LINKER_CREATED) == 0)
@@ -4225,7 +4225,7 @@ ppc64_elf_size_dynamic_sections (output_bfd, info)
 	  else
 	    {
 	      if (s != htab->srelplt)
-		relocs = true;
+		relocs = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -4255,7 +4255,7 @@ ppc64_elf_size_dynamic_sections (output_bfd, info)
 	 of garbage.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
     }
 
   if (htab->elf.dynamic_sections_created)
@@ -4271,7 +4271,7 @@ ppc64_elf_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (htab->splt != NULL && htab->splt->_raw_size != 0)
@@ -4281,14 +4281,14 @@ ppc64_elf_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0)
 	      || !add_dynamic_entry (DT_PPC64_GLINK, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (NO_OPD_RELOCS)
 	{
 	  if (!add_dynamic_entry (DT_PPC64_OPD, 0)
 	      || !add_dynamic_entry (DT_PPC64_OPDSZ, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -4296,7 +4296,7 @@ ppc64_elf_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
-	    return false;
+	    return FALSE;
 
 	  /* If any dynamic relocs apply to a read-only section,
 	     then we need a DT_TEXTREL entry.  */
@@ -4307,13 +4307,13 @@ ppc64_elf_size_dynamic_sections (output_bfd, info)
 	  if ((info->flags & DF_TEXTREL) != 0)
 	    {
 	      if (!add_dynamic_entry (DT_TEXTREL, 0))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Determine the type of stub needed, if any, for a call.  */
@@ -4399,7 +4399,7 @@ build_plt_stub (obfd, p, offset, glink)
   return p;
 }
 
-static boolean
+static bfd_boolean
 ppc_build_one_stub (gen_entry, in_arg)
      struct bfd_hash_entry *gen_entry;
      PTR in_arg;
@@ -4451,13 +4451,13 @@ ppc_build_one_stub (gen_entry, in_arg)
     case ppc_stub_plt_branch:
       br_entry = ppc_branch_hash_lookup (&htab->branch_hash_table,
 					 stub_entry->root.string + 9,
-					 false, false);
+					 FALSE, FALSE);
       if (br_entry == NULL)
 	{
 	  (*_bfd_error_handler) (_("can't find branch stub `%s'"),
 				 stub_entry->root.string + 9);
-	  htab->stub_error = true;
-	  return false;
+	  htab->stub_error = TRUE;
+	  return FALSE;
 	}
 
       off = (stub_entry->target_value
@@ -4496,8 +4496,8 @@ ppc_build_one_stub (gen_entry, in_arg)
 	    (_("linkage table error against `%s'"),
 	     stub_entry->root.string);
 	  bfd_set_error (bfd_error_bad_value);
-	  htab->stub_error = true;
-	  return false;
+	  htab->stub_error = TRUE;
+	  return FALSE;
 	}
 
       indx = off;
@@ -4540,8 +4540,8 @@ ppc_build_one_stub (gen_entry, in_arg)
 	    (_("linkage table error against `%s'"),
 	     stub_entry->h->elf.root.root.string);
 	  bfd_set_error (bfd_error_bad_value);
-	  htab->stub_error = true;
-	  return false;
+	  htab->stub_error = TRUE;
+	  return FALSE;
 	}
 
       p = build_plt_stub (stub_bfd, loc, (int) off, 0);
@@ -4550,18 +4550,18 @@ ppc_build_one_stub (gen_entry, in_arg)
 
     default:
       BFD_FAIL ();
-      return false;
+      return FALSE;
     }
 
   stub_sec->_cooked_size += size;
-  return true;
+  return TRUE;
 }
 
 /* As above, but don't actually build the stub.  Just bump offset so
    we know stub section sizes, and select plt_branch stubs where
    long_branch stubs won't do.  */
 
-static boolean
+static bfd_boolean
 ppc_size_one_stub (gen_entry, in_arg)
      struct bfd_hash_entry *gen_entry;
      PTR in_arg;
@@ -4606,13 +4606,13 @@ ppc_size_one_stub (gen_entry, in_arg)
 
 	  br_entry = ppc_branch_hash_lookup (&htab->branch_hash_table,
 					     stub_entry->root.string + 9,
-					     true, false);
+					     TRUE, FALSE);
 	  if (br_entry == NULL)
 	    {
 	      (*_bfd_error_handler) (_("can't build branch stub `%s'"),
 				     stub_entry->root.string + 9);
-	      htab->stub_error = true;
-	      return false;
+	      htab->stub_error = TRUE;
+	      return FALSE;
 	    }
 
 	  if (br_entry->iter != htab->stub_iteration)
@@ -4627,7 +4627,7 @@ ppc_size_one_stub (gen_entry, in_arg)
     }
 
   stub_entry->stub_sec->_raw_size += size;
-  return true;
+  return TRUE;
 }
 
 /* Set up various things so that we can make a list of input sections
@@ -4743,7 +4743,7 @@ static void
 group_sections (htab, stub_group_size, stubs_always_before_branch)
      struct ppc_link_hash_table *htab;
      bfd_size_type stub_group_size;
-     boolean stubs_always_before_branch;
+     bfd_boolean stubs_always_before_branch;
 {
   asection **list = htab->input_list + htab->top_index;
   do
@@ -4813,7 +4813,7 @@ group_sections (htab, stub_group_size, stubs_always_before_branch)
    PC-relative calls to a target that is unreachable with a "bl"
    instruction.  */
 
-boolean
+bfd_boolean
 ppc64_elf_size_stubs (output_bfd, stub_bfd, info, group_size,
 		      add_stub_section, layout_sections_again)
      bfd *output_bfd;
@@ -4824,7 +4824,7 @@ ppc64_elf_size_stubs (output_bfd, stub_bfd, info, group_size,
      void (*layout_sections_again) PARAMS ((void));
 {
   bfd_size_type stub_group_size;
-  boolean stubs_always_before_branch;
+  bfd_boolean stubs_always_before_branch;
   struct ppc_link_hash_table *htab = ppc_hash_table (info);
 
   /* Stash our params away.  */
@@ -4851,10 +4851,10 @@ ppc64_elf_size_stubs (output_bfd, stub_bfd, info, group_size,
       bfd *input_bfd;
       unsigned int bfd_indx;
       asection *stub_sec;
-      boolean stub_changed;
+      bfd_boolean stub_changed;
 
       htab->stub_iteration += 1;
-      stub_changed = false;
+      stub_changed = FALSE;
 
       for (input_bfd = info->input_bfds, bfd_indx = 0;
 	   input_bfd != NULL;
@@ -5010,7 +5010,7 @@ ppc64_elf_size_stubs (output_bfd, stub_bfd, info, group_size,
 		    goto error_ret_free_internal;
 
 		  stub_entry = ppc_stub_hash_lookup (&htab->stub_hash_table,
-						     stub_name, false, false);
+						     stub_name, FALSE, FALSE);
 		  if (stub_entry != NULL)
 		    {
 		      /* The proper stub has already been created.  */
@@ -5030,14 +5030,14 @@ ppc64_elf_size_stubs (output_bfd, stub_bfd, info, group_size,
 			  && (symtab_hdr->contents
 			      != (unsigned char *) local_syms))
 			free (local_syms);
-		      return false;
+		      return FALSE;
 		    }
 
 		  stub_entry->target_value = sym_value;
 		  stub_entry->target_section = sym_sec;
 		  stub_entry->stub_type = stub_type;
 		  stub_entry->h = hash;
-		  stub_changed = true;
+		  stub_changed = TRUE;
 		}
 
 	      /* We're done with the internal relocs, free them.  */
@@ -5081,7 +5081,7 @@ ppc64_elf_size_stubs (output_bfd, stub_bfd, info, group_size,
      the dynamic symbol table is corrupted since the section symbol
      for the stripped section isn't written.  */
 
-  return true;
+  return TRUE;
 }
 
 /* Called after we have determined section placement.  If sections
@@ -5145,7 +5145,7 @@ ppc64_elf_toc (obfd)
    The stubs are kept in a hash table attached to the main linker
    hash table.  This function is called via gldelf64ppc_finish.  */
 
-boolean
+bfd_boolean
 ppc64_elf_build_stubs (info)
      struct bfd_link_info *info;
 {
@@ -5166,7 +5166,7 @@ ppc64_elf_build_stubs (info)
 	{
 	  stub_sec->contents = (bfd_byte *) bfd_zalloc (htab->stub_bfd, size);
 	  if (stub_sec->contents == NULL)
-	    return false;
+	    return FALSE;
 	}
       stub_sec->_cooked_size = 0;
     }
@@ -5217,7 +5217,7 @@ ppc64_elf_build_stubs (info)
       htab->sbrlt->contents = (bfd_byte *) bfd_zalloc (htab->sbrlt->owner,
 						       htab->sbrlt->_raw_size);
       if (htab->sbrlt->contents == NULL)
-	return false;
+	return FALSE;
     }
 
   /* Build the stubs as directed by the stub hash table.  */
@@ -5234,7 +5234,7 @@ ppc64_elf_build_stubs (info)
   if (stub_sec != NULL
       || htab->sglink->_raw_size != htab->sglink->_cooked_size)
     {
-      htab->stub_error = true;
+      htab->stub_error = TRUE;
       (*_bfd_error_handler) (_("stubs don't match calculated size"));
     }
 
@@ -5270,7 +5270,7 @@ ppc64_elf_build_stubs (info)
    section, which means that the addend must be adjusted
    accordingly.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			    contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -5289,13 +5289,13 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
   bfd_vma *local_got_offsets;
   bfd_vma TOCstart;
-  boolean ret = true;
-  boolean is_opd;
+  bfd_boolean ret = TRUE;
+  bfd_boolean is_opd;
   /* Disabled until we sort out how ld should choose 'y' vs 'at'.  */
-  boolean is_power4 = false;
+  bfd_boolean is_power4 = FALSE;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   /* Initialize howto table if needed.  */
   if (!ppc64_elf_howto_table[R_PPC64_ADDR32])
@@ -5323,8 +5323,8 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       const char *sym_name;
       unsigned long r_symndx;
       bfd_vma relocation;
-      boolean unresolved_reloc;
-      boolean warned;
+      bfd_boolean unresolved_reloc;
+      bfd_boolean warned;
       long insn;
       struct ppc_stub_hash_entry *stub_entry;
       bfd_vma max_br_offset;
@@ -5339,8 +5339,8 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       sec = (asection *) 0;
       h = (struct elf_link_hash_entry *) 0;
       sym_name = (const char *) 0;
-      unresolved_reloc = false;
-      warned = false;
+      unresolved_reloc = FALSE;
+      warned = FALSE;
 
       if (r_type == R_PPC64_TOC)
 	{
@@ -5385,7 +5385,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		   relocation value for this symbol.  output_section
 		   is typically NULL for symbols satisfied by a shared
 		   library.  */
-		unresolved_reloc = true;
+		unresolved_reloc = TRUE;
 	      else
 		relocation = (h->root.u.def.value
 			      + sec->output_section->vma
@@ -5405,8 +5405,8 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      offset, (!info->shared
 			       || info->no_undefined
 			       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
-	      warned = true;
+		return FALSE;
+	      warned = TRUE;
 	    }
 	}
 
@@ -5465,7 +5465,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      && (stub_entry = ppc_get_stub_entry (input_section, sec, fdh,
 						   rel, htab)) != NULL)
 	    {
-	      boolean can_plt_call = 0;
+	      bfd_boolean can_plt_call = 0;
 
 	      if (offset + 8 <= input_section->_cooked_size)
 		{
@@ -5494,7 +5494,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				+ stub_entry->stub_sec->output_offset
 				+ stub_entry->stub_sec->output_section->vma);
 		  addend = 0;
-		  unresolved_reloc = false;
+		  unresolved_reloc = FALSE;
 		}
 	    }
 
@@ -5533,7 +5533,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	     bfd_archive_filename (input_bfd), (int) r_type, sym_name);
 
 	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 
 	case R_PPC64_NONE:
@@ -5561,7 +5561,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	    if (h != NULL)
 	      {
-		boolean dyn;
+		bfd_boolean dyn;
 
 		off = h->got.offset;
 		dyn = htab->elf.dynamic_sections_created;
@@ -5596,7 +5596,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      }
 		  }
 		else
-		  unresolved_reloc = false;
+		  unresolved_reloc = FALSE;
 	      }
 	    else
 	      {
@@ -5672,7 +5672,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	  relocation = (htab->splt->output_section->vma
 			+ htab->splt->output_offset
 			+ h->plt.offset);
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  break;
 
 	  /* TOC16 relocs.  We want the offset relative to the TOC base,
@@ -5762,7 +5762,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      || h->root.type == bfd_link_hash_undefined)))
 	    {
 	      Elf_Internal_Rela outrel;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 	      asection *sreloc;
 	      bfd_byte *loc;
 
@@ -5770,16 +5770,16 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		 are copied into the output file to be resolved at run
 		 time.  */
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
 	      outrel.r_addend = addend;
@@ -5801,7 +5801,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		     or this is an opd section reloc which must point
 		     at a local function.  */
 		  outrel.r_addend += relocation;
-		  relocate = true;
+		  relocate = TRUE;
 		  if (r_type == R_PPC64_ADDR64 || r_type == R_PPC64_TOC)
 		    {
 		      if (is_opd && h != NULL)
@@ -5816,7 +5816,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			     bug in binutils handling of weak syms.)
 			     In these cases we won't use the opd
 			     entry in this lib.  */
-			  unresolved_reloc = false;
+			  unresolved_reloc = FALSE;
 			}
 		      outrel.r_info = ELF64_R_INFO (0, R_PPC64_RELATIVE);
 		    }
@@ -5829,7 +5829,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -5890,7 +5890,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	     ppc64_elf_howto_table[(int) r_type]->name, sym_name);
 
 	  bfd_set_error (bfd_error_invalid_operation);
-	  ret = false;
+	  ret = FALSE;
 	  continue;
 	}
 
@@ -5933,7 +5933,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		 bfd_archive_filename (input_bfd),
 		 ppc64_elf_howto_table[(int) r_type]->name);
 	      bfd_set_error (bfd_error_bad_value);
-	      ret = false;
+	      ret = FALSE;
 	      continue;
 	    }
 	  break;
@@ -5980,7 +5980,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	     bfd_get_section_name (input_bfd, input_section),
 	     (long) rel->r_offset,
 	     h->root.root.string);
-	  ret = false;
+	  ret = FALSE;
 	}
 
       r = _bfd_final_link_relocate (ppc64_elf_howto_table[(int) r_type],
@@ -6029,7 +6029,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (!((*info->callbacks->reloc_overflow)
 		    (info, name, ppc64_elf_howto_table[(int) r_type]->name,
 		     rel->r_addend, input_bfd, input_section, offset)))
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
@@ -6038,7 +6038,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		 bfd_archive_filename (input_bfd),
 		 bfd_get_section_name (input_bfd, input_section),
 		 (long) rel->r_offset, name, (int) r);
-	      ret = false;
+	      ret = FALSE;
 	    }
 	}
     }
@@ -6049,7 +6049,7 @@ ppc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -6164,7 +6164,7 @@ ppc64_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
   if (strcmp (h->root.root.string, "_DYNAMIC") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Used to decide how to sort relocs in an optimal manner for the
@@ -6192,7 +6192,7 @@ ppc64_elf_reloc_type_class (rela)
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 ppc64_elf_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -6288,7 +6288,7 @@ ppc64_elf_finish_dynamic_sections (output_bfd, info)
 	= PLT_ENTRY_SIZE;
     }
 
-  return true;
+  return TRUE;
 }
 
 #define TARGET_LITTLE_SYM	bfd_elf64_powerpcle_vec
diff --git a/bfd/elf64-ppc.h b/bfd/elf64-ppc.h
index 21178d556d7..3115ea5c9f9 100644
--- a/bfd/elf64-ppc.h
+++ b/bfd/elf64-ppc.h
@@ -17,9 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-boolean ppc64_elf_mark_entry_syms
+bfd_boolean ppc64_elf_mark_entry_syms
   PARAMS ((struct bfd_link_info *));
-boolean ppc64_elf_edit_opd
+bfd_boolean ppc64_elf_edit_opd
   PARAMS ((bfd *, struct bfd_link_info *));
 bfd_vma ppc64_elf_toc
   PARAMS ((bfd *));
@@ -27,8 +27,8 @@ int ppc64_elf_setup_section_lists
   PARAMS ((bfd *, struct bfd_link_info *));
 void ppc64_elf_next_input_section
   PARAMS ((struct bfd_link_info *, asection *));
-boolean ppc64_elf_size_stubs
+bfd_boolean ppc64_elf_size_stubs
   PARAMS ((bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
 	   asection *(*) (const char *, asection *), void (*) (void)));
-boolean ppc64_elf_build_stubs
+bfd_boolean ppc64_elf_build_stubs
   PARAMS ((struct bfd_link_info *));
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index 31d59c7cd70..db5237f2e7f 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -29,47 +29,47 @@ static reloc_howto_type *elf_s390_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void elf_s390_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf_s390_is_local_label_name
+static bfd_boolean elf_s390_is_local_label_name
   PARAMS ((bfd *, const char *));
 static struct bfd_hash_entry *link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *elf_s390_link_hash_table_create
   PARAMS ((bfd *));
-static boolean create_got_section
+static bfd_boolean create_got_section
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf_s390_create_dynamic_sections
+static bfd_boolean elf_s390_create_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
 static void elf_s390_copy_indirect_symbol
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
-static boolean elf_s390_check_relocs
+static bfd_boolean elf_s390_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection *elf_s390_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf_s390_gc_sweep_hook
+static bfd_boolean elf_s390_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean elf_s390_adjust_dynamic_symbol
+static bfd_boolean elf_s390_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean allocate_dynrelocs
+static bfd_boolean allocate_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean readonly_dynrelocs
+static bfd_boolean readonly_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_s390_size_dynamic_sections
+static bfd_boolean elf_s390_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_s390_relocate_section
+static bfd_boolean elf_s390_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf_s390_finish_dynamic_symbol
+static bfd_boolean elf_s390_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
 static enum elf_reloc_type_class elf_s390_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
-static boolean elf_s390_finish_dynamic_sections
+static bfd_boolean elf_s390_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_s390_object_p PARAMS ((bfd *));
+static bfd_boolean elf_s390_object_p PARAMS ((bfd *));
 
 #include "elf/s390.h"
 
@@ -84,49 +84,49 @@ static reloc_howto_type elf_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc, /* special_function */
 	 "R_390_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO(R_390_8,         0, 0,  8, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_8",       false, 0,0x000000ff, false),
-  HOWTO(R_390_12,        0, 1, 12, false, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_12",      false, 0,0x00000fff, false),
-  HOWTO(R_390_16,        0, 1, 16, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_16",      false, 0,0x0000ffff, false),
-  HOWTO(R_390_32,        0, 2, 32, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_32",      false, 0,0xffffffff, false),
-  HOWTO(R_390_PC32,	 0, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32",    false, 0,0xffffffff,  true),
-  HOWTO(R_390_GOT12,	 0, 1, 12, false, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_GOT12",   false, 0,0x00000fff, false),
-  HOWTO(R_390_GOT32,	 0, 2, 32, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT32",   false, 0,0xffffffff, false),
-  HOWTO(R_390_PLT32,	 0, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32",   false, 0,0xffffffff,  true),
-  HOWTO(R_390_COPY,      0, 4, 64, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_COPY",    false, 0,MINUS_ONE, false),
-  HOWTO(R_390_GLOB_DAT,  0, 4, 64, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GLOB_DAT",false, 0,MINUS_ONE, false),
-  HOWTO(R_390_JMP_SLOT,  0, 4, 64, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_JMP_SLOT",false, 0,MINUS_ONE, false),
-  HOWTO(R_390_RELATIVE,  0, 4, 64,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_RELATIVE",false, 0,MINUS_ONE, false),
-  HOWTO(R_390_GOTOFF,    0, 4, 64, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTOFF",  false, 0,MINUS_ONE, false),
-  HOWTO(R_390_GOTPC,     0, 4, 64,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPC",   false, 0,MINUS_ONE,  true),
-  HOWTO(R_390_GOT16,     0, 1, 16, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT16",   false, 0,0x0000ffff, false),
-  HOWTO(R_390_PC16,      0, 1, 16,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16",    false, 0,0x0000ffff,  true),
-  HOWTO(R_390_PC16DBL,   1, 1, 16,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16DBL", false, 0,0x0000ffff,  true),
-  HOWTO(R_390_PLT16DBL,  1, 1, 16,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT16DBL", false, 0,0x0000ffff,  true),
-  HOWTO(R_390_PC32DBL,	 1, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32DBL", false, 0,0xffffffff,  true),
-  HOWTO(R_390_PLT32DBL,	 1, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32DBL", false, 0,0xffffffff,  true),
-  HOWTO(R_390_GOTPCDBL,  1, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPCDBL", false, 0,MINUS_ONE,  true),
-  HOWTO(R_390_64,        0, 4, 64, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_64",      false, 0,MINUS_ONE, false),
-  HOWTO(R_390_PC64,	 0, 4, 64,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC64",    false, 0,MINUS_ONE,  true),
-  HOWTO(R_390_GOT64,	 0, 4, 64, false, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT64",   false, 0,MINUS_ONE, false),
-  HOWTO(R_390_PLT64,	 0, 4, 64,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT64",   false, 0,MINUS_ONE,  true),
-  HOWTO(R_390_GOTENT,	 1, 2, 32,  true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTENT",   false, 0,MINUS_ONE,  true),
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO(R_390_8,         0, 0,  8, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_8",       FALSE, 0,0x000000ff, FALSE),
+  HOWTO(R_390_12,        0, 1, 12, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_12",      FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_16,        0, 1, 16, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_16",      FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_32,        0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_32",      FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PC32,	 0, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32",    FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_GOT12,	 0, 1, 12, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_GOT12",   FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_GOT32,	 0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT32",   FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PLT32,	 0, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32",   FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_COPY,      0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_COPY",    FALSE, 0,MINUS_ONE, FALSE),
+  HOWTO(R_390_GLOB_DAT,  0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GLOB_DAT",FALSE, 0,MINUS_ONE, FALSE),
+  HOWTO(R_390_JMP_SLOT,  0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_JMP_SLOT",FALSE, 0,MINUS_ONE, FALSE),
+  HOWTO(R_390_RELATIVE,  0, 4, 64,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_RELATIVE",FALSE, 0,MINUS_ONE, FALSE),
+  HOWTO(R_390_GOTOFF,    0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTOFF",  FALSE, 0,MINUS_ONE, FALSE),
+  HOWTO(R_390_GOTPC,     0, 4, 64,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPC",   FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOT16,     0, 1, 16, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT16",   FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_PC16,      0, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16",    FALSE, 0,0x0000ffff,  TRUE),
+  HOWTO(R_390_PC16DBL,   1, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16DBL", FALSE, 0,0x0000ffff,  TRUE),
+  HOWTO(R_390_PLT16DBL,  1, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT16DBL", FALSE, 0,0x0000ffff,  TRUE),
+  HOWTO(R_390_PC32DBL,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32DBL", FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_PLT32DBL,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32DBL", FALSE, 0,0xffffffff,  TRUE),
+  HOWTO(R_390_GOTPCDBL,  1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPCDBL", FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_64,        0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_64",      FALSE, 0,MINUS_ONE, FALSE),
+  HOWTO(R_390_PC64,	 0, 4, 64,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC64",    FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOT64,	 0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT64",   FALSE, 0,MINUS_ONE, FALSE),
+  HOWTO(R_390_PLT64,	 0, 4, 64,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT64",   FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOTENT,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTENT",   FALSE, 0,MINUS_ONE,  TRUE),
 };
 
 /* GNU extension to record C++ vtable hierarchy.  */
 static reloc_howto_type elf64_s390_vtinherit_howto =
-  HOWTO (R_390_GNU_VTINHERIT, 0,4,0,false,0,complain_overflow_dont, NULL, "R_390_GNU_VTINHERIT", false,0, 0, false);
+  HOWTO (R_390_GNU_VTINHERIT, 0,4,0,FALSE,0,complain_overflow_dont, NULL, "R_390_GNU_VTINHERIT", FALSE,0, 0, FALSE);
 static reloc_howto_type elf64_s390_vtentry_howto =
-  HOWTO (R_390_GNU_VTENTRY, 0,4,0,false,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_390_GNU_VTENTRY", false,0,0, false);
+  HOWTO (R_390_GNU_VTENTRY, 0,4,0,FALSE,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_390_GNU_VTENTRY", FALSE,0,0, FALSE);
 
 static reloc_howto_type *
 elf_s390_reloc_type_lookup (abfd, code)
@@ -226,13 +226,13 @@ elf_s390_info_to_howto (abfd, cache_ptr, dst)
     }
 }
 
-static boolean
+static bfd_boolean
 elf_s390_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == '.' && (name[1] == 'X' || name[1] == 'L'))
-    return true;
+    return TRUE;
 
   return _bfd_elf_is_local_label_name (abfd, name);
 }
@@ -448,7 +448,7 @@ elf_s390_link_hash_table_create (abfd)
 /* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
    shortcuts to them in our hash table.  */
 
-static boolean
+static bfd_boolean
 create_got_section (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -456,7 +456,7 @@ create_got_section (dynobj, info)
   struct elf_s390_link_hash_table *htab;
 
   if (! _bfd_elf_create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   htab = elf_s390_hash_table (info);
   htab->sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -471,15 +471,15 @@ create_got_section (dynobj, info)
 				   | SEC_IN_MEMORY | SEC_LINKER_CREATED
 				   | SEC_READONLY))
       || ! bfd_set_section_alignment (dynobj, htab->srelgot, 3))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
    .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
    hash table.  */
 
-static boolean
+static bfd_boolean
 elf_s390_create_dynamic_sections (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -488,10 +488,10 @@ elf_s390_create_dynamic_sections (dynobj, info)
 
   htab = elf_s390_hash_table (info);
   if (!htab->sgot && !create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   if (!_bfd_elf_create_dynamic_sections (dynobj, info))
-    return false;
+    return FALSE;
 
   htab->splt = bfd_get_section_by_name (dynobj, ".plt");
   htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
@@ -503,7 +503,7 @@ elf_s390_create_dynamic_sections (dynobj, info)
       || (!info->shared && !htab->srelbss))
     abort ();
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
@@ -559,7 +559,7 @@ elf_s390_copy_indirect_symbol (bed, dir, ind)
    allocate space in the global offset table or procedure linkage
    table.  */
 
-static boolean
+static bfd_boolean
 elf_s390_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -574,7 +574,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = elf_s390_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -595,7 +595,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	  (*_bfd_error_handler) (_("%s: bad symbol index: %d"),
 				 bfd_archive_filename (abfd),
 				 r_symndx);
-	  return false;
+	  return FALSE;
 	}
 
       if (r_symndx < symtab_hdr->sh_info)
@@ -630,7 +630,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		  local_got_refcounts = ((bfd_signed_vma *)
 					 bfd_zalloc (abfd, size));
 		  if (local_got_refcounts == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 		}
 	      local_got_refcounts[r_symndx] += 1;
@@ -645,7 +645,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	      if (htab->elf.dynobj == NULL)
 		htab->elf.dynobj = abfd;
 	      if (!create_got_section (htab->elf.dynobj, info))
-		return false;
+		return FALSE;
 	    }
 	  break;
 
@@ -749,7 +749,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  if (strncmp (name, ".rela", 5) != 0
 		      || strcmp (bfd_get_section_name (abfd, sec),
@@ -777,7 +777,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 3))
-			return false;
+			return FALSE;
 		    }
 		  elf_section_data (sec)->sreloc = sreloc;
 		}
@@ -798,7 +798,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		  s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
 						 sec, r_symndx);
 		  if (s == NULL)
-		    return false;
+		    return FALSE;
 
 		  head = ((struct elf_s390_dyn_relocs **)
 			  &elf_section_data (s)->local_dynrel);
@@ -811,7 +811,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		  p = ((struct elf_s390_dyn_relocs *)
 		       bfd_alloc (htab->elf.dynobj, amt));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = *head;
 		  *head = p;
 		  p->sec = sec;
@@ -833,14 +833,14 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_390_GNU_VTINHERIT:
 	  if (!_bfd_elf64_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_390_GNU_VTENTRY:
 	  if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 
 	default:
@@ -848,7 +848,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -893,7 +893,7 @@ elf_s390_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -995,7 +995,7 @@ elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
 	break;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -1004,7 +1004,7 @@ elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf_s390_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -1037,7 +1037,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	}
 
-      return true;
+      return TRUE;
     }
   else
     /* It's possible that we incorrectly decided a .plt reloc was
@@ -1056,7 +1056,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1067,18 +1067,18 @@ elf_s390_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   /* If -z nocopyreloc was given, we won't generate them either.  */
   if (info->nocopyreloc)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   eh = (struct elf_s390_link_hash_entry *) h;
@@ -1094,7 +1094,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
   if (p == NULL)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   /* We must allocate the symbol in our .dynbss section, which will
@@ -1130,7 +1130,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
       if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1140,7 +1140,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* This is the condition under which elf_s390_finish_dynamic_symbol
@@ -1157,7 +1157,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
 /* Allocate space in .plt, .got and associated reloc sections for
    dynamic relocs.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -1168,7 +1168,7 @@ allocate_dynrelocs (h, inf)
   struct elf_s390_dyn_relocs *p;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -1185,7 +1185,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
@@ -1236,7 +1236,7 @@ allocate_dynrelocs (h, inf)
   if (h->got.refcount > 0)
     {
       asection *s;
-      boolean dyn;
+      bfd_boolean dyn;
 
       /* Make sure this symbol is output as a dynamic symbol.
 	 Undefined weak syms won't yet be marked as dynamic.  */
@@ -1244,7 +1244,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = htab->sgot;
@@ -1259,7 +1259,7 @@ allocate_dynrelocs (h, inf)
 
   eh = (struct elf_s390_link_hash_entry *) h;
   if (eh->dyn_relocs == NULL)
-    return true;
+    return TRUE;
 
   /* In the shared -Bsymbolic case, discard space allocated for
      dynamic pc-relative relocs against symbols which turn out to be
@@ -1305,7 +1305,7 @@ allocate_dynrelocs (h, inf)
 	      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	    {
 	      if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  /* If that succeeded, we know we'll be keeping all the
@@ -1326,12 +1326,12 @@ allocate_dynrelocs (h, inf)
       sreloc->_raw_size += p->count * sizeof (Elf64_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Find any dynamic relocs that apply to read-only sections.  */
 
-static boolean
+static bfd_boolean
 readonly_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -1354,15 +1354,15 @@ readonly_dynrelocs (h, inf)
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
-	  return false;
+	  return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_s390_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -1370,7 +1370,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
   struct elf_s390_link_hash_table *htab;
   bfd *dynobj;
   asection *s;
-  boolean relocs;
+  bfd_boolean relocs;
   bfd *ibfd;
 
   htab = elf_s390_hash_table (info);
@@ -1460,7 +1460,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 
   /* We now have determined the sizes of the various dynamic sections.
      Allocate memory for them.  */
-  relocs = false;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       if ((s->flags & SEC_LINKER_CREATED) == 0)
@@ -1476,7 +1476,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
       else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
 	{
 	  if (s->_raw_size != 0 && s != htab->srelplt)
-	    relocs = true;
+	    relocs = TRUE;
 
 	  /* We use the reloc_count field as a counter if we need
 	     to copy relocs into the output file.  */
@@ -1511,7 +1511,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	 of garbage.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
     }
 
   if (htab->elf.dynamic_sections_created)
@@ -1527,7 +1527,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
       if (! info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (htab->splt->_raw_size != 0)
@@ -1536,7 +1536,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -1544,7 +1544,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
-	    return false;
+	    return FALSE;
 
 	  /* If any dynamic relocs apply to a read-only section,
 	     then we need a DT_TEXTREL entry.  */
@@ -1555,18 +1555,18 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	  if ((info->flags & DF_TEXTREL) != 0)
 	    {
 	      if (!add_dynamic_entry (DT_TEXTREL, 0))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate a 390 ELF section.  */
 
-static boolean
+static bfd_boolean
 elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 			      contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -1586,7 +1586,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = elf_s390_hash_table (info);
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -1605,7 +1605,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       asection *sec;
       bfd_vma off;
       bfd_vma relocation;
-      boolean unresolved_reloc;
+      bfd_boolean unresolved_reloc;
       bfd_reloc_status_type r;
 
       r_type = ELF64_R_TYPE (rel->r_info);
@@ -1615,7 +1615,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r_type < 0 || r_type >= (int) R_390_max)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       howto = elf_howto_table + r_type;
@@ -1623,7 +1623,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sec = NULL;
-      unresolved_reloc = false;
+      unresolved_reloc = FALSE;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -1647,7 +1647,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		     relocation value for this symbol.  output_section
 		     is typically NULL for symbols satisfied by a shared
 		     library.  */
-		  unresolved_reloc = true;
+		  unresolved_reloc = TRUE;
 		  relocation = 0;
 		}
 	      else
@@ -1669,7 +1669,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		      input_section, rel->r_offset,
 		      (!info->shared || info->no_undefined
 		       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1688,7 +1688,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	  if (h != NULL)
 	    {
-	      boolean dyn;
+	      bfd_boolean dyn;
 
 	      off = h->got.offset;
 	      dyn = htab->elf.dynamic_sections_created;
@@ -1721,7 +1721,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		    }
 		}
 	      else
-		unresolved_reloc = false;
+		unresolved_reloc = FALSE;
 	    }
 	  else
 	    {
@@ -1797,7 +1797,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	case R_390_GOTPCDBL:
 	  /* Use global offset table as symbol value.  */
 	  relocation = htab->sgot->output_section->vma;
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  break;
 
 	case R_390_PLT16DBL:
@@ -1824,7 +1824,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	  relocation = (htab->splt->output_section->vma
 			+ htab->splt->output_offset
 			+ h->plt.offset);
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  break;
 
 	case R_390_8:
@@ -1866,7 +1866,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		      || h->root.type == bfd_link_hash_undefined)))
 	    {
 	      Elf_Internal_Rela outrel;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 	      asection *sreloc;
 	      bfd_byte *loc;
 
@@ -1874,16 +1874,16 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		 are copied into the output file to be resolved at run
 		 time.  */
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
@@ -1908,7 +1908,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	      else
 		{
 		  /* This symbol is local, or marked to become local.  */
-		  relocate = true;
+		  relocate = TRUE;
 		  outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
 		  outrel.r_addend = relocation + rel->r_addend;
 		}
@@ -1964,7 +1964,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 						      symtab_hdr->sh_link,
 						      sym->st_name);
 	      if (name == NULL)
-		return false;
+		return FALSE;
 	      if (*name == '\0')
 		name = bfd_section_name (input_bfd, sec);
 	    }
@@ -1975,7 +1975,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
@@ -1984,18 +1984,18 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		 bfd_archive_filename (input_bfd),
 		 bfd_get_section_name (input_bfd, input_section),
 		 (long) rel->r_offset, name, (int) r);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2164,7 +2164,7 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Used to decide how to sort relocs in an optimal manner for the
@@ -2189,7 +2189,7 @@ elf_s390_reloc_type_class (rela)
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf_s390_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2305,10 +2305,10 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
       elf_section_data (htab->sgot->output_section)
 	->this_hdr.sh_entsize = 8;
     }
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf_s390_object_p (abfd)
      bfd *abfd;
 {
diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index f2109b6795c..8f6490b66df 100644
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1,5 +1,5 @@
 /* Hitachi SH64-specific support for 64-bit ELF
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -99,7 +99,7 @@ struct elf_sh64_link_hash_table
 #define sh64_elf64_link_hash_traverse(table, func, info)		\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the sh ELF linker hash table from a link_info structure.  */
@@ -107,9 +107,12 @@ struct elf_sh64_link_hash_table
 #define sh64_elf64_hash_table(p) \
   ((struct elf_sh64_link_hash_table *) ((p)->hash))
 
-static boolean sh_elf64_copy_private_data PARAMS ((bfd *, bfd *));
-static boolean sh_elf64_copy_private_data_internal PARAMS ((bfd *, bfd *));
-static boolean sh_elf64_merge_private_data PARAMS ((bfd *, bfd *));
+static bfd_boolean sh_elf64_copy_private_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean sh_elf64_copy_private_data_internal
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean sh_elf64_merge_private_data
+  PARAMS ((bfd *, bfd *));
 static bfd_reloc_status_type sh_elf64_ignore_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type sh_elf64_reloc
@@ -118,51 +121,57 @@ static reloc_howto_type *sh_elf64_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void sh_elf64_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean sh_elf64_relocate_section
+static bfd_boolean sh_elf64_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 static bfd_byte *sh_elf64_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
-static boolean sh_elf64_set_mach_from_flags PARAMS ((bfd *));
-static boolean sh_elf64_set_private_flags PARAMS ((bfd *, flagword));
+	   bfd_byte *, bfd_boolean, asymbol **));
+static bfd_boolean sh_elf64_set_mach_from_flags
+  PARAMS ((bfd *));
+static bfd_boolean sh_elf64_set_private_flags
+  PARAMS ((bfd *, flagword));
 static asection *sh_elf64_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean sh_elf64_gc_sweep_hook
+static bfd_boolean sh_elf64_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static boolean sh_elf64_check_relocs
+static bfd_boolean sh_elf64_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-static int sh64_elf64_get_symbol_type PARAMS ((Elf_Internal_Sym *, int));
-static boolean sh64_elf64_add_symbol_hook
+static int sh64_elf64_get_symbol_type
+  PARAMS ((Elf_Internal_Sym *, int));
+static bfd_boolean sh64_elf64_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
-static boolean sh64_elf64_link_output_symbol_hook
+static bfd_boolean sh64_elf64_link_output_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const char *, Elf_Internal_Sym *,
 	   asection *));
-static boolean sh64_elf64_fake_sections
+static bfd_boolean sh64_elf64_fake_sections
   PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
-static void sh64_elf64_final_write_processing PARAMS ((bfd *, boolean));
+static void sh64_elf64_final_write_processing
+  PARAMS ((bfd *, bfd_boolean));
 static struct bfd_hash_entry *sh64_elf64_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *sh64_elf64_link_hash_table_create
   PARAMS ((bfd *));
-inline static void movi_shori_putval PARAMS ((bfd *, unsigned long, char *));
-inline static void movi_3shori_putval PARAMS ((bfd *, bfd_vma, char *));
-static boolean sh64_elf64_create_dynamic_sections
+inline static void movi_shori_putval
+  PARAMS ((bfd *, unsigned long, char *));
+inline static void movi_3shori_putval
+  PARAMS ((bfd *, bfd_vma, char *));
+static bfd_boolean sh64_elf64_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean sh64_elf64_adjust_dynamic_symbol
+static bfd_boolean sh64_elf64_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *info, struct elf_link_hash_entry *));
-static boolean sh64_elf64_discard_copies
+static bfd_boolean sh64_elf64_discard_copies
   PARAMS ((struct elf_sh64_link_hash_entry *, PTR));
-static boolean sh64_elf64_size_dynamic_sections
+static bfd_boolean sh64_elf64_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean sh64_elf64_finish_dynamic_symbol
+static bfd_boolean sh64_elf64_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean sh64_elf64_finish_dynamic_sections
+static bfd_boolean sh64_elf64_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 
 static reloc_howto_type sh_elf64_howto_table[] = {
@@ -171,46 +180,46 @@ static reloc_howto_type sh_elf64_howto_table[] = {
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 sh_elf64_ignore_reloc,	/* special_function */
 	 "R_SH_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
-  /* 32 bit absolute relocation.  Setting partial_inplace to true and
+  /* 32 bit absolute relocation.  Setting partial_inplace to TRUE and
      src_mask to a non-zero value is similar to the COFF toolchain.  */
   HOWTO (R_SH_DIR32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 sh_elf64_reloc,		/* special_function */
 	 "R_SH_DIR32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit PC relative relocation.  */
   HOWTO (R_SH_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 sh_elf64_ignore_reloc,	/* special_function */
 	 "R_SH_REL32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* For 32-bit sh, this is R_SH_DIR8WPN.  */
   EMPTY_HOWTO (3),
@@ -261,15 +270,15 @@ static reloc_howto_type sh_elf64_howto_table[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf64_ignore_reloc,	/* special_function */
 	 "R_SH_SWITCH16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 32 bit switch table entry.  This is generated for an expression
      such as ``.long L1 - L2''.  The offset holds the difference
@@ -278,15 +287,15 @@ static reloc_howto_type sh_elf64_howto_table[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf64_ignore_reloc,	/* special_function */
 	 "R_SH_SWITCH32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* For 32-bit sh, this is R_SH_USES.  */
   EMPTY_HOWTO (27),
@@ -321,45 +330,45 @@ static reloc_howto_type sh_elf64_howto_table[] = {
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf64_ignore_reloc,	/* special_function */
 	 "R_SH_SWITCH8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_SH_GNU_VTINHERIT, /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_SH_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
   HOWTO (R_SH_GNU_VTENTRY,     /* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_SH_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   /* For 32-bit sh, this is R_SH_LOOP_START.  */
   EMPTY_HOWTO (36),
@@ -380,105 +389,105 @@ static reloc_howto_type sh_elf64_howto_table[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 5,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR5U",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in SHARI, SHLLI et al.  */
   HOWTO (R_SH_DIR6U,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR6U",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in BxxI, LDHI.L et al.  */
   HOWTO (R_SH_DIR6S,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR6S",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xfc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in ADDI, ANDI et al.  */
   HOWTO (R_SH_DIR10S,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 10,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR10S",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in LD.UW, ST.W et al.  */
   HOWTO (R_SH_DIR10SW,	/* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 11,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR10SW",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in LD.L, FLD.S et al.  */
   HOWTO (R_SH_DIR10SL,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR10SL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in FLD.D, FST.P et al.  */
   HOWTO (R_SH_DIR10SQ,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 13,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_DIR10SQ",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   EMPTY_HOWTO (52),
   EMPTY_HOWTO (53),
@@ -608,416 +617,416 @@ static reloc_howto_type sh_elf64_howto_table[] = {
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT_LOW16",    	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_GOT_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT_MEDLOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_GOT_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_GOT_HI16,		/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_GOTPLT_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT_LOW16",   /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_GOTPLT_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT_MEDLOW16", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_GOTPLT_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_GOTPLT_HI16,	/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_PLT_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PLT_LOW16",    	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_PLT_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PLT_MEDLOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_PLT_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PLT_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_PLT_HI16,		/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PLT_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_GOTOFF_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTOFF_LOW16",   /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_GOTOFF_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTOFF_MEDLOW16", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_GOTOFF_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTOFF_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_GOTOFF_HI16,	/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTOFF_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_GOTPC_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPC_LOW16",    /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_GOTPC_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPC_MEDLOW16", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_GOTPC_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPC_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_GOTPC_HI16,	/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPC_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),		       	/* pcrel_offset */
+	 TRUE),		       	/* pcrel_offset */
 
   /* Used in LD.L, FLD.S et al.  */
   HOWTO (R_SH_GOT10BY4,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT10BY4",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in LD.L, FLD.S et al.  */
   HOWTO (R_SH_GOTPLT10BY4,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT10BY4",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in FLD.D, FST.P et al.  */
   HOWTO (R_SH_GOT10BY8,		/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 13,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOT10BY8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in FLD.D, FST.P et al.  */
   HOWTO (R_SH_GOTPLT10BY8,	/* type */
 	 3,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 13,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GOTPLT10BY8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   HOWTO (R_SH_COPY64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_COPY64", 	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   HOWTO (R_SH_GLOB_DAT64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_GLOB_DAT64", 	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   HOWTO (R_SH_JMP_SLOT64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_JMP_SLOT64", 	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   HOWTO (R_SH_RELATIVE64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_RELATIVE64", 	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   EMPTY_HOWTO (197),
   EMPTY_HOWTO (198),
@@ -1078,15 +1087,15 @@ static reloc_howto_type sh_elf64_howto_table[] = {
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 sh_elf64_ignore_reloc,	/* special_function */
 	 "R_SH_SHMEDIA_CODE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The assembler will generate this reloc at a PTA or PTB instruction,
      and the linker checks the right type of target, or changes a PTA to a
@@ -1095,195 +1104,195 @@ static reloc_howto_type sh_elf64_howto_table[] = {
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 18,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_PT_16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in unexpanded MOVI.  */
   HOWTO (R_SH_IMMS16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMMS16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in SHORI.  */
   HOWTO (R_SH_IMMU16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_unsigned, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMMU16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI (x & 65536).  */
   HOWTO (R_SH_IMM_LOW16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_LOW16",    	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x - $) & 65536).  */
   HOWTO (R_SH_IMM_LOW16_PCREL,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_LOW16_PCREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
   HOWTO (R_SH_IMM_MEDLOW16,	/* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_MEDLOW16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI (((x - $) >> 16) & 65536).  */
   HOWTO (R_SH_IMM_MEDLOW16_PCREL, /* type */
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_MEDLOW16_PCREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
   HOWTO (R_SH_IMM_MEDHI16,	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_MEDHI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI (((x - $) >> 32) & 65536).  */
   HOWTO (R_SH_IMM_MEDHI16_PCREL, /* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_MEDHI16_PCREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
   HOWTO (R_SH_IMM_HI16,		/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* Used in MOVI and SHORI (((x - $) >> 48) & 65536).  */
   HOWTO (R_SH_IMM_HI16_PCREL,	/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_IMM_HI16_PCREL", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x3fffc00,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* For the .uaquad pseudo.  */
   HOWTO (R_SH_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_64", 		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 false),	       	/* pcrel_offset */
+	 FALSE),	       	/* pcrel_offset */
 
   /* For the .uaquad pseudo, (x - $).  */
   HOWTO (R_SH_64_PCREL,		/* type */
 	 48,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 10,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_SH_64_PCREL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 ((bfd_vma) 0) - 1,	/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
 };
 
@@ -1482,7 +1491,7 @@ sh_elf64_info_to_howto (abfd, cache_ptr, dst)
 
    See sh_elf_info_to_howto in elf32-sh.c for the original.  */
 
-static boolean
+static bfd_boolean
 sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 			   contents, relocs, local_syms, local_sections)
      bfd *output_bfd ATTRIBUTE_UNUSED;
@@ -1549,7 +1558,7 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 	      && r_type <= (int) R_SH_LAST_INVALID_RELOC_4))
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       howto = sh_elf64_howto_table + r_type;
@@ -1605,7 +1614,7 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 		     bfd_archive_filename (input_bfd),
 		     bfd_get_section_name (input_bfd, input_section),
 		     (long) rel->r_offset, howto->name);
-		  return false;
+		  return FALSE;
 		}
 
               addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
@@ -1715,8 +1724,8 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset, true)))
-		return false;
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1739,7 +1748,7 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 	    (_("%s: error: unaligned relocation type %d at %08x reloc %08x\n"),
 	     bfd_get_filename (input_bfd), (int)r_type, (unsigned)rel->r_offset, (unsigned)relocation);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       switch ((int)r_type)
 	{
@@ -1756,7 +1765,7 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      Elf_Internal_Rela outrel;
 	      bfd_byte *loc;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 
 	      /* When generating a shared object, these relocations
 		 are copied into the output file to be resolved at run
@@ -1771,7 +1780,7 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 			   elf_elfheader (input_bfd)->e_shstrndx,
 			   elf_section_data (input_section)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (input_bfd,
@@ -1782,17 +1791,17 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 		  BFD_ASSERT (sreloc != NULL);
 		}
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset
 		= _bfd_elf_section_offset (output_bfd, info,
 					   input_section, rel->r_offset);
 
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
@@ -1814,7 +1823,7 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 			  && (h->elf_link_hash_flags
 			      & ELF_LINK_HASH_DEF_REGULAR) != 0))
 		    {
-		      relocate = true;
+		      relocate = TRUE;
 		      outrel.r_info = ELF64_R_INFO (0, R_SH_RELATIVE64);
 		      outrel.r_addend = relocation + rel->r_addend;
 		    }
@@ -2123,7 +2132,7 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	default:
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 
 	}
 
@@ -2145,21 +2154,21 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 		    name = (bfd_elf_string_from_elf_section
 			    (input_bfd, symtab_hdr->sh_link, sym->st_name));
 		    if (name == NULL)
-		      return false;
+		      return FALSE;
 		    if (*name == '\0')
 		      name = bfd_section_name (input_bfd, sec);
 		  }
 		if (! ((*info->callbacks->reloc_overflow)
 		       (info, name, howto->name, (bfd_vma) 0,
 			input_bfd, input_section, rel->r_offset)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is a version of bfd_generic_get_relocated_section_contents
@@ -2174,7 +2183,7 @@ sh_elf64_get_relocated_section_contents (output_bfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   Elf_Internal_Shdr *symtab_hdr;
@@ -2219,7 +2228,7 @@ sh_elf64_get_relocated_section_contents (output_bfd, link_info, link_order,
 
       internal_relocs = (_bfd_elf64_link_read_relocs
 			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
+			  (Elf_Internal_Rela *) NULL, FALSE));
       if (internal_relocs == NULL)
 	goto error_return;
 
@@ -2281,7 +2290,7 @@ sh_elf64_get_relocated_section_contents (output_bfd, link_info, link_order,
 
 /* Set the SHF_SH5_ISA32 flag for ISA SHmedia code sections.  */
 
-boolean
+bfd_boolean
 sh64_elf64_fake_sections (output_bfd, elf_section_hdr, asect)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      Elf_Internal_Shdr *elf_section_hdr;
@@ -2291,10 +2300,10 @@ sh64_elf64_fake_sections (output_bfd, elf_section_hdr, asect)
   if (bfd_get_section_flags (output_bfd, asect) & SEC_CODE)
     elf_section_hdr->sh_flags |= SHF_SH5_ISA32;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 sh_elf64_set_mach_from_flags (abfd)
      bfd *abfd;
 {
@@ -2309,16 +2318,16 @@ sh_elf64_set_mach_from_flags (abfd)
 
     default:
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 /* Function to keep SH64 specific file flags.
 
    See sh64_elf_set_private_flags in elf32-sh64.c for the original.  */
 
-static boolean
+static bfd_boolean
 sh_elf64_set_private_flags (abfd, flags)
      bfd *    abfd;
      flagword flags;
@@ -2327,14 +2336,14 @@ sh_elf64_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
+  elf_flags_init (abfd) = TRUE;
   return sh_elf64_set_mach_from_flags (abfd);
 }
 
 /* Copy the SHF_SH5_ISA32 attribute that we keep on all sections with
    code, to keep attributes the same as for SHmedia in 32-bit ELF.  */
 
-static boolean
+static bfd_boolean
 sh_elf64_copy_private_data_internal (ibfd, obfd)
      bfd * ibfd;
      bfd * obfd;
@@ -2345,7 +2354,7 @@ sh_elf64_copy_private_data_internal (ibfd, obfd)
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   o_shdrp = elf_elfsections (obfd);
   for (osec = obfd->sections; osec; osec = osec->next)
@@ -2367,7 +2376,7 @@ sh_elf64_copy_private_data_internal (ibfd, obfd)
   return sh_elf64_set_private_flags (obfd, elf_elfheader (ibfd)->e_flags);
 }
 
-static boolean
+static bfd_boolean
 sh_elf64_copy_private_data (ibfd, obfd)
      bfd * ibfd;
      bfd * obfd;
@@ -2375,7 +2384,7 @@ sh_elf64_copy_private_data (ibfd, obfd)
   return sh_elf64_copy_private_data_internal (ibfd, obfd);
 }
 
-static boolean
+static bfd_boolean
 sh_elf64_merge_private_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -2383,11 +2392,11 @@ sh_elf64_merge_private_data (ibfd, obfd)
   flagword old_flags, new_flags;
 
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (bfd_get_arch_size (ibfd) != bfd_get_arch_size (obfd))
     {
@@ -2405,7 +2414,7 @@ sh_elf64_merge_private_data (ibfd, obfd)
       (*_bfd_error_handler) (msg, bfd_get_filename (ibfd),
 			     bfd_get_filename (obfd));
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
   old_flags = elf_elfheader (obfd)->e_flags;
@@ -2413,7 +2422,7 @@ sh_elf64_merge_private_data (ibfd, obfd)
   if (! elf_flags_init (obfd))
     {
       /* This happens when ld starts out with a 'blank' output file.  */
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = old_flags = new_flags;
     }
   /* We don't allow linking in anything else than SH64 code, and since
@@ -2425,7 +2434,7 @@ sh_elf64_merge_private_data (ibfd, obfd)
 	("%s: does not use the SH64 64-bit ABI as previous modules do",
 	 bfd_get_filename (ibfd));
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   sh_elf64_copy_private_data_internal (ibfd, obfd);
@@ -2482,7 +2491,7 @@ sh_elf64_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-static boolean
+static bfd_boolean
 sh_elf64_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -2490,14 +2499,14 @@ sh_elf64_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* No got and plt entries for 64-bit SH at present.  */
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 sh_elf64_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2519,7 +2528,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
   sreloc = NULL;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -2569,7 +2578,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 	    case R_SH_GOTPC_HI16:
 	      elf_hash_table (info)->dynobj = dynobj = abfd;
 	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	      break;
 
 	    default:
@@ -2583,14 +2592,14 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
         case R_SH_GNU_VTINHERIT:
           if (!_bfd_elf64_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
         case R_SH_GNU_VTENTRY:
           if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
 
 	force_got:
@@ -2624,7 +2633,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 						   | SEC_LINKER_CREATED
 						   | SEC_READONLY))
 		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -2655,7 +2664,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 	      if (h->dynindx == -1)
 		{
 		  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		    return false;
+		    return FALSE;
 		}
 
 	      srelgot->_raw_size += sizeof (Elf64_External_Rela);
@@ -2675,7 +2684,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 		  size *= 2;
 		  local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
 		  if (local_got_offsets == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_offsets (abfd) = local_got_offsets;
 		  for (i = 0; i < symtab_hdr->sh_info; i++)
 		    local_got_offsets[i] = (bfd_vma) -1;
@@ -2738,7 +2747,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 	  if (h->dynindx == -1)
 	    {
 	      if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
@@ -2806,7 +2815,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (abfd, sec),
@@ -2825,7 +2834,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
+			return FALSE;
 		    }
 		}
 
@@ -2856,7 +2865,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
 		      p = ((struct elf_sh64_pcrel_relocs_copied *)
 			   bfd_alloc (dynobj, sizeof *p));
 		      if (p == NULL)
-			return false;
+			return FALSE;
 		      p->next = eh->pcrel_relocs_copied;
 		      eh->pcrel_relocs_copied = p;
 		      p->section = sreloc;
@@ -2871,7 +2880,7 @@ sh_elf64_check_relocs (abfd, info, sec, relocs)
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 static int
@@ -2907,7 +2916,7 @@ sh64_elf64_get_symbol_type (elf_sym, type)
    or the hash entry, alternatively adding the index to Elf_Internal_Sym
    (not so good).  */
 
-static boolean
+static bfd_boolean
 sh64_elf64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2938,13 +2947,13 @@ sh64_elf64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
       /* Allocation may fail.  */
       if (dl_name == NULL)
-	return false;
+	return FALSE;
 
       strcpy (dl_name, *namep);
       strcat (dl_name, DATALABEL_SUFFIX);
 
       h = (struct elf_link_hash_entry *)
-	bfd_link_hash_lookup (info->hash, dl_name, false, false, false);
+	bfd_link_hash_lookup (info->hash, dl_name, FALSE, FALSE, FALSE);
 
       if (h == NULL)
 	{
@@ -2954,11 +2963,11 @@ sh64_elf64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
 	  if (! _bfd_generic_link_add_one_symbol (info, abfd, dl_name,
 						  flags, *secp, *valp,
-						  *namep, false,
+						  *namep, FALSE,
 						  bed->collect, &bh))
 	    {
 	      free (dl_name);
-	      return false;
+	      return FALSE;
 	    }
 
 	  h = (struct elf_link_hash_entry *) bh;
@@ -2981,7 +2990,7 @@ sh64_elf64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	    (_("%s: encountered datalabel symbol in input"),
 	     bfd_get_filename (abfd));
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       /* Now find the hash-table slot for this entry and fill it in.  */
@@ -2993,7 +3002,7 @@ sh64_elf64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       *namep = NULL;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This hook function is called before the linker writes out a global
@@ -3008,7 +3017,7 @@ sh64_elf64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
    we don't need to look up and make sure to emit the main symbol for each
    DataLabel symbol.  */
 
-static boolean
+static bfd_boolean
 sh64_elf64_link_output_symbol_hook (abfd, info, cname, sym, input_sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -3024,7 +3033,7 @@ sh64_elf64_link_output_symbol_hook (abfd, info, cname, sym, input_sec)
 	name[strlen (name) - strlen (DATALABEL_SUFFIX)] = 0;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set bit 0 on the entry address; it always points to SHmedia code.  This
@@ -3037,7 +3046,7 @@ sh64_elf64_link_output_symbol_hook (abfd, info, cname, sym, input_sec)
 static void
 sh64_elf64_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   /* FIXME: Perhaps we shouldn't do this if the entry address was supplied
      numerically, but we currently lack the infrastructure to recognize
@@ -3276,7 +3285,7 @@ movi_3shori_putval (output_bfd, value, addr)
 
 /* Create dynamic sections when linking against a dynamic object.  */
 
-static boolean
+static bfd_boolean
 sh64_elf64_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3298,7 +3307,7 @@ sh64_elf64_create_dynamic_sections (abfd, info)
 
     default:
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
@@ -3318,7 +3327,7 @@ sh64_elf64_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, pltflags)
       || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
-    return false;
+    return FALSE;
 
   if (bed->want_plt_sym)
     {
@@ -3329,8 +3338,8 @@ sh64_elf64_create_dynamic_sections (abfd, info)
 
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
-	      (bfd_vma) 0, (const char *) NULL, false, bed->collect, &bh)))
-	return false;
+	      (bfd_vma) 0, (const char *) NULL, FALSE, bed->collect, &bh)))
+	return FALSE;
 
       h = (struct elf_link_hash_entry *) bh;
       h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
@@ -3338,7 +3347,7 @@ sh64_elf64_create_dynamic_sections (abfd, info)
 
       if (info->shared
 	  && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-	return false;
+	return FALSE;
     }
 
   s = bfd_make_section (abfd,
@@ -3346,10 +3355,10 @@ sh64_elf64_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, ptralign))
-    return false;
+    return FALSE;
 
   if (! _bfd_elf_create_got_section (abfd, info))
-    return false;
+    return FALSE;
 
   {
     const char *secname;
@@ -3371,7 +3380,7 @@ sh64_elf64_create_dynamic_sections (abfd, info)
 	if (s == NULL
 	    || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	    || ! bfd_set_section_alignment (abfd, s, ptralign))
-	  return false;
+	  return FALSE;
       }
   }
 
@@ -3386,7 +3395,7 @@ sh64_elf64_create_dynamic_sections (abfd, info)
       s = bfd_make_section (abfd, ".dynbss");
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, SEC_ALLOC))
-	return false;
+	return FALSE;
 
       /* The .rel[a].bss section holds copy relocs.  This section is not
 	 normally needed.  We need to create it here, though, so that the
@@ -3407,11 +3416,11 @@ sh64_elf64_create_dynamic_sections (abfd, info)
 	  if (s == NULL
 	      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	      || ! bfd_set_section_alignment (abfd, s, ptralign))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -3420,7 +3429,7 @@ sh64_elf64_create_dynamic_sections (abfd, info)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 sh64_elf64_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -3458,14 +3467,14 @@ sh64_elf64_adjust_dynamic_symbol (info, h)
 	     a procedure linkage table, and we can just do a REL64
 	     reloc instead.  */
 	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
-	  return true;
+	  return TRUE;
 	}
 
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
 	{
 	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = bfd_get_section_by_name (dynobj, ".plt");
@@ -3506,7 +3515,7 @@ sh64_elf64_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf64_External_Rela);
 
-      return true;
+      return TRUE;
     }
 
   /* If this is a weak symbol, and there is a real definition, the
@@ -3518,7 +3527,7 @@ sh64_elf64_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -3529,12 +3538,12 @@ sh64_elf64_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -3575,7 +3584,7 @@ sh64_elf64_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -3585,7 +3594,7 @@ sh64_elf64_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called via sh_elf_link_hash_traverse if we are
@@ -3595,7 +3604,7 @@ sh64_elf64_adjust_dynamic_symbol (info, h)
    check_relocs routine, but we won't fill them in in the
    relocate_section routine.  */
 
-static boolean
+static bfd_boolean
 sh64_elf64_discard_copies (h, ignore)
      struct elf_sh64_link_hash_entry *h;
      PTR ignore ATTRIBUTE_UNUSED;
@@ -3607,26 +3616,26 @@ sh64_elf64_discard_copies (h, ignore)
 
   /* We only discard relocs for symbols defined in a regular object.  */
   if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
+    return TRUE;
 
   for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
     s->section->_raw_size -= s->count * sizeof (Elf64_External_Rela);
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 sh64_elf64_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean plt;
-  boolean relocs;
-  boolean reltext;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
@@ -3666,13 +3675,13 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  plt = false;
-  relocs = false;
-  reltext = false;
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -3681,7 +3690,7 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
-      strip = false;
+      strip = FALSE;
 
       if (strcmp (name, ".plt") == 0)
 	{
@@ -3689,12 +3698,12 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
 	    {
 	      /* Strip this section if we don't need it; see the
 		 comment below.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      plt = TRUE;
 	    }
 	}
       else if (strncmp (name, ".rela", 5) == 0)
@@ -3710,7 +3719,7 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
@@ -3722,7 +3731,7 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
 		{
 		  const char *outname;
 
-		  relocs = true;
+		  relocs = TRUE;
 
 		  /* If this relocation section applies to a read only
 		     section, then we probably need a DT_TEXTREL
@@ -3735,7 +3744,7 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
 		  if (target != NULL
 		      && (target->flags & SEC_READONLY) != 0
 		      && (target->flags & SEC_ALLOC) != 0)
-		    reltext = true;
+		    reltext = TRUE;
 		}
 
 	      /* We use the reloc_count field as a counter if we need
@@ -3758,7 +3767,7 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
       /* Allocate memory for the section contents.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -3771,7 +3780,7 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
       if (! info->shared)
 	{
 	  if (! bfd_elf64_add_dynamic_entry (info, DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (plt)
@@ -3780,7 +3789,7 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
 	      || ! bfd_elf64_add_dynamic_entry (info, DT_PLTRELSZ, 0)
 	      || ! bfd_elf64_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
 	      || ! bfd_elf64_add_dynamic_entry (info, DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -3789,23 +3798,23 @@ sh64_elf64_size_dynamic_sections (output_bfd, info)
 	      || ! bfd_elf64_add_dynamic_entry (info, DT_RELASZ, 0)
 	      || ! bfd_elf64_add_dynamic_entry (info, DT_RELAENT,
 						sizeof (Elf64_External_Rela)))
-	    return false;
+	    return FALSE;
 	}
 
       if (reltext)
 	{
 	  if (! bfd_elf64_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 sh64_elf64_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -4000,12 +4009,12 @@ sh64_elf64_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 sh64_elf64_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -4053,7 +4062,7 @@ sh64_elf64_finish_dynamic_sections (output_bfd, info)
 	      if (dyn.d_un.d_val != 0)
 		{
 		  h = elf_link_hash_lookup (elf_hash_table (info), name,
-					    false, false, true);
+					    FALSE, FALSE, TRUE);
 		  if (h != NULL && (h->other & STO_SH5_ISA32))
 		    {
 		      dyn.d_un.d_val |= 1;
@@ -4160,7 +4169,7 @@ sh64_elf64_finish_dynamic_sections (output_bfd, info)
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 8;
 
-  return true;
+  return TRUE;
 }
 
 #define TARGET_BIG_SYM		bfd_elf64_sh64_vec
diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
index 0311f8aabf1..c3a3f05a0b2 100644
--- a/bfd/elf64-sparc.c
+++ b/bfd/elf64-sparc.c
@@ -51,49 +51,49 @@ static bfd_vma sparc64_elf_plt_entry_offset
 static bfd_vma sparc64_elf_plt_ptr_offset
   PARAMS ((bfd_vma, bfd_vma));
 
-static boolean sparc64_elf_check_relocs
+static bfd_boolean sparc64_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *sec,
 	   const Elf_Internal_Rela *));
-static boolean sparc64_elf_adjust_dynamic_symbol
+static bfd_boolean sparc64_elf_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean sparc64_elf_size_dynamic_sections
+static bfd_boolean sparc64_elf_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static int sparc64_elf_get_symbol_type
   PARAMS (( Elf_Internal_Sym *, int));
-static boolean sparc64_elf_add_symbol_hook
+static bfd_boolean sparc64_elf_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
-static boolean sparc64_elf_output_arch_syms
+static bfd_boolean sparc64_elf_output_arch_syms
   PARAMS ((bfd *, struct bfd_link_info *, PTR,
-	   boolean (*) (PTR, const char *, Elf_Internal_Sym *, asection *)));
+	   bfd_boolean (*) (PTR, const char *, Elf_Internal_Sym *, asection *)));
 static void sparc64_elf_symbol_processing
   PARAMS ((bfd *, asymbol *));
 
-static boolean sparc64_elf_merge_private_bfd_data
+static bfd_boolean sparc64_elf_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
 
-static boolean sparc64_elf_fake_sections
+static bfd_boolean sparc64_elf_fake_sections
   PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
 
 static const char *sparc64_elf_print_symbol_all
   PARAMS ((bfd *, PTR, asymbol *));
-static boolean sparc64_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static boolean sparc64_elf_relocate_section
+static bfd_boolean sparc64_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean sparc64_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean sparc64_elf_finish_dynamic_symbol
+static bfd_boolean sparc64_elf_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-static boolean sparc64_elf_finish_dynamic_sections
+static bfd_boolean sparc64_elf_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean sparc64_elf_object_p PARAMS ((bfd *));
+static bfd_boolean sparc64_elf_object_p PARAMS ((bfd *));
 static long sparc64_elf_get_reloc_upper_bound PARAMS ((bfd *, asection *));
 static long sparc64_elf_get_dynamic_reloc_upper_bound PARAMS ((bfd *));
-static boolean sparc64_elf_slurp_one_reloc_table
-  PARAMS ((bfd *, asection *, Elf_Internal_Shdr *, asymbol **, boolean));
-static boolean sparc64_elf_slurp_reloc_table
-  PARAMS ((bfd *, asection *, asymbol **, boolean));
+static bfd_boolean sparc64_elf_slurp_one_reloc_table
+  PARAMS ((bfd *, asection *, Elf_Internal_Shdr *, asymbol **, bfd_boolean));
+static bfd_boolean sparc64_elf_slurp_reloc_table
+  PARAMS ((bfd *, asection *, asymbol **, bfd_boolean));
 static long sparc64_elf_canonicalize_dynamic_reloc
   PARAMS ((bfd *, arelent **, asymbol **));
 static void sparc64_elf_write_relocs PARAMS ((bfd *, asection *, PTR));
@@ -113,65 +113,65 @@ static bfd_reloc_status_type sparc_elf_lox10_reloc
 
 static reloc_howto_type sparc64_elf_howto_table[] =
 {
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_8,         0,0, 8,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_8",       false,0,0x000000ff,true),
-  HOWTO(R_SPARC_16,        0,1,16,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_16",      false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_32,        0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_32",      false,0,0xffffffff,true),
-  HOWTO(R_SPARC_DISP8,     0,0, 8,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP8",   false,0,0x000000ff,true),
-  HOWTO(R_SPARC_DISP16,    0,1,16,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP16",  false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_DISP32,    0,2,32,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP32",  false,0,0xffffffff,true),
-  HOWTO(R_SPARC_WDISP30,   2,2,30,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP30", false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_WDISP22,   2,2,22,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP22", false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HI22,     10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HI22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_22,        0,2,22,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_22",      false,0,0x003fffff,true),
-  HOWTO(R_SPARC_13,        0,2,13,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_13",      false,0,0x00001fff,true),
-  HOWTO(R_SPARC_LO10,      0,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LO10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT10,     0,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT10",   false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT13,     0,2,13,false,0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_GOT13",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_GOT22,    10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT22",   false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC10,      0,2,10,true, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC22,     10,2,22,true, 0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PC22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WPLT30,    2,2,30,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WPLT30",  false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_COPY,      0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_COPY",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_GLOB_DAT,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GLOB_DAT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_JMP_SLOT,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_SLOT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_RELATIVE,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_RELATIVE",false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA32,      0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA32",    false,0,0xffffffff,true),
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_8,         0,0, 8,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_8",       FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_16,        0,1,16,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_16",      FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_32,        0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_32",      FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_DISP8,     0,0, 8,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP8",   FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_DISP16,    0,1,16,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP16",  FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_DISP32,    0,2,32,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP32",  FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_WDISP30,   2,2,30,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP30", FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_WDISP22,   2,2,22,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP22", FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_HI22,     10,2,22,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HI22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_22,        0,2,22,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_22",      FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_13,        0,2,13,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_13",      FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_LO10,      0,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LO10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT10,     0,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT10",   FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT13,     0,2,13,FALSE,0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_GOT13",   FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_GOT22,    10,2,22,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT22",   FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC10,      0,2,10,TRUE, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_PC22,     10,2,22,TRUE, 0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PC22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_WPLT30,    2,2,30,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WPLT30",  FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_COPY,      0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_COPY",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_GLOB_DAT,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GLOB_DAT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_JMP_SLOT,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_SLOT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_RELATIVE,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_RELATIVE",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_UA32,      0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA32",    FALSE,0,0xffffffff,TRUE),
 #ifndef SPARC64_OLD_RELOCS
-  HOWTO(R_SPARC_PLT32,     0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PLT32",   false,0,0xffffffff,true),
+  HOWTO(R_SPARC_PLT32,     0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PLT32",   FALSE,0,0xffffffff,TRUE),
   /* These aren't implemented yet.  */
-  HOWTO(R_SPARC_HIPLT22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_HIPLT22",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_LOPLT10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_LOPLT10",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT32,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT32",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT22",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT10",  false,0,0x00000000,true),
+  HOWTO(R_SPARC_HIPLT22,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_HIPLT22",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_LOPLT10,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_LOPLT10",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT32,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT32",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT22,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT22",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT10,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT10",  FALSE,0,0x00000000,TRUE),
 #endif
-  HOWTO(R_SPARC_10,        0,2,10,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_10",      false,0,0x000003ff,true),
-  HOWTO(R_SPARC_11,        0,2,11,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_11",      false,0,0x000007ff,true),
-  HOWTO(R_SPARC_64,        0,4,64,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_64",      false,0,MINUS_ONE, true),
-  HOWTO(R_SPARC_OLO10,     0,2,13,false,0,complain_overflow_signed,  sparc_elf_notsup_reloc, "R_SPARC_OLO10",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_HH22,     42,2,22,false,0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_HH22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HM10,     32,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HM10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_LM22,     10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LM22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC_HH22,  42,2,22,true, 0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_PC_HH22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC_HM10,  32,2,10,true, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC_HM10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC_LM22,  10,2,22,true, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC_LM22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WDISP16,   2,2,16,true, 0,complain_overflow_signed,  sparc_elf_wdisp16_reloc,"R_SPARC_WDISP16", false,0,0x00000000,true),
-  HOWTO(R_SPARC_WDISP19,   2,2,19,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP19", false,0,0x0007ffff,true),
-  HOWTO(R_SPARC_UNUSED_42, 0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UNUSED_42",false,0,0x00000000,true),
-  HOWTO(R_SPARC_7,         0,2, 7,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_7",       false,0,0x0000007f,true),
-  HOWTO(R_SPARC_5,         0,2, 5,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_5",       false,0,0x0000001f,true),
-  HOWTO(R_SPARC_6,         0,2, 6,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_6",       false,0,0x0000003f,true),
-  HOWTO(R_SPARC_DISP64,    0,4,64,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP64",  false,0,MINUS_ONE, true),
-  HOWTO(R_SPARC_PLT64,     0,4,64,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PLT64",   false,0,MINUS_ONE, true),
-  HOWTO(R_SPARC_HIX22,     0,4, 0,false,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,  "R_SPARC_HIX22",   false,0,MINUS_ONE, false),
-  HOWTO(R_SPARC_LOX10,     0,4, 0,false,0,complain_overflow_dont,    sparc_elf_lox10_reloc,  "R_SPARC_LOX10",   false,0,MINUS_ONE, false),
-  HOWTO(R_SPARC_H44,      22,2,22,false,0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_H44",     false,0,0x003fffff,false),
-  HOWTO(R_SPARC_M44,      12,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_M44",     false,0,0x000003ff,false),
-  HOWTO(R_SPARC_L44,       0,2,13,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_L44",     false,0,0x00000fff,false),
-  HOWTO(R_SPARC_REGISTER,  0,4, 0,false,0,complain_overflow_bitfield,sparc_elf_notsup_reloc, "R_SPARC_REGISTER",false,0,MINUS_ONE, false),
-  HOWTO(R_SPARC_UA64,        0,4,64,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA64",      false,0,MINUS_ONE, true),
-  HOWTO(R_SPARC_UA16,        0,1,16,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA16",      false,0,0x0000ffff,true)
+  HOWTO(R_SPARC_10,        0,2,10,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_10",      FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_11,        0,2,11,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_11",      FALSE,0,0x000007ff,TRUE),
+  HOWTO(R_SPARC_64,        0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_64",      FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_OLO10,     0,2,13,FALSE,0,complain_overflow_signed,  sparc_elf_notsup_reloc, "R_SPARC_OLO10",   FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_HH22,     42,2,22,FALSE,0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_HH22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_HM10,     32,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HM10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_LM22,     10,2,22,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LM22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC_HH22,  42,2,22,TRUE, 0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_PC_HH22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC_HM10,  32,2,10,TRUE, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC_HM10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_PC_LM22,  10,2,22,TRUE, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC_LM22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_WDISP16,   2,2,16,TRUE, 0,complain_overflow_signed,  sparc_elf_wdisp16_reloc,"R_SPARC_WDISP16", FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_WDISP19,   2,2,19,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP19", FALSE,0,0x0007ffff,TRUE),
+  HOWTO(R_SPARC_UNUSED_42, 0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UNUSED_42",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_7,         0,2, 7,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_7",       FALSE,0,0x0000007f,TRUE),
+  HOWTO(R_SPARC_5,         0,2, 5,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_5",       FALSE,0,0x0000001f,TRUE),
+  HOWTO(R_SPARC_6,         0,2, 6,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_6",       FALSE,0,0x0000003f,TRUE),
+  HOWTO(R_SPARC_DISP64,    0,4,64,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP64",  FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_PLT64,     0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PLT64",   FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_HIX22,     0,4, 0,FALSE,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,  "R_SPARC_HIX22",   FALSE,0,MINUS_ONE, FALSE),
+  HOWTO(R_SPARC_LOX10,     0,4, 0,FALSE,0,complain_overflow_dont,    sparc_elf_lox10_reloc,  "R_SPARC_LOX10",   FALSE,0,MINUS_ONE, FALSE),
+  HOWTO(R_SPARC_H44,      22,2,22,FALSE,0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_H44",     FALSE,0,0x003fffff,FALSE),
+  HOWTO(R_SPARC_M44,      12,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_M44",     FALSE,0,0x000003ff,FALSE),
+  HOWTO(R_SPARC_L44,       0,2,13,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_L44",     FALSE,0,0x00000fff,FALSE),
+  HOWTO(R_SPARC_REGISTER,  0,4, 0,FALSE,0,complain_overflow_bitfield,sparc_elf_notsup_reloc, "R_SPARC_REGISTER",FALSE,0,MINUS_ONE, FALSE),
+  HOWTO(R_SPARC_UA64,        0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA64",      FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_UA16,        0,1,16,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA16",      FALSE,0,0x0000ffff,TRUE)
 };
 
 struct elf_reloc_map {
@@ -285,13 +285,13 @@ sparc64_elf_get_dynamic_reloc_upper_bound (abfd)
    has secondary addend in ELF64_R_TYPE_DATA.  We handle it as two relocations
    for the same location,  R_SPARC_LO10 and R_SPARC_13.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_slurp_one_reloc_table (abfd, asect, rel_hdr, symbols, dynamic)
      bfd *abfd;
      asection *asect;
      Elf_Internal_Shdr *rel_hdr;
      asymbol **symbols;
-     boolean dynamic;
+     bfd_boolean dynamic;
 {
   PTR allocated = NULL;
   bfd_byte *native_relocs;
@@ -371,22 +371,22 @@ sparc64_elf_slurp_one_reloc_table (abfd, asect, rel_hdr, symbols, dynamic)
   if (allocated != NULL)
     free (allocated);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (allocated != NULL)
     free (allocated);
-  return false;
+  return FALSE;
 }
 
 /* Read in and swap the external relocs.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
      bfd *abfd;
      asection *asect;
      asymbol **symbols;
-     boolean dynamic;
+     bfd_boolean dynamic;
 {
   struct bfd_elf_section_data * const d = elf_section_data (asect);
   Elf_Internal_Shdr *rel_hdr;
@@ -394,13 +394,13 @@ sparc64_elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
   bfd_size_type amt;
 
   if (asect->relocation != NULL)
-    return true;
+    return TRUE;
 
   if (! dynamic)
     {
       if ((asect->flags & SEC_RELOC) == 0
 	  || asect->reloc_count == 0)
-	return true;
+	return TRUE;
 
       rel_hdr = &d->rel_hdr;
       rel_hdr2 = d->rel_hdr2;
@@ -415,7 +415,7 @@ sparc64_elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
 	 dynamic symbol table, and in that case bfd_section_from_shdr
 	 in elf.c does not update the RELOC_COUNT.  */
       if (asect->_raw_size == 0)
-	return true;
+	return TRUE;
 
       rel_hdr = &d->this_hdr;
       asect->reloc_count = NUM_SHDR_ENTRIES (rel_hdr);
@@ -426,21 +426,21 @@ sparc64_elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
   amt *= 2 * sizeof (arelent);
   asect->relocation = (arelent *) bfd_alloc (abfd, amt);
   if (asect->relocation == NULL)
-    return false;
+    return FALSE;
 
   /* The sparc64_elf_slurp_one_reloc_table routine increments reloc_count.  */
   asect->reloc_count = 0;
 
   if (!sparc64_elf_slurp_one_reloc_table (abfd, asect, rel_hdr, symbols,
 					  dynamic))
-    return false;
+    return FALSE;
 
   if (rel_hdr2
       && !sparc64_elf_slurp_one_reloc_table (abfd, asect, rel_hdr2, symbols,
 					     dynamic))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Canonicalize the dynamic relocation entries.  Note that we return
@@ -476,7 +476,7 @@ sparc64_elf_canonicalize_dynamic_reloc (abfd, storage, syms)
 	  arelent *p;
 	  long count, i;
 
-	  if (! sparc64_elf_slurp_reloc_table (abfd, s, syms, true))
+	  if (! sparc64_elf_slurp_reloc_table (abfd, s, syms, TRUE))
 	    return -1;
 	  count = s->reloc_count;
 	  p = s->relocation;
@@ -499,7 +499,7 @@ sparc64_elf_write_relocs (abfd, sec, data)
      asection *sec;
      PTR data;
 {
-  boolean *failedp = (boolean *) data;
+  bfd_boolean *failedp = (bfd_boolean *) data;
   Elf_Internal_Shdr *rela_hdr;
   Elf64_External_Rela *outbound_relocas, *src_rela;
   unsigned int idx, count;
@@ -550,7 +550,7 @@ sparc64_elf_write_relocs (abfd, sec, data)
   rela_hdr->contents = (PTR) bfd_alloc (abfd, rela_hdr->sh_size);
   if (rela_hdr->contents == NULL)
     {
-      *failedp = true;
+      *failedp = TRUE;
       return;
     }
 
@@ -590,7 +590,7 @@ sparc64_elf_write_relocs (abfd, sec, data)
 	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
 	  if (n < 0)
 	    {
-	      *failedp = true;
+	      *failedp = TRUE;
 	      return;
 	    }
 	  last_sym_idx = n;
@@ -600,7 +600,7 @@ sparc64_elf_write_relocs (abfd, sec, data)
 	  && (*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
 	  && ! _bfd_elf_validate_reloc (abfd, ptr))
 	{
-	  *failedp = true;
+	  *failedp = TRUE;
 	  return;
 	}
 
@@ -714,7 +714,7 @@ init_insn_reloc (abfd,
       return bfd_reloc_ok;
     }
 
-  /* This works because partial_inplace is false.  */
+  /* This works because partial_inplace is FALSE.  */
   if (output_bfd != NULL)
     return bfd_reloc_continue;
 
@@ -994,7 +994,7 @@ sparc64_elf_plt_ptr_offset (index, max)
    allocate space in the global offset table or procedure linkage
    table.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1012,7 +1012,7 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable || !(sec->flags & SEC_ALLOC))
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -1047,7 +1047,7 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
 	      /* Create the .got section.  */
 	      elf_hash_table (info)->dynobj = dynobj = abfd;
 	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	    }
 
 	  if (sgot == NULL)
@@ -1071,7 +1071,7 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
 						   | SEC_LINKER_CREATED
 						   | SEC_READONLY))
 		      || ! bfd_set_section_alignment (dynobj, srelgot, 3))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -1088,7 +1088,7 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
 	      if (h->dynindx == -1)
 		{
 		  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		    return false;
+		    return FALSE;
 		}
 
 	      srelgot->_raw_size += sizeof (Elf64_External_Rela);
@@ -1106,7 +1106,7 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
 		  size *= sizeof (bfd_vma);
 		  local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
 		  if (local_got_offsets == NULL)
-		    return false;
+		    return FALSE;
 		  elf_local_got_offsets (abfd) = local_got_offsets;
 		  for (i = 0; i < symtab_hdr->sh_info; i++)
 		    local_got_offsets[i] = (bfd_vma) -1;
@@ -1164,14 +1164,14 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
 	      /* It does not make sense to have a procedure linkage
                  table entry for a local symbol.  */
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 
 	  /* Make sure this symbol is output as a dynamic symbol.  */
 	  if (h->dynindx == -1)
 	    {
 	      if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
@@ -1243,7 +1243,7 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 			      && strcmp (bfd_get_section_name (abfd, sec),
@@ -1262,7 +1262,7 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 3))
-			return false;
+			return FALSE;
 		    }
 		  if (sec->flags & SEC_READONLY)
 		    info->flags |= DF_TEXTREL;
@@ -1280,17 +1280,17 @@ sparc64_elf_check_relocs (abfd, info, sec, relocs)
 	  (*_bfd_error_handler) (_("%s: check_relocs: unhandled reloc type %d"),
 				bfd_archive_filename (abfd),
 				ELF64_R_TYPE_ID (rel->r_info));
-	  return false;
+	  return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Hook called by the linker routine which adds symbols from an object
    file.  We use it for STT_REGISTER symbols.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1316,7 +1316,7 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
           (*_bfd_error_handler)
             (_("%s: Only registers %%g[2367] can be declared using STT_REGISTER"),
              bfd_archive_filename (abfd));
-	  return false;
+	  return FALSE;
 	}
 
       if (info->hash->creator != abfd->xvec
@@ -1326,7 +1326,7 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	     If STT_REGISTER comes from a dynamic object, don't put it into
 	     the output bfd.  The dynamic linker will recheck it.  */
 	  *namep = NULL;
-	  return true;
+	  return TRUE;
         }
 
       p = sparc64_elf_hash_table(info)->app_regs + reg;
@@ -1338,7 +1338,7 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
              (int) sym->st_value,
              **namep ? *namep : "#scratch", bfd_archive_filename (abfd),
              *p->name ? p->name : "#scratch", bfd_archive_filename (p->abfd));
-	  return false;
+	  return FALSE;
 	}
 
       if (p->name == NULL)
@@ -1348,7 +1348,7 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	      struct elf_link_hash_entry *h;
 
 	      h = (struct elf_link_hash_entry *)
-		bfd_link_hash_lookup (info->hash, *namep, false, false, false);
+		bfd_link_hash_lookup (info->hash, *namep, FALSE, FALSE, FALSE);
 
 	      if (h != NULL)
 		{
@@ -1360,13 +1360,13 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 		    (_("Symbol `%s' has differing types: REGISTER in %s, previously %s in %s"),
 		     *namep, bfd_archive_filename (abfd),
 		     stt_types[type], bfd_archive_filename (p->abfd));
-		  return false;
+		  return FALSE;
 		}
 
 	      p->name = bfd_hash_allocate (&info->hash->table,
 					   strlen (*namep) + 1);
 	      if (!p->name)
-		return false;
+		return FALSE;
 
 	      strcpy (p->name, *namep);
 	    }
@@ -1386,7 +1386,7 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	    }
 	}
       *namep = NULL;
-      return true;
+      return TRUE;
     }
   else if (*namep && **namep
 	   && info->hash->creator == abfd->xvec)
@@ -1406,22 +1406,22 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	      (_("Symbol `%s' has differing types: %s in %s, previously REGISTER in %s"),
 	       *namep, stt_types[type], bfd_archive_filename (abfd),
 	       bfd_archive_filename (p->abfd));
-	    return false;
+	    return FALSE;
 	  }
     }
-  return true;
+  return TRUE;
 }
 
 /* This function takes care of emiting STT_REGISTER symbols
    which we cannot easily keep in the symbol hash table.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_output_arch_syms (output_bfd, info, finfo, func)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
      PTR finfo;
-     boolean (*func) PARAMS ((PTR, const char *,
-			      Elf_Internal_Sym *, asection *));
+     bfd_boolean (*func)
+       PARAMS ((PTR, const char *, Elf_Internal_Sym *, asection *));
 {
   int reg;
   struct sparc64_elf_app_reg *app_regs =
@@ -1449,7 +1449,7 @@ sparc64_elf_output_arch_syms (output_bfd, info, finfo, func)
     }
 
   if (info->strip == strip_all)
-    return true;
+    return TRUE;
 
   for (reg = 0; reg < 4; reg++)
     if (app_regs [reg].name != NULL)
@@ -1457,7 +1457,7 @@ sparc64_elf_output_arch_syms (output_bfd, info, finfo, func)
 	if (info->strip == strip_some
 	    && bfd_hash_lookup (info->keep_hash,
 				app_regs [reg].name,
-				false, false) == NULL)
+				FALSE, FALSE) == NULL)
 	  continue;
 
 	sym.st_value = reg < 2 ? reg + 2 : reg + 4;
@@ -1468,10 +1468,10 @@ sparc64_elf_output_arch_syms (output_bfd, info, finfo, func)
 	if (! (*func) (finfo, app_regs [reg].name, &sym,
 		       sym.st_shndx == SHN_ABS
 			 ? bfd_abs_section_ptr : bfd_und_section_ptr))
-	  return false;
+	  return FALSE;
       }
 
-  return true;
+  return TRUE;
 }
 
 static int
@@ -1509,7 +1509,7 @@ sparc64_elf_symbol_processing (abfd, asym)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -1553,7 +1553,7 @@ sparc64_elf_adjust_dynamic_symbol (info, h)
              procedure linkage table, and we can just do a WDISP30
              reloc instead.  */
 	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
-	  return true;
+	  return TRUE;
 	}
 
       s = bfd_get_section_by_name (dynobj, ".plt");
@@ -1593,10 +1593,10 @@ sparc64_elf_adjust_dynamic_symbol (info, h)
       if (s->_raw_size >= (bfd_vma)1 << 32)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
-      return true;
+      return TRUE;
     }
 
   /* If this is a weak symbol, and there is a real definition, the
@@ -1608,7 +1608,7 @@ sparc64_elf_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1619,7 +1619,7 @@ sparc64_elf_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
@@ -1661,7 +1661,7 @@ sparc64_elf_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1671,19 +1671,19 @@ sparc64_elf_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean relplt;
+  bfd_boolean relplt;
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
@@ -1714,11 +1714,11 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  relplt = false;
+  relplt = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
@@ -1727,7 +1727,7 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
 	 of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
-      strip = false;
+      strip = FALSE;
 
       if (strncmp (name, ".rela", 5) == 0)
 	{
@@ -1742,12 +1742,12 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
 		 adjust_dynamic_symbol is called, and it is that
 		 function which decides whether anything needs to go
 		 into these sections.  */
-	      strip = true;
+	      strip = TRUE;
 	    }
 	  else
 	    {
 	      if (strcmp (name, ".rela.plt") == 0)
-		relplt = true;
+		relplt = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -1772,7 +1772,7 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
 	 at the beginning, and we don't want garbage.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
@@ -1793,7 +1793,7 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relplt)
@@ -1802,18 +1802,18 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (!add_dynamic_entry (DT_RELA, 0)
 	  || !add_dynamic_entry (DT_RELASZ, 0)
 	  || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
-	return false;
+	return FALSE;
 
       if (info->flags & DF_TEXTREL)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       /* Add dynamic STT_REGISTER symbols and corresponding DT_SPARC_REGISTER
@@ -1827,12 +1827,12 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
 	    struct elf_link_local_dynamic_entry *entry, *e;
 
 	    if (!add_dynamic_entry (DT_SPARC_REGISTER, 0))
-	      return false;
+	      return FALSE;
 
 	    entry = (struct elf_link_local_dynamic_entry *)
 	      bfd_hash_allocate (&info->hash->table, sizeof (*entry));
 	    if (entry == NULL)
-	      return false;
+	      return FALSE;
 
 	    /* We cheat here a little bit: the symbol will not be local, so we
 	       put it at the end of the dynlocal linked list.  We will fix it
@@ -1841,7 +1841,7 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
 	    entry->isym.st_size = 0;
 	    if (*app_regs [reg].name != '\0')
 	      entry->isym.st_name
-		= _bfd_elf_strtab_add (dynstr, app_regs[reg].name, false);
+		= _bfd_elf_strtab_add (dynstr, app_regs[reg].name, FALSE);
 	    else
 	      entry->isym.st_name = 0;
 	    entry->isym.st_other = 0;
@@ -1865,22 +1865,22 @@ sparc64_elf_size_dynamic_sections (output_bfd, info)
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 #define SET_SEC_DO_RELAX(section) do { elf_section_data(section)->tdata = (void *)1; } while (0)
 #define SEC_DO_RELAX(section) (elf_section_data(section)->tdata == (void *)1)
 
-static boolean
+static bfd_boolean
 sparc64_elf_relax_section (abfd, section, link_info, again)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
-     boolean *again;
+     bfd_boolean *again;
 {
-  *again = false;
+  *again = FALSE;
   SET_SEC_DO_RELAX (section);
-  return true;
+  return TRUE;
 }
 
 /* This is the condition under which finish_dynamic_symbol will be called
@@ -1896,7 +1896,7 @@ sparc64_elf_relax_section (abfd, section, link_info, again)
 
 /* Relocate a SPARC64 ELF section.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			      contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -1920,7 +1920,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -1946,14 +1946,14 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       asection *sec;
       bfd_vma relocation, off;
       bfd_reloc_status_type r;
-      boolean is_plt = false;
-      boolean unresolved_reloc;
+      bfd_boolean is_plt = FALSE;
+      bfd_boolean unresolved_reloc;
 
       r_type = ELF64_R_TYPE_ID (rel->r_info);
       if (r_type < 0 || r_type >= (int) R_SPARC_max_std)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       howto = sparc64_elf_howto_table + r_type;
 
@@ -1962,7 +1962,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sec = NULL;
-      unresolved_reloc = false;
+      unresolved_reloc = FALSE;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -1986,7 +1986,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		   relocation value for this symbol.  output_section
 		   is typically NULL for symbols satisfied by a shared
 		   library.  */
-		unresolved_reloc = true;
+		unresolved_reloc = TRUE;
 	      else
 		relocation = (h->root.u.def.value
 			      + sec->output_section->vma
@@ -2006,7 +2006,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		      input_section, rel->r_offset,
 		      (!info->shared || info->no_undefined
 		       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 
 	      /* To avoid generating warning messages about truncated
 		 relocations, set the relocation's address to be the same as
@@ -2074,7 +2074,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      {
 		Elf_Internal_Rela outrel;
 		bfd_byte *loc;
-		boolean skip, relocate;
+		bfd_boolean skip, relocate;
 
 		if (sreloc == NULL)
 		  {
@@ -2085,7 +2085,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			elf_section_data (input_section)->rel_hdr.sh_name));
 
 		    if (name == NULL)
-		      return false;
+		      return FALSE;
 
 		    BFD_ASSERT (strncmp (name, ".rela", 5) == 0
 				&& strcmp (bfd_get_section_name(input_bfd,
@@ -2096,16 +2096,16 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		    BFD_ASSERT (sreloc != NULL);
 		  }
 
-		skip = false;
-		relocate = false;
+		skip = FALSE;
+		relocate = FALSE;
 
 		outrel.r_offset =
 		  _bfd_elf_section_offset (output_bfd, info, input_section,
 					   rel->r_offset);
 		if (outrel.r_offset == (bfd_vma) -1)
-		  skip = true;
+		  skip = TRUE;
 		else if (outrel.r_offset == (bfd_vma) -2)
-		  skip = true, relocate = true;
+		  skip = TRUE, relocate = TRUE;
 
 		outrel.r_offset += (input_section->output_section->vma
 				    + input_section->output_offset);
@@ -2142,7 +2142,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		       FIXME: Add code tracking needed dynamic relocs as
 		       e.g. i386 has.  */
 		    if (h->dynindx == -1)
-		      skip = true, relocate = true;
+		      skip = TRUE, relocate = TRUE;
 		    break;
 		  }
 
@@ -2188,7 +2188,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			else if (sec == NULL || sec->owner == NULL)
 			  {
 			    bfd_set_error (bfd_error_bad_value);
-			    return false;
+			    return FALSE;
 			  }
 			else
 			  {
@@ -2213,7 +2213,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				  (_("%s: probably compiled without -fPIC?"),
 				   bfd_archive_filename (input_bfd));
 				bfd_set_error (bfd_error_bad_value);
-				return false;
+				return FALSE;
 			      }
 			  }
 
@@ -2253,7 +2253,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	  if (h != NULL)
 	    {
-	      boolean dyn;
+	      bfd_boolean dyn;
 
 	      off = h->got.offset;
 	      BFD_ASSERT (off != (bfd_vma) -1);
@@ -2288,7 +2288,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		    }
 		}
 	      else
-		unresolved_reloc = false;
+		unresolved_reloc = FALSE;
 	    }
 	  else
 	    {
@@ -2369,13 +2369,13 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	  relocation = (splt->output_section->vma
 			+ splt->output_offset
 			+ sparc64_elf_plt_entry_offset (h->plt.offset));
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  if (r_type == R_SPARC_WPLT30)
 	    goto do_wplt30;
 	  if (r_type == R_SPARC_PLT32 || r_type == R_SPARC_PLT64)
 	    {
 	      r_type = r_type == R_SPARC_PLT32 ? R_SPARC_32 : R_SPARC_64;
-	      is_plt = true;
+	      is_plt = TRUE;
 	      goto do_dynreloc;
 	    }
 	  goto do_default;
@@ -2610,26 +2610,26 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			 symtab_hdr->sh_link,
 			 sym->st_name));
 		if (name == NULL)
-		  return false;
+		  return FALSE;
 		if (*name == '\0')
 		  name = bfd_section_name (input_bfd, sec);
 	      }
 	    if (! ((*info->callbacks->reloc_overflow)
 		   (info, name, howto->name, (bfd_vma) 0,
 		    input_bfd, input_section, rel->r_offset)))
-	      return false;
+	      return FALSE;
 	  }
 	break;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2770,12 +2770,12 @@ sparc64_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2803,27 +2803,27 @@ sparc64_elf_finish_dynamic_sections (output_bfd, info)
 	{
 	  Elf_Internal_Dyn dyn;
 	  const char *name;
-	  boolean size;
+	  bfd_boolean size;
 
 	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
 
 	  switch (dyn.d_tag)
 	    {
-	    case DT_PLTGOT:   name = ".plt"; size = false; break;
-	    case DT_PLTRELSZ: name = ".rela.plt"; size = true; break;
-	    case DT_JMPREL:   name = ".rela.plt"; size = false; break;
+	    case DT_PLTGOT:   name = ".plt"; size = FALSE; break;
+	    case DT_PLTRELSZ: name = ".rela.plt"; size = TRUE; break;
+	    case DT_JMPREL:   name = ".rela.plt"; size = FALSE; break;
 	    case DT_SPARC_REGISTER:
 	      if (stt_regidx == -1)
 		{
 		  stt_regidx =
 		    _bfd_elf_link_lookup_local_dynindx (info, output_bfd, -1);
 		  if (stt_regidx == -1)
-		    return false;
+		    return FALSE;
 		}
 	      dyn.d_un.d_val = stt_regidx++;
 	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
 	      /* fallthrough */
-	    default:	      name = NULL; size = false; break;
+	    default:	      name = NULL; size = FALSE; break;
 	    }
 
 	  if (name != NULL)
@@ -2876,7 +2876,7 @@ sparc64_elf_finish_dynamic_sections (output_bfd, info)
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 8;
 
-  return true;
+  return TRUE;
 }
 
 static enum elf_reloc_type_class
@@ -2901,25 +2901,25 @@ sparc64_elf_reloc_type_class (rela)
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
-  boolean error;
+  bfd_boolean error;
   flagword new_flags, old_flags;
   int new_mm, old_mm;
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   new_flags = elf_elfheader (ibfd)->e_flags;
   old_flags = elf_elfheader (obfd)->e_flags;
 
   if (!elf_flags_init (obfd))   /* First call, no flags set */
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = new_flags;
     }
 
@@ -2928,7 +2928,7 @@ sparc64_elf_merge_private_bfd_data (ibfd, obfd)
 
   else                                  /* Incompatible flags */
     {
-      error = false;
+      error = FALSE;
 
 #define EF_SPARC_ISA_EXTENSIONS \
   (EF_SPARC_SUN_US1 | EF_SPARC_SUN_US3 | EF_SPARC_HAL_R1)
@@ -2950,7 +2950,7 @@ sparc64_elf_merge_private_bfd_data (ibfd, obfd)
 	  if ((old_flags & (EF_SPARC_SUN_US1 | EF_SPARC_SUN_US3))
 	      && (old_flags & EF_SPARC_HAL_R1))
 	    {
-	      error = true;
+	      error = TRUE;
 	      (*_bfd_error_handler)
 		(_("%s: linking UltraSPARC specific with HAL specific code"),
 		 bfd_archive_filename (ibfd));
@@ -2969,7 +2969,7 @@ sparc64_elf_merge_private_bfd_data (ibfd, obfd)
       /* Warn about any other mismatches */
       if (new_flags != old_flags)
         {
-          error = true;
+          error = TRUE;
           (*_bfd_error_handler)
             (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
              bfd_archive_filename (ibfd), (long) new_flags, (long) old_flags);
@@ -2980,15 +2980,15 @@ sparc64_elf_merge_private_bfd_data (ibfd, obfd)
       if (error)
         {
           bfd_set_error (bfd_error_bad_value);
-          return false;
+          return FALSE;
         }
     }
-  return true;
+  return TRUE;
 }
 
 /* MARCO: Set the correct entry size for the .stab section.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_fake_sections (abfd, hdr, sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      Elf_Internal_Shdr *hdr ATTRIBUTE_UNUSED;
@@ -3003,8 +3003,8 @@ sparc64_elf_fake_sections (abfd, hdr, sec)
       /* Even in the 64bit case the stab entries are only 12 bytes long.  */
       elf_section_data (sec)->this_hdr.sh_entsize = 12;
     }
-  
-  return true;
+
+  return TRUE;
 }
 
 /* Print a STT_REGISTER symbol to file FILE.  */
@@ -3037,7 +3037,7 @@ sparc64_elf_print_symbol_all (abfd, filep, symbol)
 
 /* Set the right machine number for a SPARC64 ELF file.  */
 
-static boolean
+static bfd_boolean
 sparc64_elf_object_p (abfd)
      bfd *abfd;
 {
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index cd98e82bf90..a3c36ff67dc 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -34,83 +34,83 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    special_function, name, partial_inplace, src_mask, dst_pack, pcrel_offset.  */
 static reloc_howto_type x86_64_elf_howto_table[] =
 {
-  HOWTO(R_X86_64_NONE, 0, 0, 0, false, 0, complain_overflow_dont,
-	bfd_elf_generic_reloc, "R_X86_64_NONE",	false, 0x00000000, 0x00000000,
-	false),
-  HOWTO(R_X86_64_64, 0, 4, 64, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_64", false, MINUS_ONE, MINUS_ONE,
-	false),
-  HOWTO(R_X86_64_PC32, 0, 2, 32, true, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_PC32", false, 0xffffffff, 0xffffffff,
-	true),
-  HOWTO(R_X86_64_GOT32, 0, 2, 32, false, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_GOT32", false, 0xffffffff, 0xffffffff,
-	false),
-  HOWTO(R_X86_64_PLT32, 0, 2, 32, true, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_PLT32", false, 0xffffffff, 0xffffffff,
-	true),
-  HOWTO(R_X86_64_COPY, 0, 2, 32, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_COPY", false, 0xffffffff, 0xffffffff,
-	false),
-  HOWTO(R_X86_64_GLOB_DAT, 0, 4, 64, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_GLOB_DAT", false, MINUS_ONE,
-	MINUS_ONE, false),
-  HOWTO(R_X86_64_JUMP_SLOT, 0, 4, 64, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_JUMP_SLOT", false, MINUS_ONE,
-	MINUS_ONE, false),
-  HOWTO(R_X86_64_RELATIVE, 0, 4, 64, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_RELATIVE", false, MINUS_ONE,
-	MINUS_ONE, false),
-  HOWTO(R_X86_64_GOTPCREL, 0, 2, 32, true, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_GOTPCREL", false, 0xffffffff,
-	0xffffffff, true),
-  HOWTO(R_X86_64_32, 0, 2, 32, false, 0, complain_overflow_unsigned,
-	bfd_elf_generic_reloc, "R_X86_64_32", false, 0xffffffff, 0xffffffff,
-	false),
-  HOWTO(R_X86_64_32S, 0, 2, 32, false, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_32S", false, 0xffffffff, 0xffffffff,
-	false),
-  HOWTO(R_X86_64_16, 0, 1, 16, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_16", false, 0xffff, 0xffff, false),
-  HOWTO(R_X86_64_PC16,0, 1, 16, true, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_PC16", false, 0xffff, 0xffff, true),
-  HOWTO(R_X86_64_8, 0, 0, 8, false, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_8", false, 0xff, 0xff, false),
-  HOWTO(R_X86_64_PC8, 0, 0, 8, true, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_PC8", false, 0xff, 0xff, true),
-  HOWTO(R_X86_64_DTPMOD64, 0, 4, 64, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_DTPMOD64", false, MINUS_ONE,
-	MINUS_ONE, false),
-  HOWTO(R_X86_64_DTPOFF64, 0, 4, 64, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_DTPOFF64", false, MINUS_ONE,
-	MINUS_ONE, false),
-  HOWTO(R_X86_64_TPOFF64, 0, 4, 64, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_TPOFF64", false, MINUS_ONE,
-	MINUS_ONE, false),
-  HOWTO(R_X86_64_TLSGD, 0, 2, 32, true, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_TLSGD", false, 0xffffffff,
-	0xffffffff, true),
-  HOWTO(R_X86_64_TLSLD, 0, 2, 32, true, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_TLSLD", false, 0xffffffff,
-	0xffffffff, true),
-  HOWTO(R_X86_64_DTPOFF32, 0, 2, 32, false, 0, complain_overflow_bitfield,
-	bfd_elf_generic_reloc, "R_X86_64_DTPOFF32", false, 0xffffffff,
-	0xffffffff, false),
-  HOWTO(R_X86_64_GOTTPOFF, 0, 2, 32, true, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_GOTTPOFF", false, 0xffffffff,
-	0xffffffff, true),
-  HOWTO(R_X86_64_TPOFF32, 0, 2, 32, false, 0, complain_overflow_signed,
-	bfd_elf_generic_reloc, "R_X86_64_TPOFF32", false, 0xffffffff,
-	0xffffffff, false),
+  HOWTO(R_X86_64_NONE, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_X86_64_NONE",	FALSE, 0x00000000, 0x00000000,
+	FALSE),
+  HOWTO(R_X86_64_64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_64", FALSE, MINUS_ONE, MINUS_ONE,
+	FALSE),
+  HOWTO(R_X86_64_PC32, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_PC32", FALSE, 0xffffffff, 0xffffffff,
+	TRUE),
+  HOWTO(R_X86_64_GOT32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOT32", FALSE, 0xffffffff, 0xffffffff,
+	FALSE),
+  HOWTO(R_X86_64_PLT32, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_PLT32", FALSE, 0xffffffff, 0xffffffff,
+	TRUE),
+  HOWTO(R_X86_64_COPY, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_COPY", FALSE, 0xffffffff, 0xffffffff,
+	FALSE),
+  HOWTO(R_X86_64_GLOB_DAT, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_GLOB_DAT", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_JUMP_SLOT, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_JUMP_SLOT", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_RELATIVE, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_RELATIVE", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_GOTPCREL, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOTPCREL", FALSE, 0xffffffff,
+	0xffffffff, TRUE),
+  HOWTO(R_X86_64_32, 0, 2, 32, FALSE, 0, complain_overflow_unsigned,
+	bfd_elf_generic_reloc, "R_X86_64_32", FALSE, 0xffffffff, 0xffffffff,
+	FALSE),
+  HOWTO(R_X86_64_32S, 0, 2, 32, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_32S", FALSE, 0xffffffff, 0xffffffff,
+	FALSE),
+  HOWTO(R_X86_64_16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_16", FALSE, 0xffff, 0xffff, FALSE),
+  HOWTO(R_X86_64_PC16,0, 1, 16, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_PC16", FALSE, 0xffff, 0xffff, TRUE),
+  HOWTO(R_X86_64_8, 0, 0, 8, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_8", FALSE, 0xff, 0xff, FALSE),
+  HOWTO(R_X86_64_PC8, 0, 0, 8, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_PC8", FALSE, 0xff, 0xff, TRUE),
+  HOWTO(R_X86_64_DTPMOD64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_DTPMOD64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_DTPOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_DTPOFF64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_TPOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_TPOFF64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_TLSGD, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_TLSGD", FALSE, 0xffffffff,
+	0xffffffff, TRUE),
+  HOWTO(R_X86_64_TLSLD, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_TLSLD", FALSE, 0xffffffff,
+	0xffffffff, TRUE),
+  HOWTO(R_X86_64_DTPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_DTPOFF32", FALSE, 0xffffffff,
+	0xffffffff, FALSE),
+  HOWTO(R_X86_64_GOTTPOFF, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOTTPOFF", FALSE, 0xffffffff,
+	0xffffffff, TRUE),
+  HOWTO(R_X86_64_TPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_TPOFF32", FALSE, 0xffffffff,
+	0xffffffff, FALSE),
 
 /* GNU extension to record C++ vtable hierarchy.  */
-  HOWTO (R_X86_64_GNU_VTINHERIT, 0, 4, 0, false, 0, complain_overflow_dont,
-	 NULL, "R_X86_64_GNU_VTINHERIT", false, 0, 0, false),
+  HOWTO (R_X86_64_GNU_VTINHERIT, 0, 4, 0, FALSE, 0, complain_overflow_dont,
+	 NULL, "R_X86_64_GNU_VTINHERIT", FALSE, 0, 0, FALSE),
 
 /* GNU extension to record C++ vtable member usage.  */
-  HOWTO (R_X86_64_GNU_VTENTRY, 0, 4, 0, false, 0, complain_overflow_dont,
-	 _bfd_elf_rel_vtable_reloc_fn, "R_X86_64_GNU_VTENTRY", false, 0, 0,
-	 false)
+  HOWTO (R_X86_64_GNU_VTENTRY, 0, 4, 0, FALSE, 0, complain_overflow_dont,
+	 _bfd_elf_rel_vtable_reloc_fn, "R_X86_64_GNU_VTENTRY", FALSE, 0, 0,
+	 FALSE)
 };
 
 /* Map BFD relocs to the x86_64 elf relocs.  */
@@ -154,57 +154,57 @@ static reloc_howto_type *elf64_x86_64_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void elf64_x86_64_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf64_x86_64_grok_prstatus
+static bfd_boolean elf64_x86_64_grok_prstatus
   PARAMS ((bfd *, Elf_Internal_Note *));
-static boolean elf64_x86_64_grok_psinfo
+static bfd_boolean elf64_x86_64_grok_psinfo
   PARAMS ((bfd *, Elf_Internal_Note *));
 static struct bfd_link_hash_table *elf64_x86_64_link_hash_table_create
   PARAMS ((bfd *));
 static int elf64_x86_64_tls_transition
   PARAMS ((struct bfd_link_info *, int, int));
-static boolean elf64_x86_64_mkobject
+static bfd_boolean elf64_x86_64_mkobject
   PARAMS((bfd *));
-static boolean elf64_x86_64_elf_object_p PARAMS ((bfd *abfd));
-static boolean create_got_section
+static bfd_boolean elf64_x86_64_elf_object_p PARAMS ((bfd *abfd));
+static bfd_boolean create_got_section
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_x86_64_create_dynamic_sections
+static bfd_boolean elf64_x86_64_create_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
 static void elf64_x86_64_copy_indirect_symbol
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
-static boolean elf64_x86_64_check_relocs
+static bfd_boolean elf64_x86_64_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *sec,
 	   const Elf_Internal_Rela *));
 static asection *elf64_x86_64_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 
-static boolean elf64_x86_64_gc_sweep_hook
+static bfd_boolean elf64_x86_64_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 
 static struct bfd_hash_entry *link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean elf64_x86_64_adjust_dynamic_symbol
+static bfd_boolean elf64_x86_64_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 
-static boolean allocate_dynrelocs
+static bfd_boolean allocate_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean readonly_dynrelocs
+static bfd_boolean readonly_dynrelocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf64_x86_64_size_dynamic_sections
+static bfd_boolean elf64_x86_64_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static bfd_vma dtpoff_base
   PARAMS ((struct bfd_link_info *));
 static bfd_vma tpoff
   PARAMS ((struct bfd_link_info *, bfd_vma));
-static boolean elf64_x86_64_relocate_section
+static bfd_boolean elf64_x86_64_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	 Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf64_x86_64_finish_dynamic_symbol
+static bfd_boolean elf64_x86_64_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *sym));
-static boolean elf64_x86_64_finish_dynamic_sections
+static bfd_boolean elf64_x86_64_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static enum elf_reloc_type_class elf64_x86_64_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
@@ -251,7 +251,7 @@ elf64_x86_64_info_to_howto (abfd, cache_ptr, dst)
 }
 
 /* Support for core dump NOTE sections.  */
-static boolean
+static bfd_boolean
 elf64_x86_64_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -262,7 +262,7 @@ elf64_x86_64_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 336:		/* sizeof(istruct elf_prstatus) on Linux/x86_64 */
 	/* pr_cursig */
@@ -285,7 +285,7 @@ elf64_x86_64_grok_prstatus (abfd, note)
 					  raw_size, note->descpos + offset);
 }
 
-static boolean
+static bfd_boolean
 elf64_x86_64_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -293,7 +293,7 @@ elf64_x86_64_grok_psinfo (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 136:		/* sizeof(struct elf_prpsinfo) on Linux/x86_64 */
 	elf_tdata (abfd)->core_program
@@ -314,7 +314,7 @@ elf64_x86_64_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 
 /* Functions for the x86-64 ELF linker.	 */
@@ -505,7 +505,7 @@ elf64_x86_64_link_hash_table_create (abfd)
 /* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
    shortcuts to them in our hash table.  */
 
-static boolean
+static bfd_boolean
 create_got_section (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -513,7 +513,7 @@ create_got_section (dynobj, info)
   struct elf64_x86_64_link_hash_table *htab;
 
   if (! _bfd_elf_create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   htab = elf64_x86_64_hash_table (info);
   htab->sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -528,15 +528,15 @@ create_got_section (dynobj, info)
 				   | SEC_IN_MEMORY | SEC_LINKER_CREATED
 				   | SEC_READONLY))
       || ! bfd_set_section_alignment (dynobj, htab->srelgot, 3))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
    .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
    hash table.  */
 
-static boolean
+static bfd_boolean
 elf64_x86_64_create_dynamic_sections (dynobj, info)
      bfd *dynobj;
      struct bfd_link_info *info;
@@ -545,10 +545,10 @@ elf64_x86_64_create_dynamic_sections (dynobj, info)
 
   htab = elf64_x86_64_hash_table (info);
   if (!htab->sgot && !create_got_section (dynobj, info))
-    return false;
+    return FALSE;
 
   if (!_bfd_elf_create_dynamic_sections (dynobj, info))
-    return false;
+    return FALSE;
 
   htab->splt = bfd_get_section_by_name (dynobj, ".plt");
   htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
@@ -560,7 +560,7 @@ elf64_x86_64_create_dynamic_sections (dynobj, info)
       || (!info->shared && !htab->srelbss))
     abort ();
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
@@ -619,18 +619,18 @@ elf64_x86_64_copy_indirect_symbol (bed, dir, ind)
   _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
 }
 
-static boolean
+static bfd_boolean
 elf64_x86_64_mkobject (abfd)
      bfd *abfd;
 {
   bfd_size_type amt = sizeof (struct elf64_x86_64_obj_tdata);
   abfd->tdata.any = bfd_zalloc (abfd, amt);
   if (abfd->tdata.any == NULL)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf64_x86_64_elf_object_p (abfd)
   bfd *abfd;
 {
@@ -639,12 +639,12 @@ elf64_x86_64_elf_object_p (abfd)
   bfd_size_type amt = sizeof (struct elf64_x86_64_obj_tdata);
   new_tdata = bfd_zalloc (abfd, amt);
   if (new_tdata == NULL)
-    return false;
+    return FALSE;
   new_tdata->root = *abfd->tdata.elf_obj_data;
   abfd->tdata.any = new_tdata;
   /* Set the right machine number for an x86-64 elf64 file.  */
   bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64);
-  return true;
+  return TRUE;
 }
 
 static int
@@ -674,7 +674,7 @@ elf64_x86_64_tls_transition (info, r_type, is_local)
    calculate needed space in the global offset table, procedure
    linkage table, and dynamic reloc sections.  */
 
-static boolean
+static bfd_boolean
 elf64_x86_64_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -689,7 +689,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
   asection *sreloc;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = elf64_x86_64_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -712,7 +712,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 	  (*_bfd_error_handler) (_("%s: bad symbol index: %d"),
 				 bfd_archive_filename (abfd),
 				 r_symndx);
-	  return false;
+	  return FALSE;
 	}
 
       if (r_symndx < symtab_hdr->sh_info)
@@ -735,7 +735,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 		 bfd_archive_filename (abfd),
 		 x86_64_elf_howto_table[r_type].name);
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 
@@ -778,7 +778,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 		    local_got_refcounts = ((bfd_signed_vma *)
 					   bfd_zalloc (abfd, size));
 		    if (local_got_refcounts == NULL)
-		      return false;
+		      return FALSE;
 		    elf_local_got_refcounts (abfd) = local_got_refcounts;
 		    elf64_x86_64_local_got_tls_type (abfd)
 		      = (char *) (local_got_refcounts + symtab_hdr->sh_info);
@@ -801,7 +801,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 		      (_("%s: %s' accessed both as normal and thread local symbol"),
 		       bfd_archive_filename (abfd),
 		       h ? h->root.root.string : "<local>");
-		    return false;
+		    return FALSE;
 		  }
 	      }
 
@@ -822,7 +822,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 	      if (htab->elf.dynobj == NULL)
 		htab->elf.dynobj = abfd;
 	      if (!create_got_section (htab->elf.dynobj, info))
-		return false;
+		return FALSE;
 	    }
 	  break;
 
@@ -860,7 +860,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 		 bfd_archive_filename (abfd),
 		 x86_64_elf_howto_table[r_type].name);
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  /* Fall through.  */
 
@@ -937,7 +937,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
-		    return false;
+		    return FALSE;
 
 		  if (strncmp (name, ".rela", 5) != 0
 		      || strcmp (bfd_get_section_name (abfd, sec),
@@ -966,7 +966,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 		      if (sreloc == NULL
 			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 3))
-			return false;
+			return FALSE;
 		    }
 		  elf_section_data (sec)->sreloc = sreloc;
 		}
@@ -987,7 +987,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 		  s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
 						 sec, r_symndx);
 		  if (s == NULL)
-		    return false;
+		    return FALSE;
 
 		  head = ((struct elf64_x86_64_dyn_relocs **)
 			  &elf_section_data (s)->local_dynrel);
@@ -1000,7 +1000,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 		  p = ((struct elf64_x86_64_dyn_relocs *)
 		       bfd_alloc (htab->elf.dynobj, amt));
 		  if (p == NULL)
-		    return false;
+		    return FALSE;
 		  p->next = *head;
 		  *head = p;
 		  p->sec = sec;
@@ -1020,14 +1020,14 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_X86_64_GNU_VTINHERIT:
 	  if (!_bfd_elf64_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_X86_64_GNU_VTENTRY:
 	  if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
+	    return FALSE;
 	  break;
 
 	default:
@@ -1035,7 +1035,7 @@ elf64_x86_64_check_relocs (abfd, info, sec, relocs)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -1080,7 +1080,7 @@ elf64_x86_64_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.	 */
 
-static boolean
+static bfd_boolean
 elf64_x86_64_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1183,7 +1183,7 @@ elf64_x86_64_gc_sweep_hook (abfd, info, sec, relocs)
 	break;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -1192,7 +1192,7 @@ elf64_x86_64_gc_sweep_hook (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.	*/
 
-static boolean
+static bfd_boolean
 elf64_x86_64_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -1225,7 +1225,7 @@ elf64_x86_64_adjust_dynamic_symbol (info, h)
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
 	}
 
-      return true;
+      return TRUE;
     }
   else
     /* It's possible that we incorrectly decided a .plt reloc was
@@ -1244,7 +1244,7 @@ elf64_x86_64_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1255,18 +1255,18 @@ elf64_x86_64_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.	*/
   if (info->shared)
-    return true;
+    return TRUE;
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
-    return true;
+    return TRUE;
 
   /* If -z nocopyreloc was given, we won't generate them either.  */
   if (info->nocopyreloc)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   eh = (struct elf64_x86_64_link_hash_entry *) h;
@@ -1282,7 +1282,7 @@ elf64_x86_64_adjust_dynamic_symbol (info, h)
   if (p == NULL)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
-      return true;
+      return TRUE;
     }
 
   /* We must allocate the symbol in our .dynbss section, which will
@@ -1321,7 +1321,7 @@ elf64_x86_64_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
       if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
-	return false;
+	return FALSE;
     }
 
   /* Define the symbol as being at this point in the section.  */
@@ -1331,7 +1331,7 @@ elf64_x86_64_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
-  return true;
+  return TRUE;
 }
 
 /* This is the condition under which elf64_x86_64_finish_dynamic_symbol
@@ -1348,7 +1348,7 @@ elf64_x86_64_adjust_dynamic_symbol (info, h)
 /* Allocate space in .plt, .got and associated reloc sections for
    dynamic relocs.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -1359,7 +1359,7 @@ allocate_dynrelocs (h, inf)
   struct elf64_x86_64_dyn_relocs *p;
 
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -1376,7 +1376,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
@@ -1434,7 +1434,7 @@ allocate_dynrelocs (h, inf)
   else if (h->got.refcount > 0)
     {
       asection *s;
-      boolean dyn;
+      bfd_boolean dyn;
       int tls_type = elf64_x86_64_hash_entry (h)->tls_type;
 
       /* Make sure this symbol is output as a dynamic symbol.
@@ -1443,7 +1443,7 @@ allocate_dynrelocs (h, inf)
 	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	{
 	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       s = htab->sgot;
@@ -1469,7 +1469,7 @@ allocate_dynrelocs (h, inf)
 
   eh = (struct elf64_x86_64_link_hash_entry *) h;
   if (eh->dyn_relocs == NULL)
-    return true;
+    return TRUE;
 
   /* In the shared -Bsymbolic case, discard space allocated for
      dynamic pc-relative relocs against symbols which turn out to be
@@ -1515,7 +1515,7 @@ allocate_dynrelocs (h, inf)
 	      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
 	    {
 	      if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 
 	  /* If that succeeded, we know we'll be keeping all the
@@ -1536,12 +1536,12 @@ allocate_dynrelocs (h, inf)
       sreloc->_raw_size += p->count * sizeof (Elf64_External_Rela);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Find any dynamic relocs that apply to read-only sections.  */
 
-static boolean
+static bfd_boolean
 readonly_dynrelocs (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
@@ -1564,15 +1564,15 @@ readonly_dynrelocs (h, inf)
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
-	  return false;
+	  return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_x86_64_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
@@ -1580,7 +1580,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info)
   struct elf64_x86_64_link_hash_table *htab;
   bfd *dynobj;
   asection *s;
-  boolean relocs;
+  bfd_boolean relocs;
   bfd *ibfd;
 
   htab = elf64_x86_64_hash_table (info);
@@ -1688,7 +1688,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info)
 
   /* We now have determined the sizes of the various dynamic sections.
      Allocate memory for them.  */
-  relocs = false;
+  relocs = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       if ((s->flags & SEC_LINKER_CREATED) == 0)
@@ -1704,7 +1704,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info)
       else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
 	{
 	  if (s->_raw_size != 0 && s != htab->srelplt)
-	    relocs = true;
+	    relocs = TRUE;
 
 	  /* We use the reloc_count field as a counter if we need
 	     to copy relocs into the output file.  */
@@ -1739,7 +1739,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info)
 	 of garbage.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
     }
 
   if (htab->elf.dynamic_sections_created)
@@ -1755,7 +1755,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info)
       if (! info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (htab->splt->_raw_size != 0)
@@ -1764,7 +1764,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (relocs)
@@ -1772,7 +1772,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info)
 	  if (!add_dynamic_entry (DT_RELA, 0)
 	      || !add_dynamic_entry (DT_RELASZ, 0)
 	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
-	    return false;
+	    return FALSE;
 
 	  /* If any dynamic relocs apply to a read-only section,
 	     then we need a DT_TEXTREL entry.  */
@@ -1783,13 +1783,13 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info)
 	  if ((info->flags & DF_TEXTREL) != 0)
 	    {
 	      if (!add_dynamic_entry (DT_TEXTREL, 0))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 #undef add_dynamic_entry
 
-  return true;
+  return TRUE;
 }
 
 /* Return the base VMA address which should be subtracted from real addresses
@@ -1826,7 +1826,7 @@ tpoff (info, address)
 
 /* Relocate an x86_64 ELF section.  */
 
-static boolean
+static bfd_boolean
 elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 			       contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -1846,7 +1846,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *relend;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   htab = elf64_x86_64_hash_table (info);
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -1865,7 +1865,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
       asection *sec;
       bfd_vma off;
       bfd_vma relocation;
-      boolean unresolved_reloc;
+      bfd_boolean unresolved_reloc;
       bfd_reloc_status_type r;
       int tls_type;
 
@@ -1877,7 +1877,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r_type >= R_X86_64_max)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       howto = x86_64_elf_howto_table + r_type;
@@ -1885,7 +1885,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sec = NULL;
-      unresolved_reloc = false;
+      unresolved_reloc = FALSE;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -1910,7 +1910,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 		     relocation value for this symbol.  output_section
 		     is typically NULL for symbols satisfied by a shared
 		     library.  */
-		  unresolved_reloc = true;
+		  unresolved_reloc = TRUE;
 		  relocation = 0;
 		}
 	      else
@@ -1932,7 +1932,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 		      input_section, rel->r_offset,
 		      (!info->shared || info->no_undefined
 		       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
+		return FALSE;
 	      relocation = 0;
 	    }
 	}
@@ -1950,7 +1950,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	  if (h != NULL)
 	    {
-	      boolean dyn;
+	      bfd_boolean dyn;
 
 	      off = h->got.offset;
 	      dyn = htab->elf.dynamic_sections_created;
@@ -1983,7 +1983,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 		    }
 		}
 	      else
-		unresolved_reloc = false;
+		unresolved_reloc = FALSE;
 	    }
 	  else
 	    {
@@ -2058,7 +2058,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 	  relocation = (htab->splt->output_section->vma
 			+ htab->splt->output_offset
 			+ h->plt.offset);
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  break;
 
 	case R_X86_64_PC8:
@@ -2100,23 +2100,23 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      Elf_Internal_Rela outrel;
 	      bfd_byte *loc;
-	      boolean skip, relocate;
+	      bfd_boolean skip, relocate;
 	      asection *sreloc;
 
 	      /* When generating a shared object, these relocations
 		 are copied into the output file to be resolved at run
 		 time.	*/
 
-	      skip = false;
-	      relocate = false;
+	      skip = FALSE;
+	      relocate = FALSE;
 
 	      outrel.r_offset =
 		_bfd_elf_section_offset (output_bfd, info, input_section,
 					 rel->r_offset);
 	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = true;
+		skip = TRUE;
 	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = true, relocate = true;
+		skip = TRUE, relocate = TRUE;
 
 	      outrel.r_offset += (input_section->output_section->vma
 				  + input_section->output_offset);
@@ -2144,7 +2144,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 		  /* This symbol is local, or marked to become local.  */
 		  if (r_type == R_X86_64_64)
 		    {
-		      relocate = true;
+		      relocate = TRUE;
 		      outrel.r_info = ELF64_R_INFO (0, R_X86_64_RELATIVE);
 		      outrel.r_addend = relocation + rel->r_addend;
 		    }
@@ -2166,7 +2166,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -2392,7 +2392,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      relocation = htab->sgot->output_section->vma
 			   + htab->sgot->output_offset + off;
-	      unresolved_reloc = false;
+	      unresolved_reloc = FALSE;
 	    }
 	  else
 	    {
@@ -2493,7 +2493,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 	    }
 	  relocation = htab->sgot->output_section->vma
 		       + htab->sgot->output_offset + off;
-	  unresolved_reloc = false;
+	  unresolved_reloc = FALSE;
 	  break;
 
 	case R_X86_64_DTPOFF32:
@@ -2541,7 +2541,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 						      symtab_hdr->sh_link,
 						      sym->st_name);
 	      if (name == NULL)
-		return false;
+		return FALSE;
 	      if (*name == '\0')
 		name = bfd_section_name (input_bfd, sec);
 	    }
@@ -2552,7 +2552,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
@@ -2561,18 +2561,18 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
 		 bfd_archive_filename (input_bfd),
 		 bfd_get_section_name (input_bfd, input_section),
 		 (long) rel->r_offset, name, (int) r);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf64_x86_64_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2738,7 +2738,7 @@ elf64_x86_64_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Used to decide how to sort relocs in an optimal manner for the
@@ -2763,7 +2763,7 @@ elf64_x86_64_reloc_type_class (rela)
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_x86_64_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2889,7 +2889,7 @@ elf64_x86_64_finish_dynamic_sections (output_bfd, info)
 	GOT_ENTRY_SIZE;
     }
 
-  return true;
+  return TRUE;
 }
 
 
diff --git a/bfd/elfarm-nabi.c b/bfd/elfarm-nabi.c
index 47ac1c0eedb..5ecbe8e3e62 100644
--- a/bfd/elfarm-nabi.c
+++ b/bfd/elfarm-nabi.c
@@ -42,9 +42,9 @@
 
 static reloc_howto_type * elf32_arm_reloc_type_lookup
   PARAMS ((bfd * abfd, bfd_reloc_code_real_type code));
-static boolean elf32_arm_nabi_grok_prstatus
+static bfd_boolean elf32_arm_nabi_grok_prstatus
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
-static boolean elf32_arm_nabi_grok_psinfo
+static bfd_boolean elf32_arm_nabi_grok_psinfo
   PARAMS ((bfd *abfd, Elf_Internal_Note *note));
 
 /* Note: code such as elf32_arm_reloc_type_lookup expect to use e.g.
@@ -58,247 +58,247 @@ static reloc_howto_type elf32_arm_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_PC24,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 24,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_PC24",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ffffff,		/* src_mask */
 	 0x00ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 32 bit absolute */
   HOWTO (R_ARM_ABS32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_ABS32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* standard 32bit pc-relative reloc */
   HOWTO (R_ARM_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_REL32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 8 bit absolute */
   HOWTO (R_ARM_PC13,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_PC13",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
    /* 16 bit absolute */
   HOWTO (R_ARM_ABS16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_ABS16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 12 bit absolute */
   HOWTO (R_ARM_ABS12,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 12,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_ABS12",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x000008ff,		/* src_mask */
 	 0x000008ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_THM_ABS5,	/* type */
 	 6,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 5,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_THM_ABS5",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x000007e0,		/* src_mask */
 	 0x000007e0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 8 bit absolute */
   HOWTO (R_ARM_ABS8,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_ABS8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_SBREL32,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_SBREL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_THM_PC22,	/* type */
 	 1,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 23,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_THM_PC22",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x07ff07ff,		/* src_mask */
 	 0x07ff07ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_ARM_THM_PC8,	        /* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_THM_PC8",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_ARM_AMP_VCALL9,	/* type */
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_AMP_VCALL9",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   HOWTO (R_ARM_SWI24,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_SWI24",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_THM_SWI8,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_SWI8",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* BLX instruction for the ARM.  */
   HOWTO (R_ARM_XPC25,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 25,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_XPC25",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00ffffff,		/* src_mask */
 	 0x00ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* BLX instruction for the Thumb.  */
   HOWTO (R_ARM_THM_XPC22,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 22,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_THM_XPC22",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x07ff07ff,		/* src_mask */
 	 0x07ff07ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* These next three relocs are not defined, but we need to fill the space.  */
 
@@ -306,43 +306,43 @@ static reloc_howto_type elf32_arm_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_unknown_17",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_NONE,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_unknown_18",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_NONE,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_unknown_19",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Relocs used in ARM Linux */
 
@@ -350,113 +350,113 @@ static reloc_howto_type elf32_arm_howto_table[] =
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield,/* complain_on_overflow */
          bfd_elf_generic_reloc, /* special_function */
          "R_ARM_COPY",		/* name */
-         true,			/* partial_inplace */
+         TRUE,			/* partial_inplace */
          0xffffffff,		/* src_mask */
          0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   HOWTO (R_ARM_GLOB_DAT,	/* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield,/* complain_on_overflow */
          bfd_elf_generic_reloc, /* special_function */
          "R_ARM_GLOB_DAT",	/* name */
-         true,			/* partial_inplace */
+         TRUE,			/* partial_inplace */
          0xffffffff,		/* src_mask */
          0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   HOWTO (R_ARM_JUMP_SLOT,	/* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield,/* complain_on_overflow */
          bfd_elf_generic_reloc, /* special_function */
          "R_ARM_JUMP_SLOT",	/* name */
-         true,			/* partial_inplace */
+         TRUE,			/* partial_inplace */
          0xffffffff,		/* src_mask */
          0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   HOWTO (R_ARM_RELATIVE,	/* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield,/* complain_on_overflow */
          bfd_elf_generic_reloc, /* special_function */
          "R_ARM_RELATIVE",	/* name */
-         true,			/* partial_inplace */
+         TRUE,			/* partial_inplace */
          0xffffffff,		/* src_mask */
          0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   HOWTO (R_ARM_GOTOFF,		/* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield,/* complain_on_overflow */
          bfd_elf_generic_reloc, /* special_function */
          "R_ARM_GOTOFF",	/* name */
-         true,			/* partial_inplace */
+         TRUE,			/* partial_inplace */
          0xffffffff,		/* src_mask */
          0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
+         FALSE),                /* pcrel_offset */
 
   HOWTO (R_ARM_GOTPC,		/* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         true,			/* pc_relative */
+         TRUE,			/* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield,/* complain_on_overflow */
          bfd_elf_generic_reloc, /* special_function */
          "R_ARM_GOTPC",		/* name */
-         true,			/* partial_inplace */
+         TRUE,			/* partial_inplace */
          0xffffffff,		/* src_mask */
          0xffffffff,		/* dst_mask */
-         true),			/* pcrel_offset */
+         TRUE),			/* pcrel_offset */
 
   HOWTO (R_ARM_GOT32,		/* type */
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         false,			/* pc_relative */
+         FALSE,			/* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield,/* complain_on_overflow */
          bfd_elf_generic_reloc, /* special_function */
          "R_ARM_GOT32",		/* name */
-         true,			/* partial_inplace */
+         TRUE,			/* partial_inplace */
          0xffffffff,		/* src_mask */
          0xffffffff,		/* dst_mask */
-         false),		/* pcrel_offset */
+         FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_PLT32,		/* type */
          2,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          26,                    /* bitsize */
-         true,			/* pc_relative */
+         TRUE,			/* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield,/* complain_on_overflow */
          bfd_elf_generic_reloc, /* special_function */
          "R_ARM_PLT32",		/* name */
-         true,			/* partial_inplace */
+         TRUE,			/* partial_inplace */
          0x00ffffff,		/* src_mask */
          0x00ffffff,		/* dst_mask */
-         true),			/* pcrel_offset */
+         TRUE),			/* pcrel_offset */
 
   /* End of relocs used in ARM Linux */
 
@@ -464,57 +464,57 @@ static reloc_howto_type elf32_arm_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_RREL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_RABS32,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_RABS32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_RPC24,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_RPC24",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_ARM_RBASE,		/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont,/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_RBASE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 };
 
@@ -524,15 +524,15 @@ static reloc_howto_type elf32_arm_vtinherit_howto =
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          NULL,                  /* special_function */
          "R_ARM_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false);                /* pcrel_offset */
+         FALSE);                /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage */
 static reloc_howto_type elf32_arm_vtentry_howto =
@@ -540,15 +540,15 @@ static reloc_howto_type elf32_arm_vtentry_howto =
          0,                     /* rightshift */
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          0,                     /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_dont, /* complain_on_overflow */
          _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
          "R_ARM_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
+         FALSE,                 /* partial_inplace */
          0,                     /* src_mask */
          0,                     /* dst_mask */
-         false);                /* pcrel_offset */
+         FALSE);                /* pcrel_offset */
 
   /* 12 bit pc relative */
 static reloc_howto_type elf32_arm_thm_pc11_howto =
@@ -556,15 +556,15 @@ static reloc_howto_type elf32_arm_thm_pc11_howto =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 11,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_THM_PC11",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x000007ff,		/* src_mask */
 	 0x000007ff,		/* dst_mask */
-	 true);			/* pcrel_offset */
+	 TRUE);			/* pcrel_offset */
 
   /* 12 bit pc relative */
 static reloc_howto_type elf32_arm_thm_pc9_howto =
@@ -572,15 +572,15 @@ static reloc_howto_type elf32_arm_thm_pc9_howto =
 	 1,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,	/* complain_on_overflow */
 	 bfd_elf_generic_reloc,	/* special_function */
 	 "R_ARM_THM_PC9",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x000000ff,		/* src_mask */
 	 0x000000ff,		/* dst_mask */
-	 true);			/* pcrel_offset */
+	 TRUE);			/* pcrel_offset */
 
 static void elf32_arm_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
@@ -682,7 +682,7 @@ elf32_arm_reloc_type_lookup (abfd, code)
 }
 
 /* Support for core dump NOTE sections */
-static boolean
+static bfd_boolean
 elf32_arm_nabi_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -693,7 +693,7 @@ elf32_arm_nabi_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 148:		/* Linux/ARM 32-bit*/
 	/* pr_cursig */
@@ -714,7 +714,7 @@ elf32_arm_nabi_grok_prstatus (abfd, note)
 					  raw_size, note->descpos + offset);
 }
 
-static boolean
+static bfd_boolean
 elf32_arm_nabi_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -722,7 +722,7 @@ elf32_arm_nabi_grok_psinfo (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 124:		/* Linux/ARM elf_prpsinfo */
 	elf_tdata (abfd)->core_program
@@ -743,7 +743,7 @@ elf32_arm_nabi_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 
 #define elf_backend_grok_prstatus	elf32_arm_nabi_grok_prstatus
diff --git a/bfd/elfarm-oabi.c b/bfd/elfarm-oabi.c
index 00cdeea3093..08ba41e1ea7 100644
--- a/bfd/elfarm-oabi.c
+++ b/bfd/elfarm-oabi.c
@@ -59,220 +59,220 @@ static reloc_howto_type elf32_arm_howto_table[] =
 	   0,			/* rightshift */
 	   0,			/* size (0 = byte, 1 = short, 2 = long) */
 	   0,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_NONE",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0,			/* src_mask */
 	   0,			/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     HOWTO (R_ARM_PC24,		/* type */
 	   2,			/* rightshift */
 	   2,			/* size (0 = byte, 1 = short, 2 = long) */
 	   24,			/* bitsize */
-	   true,		/* pc_relative */
+	   TRUE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_signed,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_PC24",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0x00ffffff,		/* src_mask */
 	   0x00ffffff,		/* dst_mask */
-	   true),			/* pcrel_offset */
+	   TRUE),			/* pcrel_offset */
 
     /* 32 bit absolute.  */
     HOWTO (R_ARM_ABS32,		/* type */
 	   0,			/* rightshift */
 	   2,			/* size (0 = byte, 1 = short, 2 = long) */
 	   32,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_bitfield,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_ABS32",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0xffffffff,		/* src_mask */
 	   0xffffffff,		/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     /* Standard 32bit pc-relative reloc.  */
     HOWTO (R_ARM_REL32,		/* type */
 	   0,			/* rightshift */
 	   2,			/* size (0 = byte, 1 = short, 2 = long) */
 	   32,			/* bitsize */
-	   true,		/* pc_relative */
+	   TRUE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_bitfield,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_REL32",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0xffffffff,		/* src_mask */
 	   0xffffffff,		/* dst_mask */
-	   true),		/* pcrel_offset */
+	   TRUE),		/* pcrel_offset */
 
     /* 8 bit absolute.  */
     HOWTO (R_ARM_ABS8,		/* type */
 	   0,			/* rightshift */
 	   0,			/* size (0 = byte, 1 = short, 2 = long) */
 	   8,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_bitfield,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_ABS8",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0x000000ff,		/* src_mask */
 	   0x000000ff,		/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     /* 16 bit absolute.  */
     HOWTO (R_ARM_ABS16,		/* type */
 	   0,			/* rightshift */
 	   1,			/* size (0 = byte, 1 = short, 2 = long) */
 	   16,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_bitfield,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_ABS16",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0,			/* src_mask */
 	   0,			/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     /* 12 bit absolute.  */
     HOWTO (R_ARM_ABS12,		/* type */
 	   0,			/* rightshift */
 	   2,			/* size (0 = byte, 1 = short, 2 = long) */
 	   12,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_bitfield,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_ABS12",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0x000008ff,		/* src_mask */
 	   0x000008ff,		/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     HOWTO (R_ARM_THM_ABS5,	/* type */
 	   6,			/* rightshift */
 	   1,			/* size (0 = byte, 1 = short, 2 = long) */
 	   5,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_bitfield,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_THM_ABS5",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0x000007e0,		/* src_mask */
 	   0x000007e0,		/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     HOWTO (R_ARM_THM_PC22,	/* type */
 	   1,			/* rightshift */
 	   2,			/* size (0 = byte, 1 = short, 2 = long) */
 	   23,			/* bitsize */
-	   true,		/* pc_relative */
+	   TRUE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_signed,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_THM_PC22",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0x07ff07ff,		/* src_mask */
 	   0x07ff07ff,		/* dst_mask */
-	   true),			/* pcrel_offset */
+	   TRUE),			/* pcrel_offset */
 
     HOWTO (R_ARM_SBREL32,		/* type */
 	   0,			/* rightshift */
 	   0,			/* size (0 = byte, 1 = short, 2 = long) */
 	   0,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_SBREL32",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0,			/* src_mask */
 	   0,			/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     HOWTO (R_ARM_AMP_VCALL9,	/* type */
 	   1,			/* rightshift */
 	   1,			/* size (0 = byte, 1 = short, 2 = long) */
 	   8,			/* bitsize */
-	   true,		/* pc_relative */
+	   TRUE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_signed,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_AMP_VCALL9",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0x000000ff,		/* src_mask */
 	   0x000000ff,		/* dst_mask */
-	   true),		/* pcrel_offset */
+	   TRUE),		/* pcrel_offset */
 
     /* 12 bit pc relative.  */
     HOWTO (R_ARM_THM_PC11,	/* type */
 	   1,			/* rightshift */
 	   1,			/* size (0 = byte, 1 = short, 2 = long) */
 	   11,			/* bitsize */
-	   true,		/* pc_relative */
+	   TRUE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_signed,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_THM_PC11",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0x000007ff,		/* src_mask */
 	   0x000007ff,		/* dst_mask */
-	   true),		/* pcrel_offset */
+	   TRUE),		/* pcrel_offset */
 
     /* 12 bit pc relative.  */
     HOWTO (R_ARM_THM_PC9,	/* type */
 	   1,			/* rightshift */
 	   1,			/* size (0 = byte, 1 = short, 2 = long) */
 	   8,			/* bitsize */
-	   true,		/* pc_relative */
+	   TRUE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_signed,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_THM_PC9",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0x000000ff,		/* src_mask */
 	   0x000000ff,		/* dst_mask */
-	   true),		/* pcrel_offset */
+	   TRUE),		/* pcrel_offset */
 
     /* GNU extension to record C++ vtable hierarchy.  */
     HOWTO (R_ARM_GNU_VTINHERIT, /* type */
 	   0,                     /* rightshift */
 	   2,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   0,                     /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont, /* complain_on_overflow */
 	   NULL,                  /* special_function */
 	   "R_ARM_GNU_VTINHERIT", /* name */
-	   false,                 /* partial_inplace */
+	   FALSE,                 /* partial_inplace */
 	   0,                     /* src_mask */
 	   0,                     /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* GNU extension to record C++ vtable member usage.  */
     HOWTO (R_ARM_GNU_VTENTRY,     /* type */
 	   0,                     /* rightshift */
 	   2,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   0,                     /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont, /* complain_on_overflow */
 	   _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
 	   "R_ARM_GNU_VTENTRY",   /* name */
-	   false,                 /* partial_inplace */
+	   FALSE,                 /* partial_inplace */
 	   0,                     /* src_mask */
 	   0,                     /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* XXX - gap in index numbering here.  */
 
@@ -280,15 +280,15 @@ static reloc_howto_type elf32_arm_howto_table[] =
 	   2,                   /* rightshift */
 	   2,                   /* size (0 = byte, 1 = short, 2 = long) */
 	   26,                  /* bitsize */
-	   true,		/* pc_relative */
+	   TRUE,		/* pc_relative */
 	   0,                   /* bitpos */
 	   complain_overflow_bitfield,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_ARM_PLT32",	/* name */
-	   true,		/* partial_inplace */
+	   TRUE,		/* partial_inplace */
 	   0x00ffffff,		/* src_mask */
 	   0x00ffffff,		/* dst_mask */
-	   true),			/* pcrel_offset */
+	   TRUE),			/* pcrel_offset */
 
     /* XXX - gap in index numbering here.  */
 
@@ -296,57 +296,57 @@ static reloc_howto_type elf32_arm_howto_table[] =
 	   0,			/* rightshift */
 	   0,			/* size (0 = byte, 1 = short, 2 = long) */
 	   0,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_RREL32",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0,			/* src_mask */
 	   0,			/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     HOWTO (R_ARM_RABS32,	/* type */
 	   0,			/* rightshift */
 	   0,			/* size (0 = byte, 1 = short, 2 = long) */
 	   0,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_RABS32",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0,			/* src_mask */
 	   0,			/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     HOWTO (R_ARM_RPC24,		/* type */
 	   0,			/* rightshift */
 	   0,			/* size (0 = byte, 1 = short, 2 = long) */
 	   0,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_RPC24",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0,			/* src_mask */
 	   0,			/* dst_mask */
-	   false),		/* pcrel_offset */
+	   FALSE),		/* pcrel_offset */
 
     HOWTO (R_ARM_RBASE,		/* type */
 	   0,			/* rightshift */
 	   0,			/* size (0 = byte, 1 = short, 2 = long) */
 	   0,			/* bitsize */
-	   false,		/* pc_relative */
+	   FALSE,		/* pc_relative */
 	   0,			/* bitpos */
 	   complain_overflow_dont,	/* complain_on_overflow */
 	   bfd_elf_generic_reloc,	/* special_function */
 	   "R_ARM_RBASE",	/* name */
-	   false,		/* partial_inplace */
+	   FALSE,		/* partial_inplace */
 	   0,			/* src_mask */
 	   0,			/* dst_mask */
-	   false)		/* pcrel_offset */
+	   FALSE)		/* pcrel_offset */
   };
 
 /* Locate a reloc in the howto table.  This function must be used
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index c1ef912d727..2a6f6bf20a4 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -170,11 +170,11 @@ static void elf_swap_shdr_out
 
 #define section_from_elf_index bfd_section_from_elf_index
 
-static boolean elf_slurp_reloc_table_from_section
+static bfd_boolean elf_slurp_reloc_table_from_section
   PARAMS ((bfd *, asection *, Elf_Internal_Shdr *, bfd_size_type,
-	   arelent *, asymbol **, boolean));
+	   arelent *, asymbol **, bfd_boolean));
 
-static boolean elf_file_p PARAMS ((Elf_External_Ehdr *));
+static bfd_boolean elf_file_p PARAMS ((Elf_External_Ehdr *));
 
 #ifdef DEBUG
 static void elf_debug_section PARAMS ((int, Elf_Internal_Shdr *));
@@ -500,7 +500,7 @@ elf_swap_dyn_out (abfd, src, p)
    First we validate the file by reading in the ELF header and checking
    the magic number.  */
 
-static INLINE boolean
+static INLINE bfd_boolean
 elf_file_p (x_ehdrp)
      Elf_External_Ehdr *x_ehdrp;
 {
@@ -861,7 +861,7 @@ elf_write_relocs (abfd, sec, data)
      asection *sec;
      PTR data;
 {
-  boolean *failedp = (boolean *) data;
+  bfd_boolean *failedp = (bfd_boolean *) data;
   Elf_Internal_Shdr *rela_hdr;
   bfd_vma addr_offset;
   void (*swap_out) PARAMS ((bfd *, const Elf_Internal_Rela *, bfd_byte *));
@@ -891,7 +891,7 @@ elf_write_relocs (abfd, sec, data)
   rela_hdr->contents = (PTR) bfd_alloc (abfd, rela_hdr->sh_size);
   if (rela_hdr->contents == NULL)
     {
-      *failedp = true;
+      *failedp = TRUE;
       return;
     }
 
@@ -942,7 +942,7 @@ elf_write_relocs (abfd, sec, data)
 	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
 	  if (n < 0)
 	    {
-	      *failedp = true;
+	      *failedp = TRUE;
 	      return;
 	    }
 	  last_sym_idx = n;
@@ -952,7 +952,7 @@ elf_write_relocs (abfd, sec, data)
 	  && (*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
 	  && ! _bfd_elf_validate_reloc (abfd, ptr))
 	{
-	  *failedp = true;
+	  *failedp = TRUE;
 	  return;
 	}
 
@@ -985,7 +985,7 @@ elf_write_out_phdrs (abfd, phdr, count)
 
 /* Write out the section headers and the ELF file header.  */
 
-boolean
+bfd_boolean
 elf_write_shdrs_and_ehdr (abfd)
      bfd *abfd;
 {
@@ -1008,7 +1008,7 @@ elf_write_shdrs_and_ehdr (abfd)
   amt = sizeof (x_ehdr);
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
       || bfd_bwrite ((PTR) & x_ehdr, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Some fields in the first section header handle overflow of ehdr
      fields.  */
@@ -1022,7 +1022,7 @@ elf_write_shdrs_and_ehdr (abfd)
   amt *= sizeof (*x_shdrp);
   x_shdrp = (Elf_External_Shdr *) bfd_alloc (abfd, amt);
   if (!x_shdrp)
-    return false;
+    return FALSE;
 
   for (count = 0; count < i_ehdrp->e_shnum; i_shdrp++, count++)
     {
@@ -1030,24 +1030,24 @@ elf_write_shdrs_and_ehdr (abfd)
       elf_debug_section (count, *i_shdrp);
 #endif
       elf_swap_shdr_out (abfd, *i_shdrp, x_shdrp + count);
-      
+
       if (count == SHN_LORESERVE - 1)
 	i_shdrp += SHN_HIRESERVE + 1 - SHN_LORESERVE;
     }
   if (bfd_seek (abfd, (file_ptr) i_ehdrp->e_shoff, SEEK_SET) != 0
       || bfd_bwrite ((PTR) x_shdrp, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* need to dump the string table too...  */
 
-  return true;
+  return TRUE;
 }
 
 long
 elf_slurp_symbol_table (abfd, symptrs, dynamic)
      bfd *abfd;
      asymbol **symptrs;		/* Buffer for generated bfd symbols */
-     boolean dynamic;
+     bfd_boolean dynamic;
 {
   Elf_Internal_Shdr *hdr;
   Elf_Internal_Shdr *verhdr;
@@ -1281,7 +1281,7 @@ error_return:
 /* Read  relocations for ASECT from REL_HDR.  There are RELOC_COUNT of
    them.  */
 
-static boolean
+static bfd_boolean
 elf_slurp_reloc_table_from_section (abfd, asect, rel_hdr, reloc_count,
 				    relents, symbols, dynamic)
      bfd *abfd;
@@ -1290,7 +1290,7 @@ elf_slurp_reloc_table_from_section (abfd, asect, rel_hdr, reloc_count,
      bfd_size_type reloc_count;
      arelent *relents;
      asymbol **symbols;
-     boolean dynamic;
+     bfd_boolean dynamic;
 {
   struct elf_backend_data * const ebd = get_elf_backend_data (abfd);
   PTR allocated = NULL;
@@ -1374,22 +1374,22 @@ elf_slurp_reloc_table_from_section (abfd, asect, rel_hdr, reloc_count,
   if (allocated != NULL)
     free (allocated);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (allocated != NULL)
     free (allocated);
-  return false;
+  return FALSE;
 }
 
 /* Read in and swap the external relocs.  */
 
-boolean
+bfd_boolean
 elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
      bfd *abfd;
      asection *asect;
      asymbol **symbols;
-     boolean dynamic;
+     bfd_boolean dynamic;
 {
   struct bfd_elf_section_data * const d = elf_section_data (asect);
   Elf_Internal_Shdr *rel_hdr;
@@ -1400,13 +1400,13 @@ elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
   bfd_size_type amt;
 
   if (asect->relocation != NULL)
-    return true;
+    return TRUE;
 
   if (! dynamic)
     {
       if ((asect->flags & SEC_RELOC) == 0
 	  || asect->reloc_count == 0)
-	return true;
+	return TRUE;
 
       rel_hdr = &d->rel_hdr;
       reloc_count = NUM_SHDR_ENTRIES (rel_hdr);
@@ -1425,7 +1425,7 @@ elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
 	 dynamic symbol table, and in that case bfd_section_from_shdr
 	 in elf.c does not update the RELOC_COUNT.  */
       if (asect->_raw_size == 0)
-	return true;
+	return TRUE;
 
       rel_hdr = &d->this_hdr;
       reloc_count = NUM_SHDR_ENTRIES (rel_hdr);
@@ -1436,23 +1436,23 @@ elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
   amt = (reloc_count + reloc_count2) * sizeof (arelent);
   relents = (arelent *) bfd_alloc (abfd, amt);
   if (relents == NULL)
-    return false;
+    return FALSE;
 
   if (!elf_slurp_reloc_table_from_section (abfd, asect,
 					   rel_hdr, reloc_count,
 					   relents,
 					   symbols, dynamic))
-    return false;
+    return FALSE;
 
   if (rel_hdr2
       && !elf_slurp_reloc_table_from_section (abfd, asect,
 					      rel_hdr2, reloc_count2,
 					      relents + reloc_count,
 					      symbols, dynamic))
-    return false;
+    return FALSE;
 
   asect->relocation = relents;
-  return true;
+  return TRUE;
 }
 
 #ifdef DEBUG
diff --git a/bfd/elfcore.h b/bfd/elfcore.h
index 264ff554fe2..4f9fcf75c25 100644
--- a/bfd/elfcore.h
+++ b/bfd/elfcore.h
@@ -32,7 +32,7 @@ elf_core_file_failing_signal (abfd)
   return elf_tdata (abfd)->core_signal;
 }
 
-boolean
+bfd_boolean
 elf_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd;
      bfd *exec_bfd;
@@ -44,7 +44,7 @@ elf_core_file_matches_executable_p (core_bfd, exec_bfd)
   if (core_bfd->xvec != exec_bfd->xvec)
     {
       bfd_set_error (bfd_error_system_call);
-      return false;
+      return FALSE;
     }
 
   /* See if the name in the corefile matches the executable name.  */
@@ -56,10 +56,10 @@ elf_core_file_matches_executable_p (core_bfd, exec_bfd)
       execname = execname ? execname + 1 : exec_bfd->filename;
 
       if (strcmp(execname, corename) != 0)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /*  Core files are simply standard ELF formatted files that partition
diff --git a/bfd/elflink.c b/bfd/elflink.c
index d6da588a153..3170035787e 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ARCH_SIZE 0
 #include "elf-bfd.h"
 
-boolean
+bfd_boolean
 _bfd_elf_create_got_section (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -39,7 +39,7 @@ _bfd_elf_create_got_section (abfd, info)
 
   /* This function may be called more than once.  */
   if (bfd_get_section_by_name (abfd, ".got") != NULL)
-    return true;
+    return TRUE;
 
   switch (bed->s->arch_size)
     {
@@ -53,7 +53,7 @@ _bfd_elf_create_got_section (abfd, info)
 
     default:
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
@@ -63,7 +63,7 @@ _bfd_elf_create_got_section (abfd, info)
   if (s == NULL
       || !bfd_set_section_flags (abfd, s, flags)
       || !bfd_set_section_alignment (abfd, s, ptralign))
-    return false;
+    return FALSE;
 
   if (bed->want_got_plt)
     {
@@ -71,7 +71,7 @@ _bfd_elf_create_got_section (abfd, info)
       if (s == NULL
 	  || !bfd_set_section_flags (abfd, s, flags)
 	  || !bfd_set_section_alignment (abfd, s, ptralign))
-	return false;
+	return FALSE;
     }
 
   if (bed->want_got_sym)
@@ -83,16 +83,16 @@ _bfd_elf_create_got_section (abfd, info)
       bh = NULL;
       if (!(_bfd_generic_link_add_one_symbol
 	    (info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, s,
-	     bed->got_symbol_offset, (const char *) NULL, false,
+	     bed->got_symbol_offset, (const char *) NULL, FALSE,
 	     bed->collect, &bh)))
-	return false;
+	return FALSE;
       h = (struct elf_link_hash_entry *) bh;
       h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
       h->type = STT_OBJECT;
 
       if (info->shared
 	  && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-	return false;
+	return FALSE;
 
       elf_hash_table (info)->hgot = h;
     }
@@ -100,12 +100,12 @@ _bfd_elf_create_got_section (abfd, info)
   /* The first bit of the global offset table is the header.  */
   s->_raw_size += bed->got_header_size + bed->got_symbol_offset;
 
-  return true;
+  return TRUE;
 }
 
 /* Create dynamic sections when linking against a dynamic object.  */
 
-boolean
+bfd_boolean
 _bfd_elf_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -127,7 +127,7 @@ _bfd_elf_create_dynamic_sections (abfd, info)
 
     default:
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
@@ -147,7 +147,7 @@ _bfd_elf_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, pltflags)
       || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
-    return false;
+    return FALSE;
 
   if (bed->want_plt_sym)
     {
@@ -158,16 +158,16 @@ _bfd_elf_create_dynamic_sections (abfd, info)
 
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
-	      (bfd_vma) 0, (const char *) NULL, false,
+	      (bfd_vma) 0, (const char *) NULL, FALSE,
 	      get_elf_backend_data (abfd)->collect, &bh)))
-	return false;
+	return FALSE;
       h = (struct elf_link_hash_entry *) bh;
       h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
       h->type = STT_OBJECT;
 
       if (info->shared
 	  && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-	return false;
+	return FALSE;
     }
 
   s = bfd_make_section (abfd,
@@ -175,10 +175,10 @@ _bfd_elf_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, ptralign))
-    return false;
+    return FALSE;
 
   if (! _bfd_elf_create_got_section (abfd, info))
-    return false;
+    return FALSE;
 
   if (bed->want_dynbss)
     {
@@ -191,7 +191,7 @@ _bfd_elf_create_dynamic_sections (abfd, info)
       s = bfd_make_section (abfd, ".dynbss");
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, SEC_ALLOC))
-	return false;
+	return FALSE;
 
       /* The .rel[a].bss section holds copy relocs.  This section is not
      normally needed.  We need to create it here, though, so that the
@@ -212,11 +212,11 @@ _bfd_elf_create_dynamic_sections (abfd, info)
 	  if (s == NULL
 	      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	      || ! bfd_set_section_alignment (abfd, s, ptralign))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Record a new dynamic symbol.  We record the dynamic symbols as we
@@ -227,7 +227,7 @@ _bfd_elf_create_dynamic_sections (abfd, info)
    symbol should be in the dynamic symbol table, but only if there is
    one.  */
 
-boolean
+bfd_boolean
 _bfd_elf_link_record_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -237,7 +237,7 @@ _bfd_elf_link_record_dynamic_symbol (info, h)
       struct elf_strtab_hash *dynstr;
       char *p, *alc;
       const char *name;
-      boolean copy;
+      bfd_boolean copy;
       bfd_size_type indx;
 
       /* XXX: The ABI draft says the linker must turn hidden and
@@ -252,7 +252,7 @@ _bfd_elf_link_record_dynamic_symbol (info, h)
 	      && h->root.type != bfd_link_hash_undefweak)
 	    {
 	      h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
-	      return true;
+	      return TRUE;
 	    }
 
 	default:
@@ -268,7 +268,7 @@ _bfd_elf_link_record_dynamic_symbol (info, h)
 	  /* Create a strtab to hold the dynamic symbol names.  */
 	  elf_hash_table (info)->dynstr = dynstr = _bfd_elf_strtab_init ();
 	  if (dynstr == NULL)
-	    return false;
+	    return FALSE;
 	}
 
       /* We don't put any version information in the dynamic string
@@ -278,7 +278,7 @@ _bfd_elf_link_record_dynamic_symbol (info, h)
       if (p == NULL)
 	{
 	  alc = NULL;
-	  copy = false;
+	  copy = FALSE;
 	}
       else
 	{
@@ -286,11 +286,11 @@ _bfd_elf_link_record_dynamic_symbol (info, h)
 
 	  alc = bfd_malloc ((bfd_size_type) len);
 	  if (alc == NULL)
-	    return false;
+	    return FALSE;
 	  memcpy (alc, name, len - 1);
 	  alc[len - 1] = '\0';
 	  name = alc;
-	  copy = true;
+	  copy = TRUE;
 	}
 
       indx = _bfd_elf_strtab_add (dynstr, name, copy);
@@ -299,11 +299,11 @@ _bfd_elf_link_record_dynamic_symbol (info, h)
 	free (alc);
 
       if (indx == (bfd_size_type) -1)
-	return false;
+	return FALSE;
       h->dynstr_index = indx;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Record a new local dynamic symbol.  Returns 0 on failure, 1 on
@@ -376,7 +376,7 @@ elf_link_record_local_dynamic_symbol (info, input_bfd, input_indx)
 	return 0;
     }
 
-  dynstr_index = _bfd_elf_strtab_add (dynstr, name, false);
+  dynstr_index = _bfd_elf_strtab_add (dynstr, name, FALSE);
   if (dynstr_index == (unsigned long) -1)
     return 0;
   entry->isym.st_name = dynstr_index;
@@ -418,10 +418,10 @@ _bfd_elf_link_lookup_local_dynindx (info, input_bfd, input_indx)
    them are removed because they are marked as local.  This is called
    via elf_link_hash_traverse.  */
 
-static boolean elf_link_renumber_hash_table_dynsyms
+static bfd_boolean elf_link_renumber_hash_table_dynsyms
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean
+static bfd_boolean
 elf_link_renumber_hash_table_dynsyms (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -434,7 +434,7 @@ elf_link_renumber_hash_table_dynsyms (h, data)
   if (h->dynindx != -1)
     h->dynindx = ++(*count);
 
-  return true;
+  return TRUE;
 }
 
 /* Assign dynsym indices.  In a shared library we generate a section
@@ -506,7 +506,7 @@ _bfd_elf_create_linker_section (abfd, info, which, defaults)
       *lsect = *defaults;
       elf_linker_section (dynobj, which) = lsect;
       lsect->which = which;
-      lsect->hole_written_p = false;
+      lsect->hole_written_p = FALSE;
 
       /* See if the sections already exist */
       lsect->section = s = bfd_get_section_by_name (dynobj, lsect->name);
@@ -559,7 +559,7 @@ _bfd_elf_create_linker_section (abfd, info, which, defaults)
 		   lsect->name);
 #endif
 	  bh = bfd_link_hash_lookup (info->hash, lsect->sym_name,
-				     false, false, false);
+				     FALSE, FALSE, FALSE);
 
 	  if ((bh == NULL || bh->type == bfd_link_hash_undefined)
 	      && !(_bfd_generic_link_add_one_symbol
@@ -567,7 +567,7 @@ _bfd_elf_create_linker_section (abfd, info, which, defaults)
 		    (lsect->hole_size
 		     ? s->_raw_size - lsect->hole_size + lsect->sym_offset
 		     : lsect->sym_offset),
-		    (const char *) NULL, false,
+		    (const char *) NULL, FALSE,
 		    get_elf_backend_data (abfd)->collect, &bh)))
 	    return (elf_linker_section_t *) 0;
 	  h = (struct elf_link_hash_entry *) bh;
@@ -620,14 +620,14 @@ _bfd_elf_find_pointer_linker_section (linker_pointers, addend, which)
 
 /* Make the .rela section corresponding to the generated linker section.  */
 
-boolean
+bfd_boolean
 _bfd_elf_make_linker_section_rela (dynobj, lsect, alignment)
      bfd *dynobj;
      elf_linker_section_t *lsect;
      int alignment;
 {
   if (lsect->rel_section)
-    return true;
+    return TRUE;
 
   lsect->rel_section = bfd_get_section_by_name (dynobj, lsect->rel_name);
   if (lsect->rel_section == NULL)
@@ -643,8 +643,8 @@ _bfd_elf_make_linker_section_rela (dynobj, lsect, alignment)
 				       | SEC_LINKER_CREATED
 				       | SEC_READONLY))
 	  || ! bfd_set_section_alignment (dynobj, lsect->rel_section, alignment))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/elflink.h b/bfd/elflink.h
index 7192778b282..39deca0c2f2 100644
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -25,49 +25,49 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 struct elf_info_failed
 {
-  boolean failed;
+  bfd_boolean failed;
   struct bfd_link_info *info;
   struct bfd_elf_version_tree *verdefs;
 };
 
-static boolean is_global_data_symbol_definition
+static bfd_boolean is_global_data_symbol_definition
   PARAMS ((bfd *, Elf_Internal_Sym *));
-static boolean elf_link_is_defined_archive_symbol
+static bfd_boolean elf_link_is_defined_archive_symbol
   PARAMS ((bfd *, carsym *));
-static boolean elf_link_add_object_symbols
+static bfd_boolean elf_link_add_object_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_link_add_archive_symbols
+static bfd_boolean elf_link_add_archive_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_merge_symbol
+static bfd_boolean elf_merge_symbol
   PARAMS ((bfd *, struct bfd_link_info *, const char *,
 	   Elf_Internal_Sym *, asection **, bfd_vma *,
-	   struct elf_link_hash_entry **, boolean *, boolean *,
-	   boolean *, boolean));
-static boolean elf_add_default_symbol
+	   struct elf_link_hash_entry **, bfd_boolean *, bfd_boolean *,
+	   bfd_boolean *, bfd_boolean));
+static bfd_boolean elf_add_default_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   const char *, Elf_Internal_Sym *, asection **, bfd_vma *,
-	   boolean *, boolean, boolean));
-static boolean elf_export_symbol
+	   bfd_boolean *, bfd_boolean, bfd_boolean));
+static bfd_boolean elf_export_symbol
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_finalize_dynstr
+static bfd_boolean elf_finalize_dynstr
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_fix_symbol_flags
+static bfd_boolean elf_fix_symbol_flags
   PARAMS ((struct elf_link_hash_entry *, struct elf_info_failed *));
-static boolean elf_adjust_dynamic_symbol
+static bfd_boolean elf_adjust_dynamic_symbol
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_find_version_dependencies
+static bfd_boolean elf_link_find_version_dependencies
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_assign_sym_version
+static bfd_boolean elf_link_assign_sym_version
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_collect_hash_codes
+static bfd_boolean elf_collect_hash_codes
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_read_relocs_from_section
+static bfd_boolean elf_link_read_relocs_from_section
   PARAMS ((bfd *, Elf_Internal_Shdr *, PTR, Elf_Internal_Rela *));
 static size_t compute_bucket_count
   PARAMS ((struct bfd_link_info *));
-static boolean elf_link_output_relocs
+static bfd_boolean elf_link_output_relocs
   PARAMS ((bfd *, asection *, Elf_Internal_Shdr *, Elf_Internal_Rela *));
-static boolean elf_link_size_reloc_section
+static bfd_boolean elf_link_size_reloc_section
   PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
 static void elf_link_adjust_relocs
   PARAMS ((bfd *, Elf_Internal_Shdr *, unsigned int,
@@ -78,13 +78,13 @@ static int elf_link_sort_cmp2
   PARAMS ((const void *, const void *));
 static size_t elf_link_sort_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection **));
-static boolean elf_section_ignore_discarded_relocs
+static bfd_boolean elf_section_ignore_discarded_relocs
   PARAMS ((asection *));
 
 /* Given an ELF BFD, add symbols to the global hash table as
    appropriate.  */
 
-boolean
+bfd_boolean
 elf_bfd_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -97,12 +97,12 @@ elf_bfd_link_add_symbols (abfd, info)
       return elf_link_add_archive_symbols (abfd, info);
     default:
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 }
 
-/* Return true iff this is a non-common, definition of a non-function symbol.  */
-static boolean
+/* Return TRUE iff this is a non-common, definition of a non-function symbol.  */
+static bfd_boolean
 is_global_data_symbol_definition (abfd, sym)
      bfd * abfd ATTRIBUTE_UNUSED;
      Elf_Internal_Sym * sym;
@@ -110,20 +110,20 @@ is_global_data_symbol_definition (abfd, sym)
   /* Local symbols do not count, but target specific ones might.  */
   if (ELF_ST_BIND (sym->st_info) != STB_GLOBAL
       && ELF_ST_BIND (sym->st_info) < STB_LOOS)
-    return false;
+    return FALSE;
 
   /* Function symbols do not count.  */
   if (ELF_ST_TYPE (sym->st_info) == STT_FUNC)
-    return false;
+    return FALSE;
 
   /* If the section is undefined, then so is the symbol.  */
   if (sym->st_shndx == SHN_UNDEF)
-    return false;
+    return FALSE;
 
   /* If the symbol is defined in the common section, then
      it is a common definition and so does not count.  */
   if (sym->st_shndx == SHN_COMMON)
-    return false;
+    return FALSE;
 
   /* If the symbol is in a target specific section then we
      must rely upon the backend to tell us what it is.  */
@@ -135,15 +135,15 @@ is_global_data_symbol_definition (abfd, sym)
        Instead for now assume that the definition is not global,
        Even if this is wrong, at least the linker will behave
        in the same way that it used to do.  */
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Search the symbol table of the archive element of the archive ABFD
    whose archive map contains a mention of SYMDEF, and determine if
    the symbol is defined in this element.  */
-static boolean
+static bfd_boolean
 elf_link_is_defined_archive_symbol (abfd, symdef)
      bfd * abfd;
      carsym * symdef;
@@ -155,21 +155,21 @@ elf_link_is_defined_archive_symbol (abfd, symdef)
   Elf_Internal_Sym *isymbuf;
   Elf_Internal_Sym *isym;
   Elf_Internal_Sym *isymend;
-  boolean result;
+  bfd_boolean result;
 
   abfd = _bfd_get_elt_at_filepos (abfd, symdef->file_offset);
   if (abfd == (bfd *) NULL)
-    return false;
+    return FALSE;
 
   if (! bfd_check_format (abfd, bfd_object))
-    return false;
+    return FALSE;
 
   /* If we have already included the element containing this symbol in the
      link then we do not need to include it again.  Just claim that any symbol
      it contains is not a definition, so that our caller will not decide to
      (re)include this element.  */
   if (abfd->archive_pass)
-    return false;
+    return FALSE;
 
   /* Select the appropriate symbol table.  */
   if ((abfd->flags & DYNAMIC) == 0 || elf_dynsymtab (abfd) == 0)
@@ -193,16 +193,16 @@ elf_link_is_defined_archive_symbol (abfd, symdef)
     }
 
   if (extsymcount == 0)
-    return false;
+    return FALSE;
 
   /* Read in the symbol table.  */
   isymbuf = bfd_elf_get_elf_syms (abfd, hdr, extsymcount, extsymoff,
 				  NULL, NULL, NULL);
   if (isymbuf == NULL)
-    return false;
+    return FALSE;
 
   /* Scan the symbol table looking for SYMDEF.  */
-  result = false;
+  result = FALSE;
   for (isym = isymbuf, isymend = isymbuf + extsymcount; isym < isymend; isym++)
     {
       const char *name;
@@ -249,25 +249,25 @@ elf_link_is_defined_archive_symbol (abfd, symdef)
    Unfortunately, we do have to make multiple passes over the symbol
    table until nothing further is resolved.  */
 
-static boolean
+static bfd_boolean
 elf_link_add_archive_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   symindex c;
-  boolean *defined = NULL;
-  boolean *included = NULL;
+  bfd_boolean *defined = NULL;
+  bfd_boolean *included = NULL;
   carsym *symdefs;
-  boolean loop;
+  bfd_boolean loop;
   bfd_size_type amt;
 
   if (! bfd_has_map (abfd))
     {
       /* An empty archive is a special case.  */
       if (bfd_openr_next_archived_file (abfd, (bfd *) NULL) == NULL)
-	return true;
+	return TRUE;
       bfd_set_error (bfd_error_no_armap);
-      return false;
+      return FALSE;
     }
 
   /* Keep track of all symbols we know to be already defined, and all
@@ -275,12 +275,12 @@ elf_link_add_archive_symbols (abfd, info)
      second and subsequent passes.  */
   c = bfd_ardata (abfd)->symdef_count;
   if (c == 0)
-    return true;
+    return TRUE;
   amt = c;
-  amt *= sizeof (boolean);
-  defined = (boolean *) bfd_zmalloc (amt);
-  included = (boolean *) bfd_zmalloc (amt);
-  if (defined == (boolean *) NULL || included == (boolean *) NULL)
+  amt *= sizeof (bfd_boolean);
+  defined = (bfd_boolean *) bfd_zmalloc (amt);
+  included = (bfd_boolean *) bfd_zmalloc (amt);
+  if (defined == (bfd_boolean *) NULL || included == (bfd_boolean *) NULL)
     goto error_return;
 
   symdefs = bfd_ardata (abfd)->symdefs;
@@ -292,7 +292,7 @@ elf_link_add_archive_symbols (abfd, info)
       carsym *symdef;
       carsym *symdefend;
 
-      loop = false;
+      loop = FALSE;
       last = -1;
 
       symdef = symdefs;
@@ -308,12 +308,12 @@ elf_link_add_archive_symbols (abfd, info)
 	    continue;
 	  if (symdef->file_offset == last)
 	    {
-	      included[i] = true;
+	      included[i] = TRUE;
 	      continue;
 	    }
 
 	  h = elf_link_hash_lookup (elf_hash_table (info), symdef->name,
-				    false, false, false);
+				    FALSE, FALSE, FALSE);
 
 	  if (h == NULL)
 	    {
@@ -340,7 +340,7 @@ elf_link_add_archive_symbols (abfd, info)
 	      memcpy (copy + first, symdef->name + first + 1, len - first);
 
 	      h = elf_link_hash_lookup (elf_hash_table (info), copy,
-					false, false, false);
+					FALSE, FALSE, FALSE);
 
 	      if (h == NULL)
 		{
@@ -349,7 +349,7 @@ elf_link_add_archive_symbols (abfd, info)
 
 		  copy[first - 1] = '\0';
 		  h = elf_link_hash_lookup (elf_hash_table (info),
-					    copy, false, false, false);
+					    copy, FALSE, FALSE, FALSE);
 		}
 
 	      bfd_release (abfd, copy);
@@ -378,7 +378,7 @@ elf_link_add_archive_symbols (abfd, info)
 	  else if (h->root.type != bfd_link_hash_undefined)
 	    {
 	      if (h->root.type != bfd_link_hash_undefweak)
-		defined[i] = true;
+		defined[i] = TRUE;
 	      continue;
 	    }
 
@@ -416,14 +416,14 @@ elf_link_add_archive_symbols (abfd, info)
 	     does not require another pass.  This isn't a bug, but it
 	     does make the code less efficient than it could be.  */
 	  if (undefs_tail != info->hash->undefs_tail)
-	    loop = true;
+	    loop = TRUE;
 
 	  /* Look backward to mark all symbols from this object file
 	     which we have already seen in this pass.  */
 	  mark = i;
 	  do
 	    {
-	      included[mark] = true;
+	      included[mark] = TRUE;
 	      if (mark == 0)
 		break;
 	      --mark;
@@ -440,14 +440,14 @@ elf_link_add_archive_symbols (abfd, info)
   free (defined);
   free (included);
 
-  return true;
+  return TRUE;
 
  error_return:
-  if (defined != (boolean *) NULL)
+  if (defined != (bfd_boolean *) NULL)
     free (defined);
-  if (included != (boolean *) NULL)
+  if (included != (bfd_boolean *) NULL)
     free (included);
-  return false;
+  return FALSE;
 }
 
 /* This function is called when we want to define a new symbol.  It
@@ -462,7 +462,7 @@ elf_link_add_archive_symbols (abfd, info)
    change. DT_NEEDED indicates if it comes from a DT_NEEDED entry of
    a shared object.  */
 
-static boolean
+static bfd_boolean
 elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
 		  override, type_change_ok, size_change_ok, dt_needed)
      bfd *abfd;
@@ -472,35 +472,35 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
      asection **psec;
      bfd_vma *pvalue;
      struct elf_link_hash_entry **sym_hash;
-     boolean *override;
-     boolean *type_change_ok;
-     boolean *size_change_ok;
-     boolean dt_needed;
+     bfd_boolean *override;
+     bfd_boolean *type_change_ok;
+     bfd_boolean *size_change_ok;
+     bfd_boolean dt_needed;
 {
   asection *sec;
   struct elf_link_hash_entry *h;
   int bind;
   bfd *oldbfd;
-  boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon;
+  bfd_boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon;
 
-  *override = false;
+  *override = FALSE;
 
   sec = *psec;
   bind = ELF_ST_BIND (sym->st_info);
 
   if (! bfd_is_und_section (sec))
-    h = elf_link_hash_lookup (elf_hash_table (info), name, true, false, false);
+    h = elf_link_hash_lookup (elf_hash_table (info), name, TRUE, FALSE, FALSE);
   else
     h = ((struct elf_link_hash_entry *)
-	 bfd_wrapped_link_hash_lookup (abfd, info, name, true, false, false));
+	 bfd_wrapped_link_hash_lookup (abfd, info, name, TRUE, FALSE, FALSE));
   if (h == NULL)
-    return false;
+    return FALSE;
   *sym_hash = h;
 
   /* This code is for coping with dynamic objects, and is only useful
      if we are doing an ELF link.  */
   if (info->hash->creator != abfd->xvec)
-    return true;
+    return TRUE;
 
   /* For merging, we only care about real symbols.  */
 
@@ -515,7 +515,7 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
   if (h->root.type == bfd_link_hash_new)
     {
       h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
-      return true;
+      return TRUE;
     }
 
   /* OLDBFD is a BFD associated with the existing symbol.  */
@@ -550,15 +550,15 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
   if (abfd == oldbfd
       && ((abfd->flags & DYNAMIC) == 0
 	  || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0))
-    return true;
+    return TRUE;
 
   /* NEWDYN and OLDDYN indicate whether the new or old symbol,
      respectively, is from a dynamic object.  */
 
   if ((abfd->flags & DYNAMIC) != 0)
-    newdyn = true;
+    newdyn = TRUE;
   else
-    newdyn = false;
+    newdyn = FALSE;
 
   if (oldbfd != NULL)
     olddyn = (oldbfd->flags & DYNAMIC) != 0;
@@ -585,7 +585,7 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
 	}
 
       if (hsec == NULL)
-	olddyn = false;
+	olddyn = FALSE;
       else
 	olddyn = (hsec->symbol->flags & BSF_DYNAMIC) != 0;
     }
@@ -594,16 +594,16 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
      respectively, appear to be a definition rather than reference.  */
 
   if (bfd_is_und_section (sec) || bfd_is_com_section (sec))
-    newdef = false;
+    newdef = FALSE;
   else
-    newdef = true;
+    newdef = TRUE;
 
   if (h->root.type == bfd_link_hash_undefined
       || h->root.type == bfd_link_hash_undefweak
       || h->root.type == bfd_link_hash_common)
-    olddef = false;
+    olddef = FALSE;
   else
-    olddef = true;
+    olddef = TRUE;
 
   /* NEWDYNCOMMON and OLDDYNCOMMON indicate whether the new or old
      symbol, respectively, appears to be a common symbol in a dynamic
@@ -635,9 +635,9 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
       && sym->st_size > 0
       && bind != STB_WEAK
       && ELF_ST_TYPE (sym->st_info) != STT_FUNC)
-    newdyncommon = true;
+    newdyncommon = TRUE;
   else
-    newdyncommon = false;
+    newdyncommon = FALSE;
 
   if (olddyn
       && olddef
@@ -647,9 +647,9 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
       && (h->root.u.def.section->flags & SEC_LOAD) == 0
       && h->size > 0
       && h->type != STT_FUNC)
-    olddyncommon = true;
+    olddyncommon = TRUE;
   else
-    olddyncommon = false;
+    olddyncommon = FALSE;
 
   /* It's OK to change the type if either the existing symbol or the
      new symbol is weak unless it comes from a DT_NEEDED entry of
@@ -659,14 +659,14 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
   if ((! dt_needed && h->root.type == bfd_link_hash_defweak)
       || h->root.type == bfd_link_hash_undefweak
       || bind == STB_WEAK)
-    *type_change_ok = true;
+    *type_change_ok = TRUE;
 
   /* It's OK to change the size if either the existing symbol or the
      new symbol is weak, or if the old symbol is undefined.  */
 
   if (*type_change_ok
       || h->root.type == bfd_link_hash_undefined)
-    *size_change_ok = true;
+    *size_change_ok = TRUE;
 
   /* If both the old and the new symbols look like common symbols in a
      dynamic object, set the size of the symbol to the larger of the
@@ -685,12 +685,12 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
       if (! ((*info->callbacks->multiple_common)
 	     (info, h->root.root.string, oldbfd, bfd_link_hash_common,
 	      h->size, abfd, bfd_link_hash_common, sym->st_size)))
-	return false;
+	return FALSE;
 
       if (sym->st_size > h->size)
 	h->size = sym->st_size;
 
-      *size_change_ok = true;
+      *size_change_ok = TRUE;
     }
 
   /* If we are looking at a dynamic object, and we have found a
@@ -722,12 +722,12 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
 	  || dt_needed
 	  || bind == STB_WEAK))
     {
-      *override = true;
-      newdef = false;
-      newdyncommon = false;
+      *override = TRUE;
+      newdef = FALSE;
+      newdyncommon = FALSE;
 
       *psec = sec = bfd_und_section_ptr;
-      *size_change_ok = true;
+      *size_change_ok = TRUE;
 
       /* If we get here when the old symbol is a common symbol, then
 	 we are explicitly letting it override a weak symbol or
@@ -736,7 +736,7 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
 	 change warning may still be appropriate.  */
 
       if (h->root.type == bfd_link_hash_common)
-	*type_change_ok = true;
+	*type_change_ok = TRUE;
     }
 
   /* Handle the special case of an old common symbol merging with a
@@ -748,12 +748,12 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
   if (newdyncommon
       && h->root.type == bfd_link_hash_common)
     {
-      *override = true;
-      newdef = false;
-      newdyncommon = false;
+      *override = TRUE;
+      newdef = FALSE;
+      newdyncommon = FALSE;
       *pvalue = sym->st_size;
       *psec = sec = bfd_com_section_ptr;
-      *size_change_ok = true;
+      *size_change_ok = TRUE;
     }
 
   /* If the old symbol is from a dynamic object, and the new symbol is
@@ -786,16 +786,16 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
 
       h->root.type = bfd_link_hash_undefined;
       h->root.u.undef.abfd = h->root.u.def.section->owner;
-      *size_change_ok = true;
+      *size_change_ok = TRUE;
 
-      olddef = false;
-      olddyncommon = false;
+      olddef = FALSE;
+      olddyncommon = FALSE;
 
       /* We again permit a type change when a common symbol may be
 	 overriding a function.  */
 
       if (bfd_is_com_section (sec))
-	*type_change_ok = true;
+	*type_change_ok = TRUE;
 
       /* This union may have been set to be non-NULL when this symbol
 	 was seen in a dynamic object.  We must force the union to be
@@ -828,7 +828,7 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
       if (! ((*info->callbacks->multiple_common)
 	     (info, h->root.root.string, oldbfd, bfd_link_hash_common,
 	      h->size, abfd, bfd_link_hash_common, sym->st_size)))
-	return false;
+	return FALSE;
 
       /* If the predumed common symbol in the dynamic object is
 	 larger, pretend that the new symbol has its size.  */
@@ -840,14 +840,14 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
 	 in the dynamic object, so we just wind up using the one from
 	 the regular object.  */
 
-      olddef = false;
-      olddyncommon = false;
+      olddef = FALSE;
+      olddyncommon = FALSE;
 
       h->root.type = bfd_link_hash_undefined;
       h->root.u.undef.abfd = h->root.u.def.section->owner;
 
-      *size_change_ok = true;
-      *type_change_ok = true;
+      *size_change_ok = TRUE;
+      *type_change_ok = TRUE;
 
       h->verinfo.vertree = NULL;
     }
@@ -892,9 +892,9 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
       && newdef
       && ! newdyn
       && bind == STB_WEAK)
-    *override = true;
+    *override = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called to create an indirect symbol from the
@@ -903,7 +903,7 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
    set DYNSYM if the new indirect symbol is dynamic. DT_NEEDED
    indicates if it comes from a DT_NEEDED entry of a shared object.  */
 
-static boolean
+static bfd_boolean
 elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
 			dynsym, override, dt_needed)
      bfd *abfd;
@@ -913,18 +913,18 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
      Elf_Internal_Sym *sym;
      asection **psec;
      bfd_vma *value;
-     boolean *dynsym;
-     boolean override;
-     boolean dt_needed;
+     bfd_boolean *dynsym;
+     bfd_boolean override;
+     bfd_boolean dt_needed;
 {
-  boolean type_change_ok;
-  boolean size_change_ok;
+  bfd_boolean type_change_ok;
+  bfd_boolean size_change_ok;
   char *shortname;
   struct elf_link_hash_entry *hi;
   struct bfd_link_hash_entry *bh;
   struct elf_backend_data *bed;
-  boolean collect;
-  boolean dynamic;
+  bfd_boolean collect;
+  bfd_boolean dynamic;
   char *p;
   size_t len, shortlen;
   asection *sec;
@@ -935,23 +935,23 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
      specify a version to be bound to this version of the symbol.  */
   p = strchr (name, ELF_VER_CHR);
   if (p == NULL || p[1] != ELF_VER_CHR)
-    return true;
+    return TRUE;
 
   if (override)
     {
       /* We are overridden by an old defition. We need to check if we
 	 need to create the indirect symbol from the default name.  */
-      hi = elf_link_hash_lookup (elf_hash_table (info), name, true,
-				 false, false);
+      hi = elf_link_hash_lookup (elf_hash_table (info), name, TRUE,
+				 FALSE, FALSE);
       BFD_ASSERT (hi != NULL);
       if (hi == h)
-	return true;
+	return TRUE;
       while (hi->root.type == bfd_link_hash_indirect
 	     || hi->root.type == bfd_link_hash_warning)
 	{
 	  hi = (struct elf_link_hash_entry *) hi->root.u.i.link;
 	  if (hi == h)
-	    return true;
+	    return TRUE;
 	}
     }
 
@@ -962,7 +962,7 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
   shortlen = p - name;
   shortname = bfd_hash_allocate (&info->hash->table, shortlen + 1);
   if (shortname == NULL)
-    return false;
+    return FALSE;
   memcpy (shortname, name, shortlen);
   shortname[shortlen] = '\0';
 
@@ -970,21 +970,21 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
      symbol with this name.  For the purposes of the merge, act as
      though we were defining the symbol we just defined, although we
      actually going to define an indirect symbol.  */
-  type_change_ok = false;
-  size_change_ok = false;
+  type_change_ok = FALSE;
+  size_change_ok = FALSE;
   sec = *psec;
   if (! elf_merge_symbol (abfd, info, shortname, sym, &sec, value,
 			  &hi, &override, &type_change_ok,
 			  &size_change_ok, dt_needed))
-    return false;
+    return FALSE;
 
   if (! override)
     {
       bh = &hi->root;
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, abfd, shortname, BSF_INDIRECT, bfd_ind_section_ptr,
-	      (bfd_vma) 0, name, false, collect, &bh)))
-	return false;
+	      (bfd_vma) 0, name, FALSE, collect, &bh)))
+	return FALSE;
       hi = (struct elf_link_hash_entry *) bh;
     }
   else
@@ -1022,7 +1022,7 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
 		 | ELF_LINK_HASH_DEF_REGULAR))
 	    {
 	      if (! _bfd_elf_link_record_dynamic_symbol (info, hi))
-		return false;
+		return FALSE;
 	    }
 	}
 
@@ -1057,13 +1057,13 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
 	      if (info->shared
 		  || ((hi->elf_link_hash_flags
 		       & ELF_LINK_HASH_REF_DYNAMIC) != 0))
-		*dynsym = true;
+		*dynsym = TRUE;
 	    }
 	  else
 	    {
 	      if ((hi->elf_link_hash_flags
 		   & ELF_LINK_HASH_REF_REGULAR) != 0)
-		*dynsym = true;
+		*dynsym = TRUE;
 	    }
 	}
     }
@@ -1074,18 +1074,18 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
   len = strlen (name);
   shortname = bfd_hash_allocate (&info->hash->table, len);
   if (shortname == NULL)
-    return false;
+    return FALSE;
   memcpy (shortname, name, shortlen);
   memcpy (shortname + shortlen, p + 1, len - shortlen);
 
   /* Once again, merge with any existing symbol.  */
-  type_change_ok = false;
-  size_change_ok = false;
+  type_change_ok = FALSE;
+  size_change_ok = FALSE;
   sec = *psec;
   if (! elf_merge_symbol (abfd, info, shortname, sym, &sec, value,
 			  &hi, &override, &type_change_ok,
 			  &size_change_ok, dt_needed))
-    return false;
+    return FALSE;
 
   if (override)
     {
@@ -1103,8 +1103,8 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
       bh = &hi->root;
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, abfd, shortname, BSF_INDIRECT,
-	      bfd_ind_section_ptr, (bfd_vma) 0, name, false, collect, &bh)))
-	return false;
+	      bfd_ind_section_ptr, (bfd_vma) 0, name, FALSE, collect, &bh)))
+	return FALSE;
       hi = (struct elf_link_hash_entry *) bh;
 
       /* If there is a duplicate definition somewhere, then HI may not
@@ -1130,41 +1130,41 @@ elf_add_default_symbol (abfd, info, h, name, sym, psec, value,
 		  if (info->shared
 		      || ((hi->elf_link_hash_flags
 			   & ELF_LINK_HASH_REF_DYNAMIC) != 0))
-		    *dynsym = true;
+		    *dynsym = TRUE;
 		}
 	      else
 		{
 		  if ((hi->elf_link_hash_flags
 		       & ELF_LINK_HASH_REF_REGULAR) != 0)
-		    *dynsym = true;
+		    *dynsym = TRUE;
 		}
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Add symbols from an ELF object file to the linker hash table.  */
 
-static boolean
+static bfd_boolean
 elf_link_add_object_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
-  boolean (*add_symbol_hook) PARAMS ((bfd *, struct bfd_link_info *,
-				      const Elf_Internal_Sym *,
-				      const char **, flagword *,
-				      asection **, bfd_vma *));
-  boolean (*check_relocs) PARAMS ((bfd *, struct bfd_link_info *,
-				   asection *, const Elf_Internal_Rela *));
-  boolean collect;
+  bfd_boolean (*add_symbol_hook)
+    PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
+	     const char **, flagword *, asection **, bfd_vma *));
+  bfd_boolean (*check_relocs)
+    PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	     const Elf_Internal_Rela *));
+  bfd_boolean collect;
   Elf_Internal_Shdr *hdr;
   bfd_size_type symcount;
   bfd_size_type extsymcount;
   bfd_size_type extsymoff;
   struct elf_link_hash_entry **sym_hash;
-  boolean dynamic;
+  bfd_boolean dynamic;
   Elf_External_Versym *extversym = NULL;
   Elf_External_Versym *ever;
   struct elf_link_hash_entry *weaks;
@@ -1172,7 +1172,7 @@ elf_link_add_object_symbols (abfd, info)
   Elf_Internal_Sym *isym;
   Elf_Internal_Sym *isymend;
   struct elf_backend_data *bed;
-  boolean dt_needed;
+  bfd_boolean dt_needed;
   struct elf_link_hash_table * hash_table;
   bfd_size_type amt;
 
@@ -1183,10 +1183,10 @@ elf_link_add_object_symbols (abfd, info)
   collect = bed->collect;
 
   if ((abfd->flags & DYNAMIC) == 0)
-    dynamic = false;
+    dynamic = FALSE;
   else
     {
-      dynamic = true;
+      dynamic = TRUE;
 
       /* You can't use -r against a dynamic object.  Also, there's no
 	 hope of using a dynamic object which does not exactly match
@@ -1232,7 +1232,7 @@ elf_link_add_object_symbols (abfd, info)
 		  struct elf_link_hash_entry *h;
 
 		  h = elf_link_hash_lookup (hash_table, name,
-					    false, false, true);
+					    FALSE, FALSE, TRUE);
 
 		  /* FIXME: What about bfd_link_hash_common?  */
 		  if (h != NULL
@@ -1259,7 +1259,7 @@ elf_link_add_object_symbols (abfd, info)
 
 	      if (! (_bfd_generic_link_add_one_symbol
 		     (info, abfd, name, BSF_WARNING, s, (bfd_vma) 0, msg,
-		      false, collect, (struct bfd_link_hash_entry **) NULL)))
+		      FALSE, collect, (struct bfd_link_hash_entry **) NULL)))
 		goto error_return;
 
 	      if (! info->relocateable)
@@ -1272,7 +1272,7 @@ elf_link_add_object_symbols (abfd, info)
 	}
     }
 
-  dt_needed = false;
+  dt_needed = FALSE;
   if (! dynamic)
     {
       /* If we are creating a shared library, create all the dynamic
@@ -1294,7 +1294,7 @@ elf_link_add_object_symbols (abfd, info)
   else
     {
       asection *s;
-      boolean add_needed;
+      bfd_boolean add_needed;
       const char *name;
       bfd_size_type oldsize;
       bfd_size_type strindex;
@@ -1314,7 +1314,7 @@ elf_link_add_object_symbols (abfd, info)
 	 name.  If the generic linker put a null string into
 	 elf_dt_name, we don't make a DT_NEEDED entry at all, even if
 	 there is a DT_SONAME entry.  */
-      add_needed = true;
+      add_needed = TRUE;
       name = bfd_get_filename (abfd);
       if (elf_dt_name (abfd) != NULL)
 	{
@@ -1322,9 +1322,9 @@ elf_link_add_object_symbols (abfd, info)
 	  if (*name == '\0')
 	    {
 	      if (elf_dt_soname (abfd) != NULL)
-		dt_needed = true;
+		dt_needed = TRUE;
 
-	      add_needed = false;
+	      add_needed = FALSE;
 	    }
 	}
       s = bfd_get_section_by_name (abfd, ".dynamic");
@@ -1482,7 +1482,7 @@ elf_link_add_object_symbols (abfd, info)
 	{
 	  /* Add a DT_NEEDED entry for this dynamic object.  */
 	  oldsize = _bfd_elf_strtab_size (hash_table->dynstr);
-	  strindex = _bfd_elf_strtab_add (hash_table->dynstr, name, false);
+	  strindex = _bfd_elf_strtab_add (hash_table->dynstr, name, FALSE);
 	  if (strindex == (bfd_size_type) -1)
 	    goto error_return;
 
@@ -1511,7 +1511,7 @@ elf_link_add_object_symbols (abfd, info)
 		      && dyn.d_un.d_val == strindex)
 		    {
 		      _bfd_elf_strtab_delref (hash_table->dynstr, strindex);
-		      return true;
+		      return TRUE;
 		    }
 		}
 	    }
@@ -1606,13 +1606,13 @@ elf_link_add_object_symbols (abfd, info)
       flagword flags;
       const char *name;
       struct elf_link_hash_entry *h;
-      boolean definition;
-      boolean size_change_ok, type_change_ok;
-      boolean new_weakdef;
+      bfd_boolean definition;
+      bfd_boolean size_change_ok, type_change_ok;
+      bfd_boolean new_weakdef;
       unsigned int old_alignment;
-      boolean override;
+      bfd_boolean override;
 
-      override = false;
+      override = FALSE;
 
       flags = BSF_NO_FLAGS;
       sec = NULL;
@@ -1708,11 +1708,11 @@ elf_link_add_object_symbols (abfd, info)
 
       if (bfd_is_und_section (sec)
 	  || bfd_is_com_section (sec))
-	definition = false;
+	definition = FALSE;
       else
-	definition = true;
+	definition = TRUE;
 
-      size_change_ok = false;
+      size_change_ok = FALSE;
       type_change_ok = get_elf_backend_data (abfd)->type_change_ok;
       old_alignment = 0;
       if (info->hash->creator->flavour == bfd_target_elf_flavour)
@@ -1821,7 +1821,7 @@ elf_link_add_object_symbols (abfd, info)
 	    goto error_free_vers;
 
 	  if (override)
-	    definition = false;
+	    definition = FALSE;
 
 	  h = *sym_hash;
 	  while (h->root.type == bfd_link_hash_indirect
@@ -1845,7 +1845,7 @@ elf_link_add_object_symbols (abfd, info)
 
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, abfd, name, flags, sec, value, (const char *) NULL,
-	      false, collect, (struct bfd_link_hash_entry **) sym_hash)))
+	      FALSE, collect, (struct bfd_link_hash_entry **) sym_hash)))
 	goto error_free_vers;
 
       h = *sym_hash;
@@ -1854,7 +1854,7 @@ elf_link_add_object_symbols (abfd, info)
 	h = (struct elf_link_hash_entry *) h->root.u.i.link;
       *sym_hash = h;
 
-      new_weakdef = false;
+      new_weakdef = FALSE;
       if (dynamic
 	  && definition
 	  && (flags & BSF_WEAK) != 0
@@ -1876,7 +1876,7 @@ elf_link_add_object_symbols (abfd, info)
 
 	  h->weakdef = weaks;
 	  weaks = h;
-	  new_weakdef = true;
+	  new_weakdef = TRUE;
 	}
 
       /* Set the alignment of a common symbol.  */
@@ -1896,7 +1896,7 @@ elf_link_add_object_symbols (abfd, info)
       if (info->hash->creator->flavour == bfd_target_elf_flavour)
 	{
 	  int old_flags;
-	  boolean dynsym;
+	  bfd_boolean dynsym;
 	  int new_flag;
 
 	  /* Remember the symbol size and type.  */
@@ -1957,7 +1957,7 @@ elf_link_add_object_symbols (abfd, info)
 	     is one which is referenced or defined by both a regular
 	     object and a shared object.  */
 	  old_flags = h->elf_link_hash_flags;
-	  dynsym = false;
+	  dynsym = FALSE;
 	  if (! dynamic)
 	    {
 	      if (! definition)
@@ -1971,7 +1971,7 @@ elf_link_add_object_symbols (abfd, info)
 	      if (info->shared
 		  || (old_flags & (ELF_LINK_HASH_DEF_DYNAMIC
 				   | ELF_LINK_HASH_REF_DYNAMIC)) != 0)
-		dynsym = true;
+		dynsym = TRUE;
 	    }
 	  else
 	    {
@@ -1984,7 +1984,7 @@ elf_link_add_object_symbols (abfd, info)
 		  || (h->weakdef != NULL
 		      && ! new_weakdef
 		      && h->weakdef->dynindx != -1))
-		dynsym = true;
+		dynsym = TRUE;
 	    }
 
 	  h->elf_link_hash_flags |= new_flag;
@@ -2017,7 +2017,7 @@ elf_link_add_object_symbols (abfd, info)
 	      {
 	      case STV_INTERNAL:
 	      case STV_HIDDEN:
-		(*bed->elf_backend_hide_symbol) (info, h, true);
+		(*bed->elf_backend_hide_symbol) (info, h, TRUE);
 		break;
 	      }
 
@@ -2035,10 +2035,10 @@ elf_link_add_object_symbols (abfd, info)
 		 the regular object to create a dynamic executable. We
 		 have to make sure there is a DT_NEEDED entry for it.  */
 
-	      dt_needed = false;
+	      dt_needed = FALSE;
 	      oldsize = _bfd_elf_strtab_size (hash_table->dynstr);
 	      strindex = _bfd_elf_strtab_add (hash_table->dynstr,
-					      elf_dt_soname (abfd), false);
+					      elf_dt_soname (abfd), FALSE);
 	      if (strindex == (bfd_size_type) -1)
 		goto error_free_vers;
 
@@ -2180,7 +2180,7 @@ elf_link_add_object_symbols (abfd, info)
       for (o = abfd->sections; o != NULL; o = o->next)
 	{
 	  Elf_Internal_Rela *internal_relocs;
-	  boolean ok;
+	  bfd_boolean ok;
 
 	  if ((o->flags & SEC_RELOC) == 0
 	      || o->reloc_count == 0
@@ -2274,7 +2274,7 @@ elf_link_add_object_symbols (abfd, info)
       hash_table->loaded = n;
     }
 
-  return true;
+  return TRUE;
 
  error_free_vers:
   if (extversym != NULL)
@@ -2283,7 +2283,7 @@ elf_link_add_object_symbols (abfd, info)
   if (isymbuf != NULL)
     free (isymbuf);
  error_return:
-  return false;
+  return FALSE;
 }
 
 /* Create some sections which will be filled in with dynamic linking
@@ -2293,7 +2293,7 @@ elf_link_add_object_symbols (abfd, info)
    addresses are assigned to the output sections.  We work out the
    actual contents and size of these sections later.  */
 
-boolean
+bfd_boolean
 elf_link_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2305,10 +2305,10 @@ elf_link_create_dynamic_sections (abfd, info)
   struct elf_backend_data *bed;
 
   if (! is_elf_hash_table (info))
-    return false;
+    return FALSE;
 
   if (elf_hash_table (info)->dynamic_sections_created)
-    return true;
+    return TRUE;
 
   /* Make sure that all dynamic sections use the same input BFD.  */
   if (elf_hash_table (info)->dynobj == NULL)
@@ -2328,7 +2328,7 @@ elf_link_create_dynamic_sections (abfd, info)
       s = bfd_make_section (abfd, ".interp");
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY))
-	return false;
+	return FALSE;
     }
 
   if (! info->traditional_format
@@ -2338,7 +2338,7 @@ elf_link_create_dynamic_sections (abfd, info)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
       elf_hash_table (info)->eh_info.hdr_sec = s;
     }
 
@@ -2348,44 +2348,44 @@ elf_link_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
+    return FALSE;
 
   s = bfd_make_section (abfd, ".gnu.version");
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, 1))
-    return false;
+    return FALSE;
 
   s = bfd_make_section (abfd, ".gnu.version_r");
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
+    return FALSE;
 
   s = bfd_make_section (abfd, ".dynsym");
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
+    return FALSE;
 
   s = bfd_make_section (abfd, ".dynstr");
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY))
-    return false;
+    return FALSE;
 
   /* Create a strtab to hold the dynamic symbol names.  */
   if (elf_hash_table (info)->dynstr == NULL)
     {
       elf_hash_table (info)->dynstr = _bfd_elf_strtab_init ();
       if (elf_hash_table (info)->dynstr == NULL)
-	return false;
+	return FALSE;
     }
 
   s = bfd_make_section (abfd, ".dynamic");
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags)
       || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
+    return FALSE;
 
   /* The special symbol _DYNAMIC is always set to the start of the
      .dynamic section.  This call occurs before we have processed the
@@ -2398,15 +2398,15 @@ elf_link_create_dynamic_sections (abfd, info)
   bh = NULL;
   if (! (_bfd_generic_link_add_one_symbol
 	 (info, abfd, "_DYNAMIC", BSF_GLOBAL, s, (bfd_vma) 0,
-	  (const char *) 0, false, get_elf_backend_data (abfd)->collect, &bh)))
-    return false;
+	  (const char *) 0, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+    return FALSE;
   h = (struct elf_link_hash_entry *) bh;
   h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
   h->type = STT_OBJECT;
 
   if (info->shared
       && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
+    return FALSE;
 
   bed = get_elf_backend_data (abfd);
 
@@ -2414,23 +2414,23 @@ elf_link_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
       || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
+    return FALSE;
   elf_section_data (s)->this_hdr.sh_entsize = bed->s->sizeof_hash_entry;
 
   /* Let the backend create the rest of the sections.  This lets the
      backend set the right flags.  The backend will normally create
      the .got and .plt sections.  */
   if (! (*bed->elf_backend_create_dynamic_sections) (abfd, info))
-    return false;
+    return FALSE;
 
-  elf_hash_table (info)->dynamic_sections_created = true;
+  elf_hash_table (info)->dynamic_sections_created = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* Add an entry to the .dynamic table.  */
 
-boolean
+bfd_boolean
 elf_add_dynamic_entry (info, tag, val)
      struct bfd_link_info *info;
      bfd_vma tag;
@@ -2443,7 +2443,7 @@ elf_add_dynamic_entry (info, tag, val)
   bfd_byte *newcontents;
 
   if (! is_elf_hash_table (info))
-    return false;
+    return FALSE;
 
   dynobj = elf_hash_table (info)->dynobj;
 
@@ -2453,7 +2453,7 @@ elf_add_dynamic_entry (info, tag, val)
   newsize = s->_raw_size + sizeof (Elf_External_Dyn);
   newcontents = (bfd_byte *) bfd_realloc (s->contents, newsize);
   if (newcontents == NULL)
-    return false;
+    return FALSE;
 
   dyn.d_tag = tag;
   dyn.d_un.d_val = val;
@@ -2463,7 +2463,7 @@ elf_add_dynamic_entry (info, tag, val)
   s->_raw_size = newsize;
   s->contents = newcontents;
 
-  return true;
+  return TRUE;
 }
 
 /* Read and swap the relocs from the section indicated by SHDR.  This
@@ -2473,9 +2473,9 @@ elf_add_dynamic_entry (info, tag, val)
    The EXTERNAL_RELOCS are a buffer where the external form of the
    relocations should be stored.
 
-   Returns false if something goes wrong.  */
+   Returns FALSE if something goes wrong.  */
 
-static boolean
+static bfd_boolean
 elf_link_read_relocs_from_section (abfd, shdr, external_relocs,
 				   internal_relocs)
      bfd *abfd;
@@ -2491,15 +2491,15 @@ elf_link_read_relocs_from_section (abfd, shdr, external_relocs,
 
   /* If there aren't any relocations, that's OK.  */
   if (!shdr)
-    return true;
+    return TRUE;
 
   /* Position ourselves at the start of the section.  */
   if (bfd_seek (abfd, shdr->sh_offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   /* Read the relocations.  */
   if (bfd_bread (external_relocs, shdr->sh_size, abfd) != shdr->sh_size)
-    return false;
+    return FALSE;
 
   bed = get_elf_backend_data (abfd);
 
@@ -2521,7 +2521,7 @@ elf_link_read_relocs_from_section (abfd, shdr, external_relocs,
       erela += shdr->sh_entsize;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Read and swap the relocs for a section O.  They may have been
@@ -2541,7 +2541,7 @@ NAME(_bfd_elf,link_read_relocs) (abfd, o, external_relocs, internal_relocs,
      asection *o;
      PTR external_relocs;
      Elf_Internal_Rela *internal_relocs;
-     boolean keep_memory;
+     bfd_boolean keep_memory;
 {
   Elf_Internal_Shdr *rel_hdr;
   PTR alloc1 = NULL;
@@ -2617,21 +2617,21 @@ NAME(_bfd_elf,link_read_relocs) (abfd, o, external_relocs, internal_relocs,
 /* Record an assignment to a symbol made by a linker script.  We need
    this in case some dynamic object refers to this symbol.  */
 
-boolean
+bfd_boolean
 NAME(bfd_elf,record_link_assignment) (output_bfd, info, name, provide)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
      const char *name;
-     boolean provide;
+     bfd_boolean provide;
 {
   struct elf_link_hash_entry *h;
 
   if (info->hash->creator->flavour != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
-  h = elf_link_hash_lookup (elf_hash_table (info), name, true, true, false);
+  h = elf_link_hash_lookup (elf_hash_table (info), name, TRUE, TRUE, FALSE);
   if (h == NULL)
-    return false;
+    return FALSE;
 
   if (h->root.type == bfd_link_hash_new)
     h->elf_link_hash_flags &= ~ELF_LINK_NON_ELF;
@@ -2662,7 +2662,7 @@ NAME(bfd_elf,record_link_assignment) (output_bfd, info, name, provide)
       && h->dynindx == -1)
     {
       if (! _bfd_elf_link_record_dynamic_symbol (info, h))
-	return false;
+	return FALSE;
 
       /* If this is a weak defined symbol, and we know a corresponding
 	 real symbol from the same dynamic object, make sure the real
@@ -2671,11 +2671,11 @@ NAME(bfd_elf,record_link_assignment) (output_bfd, info, name, provide)
 	  && h->weakdef->dynindx == -1)
 	{
 	  if (! _bfd_elf_link_record_dynamic_symbol (info, h->weakdef))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This structure is used to pass information to
@@ -2690,7 +2690,7 @@ struct elf_assign_sym_version_info
   /* Version tree.  */
   struct bfd_elf_version_tree *verdefs;
   /* Whether we had a failure.  */
-  boolean failed;
+  bfd_boolean failed;
 };
 
 /* This structure is used to pass information to
@@ -2705,7 +2705,7 @@ struct elf_find_verdep_info
   /* The number of dependencies.  */
   unsigned int vers;
   /* Whether we had a failure.  */
-  boolean failed;
+  bfd_boolean failed;
 };
 
 /* Array used to determine the number of hash table buckets to use
@@ -2871,7 +2871,7 @@ compute_bucket_count (info)
    must set the sizes of the sections before the linker sets the
    addresses of the various sections.  */
 
-boolean
+bfd_boolean
 NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 				     filter_shlib,
 				     auxiliary_filters, info, sinterpptr,
@@ -2895,10 +2895,10 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
   soname_indx = (bfd_size_type) -1;
 
   if (info->hash->creator->flavour != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (! is_elf_hash_table (info))
-    return true;
+    return TRUE;
 
   /* Any syms created from now on start with -1 in
      got.refcount/offset and plt.refcount/offset.  */
@@ -2909,17 +2909,17 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
   bed = get_elf_backend_data (output_bfd);
   if (bed->elf_backend_always_size_sections
       && ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
-    return false;
+    return FALSE;
 
   dynobj = elf_hash_table (info)->dynobj;
 
   /* If there were no dynamic objects in the link, there is nothing to
      do here.  */
   if (dynobj == NULL)
-    return true;
+    return TRUE;
 
   if (! _bfd_elf_maybe_strip_eh_frame_hdr (info))
-    return false;
+    return FALSE;
 
   if (elf_hash_table (info)->dynamic_sections_created)
     {
@@ -2928,7 +2928,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
       asection *dynstr;
       struct bfd_elf_version_tree *t;
       struct bfd_elf_version_expr *d;
-      boolean all_defined;
+      bfd_boolean all_defined;
 
       *sinterpptr = bfd_get_section_by_name (dynobj, ".interp");
       BFD_ASSERT (*sinterpptr != NULL || info->shared);
@@ -2936,18 +2936,18 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
       if (soname != NULL)
 	{
 	  soname_indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
-					     soname, true);
+					     soname, TRUE);
 	  if (soname_indx == (bfd_size_type) -1
 	      || ! elf_add_dynamic_entry (info, (bfd_vma) DT_SONAME,
 					  soname_indx))
-	    return false;
+	    return FALSE;
 	}
 
       if (info->symbolic)
 	{
 	  if (! elf_add_dynamic_entry (info, (bfd_vma) DT_SYMBOLIC,
 				       (bfd_vma) 0))
-	    return false;
+	    return FALSE;
 	  info->flags |= DF_SYMBOLIC;
 	}
 
@@ -2956,7 +2956,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	  bfd_size_type indx;
 
 	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath,
-				      true);
+				      TRUE);
 	  if (info->new_dtags)
 	    _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx);
 	  if (indx == (bfd_size_type) -1
@@ -2964,7 +2964,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	      || (info->new_dtags
 		  && ! elf_add_dynamic_entry (info, (bfd_vma) DT_RUNPATH,
 					      indx)))
-	    return false;
+	    return FALSE;
 	}
 
       if (filter_shlib != NULL)
@@ -2972,10 +2972,10 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	  bfd_size_type indx;
 
 	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
-				      filter_shlib, true);
+				      filter_shlib, TRUE);
 	  if (indx == (bfd_size_type) -1
 	      || ! elf_add_dynamic_entry (info, (bfd_vma) DT_FILTER, indx))
-	    return false;
+	    return FALSE;
 	}
 
       if (auxiliary_filters != NULL)
@@ -2987,17 +2987,17 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	      bfd_size_type indx;
 
 	      indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
-					  *p, true);
+					  *p, TRUE);
 	      if (indx == (bfd_size_type) -1
 		  || ! elf_add_dynamic_entry (info, (bfd_vma) DT_AUXILIARY,
 					      indx))
-		return false;
+		return FALSE;
 	    }
 	}
 
       eif.info = info;
       eif.verdefs = verdefs;
-      eif.failed = false;
+      eif.failed = FALSE;
 
       /* If we are supposed to export all symbols into the dynamic symbol
 	 table (this is not the normal case), then do so.  */
@@ -3006,7 +3006,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	  elf_link_hash_traverse (elf_hash_table (info), elf_export_symbol,
 				  (PTR) &eif);
 	  if (eif.failed)
-	    return false;
+	    return FALSE;
 	}
 
       /* Make all global versions with definiton.  */
@@ -3023,11 +3023,11 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	      namelen = strlen (name);
 	      verstr = t->name;
 	      verlen = strlen (verstr);
-	      newlen = namelen + verlen + 3; 
+	      newlen = namelen + verlen + 3;
 
 	      newname = (char *) bfd_malloc ((bfd_size_type) newlen);
 	      if (newname == NULL)
-		return false;
+		return FALSE;
 	      memcpy (newname, name, namelen);
 
 	      /* Check the hidden versioned definition.  */
@@ -3035,8 +3035,8 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	      *p++ = ELF_VER_CHR;
 	      memcpy (p, verstr, verlen + 1);
 	      newh = elf_link_hash_lookup (elf_hash_table (info),
-					   newname, false, false,
-					   false);
+					   newname, FALSE, FALSE,
+					   FALSE);
 	      if (newh == NULL
 		  || (newh->root.type != bfd_link_hash_defined
 		      && newh->root.type != bfd_link_hash_defweak))
@@ -3045,8 +3045,8 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 		  *p++ = ELF_VER_CHR;
 		  memcpy (p, verstr, verlen + 1);
 		  newh = elf_link_hash_lookup (elf_hash_table (info),
-					       newname, false, false,
-					       false);
+					       newname, FALSE, FALSE,
+					       FALSE);
 		}
 	      free (newname);
 
@@ -3064,18 +3064,18 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
       asvinfo.output_bfd = output_bfd;
       asvinfo.info = info;
       asvinfo.verdefs = verdefs;
-      asvinfo.failed = false;
+      asvinfo.failed = FALSE;
 
       elf_link_hash_traverse (elf_hash_table (info),
 			      elf_link_assign_sym_version,
 			      (PTR) &asvinfo);
       if (asvinfo.failed)
-	return false;
+	return FALSE;
 
       if (!info->allow_undefined_version)
 	{
 	  /* Check if all global versions have a definiton.  */
-	  all_defined = true;
+	  all_defined = TRUE;
 	  for (t = verdefs; t != NULL; t = t->next)
 	    for (d = t->globals; d != NULL; d = d->next)
 	      if (!d->symver && !d->script
@@ -3084,13 +3084,13 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 		  (*_bfd_error_handler)
 		    (_("%s: undefined version: %s"),
 		     d->pattern, t->name);
-		  all_defined = false;
+		  all_defined = FALSE;
 		}
 
 	  if (!all_defined)
 	    {
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	}
 
@@ -3100,7 +3100,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 			      elf_adjust_dynamic_symbol,
 			      (PTR) &eif);
       if (eif.failed)
-	return false;
+	return FALSE;
 
       /* Add some entries to the .dynamic section.  We fill in some of the
 	 values later, in elf_bfd_final_link, but we must add the entries
@@ -3110,27 +3110,27 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	 call then add the corresponding DT_INIT/DT_FINI entries.  */
       h = (info->init_function
 	   ? elf_link_hash_lookup (elf_hash_table (info),
-				   info->init_function, false,
-				   false, false)
+				   info->init_function, FALSE,
+				   FALSE, FALSE)
 	   : NULL);
       if (h != NULL
 	  && (h->elf_link_hash_flags & (ELF_LINK_HASH_REF_REGULAR
 					| ELF_LINK_HASH_DEF_REGULAR)) != 0)
 	{
 	  if (! elf_add_dynamic_entry (info, (bfd_vma) DT_INIT, (bfd_vma) 0))
-	    return false;
+	    return FALSE;
 	}
       h = (info->fini_function
 	   ? elf_link_hash_lookup (elf_hash_table (info),
-				   info->fini_function, false,
-				   false, false)
+				   info->fini_function, FALSE,
+				   FALSE, FALSE)
 	   : NULL);
       if (h != NULL
 	  && (h->elf_link_hash_flags & (ELF_LINK_HASH_REF_REGULAR
 					| ELF_LINK_HASH_DEF_REGULAR)) != 0)
 	{
 	  if (! elf_add_dynamic_entry (info, (bfd_vma) DT_FINI, (bfd_vma) 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (bfd_get_section_by_name (output_bfd, ".preinit_array") != NULL)
@@ -3154,14 +3154,14 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 		    }
 
 	      bfd_set_error (bfd_error_nonrepresentable_section);
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (!elf_add_dynamic_entry (info, (bfd_vma) DT_PREINIT_ARRAY,
 				      (bfd_vma) 0)
 	      || !elf_add_dynamic_entry (info, (bfd_vma) DT_PREINIT_ARRAYSZ,
 					 (bfd_vma) 0))
-	    return false;
+	    return FALSE;
 	}
       if (bfd_get_section_by_name (output_bfd, ".init_array") != NULL)
 	{
@@ -3169,7 +3169,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 				      (bfd_vma) 0)
 	      || !elf_add_dynamic_entry (info, (bfd_vma) DT_INIT_ARRAYSZ,
 					 (bfd_vma) 0))
-	    return false;
+	    return FALSE;
 	}
       if (bfd_get_section_by_name (output_bfd, ".fini_array") != NULL)
 	{
@@ -3177,7 +3177,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 				      (bfd_vma) 0)
 	      || !elf_add_dynamic_entry (info, (bfd_vma) DT_FINI_ARRAYSZ,
 					 (bfd_vma) 0))
-	    return false;
+	    return FALSE;
 	}
 
       dynstr = bfd_get_section_by_name (dynobj, ".dynstr");
@@ -3196,7 +3196,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	      || ! elf_add_dynamic_entry (info, (bfd_vma) DT_STRSZ, strsize)
 	      || ! elf_add_dynamic_entry (info, (bfd_vma) DT_SYMENT,
 					  (bfd_vma) sizeof (Elf_External_Sym)))
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -3204,7 +3204,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
      sections.  */
   if (bed->elf_backend_size_dynamic_sections
       && ! (*bed->elf_backend_size_dynamic_sections) (output_bfd, info))
-    return false;
+    return FALSE;
 
   if (elf_hash_table (info)->dynamic_sections_created)
     {
@@ -3260,7 +3260,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	  s->_raw_size = size;
 	  s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
 	  if (s->contents == NULL && s->_raw_size != 0)
-	    return false;
+	    return FALSE;
 
 	  /* Fill in the version definition section.  */
 
@@ -3289,9 +3289,9 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	      name = basename (output_bfd->filename);
 	      def.vd_hash = bfd_elf_hash (name);
 	      indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
-					  name, false);
+					  name, FALSE);
 	      if (indx == (bfd_size_type) -1)
-		return false;
+		return FALSE;
 	      defaux.vda_name = indx;
 	    }
 	  defaux.vda_next = 0;
@@ -3318,9 +3318,9 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	      bh = NULL;
 	      if (! (_bfd_generic_link_add_one_symbol
 		     (info, dynobj, t->name, BSF_GLOBAL, bfd_abs_section_ptr,
-		      (bfd_vma) 0, (const char *) NULL, false,
+		      (bfd_vma) 0, (const char *) NULL, FALSE,
 		      get_elf_backend_data (dynobj)->collect, &bh)))
-		return false;
+		return FALSE;
 	      h = (struct elf_link_hash_entry *) bh;
 	      h->elf_link_hash_flags &= ~ ELF_LINK_NON_ELF;
 	      h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
@@ -3328,7 +3328,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	      h->verinfo.vertree = t;
 
 	      if (! _bfd_elf_link_record_dynamic_symbol (info, h))
-		return false;
+		return FALSE;
 
 	      def.vd_version = VER_DEF_CURRENT;
 	      def.vd_flags = 0;
@@ -3389,7 +3389,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	  if (! elf_add_dynamic_entry (info, (bfd_vma) DT_VERDEF, (bfd_vma) 0)
 	      || ! elf_add_dynamic_entry (info, (bfd_vma) DT_VERDEFNUM,
 					  (bfd_vma) cdefs))
-	    return false;
+	    return FALSE;
 
 	  elf_tdata (output_bfd)->cverdefs = cdefs;
 	}
@@ -3397,7 +3397,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
       if ((info->new_dtags && info->flags) || (info->flags & DF_STATIC_TLS))
 	{
 	  if (! elf_add_dynamic_entry (info, (bfd_vma) DT_FLAGS, info->flags))
-	    return false;
+	    return FALSE;
 	}
 
       if (info->flags_1)
@@ -3408,7 +3408,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 				| DF_1_NOOPEN);
 	  if (! elf_add_dynamic_entry (info, (bfd_vma) DT_FLAGS_1,
 				       info->flags_1))
-	    return false;
+	    return FALSE;
 	}
 
       /* Work out the size of the version reference section.  */
@@ -3423,7 +3423,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	sinfo.vers = elf_tdata (output_bfd)->cverdefs;
 	if (sinfo.vers == 0)
 	  sinfo.vers = 1;
-	sinfo.failed = false;
+	sinfo.failed = FALSE;
 
 	elf_link_hash_traverse (elf_hash_table (info),
 				elf_link_find_version_dependencies,
@@ -3456,7 +3456,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	    s->_raw_size = size;
 	    s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
 	    if (s->contents == NULL)
-	      return false;
+	      return FALSE;
 
 	    p = s->contents;
 	    for (t = elf_tdata (output_bfd)->verref;
@@ -3477,9 +3477,9 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 					    elf_dt_name (t->vn_bfd) != NULL
 					    ? elf_dt_name (t->vn_bfd)
 					    : basename (t->vn_bfd->filename),
-					    false);
+					    FALSE);
 		if (indx == (bfd_size_type) -1)
-		  return false;
+		  return FALSE;
 		t->vn_file = indx;
 		t->vn_aux = sizeof (Elf_External_Verneed);
 		if (t->vn_nextref == NULL)
@@ -3496,9 +3496,9 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 		  {
 		    a->vna_hash = bfd_elf_hash (a->vna_nodename);
 		    indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
-						a->vna_nodename, false);
+						a->vna_nodename, FALSE);
 		    if (indx == (bfd_size_type) -1)
-		      return false;
+		      return FALSE;
 		    a->vna_name = indx;
 		    if (a->vna_nextptr == NULL)
 		      a->vna_next = 0;
@@ -3515,7 +3515,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 					 (bfd_vma) 0)
 		|| ! elf_add_dynamic_entry (info, (bfd_vma) DT_VERNEEDNUM,
 					    (bfd_vma) crefs))
-	      return false;
+	      return FALSE;
 
 	    elf_tdata (output_bfd)->cverrefs = crefs;
 	  }
@@ -3544,10 +3544,10 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 	  s->_raw_size = dynsymcount * sizeof (Elf_External_Versym);
 	  s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->_raw_size);
 	  if (s->contents == NULL)
-	    return false;
+	    return FALSE;
 
 	  if (! elf_add_dynamic_entry (info, (bfd_vma) DT_VERSYM, (bfd_vma) 0))
-	    return false;
+	    return FALSE;
 	}
 
       /* Set the size of the .dynsym and .hash sections.  We counted
@@ -3561,7 +3561,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
       s->_raw_size = dynsymcount * sizeof (Elf_External_Sym);
       s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
 
       if (dynsymcount != 0)
 	{
@@ -3587,7 +3587,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
       s->_raw_size = ((2 + bucketcount + dynsymcount) * hash_entry_size);
       s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
 
       bfd_put (8 * hash_entry_size, output_bfd, (bfd_vma) bucketcount,
 	       s->contents);
@@ -3605,19 +3605,19 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 
       for (dtagcount = 0; dtagcount <= info->spare_dynamic_tags; ++dtagcount)
 	if (! elf_add_dynamic_entry (info, (bfd_vma) DT_NULL, (bfd_vma) 0))
-	  return false;
+	  return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This function is used to adjust offsets into .dynstr for
    dynamic symbols.  This is called via elf_link_hash_traverse.  */
 
-static boolean elf_adjust_dynstr_offsets
-PARAMS ((struct elf_link_hash_entry *, PTR));
+static bfd_boolean elf_adjust_dynstr_offsets
+  PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean
+static bfd_boolean
 elf_adjust_dynstr_offsets (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -3629,13 +3629,13 @@ elf_adjust_dynstr_offsets (h, data)
 
   if (h->dynindx != -1)
     h->dynstr_index = _bfd_elf_strtab_offset (dynstr, h->dynstr_index);
-  return true;
+  return TRUE;
 }
 
 /* Assign string offsets in .dynstr, update all structures referencing
    them.  */
 
-static boolean
+static bfd_boolean
 elf_finalize_dynstr (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -3755,7 +3755,7 @@ elf_finalize_dynstr (output_bfd, info)
       while (need.vn_next);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Fix up the flags for a symbol.  This handles various cases which
@@ -3764,7 +3764,7 @@ elf_finalize_dynstr (output_bfd, info)
    assign_sym_version, which is unnecessary but perhaps more robust in
    the face of future changes.  */
 
-static boolean
+static bfd_boolean
 elf_fix_symbol_flags (h, eif)
      struct elf_link_hash_entry *h;
      struct elf_info_failed *eif;
@@ -3799,8 +3799,8 @@ elf_fix_symbol_flags (h, eif)
 	{
 	  if (! _bfd_elf_link_record_dynamic_symbol (eif->info, h))
 	    {
-	      eif->failed = true;
-	      return false;
+	      eif->failed = TRUE;
+	      return FALSE;
 	    }
 	}
     }
@@ -3853,7 +3853,7 @@ elf_fix_symbol_flags (h, eif)
       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0)
     {
       struct elf_backend_data *bed;
-      boolean force_local;
+      bfd_boolean force_local;
 
       bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
 
@@ -3893,14 +3893,14 @@ elf_fix_symbol_flags (h, eif)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Make the backend pick a good value for a dynamic symbol.  This is
    called via elf_link_hash_traverse, and also calls itself
    recursively.  */
 
-static boolean
+static bfd_boolean
 elf_adjust_dynamic_symbol (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -3922,14 +3922,14 @@ elf_adjust_dynamic_symbol (h, data)
 
   /* Ignore indirect symbols.  These are added by the versioning code.  */
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (! is_elf_hash_table (eif->info))
-    return false;
+    return FALSE;
 
   /* Fix the symbol flags.  */
   if (! elf_fix_symbol_flags (h, eif))
-    return false;
+    return FALSE;
 
   /* If this symbol does not require a PLT entry, and it is not
      defined by a dynamic object, or is not referenced by a regular
@@ -3945,13 +3945,13 @@ elf_adjust_dynamic_symbol (h, data)
 	      && (h->weakdef == NULL || h->weakdef->dynindx == -1))))
     {
       h->plt.offset = (bfd_vma) -1;
-      return true;
+      return TRUE;
     }
 
   /* If we've already adjusted this symbol, don't do it again.  This
      can happen via a recursive call.  */
   if ((h->elf_link_hash_flags & ELF_LINK_HASH_DYNAMIC_ADJUSTED) != 0)
-    return true;
+    return TRUE;
 
   /* Don't look at this symbol again.  Note that we must set this
      after checking the above conditions, because we may look at a
@@ -3996,7 +3996,7 @@ elf_adjust_dynamic_symbol (h, data)
       h->weakdef->elf_link_hash_flags |= ELF_LINK_HASH_REF_REGULAR;
 
       if (! elf_adjust_dynamic_symbol (h->weakdef, (PTR) eif))
-	return false;
+	return FALSE;
     }
 
   /* If a symbol has no type and no size and does not require a PLT
@@ -4015,17 +4015,17 @@ elf_adjust_dynamic_symbol (h, data)
   bed = get_elf_backend_data (dynobj);
   if (! (*bed->elf_backend_adjust_dynamic_symbol) (eif->info, h))
     {
-      eif->failed = true;
-      return false;
+      eif->failed = TRUE;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This routine is used to export all defined symbols into the dynamic
    symbol table.  It is called via elf_link_hash_traverse.  */
 
-static boolean
+static bfd_boolean
 elf_export_symbol (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -4034,7 +4034,7 @@ elf_export_symbol (h, data)
 
   /* Ignore indirect symbols.  These are added by the versioning code.  */
   if (h->root.type == bfd_link_hash_indirect)
-    return true;
+    return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -4062,7 +4062,7 @@ elf_export_symbol (h, data)
 	      for (d = t->locals ; d != NULL; d = d->next)
 		{
 		  if ((*d->match) (d, h->root.root.string))
-		    return true;
+		    return TRUE;
 		}
 	    }
 	}
@@ -4072,13 +4072,13 @@ elf_export_symbol (h, data)
 	doit:
 	  if (! _bfd_elf_link_record_dynamic_symbol (eif->info, h))
 	    {
-	      eif->failed = true;
-	      return false;
+	      eif->failed = TRUE;
+	      return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Look through the symbols which are defined in other shared
@@ -4086,7 +4086,7 @@ elf_export_symbol (h, data)
    dependencies.  This will be put into the .gnu.version_r section.
    This function is called via elf_link_hash_traverse.  */
 
-static boolean
+static bfd_boolean
 elf_link_find_version_dependencies (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -4105,7 +4105,7 @@ elf_link_find_version_dependencies (h, data)
       || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
       || h->dynindx == -1
       || h->verinfo.verdef == NULL)
-    return true;
+    return TRUE;
 
   /* See if we already know about this version.  */
   for (t = elf_tdata (rinfo->output_bfd)->verref; t != NULL; t = t->vn_nextref)
@@ -4115,7 +4115,7 @@ elf_link_find_version_dependencies (h, data)
 
       for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
 	if (a->vna_nodename == h->verinfo.verdef->vd_nodename)
-	  return true;
+	  return TRUE;
 
       break;
     }
@@ -4128,8 +4128,8 @@ elf_link_find_version_dependencies (h, data)
       t = (Elf_Internal_Verneed *) bfd_zalloc (rinfo->output_bfd, amt);
       if (t == NULL)
 	{
-	  rinfo->failed = true;
-	  return false;
+	  rinfo->failed = TRUE;
+	  return FALSE;
 	}
 
       t->vn_bfd = h->verinfo.verdef->vd_bfd;
@@ -4156,7 +4156,7 @@ elf_link_find_version_dependencies (h, data)
 
   t->vn_auxptr = a;
 
-  return true;
+  return TRUE;
 }
 
 /* Figure out appropriate versions for all the symbols.  We may not
@@ -4164,7 +4164,7 @@ elf_link_find_version_dependencies (h, data)
    files, so until that point we don't know which symbols should be
    local.  This function is called via elf_link_hash_traverse.  */
 
-static boolean
+static bfd_boolean
 elf_link_assign_sym_version (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -4183,35 +4183,35 @@ elf_link_assign_sym_version (h, data)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
   /* Fix the symbol flags.  */
-  eif.failed = false;
+  eif.failed = FALSE;
   eif.info = info;
   if (! elf_fix_symbol_flags (h, &eif))
     {
       if (eif.failed)
-	sinfo->failed = true;
-      return false;
+	sinfo->failed = TRUE;
+      return FALSE;
     }
 
   /* We only need version numbers for symbols defined in regular
      objects.  */
   if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
+    return TRUE;
 
   bed = get_elf_backend_data (sinfo->output_bfd);
   p = strchr (h->root.root.string, ELF_VER_CHR);
   if (p != NULL && h->verinfo.vertree == NULL)
     {
       struct bfd_elf_version_tree *t;
-      boolean hidden;
+      bfd_boolean hidden;
 
-      hidden = true;
+      hidden = TRUE;
 
       /* There are two consecutive ELF_VER_CHR characters if this is
 	 not a hidden symbol.  */
       ++p;
       if (*p == ELF_VER_CHR)
 	{
-	  hidden = false;
+	  hidden = FALSE;
 	  ++p;
 	}
 
@@ -4220,7 +4220,7 @@ elf_link_assign_sym_version (h, data)
 	{
 	  if (hidden)
 	    h->elf_link_hash_flags |= ELF_LINK_HIDDEN;
-	  return true;
+	  return TRUE;
 	}
 
       /* Look for the version.  If we find it, it is no longer weak.  */
@@ -4235,14 +4235,14 @@ elf_link_assign_sym_version (h, data)
 	      len = p - h->root.root.string;
 	      alc = bfd_malloc ((bfd_size_type) len);
 	      if (alc == NULL)
-		return false;
+		return FALSE;
 	      memcpy (alc, h->root.root.string, len - 1);
 	      alc[len - 1] = '\0';
 	      if (alc[len - 2] == ELF_VER_CHR)
 		alc[len - 2] = '\0';
 
 	      h->verinfo.vertree = t;
-	      t->used = true;
+	      t->used = TRUE;
 	      d = NULL;
 
 	      if (t->globals != NULL)
@@ -4264,7 +4264,7 @@ elf_link_assign_sym_version (h, data)
 			      && info->shared
 			      && ! info->export_dynamic)
 			    {
-			      (*bed->elf_backend_hide_symbol) (info, h, true);
+			      (*bed->elf_backend_hide_symbol) (info, h, TRUE);
 			    }
 
 			  break;
@@ -4287,15 +4287,15 @@ elf_link_assign_sym_version (h, data)
 	  /* If we aren't going to export this symbol, we don't need
 	     to worry about it.  */
 	  if (h->dynindx == -1)
-	    return true;
+	    return TRUE;
 
 	  amt = sizeof *t;
 	  t = ((struct bfd_elf_version_tree *)
 	       bfd_alloc (sinfo->output_bfd, amt));
 	  if (t == NULL)
 	    {
-	      sinfo->failed = true;
-	      return false;
+	      sinfo->failed = TRUE;
+	      return FALSE;
 	    }
 
 	  t->next = NULL;
@@ -4304,7 +4304,7 @@ elf_link_assign_sym_version (h, data)
 	  t->locals = NULL;
 	  t->deps = NULL;
 	  t->name_indx = (unsigned int) -1;
-	  t->used = true;
+	  t->used = TRUE;
 
 	  version_index = 1;
 	  /* Don't count anonymous version tag.  */
@@ -4326,8 +4326,8 @@ elf_link_assign_sym_version (h, data)
 	    (_("%s: undefined versioned symbol name %s"),
 	     bfd_get_filename (sinfo->output_bfd), h->root.root.string);
 	  bfd_set_error (bfd_error_bad_value);
-	  sinfo->failed = true;
-	  return false;
+	  sinfo->failed = TRUE;
+	  return FALSE;
 	}
 
       if (hidden)
@@ -4350,15 +4350,15 @@ elf_link_assign_sym_version (h, data)
 	{
 	  if (t->globals != NULL)
 	    {
-	      boolean matched;
+	      bfd_boolean matched;
 
-	      matched = false;
+	      matched = FALSE;
 	      for (d = t->globals; d != NULL; d = d->next)
 		{
 		  if ((*d->match) (d, h->root.root.string))
 		    {
 		      if (d->symver)
-			matched = true;
+			matched = TRUE;
 		      else
 			{
 			  /* There is a version without definition.  Make
@@ -4377,7 +4377,7 @@ elf_link_assign_sym_version (h, data)
 	      else if (matched)
 		/* There is no undefined version for this symbol. Hide the
 		   default one.  */
-		(*bed->elf_backend_hide_symbol) (info, h, true);
+		(*bed->elf_backend_hide_symbol) (info, h, TRUE);
 	    }
 
 	  if (t->locals != NULL)
@@ -4407,12 +4407,12 @@ elf_link_assign_sym_version (h, data)
 	      && info->shared
 	      && ! info->export_dynamic)
 	    {
-	      (*bed->elf_backend_hide_symbol) (info, h, true);
+	      (*bed->elf_backend_hide_symbol) (info, h, TRUE);
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Final phase of ELF linker.  */
@@ -4467,20 +4467,20 @@ struct elf_final_link_info
   size_t shndxbuf_size;
 };
 
-static boolean elf_link_output_sym
+static bfd_boolean elf_link_output_sym
   PARAMS ((struct elf_final_link_info *, const char *,
 	   Elf_Internal_Sym *, asection *));
-static boolean elf_link_flush_output_syms
+static bfd_boolean elf_link_flush_output_syms
   PARAMS ((struct elf_final_link_info *));
-static boolean elf_link_output_extsym
+static bfd_boolean elf_link_output_extsym
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_sec_merge_syms
+static bfd_boolean elf_link_sec_merge_syms
   PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_check_versioned_symbol
+static bfd_boolean elf_link_check_versioned_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf_link_input_bfd
+static bfd_boolean elf_link_input_bfd
   PARAMS ((struct elf_final_link_info *, bfd *));
-static boolean elf_reloc_link_order
+static bfd_boolean elf_reloc_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   struct bfd_link_order *));
 
@@ -4488,15 +4488,15 @@ static boolean elf_reloc_link_order
 
 struct elf_outext_info
 {
-  boolean failed;
-  boolean localsyms;
+  bfd_boolean failed;
+  bfd_boolean localsyms;
   struct elf_final_link_info *finfo;
 };
 
 /* Compute the size of, and allocate space for, REL_HDR which is the
    section header for a section containing relocations for O.  */
 
-static boolean
+static bfd_boolean
 elf_link_size_reloc_section (abfd, rel_hdr, o)
      bfd *abfd;
      Elf_Internal_Shdr *rel_hdr;
@@ -4524,7 +4524,7 @@ elf_link_size_reloc_section (abfd, rel_hdr, o)
      we zero the allocated space.  */
   rel_hdr->contents = (PTR) bfd_zalloc (abfd, rel_hdr->sh_size);
   if (rel_hdr->contents == NULL && rel_hdr->sh_size != 0)
-    return false;
+    return FALSE;
 
   /* We only allocate one set of hash entries, so we only do it the
      first time we are called.  */
@@ -4537,12 +4537,12 @@ elf_link_size_reloc_section (abfd, rel_hdr, o)
 	   bfd_zmalloc (num_rel_hashes
 			* sizeof (struct elf_link_hash_entry *)));
       if (p == NULL)
-	return false;
+	return FALSE;
 
       elf_section_data (o)->rel_hashes = p;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* When performing a relocateable link, the input relocations are
@@ -4782,13 +4782,13 @@ elf_link_sort_relocs (abfd, info, psec)
 
 /* Do the final step of an ELF link.  */
 
-boolean
+bfd_boolean
 elf_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
-  boolean dynamic;
-  boolean emit_relocs;
+  bfd_boolean dynamic;
+  bfd_boolean emit_relocs;
   bfd *dynobj;
   struct elf_final_link_info finfo;
   register asection *o;
@@ -4807,13 +4807,13 @@ elf_bfd_final_link (abfd, info)
   Elf_Internal_Shdr *symstrtab_hdr;
   struct elf_backend_data *bed = get_elf_backend_data (abfd);
   struct elf_outext_info eoinfo;
-  boolean merged;
+  bfd_boolean merged;
   size_t relativecount = 0;
   asection *reldyn = 0;
   bfd_size_type amt;
 
   if (! is_elf_hash_table (info))
-    return false;
+    return FALSE;
 
   if (info->shared)
     abfd->flags |= DYNAMIC;
@@ -4829,7 +4829,7 @@ elf_bfd_final_link (abfd, info)
   finfo.output_bfd = abfd;
   finfo.symstrtab = elf_stringtab_init ();
   if (finfo.symstrtab == NULL)
-    return false;
+    return FALSE;
 
   if (! dynamic)
     {
@@ -4875,7 +4875,7 @@ elf_bfd_final_link (abfd, info)
   max_internal_reloc_count = 0;
   max_sym_count = 0;
   max_sym_shndx_count = 0;
-  merged = false;
+  merged = FALSE;
   for (o = abfd->sections; o != (asection *) NULL; o = o->next)
     {
       o->reloc_count = 0;
@@ -4895,10 +4895,10 @@ elf_bfd_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 (sec->flags & SEC_MERGE)
-		merged = true;
+		merged = TRUE;
 
 	      if (info->relocateable || info->emitrelocations)
 		o->reloc_count += sec->reloc_count;
@@ -5086,7 +5086,7 @@ elf_bfd_final_link (abfd, info)
   symtab_hdr->sh_addralign = bed->s->file_align;
 
   off = elf_tdata (abfd)->next_file_pos;
-  off = _bfd_elf_assign_file_position_for_section (symtab_hdr, off, true);
+  off = _bfd_elf_assign_file_position_for_section (symtab_hdr, off, TRUE);
 
   /* Note that at this point elf_tdata (abfd)->next_file_pos is
      incorrect.  We do not yet know the size of the .symtab section.
@@ -5285,7 +5285,7 @@ elf_bfd_final_link (abfd, info)
      know how bad the memory loss will be.  */
 
   for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    sub->output_has_begun = false;
+    sub->output_has_begun = FALSE;
   for (o = abfd->sections; o != NULL; o = o->next)
     {
       for (p = o->link_order_head; p != NULL; p = p->next)
@@ -5299,7 +5299,7 @@ elf_bfd_final_link (abfd, info)
 		{
 		  if (! elf_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
@@ -5322,13 +5322,13 @@ elf_bfd_final_link (abfd, info)
      prior to any global symbols.  FIXME: We should only do this if
      some global symbols were, in fact, converted to become local.
      FIXME: Will this work correctly with the Irix 5 linker?  */
-  eoinfo.failed = false;
+  eoinfo.failed = FALSE;
   eoinfo.finfo = &finfo;
-  eoinfo.localsyms = true;
+  eoinfo.localsyms = TRUE;
   elf_link_hash_traverse (elf_hash_table (info), elf_link_output_extsym,
 			  (PTR) &eoinfo);
   if (eoinfo.failed)
-    return false;
+    return FALSE;
 
   /* That wrote out all the local symbols.  Finish up the symbol table
      with the global symbols. Even if we want to strip everything we
@@ -5416,30 +5416,29 @@ elf_bfd_final_link (abfd, info)
     }
 
   /* We get the global symbols from the hash table.  */
-  eoinfo.failed = false;
-  eoinfo.localsyms = false;
+  eoinfo.failed = FALSE;
+  eoinfo.localsyms = FALSE;
   eoinfo.finfo = &finfo;
   elf_link_hash_traverse (elf_hash_table (info), elf_link_output_extsym,
 			  (PTR) &eoinfo);
   if (eoinfo.failed)
-    return false;
+    return FALSE;
 
   /* If backend needs to output some symbols not present in the hash
      table, do it now.  */
   if (bed->elf_backend_output_arch_syms)
     {
-      typedef boolean (*out_sym_func) PARAMS ((PTR, const char *,
-					       Elf_Internal_Sym *,
-					       asection *));
+      typedef bfd_boolean (*out_sym_func)
+	PARAMS ((PTR, const char *, Elf_Internal_Sym *, asection *));
 
       if (! ((*bed->elf_backend_output_arch_syms)
 	     (abfd, info, (PTR) &finfo, (out_sym_func) elf_link_output_sym)))
-	return false;
+	return FALSE;
     }
 
   /* Flush all symbols to the file.  */
   if (! elf_link_flush_output_syms (&finfo))
-    return false;
+    return FALSE;
 
   /* Now we know the size of the symtab section.  */
   off += symtab_hdr->sh_size;
@@ -5454,11 +5453,11 @@ elf_bfd_final_link (abfd, info)
       symtab_shndx_hdr->sh_size = amt;
 
       off = _bfd_elf_assign_file_position_for_section (symtab_shndx_hdr,
-						       off, true);
+						       off, TRUE);
 
       if (bfd_seek (abfd, symtab_shndx_hdr->sh_offset, SEEK_SET) != 0
 	  || (bfd_bwrite ((PTR) finfo.symshndxbuf, amt, abfd) != amt))
-	return false;
+	return FALSE;
     }
 
 
@@ -5476,14 +5475,14 @@ elf_bfd_final_link (abfd, info)
   /* sh_offset is set just below.  */
   symstrtab_hdr->sh_addralign = 1;
 
-  off = _bfd_elf_assign_file_position_for_section (symstrtab_hdr, off, true);
+  off = _bfd_elf_assign_file_position_for_section (symstrtab_hdr, off, TRUE);
   elf_tdata (abfd)->next_file_pos = off;
 
   if (bfd_get_symcount (abfd) > 0)
     {
       if (bfd_seek (abfd, symstrtab_hdr->sh_offset, SEEK_SET) != 0
 	  || ! _bfd_stringtab_emit (abfd, finfo.symstrtab))
-	return false;
+	return FALSE;
     }
 
   /* Adjust the relocs to have the correct symbol indices.  */
@@ -5560,7 +5559,7 @@ elf_bfd_final_link (abfd, info)
 		struct elf_link_hash_entry *h;
 
 		h = elf_link_hash_lookup (elf_hash_table (info), name,
-					  false, false, true);
+					  FALSE, FALSE, TRUE);
 		if (h != NULL
 		    && (h->root.type == bfd_link_hash_defined
 			|| h->root.type == bfd_link_hash_defweak))
@@ -5722,7 +5721,7 @@ elf_bfd_final_link (abfd, info)
 
   if (info->relocateable)
     {
-      boolean failed = false;
+      bfd_boolean failed = FALSE;
 
       bfd_map_over_sections (abfd, bfd_elf_set_group_contents, &failed);
       if (failed)
@@ -5771,9 +5770,9 @@ elf_bfd_final_link (abfd, info)
 	free (elf_section_data (o)->rel_hashes);
     }
 
-  elf_tdata (abfd)->linker = true;
+  elf_tdata (abfd)->linker = TRUE;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (finfo.symstrtab != NULL)
@@ -5805,12 +5804,12 @@ elf_bfd_final_link (abfd, info)
 	free (elf_section_data (o)->rel_hashes);
     }
 
-  return false;
+  return FALSE;
 }
 
 /* Add a symbol to the output symbol table.  */
 
-static boolean
+static bfd_boolean
 elf_link_output_sym (finfo, name, elfsym, input_sec)
      struct elf_final_link_info *finfo;
      const char *name;
@@ -5819,12 +5818,9 @@ elf_link_output_sym (finfo, name, elfsym, input_sec)
 {
   Elf_External_Sym *dest;
   Elf_External_Sym_Shndx *destshndx;
-
-  boolean (*output_symbol_hook) PARAMS ((bfd *,
-					 struct bfd_link_info *info,
-					 const char *,
-					 Elf_Internal_Sym *,
-					 asection *));
+  bfd_boolean (*output_symbol_hook)
+    PARAMS ((bfd *, struct bfd_link_info *info, const char *,
+	     Elf_Internal_Sym *, asection *));
 
   output_symbol_hook = get_elf_backend_data (finfo->output_bfd)->
     elf_backend_link_output_symbol_hook;
@@ -5832,7 +5828,7 @@ elf_link_output_sym (finfo, name, elfsym, input_sec)
     {
       if (! ((*output_symbol_hook)
 	     (finfo->output_bfd, finfo->info, name, elfsym, input_sec)))
-	return false;
+	return FALSE;
     }
 
   if (name == (const char *) NULL || *name == '\0')
@@ -5842,15 +5838,15 @@ elf_link_output_sym (finfo, name, elfsym, input_sec)
   else
     {
       elfsym->st_name = (unsigned long) _bfd_stringtab_add (finfo->symstrtab,
-							    name, true, false);
+							    name, TRUE, FALSE);
       if (elfsym->st_name == (unsigned long) -1)
-	return false;
+	return FALSE;
     }
 
   if (finfo->symbuf_count >= finfo->symbuf_size)
     {
       if (! elf_link_flush_output_syms (finfo))
-	return false;
+	return FALSE;
     }
 
   dest = finfo->symbuf + finfo->symbuf_count;
@@ -5864,7 +5860,7 @@ elf_link_output_sym (finfo, name, elfsym, input_sec)
 	  amt = finfo->shndxbuf_size * sizeof (Elf_External_Sym_Shndx);
 	  finfo->symshndxbuf = destshndx = bfd_realloc (destshndx, amt * 2);
 	  if (destshndx == NULL)
-	    return false;
+	    return FALSE;
 	  memset ((char *) destshndx + amt, 0, amt);
 	  finfo->shndxbuf_size *= 2;
 	}
@@ -5875,12 +5871,12 @@ elf_link_output_sym (finfo, name, elfsym, input_sec)
   finfo->symbuf_count += 1;
   bfd_get_symcount (finfo->output_bfd) += 1;
 
-  return true;
+  return TRUE;
 }
 
 /* Flush the output symbols to the file.  */
 
-static boolean
+static bfd_boolean
 elf_link_flush_output_syms (finfo)
      struct elf_final_link_info *finfo;
 {
@@ -5895,19 +5891,19 @@ elf_link_flush_output_syms (finfo)
       amt = finfo->symbuf_count * sizeof (Elf_External_Sym);
       if (bfd_seek (finfo->output_bfd, pos, SEEK_SET) != 0
 	  || bfd_bwrite ((PTR) finfo->symbuf, amt, finfo->output_bfd) != amt)
-	return false;
+	return FALSE;
 
       hdr->sh_size += amt;
       finfo->symbuf_count = 0;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust all external symbols pointing into SEC_MERGE sections
    to reflect the object merging within the sections.  */
 
-static boolean
+static bfd_boolean
 elf_link_sec_merge_syms (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -5931,14 +5927,14 @@ elf_link_sec_merge_syms (h, data)
 				    h->root.u.def.value, (bfd_vma) 0);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* For DSOs loaded in via a DT_NEEDED entry, emulate ld.so in
    allowing an unsatisfied unversioned symbol in the DSO to match a
    versioned symbol that would normally require an explicit version.  */
 
-static boolean
+static bfd_boolean
 elf_link_check_versioned_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -5949,7 +5945,7 @@ elf_link_check_versioned_symbol (info, h)
   if ((undef_bfd->flags & DYNAMIC) == 0
       || info->hash->creator->flavour != bfd_target_elf_flavour
       || elf_dt_soname (h->root.u.undef.abfd) == NULL)
-    return false;
+    return FALSE;
 
   for (loaded = elf_hash_table (info)->loaded;
        loaded != NULL;
@@ -5995,7 +5991,7 @@ elf_link_check_versioned_symbol (info, h)
       isymbuf = bfd_elf_get_elf_syms (input, hdr, extsymcount, extsymoff,
 				      NULL, NULL, NULL);
       if (isymbuf == NULL)
-	return false;
+	return FALSE;
 
       /* Read in any version definitions.  */
       versymhdr = &elf_tdata (input)->dynversym_hdr;
@@ -6010,7 +6006,7 @@ elf_link_check_versioned_symbol (info, h)
 	  free (extversym);
 	error_ret:
 	  free (isymbuf);
-	  return false;
+	  return FALSE;
 	}
 
       ever = extversym + extsymoff;
@@ -6044,7 +6040,7 @@ elf_link_check_versioned_symbol (info, h)
 	      /* This is the oldest (default) sym.  We can use it.  */
 	      free (extversym);
 	      free (isymbuf);
-	      return true;
+	      return TRUE;
 	    }
 	}
 
@@ -6052,7 +6048,7 @@ elf_link_check_versioned_symbol (info, h)
       free (isymbuf);
     }
 
-  return false;
+  return FALSE;
 }
 
 /* Add an external symbol to the symbol table.  This is called from
@@ -6062,14 +6058,14 @@ elf_link_check_versioned_symbol (info, h)
    script.  The second time we output the symbols that are still
    global symbols.  */
 
-static boolean
+static bfd_boolean
 elf_link_output_extsym (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
 {
   struct elf_outext_info *eoinfo = (struct elf_outext_info *) data;
   struct elf_final_link_info *finfo = eoinfo->finfo;
-  boolean strip;
+  bfd_boolean strip;
   Elf_Internal_Sym sym;
   asection *input_sec;
 
@@ -6077,19 +6073,19 @@ elf_link_output_extsym (h, data)
     {
       h = (struct elf_link_hash_entry *) h->root.u.i.link;
       if (h->root.type == bfd_link_hash_new)
-	return true;
+	return TRUE;
     }
 
   /* Decide whether to output this symbol in this pass.  */
   if (eoinfo->localsyms)
     {
       if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
-	return true;
+	return TRUE;
     }
   else
     {
       if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
-	return true;
+	return TRUE;
     }
 
   /* If we are not creating a shared library, and this symbol is
@@ -6109,10 +6105,10 @@ elf_link_output_extsym (h, data)
     {
       if (! ((*finfo->info->callbacks->undefined_symbol)
 	     (finfo->info, h->root.root.string, h->root.u.undef.abfd,
-	      (asection *) NULL, (bfd_vma) 0, true)))
+	      (asection *) NULL, (bfd_vma) 0, TRUE)))
 	{
-	  eoinfo->failed = true;
-	  return false;
+	  eoinfo->failed = TRUE;
+	  return FALSE;
 	}
     }
 
@@ -6121,27 +6117,27 @@ elf_link_output_extsym (h, data)
      h->indx is set to -2, the symbol is used by a reloc and we must
      output it.  */
   if (h->indx == -2)
-    strip = false;
+    strip = FALSE;
   else if (((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
 	    || (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0)
 	   && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
 	   && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
-    strip = true;
+    strip = TRUE;
   else if (finfo->info->strip == strip_all
 	   || (finfo->info->strip == strip_some
 	       && bfd_hash_lookup (finfo->info->keep_hash,
 				   h->root.root.string,
-				   false, false) == NULL))
-    strip = true;
+				   FALSE, FALSE) == NULL))
+    strip = TRUE;
   else
-    strip = false;
+    strip = FALSE;
 
   /* If we're stripping it, and it's not a dynamic symbol, there's
      nothing else to do unless it is a forced local symbol.  */
   if (strip
       && h->dynindx == -1
       && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
-    return true;
+    return TRUE;
 
   sym.st_value = 0;
   sym.st_size = h->size;
@@ -6160,7 +6156,7 @@ elf_link_output_extsym (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:
@@ -6184,8 +6180,8 @@ elf_link_output_extsym (h, data)
 		   bfd_get_filename (finfo->output_bfd),
 		   input_sec->output_section->name,
 		   input_sec->name);
-		eoinfo->failed = true;
-		return false;
+		eoinfo->failed = TRUE;
+		return FALSE;
 	      }
 
 	    /* ELF symbols in relocateable files are section relative,
@@ -6227,7 +6223,7 @@ elf_link_output_extsym (h, data)
 	 foo is used with no version, then we add an indirect symbol
 	 foo which points to foo@@GNU_1.2.  We ignore these symbols,
 	 since the indirected symbol is already in the hash table.  */
-      return true;
+      return TRUE;
     }
 
   /* Give the processor backend a chance to tweak the symbol value,
@@ -6246,8 +6242,8 @@ elf_link_output_extsym (h, data)
       if (! ((*bed->elf_backend_finish_dynamic_symbol)
 	     (finfo->output_bfd, finfo->info, h, &sym)))
 	{
-	  eoinfo->failed = true;
-	  return false;
+	  eoinfo->failed = TRUE;
+	  return FALSE;
 	}
     }
 
@@ -6338,24 +6334,24 @@ elf_link_output_extsym (h, data)
   /* If we're stripping it, then it was just a dynamic symbol, and
      there's nothing else to do.  */
   if (strip || (input_sec->flags & SEC_EXCLUDE) != 0)
-    return true;
+    return TRUE;
 
   h->indx = bfd_get_symcount (finfo->output_bfd);
 
   if (! elf_link_output_sym (finfo, h->root.root.string, &sym, input_sec))
     {
-      eoinfo->failed = true;
-      return false;
+      eoinfo->failed = TRUE;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Copy the relocations indicated by the INTERNAL_RELOCS (which
    originated from the section given by INPUT_REL_HDR) to the
    OUTPUT_BFD.  */
 
-static boolean
+static bfd_boolean
 elf_link_output_relocs (output_bfd, input_section, input_rel_hdr,
 			internal_relocs)
      bfd *output_bfd;
@@ -6396,7 +6392,7 @@ elf_link_output_relocs (output_bfd, input_section, input_rel_hdr,
 	 bfd_archive_filename (input_section->owner),
 	 input_section->name);
       bfd_set_error (bfd_error_wrong_object_format);
-      return false;
+      return FALSE;
     }
 
   bed = get_elf_backend_data (output_bfd);
@@ -6423,7 +6419,7 @@ elf_link_output_relocs (output_bfd, input_section, input_rel_hdr,
      relocations.  */
   *rel_countp += NUM_SHDR_ENTRIES (input_rel_hdr);
 
-  return true;
+  return TRUE;
 }
 
 /* Link an input file into the linker output file.  This function
@@ -6431,15 +6427,14 @@ elf_link_output_relocs (output_bfd, input_section, input_rel_hdr,
    This is so that we only have to read the local symbols once, and
    don't have to keep them in memory.  */
 
-static boolean
+static bfd_boolean
 elf_link_input_bfd (finfo, input_bfd)
      struct elf_final_link_info *finfo;
      bfd *input_bfd;
 {
-  boolean (*relocate_section) PARAMS ((bfd *, struct bfd_link_info *,
-				       bfd *, asection *, bfd_byte *,
-				       Elf_Internal_Rela *,
-				       Elf_Internal_Sym *, asection **));
+  bfd_boolean (*relocate_section)
+    PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	     Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
   bfd *output_bfd;
   Elf_Internal_Shdr *symtab_hdr;
   size_t locsymcount;
@@ -6451,7 +6446,7 @@ elf_link_input_bfd (finfo, input_bfd)
   asection **ppsection;
   asection *o;
   struct elf_backend_data *bed;
-  boolean emit_relocs;
+  bfd_boolean emit_relocs;
   struct elf_link_hash_entry **sym_hashes;
 
   output_bfd = finfo->output_bfd;
@@ -6462,7 +6457,7 @@ elf_link_input_bfd (finfo, input_bfd)
      we don't want the local symbols, and we don't want the section
      contents.  */
   if ((input_bfd->flags & DYNAMIC) != 0)
-    return true;
+    return TRUE;
 
   emit_relocs = (finfo->info->relocateable
 		 || finfo->info->emitrelocations
@@ -6489,7 +6484,7 @@ elf_link_input_bfd (finfo, input_bfd)
 				      finfo->external_syms,
 				      finfo->locsym_shndx);
       if (isymbuf == NULL)
-	return false;
+	return FALSE;
     }
 
   /* Find local symbol sections and adjust values of symbols in
@@ -6582,11 +6577,11 @@ elf_link_input_bfd (finfo, input_bfd)
       name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link,
 					      isym->st_name);
       if (name == NULL)
-	return false;
+	return FALSE;
 
       /* See if we are discarding symbols with this name.  */
       if ((finfo->info->strip == strip_some
-	   && (bfd_hash_lookup (finfo->info->keep_hash, name, false, false)
+	   && (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
 	       == NULL))
 	  || (((finfo->info->discard == discard_sec_merge
 		&& (isec->flags & SEC_MERGE) && ! finfo->info->relocateable)
@@ -6602,7 +6597,7 @@ elf_link_input_bfd (finfo, input_bfd)
       osym.st_shndx = _bfd_elf_section_from_bfd_section (output_bfd,
 							 isec->output_section);
       if (osym.st_shndx == SHN_BAD)
-	return false;
+	return FALSE;
 
       *pindex = bfd_get_symcount (output_bfd);
 
@@ -6626,7 +6621,7 @@ elf_link_input_bfd (finfo, input_bfd)
 	}
 
       if (! elf_link_output_sym (finfo, name, &osym, isec))
-	return false;
+	return FALSE;
     }
 
   /* Relocate the contents of each section.  */
@@ -6663,7 +6658,7 @@ elf_link_input_bfd (finfo, input_bfd)
 	  contents = finfo->contents;
 	  if (! bfd_get_section_contents (input_bfd, o, contents,
 					  (file_ptr) 0, o->_raw_size))
-	    return false;
+	    return FALSE;
 	}
 
       if ((o->flags & SEC_RELOC) != 0)
@@ -6673,10 +6668,10 @@ elf_link_input_bfd (finfo, input_bfd)
 	  /* Get the swapped relocs.  */
 	  internal_relocs = (NAME(_bfd_elf,link_read_relocs)
 			     (input_bfd, o, finfo->external_relocs,
-			      finfo->internal_relocs, false));
+			      finfo->internal_relocs, FALSE));
 	  if (internal_relocs == NULL
 	      && o->reloc_count > 0)
-	    return false;
+	    return FALSE;
 
 	  /* Run through the relocs looking for any against symbols
 	     from discarded sections and section symbols from
@@ -6721,8 +6716,8 @@ elf_link_input_bfd (finfo, input_bfd)
 			      if (! ((*finfo->info->callbacks->undefined_symbol)
 				     (finfo->info, h->root.root.string,
 				      input_bfd, o, rel->r_offset,
-				      true)))
-				return false;
+				      TRUE)))
+				return FALSE;
 			    }
 			}
 		    }
@@ -6742,7 +6737,7 @@ elf_link_input_bfd (finfo, input_bfd)
 			    }
 			  else
 			    {
-			      boolean ok;
+			      bfd_boolean ok;
 			      const char *msg
 				= _("local symbols in discarded section %s");
 			      bfd_size_type amt
@@ -6757,11 +6752,11 @@ elf_link_input_bfd (finfo, input_bfd)
 				    ->undefined_symbol) (finfo->info, buf,
 							 input_bfd, o,
 							 rel->r_offset,
-							 true);
+							 TRUE);
 			      if (buf != sec->name)
 				free (buf);
 			      if (!ok)
-				return false;
+				return FALSE;
 			    }
 			}
 		    }
@@ -6793,7 +6788,7 @@ elf_link_input_bfd (finfo, input_bfd)
 				     internal_relocs,
 				     isymbuf,
 				     finfo->sections))
-	    return false;
+	    return FALSE;
 
 	  if (emit_relocs)
 	    {
@@ -6803,10 +6798,10 @@ elf_link_input_bfd (finfo, input_bfd)
 	      struct elf_link_hash_entry **rel_hash;
 	      Elf_Internal_Shdr *input_rel_hdr, *input_rel_hdr2;
 	      unsigned int next_erel;
-	      boolean (*reloc_emitter) PARAMS ((bfd *, asection *,
-						Elf_Internal_Shdr *,
-						Elf_Internal_Rela *));
-	      boolean rela_normal;
+	      bfd_boolean (*reloc_emitter)
+		PARAMS ((bfd *, asection *, Elf_Internal_Shdr *,
+			 Elf_Internal_Rela *));
+	      bfd_boolean rela_normal;
 
 	      input_rel_hdr = &elf_section_data (o)->rel_hdr;
 	      rela_normal = (bed->rela_normal
@@ -6844,7 +6839,7 @@ elf_link_input_bfd (finfo, input_bfd)
 			 Turn it into an R_*_NONE reloc, at the same
 			 offset as the last reloc.  elf_eh_frame.c and
 			 elf_bfd_discard_info rely on reloc offsets
-			 being ordered.  */ 
+			 being ordered.  */
 		      irela->r_offset = last_offset;
 		      irela->r_info = 0;
 		      irela->r_addend = 0;
@@ -6913,7 +6908,7 @@ elf_link_input_bfd (finfo, input_bfd)
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      else
 			{
@@ -6938,7 +6933,7 @@ elf_link_input_bfd (finfo, input_bfd)
 			    {
 			      /* You can't do ld -r -s.  */
 			      bfd_set_error (bfd_error_invalid_operation);
-			      return false;
+			      return FALSE;
 			    }
 
 			  /* This symbol was skipped earlier, but
@@ -6948,14 +6943,14 @@ elf_link_input_bfd (finfo, input_bfd)
 			  name = (bfd_elf_string_from_elf_section
 				  (input_bfd, shlink, sym.st_name));
 			  if (name == NULL)
-			    return false;
+			    return FALSE;
 
 			  osec = sec->output_section;
 			  sym.st_shndx =
 			    _bfd_elf_section_from_bfd_section (output_bfd,
 							       osec);
 			  if (sym.st_shndx == SHN_BAD)
-			    return false;
+			    return FALSE;
 
 			  sym.st_value += sec->output_offset;
 			  if (! finfo->info->relocateable)
@@ -6974,7 +6969,7 @@ elf_link_input_bfd (finfo, input_bfd)
 			    = bfd_get_symcount (output_bfd);
 
 			  if (! elf_link_output_sym (finfo, name, &sym, sec))
-			    return false;
+			    return FALSE;
 			}
 
 		      r_symndx = finfo->indices[r_symndx];
@@ -6995,7 +6990,7 @@ elf_link_input_bfd (finfo, input_bfd)
 	      if (input_rel_hdr->sh_size != 0
 		  && ! (*reloc_emitter) (output_bfd, o, input_rel_hdr,
 					 internal_relocs))
-		return false;
+		return FALSE;
 
 	      input_rel_hdr2 = elf_section_data (o)->rel_hdr2;
 	      if (input_rel_hdr2 && input_rel_hdr2->sh_size != 0)
@@ -7004,7 +6999,7 @@ elf_link_input_bfd (finfo, input_bfd)
 				      * bed->s->int_rels_per_ext_rel);
 		  if (! (*reloc_emitter) (output_bfd, o, input_rel_hdr2,
 					  internal_relocs))
-		    return false;
+		    return FALSE;
 		}
 	    }
 	}
@@ -7022,18 +7017,18 @@ elf_link_input_bfd (finfo, input_bfd)
 		 (output_bfd,
 		  &elf_hash_table (finfo->info)->stab_info,
 		  o, &elf_section_data (o)->sec_info, contents)))
-	    return false;
+	    return FALSE;
 	  break;
 	case ELF_INFO_TYPE_MERGE:
 	  if (! _bfd_write_merged_section (output_bfd, o,
 					   elf_section_data (o)->sec_info))
-	    return false;
+	    return FALSE;
 	  break;
 	case ELF_INFO_TYPE_EH_FRAME:
 	  {
 	    if (! _bfd_elf_write_section_eh_frame (output_bfd, finfo->info,
 						   o, contents))
-	      return false;
+	      return FALSE;
 	  }
 	  break;
 	default:
@@ -7046,13 +7041,13 @@ elf_link_input_bfd (finfo, input_bfd)
 					       contents,
 					       (file_ptr) o->output_offset,
 					       sec_size))
-	      return false;
+	      return FALSE;
 	  }
 	  break;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Generate a reloc when linking an ELF file.  This is a reloc
@@ -7060,7 +7055,7 @@ elf_link_input_bfd (finfo, input_bfd)
    is used to build constructor and destructor tables when linking
    with -Ur.  */
 
-static boolean
+static bfd_boolean
 elf_reloc_link_order (output_bfd, info, output_section, link_order)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -7082,7 +7077,7 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order)
   if (howto == NULL)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   addend = link_order->u.reloc.p->addend;
@@ -7106,7 +7101,7 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order)
       h = ((struct elf_link_hash_entry *)
 	   bfd_wrapped_link_hash_lookup (output_bfd, info,
 					 link_order->u.reloc.p->u.name,
-					 false, false, true));
+					 FALSE, FALSE, TRUE));
       if (h != NULL
 	  && (h->root.type == bfd_link_hash_defined
 	      || h->root.type == bfd_link_hash_defweak))
@@ -7134,7 +7129,7 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order)
 	  if (! ((*info->callbacks->unattached_reloc)
 		 (info, link_order->u.reloc.p->u.name, (bfd *) NULL,
 		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
+	    return FALSE;
 	  indx = 0;
 	}
     }
@@ -7146,13 +7141,13 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order)
       bfd_size_type size;
       bfd_reloc_status_type rstat;
       bfd_byte *buf;
-      boolean ok;
+      bfd_boolean ok;
       const char *sym_name;
 
       size = bfd_get_reloc_size (howto);
       buf = (bfd_byte *) bfd_zmalloc (size);
       if (buf == (bfd_byte *) NULL)
-	return false;
+	return FALSE;
       rstat = _bfd_relocate_contents (howto, output_bfd, (bfd_vma) addend, buf);
       switch (rstat)
 	{
@@ -7174,7 +7169,7 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order)
 		  (bfd *) NULL, (asection *) NULL, (bfd_vma) 0)))
 	    {
 	      free (buf);
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 	}
@@ -7182,7 +7177,7 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order)
 				     (file_ptr) link_order->offset, size);
       free (buf);
       if (! ok)
-	return false;
+	return FALSE;
     }
 
   /* The address of a reloc is relative to the section in a
@@ -7218,12 +7213,12 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order)
 
   ++elf_section_data (output_section)->rel_count;
 
-  return true;
+  return TRUE;
 }
 
 /* Allocate a pointer to live in a linker created section.  */
 
-boolean
+bfd_boolean
 elf_create_pointer_linker_section (abfd, info, lsect, h, rel)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -7245,14 +7240,14 @@ elf_create_pointer_linker_section (abfd, info, lsect, h, rel)
       if (_bfd_elf_find_pointer_linker_section (h->linker_section_pointer,
 						rel->r_addend,
 						lsect->which))
-	return true;
+	return TRUE;
 
       ptr_linker_section_ptr = &h->linker_section_pointer;
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
 	{
 	  if (! elf_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       if (lsect->rel_section)
@@ -7274,7 +7269,7 @@ elf_create_pointer_linker_section (abfd, info, lsect, h, rel)
 	  ptr = (elf_linker_section_pointers_t **) bfd_alloc (abfd, amt);
 
 	  if (!ptr)
-	    return false;
+	    return FALSE;
 
 	  elf_local_ptr_offsets (abfd) = ptr;
 	  for (i = 0; i < num_symbols; i++)
@@ -7285,7 +7280,7 @@ elf_create_pointer_linker_section (abfd, info, lsect, h, rel)
       if (_bfd_elf_find_pointer_linker_section (ptr[r_symndx],
 						rel->r_addend,
 						lsect->which))
-	return true;
+	return TRUE;
 
       ptr_linker_section_ptr = &ptr[r_symndx];
 
@@ -7306,12 +7301,12 @@ elf_create_pointer_linker_section (abfd, info, lsect, h, rel)
   linker_section_ptr = (elf_linker_section_pointers_t *) bfd_alloc (abfd, amt);
 
   if (!linker_section_ptr)
-    return false;
+    return FALSE;
 
   linker_section_ptr->next = *ptr_linker_section_ptr;
   linker_section_ptr->addend = rel->r_addend;
   linker_section_ptr->which = lsect->which;
-  linker_section_ptr->written_address_p = false;
+  linker_section_ptr->written_address_p = FALSE;
   *ptr_linker_section_ptr = linker_section_ptr;
 
 #if 0
@@ -7346,7 +7341,7 @@ elf_create_pointer_linker_section (abfd, info, lsect, h, rel)
 	   (long) lsect->section->_raw_size);
 #endif
 
-  return true;
+  return TRUE;
 }
 
 #if ARCH_SIZE==64
@@ -7399,7 +7394,7 @@ elf_finish_pointer_linker_section (output_bfd, input_bfd, info, lsect, h,
 	     is done in the finish_dynamic_symbol routine.  */
 	  if (!linker_section_ptr->written_address_p)
 	    {
-	      linker_section_ptr->written_address_p = true;
+	      linker_section_ptr->written_address_p = TRUE;
 	      bfd_put_ptr (output_bfd,
 			   relocation + linker_section_ptr->addend,
 			   (lsect->section->contents
@@ -7423,7 +7418,7 @@ elf_finish_pointer_linker_section (output_bfd, input_bfd, info, lsect, h,
       /* Write out pointer if it hasn't been rewritten out before.  */
       if (!linker_section_ptr->written_address_p)
 	{
-	  linker_section_ptr->written_address_p = true;
+	  linker_section_ptr->written_address_p = TRUE;
 	  bfd_put_ptr (output_bfd, relocation + linker_section_ptr->addend,
 		       lsect->section->contents + linker_section_ptr->offset);
 
@@ -7481,43 +7476,44 @@ elf_finish_pointer_linker_section (output_bfd, input_bfd, info, lsect, h,
 
 /* Garbage collect unused sections.  */
 
-static boolean elf_gc_mark
+static bfd_boolean elf_gc_mark
   PARAMS ((struct bfd_link_info *, asection *,
 	   asection * (*) (asection *, struct bfd_link_info *,
 			   Elf_Internal_Rela *, struct elf_link_hash_entry *,
 			   Elf_Internal_Sym *)));
 
-static boolean elf_gc_sweep
+static bfd_boolean elf_gc_sweep
   PARAMS ((struct bfd_link_info *,
-	   boolean (*) (bfd *, struct bfd_link_info *, asection *,
-			const Elf_Internal_Rela *)));
+	   bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *,
+			    const Elf_Internal_Rela *)));
 
-static boolean elf_gc_sweep_symbol
+static bfd_boolean elf_gc_sweep_symbol
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean elf_gc_allocate_got_offsets
+static bfd_boolean elf_gc_allocate_got_offsets
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean elf_gc_propagate_vtable_entries_used
+static bfd_boolean elf_gc_propagate_vtable_entries_used
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static boolean elf_gc_smash_unused_vtentry_relocs
+static bfd_boolean elf_gc_smash_unused_vtentry_relocs
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
 /* The mark phase of garbage collection.  For a given section, mark
    it and any sections in this section's group, and all the sections
    which define symbols to which it refers.  */
 
-static boolean
+typedef asection * (*gc_mark_hook_fn)
+  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
+
+static bfd_boolean
 elf_gc_mark (info, sec, gc_mark_hook)
      struct bfd_link_info *info;
      asection *sec;
-     asection * (*gc_mark_hook) PARAMS ((asection *, struct bfd_link_info *,
-					 Elf_Internal_Rela *,
-					 struct elf_link_hash_entry *,
-					 Elf_Internal_Sym *));
+     gc_mark_hook_fn gc_mark_hook;
 {
-  boolean ret;
+  bfd_boolean ret;
   asection *group_sec;
 
   sec->gc_mark = 1;
@@ -7526,10 +7522,10 @@ elf_gc_mark (info, sec, gc_mark_hook)
   group_sec = elf_section_data (sec)->next_in_group;
   if (group_sec && !group_sec->gc_mark)
     if (!elf_gc_mark (info, group_sec, gc_mark_hook))
-      return false;
+      return FALSE;
 
   /* Look through the section relocs.  */
-  ret = true;
+  ret = TRUE;
   if ((sec->flags & SEC_RELOC) != 0 && sec->reloc_count > 0)
     {
       Elf_Internal_Rela *relstart, *rel, *relend;
@@ -7559,7 +7555,7 @@ elf_gc_mark (info, sec, gc_mark_hook)
 	  isym = bfd_elf_get_elf_syms (input_bfd, symtab_hdr, nlocsyms, 0,
 				       NULL, NULL, NULL);
 	  if (isym == NULL)
-	    return false;
+	    return FALSE;
 	}
 
       /* Read the relocations.  */
@@ -7568,7 +7564,7 @@ elf_gc_mark (info, sec, gc_mark_hook)
 		   info->keep_memory));
       if (relstart == NULL)
 	{
-	  ret = false;
+	  ret = FALSE;
 	  goto out1;
 	}
       relend = relstart + sec->reloc_count * bed->s->int_rels_per_ext_rel;
@@ -7600,7 +7596,7 @@ elf_gc_mark (info, sec, gc_mark_hook)
 		rsec->gc_mark = 1;
 	      else if (!elf_gc_mark (info, rsec, gc_mark_hook))
 		{
-		  ret = false;
+		  ret = FALSE;
 		  goto out2;
 		}
 	    }
@@ -7624,11 +7620,14 @@ elf_gc_mark (info, sec, gc_mark_hook)
 
 /* The sweep phase of garbage collection.  Remove all garbage sections.  */
 
-static boolean
+typedef bfd_boolean (*gc_sweep_hook_fn)
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+
+static bfd_boolean
 elf_gc_sweep (info, gc_sweep_hook)
      struct bfd_link_info *info;
-     boolean (*gc_sweep_hook) PARAMS ((bfd *, struct bfd_link_info *,
-				       asection *, const Elf_Internal_Rela *));
+     gc_sweep_hook_fn gc_sweep_hook;
 {
   bfd *sub;
 
@@ -7663,12 +7662,12 @@ elf_gc_sweep (info, gc_sweep_hook)
 	      && (o->flags & SEC_RELOC) && o->reloc_count > 0)
 	    {
 	      Elf_Internal_Rela *internal_relocs;
-	      boolean r;
+	      bfd_boolean r;
 
 	      internal_relocs = (NAME(_bfd_elf,link_read_relocs)
 				 (o->owner, o, NULL, NULL, info->keep_memory));
 	      if (internal_relocs == NULL)
-		return false;
+		return FALSE;
 
 	      r = (*gc_sweep_hook) (o->owner, info, o, internal_relocs);
 
@@ -7676,7 +7675,7 @@ elf_gc_sweep (info, gc_sweep_hook)
 		free (internal_relocs);
 
 	      if (!r)
-		return false;
+		return FALSE;
 	    }
 	}
     }
@@ -7694,12 +7693,12 @@ elf_gc_sweep (info, gc_sweep_hook)
     elf_hash_table (info)->dynsymcount = i;
   }
 
-  return true;
+  return TRUE;
 }
 
 /* Sweep symbols in swept sections.  Called via elf_link_hash_traverse.  */
 
-static boolean
+static bfd_boolean
 elf_gc_sweep_symbol (h, idxptr)
      struct elf_link_hash_entry *h;
      PTR idxptr;
@@ -7715,13 +7714,13 @@ elf_gc_sweep_symbol (h, idxptr)
 	  || h->root.u.def.section->gc_mark))
     h->dynindx = (*idx)++;
 
-  return true;
+  return TRUE;
 }
 
 /* Propogate collected vtable information.  This is called through
    elf_link_hash_traverse.  */
 
-static boolean
+static bfd_boolean
 elf_gc_propagate_vtable_entries_used (h, okp)
      struct elf_link_hash_entry *h;
      PTR okp;
@@ -7731,15 +7730,15 @@ elf_gc_propagate_vtable_entries_used (h, okp)
 
   /* Those that are not vtables.  */
   if (h->vtable_parent == NULL)
-    return true;
+    return TRUE;
 
   /* Those vtables that do not have parents, we cannot merge.  */
   if (h->vtable_parent == (struct elf_link_hash_entry *) -1)
-    return true;
+    return TRUE;
 
   /* If we've already been done, exit.  */
   if (h->vtable_entries_used && h->vtable_entries_used[-1])
-    return true;
+    return TRUE;
 
   /* Make sure the parent's table is up to date.  */
   elf_gc_propagate_vtable_entries_used (h->vtable_parent, okp);
@@ -7754,11 +7753,11 @@ elf_gc_propagate_vtable_entries_used (h, okp)
   else
     {
       size_t n;
-      boolean *cu, *pu;
+      bfd_boolean *cu, *pu;
 
       /* Or the parent's entries into ours.  */
       cu = h->vtable_entries_used;
-      cu[-1] = true;
+      cu[-1] = TRUE;
       pu = h->vtable_parent->vtable_entries_used;
       if (pu != NULL)
 	{
@@ -7770,17 +7769,17 @@ elf_gc_propagate_vtable_entries_used (h, okp)
 	  while (n--)
 	    {
 	      if (*pu)
-		*cu = true;
+		*cu = TRUE;
 	      pu++;
 	      cu++;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf_gc_smash_unused_vtentry_relocs (h, okp)
      struct elf_link_hash_entry *h;
      PTR okp;
@@ -7797,7 +7796,7 @@ elf_gc_smash_unused_vtentry_relocs (h, okp)
   /* Take care of both those symbols that do not describe vtables as
      well as those that are not loaded.  */
   if (h->vtable_parent == NULL)
-    return true;
+    return TRUE;
 
   BFD_ASSERT (h->root.type == bfd_link_hash_defined
 	      || h->root.type == bfd_link_hash_defweak);
@@ -7807,9 +7806,9 @@ elf_gc_smash_unused_vtentry_relocs (h, okp)
   hend = hstart + h->size;
 
   relstart = (NAME(_bfd_elf,link_read_relocs)
-	      (sec->owner, sec, NULL, (Elf_Internal_Rela *) NULL, true));
+	      (sec->owner, sec, NULL, (Elf_Internal_Rela *) NULL, TRUE));
   if (!relstart)
-    return *(boolean *) okp = false;
+    return *(bfd_boolean *) okp = FALSE;
   bed = get_elf_backend_data (sec->owner);
   file_align = bed->s->file_align;
 
@@ -7830,17 +7829,17 @@ elf_gc_smash_unused_vtentry_relocs (h, okp)
 	rel->r_offset = rel->r_info = rel->r_addend = 0;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* Do mark and sweep of unused sections.  */
 
-boolean
+bfd_boolean
 elf_gc_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
-  boolean ok = true;
+  bfd_boolean ok = TRUE;
   bfd *sub;
   asection * (*gc_mark_hook)
     PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
@@ -7849,21 +7848,21 @@ elf_gc_sections (abfd, info)
   if (!get_elf_backend_data (abfd)->can_gc_sections
       || info->relocateable || info->emitrelocations
       || elf_hash_table (info)->dynamic_sections_created)
-    return true;
+    return TRUE;
 
   /* Apply transitive closure to the vtable entry usage info.  */
   elf_link_hash_traverse (elf_hash_table (info),
 			  elf_gc_propagate_vtable_entries_used,
 			  (PTR) &ok);
   if (!ok)
-    return false;
+    return FALSE;
 
   /* Kill the vtable relocations that were not used.  */
   elf_link_hash_traverse (elf_hash_table (info),
 			  elf_gc_smash_unused_vtentry_relocs,
 			  (PTR) &ok);
   if (!ok)
-    return false;
+    return FALSE;
 
   /* Grovel through relocs to find out who stays ...  */
 
@@ -7879,20 +7878,20 @@ elf_gc_sections (abfd, info)
 	{
 	  if (o->flags & SEC_KEEP)
 	    if (!elf_gc_mark (info, o, gc_mark_hook))
-	      return false;
+	      return FALSE;
 	}
     }
 
   /* ... and mark SEC_EXCLUDE for those that go.  */
   if (!elf_gc_sweep (info, get_elf_backend_data (abfd)->gc_sweep_hook))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Called from check_relocs to record the existance of a VTINHERIT reloc.  */
 
-boolean
+bfd_boolean
 elf_gc_record_vtinherit (abfd, sec, h, offset)
      bfd *abfd;
      asection *sec;
@@ -7929,7 +7928,7 @@ elf_gc_record_vtinherit (abfd, sec, h, offset)
 			 bfd_archive_filename (abfd), sec->name,
 			 (unsigned long) offset);
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 
  win:
   if (!h)
@@ -7944,12 +7943,12 @@ elf_gc_record_vtinherit (abfd, sec, h, offset)
   else
     child->vtable_parent = h;
 
-  return true;
+  return TRUE;
 }
 
 /* Called from check_relocs to record the existance of a VTENTRY reloc.  */
 
-boolean
+bfd_boolean
 elf_gc_record_vtentry (abfd, sec, h, addend)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
@@ -7962,7 +7961,7 @@ elf_gc_record_vtentry (abfd, sec, h, addend)
   if (addend >= h->vtable_entries_size)
     {
       size_t size, bytes;
-      boolean *ptr = h->vtable_entries_used;
+      bfd_boolean *ptr = h->vtable_entries_used;
 
       /* While the symbol is undefined, we have to be prepared to handle
 	 a zero size.  */
@@ -7981,7 +7980,7 @@ elf_gc_record_vtentry (abfd, sec, h, addend)
 
       /* Allocate one extra entry for use as a "done" flag for the
 	 consolidation pass.  */
-      bytes = (size / file_align + 1) * sizeof (boolean);
+      bytes = (size / file_align + 1) * sizeof (bfd_boolean);
 
       if (ptr)
 	{
@@ -7992,7 +7991,7 @@ elf_gc_record_vtentry (abfd, sec, h, addend)
 	      size_t oldbytes;
 
 	      oldbytes = ((h->vtable_entries_size / file_align + 1)
-			  * sizeof (boolean));
+			  * sizeof (bfd_boolean));
 	      memset (((char *) ptr) + oldbytes, 0, bytes - oldbytes);
 	    }
 	}
@@ -8000,22 +7999,22 @@ elf_gc_record_vtentry (abfd, sec, h, addend)
 	ptr = bfd_zmalloc ((bfd_size_type) bytes);
 
       if (ptr == NULL)
-	return false;
+	return FALSE;
 
       /* And arrange for that done flag to be at index -1.  */
       h->vtable_entries_used = ptr + 1;
       h->vtable_entries_size = size;
     }
 
-  h->vtable_entries_used[addend / file_align] = true;
+  h->vtable_entries_used[addend / file_align] = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* And an accompanying bit to work out final got entry offsets once
    we're done.  Should be called from final_link.  */
 
-boolean
+bfd_boolean
 elf_gc_common_finalize_got_offsets (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -8068,13 +8067,13 @@ elf_gc_common_finalize_got_offsets (abfd, info)
   elf_link_hash_traverse (elf_hash_table (info),
 			  elf_gc_allocate_got_offsets,
 			  (PTR) &gotoff);
-  return true;
+  return TRUE;
 }
 
 /* We need a special top-level link routine to convert got reference counts
    to real got offsets.  */
 
-static boolean
+static bfd_boolean
 elf_gc_allocate_got_offsets (h, offarg)
      struct elf_link_hash_entry *h;
      PTR offarg;
@@ -8092,19 +8091,19 @@ elf_gc_allocate_got_offsets (h, offarg)
   else
     h->got.offset = (bfd_vma) -1;
 
-  return true;
+  return TRUE;
 }
 
 /* Many folk need no more in the way of final link than this, once
    got entry reference counting is enabled.  */
 
-boolean
+bfd_boolean
 elf_gc_common_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   if (!elf_gc_common_finalize_got_offsets (abfd, info))
-    return false;
+    return FALSE;
 
   /* Invoke the regular ELF backend linker to do all the work.  */
   return elf_bfd_final_link (abfd, info);
@@ -8113,7 +8112,7 @@ elf_gc_common_final_link (abfd, info)
 /* This function will be called though elf_link_hash_traverse to store
    all hash value of the exported symbols in an array.  */
 
-static boolean
+static bfd_boolean
 elf_collect_hash_codes (h, data)
      struct elf_link_hash_entry *h;
      PTR data;
@@ -8129,7 +8128,7 @@ elf_collect_hash_codes (h, data)
 
   /* Ignore indirect symbols.  These are added by the versioning code.  */
   if (h->dynindx == -1)
-    return true;
+    return TRUE;
 
   name = h->root.root.string;
   p = strchr (name, ELF_VER_CHR);
@@ -8154,10 +8153,10 @@ elf_collect_hash_codes (h, data)
   if (alc != NULL)
     free (alc);
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 elf_reloc_symbol_deleted_p (offset, cookie)
      bfd_vma offset;
      PTR cookie;
@@ -8173,13 +8172,13 @@ elf_reloc_symbol_deleted_p (offset, cookie)
 
       if (! rcookie->bad_symtab)
 	if (rcookie->rel->r_offset > offset)
-	  return false;
+	  return FALSE;
       if (rcookie->rel->r_offset != offset)
 	continue;
 
       r_symndx = ELF_R_SYM (rcookie->rel->r_info);
       if (r_symndx == SHN_UNDEF)
-	return true;
+	return TRUE;
 
       if (r_symndx >= rcookie->locsymcount
 	  || ELF_ST_BIND (rcookie->locsyms[r_symndx].st_info) != STB_LOCAL)
@@ -8195,9 +8194,9 @@ elf_reloc_symbol_deleted_p (offset, cookie)
 	  if ((h->root.type == bfd_link_hash_defined
 	       || h->root.type == bfd_link_hash_defweak)
 	      && elf_discarded_section (h->root.u.def.section))
-	    return true;
+	    return TRUE;
 	  else
-	    return false;
+	    return FALSE;
 	}
       else
 	{
@@ -8213,20 +8212,20 @@ elf_reloc_symbol_deleted_p (offset, cookie)
 	    {
 	      isec = section_from_elf_index (rcookie->abfd, isym->st_shndx);
 	      if (isec != NULL && elf_discarded_section (isec))
-		return true;
+		return TRUE;
 	    }
 	}
-      return false;
+      return FALSE;
     }
-  return false;
+  return FALSE;
 }
 
 /* Discard unneeded references to discarded sections.
-   Returns true if any section's size was changed.  */
+   Returns TRUE if any section's size was changed.  */
 /* This function assumes that the relocations are in sorted order,
-   which is true for all known assemblers.  */
+   which is TRUE for all known assemblers.  */
 
-boolean
+bfd_boolean
 elf_bfd_discard_info (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -8237,12 +8236,12 @@ elf_bfd_discard_info (output_bfd, info)
   struct elf_backend_data *bed;
   bfd *abfd;
   unsigned int count;
-  boolean ret = false;
+  bfd_boolean ret = FALSE;
 
   if (info->traditional_format
       || info->hash->creator->flavour != bfd_target_elf_flavour
       || ! is_elf_hash_table (info))
-    return false;
+    return FALSE;
 
   for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link_next)
     {
@@ -8294,7 +8293,7 @@ elf_bfd_discard_info (output_bfd, info)
 						 cookie.locsymcount, 0,
 						 NULL, NULL, NULL);
 	  if (cookie.locsyms == NULL)
-	    return false;
+	    return FALSE;
 	}
 
       if (stab != NULL)
@@ -8314,7 +8313,7 @@ elf_bfd_discard_info (output_bfd, info)
 					      elf_section_data (stab)->sec_info,
 					      elf_reloc_symbol_deleted_p,
 					      &cookie))
-		ret = true;
+		ret = TRUE;
 	      if (elf_section_data (stab)->relocs != cookie.rels)
 		free (cookie.rels);
 	    }
@@ -8336,7 +8335,7 @@ elf_bfd_discard_info (output_bfd, info)
 	  if (_bfd_elf_discard_section_eh_frame (abfd, info, eh,
 						 elf_reloc_symbol_deleted_p,
 						 &cookie))
-	    ret = true;
+	    ret = TRUE;
 
 	  if (cookie.rels != NULL
 	      && elf_section_data (eh)->relocs != cookie.rels)
@@ -8345,7 +8344,7 @@ elf_bfd_discard_info (output_bfd, info)
 
       if (bed->elf_backend_discard_info != NULL
 	  && (*bed->elf_backend_discard_info) (abfd, &cookie, info))
-	ret = true;
+	ret = TRUE;
 
       if (cookie.locsyms != NULL
 	  && symtab_hdr->contents != (unsigned char *) cookie.locsyms)
@@ -8359,12 +8358,12 @@ elf_bfd_discard_info (output_bfd, info)
 
   if (info->eh_frame_hdr
       && _bfd_elf_discard_section_eh_frame_hdr (output_bfd, info))
-    ret = true;
+    ret = TRUE;
 
   return ret;
 }
 
-static boolean
+static bfd_boolean
 elf_section_ignore_discarded_relocs (sec)
      asection *sec;
 {
@@ -8374,7 +8373,7 @@ elf_section_ignore_discarded_relocs (sec)
     {
     case ELF_INFO_TYPE_STABS:
     case ELF_INFO_TYPE_EH_FRAME:
-      return true;
+      return TRUE;
     default:
       break;
     }
@@ -8382,7 +8381,7 @@ elf_section_ignore_discarded_relocs (sec)
   bed = get_elf_backend_data (sec->owner);
   if (bed->elf_backend_ignore_discarded_relocs != NULL
       && (*bed->elf_backend_ignore_discarded_relocs) (sec))
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index 15f0fdf6fcc..144a9da13bf 100644
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -55,9 +55,10 @@ static bfd_reloc_status_type mips_elf_lo16_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type mips_elf_got16_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean mips_elf_assign_gp PARAMS ((bfd *, bfd_vma *));
+static bfd_boolean mips_elf_assign_gp
+  PARAMS ((bfd *, bfd_vma *));
 static bfd_reloc_status_type mips_elf_final_gp
-  PARAMS ((bfd *, asymbol *, boolean, char **, bfd_vma *));
+  PARAMS ((bfd *, asymbol *, bfd_boolean, char **, bfd_vma *));
 static bfd_reloc_status_type mips_elf_gprel16_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type mips_elf_literal_reloc
@@ -65,7 +66,8 @@ static bfd_reloc_status_type mips_elf_literal_reloc
 static bfd_reloc_status_type mips_elf_gprel32_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type gprel32_with_gp
-  PARAMS ((bfd *, asymbol *, arelent *, asection *, boolean, PTR, bfd_vma));
+  PARAMS ((bfd *, asymbol *, arelent *, asection *, bfd_boolean, PTR,
+	   bfd_vma));
 static bfd_reloc_status_type mips_elf_shift6_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type mips16_jump_reloc
@@ -75,16 +77,18 @@ static bfd_reloc_status_type mips16_gprel_reloc
 static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static reloc_howto_type *mips_elf_n32_rtype_to_howto
-  PARAMS ((unsigned int, boolean));
+  PARAMS ((unsigned int, bfd_boolean));
 static void mips_info_to_howto_rel
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void mips_info_to_howto_rela
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean mips_elf_sym_is_global PARAMS ((bfd *, asymbol *));
-static boolean mips_elf_n32_object_p PARAMS ((bfd *));
-static boolean elf32_mips_grok_prstatus
+static bfd_boolean mips_elf_sym_is_global
+  PARAMS ((bfd *, asymbol *));
+static bfd_boolean mips_elf_n32_object_p
+  PARAMS ((bfd *));
+static bfd_boolean elf32_mips_grok_prstatus
   PARAMS ((bfd *, Elf_Internal_Note *));
-static boolean elf32_mips_grok_psinfo
+static bfd_boolean elf32_mips_grok_psinfo
   PARAMS ((bfd *, Elf_Internal_Note *));
 static irix_compat_t elf_n32_mips_irix_compat
   PARAMS ((bfd *));
@@ -119,67 +123,67 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit relocation.  */
   HOWTO (R_MIPS_16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit relocation.  */
   HOWTO (R_MIPS_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit symbol relative relocation.  */
   HOWTO (R_MIPS_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_REL32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 26 bit jump address.  */
   HOWTO (R_MIPS_26,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 			/* This needs complex overflow
@@ -187,10 +191,10 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 				   bits must match the PC + 4.  */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x03ffffff,		/* src_mask */
 	 0x03ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* R_MIPS_HI16 and R_MIPS_LO16 are unsupported for NewABI REL.
      However, the native IRIX6 tools use them, so we try our best. */
@@ -200,120 +204,120 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_hi16_reloc,	/* special_function */
 	 "R_MIPS_HI16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of symbol value.  */
   HOWTO (R_MIPS_LO16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_lo16_reloc,	/* special_function */
 	 "R_MIPS_LO16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GP relative reference.  */
   HOWTO (R_MIPS_GPREL16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_gprel16_reloc, /* special_function */
 	 "R_MIPS_GPREL16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to literal section.  */
   HOWTO (R_MIPS_LITERAL,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_literal_reloc, /* special_function */
 	 "R_MIPS_LITERAL",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to global offset table.  */
   HOWTO (R_MIPS_GOT16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_got16_reloc,	/* special_function */
 	 "R_MIPS_GOT16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit PC relative reference.  */
   HOWTO (R_MIPS_PC16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_PC16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 16 bit call through global offset table.  */
   HOWTO (R_MIPS_CALL16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_CALL16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit GP relative reference.  */
   HOWTO (R_MIPS_GPREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_gprel32_reloc, /* special_function */
 	 "R_MIPS_GPREL32",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The remaining relocs are defined on Irix 5, although they are
      not defined by the ABI.  */
@@ -326,135 +330,135 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 5,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_SHIFT5",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000007c0,		/* src_mask */
 	 0x000007c0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 6 bit shift field.  */
   HOWTO (R_MIPS_SHIFT6,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_elf_shift6_reloc,	/* special_function */
 	 "R_MIPS_SHIFT6",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x000007c4,		/* src_mask */
 	 0x000007c4,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit relocation.  */
   HOWTO (R_MIPS_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement in the global offset table.  */
   HOWTO (R_MIPS_GOT_DISP,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_DISP",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement to page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_PAGE,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_PAGE",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Offset from page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_OFST,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_OFST",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_HI16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_HI16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_LO16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit subtraction.  */
   HOWTO (R_MIPS_SUB,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_SUB",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Insert the addend as an instruction.  */
   /* FIXME: Not handled correctly.  */
@@ -462,15 +466,15 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_INSERT_A",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Insert the addend as an instruction, and change all relocations
      to refer to the old instruction at the address.  */
@@ -479,15 +483,15 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_INSERT_B",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Delete a 32 bit instruction.  */
   /* FIXME: Not handled correctly.  */
@@ -495,15 +499,15 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_DELETE",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The MIPS ELF64 ABI Draft wants us to support these for REL relocations.
      We don't, because
@@ -519,59 +523,59 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_CALL_HI16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_CALL_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_CALL_LO16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Section displacement.  */
   HOWTO (R_MIPS_SCN_DISP,       /* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_SCN_DISP",     /* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   HOWTO (R_MIPS_REL16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_REL16",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* These two are obsolete.  */
   EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
@@ -583,15 +587,15 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_RELGOT",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Protected jump conversion.  This is an optimization hint.  No
      relocation is required for correctness.  */
@@ -599,15 +603,15 @@ static reloc_howto_type elf_mips_howto_table_rel[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_JALR",	        /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0x00000000,		/* src_mask */
 	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 /* The relocation table used for SHT_RELA sections.  */
@@ -619,67 +623,67 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_NONE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit relocation.  */
   HOWTO (R_MIPS_16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit relocation.  */
   HOWTO (R_MIPS_32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_32",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit symbol relative relocation.  */
   HOWTO (R_MIPS_REL32,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_REL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 26 bit jump address.  */
   HOWTO (R_MIPS_26,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 				/* This needs complex overflow
@@ -687,130 +691,130 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 				   bits must match the PC + 4.  */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_26",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x03ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of symbol value.  */
   HOWTO (R_MIPS_HI16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_HI16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of symbol value.  */
   HOWTO (R_MIPS_LO16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_LO16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* GP relative reference.  */
   HOWTO (R_MIPS_GPREL16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_gprel16_reloc, /* special_function */
 	 "R_MIPS_GPREL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to literal section.  */
   HOWTO (R_MIPS_LITERAL,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_literal_reloc, /* special_function */
 	 "R_MIPS_LITERAL",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Reference to global offset table.  */
   HOWTO (R_MIPS_GOT16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_got16_reloc,	/* special_function */
 	 "R_MIPS_GOT16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit PC relative reference.  */
   HOWTO (R_MIPS_PC16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_PC16",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* 16 bit call through global offset table.  */
   HOWTO (R_MIPS_CALL16,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_CALL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit GP relative reference.  */
   HOWTO (R_MIPS_GPREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_gprel32_reloc, /* special_function */
 	 "R_MIPS_GPREL32",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (13),
   EMPTY_HOWTO (14),
@@ -821,135 +825,135 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 5,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_SHIFT5",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x000007c0,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 6 bit shift field.  */
   HOWTO (R_MIPS_SHIFT6,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 6,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 6,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 mips_elf_shift6_reloc,	/* special_function */
 	 "R_MIPS_SHIFT6",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x000007c4,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit relocation.  */
   HOWTO (R_MIPS_64,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_64",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement in the global offset table.  */
   HOWTO (R_MIPS_GOT_DISP,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_DISP",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Displacement to page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_PAGE,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_PAGE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Offset from page pointer in the global offset table.  */
   HOWTO (R_MIPS_GOT_OFST,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_OFST",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_HI16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_GOT_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_GOT_LO16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 64 bit substraction.  */
   HOWTO (R_MIPS_SUB,		/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_SUB",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Insert the addend as an instruction.  */
   /* FIXME: Not handled correctly.  */
@@ -957,15 +961,15 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_INSERT_A",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Insert the addend as an instruction, and change all relocations
      to refer to the old instruction at the address.  */
@@ -974,15 +978,15 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_INSERT_B",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Delete a 32 bit instruction.  */
   /* FIXME: Not handled correctly.  */
@@ -990,105 +994,105 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_DELETE",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Get the higher value of a 64 bit addend.  */
   HOWTO (R_MIPS_HIGHER,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_HIGHER",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Get the highest value of a 64 bit addend.  */
   HOWTO (R_MIPS_HIGHEST,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_HIGHEST",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* High 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_CALL_HI16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_CALL_HI16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Low 16 bits of displacement in global offset table.  */
   HOWTO (R_MIPS_CALL_LO16,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_CALL_LO16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Section displacement, used by an associated event location section.  */
   HOWTO (R_MIPS_SCN_DISP,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_SCN_DISP",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit relocation.  */
   HOWTO (R_MIPS_REL16,		/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_REL16",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* These two are obsolete.  */
   EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
@@ -1100,15 +1104,15 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_RELGOT",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Protected jump conversion.  This is an optimization hint.  No
      relocation is required for correctness.  */
@@ -1116,15 +1120,15 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_JALR",	        /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 };
 
 /* The reloc used for the mips16 jump instruction.  */
@@ -1133,7 +1137,7 @@ static reloc_howto_type elf_mips16_jump_howto =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 			/* This needs complex overflow
@@ -1141,10 +1145,10 @@ static reloc_howto_type elf_mips16_jump_howto =
 				   bits must match the PC.  */
 	 mips16_jump_reloc,	/* special_function */
 	 "R_MIPS16_26",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* The reloc used for the mips16 gprel instruction.  */
 static reloc_howto_type elf_mips16_gprel_howto =
@@ -1152,15 +1156,15 @@ static reloc_howto_type elf_mips16_gprel_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 mips16_gprel_reloc,	/* special_function */
 	 "R_MIPS16_GPREL",	/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x07ff001f,		/* src_mask */
 	 0x07ff001f,	        /* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* GNU extension to record C++ vtable hierarchy */
 static reloc_howto_type elf_mips_gnu_vtinherit_howto =
@@ -1168,15 +1172,15 @@ static reloc_howto_type elf_mips_gnu_vtinherit_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 NULL,			/* special_function */
 	 "R_MIPS_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* GNU extension to record C++ vtable member usage */
 static reloc_howto_type elf_mips_gnu_vtentry_howto =
@@ -1184,15 +1188,15 @@ static reloc_howto_type elf_mips_gnu_vtentry_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
 	 "R_MIPS_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* This is derived from bfd_elf_generic_reloc.  NewABI allows us to have
    several relocations against the same address.  The addend is derived
@@ -1425,10 +1429,10 @@ mips_elf_got16_reloc (abfd, reloc_entry, symbol, data, input_section,
 				 input_section, output_bfd, error_message);
 }
 
-/* Set the GP value for OUTPUT_BFD.  Returns false if this is a
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
    dangerous relocation.  */
 
-static boolean
+static bfd_boolean
 mips_elf_assign_gp (output_bfd, pgp)
      bfd *output_bfd;
      bfd_vma *pgp;
@@ -1440,7 +1444,7 @@ mips_elf_assign_gp (output_bfd, pgp)
   /* If we've already figured out what GP will be, just return it.  */
   *pgp = _bfd_get_gp_value (output_bfd);
   if (*pgp)
-    return true;
+    return TRUE;
 
   count = bfd_get_symcount (output_bfd);
   sym = bfd_get_outsymbols (output_bfd);
@@ -1470,10 +1474,10 @@ mips_elf_assign_gp (output_bfd, pgp)
       /* Only get the error once.  */
       *pgp = 4;
       _bfd_set_gp_value (output_bfd, *pgp);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We have to figure out the gp value, so that we can adjust the
@@ -1486,7 +1490,7 @@ static bfd_reloc_status_type
 mips_elf_final_gp (output_bfd, symbol, relocateable, error_message, pgp)
      bfd *output_bfd;
      asymbol *symbol;
-     boolean relocateable;
+     bfd_boolean relocateable;
      char **error_message;
      bfd_vma *pgp;
 {
@@ -1533,17 +1537,17 @@ mips_elf_gprel16_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message ATTRIBUTE_UNUSED;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
 
   GET_RELOC_ADDEND (output_bfd, symbol, reloc_entry, input_section)
 
   if (output_bfd != (bfd *) NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1570,7 +1574,7 @@ mips_elf_literal_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
 
@@ -1578,10 +1582,10 @@ mips_elf_literal_reloc (abfd, reloc_entry, symbol, data, input_section,
 
   /* FIXME: The entries in the .lit8 and .lit4 sections should be merged.  */
   if (output_bfd != (bfd *) NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1609,7 +1613,7 @@ mips_elf_gprel32_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
 
@@ -1629,12 +1633,12 @@ mips_elf_gprel32_reloc (abfd, reloc_entry, symbol, data, input_section,
 
   if (output_bfd != (bfd *) NULL)
     {
-      relocateable = true;
+      relocateable = TRUE;
       gp = _bfd_get_gp_value (output_bfd);
     }
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
 
       ret = mips_elf_final_gp (output_bfd, symbol, relocateable,
@@ -1654,7 +1658,7 @@ gprel32_with_gp (abfd, symbol, reloc_entry, input_section, relocateable, data,
      asymbol *symbol;
      arelent *reloc_entry;
      asection *input_section;
-     boolean relocateable;
+     bfd_boolean relocateable;
      PTR data;
      bfd_vma gp;
 {
@@ -1732,7 +1736,7 @@ mips16_jump_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message ATTRIBUTE_UNUSED;
 {
-  static boolean warned = false;
+  static bfd_boolean warned = FALSE;
 
   GET_RELOC_ADDEND (output_bfd, symbol, reloc_entry, input_section)
 
@@ -1741,7 +1745,7 @@ mips16_jump_reloc (abfd, reloc_entry, symbol, data, input_section,
     (*_bfd_error_handler)
       (_("Linking mips16 objects into %s format is not supported"),
        bfd_get_target (input_section->output_section->owner));
-  warned = true;
+  warned = TRUE;
 
   return bfd_reloc_undefined;
 }
@@ -1759,7 +1763,7 @@ mips16_gprel_reloc (abfd, reloc_entry, symbol, data, input_section,
      bfd *output_bfd;
      char **error_message;
 {
-  boolean relocateable;
+  bfd_boolean relocateable;
   bfd_reloc_status_type ret;
   bfd_vma gp;
   unsigned short extend, insn;
@@ -1768,10 +1772,10 @@ mips16_gprel_reloc (abfd, reloc_entry, symbol, data, input_section,
   GET_RELOC_ADDEND (output_bfd, symbol, reloc_entry, input_section)
 
   if (output_bfd != NULL)
-    relocateable = true;
+    relocateable = TRUE;
   else
     {
-      relocateable = false;
+      relocateable = FALSE;
       output_bfd = symbol->section->output_section->owner;
     }
 
@@ -1901,7 +1905,7 @@ bfd_elf32_bfd_reloc_type_lookup (abfd, code)
 static reloc_howto_type *
 mips_elf_n32_rtype_to_howto (r_type, rela_p)
      unsigned int r_type;
-     boolean rela_p;
+     bfd_boolean rela_p;
 {
   switch (r_type)
     {
@@ -1934,7 +1938,7 @@ mips_info_to_howto_rel (abfd, cache_ptr, dst)
   unsigned int r_type;
 
   r_type = ELF32_R_TYPE (dst->r_info);
-  cache_ptr->howto = mips_elf_n32_rtype_to_howto (r_type, false);
+  cache_ptr->howto = mips_elf_n32_rtype_to_howto (r_type, FALSE);
 
   /* The addend for a GPREL16 or LITERAL relocation comes from the GP
      value for the object file.  We get the addend now, rather than
@@ -1957,7 +1961,7 @@ mips_info_to_howto_rela (abfd, cache_ptr, dst)
   unsigned int r_type;
 
   r_type = ELF32_R_TYPE (dst->r_info);
-  cache_ptr->howto = mips_elf_n32_rtype_to_howto (r_type, true);
+  cache_ptr->howto = mips_elf_n32_rtype_to_howto (r_type, TRUE);
   cache_ptr->addend = dst->r_addend;
 }
 
@@ -1967,7 +1971,7 @@ mips_info_to_howto_rela (abfd, cache_ptr, dst)
    symbols.  On most ELF targets the split is between static symbols
    and externally visible symbols.  */
 
-static boolean
+static bfd_boolean
 mips_elf_sym_is_global (abfd, sym)
      bfd *abfd ATTRIBUTE_UNUSED;
      asymbol *sym;
@@ -1982,7 +1986,7 @@ mips_elf_sym_is_global (abfd, sym)
 
 /* Set the right machine number for a MIPS ELF file.  */
 
-static boolean
+static bfd_boolean
 mips_elf_n32_object_p (abfd)
      bfd *abfd;
 {
@@ -1992,19 +1996,19 @@ mips_elf_n32_object_p (abfd)
      sorted correctly such that local symbols precede global symbols,
      and the sh_info field in the symbol table is not always right.  */
   if (SGI_COMPAT (abfd))
-    elf_bad_symtab (abfd) = true;
+    elf_bad_symtab (abfd) = TRUE;
 
   mach = _bfd_elf_mips_mach (elf_elfheader (abfd)->e_flags);
   bfd_default_set_arch_mach (abfd, bfd_arch_mips, mach);
 
   if (! ABI_N32_P(abfd))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Support for core dump NOTE sections.  */
-static boolean
+static bfd_boolean
 elf32_mips_grok_prstatus (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -2015,7 +2019,7 @@ elf32_mips_grok_prstatus (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 256:		/* Linux/MIPS */
 	/* pr_cursig */
@@ -2036,7 +2040,7 @@ elf32_mips_grok_prstatus (abfd, note)
 					  note->descpos + offset);
 }
 
-static boolean
+static bfd_boolean
 elf32_mips_grok_psinfo (abfd, note)
      bfd *abfd;
      Elf_Internal_Note *note;
@@ -2044,7 +2048,7 @@ elf32_mips_grok_psinfo (abfd, note)
   switch (note->descsz)
     {
       default:
-	return false;
+	return FALSE;
 
       case 128:		/* Linux/MIPS elf_prpsinfo */
 	elf_tdata (abfd)->core_program
@@ -2065,7 +2069,7 @@ elf32_mips_grok_psinfo (abfd, note)
       command[n - 1] = '\0';
   }
 
-  return true;
+  return TRUE;
 }
 
 /* Depending on the target vector we generate some version of Irix
@@ -2131,9 +2135,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
    FIXME: How does this affect NewABI?  */
 #define ELF_MAXPAGESIZE			0x1000
 
-#define elf_backend_collect		true
-#define elf_backend_type_change_ok	true
-#define elf_backend_can_gc_sections	true
+#define elf_backend_collect		TRUE
+#define elf_backend_type_change_ok	TRUE
+#define elf_backend_can_gc_sections	TRUE
 #define elf_info_to_howto		mips_info_to_howto_rela
 #define elf_info_to_howto_rel		mips_info_to_howto_rel
 #define elf_backend_sym_is_global	mips_elf_sym_is_global
@@ -2183,7 +2187,7 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
 #define elf_backend_may_use_rel_p	1
 #define elf_backend_may_use_rela_p	1
 #define elf_backend_default_use_rela_p	1
-#define elf_backend_sign_extend_vma	true
+#define elf_backend_sign_extend_vma	TRUE
 
 #define elf_backend_discard_info	_bfd_mips_elf_discard_info
 #define elf_backend_ignore_discarded_relocs \
diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index 9a6f65c4049..93741bdc72e 100644
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -26,30 +26,30 @@
 #include "elf/ia64.h"
 
 /* THE RULES for all the stuff the linker creates --
- 
+
   GOT		Entries created in response to LTOFF or LTOFF_FPTR
  		relocations.  Dynamic relocs created for dynamic
  		symbols in an application; REL relocs for locals
  		in a shared library.
- 
+
   FPTR		The canonical function descriptor.  Created for local
  		symbols in applications.  Descriptors for dynamic symbols
  		and local symbols in shared libraries are created by
  		ld.so.  Thus there are no dynamic relocs against these
  		objects.  The FPTR relocs for such _are_ passed through
  		to the dynamic relocation tables.
- 
+
   FULL_PLT	Created for a PCREL21B relocation against a dynamic symbol.
  		Requires the creation of a PLTOFF entry.  This does not
  		require any dynamic relocations.
- 
+
   PLTOFF	Created by PLTOFF relocations.  For local symbols, this
  		is an alternate function descriptor, and in shared libraries
  		requires two REL relocations.  Note that this cannot be
  		transformed into an FPTR relocation, since it must be in
  		range of the GP.  For dynamic symbols, this is a function
  		descriptor for a MIN_PLT entry, and requires one IPLT reloc.
- 
+
   MIN_PLT	Created by PLTOFF entries against dynamic symbols.  This
  		does not reqire dynamic relocations.  */
 
@@ -92,7 +92,7 @@ struct elfNN_ia64_dyn_sym_info
     int count;
   } *reloc_entries;
 
-  /* True when the section contents have been updated.  */
+  /* TRUE when the section contents have been updated.  */
   unsigned got_done : 1;
   unsigned fptr_done : 1;
   unsigned pltoff_done : 1;
@@ -100,7 +100,7 @@ struct elfNN_ia64_dyn_sym_info
   unsigned dtpmod_done : 1;
   unsigned dtprel_done : 1;
 
-  /* True for the different kinds of linker data we want created.  */
+  /* TRUE for the different kinds of linker data we want created.  */
   unsigned want_got : 1;
   unsigned want_fptr : 1;
   unsigned want_ltoff_fptr : 1;
@@ -117,7 +117,7 @@ struct elfNN_ia64_local_hash_entry
   struct bfd_hash_entry root;
   struct elfNN_ia64_dyn_sym_info *info;
 
-  /* True if this hash entry's addends was translated for
+  /* TRUE if this hash entry's addends was translated for
      SHF_MERGE optimization.  */
   unsigned sec_merge_done : 1;
 };
@@ -164,40 +164,40 @@ static reloc_howto_type *elfNN_ia64_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type bfd_code));
 static void elfNN_ia64_info_to_howto
   PARAMS ((bfd *abfd, arelent *bfd_reloc, Elf_Internal_Rela *elf_reloc));
-static boolean elfNN_ia64_relax_section
+static bfd_boolean elfNN_ia64_relax_section
   PARAMS((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
-	  boolean *again));
-static boolean is_unwind_section_name
+	  bfd_boolean *again));
+static bfd_boolean is_unwind_section_name
   PARAMS ((bfd *abfd, const char *));
-static boolean elfNN_ia64_section_from_shdr
+static bfd_boolean elfNN_ia64_section_from_shdr
   PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
-static boolean elfNN_ia64_section_flags
+static bfd_boolean elfNN_ia64_section_flags
   PARAMS ((flagword *, Elf_Internal_Shdr *));
-static boolean elfNN_ia64_fake_sections
+static bfd_boolean elfNN_ia64_fake_sections
   PARAMS ((bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec));
 static void elfNN_ia64_final_write_processing
-  PARAMS ((bfd *abfd, boolean linker));
-static boolean elfNN_ia64_add_symbol_hook
+  PARAMS ((bfd *abfd, bfd_boolean linker));
+static bfd_boolean elfNN_ia64_add_symbol_hook
   PARAMS ((bfd *abfd, struct bfd_link_info *info, const Elf_Internal_Sym *sym,
 	   const char **namep, flagword *flagsp, asection **secp,
 	   bfd_vma *valp));
-static boolean elfNN_ia64_aix_vec
+static bfd_boolean elfNN_ia64_aix_vec
   PARAMS ((const bfd_target *vec));
-static boolean elfNN_ia64_aix_add_symbol_hook
+static bfd_boolean elfNN_ia64_aix_add_symbol_hook
   PARAMS ((bfd *abfd, struct bfd_link_info *info, const Elf_Internal_Sym *sym,
 	   const char **namep, flagword *flagsp, asection **secp,
 	   bfd_vma *valp));
-static boolean elfNN_ia64_aix_link_add_symbols
+static bfd_boolean elfNN_ia64_aix_link_add_symbols
   PARAMS ((bfd *abfd, struct bfd_link_info *info));
 static int elfNN_ia64_additional_program_headers
   PARAMS ((bfd *abfd));
-static boolean elfNN_ia64_modify_segment_map
+static bfd_boolean elfNN_ia64_modify_segment_map
   PARAMS ((bfd *));
-static boolean elfNN_ia64_is_local_label_name
+static bfd_boolean elfNN_ia64_is_local_label_name
   PARAMS ((bfd *abfd, const char *name));
-static boolean elfNN_ia64_dynamic_symbol_p
+static bfd_boolean elfNN_ia64_dynamic_symbol_p
   PARAMS ((struct elf_link_hash_entry *h, struct bfd_link_info *info));
-static boolean elfNN_ia64_local_hash_table_init
+static bfd_boolean elfNN_ia64_local_hash_table_init
   PARAMS ((struct elfNN_ia64_local_hash_table *ht, bfd *abfd,
 	   new_hash_entry_func new));
 static struct bfd_hash_entry *elfNN_ia64_new_loc_hash_entry
@@ -210,29 +210,29 @@ static void elfNN_ia64_hash_copy_indirect
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
 static void elfNN_ia64_hash_hide_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean));
 static struct bfd_link_hash_table *elfNN_ia64_hash_table_create
   PARAMS ((bfd *abfd));
 static struct elfNN_ia64_local_hash_entry *elfNN_ia64_local_hash_lookup
   PARAMS ((struct elfNN_ia64_local_hash_table *table, const char *string,
-	   boolean create, boolean copy));
-static boolean elfNN_ia64_global_dyn_sym_thunk
+	   bfd_boolean create, bfd_boolean copy));
+static bfd_boolean elfNN_ia64_global_dyn_sym_thunk
   PARAMS ((struct bfd_hash_entry *, PTR));
-static boolean elfNN_ia64_local_dyn_sym_thunk
+static bfd_boolean elfNN_ia64_local_dyn_sym_thunk
   PARAMS ((struct bfd_hash_entry *, PTR));
 static void elfNN_ia64_dyn_sym_traverse
   PARAMS ((struct elfNN_ia64_link_hash_table *ia64_info,
-	   boolean (*func) (struct elfNN_ia64_dyn_sym_info *, PTR),
+	   bfd_boolean (*func) (struct elfNN_ia64_dyn_sym_info *, PTR),
 	   PTR info));
-static boolean elfNN_ia64_create_dynamic_sections
+static bfd_boolean elfNN_ia64_create_dynamic_sections
   PARAMS ((bfd *abfd, struct bfd_link_info *info));
 static struct elfNN_ia64_local_hash_entry * get_local_sym_hash
   PARAMS ((struct elfNN_ia64_link_hash_table *ia64_info,
-	   bfd *abfd, const Elf_Internal_Rela *rel, boolean create));
+	   bfd *abfd, const Elf_Internal_Rela *rel, bfd_boolean create));
 static struct elfNN_ia64_dyn_sym_info * get_dyn_sym_info
   PARAMS ((struct elfNN_ia64_link_hash_table *ia64_info,
 	   struct elf_link_hash_entry *h,
-	   bfd *abfd, const Elf_Internal_Rela *rel, boolean create));
+	   bfd *abfd, const Elf_Internal_Rela *rel, bfd_boolean create));
 static asection *get_got
   PARAMS ((bfd *abfd, struct bfd_link_info *info,
 	   struct elfNN_ia64_link_hash_table *ia64_info));
@@ -244,34 +244,34 @@ static asection *get_pltoff
 	   struct elfNN_ia64_link_hash_table *ia64_info));
 static asection *get_reloc_section
   PARAMS ((bfd *abfd, struct elfNN_ia64_link_hash_table *ia64_info,
-	   asection *sec, boolean create));
-static boolean count_dyn_reloc
+	   asection *sec, bfd_boolean create));
+static bfd_boolean count_dyn_reloc
   PARAMS ((bfd *abfd, struct elfNN_ia64_dyn_sym_info *dyn_i,
 	   asection *srel, int type));
-static boolean elfNN_ia64_check_relocs
+static bfd_boolean elfNN_ia64_check_relocs
   PARAMS ((bfd *abfd, struct bfd_link_info *info, asection *sec,
 	   const Elf_Internal_Rela *relocs));
-static boolean elfNN_ia64_adjust_dynamic_symbol
+static bfd_boolean elfNN_ia64_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *info, struct elf_link_hash_entry *h));
 static long global_sym_index
   PARAMS ((struct elf_link_hash_entry *h));
-static boolean allocate_fptr
+static bfd_boolean allocate_fptr
   PARAMS ((struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data));
-static boolean allocate_global_data_got
+static bfd_boolean allocate_global_data_got
   PARAMS ((struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data));
-static boolean allocate_global_fptr_got
+static bfd_boolean allocate_global_fptr_got
   PARAMS ((struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data));
-static boolean allocate_local_got
+static bfd_boolean allocate_local_got
   PARAMS ((struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data));
-static boolean allocate_pltoff_entries
+static bfd_boolean allocate_pltoff_entries
   PARAMS ((struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data));
-static boolean allocate_plt_entries
+static bfd_boolean allocate_plt_entries
   PARAMS ((struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data));
-static boolean allocate_plt2_entries
+static bfd_boolean allocate_plt2_entries
   PARAMS ((struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data));
-static boolean allocate_dynrel_entries
+static bfd_boolean allocate_dynrel_entries
   PARAMS ((struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data));
-static boolean elfNN_ia64_size_dynamic_sections
+static bfd_boolean elfNN_ia64_size_dynamic_sections
   PARAMS ((bfd *output_bfd, struct bfd_link_info *info));
 static bfd_reloc_status_type elfNN_ia64_install_value
   PARAMS ((bfd *abfd, bfd_byte *hit_addr, bfd_vma val, unsigned int r_type));
@@ -290,38 +290,38 @@ static bfd_vma set_fptr_entry
 static bfd_vma set_pltoff_entry
   PARAMS ((bfd *abfd, struct bfd_link_info *info,
 	   struct elfNN_ia64_dyn_sym_info *dyn_i,
-	   bfd_vma value, boolean));
+	   bfd_vma value, bfd_boolean));
 static bfd_vma elfNN_ia64_tprel_base
   PARAMS ((struct bfd_link_info *info));
 static bfd_vma elfNN_ia64_dtprel_base
   PARAMS ((struct bfd_link_info *info));
 static int elfNN_ia64_unwind_entry_compare
   PARAMS ((const PTR, const PTR));
-static boolean elfNN_ia64_final_link
+static bfd_boolean elfNN_ia64_final_link
   PARAMS ((bfd *abfd, struct bfd_link_info *info));
-static boolean elfNN_ia64_relocate_section
+static bfd_boolean elfNN_ia64_relocate_section
   PARAMS ((bfd *output_bfd, struct bfd_link_info *info, bfd *input_bfd,
 	   asection *input_section, bfd_byte *contents,
 	   Elf_Internal_Rela *relocs, Elf_Internal_Sym *local_syms,
 	   asection **local_sections));
-static boolean elfNN_ia64_finish_dynamic_symbol
+static bfd_boolean elfNN_ia64_finish_dynamic_symbol
   PARAMS ((bfd *output_bfd, struct bfd_link_info *info,
 	   struct elf_link_hash_entry *h, Elf_Internal_Sym *sym));
-static boolean elfNN_ia64_finish_dynamic_sections
+static bfd_boolean elfNN_ia64_finish_dynamic_sections
   PARAMS ((bfd *abfd, struct bfd_link_info *info));
-static boolean elfNN_ia64_set_private_flags
+static bfd_boolean elfNN_ia64_set_private_flags
   PARAMS ((bfd *abfd, flagword flags));
-static boolean elfNN_ia64_merge_private_bfd_data
+static bfd_boolean elfNN_ia64_merge_private_bfd_data
   PARAMS ((bfd *ibfd, bfd *obfd));
-static boolean elfNN_ia64_print_private_bfd_data
+static bfd_boolean elfNN_ia64_print_private_bfd_data
   PARAMS ((bfd *abfd, PTR ptr));
 static enum elf_reloc_type_class elfNN_ia64_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
-static boolean elfNN_ia64_hpux_vec
+static bfd_boolean elfNN_ia64_hpux_vec
   PARAMS ((const bfd_target *vec));
 static void elfNN_hpux_post_process_headers
   PARAMS ((bfd *abfd, struct bfd_link_info *info));
-boolean elfNN_hpux_backend_section_from_bfd_section
+bfd_boolean elfNN_hpux_backend_section_from_bfd_section
   PARAMS ((bfd *abfd, asection *sec, int *retval));
 
 /* ia64-specific relocation.  */
@@ -350,108 +350,108 @@ elfNN_ia64_reloc (abfd, reloc, sym, data, input_section,
 
 #define IA64_HOWTO(TYPE, NAME, SIZE, PCREL, IN)			\
   HOWTO (TYPE, 0, SIZE, 0, PCREL, 0, complain_overflow_signed,	\
-	 elfNN_ia64_reloc, NAME, false, 0, 0, IN)
+	 elfNN_ia64_reloc, NAME, FALSE, 0, 0, IN)
 
 /* This table has to be sorted according to increasing number of the
    TYPE field.  */
 static reloc_howto_type ia64_howto_table[] =
   {
-    IA64_HOWTO (R_IA64_NONE,	    "NONE",	   0, false, true),
-
-    IA64_HOWTO (R_IA64_IMM14,	    "IMM14",	   0, false, true),
-    IA64_HOWTO (R_IA64_IMM22,	    "IMM22",	   0, false, true),
-    IA64_HOWTO (R_IA64_IMM64,	    "IMM64",	   0, false, true),
-    IA64_HOWTO (R_IA64_DIR32MSB,    "DIR32MSB",	   2, false, true),
-    IA64_HOWTO (R_IA64_DIR32LSB,    "DIR32LSB",	   2, false, true),
-    IA64_HOWTO (R_IA64_DIR64MSB,    "DIR64MSB",	   4, false, true),
-    IA64_HOWTO (R_IA64_DIR64LSB,    "DIR64LSB",	   4, false, true),
-
-    IA64_HOWTO (R_IA64_GPREL22,	    "GPREL22",	   0, false, true),
-    IA64_HOWTO (R_IA64_GPREL64I,    "GPREL64I",	   0, false, true),
-    IA64_HOWTO (R_IA64_GPREL32MSB,  "GPREL32MSB",  2, false, true),
-    IA64_HOWTO (R_IA64_GPREL32LSB,  "GPREL32LSB",  2, false, true),
-    IA64_HOWTO (R_IA64_GPREL64MSB,  "GPREL64MSB",  4, false, true),
-    IA64_HOWTO (R_IA64_GPREL64LSB,  "GPREL64LSB",  4, false, true),
-
-    IA64_HOWTO (R_IA64_LTOFF22,	    "LTOFF22",	   0, false, true),
-    IA64_HOWTO (R_IA64_LTOFF64I,    "LTOFF64I",	   0, false, true),
-
-    IA64_HOWTO (R_IA64_PLTOFF22,    "PLTOFF22",	   0, false, true),
-    IA64_HOWTO (R_IA64_PLTOFF64I,   "PLTOFF64I",   0, false, true),
-    IA64_HOWTO (R_IA64_PLTOFF64MSB, "PLTOFF64MSB", 4, false, true),
-    IA64_HOWTO (R_IA64_PLTOFF64LSB, "PLTOFF64LSB", 4, false, true),
-
-    IA64_HOWTO (R_IA64_FPTR64I,	    "FPTR64I",	   0, false, true),
-    IA64_HOWTO (R_IA64_FPTR32MSB,   "FPTR32MSB",   2, false, true),
-    IA64_HOWTO (R_IA64_FPTR32LSB,   "FPTR32LSB",   2, false, true),
-    IA64_HOWTO (R_IA64_FPTR64MSB,   "FPTR64MSB",   4, false, true),
-    IA64_HOWTO (R_IA64_FPTR64LSB,   "FPTR64LSB",   4, false, true),
-
-    IA64_HOWTO (R_IA64_PCREL60B,    "PCREL60B",	   0, true, true),
-    IA64_HOWTO (R_IA64_PCREL21B,    "PCREL21B",	   0, true, true),
-    IA64_HOWTO (R_IA64_PCREL21M,    "PCREL21M",	   0, true, true),
-    IA64_HOWTO (R_IA64_PCREL21F,    "PCREL21F",	   0, true, true),
-    IA64_HOWTO (R_IA64_PCREL32MSB,  "PCREL32MSB",  2, true, true),
-    IA64_HOWTO (R_IA64_PCREL32LSB,  "PCREL32LSB",  2, true, true),
-    IA64_HOWTO (R_IA64_PCREL64MSB,  "PCREL64MSB",  4, true, true),
-    IA64_HOWTO (R_IA64_PCREL64LSB,  "PCREL64LSB",  4, true, true),
-
-    IA64_HOWTO (R_IA64_LTOFF_FPTR22, "LTOFF_FPTR22", 0, false, true),
-    IA64_HOWTO (R_IA64_LTOFF_FPTR64I, "LTOFF_FPTR64I", 0, false, true),
-    IA64_HOWTO (R_IA64_LTOFF_FPTR32MSB, "LTOFF_FPTR32MSB", 2, false, true),
-    IA64_HOWTO (R_IA64_LTOFF_FPTR32LSB, "LTOFF_FPTR32LSB", 2, false, true),
-    IA64_HOWTO (R_IA64_LTOFF_FPTR64MSB, "LTOFF_FPTR64MSB", 4, false, true),
-    IA64_HOWTO (R_IA64_LTOFF_FPTR64LSB, "LTOFF_FPTR64LSB", 4, false, true),
-
-    IA64_HOWTO (R_IA64_SEGREL32MSB, "SEGREL32MSB", 2, false, true),
-    IA64_HOWTO (R_IA64_SEGREL32LSB, "SEGREL32LSB", 2, false, true),
-    IA64_HOWTO (R_IA64_SEGREL64MSB, "SEGREL64MSB", 4, false, true),
-    IA64_HOWTO (R_IA64_SEGREL64LSB, "SEGREL64LSB", 4, false, true),
-
-    IA64_HOWTO (R_IA64_SECREL32MSB, "SECREL32MSB", 2, false, true),
-    IA64_HOWTO (R_IA64_SECREL32LSB, "SECREL32LSB", 2, false, true),
-    IA64_HOWTO (R_IA64_SECREL64MSB, "SECREL64MSB", 4, false, true),
-    IA64_HOWTO (R_IA64_SECREL64LSB, "SECREL64LSB", 4, false, true),
-
-    IA64_HOWTO (R_IA64_REL32MSB,    "REL32MSB",	   2, false, true),
-    IA64_HOWTO (R_IA64_REL32LSB,    "REL32LSB",	   2, false, true),
-    IA64_HOWTO (R_IA64_REL64MSB,    "REL64MSB",	   4, false, true),
-    IA64_HOWTO (R_IA64_REL64LSB,    "REL64LSB",	   4, false, true),
-
-    IA64_HOWTO (R_IA64_LTV32MSB,    "LTV32MSB",	   2, false, true),
-    IA64_HOWTO (R_IA64_LTV32LSB,    "LTV32LSB",	   2, false, true),
-    IA64_HOWTO (R_IA64_LTV64MSB,    "LTV64MSB",	   4, false, true),
-    IA64_HOWTO (R_IA64_LTV64LSB,    "LTV64LSB",	   4, false, true),
-
-    IA64_HOWTO (R_IA64_PCREL21BI,   "PCREL21BI",   0, true, true),
-    IA64_HOWTO (R_IA64_PCREL22,     "PCREL22",     0, true, true),
-    IA64_HOWTO (R_IA64_PCREL64I,    "PCREL64I",    0, true, true),
-
-    IA64_HOWTO (R_IA64_IPLTMSB,	    "IPLTMSB",	   4, false, true),
-    IA64_HOWTO (R_IA64_IPLTLSB,	    "IPLTLSB",	   4, false, true),
-    IA64_HOWTO (R_IA64_COPY,	    "COPY",	   4, false, true),
-    IA64_HOWTO (R_IA64_LTOFF22X,    "LTOFF22X",	   0, false, true),
-    IA64_HOWTO (R_IA64_LDXMOV,	    "LDXMOV",	   0, false, true),
-
-    IA64_HOWTO (R_IA64_TPREL14,	    "TPREL14",	   0, false, false),
-    IA64_HOWTO (R_IA64_TPREL22,	    "TPREL22",	   0, false, false),
-    IA64_HOWTO (R_IA64_TPREL64I,    "TPREL64I",	   0, false, false),
-    IA64_HOWTO (R_IA64_TPREL64MSB,  "TPREL64MSB",  8, false, false),
-    IA64_HOWTO (R_IA64_TPREL64LSB,  "TPREL64LSB",  8, false, false),
-    IA64_HOWTO (R_IA64_LTOFF_TPREL22, "LTOFF_TPREL22",  0, false, false),
-
-    IA64_HOWTO (R_IA64_DTPMOD64MSB, "TPREL64MSB",  8, false, false),
-    IA64_HOWTO (R_IA64_DTPMOD64LSB, "TPREL64LSB",  8, false, false),
-    IA64_HOWTO (R_IA64_LTOFF_DTPMOD22, "LTOFF_DTPMOD22", 0, false, false),
-
-    IA64_HOWTO (R_IA64_DTPREL14,    "DTPREL14",	   0, false, false),
-    IA64_HOWTO (R_IA64_DTPREL22,    "DTPREL22",	   0, false, false),
-    IA64_HOWTO (R_IA64_DTPREL64I,   "DTPREL64I",   0, false, false),
-    IA64_HOWTO (R_IA64_DTPREL32MSB, "DTPREL32MSB", 4, false, false),
-    IA64_HOWTO (R_IA64_DTPREL32LSB, "DTPREL32LSB", 4, false, false),
-    IA64_HOWTO (R_IA64_DTPREL64MSB, "DTPREL64MSB", 8, false, false),
-    IA64_HOWTO (R_IA64_DTPREL64LSB, "DTPREL64LSB", 8, false, false),
-    IA64_HOWTO (R_IA64_LTOFF_DTPREL22, "LTOFF_DTPREL22", 0, false, false),
+    IA64_HOWTO (R_IA64_NONE,	    "NONE",	   0, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_IMM14,	    "IMM14",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_IMM22,	    "IMM22",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_IMM64,	    "IMM64",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_DIR32MSB,    "DIR32MSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_DIR32LSB,    "DIR32LSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_DIR64MSB,    "DIR64MSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_DIR64LSB,    "DIR64LSB",	   4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_GPREL22,	    "GPREL22",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL64I,    "GPREL64I",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL32MSB,  "GPREL32MSB",  2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL32LSB,  "GPREL32LSB",  2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL64MSB,  "GPREL64MSB",  4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL64LSB,  "GPREL64LSB",  4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_LTOFF22,	    "LTOFF22",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF64I,    "LTOFF64I",	   0, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_PLTOFF22,    "PLTOFF22",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_PLTOFF64I,   "PLTOFF64I",   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_PLTOFF64MSB, "PLTOFF64MSB", 4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_PLTOFF64LSB, "PLTOFF64LSB", 4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_FPTR64I,	    "FPTR64I",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_FPTR32MSB,   "FPTR32MSB",   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_FPTR32LSB,   "FPTR32LSB",   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_FPTR64MSB,   "FPTR64MSB",   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_FPTR64LSB,   "FPTR64LSB",   4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_PCREL60B,    "PCREL60B",	   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL21B,    "PCREL21B",	   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL21M,    "PCREL21M",	   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL21F,    "PCREL21F",	   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL32MSB,  "PCREL32MSB",  2, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL32LSB,  "PCREL32LSB",  2, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL64MSB,  "PCREL64MSB",  4, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL64LSB,  "PCREL64LSB",  4, TRUE, TRUE),
+
+    IA64_HOWTO (R_IA64_LTOFF_FPTR22, "LTOFF_FPTR22", 0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR64I, "LTOFF_FPTR64I", 0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR32MSB, "LTOFF_FPTR32MSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR32LSB, "LTOFF_FPTR32LSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR64MSB, "LTOFF_FPTR64MSB", 4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR64LSB, "LTOFF_FPTR64LSB", 4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_SEGREL32MSB, "SEGREL32MSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SEGREL32LSB, "SEGREL32LSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SEGREL64MSB, "SEGREL64MSB", 4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SEGREL64LSB, "SEGREL64LSB", 4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_SECREL32MSB, "SECREL32MSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SECREL32LSB, "SECREL32LSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SECREL64MSB, "SECREL64MSB", 4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SECREL64LSB, "SECREL64LSB", 4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_REL32MSB,    "REL32MSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_REL32LSB,    "REL32LSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_REL64MSB,    "REL64MSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_REL64LSB,    "REL64LSB",	   4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_LTV32MSB,    "LTV32MSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTV32LSB,    "LTV32LSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTV64MSB,    "LTV64MSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTV64LSB,    "LTV64LSB",	   4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_PCREL21BI,   "PCREL21BI",   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL22,     "PCREL22",     0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL64I,    "PCREL64I",    0, TRUE, TRUE),
+
+    IA64_HOWTO (R_IA64_IPLTMSB,	    "IPLTMSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_IPLTLSB,	    "IPLTLSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_COPY,	    "COPY",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF22X,    "LTOFF22X",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LDXMOV,	    "LDXMOV",	   0, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_TPREL14,	    "TPREL14",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_TPREL22,	    "TPREL22",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_TPREL64I,    "TPREL64I",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_TPREL64MSB,  "TPREL64MSB",  8, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_TPREL64LSB,  "TPREL64LSB",  8, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_LTOFF_TPREL22, "LTOFF_TPREL22",  0, FALSE, FALSE),
+
+    IA64_HOWTO (R_IA64_DTPMOD64MSB, "TPREL64MSB",  8, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPMOD64LSB, "TPREL64LSB",  8, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_LTOFF_DTPMOD22, "LTOFF_DTPMOD22", 0, FALSE, FALSE),
+
+    IA64_HOWTO (R_IA64_DTPREL14,    "DTPREL14",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL22,    "DTPREL22",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL64I,   "DTPREL64I",   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL32MSB, "DTPREL32MSB", 4, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL32LSB, "DTPREL32LSB", 4, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL64MSB, "DTPREL64MSB", 8, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL64LSB, "DTPREL64LSB", 8, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_LTOFF_DTPREL22, "LTOFF_DTPREL22", 0, FALSE, FALSE),
   };
 
 static unsigned char elf_code_to_howto_index[R_IA64_MAX_RELOC_CODE + 1];
@@ -674,12 +674,12 @@ static const bfd_byte oor_ip[48] =
    This is primarily to support branches to targets out of range;
    relaxation of R_IA64_LTOFF22X and R_IA64_LDXMOV not yet supported.  */
 
-static boolean
+static bfd_boolean
 elfNN_ia64_relax_section (abfd, sec, link_info, again)
      bfd *abfd;
      asection *sec;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   struct one_fixup
     {
@@ -696,17 +696,17 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
   Elf_Internal_Sym *isymbuf = NULL;
   struct elfNN_ia64_link_hash_table *ia64_info;
   struct one_fixup *fixups = NULL;
-  boolean changed_contents = false;
-  boolean changed_relocs = false;
+  bfd_boolean changed_contents = FALSE;
+  bfd_boolean changed_relocs = FALSE;
 
   /* Assume we're not going to change any sizes, and we'll only need
      one pass.  */
-  *again = false;
+  *again = FALSE;
 
   /* Nothing to do if there are no relocations.  */
   if ((sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0)
-    return true;
+    return TRUE;
 
   /* If this is the first time we have been called for this section,
      initialize the cooked size.  */
@@ -720,7 +720,7 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
 		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
 		      link_info->keep_memory));
   if (internal_relocs == NULL)
-    return false;
+    return FALSE;
 
   ia64_info = elfNN_ia64_hash_table (link_info);
   irelend = internal_relocs + sec->reloc_count;
@@ -736,7 +736,7 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
     {
       if (elf_section_data (sec)->relocs != internal_relocs)
 	free (internal_relocs);
-      return true;
+      return TRUE;
     }
 
   /* Get the section contents.  */
@@ -811,7 +811,7 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
 		 || h->root.type == bfd_link_hash_warning)
 	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
-	  dyn_i = get_dyn_sym_info (ia64_info, h, abfd, irel, false);
+	  dyn_i = get_dyn_sym_info (ia64_info, h, abfd, irel, FALSE);
 
 	  /* For branches to dynamic symbols, we're interested instead
 	     in a branch to the PLT entry.  */
@@ -931,8 +931,8 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
 				    R_IA64_PCREL21B) != bfd_reloc_ok)
 	goto error_return;
 
-      changed_contents = true;
-      changed_relocs = true;
+      changed_contents = TRUE;
+      changed_relocs = TRUE;
     }
 
   /* Clean up and go home.  */
@@ -976,7 +976,7 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
     }
 
   *again = changed_contents || changed_relocs;
-  return true;
+  return TRUE;
 
  error_return:
   if (isymbuf != NULL && (unsigned char *) isymbuf != symtab_hdr->contents)
@@ -987,12 +987,12 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
   if (internal_relocs != NULL
       && elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
-  return false;
+  return FALSE;
 }
 
-/* Return true if NAME is an unwind table section name.  */
+/* Return TRUE if NAME is an unwind table section name.  */
 
-static inline boolean
+static inline bfd_boolean
 is_unwind_section_name (abfd, name)
 	bfd *abfd;
 	const char *name;
@@ -1001,7 +1001,7 @@ is_unwind_section_name (abfd, name)
 
   if (elfNN_ia64_hpux_vec (abfd->xvec)
       && !strcmp (name, ELF_STRING_ia64_unwind_hdr))
-    return false;
+    return FALSE;
 
   len1 = sizeof (ELF_STRING_ia64_unwind) - 1;
   len2 = sizeof (ELF_STRING_ia64_unwind_info) - 1;
@@ -1014,7 +1014,7 @@ is_unwind_section_name (abfd, name)
 /* Handle an IA-64 specific section when reading an object file.  This
    is called when elfcode.h finds a section with an unknown type.  */
 
-static boolean
+static bfd_boolean
 elfNN_ia64_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -1035,18 +1035,18 @@ elfNN_ia64_section_from_shdr (abfd, hdr, name)
 
     case SHT_IA_64_EXT:
       if (strcmp (name, ELF_STRING_ia64_archext) != 0)
-	return false;
+	return FALSE;
       break;
 
     default:
-      return false;
+      return FALSE;
     }
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
   newsect = hdr->bfd_section;
 
-  return true;
+  return TRUE;
 }
 
 /* Convert IA-64 specific section flags to bfd internal section flags.  */
@@ -1054,7 +1054,7 @@ elfNN_ia64_section_from_shdr (abfd, hdr, name)
 /* ??? There is no bfd internal flag equivalent to the SHF_IA_64_NORECOV
    flag.  */
 
-static boolean
+static bfd_boolean
 elfNN_ia64_section_flags (flags, hdr)
      flagword *flags;
      Elf_Internal_Shdr *hdr;
@@ -1062,13 +1062,13 @@ elfNN_ia64_section_flags (flags, hdr)
   if (hdr->sh_flags & SHF_IA_64_SHORT)
     *flags |= SEC_SMALL_DATA;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the correct type for an IA-64 ELF section.  We do this by the
    section name, which is a hack, but ought to work.  */
 
-static boolean
+static bfd_boolean
 elfNN_ia64_fake_sections (abfd, hdr, sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      Elf_Internal_Shdr *hdr;
@@ -1111,7 +1111,7 @@ elfNN_ia64_fake_sections (abfd, hdr, sec)
   if (sec->flags & SEC_SMALL_DATA)
     hdr->sh_flags |= SHF_IA_64_SHORT;
 
-  return true;
+  return TRUE;
 }
 
 /* The final processing done just before writing out an IA-64 ELF
@@ -1120,7 +1120,7 @@ elfNN_ia64_fake_sections (abfd, hdr, sec)
 static void
 elfNN_ia64_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   Elf_Internal_Shdr *hdr;
   const char *sname;
@@ -1205,14 +1205,14 @@ elfNN_ia64_final_write_processing (abfd, linker)
 	flags |= EF_IA_64_ABI64;
 
       elf_elfheader(abfd)->e_flags = flags;
-      elf_flags_init (abfd) = true;
+      elf_flags_init (abfd) = TRUE;
     }
 }
 
 /* Hook called by the linker routine which adds symbols from an object
    file.  We use it to put .comm items in .sbss, and not .bss.  */
 
-static boolean
+static bfd_boolean
 elfNN_ia64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1238,17 +1238,17 @@ elfNN_ia64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	      || !bfd_set_section_flags (abfd, scomm, (SEC_ALLOC
 						       | SEC_IS_COMMON
 						       | SEC_LINKER_CREATED)))
-	    return false;
+	    return FALSE;
 	}
 
       *secp = scomm;
       *valp = sym->st_size;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_aix_vec (const bfd_target *vec)
 {
   extern const bfd_target bfd_elfNN_ia64_aix_little_vec;
@@ -1261,7 +1261,7 @@ elfNN_ia64_aix_vec (const bfd_target *vec)
 /* Hook called by the linker routine which adds symbols from an object
    file.  We use it to handle OS-specific symbols.  */
 
-static boolean
+static bfd_boolean
 elfNN_ia64_aix_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1279,7 +1279,7 @@ elfNN_ia64_aix_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       struct elf_link_hash_entry *h;
 
       h = elf_link_hash_lookup (elf_hash_table (info), *namep,
-				false, false, false);
+				FALSE, FALSE, FALSE);
       if (h == NULL)
 	{
 	  struct elf_backend_data *bed;
@@ -1292,19 +1292,19 @@ elfNN_ia64_aix_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	  if (!(_bfd_generic_link_add_one_symbol
 		(info, abfd, *namep, BSF_GLOBAL,
 		 bfd_get_section_by_name (abfd, ".bss"),
-		 bed->got_symbol_offset, (const char *) NULL, false,
+		 bed->got_symbol_offset, (const char *) NULL, FALSE,
 		 bed->collect, &bh)))
-	    return false;
+	    return FALSE;
 
 	  h = (struct elf_link_hash_entry *) bh;
 	  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
 	  h->type = STT_OBJECT;
 
 	  if (! _bfd_elf_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
-      return true;
+      return TRUE;
     }
   else if (sym->st_shndx == SHN_LOOS)
     {
@@ -1330,7 +1330,7 @@ elfNN_ia64_aix_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
       *valp = sym->st_size;
 
-      return true;
+      return TRUE;
     }
   else
     {
@@ -1339,7 +1339,7 @@ elfNN_ia64_aix_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
     }
 }
 
-boolean
+bfd_boolean
 elfNN_ia64_aix_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1349,7 +1349,7 @@ elfNN_ia64_aix_link_add_symbols (abfd, info)
       && abfd->xvec == info->hash->creator)
     {
       if (! bfd_elfNN_link_create_dynamic_sections (abfd, info))
-	return false;
+	return FALSE;
     }
 
   /* Now do the standard call.  */
@@ -1378,7 +1378,7 @@ elfNN_ia64_additional_program_headers (abfd)
   return ret;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_modify_segment_map (abfd)
      bfd *abfd;
 {
@@ -1399,7 +1399,7 @@ elfNN_ia64_modify_segment_map (abfd)
 	  m = ((struct elf_segment_map *)
 	       bfd_zalloc (abfd, (bfd_size_type) sizeof *m));
 	  if (m == NULL)
-	    return false;
+	    return FALSE;
 
 	  m->p_type = PT_IA_64_ARCHEXT;
 	  m->count = 1;
@@ -1447,7 +1447,7 @@ elfNN_ia64_modify_segment_map (abfd)
 	      m = ((struct elf_segment_map *)
 		   bfd_zalloc (abfd, (bfd_size_type) sizeof *m));
 	      if (m == NULL)
-		return false;
+		return FALSE;
 
 	      m->p_type = PT_IA_64_UNWIND;
 	      m->count = 1;
@@ -1491,13 +1491,13 @@ elfNN_ia64_modify_segment_map (abfd)
       found:;
       }
 
-  return true;
+  return TRUE;
 }
 
 /* According to the Tahoe assembler spec, all labels starting with a
    '.' are local.  */
 
-static boolean
+static bfd_boolean
 elfNN_ia64_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -1507,43 +1507,43 @@ elfNN_ia64_is_local_label_name (abfd, name)
 
 /* Should we do dynamic things to this symbol?  */
 
-static boolean
+static bfd_boolean
 elfNN_ia64_dynamic_symbol_p (h, info)
      struct elf_link_hash_entry *h;
      struct bfd_link_info *info;
 {
   if (h == NULL)
-    return false;
+    return FALSE;
 
   while (h->root.type == bfd_link_hash_indirect
 	 || h->root.type == bfd_link_hash_warning)
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
   if (h->dynindx == -1)
-    return false;
+    return FALSE;
   switch (ELF_ST_VISIBILITY (h->other))
     {
     case STV_INTERNAL:
     case STV_HIDDEN:
-      return false;
+      return FALSE;
     default:
       break;
     }
 
   if (h->root.type == bfd_link_hash_undefweak
       || h->root.type == bfd_link_hash_defweak)
-    return true;
+    return TRUE;
 
   if ((info->shared && (!info->symbolic || info->allow_shlib_undefined))
       || ((h->elf_link_hash_flags
 	   & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR))
 	  == (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR)))
-    return true;
+    return TRUE;
 
-  return false;
+  return FALSE;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_local_hash_table_init (ht, abfd, new)
      struct elfNN_ia64_local_hash_table *ht;
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -1664,7 +1664,7 @@ static void
 elfNN_ia64_hash_hide_symbol (info, xh, force_local)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *xh;
-     boolean force_local;
+     bfd_boolean force_local;
 {
   struct elfNN_ia64_link_hash_entry *h;
   struct elfNN_ia64_dyn_sym_info *dyn_i;
@@ -1709,7 +1709,7 @@ static INLINE struct elfNN_ia64_local_hash_entry *
 elfNN_ia64_local_hash_lookup(table, string, create, copy)
      struct elfNN_ia64_local_hash_table *table;
      const char *string;
-     boolean create, copy;
+     bfd_boolean create, copy;
 {
   return ((struct elfNN_ia64_local_hash_entry *)
 	  bfd_hash_lookup (&table->root, string, create, copy));
@@ -1719,11 +1719,11 @@ elfNN_ia64_local_hash_lookup(table, string, create, copy)
 
 struct elfNN_ia64_dyn_sym_traverse_data
 {
-  boolean (*func) PARAMS ((struct elfNN_ia64_dyn_sym_info *, PTR));
+  bfd_boolean (*func) PARAMS ((struct elfNN_ia64_dyn_sym_info *, PTR));
   PTR data;
 };
 
-static boolean
+static bfd_boolean
 elfNN_ia64_global_dyn_sym_thunk (xentry, xdata)
      struct bfd_hash_entry *xentry;
      PTR xdata;
@@ -1739,11 +1739,11 @@ elfNN_ia64_global_dyn_sym_thunk (xentry, xdata)
 
   for (dyn_i = entry->info; dyn_i; dyn_i = dyn_i->next)
     if (! (*data->func) (dyn_i, data->data))
-      return false;
-  return true;
+      return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_local_dyn_sym_thunk (xentry, xdata)
      struct bfd_hash_entry *xentry;
      PTR xdata;
@@ -1756,14 +1756,14 @@ elfNN_ia64_local_dyn_sym_thunk (xentry, xdata)
 
   for (dyn_i = entry->info; dyn_i; dyn_i = dyn_i->next)
     if (! (*data->func) (dyn_i, data->data))
-      return false;
-  return true;
+      return FALSE;
+  return TRUE;
 }
 
 static void
 elfNN_ia64_dyn_sym_traverse (ia64_info, func, data)
      struct elfNN_ia64_link_hash_table *ia64_info;
-     boolean (*func) PARAMS ((struct elfNN_ia64_dyn_sym_info *, PTR));
+     bfd_boolean (*func) PARAMS ((struct elfNN_ia64_dyn_sym_info *, PTR));
      PTR data;
 {
   struct elfNN_ia64_dyn_sym_traverse_data xdata;
@@ -1777,7 +1777,7 @@ elfNN_ia64_dyn_sym_traverse (ia64_info, func, data)
 		     elfNN_ia64_local_dyn_sym_thunk, &xdata);
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1786,7 +1786,7 @@ elfNN_ia64_create_dynamic_sections (abfd, info)
   asection *s;
 
   if (! _bfd_elf_create_dynamic_sections (abfd, info))
-    return false;
+    return FALSE;
 
   ia64_info = elfNN_ia64_hash_table (info);
 
@@ -1799,7 +1799,7 @@ elfNN_ia64_create_dynamic_sections (abfd, info)
   }
 
   if (!get_pltoff (abfd, info, ia64_info))
-    return false;
+    return FALSE;
 
   s = bfd_make_section(abfd, ".rela.IA_64.pltoff");
   if (s == NULL
@@ -1809,7 +1809,7 @@ elfNN_ia64_create_dynamic_sections (abfd, info)
 					   | SEC_LINKER_CREATED
 					   | SEC_READONLY))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
   ia64_info->rel_pltoff_sec = s;
 
   s = bfd_make_section(abfd, ".rela.got");
@@ -1820,10 +1820,10 @@ elfNN_ia64_create_dynamic_sections (abfd, info)
 					   | SEC_LINKER_CREATED
 					   | SEC_READONLY))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
   ia64_info->rel_got_sec = s;
 
-  return true;
+  return TRUE;
 }
 
 /* Find and/or create a hash entry for local symbol.  */
@@ -1832,7 +1832,7 @@ get_local_sym_hash (ia64_info, abfd, rel, create)
      struct elfNN_ia64_link_hash_table *ia64_info;
      bfd *abfd;
      const Elf_Internal_Rela *rel;
-     boolean create;
+     bfd_boolean create;
 {
   char *addr_name;
   size_t len;
@@ -1866,7 +1866,7 @@ get_dyn_sym_info (ia64_info, h, abfd, rel, create)
      struct elf_link_hash_entry *h;
      bfd *abfd;
      const Elf_Internal_Rela *rel;
-     boolean create;
+     bfd_boolean create;
 {
   struct elfNN_ia64_dyn_sym_info **pp;
   struct elfNN_ia64_dyn_sym_info *dyn_i;
@@ -2013,7 +2013,7 @@ get_reloc_section (abfd, ia64_info, sec, create)
      bfd *abfd;
      struct elfNN_ia64_link_hash_table *ia64_info;
      asection *sec;
-     boolean create;
+     bfd_boolean create;
 {
   const char *srel_name;
   asection *srel;
@@ -2058,7 +2058,7 @@ get_reloc_section (abfd, ia64_info, sec, create)
   return srel;
 }
 
-static boolean
+static bfd_boolean
 count_dyn_reloc (abfd, dyn_i, srel, type)
      bfd *abfd;
      struct elfNN_ia64_dyn_sym_info *dyn_i;
@@ -2076,7 +2076,7 @@ count_dyn_reloc (abfd, dyn_i, srel, type)
       rent = ((struct elfNN_ia64_dyn_reloc_entry *)
 	      bfd_alloc (abfd, (bfd_size_type) sizeof (*rent)));
       if (!rent)
-	return false;
+	return FALSE;
 
       rent->next = dyn_i->reloc_entries;
       rent->srel = srel;
@@ -2086,10 +2086,10 @@ count_dyn_reloc (abfd, dyn_i, srel, type)
     }
   rent->count++;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2103,7 +2103,7 @@ elfNN_ia64_check_relocs (abfd, info, sec, relocs)
   asection *got, *fptr, *srel;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   ia64_info = elfNN_ia64_hash_table (info);
@@ -2130,7 +2130,7 @@ elfNN_ia64_check_relocs (abfd, info, sec, relocs)
       unsigned long r_symndx = ELFNN_R_SYM (rel->r_info);
       struct elfNN_ia64_dyn_sym_info *dyn_i;
       int need_entry;
-      boolean maybe_dynamic;
+      bfd_boolean maybe_dynamic;
       int dynrel_type = R_IA64_NONE;
 
       if (r_symndx >= symtab_hdr->sh_info)
@@ -2150,13 +2150,13 @@ elfNN_ia64_check_relocs (abfd, info, sec, relocs)
 	 locally or externally defined, as not all of the input files
 	 have yet been processed.  Do something with what we know, as
 	 this may help reduce memory usage and processing time later.  */
-      maybe_dynamic = false;
+      maybe_dynamic = FALSE;
       if (h && ((info->shared
 		      && (!info->symbolic || info->allow_shlib_undefined))
 		|| ! (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
 		|| h->root.type == bfd_link_hash_defweak
 		|| elfNN_ia64_aix_vec (abfd->xvec)))
-	maybe_dynamic = true;
+	maybe_dynamic = TRUE;
 
       need_entry = 0;
       switch (ELFNN_R_TYPE (rel->r_info))
@@ -2300,7 +2300,7 @@ elfNN_ia64_check_relocs (abfd, info, sec, relocs)
 	     abfd, 0, (bfd_vma) 0);
 	}
 
-      dyn_i = get_dyn_sym_info (ia64_info, h, abfd, rel, true);
+      dyn_i = get_dyn_sym_info (ia64_info, h, abfd, rel, TRUE);
 
       /* Record whether or not this is a local symbol.  */
       dyn_i->h = h;
@@ -2312,7 +2312,7 @@ elfNN_ia64_check_relocs (abfd, info, sec, relocs)
 	    {
 	      got = get_got (abfd, info, ia64_info);
 	      if (!got)
-		return false;
+		return FALSE;
 	    }
 	  if (need_entry & NEED_GOT)
 	    dyn_i->want_got = 1;
@@ -2329,7 +2329,7 @@ elfNN_ia64_check_relocs (abfd, info, sec, relocs)
 	    {
 	      fptr = get_fptr (abfd, info, ia64_info);
 	      if (!fptr)
-		return false;
+		return FALSE;
 	    }
 
 	  /* FPTRs for shared libraries are allocated by the dynamic
@@ -2341,7 +2341,7 @@ elfNN_ia64_check_relocs (abfd, info, sec, relocs)
 	    {
 	      if (! (_bfd_elfNN_link_record_local_dynamic_symbol
 		     (info, abfd, (long) r_symndx)))
-		return false;
+		return FALSE;
 	    }
 
 	  dyn_i->want_fptr = 1;
@@ -2363,16 +2363,16 @@ elfNN_ia64_check_relocs (abfd, info, sec, relocs)
 	{
 	  if (!srel)
 	    {
-	      srel = get_reloc_section (abfd, ia64_info, sec, true);
+	      srel = get_reloc_section (abfd, ia64_info, sec, TRUE);
 	      if (!srel)
-		return false;
+		return FALSE;
 	    }
 	  if (!count_dyn_reloc (abfd, dyn_i, srel, dynrel_type))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 struct elfNN_ia64_allocate_data
@@ -2384,7 +2384,7 @@ struct elfNN_ia64_allocate_data
 /* For cleanliness, and potentially faster dynamic loading, allocate
    external GOT entries first.  */
 
-static boolean
+static bfd_boolean
 allocate_global_data_got (dyn_i, data)
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      PTR data;
@@ -2416,12 +2416,12 @@ allocate_global_data_got (dyn_i, data)
       dyn_i->dtprel_offset = x->ofs;
       x->ofs += 8;
     }
-  return true;
+  return TRUE;
 }
 
 /* Next, allocate all the GOT entries used by LTOFF_FPTR relocs.  */
 
-static boolean
+static bfd_boolean
 allocate_global_fptr_got (dyn_i, data)
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      PTR data;
@@ -2436,12 +2436,12 @@ allocate_global_fptr_got (dyn_i, data)
       dyn_i->got_offset = x->ofs;
       x->ofs += 8;
     }
-  return true;
+  return TRUE;
 }
 
 /* Lastly, allocate all the GOT entries for local data.  */
 
-static boolean
+static bfd_boolean
 allocate_local_got (dyn_i, data)
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      PTR data;
@@ -2455,7 +2455,7 @@ allocate_local_got (dyn_i, data)
       dyn_i->got_offset = x->ofs;
       x->ofs += 8;
     }
-  return true;
+  return TRUE;
 }
 
 /* Search for the index of a global symbol in it's defining object file.  */
@@ -2480,7 +2480,7 @@ global_sym_index (h)
 /* Allocate function descriptors.  We can do these for every function
    in a main executable that is not exported.  */
 
-static boolean
+static bfd_boolean
 allocate_fptr (dyn_i, data)
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      PTR data;
@@ -2511,7 +2511,7 @@ allocate_fptr (dyn_i, data)
 	      if (!_bfd_elfNN_link_record_local_dynamic_symbol
 		    (x->info, h->root.u.def.section->owner,
 		     global_sym_index (h)))
-		return false;
+		return FALSE;
 	    }
 
 	  dyn_i->want_fptr = 0;
@@ -2524,12 +2524,12 @@ allocate_fptr (dyn_i, data)
       else
 	dyn_i->want_fptr = 0;
     }
-  return true;
+  return TRUE;
 }
 
 /* Allocate all the minimal PLT entries.  */
 
-static boolean
+static bfd_boolean
 allocate_plt_entries (dyn_i, data)
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      PTR data;
@@ -2562,12 +2562,12 @@ allocate_plt_entries (dyn_i, data)
 	  dyn_i->want_plt2 = 0;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Allocate all the full PLT entries.  */
 
-static boolean
+static bfd_boolean
 allocate_plt2_entries (dyn_i, data)
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      PTR data;
@@ -2587,7 +2587,7 @@ allocate_plt2_entries (dyn_i, data)
 	h = (struct elf_link_hash_entry *) h->root.u.i.link;
       dyn_i->h->plt.offset = ofs;
     }
-  return true;
+  return TRUE;
 }
 
 /* Allocate all the PLTOFF entries requested by relocations and
@@ -2595,7 +2595,7 @@ allocate_plt2_entries (dyn_i, data)
    because the latter are not necessarily addressable by the GP.
    ??? Relaxation might be able to determine that they are.  */
 
-static boolean
+static bfd_boolean
 allocate_pltoff_entries (dyn_i, data)
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      PTR data;
@@ -2607,13 +2607,13 @@ allocate_pltoff_entries (dyn_i, data)
       dyn_i->pltoff_offset = x->ofs;
       x->ofs += 16;
     }
-  return true;
+  return TRUE;
 }
 
 /* Allocate dynamic relocations for those symbols that turned out
    to be dynamic.  */
 
-static boolean
+static bfd_boolean
 allocate_dynrel_entries (dyn_i, data)
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      PTR data;
@@ -2621,7 +2621,7 @@ allocate_dynrel_entries (dyn_i, data)
   struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
   struct elfNN_ia64_link_hash_table *ia64_info;
   struct elfNN_ia64_dyn_reloc_entry *rent;
-  boolean dynamic_symbol, shared;
+  bfd_boolean dynamic_symbol, shared;
 
   ia64_info = elfNN_ia64_hash_table (x->info);
   dynamic_symbol = elfNN_ia64_dynamic_symbol_p (dyn_i->h, x->info)
@@ -2699,10 +2699,10 @@ allocate_dynrel_entries (dyn_i, data)
       ia64_info->rel_pltoff_sec->_raw_size += t;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      struct elf_link_hash_entry *h;
@@ -2719,7 +2719,7 @@ elfNN_ia64_adjust_dynamic_symbol (info, h)
                   || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* If this is a reference to a symbol defined by a dynamic object which
@@ -2729,10 +2729,10 @@ elfNN_ia64_adjust_dynamic_symbol (info, h)
      But IA-64 code is canonically PIC, so as a rule we can avoid this sort
      of hackery.  */
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2741,7 +2741,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info)
   struct elfNN_ia64_link_hash_table *ia64_info;
   asection *sec;
   bfd *dynobj;
-  boolean relplt = false;
+  bfd_boolean relplt = FALSE;
 
   dynobj = elf_hash_table(info)->dynobj;
   ia64_info = elfNN_ia64_hash_table (info);
@@ -2780,7 +2780,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info)
 
   /* Now that we've seen all of the input files, we can decide which
      symbols need plt entries.  Allocate the minimal PLT entries first.
-     We do this even though dynamic_sections_created may be false, because
+     We do this even though dynamic_sections_created may be FALSE, because
      this has the side-effect of clearing want_plt and want_plt2.  */
 
   data.ofs = 0;
@@ -2830,7 +2830,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info)
      Allocate memory for them.  */
   for (sec = dynobj->sections; sec != NULL; sec = sec->next)
     {
-      boolean strip;
+      bfd_boolean strip;
 
       if (!(sec->flags & SEC_LINKER_CREATED))
 	continue;
@@ -2846,7 +2846,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info)
       strip = (sec->_raw_size == 0);
 
       if (sec == ia64_info->got_sec)
-	strip = false;
+	strip = FALSE;
       else if (sec == ia64_info->rel_got_sec)
 	{
 	  if (strip)
@@ -2877,7 +2877,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info)
 	    ia64_info->rel_pltoff_sec = NULL;
 	  else
 	    {
-	      relplt = true;
+	      relplt = TRUE;
 	      /* We use the reloc_count field as a counter if we need to
 		 copy relocs into the output file.  */
 	      sec->reloc_count = 0;
@@ -2892,7 +2892,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info)
 	  name = bfd_get_section_name (dynobj, sec);
 
 	  if (strcmp (name, ".got.plt") == 0)
-	    strip = false;
+	    strip = FALSE;
 	  else if (strncmp (name, ".rel", 4) == 0)
 	    {
 	      if (!strip)
@@ -2913,7 +2913,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info)
 	  /* Allocate memory for the section contents.  */
 	  sec->contents = (bfd_byte *) bfd_zalloc (dynobj, sec->_raw_size);
 	  if (sec->contents == NULL && sec->_raw_size != 0)
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -2931,38 +2931,38 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info)
   bfd_elfNN_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL))
 
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (!add_dynamic_entry (DT_IA_64_PLT_RESERVE, 0))
-	return false;
+	return FALSE;
       if (!add_dynamic_entry (DT_PLTGOT, 0))
-	return false;
+	return FALSE;
 
       if (relplt)
 	{
 	  if (!add_dynamic_entry (DT_PLTRELSZ, 0)
 	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (!add_dynamic_entry (DT_RELA, 0)
 	  || !add_dynamic_entry (DT_RELASZ, 0)
 	  || !add_dynamic_entry (DT_RELAENT, sizeof (ElfNN_External_Rela)))
-	return false;
+	return FALSE;
 
       if (ia64_info->reltext)
 	{
 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	  info->flags |= DF_TEXTREL;
 	}
     }
 
   /* ??? Perhaps force __gp local.  */
 
-  return true;
+  return TRUE;
 }
 
 static bfd_reloc_status_type
@@ -3242,7 +3242,7 @@ set_got_entry (abfd, info, dyn_i, dynindx, addend, value, dyn_r_type)
 {
   struct elfNN_ia64_link_hash_table *ia64_info;
   asection *got_sec;
-  boolean done;
+  bfd_boolean done;
   bfd_vma got_offset;
 
   ia64_info = elfNN_ia64_hash_table (info);
@@ -3252,22 +3252,22 @@ set_got_entry (abfd, info, dyn_i, dynindx, addend, value, dyn_r_type)
     {
     case R_IA64_TPREL64LSB:
       done = dyn_i->tprel_done;
-      dyn_i->tprel_done = true;
+      dyn_i->tprel_done = TRUE;
       got_offset = dyn_i->tprel_offset;
       break;
     case R_IA64_DTPMOD64LSB:
       done = dyn_i->dtpmod_done;
-      dyn_i->dtpmod_done = true;
+      dyn_i->dtpmod_done = TRUE;
       got_offset = dyn_i->dtpmod_offset;
       break;
     case R_IA64_DTPREL64LSB:
       done = dyn_i->dtprel_done;
-      dyn_i->dtprel_done = true;
+      dyn_i->dtprel_done = TRUE;
       got_offset = dyn_i->dtprel_offset;
       break;
     default:
       done = dyn_i->got_done;
-      dyn_i->got_done = true;
+      dyn_i->got_done = TRUE;
       got_offset = dyn_i->got_offset;
       break;
     }
@@ -3318,7 +3318,7 @@ set_got_entry (abfd, info, dyn_i, dynindx, addend, value, dyn_r_type)
 		  dyn_r_type = R_IA64_DTPREL64MSB;
 		  break;
 		default:
-		  BFD_ASSERT (false);
+		  BFD_ASSERT (FALSE);
 		  break;
 		}
 	    }
@@ -3381,7 +3381,7 @@ set_pltoff_entry (abfd, info, dyn_i, value, is_plt)
      struct bfd_link_info *info;
      struct elfNN_ia64_dyn_sym_info *dyn_i;
      bfd_vma value;
-     boolean is_plt;
+     bfd_boolean is_plt;
 {
   struct elfNN_ia64_link_hash_table *ia64_info;
   asection *pltoff_sec;
@@ -3479,7 +3479,7 @@ elfNN_ia64_unwind_entry_compare (a, b)
   return (av < bv ? -1 : av > bv ? 1 : 0);
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3527,8 +3527,8 @@ elfNN_ia64_final_link (abfd, info)
 	}
 
       /* See if the user wants to force a value.  */
-      gp = elf_link_hash_lookup (elf_hash_table (info), "__gp", false,
-				 false, false);
+      gp = elf_link_hash_lookup (elf_hash_table (info), "__gp", FALSE,
+				 FALSE, FALSE);
 
       if (gp
 	  && (gp->root.type == bfd_link_hash_defined
@@ -3582,7 +3582,7 @@ elfNN_ia64_final_link (abfd, info)
 		(_("%s: short data segment overflowed (0x%lx >= 0x400000)"),
 		 bfd_get_filename (abfd),
 		 (unsigned long) (max_short_vma - min_short_vma));
-	      return false;
+	      return FALSE;
 	    }
 	  else if ((gp_val > min_short_vma
 		    && gp_val - min_short_vma > 0x200000)
@@ -3592,7 +3592,7 @@ elfNN_ia64_final_link (abfd, info)
 	      (*_bfd_error_handler)
 		(_("%s: __gp does not cover short data segment"),
 		 bfd_get_filename (abfd));
-	      return false;
+	      return FALSE;
 	    }
 	}
 
@@ -3619,13 +3619,13 @@ elfNN_ia64_final_link (abfd, info)
 	  unwind_output_sec->contents
 	    = bfd_malloc (unwind_output_sec->_raw_size);
 	  if (unwind_output_sec->contents == NULL)
-	    return false;
+	    return FALSE;
 	}
     }
 
   /* Invoke the regular ELF backend linker to do all the work.  */
   if (!bfd_elfNN_bfd_final_link (abfd, info))
-    return false;
+    return FALSE;
 
   if (unwind_output_sec)
     {
@@ -3638,13 +3638,13 @@ elfNN_ia64_final_link (abfd, info)
       if (! bfd_set_section_contents (abfd, unwind_output_sec,
 				      unwind_output_sec->contents, (bfd_vma) 0,
 				      unwind_output_sec->_raw_size))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 			     contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -3661,7 +3661,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
   asection *srel;
-  boolean ret_val = true;	/* for non-fatal errors */
+  bfd_boolean ret_val = TRUE;	/* for non-fatal errors */
   bfd_vma gp_val;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -3677,11 +3677,11 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 
       elf_section_data(input_section->output_section)
 	->this_hdr.sh_flags |= flags;
-      return true;
+      return TRUE;
     }
 
   gp_val = _bfd_get_gp_value (output_bfd);
-  srel = get_reloc_section (input_bfd, ia64_info, input_section, false);
+  srel = get_reloc_section (input_bfd, ia64_info, input_section, FALSE);
 
   rel = relocs;
   relend = relocs + input_section->reloc_count;
@@ -3697,8 +3697,8 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
       bfd_vma value;
       asection *sym_sec;
       bfd_byte *hit_addr;
-      boolean dynamic_symbol_p;
-      boolean undef_weak_ref;
+      bfd_boolean dynamic_symbol_p;
+      bfd_boolean undef_weak_ref;
 
       r_type = ELFNN_R_TYPE (rel->r_info);
       if (r_type > R_IA64_MAX_RELOC_CODE)
@@ -3707,7 +3707,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	    (_("%s: unknown relocation type %d"),
 	     bfd_archive_filename (input_bfd), (int)r_type);
 	  bfd_set_error (bfd_error_bad_value);
-	  ret_val = false;
+	  ret_val = FALSE;
 	  continue;
 	}
 
@@ -3716,7 +3716,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sym_sec = NULL;
-      undef_weak_ref = false;
+      undef_weak_ref = FALSE;
 
       if (r_symndx < symtab_hdr->sh_info)
 	{
@@ -3730,8 +3730,8 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 		  == ELF_INFO_TYPE_MERGE))
  	    {
 	      struct elfNN_ia64_local_hash_entry *loc_h;
-      
-	      loc_h = get_local_sym_hash (ia64_info, input_bfd, rel, false);
+
+	      loc_h = get_local_sym_hash (ia64_info, input_bfd, rel, FALSE);
 	      if (loc_h && ! loc_h->sec_merge_done)
 		{
 		  struct elfNN_ia64_dyn_sym_info *dynent;
@@ -3790,7 +3790,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 		}
 	    }
 	  else if (h->root.type == bfd_link_hash_undefweak)
-	    undef_weak_ref = true;
+	    undef_weak_ref = TRUE;
 	  else if (info->shared
 		   && (!info->symbolic || info->allow_shlib_undefined)
 		   && !info->no_undefined
@@ -3803,8 +3803,8 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 		      input_section, rel->r_offset,
 		      (!info->shared || info->no_undefined
 		       || ELF_ST_VISIBILITY (h->other)))))
-		return false;
-	      ret_val = false;
+		return FALSE;
+	      ret_val = FALSE;
 	      continue;
 	    }
 	}
@@ -3877,7 +3877,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 		      (*_bfd_error_handler)
 			(_("%s: linking non-pic code in a shared library"),
 			 bfd_archive_filename (input_bfd));
-		      ret_val = false;
+		      ret_val = FALSE;
 		      continue;
 		    }
 		  dynindx = 0;
@@ -3910,7 +3910,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (*_bfd_error_handler)
 		(_("%s: @gprel relocation against dynamic symbol %s"),
 		 bfd_archive_filename (input_bfd), h->root.root.string);
-	      ret_val = false;
+	      ret_val = FALSE;
 	      continue;
 	    }
 	  value -= gp_val;
@@ -3920,7 +3920,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	case R_IA64_LTOFF22:
 	case R_IA64_LTOFF22X:
 	case R_IA64_LTOFF64I:
-          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, false);
+          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
 	  value = set_got_entry (input_bfd, info, dyn_i, (h ? h->dynindx : -1),
 				 rel->r_addend, value, R_IA64_DIR64LSB);
 	  value -= gp_val;
@@ -3931,8 +3931,8 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	case R_IA64_PLTOFF64I:
 	case R_IA64_PLTOFF64MSB:
 	case R_IA64_PLTOFF64LSB:
-          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, false);
-	  value = set_pltoff_entry (output_bfd, info, dyn_i, value, false);
+          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
+	  value = set_pltoff_entry (output_bfd, info, dyn_i, value, FALSE);
 	  value -= gp_val;
 	  r = elfNN_ia64_install_value (output_bfd, hit_addr, value, r_type);
 	  break;
@@ -3942,7 +3942,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	case R_IA64_FPTR32LSB:
 	case R_IA64_FPTR64MSB:
 	case R_IA64_FPTR64LSB:
-          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, false);
+          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
 	  if (dyn_i->want_fptr)
 	    {
 	      if (!undef_weak_ref)
@@ -3988,7 +3988,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	  {
 	    long dynindx;
 
-	    dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, false);
+	    dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
 	    if (dyn_i->want_fptr)
 	      {
 		BFD_ASSERT (h == NULL || h->dynindx == -1)
@@ -4049,7 +4049,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (*_bfd_error_handler)
 		(_("%s: dynamic relocation against speculation fixup"),
 		 bfd_archive_filename (input_bfd));
-	      ret_val = false;
+	      ret_val = FALSE;
 	      continue;
 	    }
 	  if (undef_weak_ref)
@@ -4057,7 +4057,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	      (*_bfd_error_handler)
 		(_("%s: speculation fixup against undefined weak symbol"),
 		 bfd_archive_filename (input_bfd));
-	      ret_val = false;
+	      ret_val = FALSE;
 	      continue;
 	    }
 	  goto finish_pcrel;
@@ -4067,7 +4067,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	  /* We should have created a PLT entry for any dynamic symbol.  */
 	  dyn_i = NULL;
 	  if (h)
-	    dyn_i = get_dyn_sym_info (ia64_info, h, NULL, NULL, false);
+	    dyn_i = get_dyn_sym_info (ia64_info, h, NULL, NULL, FALSE);
 
 	  if (dyn_i && dyn_i->want_plt2)
 	    {
@@ -4244,7 +4244,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 		got_r_type = R_IA64_DTPREL64LSB;
 		break;
 	      }
-	    dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, false);
+	    dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
 	    value = set_got_entry (input_bfd, info, dyn_i,
 				   (h ? h->dynindx : -1), rel->r_addend,
 				   value, got_r_type);
@@ -4270,7 +4270,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	     don't try to continue.  */
 	  (*info->callbacks->undefined_symbol)
 	    (info, "__gp", input_bfd, input_section, rel->r_offset, 1);
-	  return false;
+	  return FALSE;
 
 	case bfd_reloc_notsupported:
 	  {
@@ -4284,15 +4284,15 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 							symtab_hdr->sh_link,
 							sym->st_name);
 		if (name == NULL)
-		  return false;
+		  return FALSE;
 		if (*name == '\0')
 		  name = bfd_section_name (input_bfd, input_section);
 	      }
 	    if (!(*info->callbacks->warning) (info, _("unsupported reloc"),
 					      name, input_bfd,
 					      input_section, rel->r_offset))
-	      return false;
-	    ret_val = false;
+	      return FALSE;
+	    ret_val = FALSE;
 	  }
 	  break;
 
@@ -4311,7 +4311,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 							symtab_hdr->sh_link,
 							sym->st_name);
 		if (name == NULL)
-		  return false;
+		  return FALSE;
 		if (*name == '\0')
 		  name = bfd_section_name (input_bfd, input_section);
 	      }
@@ -4321,8 +4321,8 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 						     input_bfd,
 						     input_section,
 						     rel->r_offset))
-	      return false;
-	    ret_val = false;
+	      return FALSE;
+	    ret_val = FALSE;
 	  }
 	  break;
 	}
@@ -4331,7 +4331,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
   return ret_val;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -4342,7 +4342,7 @@ elfNN_ia64_finish_dynamic_symbol (output_bfd, info, h, sym)
   struct elfNN_ia64_dyn_sym_info *dyn_i;
 
   ia64_info = elfNN_ia64_hash_table (info);
-  dyn_i = get_dyn_sym_info (ia64_info, h, NULL, NULL, false);
+  dyn_i = get_dyn_sym_info (ia64_info, h, NULL, NULL, FALSE);
 
   /* Fill in the PLT data, if required.  */
   if (dyn_i && dyn_i->want_plt)
@@ -4368,7 +4368,7 @@ elfNN_ia64_finish_dynamic_symbol (output_bfd, info, h, sym)
       plt_addr = (plt_sec->output_section->vma
 		  + plt_sec->output_offset
 		  + dyn_i->plt_offset);
-      pltoff_addr = set_pltoff_entry (output_bfd, info, dyn_i, plt_addr, true);
+      pltoff_addr = set_pltoff_entry (output_bfd, info, dyn_i, plt_addr, TRUE);
 
       /* Initialize the FULL PLT entry, if needed.  */
       if (dyn_i->want_plt2)
@@ -4419,10 +4419,10 @@ elfNN_ia64_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_finish_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -4504,13 +4504,13 @@ elfNN_ia64_finish_dynamic_sections (abfd, info)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* ELF file flag handling: */
 
 /* Function to keep IA-64 specific file flags.  */
-static boolean
+static bfd_boolean
 elfNN_ia64_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -4519,31 +4519,31 @@ elfNN_ia64_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
-static boolean
+static bfd_boolean
 elfNN_ia64_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd, *obfd;
 {
   flagword out_flags;
   flagword in_flags;
-  boolean ok = true;
+  bfd_boolean ok = TRUE;
 
   /* Don't even pretend to support mixed-format linking.  */
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return false;
+    return FALSE;
 
   in_flags  = elf_elfheader (ibfd)->e_flags;
   out_flags = elf_elfheader (obfd)->e_flags;
 
   if (! elf_flags_init (obfd))
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = in_flags;
 
       if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
@@ -4553,12 +4553,12 @@ elfNN_ia64_merge_private_bfd_data (ibfd, obfd)
 				    bfd_get_mach (ibfd));
 	}
 
-      return true;
+      return TRUE;
     }
 
   /* Check flag compatibility.  */
   if (in_flags == out_flags)
-    return true;
+    return TRUE;
 
   /* Output has EF_IA_64_REDUCEDFP set only if all inputs have it set.  */
   if (!(in_flags & EF_IA_64_REDUCEDFP) && (out_flags & EF_IA_64_REDUCEDFP))
@@ -4571,7 +4571,7 @@ elfNN_ia64_merge_private_bfd_data (ibfd, obfd)
 	 bfd_archive_filename (ibfd));
 
       bfd_set_error (bfd_error_bad_value);
-      ok = false;
+      ok = FALSE;
     }
   if ((in_flags & EF_IA_64_BE) != (out_flags & EF_IA_64_BE))
     {
@@ -4580,7 +4580,7 @@ elfNN_ia64_merge_private_bfd_data (ibfd, obfd)
 	 bfd_archive_filename (ibfd));
 
       bfd_set_error (bfd_error_bad_value);
-      ok = false;
+      ok = FALSE;
     }
   if ((in_flags & EF_IA_64_ABI64) != (out_flags & EF_IA_64_ABI64))
     {
@@ -4589,7 +4589,7 @@ elfNN_ia64_merge_private_bfd_data (ibfd, obfd)
 	 bfd_archive_filename (ibfd));
 
       bfd_set_error (bfd_error_bad_value);
-      ok = false;
+      ok = FALSE;
     }
   if ((in_flags & EF_IA_64_CONS_GP) != (out_flags & EF_IA_64_CONS_GP))
     {
@@ -4598,7 +4598,7 @@ elfNN_ia64_merge_private_bfd_data (ibfd, obfd)
 	 bfd_archive_filename (ibfd));
 
       bfd_set_error (bfd_error_bad_value);
-      ok = false;
+      ok = FALSE;
     }
   if ((in_flags & EF_IA_64_NOFUNCDESC_CONS_GP)
       != (out_flags & EF_IA_64_NOFUNCDESC_CONS_GP))
@@ -4608,13 +4608,13 @@ elfNN_ia64_merge_private_bfd_data (ibfd, obfd)
 	 bfd_archive_filename (ibfd));
 
       bfd_set_error (bfd_error_bad_value);
-      ok = false;
+      ok = FALSE;
     }
 
   return ok;
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -4635,7 +4635,7 @@ elfNN_ia64_print_private_bfd_data (abfd, ptr)
 	   (flags & EF_IA_64_ABI64) ? "ABI64" : "ABI32");
 
   _bfd_elf_print_private_bfd_data (abfd, ptr);
-  return true;
+  return TRUE;
 }
 
 static enum elf_reloc_type_class
@@ -4659,7 +4659,7 @@ elfNN_ia64_reloc_type_class (rela)
     }
 }
 
-static boolean
+static bfd_boolean
 elfNN_ia64_hpux_vec (const bfd_target *vec)
 {
   extern const bfd_target bfd_elfNN_ia64_hpux_big_vec;
@@ -4677,7 +4677,7 @@ elfNN_hpux_post_process_headers (abfd, info)
   i_ehdrp->e_ident[EI_ABIVERSION] = 1;
 }
 
-boolean
+bfd_boolean
 elfNN_hpux_backend_section_from_bfd_section (abfd, sec, retval)
 	bfd *abfd ATTRIBUTE_UNUSED;
 	asection *sec;
@@ -4686,9 +4686,9 @@ elfNN_hpux_backend_section_from_bfd_section (abfd, sec, retval)
   if (bfd_is_com_section (sec))
     {
       *retval = SHN_IA_64_ANSI_COMMON;
-      return true;
+      return TRUE;
     }
-  return false;
+  return FALSE;
 }
 
 #define TARGET_LITTLE_SYM		bfd_elfNN_ia64_little_vec
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index c8e9906dd93..719071bf5a3 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -88,7 +88,7 @@ struct mips_elf_link_hash_entry
 
   /* If the R_MIPS_32, R_MIPS_REL32, or R_MIPS_64 reloc is against
      a readonly section.  */
-  boolean readonly_reloc;
+  bfd_boolean readonly_reloc;
 
   /* The index of the first dynamic relocation (in the .rel.dyn
      section) against this symbol.  */
@@ -98,7 +98,7 @@ struct mips_elf_link_hash_entry
      related to taking the function's address, i.e. any but
      R_MIPS_CALL*16 ones -- see "MIPS ABI Supplement, 3rd Edition",
      p. 4-20.  */
-  boolean no_fn_stub;
+  bfd_boolean no_fn_stub;
 
   /* If there is a stub that 32 bit functions should use to call this
      16 bit function, this points to the section containing the stub.  */
@@ -106,7 +106,7 @@ struct mips_elf_link_hash_entry
 
   /* Whether we need the fn_stub; this is set if this symbol appears
      in any relocs other than a 16 bit call.  */
-  boolean need_fn_stub;
+  bfd_boolean need_fn_stub;
 
   /* If there is a stub that 16 bit functions should use to call this
      32 bit function, this points to the section containing the stub.  */
@@ -117,7 +117,7 @@ struct mips_elf_link_hash_entry
   asection *call_fp_stub;
 
   /* Are we forced local?  .*/
-  boolean forced_local;
+  bfd_boolean forced_local;
 };
 
 /* MIPS ELF linker hash table.  */
@@ -136,11 +136,11 @@ struct mips_elf_link_hash_table
   bfd_size_type compact_rel_size;
   /* This flag indicates that the value of DT_MIPS_RLD_MAP dynamic
      entry is set to the address of __rld_obj_head as in IRIX5.  */
-  boolean use_rld_obj_head;
+  bfd_boolean use_rld_obj_head;
   /* This is the value of the __rld_map or __rld_obj_head symbol.  */
   bfd_vma rld_value;
   /* This is set if we see any mips16 stub sections.  */
-  boolean mips16_stubs_seen;
+  bfd_boolean mips16_stubs_seen;
 };
 
 /* Structure used to pass information to mips_elf_output_extsym.  */
@@ -151,7 +151,7 @@ struct extsym_info
   struct bfd_link_info *info;
   struct ecoff_debug_info *debug;
   const struct ecoff_debug_swap *swap;
-  boolean failed;
+  bfd_boolean failed;
 };
 
 /* The names of the runtime procedure table symbols used on IRIX5.  */
@@ -279,10 +279,10 @@ static struct bfd_hash_entry *mips_elf_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static void ecoff_swap_rpdr_out
   PARAMS ((bfd *, const RPDR *, struct rpdr_ext *));
-static boolean mips_elf_create_procedure_table
+static bfd_boolean mips_elf_create_procedure_table
   PARAMS ((PTR, bfd *, struct bfd_link_info *, asection *,
 	   struct ecoff_debug_info *));
-static boolean mips_elf_check_mips16_stubs
+static bfd_boolean mips_elf_check_mips16_stubs
   PARAMS ((struct mips_elf_link_hash_entry *, PTR));
 static void bfd_mips_elf32_swap_gptab_in
   PARAMS ((bfd *, const Elf32_External_gptab *, Elf32_gptab *));
@@ -300,7 +300,7 @@ static void bfd_mips_elf_swap_msym_out
   PARAMS ((bfd *, const Elf32_Internal_Msym *, Elf32_External_Msym *));
 static int sort_dynamic_relocs
   PARAMS ((const void *, const void *));
-static boolean mips_elf_output_extsym
+static bfd_boolean mips_elf_output_extsym
   PARAMS ((struct mips_elf_link_hash_entry *, PTR));
 static int gptab_compare PARAMS ((const void *, const void *));
 static asection * mips_elf_got_section PARAMS ((bfd *));
@@ -313,31 +313,31 @@ static bfd_vma mips_elf_global_got_index
 static bfd_vma mips_elf_got_page
   PARAMS ((bfd *, struct bfd_link_info *, bfd_vma, bfd_vma *));
 static bfd_vma mips_elf_got16_entry
-  PARAMS ((bfd *, struct bfd_link_info *, bfd_vma, boolean));
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_vma, bfd_boolean));
 static bfd_vma mips_elf_got_offset_from_index
   PARAMS ((bfd *, bfd *, bfd_vma));
 static bfd_vma mips_elf_create_local_got_entry
   PARAMS ((bfd *, struct mips_got_info *, asection *, bfd_vma));
-static boolean mips_elf_sort_hash_table
+static bfd_boolean mips_elf_sort_hash_table
   PARAMS ((struct bfd_link_info *, unsigned long));
-static boolean mips_elf_sort_hash_table_f
+static bfd_boolean mips_elf_sort_hash_table_f
   PARAMS ((struct mips_elf_link_hash_entry *, PTR));
-static boolean mips_elf_record_global_got_symbol
+static bfd_boolean mips_elf_record_global_got_symbol
   PARAMS ((struct elf_link_hash_entry *, struct bfd_link_info *,
 	   struct mips_got_info *));
 static const Elf_Internal_Rela *mips_elf_next_relocation
   PARAMS ((bfd *, unsigned int, const Elf_Internal_Rela *,
 	   const Elf_Internal_Rela *));
-static boolean mips_elf_local_relocation_p
-  PARAMS ((bfd *, const Elf_Internal_Rela *, asection **, boolean));
+static bfd_boolean mips_elf_local_relocation_p
+  PARAMS ((bfd *, const Elf_Internal_Rela *, asection **, bfd_boolean));
 static bfd_vma mips_elf_sign_extend PARAMS ((bfd_vma, int));
-static boolean mips_elf_overflow_p PARAMS ((bfd_vma, int));
+static bfd_boolean mips_elf_overflow_p PARAMS ((bfd_vma, int));
 static bfd_vma mips_elf_high PARAMS ((bfd_vma));
 static bfd_vma mips_elf_higher PARAMS ((bfd_vma));
 static bfd_vma mips_elf_highest PARAMS ((bfd_vma));
-static boolean mips_elf_create_compact_rel_section
+static bfd_boolean mips_elf_create_compact_rel_section
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean mips_elf_create_got_section
+static bfd_boolean mips_elf_create_got_section
   PARAMS ((bfd *, struct bfd_link_info *));
 static asection *mips_elf_create_msym_section
   PARAMS ((bfd *));
@@ -345,18 +345,18 @@ static bfd_reloc_status_type mips_elf_calculate_relocation
   PARAMS ((bfd *, bfd *, asection *, struct bfd_link_info *,
 	   const Elf_Internal_Rela *, bfd_vma, reloc_howto_type *,
 	   Elf_Internal_Sym *, asection **, bfd_vma *, const char **,
-	   boolean *, boolean));
+	   bfd_boolean *, bfd_boolean));
 static bfd_vma mips_elf_obtain_contents
   PARAMS ((reloc_howto_type *, const Elf_Internal_Rela *, bfd *, bfd_byte *));
-static boolean mips_elf_perform_relocation
+static bfd_boolean mips_elf_perform_relocation
   PARAMS ((struct bfd_link_info *, reloc_howto_type *,
 	   const Elf_Internal_Rela *, bfd_vma, bfd *, asection *, bfd_byte *,
-	   boolean));
-static boolean mips_elf_stub_section_p
+	   bfd_boolean));
+static bfd_boolean mips_elf_stub_section_p
   PARAMS ((bfd *, asection *));
 static void mips_elf_allocate_dynamic_relocations
   PARAMS ((bfd *, unsigned int));
-static boolean mips_elf_create_dynamic_relocation
+static bfd_boolean mips_elf_create_dynamic_relocation
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Rela *,
 	   struct mips_elf_link_hash_entry *, asection *,
 	   bfd_vma, bfd_vma *, asection *));
@@ -364,7 +364,7 @@ static INLINE int elf_mips_isa PARAMS ((flagword));
 static INLINE char* elf_mips_abi_name PARAMS ((bfd *));
 static void mips_elf_irix6_finish_dynamic_symbol
   PARAMS ((bfd *, const char *, Elf_Internal_Sym *));
-static boolean _bfd_mips_elf_mach_extends_p PARAMS ((flagword, flagword));
+static bfd_boolean _bfd_mips_elf_mach_extends_p PARAMS ((flagword, flagword));
 
 /* This will be used when we sort the dynamic relocation records.  */
 static bfd *reldyn_sorting_bfd;
@@ -436,7 +436,7 @@ static bfd *reldyn_sorting_bfd;
 #else
 #define MIPS_ELF_ADD_DYNAMIC_ENTRY(info, tag, val)			\
   (ABI_64_P (elf_hash_table (info)->dynobj)				\
-   ? (boolean) (abort (), false)					\
+   ? (abort (), FALSE)							\
    : bfd_elf32_add_dynamic_entry (info, (bfd_vma) tag, (bfd_vma) val))
 #endif
 
@@ -560,7 +560,7 @@ static bfd *reldyn_sorting_bfd;
 #define mips_elf_link_hash_traverse(table, func, info)			\
   (elf_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the MIPS ELF linker hash table from a link_info structure.  */
@@ -600,14 +600,14 @@ mips_elf_link_hash_newfunc (entry, table, string)
 	 not been set.  -1 means there is no associated ifd.  */
       ret->esym.ifd = -2;
       ret->possibly_dynamic_relocs = 0;
-      ret->readonly_reloc = false;
+      ret->readonly_reloc = FALSE;
       ret->min_dyn_reloc_index = 0;
-      ret->no_fn_stub = false;
+      ret->no_fn_stub = FALSE;
       ret->fn_stub = NULL;
-      ret->need_fn_stub = false;
+      ret->need_fn_stub = FALSE;
       ret->call_stub = NULL;
       ret->call_fp_stub = NULL;
-      ret->forced_local = false;
+      ret->forced_local = FALSE;
     }
 
   return (struct bfd_hash_entry *) ret;
@@ -616,7 +616,7 @@ mips_elf_link_hash_newfunc (entry, table, string)
 /* Read ECOFF debugging information from a .mdebug section into a
    ecoff_debug_info structure.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_read_ecoff_info (abfd, section, debug)
      bfd *abfd;
      asection *section;
@@ -673,7 +673,7 @@ _bfd_mips_elf_read_ecoff_info (abfd, section, debug)
   debug->fdr = NULL;
   debug->adjust = NULL;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (ext_hdr != NULL)
@@ -700,7 +700,7 @@ _bfd_mips_elf_read_ecoff_info (abfd, section, debug)
     free (debug->external_rfd);
   if (debug->external_ext != NULL)
     free (debug->external_ext);
-  return false;
+  return FALSE;
 }
 
 /* Swap RPDR (runtime procedure table entry) for output.  */
@@ -729,7 +729,7 @@ ecoff_swap_rpdr_out (abfd, in, ex)
 
 /* Create a runtime procedure table from the .mdebug section.  */
 
-static boolean
+static bfd_boolean
 mips_elf_create_procedure_table (handle, abfd, info, s, debug)
      PTR handle;
      bfd *abfd;
@@ -864,7 +864,7 @@ mips_elf_create_procedure_table (handle, abfd, info, s, debug)
   if (sv != NULL)
     free (sv);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (epdr != NULL)
@@ -877,13 +877,13 @@ mips_elf_create_procedure_table (handle, abfd, info, s, debug)
     free (ss);
   if (sv != NULL)
     free (sv);
-  return false;
+  return FALSE;
 }
 
 /* Check the mips16 stubs for a particular symbol, and see if we can
    discard them.  */
 
-static boolean
+static bfd_boolean
 mips_elf_check_mips16_stubs (h, data)
      struct mips_elf_link_hash_entry *h;
      PTR data ATTRIBUTE_UNUSED;
@@ -930,7 +930,7 @@ mips_elf_check_mips16_stubs (h, data)
       h->call_fp_stub->flags |= SEC_EXCLUDE;
     }
 
-  return true;
+  return TRUE;
 }
 
 bfd_reloc_status_type
@@ -940,7 +940,7 @@ _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry, input_section,
      asymbol *symbol;
      arelent *reloc_entry;
      asection *input_section;
-     boolean relocateable;
+     bfd_boolean relocateable;
      PTR data;
      bfd_vma gp;
 {
@@ -1199,36 +1199,36 @@ sort_dynamic_relocs (arg1, arg2)
    stripped but required by a reloc.  In particular, it can not happen
    when generating a final executable.  */
 
-static boolean
+static bfd_boolean
 mips_elf_output_extsym (h, data)
      struct mips_elf_link_hash_entry *h;
      PTR data;
 {
   struct extsym_info *einfo = (struct extsym_info *) data;
-  boolean strip;
+  bfd_boolean strip;
   asection *sec, *output_section;
 
   if (h->root.root.type == bfd_link_hash_warning)
     h = (struct mips_elf_link_hash_entry *) h->root.root.u.i.link;
 
   if (h->root.indx == -2)
-    strip = false;
+    strip = FALSE;
   else if (((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
 	    || (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0)
 	   && (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
 	   && (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
-    strip = true;
+    strip = TRUE;
   else if (einfo->info->strip == strip_all
 	   || (einfo->info->strip == strip_some
 	       && bfd_hash_lookup (einfo->info->keep_hash,
 				   h->root.root.root.string,
-				   false, false) == NULL))
-    strip = true;
+				   FALSE, FALSE) == NULL))
+    strip = TRUE;
   else
-    strip = false;
+    strip = FALSE;
 
   if (strip)
-    return true;
+    return TRUE;
 
   if (h->esym.ifd == -2)
     {
@@ -1337,7 +1337,7 @@ mips_elf_output_extsym (h, data)
   else if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
     {
       struct mips_elf_link_hash_entry *hd = h;
-      boolean no_fn_stub = h->no_fn_stub;
+      bfd_boolean no_fn_stub = h->no_fn_stub;
 
       while (hd->root.root.type == bfd_link_hash_indirect)
 	{
@@ -1372,11 +1372,11 @@ mips_elf_output_extsym (h, data)
 				      h->root.root.root.string,
 				      &h->esym))
     {
-      einfo->failed = true;
-      return false;
+      einfo->failed = TRUE;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* A comparison routine used to sort .gptab entries.  */
@@ -1543,7 +1543,7 @@ mips_elf_got16_entry (abfd, info, value, external)
      bfd *abfd;
      struct bfd_link_info *info;
      bfd_vma value;
-     boolean external;
+     bfd_boolean external;
 {
   asection *sgot;
   struct mips_got_info *g;
@@ -1637,7 +1637,7 @@ mips_elf_create_local_got_entry (abfd, g, sgot, value)
    _bfd_mips_elf_size_dynamic_sections, this value is 1.  Afterward, the
    section symbols are added and the count is higher.  */
 
-static boolean
+static bfd_boolean
 mips_elf_sort_hash_table (info, max_local)
      struct bfd_link_info *info;
      unsigned long max_local;
@@ -1665,14 +1665,14 @@ mips_elf_sort_hash_table (info, max_local)
   g = mips_elf_got_info (dynobj, NULL);
   g->global_gotsym = hsd.low;
 
-  return true;
+  return TRUE;
 }
 
 /* If H needs a GOT entry, assign it the highest available dynamic
    index.  Otherwise, assign it the lowest available dynamic
    index.  */
 
-static boolean
+static bfd_boolean
 mips_elf_sort_hash_table_f (h, data)
      struct mips_elf_link_hash_entry *h;
      PTR data;
@@ -1686,7 +1686,7 @@ mips_elf_sort_hash_table_f (h, data)
   /* Symbols without dynamic symbol table entries aren't interesting
      at all.  */
   if (h->root.dynindx == -1)
-    return true;
+    return TRUE;
 
   if (h->root.got.offset != 1)
     h->root.dynindx = hsd->max_non_got_dynindx++;
@@ -1696,14 +1696,14 @@ mips_elf_sort_hash_table_f (h, data)
       hsd->low = (struct elf_link_hash_entry *) h;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* If H is a symbol that needs a global GOT entry, but has a dynamic
    symbol table index lower than any we've seen to date, record it for
    posterity.  */
 
-static boolean
+static bfd_boolean
 mips_elf_record_global_got_symbol (h, info, g)
      struct elf_link_hash_entry *h;
      struct bfd_link_info *info;
@@ -1717,24 +1717,24 @@ mips_elf_record_global_got_symbol (h, info, g)
 	{
 	case STV_INTERNAL:
 	case STV_HIDDEN:
-	  _bfd_mips_elf_hide_symbol (info, h, true);
+	  _bfd_mips_elf_hide_symbol (info, h, TRUE);
 	  break;
 	}
       if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-	return false;
+	return FALSE;
     }
 
   /* If we've already marked this entry as needing GOT space, we don't
      need to do it again.  */
   if (h->got.offset != MINUS_ONE)
-    return true;
+    return TRUE;
 
   /* By setting this to a value other than -1, we are indicating that
      there needs to be a GOT entry for H.  Avoid using zero, as the
      generic ELF copy_indirect_symbol tests for <= 0.  */
   h->got.offset = 1;
 
-  return true;
+  return TRUE;
 }
 
 /* Returns the first relocation of type r_type found, beginning with
@@ -1768,13 +1768,13 @@ mips_elf_next_relocation (abfd, r_type, relocation, relend)
 
 /* Return whether a relocation is against a local symbol.  */
 
-static boolean
+static bfd_boolean
 mips_elf_local_relocation_p (input_bfd, relocation, local_sections,
 			     check_forced)
      bfd *input_bfd;
      const Elf_Internal_Rela *relocation;
      asection **local_sections;
-     boolean check_forced;
+     bfd_boolean check_forced;
 {
   unsigned long r_symndx;
   Elf_Internal_Shdr *symtab_hdr;
@@ -1786,9 +1786,9 @@ mips_elf_local_relocation_p (input_bfd, relocation, local_sections,
   extsymoff = (elf_bad_symtab (input_bfd)) ? 0 : symtab_hdr->sh_info;
 
   if (r_symndx < extsymoff)
-    return true;
+    return TRUE;
   if (elf_bad_symtab (input_bfd) && local_sections[r_symndx] != NULL)
-    return true;
+    return TRUE;
 
   if (check_forced)
     {
@@ -1801,10 +1801,10 @@ mips_elf_local_relocation_p (input_bfd, relocation, local_sections,
  	     || h->root.root.type == bfd_link_hash_warning)
 	h = (struct mips_elf_link_hash_entry *) h->root.root.u.i.link;
       if ((h->root.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
-	return true;
+	return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
 
 /* Sign-extend VALUE, which has the indicated number of BITS.  */
@@ -1825,7 +1825,7 @@ mips_elf_sign_extend (value, bits)
    range expressable by a signed number with the indicated number of
    BITS.  */
 
-static boolean
+static bfd_boolean
 mips_elf_overflow_p (value, bits)
      bfd_vma value;
      int bits;
@@ -1834,13 +1834,13 @@ mips_elf_overflow_p (value, bits)
 
   if (svalue > (1 << (bits - 1)) - 1)
     /* The value is too big.  */
-    return true;
+    return TRUE;
   else if (svalue < -(1 << (bits - 1)))
     /* The value is too small.  */
-    return true;
+    return TRUE;
 
   /* All is well.  */
-  return false;
+  return FALSE;
 }
 
 /* Calculate the %high function.  */
@@ -1882,7 +1882,7 @@ mips_elf_highest (value)
 
 /* Create the .compact_rel section.  */
 
-static boolean
+static bfd_boolean
 mips_elf_create_compact_rel_section (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1900,17 +1900,17 @@ mips_elf_create_compact_rel_section (abfd, info)
 	  || ! bfd_set_section_flags (abfd, s, flags)
 	  || ! bfd_set_section_alignment (abfd, s,
 					  MIPS_ELF_LOG_FILE_ALIGN (abfd)))
-	return false;
+	return FALSE;
 
       s->_raw_size = sizeof (Elf32_External_compact_rel);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Create the .got section to hold the global offset table.  */
 
-static boolean
+static bfd_boolean
 mips_elf_create_got_section (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -1924,7 +1924,7 @@ mips_elf_create_got_section (abfd, info)
 
   /* This function may be called more than once.  */
   if (mips_elf_got_section (abfd))
-    return true;
+    return TRUE;
 
   flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
 	   | SEC_LINKER_CREATED);
@@ -1933,7 +1933,7 @@ mips_elf_create_got_section (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags)
       || ! bfd_set_section_alignment (abfd, s, 4))
-    return false;
+    return FALSE;
 
   /* Define the symbol _GLOBAL_OFFSET_TABLE_.  We don't do this in the
      linker script because we don't want to define the symbol if we
@@ -1941,9 +1941,9 @@ mips_elf_create_got_section (abfd, info)
   bh = NULL;
   if (! (_bfd_generic_link_add_one_symbol
 	 (info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, s,
-	  (bfd_vma) 0, (const char *) NULL, false,
+	  (bfd_vma) 0, (const char *) NULL, FALSE,
 	  get_elf_backend_data (abfd)->collect, &bh)))
-    return false;
+    return FALSE;
 
   h = (struct elf_link_hash_entry *) bh;
   h->elf_link_hash_flags &= ~ELF_LINK_NON_ELF;
@@ -1952,7 +1952,7 @@ mips_elf_create_got_section (abfd, info)
 
   if (info->shared
       && ! bfd_elf32_link_record_dynamic_symbol (info, h))
-    return false;
+    return FALSE;
 
   /* The first several global offset table entries are reserved.  */
   s->_raw_size = MIPS_RESERVED_GOTNO * MIPS_ELF_GOT_SIZE (abfd);
@@ -1960,7 +1960,7 @@ mips_elf_create_got_section (abfd, info)
   amt = sizeof (struct mips_got_info);
   g = (struct mips_got_info *) bfd_alloc (abfd, amt);
   if (g == NULL)
-    return false;
+    return FALSE;
   g->global_gotsym = NULL;
   g->local_gotno = MIPS_RESERVED_GOTNO;
   g->assigned_gotno = MIPS_RESERVED_GOTNO;
@@ -1969,13 +1969,13 @@ mips_elf_create_got_section (abfd, info)
       amt = sizeof (struct bfd_elf_section_data);
       s->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
       if (elf_section_data (s) == NULL)
-	return false;
+	return FALSE;
     }
   elf_section_data (s)->tdata = (PTR) g;
   elf_section_data (s)->this_hdr.sh_flags
     |= SHF_ALLOC | SHF_WRITE | SHF_MIPS_GPREL;
 
-  return true;
+  return TRUE;
 }
 
 /* Returns the .msym section for ABFD, creating it if it does not
@@ -2035,8 +2035,8 @@ mips_elf_calculate_relocation (abfd, input_bfd, input_section, info,
      asection **local_sections;
      bfd_vma *valuep;
      const char **namep;
-     boolean *require_jalxp;
-     boolean save_addend;
+     bfd_boolean *require_jalxp;
+     bfd_boolean save_addend;
 {
   /* The eventual value we will return.  */
   bfd_vma value;
@@ -2059,20 +2059,20 @@ mips_elf_calculate_relocation (abfd, input_bfd, input_section, info,
      located.  */
   asection *sec = NULL;
   struct mips_elf_link_hash_entry *h = NULL;
-  /* True if the symbol referred to by this relocation is a local
+  /* TRUE if the symbol referred to by this relocation is a local
      symbol.  */
-  boolean local_p, was_local_p;
-  /* True if the symbol referred to by this relocation is "_gp_disp".  */
-  boolean gp_disp_p = false;
+  bfd_boolean local_p, was_local_p;
+  /* TRUE if the symbol referred to by this relocation is "_gp_disp".  */
+  bfd_boolean gp_disp_p = FALSE;
   Elf_Internal_Shdr *symtab_hdr;
   size_t extsymoff;
   unsigned long r_symndx;
   int r_type;
-  /* True if overflow occurred during the calculation of the
+  /* TRUE if overflow occurred during the calculation of the
      relocation value.  */
-  boolean overflowed_p;
-  /* True if this relocation refers to a MIPS16 function.  */
-  boolean target_is_16_bit_code_p = false;
+  bfd_boolean overflowed_p;
+  /* TRUE if this relocation refers to a MIPS16 function.  */
+  bfd_boolean target_is_16_bit_code_p = FALSE;
 
   /* Parse the relocation.  */
   r_symndx = ELF_R_SYM (input_bfd, relocation->r_info);
@@ -2082,13 +2082,13 @@ mips_elf_calculate_relocation (abfd, input_bfd, input_section, info,
        + relocation->r_offset);
 
   /* Assume that there will be no overflow.  */
-  overflowed_p = false;
+  overflowed_p = FALSE;
 
   /* Figure out whether or not the symbol is local, and get the offset
      used in the array of hash table entries.  */
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   local_p = mips_elf_local_relocation_p (input_bfd, relocation,
-					 local_sections, false);
+					 local_sections, FALSE);
   was_local_p = local_p;
   if (! elf_bad_symtab (input_bfd))
     extsymoff = symtab_hdr->sh_info;
@@ -2155,7 +2155,7 @@ mips_elf_calculate_relocation (abfd, input_bfd, input_section, info,
 	  if (r_type != R_MIPS_HI16 && r_type != R_MIPS_LO16)
 	    return bfd_reloc_notsupported;
 
-	  gp_disp_p = true;
+	  gp_disp_p = TRUE;
 	}
       /* If this symbol is defined, calculate its address.  Note that
 	 _gp_disp is a magic symbol, always implicitly defined by the
@@ -2276,7 +2276,7 @@ mips_elf_calculate_relocation (abfd, input_bfd, input_section, info,
                         || ((r_type == R_MIPS_26) && target_is_16_bit_code_p)));
 
   local_p = mips_elf_local_relocation_p (input_bfd, relocation,
-					 local_sections, true);
+					 local_sections, TRUE);
 
   /* If we haven't already determined the GOT offset, or the GP value,
      and we're going to need it, get it now.  */
@@ -2497,13 +2497,13 @@ mips_elf_calculate_relocation (abfd, input_bfd, input_section, info,
     case R_MIPS_CALL16:
       if (local_p)
 	{
-	  boolean forced;
+	  bfd_boolean forced;
 
 	  /* The special case is when the symbol is forced to be local.  We
 	     need the full address in the GOT since no R_MIPS_LO16 relocation
 	     follows.  */
 	  forced = ! mips_elf_local_relocation_p (input_bfd, relocation,
-						  local_sections, false);
+						  local_sections, FALSE);
 	  value = mips_elf_got16_entry (abfd, info, symbol + addend, forced);
 	  if (value == MINUS_ONE)
 	    return bfd_reloc_outofrange;
@@ -2631,13 +2631,13 @@ mips_elf_obtain_contents (howto, relocation, input_bfd, contents)
 /* It has been determined that the result of the RELOCATION is the
    VALUE.  Use HOWTO to place VALUE into the output file at the
    appropriate position.  The SECTION is the section to which the
-   relocation applies.  If REQUIRE_JALX is true, then the opcode used
+   relocation applies.  If REQUIRE_JALX is TRUE, then the opcode used
    for the relocation must be either JAL or JALX, and it is
    unconditionally converted to JALX.
 
-   Returns false if anything goes wrong.  */
+   Returns FALSE if anything goes wrong.  */
 
-static boolean
+static bfd_boolean
 mips_elf_perform_relocation (info, howto, relocation, value, input_bfd,
 			     input_section, contents, require_jalx)
      struct bfd_link_info *info;
@@ -2647,7 +2647,7 @@ mips_elf_perform_relocation (info, howto, relocation, value, input_bfd,
      bfd *input_bfd;
      asection *input_section;
      bfd_byte *contents;
-     boolean require_jalx;
+     bfd_boolean require_jalx;
 {
   bfd_vma x;
   bfd_byte *location;
@@ -2763,7 +2763,7 @@ mips_elf_perform_relocation (info, howto, relocation, value, input_bfd,
   /* If required, turn JAL into JALX.  */
   if (require_jalx)
     {
-      boolean ok;
+      bfd_boolean ok;
       bfd_vma opcode = x >> 26;
       bfd_vma jalx_opcode;
 
@@ -2788,7 +2788,7 @@ mips_elf_perform_relocation (info, howto, relocation, value, input_bfd,
 	     input_section->name,
 	     (unsigned long) relocation->r_offset);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       /* Make this the JALX opcode.  */
@@ -2803,12 +2803,12 @@ mips_elf_perform_relocation (info, howto, relocation, value, input_bfd,
 
   /* Put the value into the output.  */
   bfd_put (8 * bfd_get_reloc_size (howto), input_bfd, x, location);
-  return true;
+  return TRUE;
 }
 
-/* Returns true if SECTION is a MIPS16 stub section.  */
+/* Returns TRUE if SECTION is a MIPS16 stub section.  */
 
-static boolean
+static bfd_boolean
 mips_elf_stub_section_p (abfd, section)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section;
@@ -2846,7 +2846,7 @@ mips_elf_allocate_dynamic_relocations (abfd, n)
    dynamic relocation.  The ADDENDP is adjusted if necessary; the
    caller should store the result in place of the original addend.  */
 
-static boolean
+static bfd_boolean
 mips_elf_create_dynamic_relocation (output_bfd, info, rel, h, sec,
 				    symbol, addendp, input_section)
      bfd *output_bfd;
@@ -2859,7 +2859,7 @@ mips_elf_create_dynamic_relocation (output_bfd, info, rel, h, sec,
      asection *input_section;
 {
   Elf_Internal_Rela outrel[3];
-  boolean skip;
+  bfd_boolean skip;
   asection *sreloc;
   bfd *dynobj;
   int r_type;
@@ -2872,7 +2872,7 @@ mips_elf_create_dynamic_relocation (output_bfd, info, rel, h, sec,
   BFD_ASSERT (sreloc->reloc_count * MIPS_ELF_REL_SIZE (output_bfd)
 	      < sreloc->_raw_size);
 
-  skip = false;
+  skip = FALSE;
   outrel[0].r_offset =
     _bfd_elf_section_offset (output_bfd, info, input_section, rel[0].r_offset);
   outrel[1].r_offset =
@@ -2900,12 +2900,12 @@ mips_elf_create_dynamic_relocation (output_bfd, info, rel, h, sec,
       /* If we didn't need the relocation at all, this value will be
 	 -1.  */
       if (outrel[0].r_offset == (bfd_vma) -1)
-	skip = true;
+	skip = TRUE;
     }
 #endif
 
   if (outrel[0].r_offset == (bfd_vma) -1)
-    skip = true;
+    skip = TRUE;
   /* FIXME: For -2 runtime relocation needs to be skipped, but
      properly resolved statically and installed.  */
   BFD_ASSERT (outrel[0].r_offset != (bfd_vma) -2);
@@ -2939,7 +2939,7 @@ mips_elf_create_dynamic_relocation (output_bfd, info, rel, h, sec,
 	  else if (sec == NULL || sec->owner == NULL)
 	    {
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  else
 	    {
@@ -3047,7 +3047,7 @@ mips_elf_create_dynamic_relocation (output_bfd, info, rel, h, sec,
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the ISA for a MIPS e_flags value.  */
@@ -3276,7 +3276,7 @@ _bfd_mips_elf_symbol_processing (abfd, asym)
    sections that need the SHF_MIPS_GPREL flag by name; there has to be
    a better way.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_section_processing (abfd, hdr)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -3292,10 +3292,10 @@ _bfd_mips_elf_section_processing (abfd, hdr)
       if (bfd_seek (abfd,
 		    hdr->sh_offset + sizeof (Elf32_External_RegInfo) - 4,
 		    SEEK_SET) != 0)
-	return false;
+	return FALSE;
       H_PUT_32 (abfd, elf_gp (abfd), buf);
       if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
-	return false;
+	return FALSE;
     }
 
   if (hdr->sh_type == SHT_MIPS_OPTIONS
@@ -3331,10 +3331,10 @@ _bfd_mips_elf_section_processing (abfd, hdr)
 			     + sizeof (Elf_External_Options)
 			     + (sizeof (Elf64_External_RegInfo) - 8)),
 			     SEEK_SET) != 0)
-		return false;
+		return FALSE;
 	      H_PUT_64 (abfd, elf_gp (abfd), buf);
 	      if (bfd_bwrite (buf, (bfd_size_type) 8, abfd) != 8)
-		return false;
+		return FALSE;
 	    }
 	  else if (intopt.kind == ODK_REGINFO)
 	    {
@@ -3346,10 +3346,10 @@ _bfd_mips_elf_section_processing (abfd, hdr)
 			     + sizeof (Elf_External_Options)
 			     + (sizeof (Elf32_External_RegInfo) - 4)),
 			    SEEK_SET) != 0)
-		return false;
+		return FALSE;
 	      H_PUT_32 (abfd, elf_gp (abfd), buf);
 	      if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
-		return false;
+		return FALSE;
 	    }
 	  l += intopt.size;
 	}
@@ -3394,7 +3394,7 @@ _bfd_mips_elf_section_processing (abfd, hdr)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Handle a MIPS specific section when reading an object file.  This
@@ -3404,7 +3404,7 @@ _bfd_mips_elf_section_processing (abfd, hdr)
    FIXME: We need to handle the SHF_MIPS_GPREL flag, but I'm not sure
    how to.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -3421,67 +3421,67 @@ _bfd_mips_elf_section_from_shdr (abfd, hdr, name)
     {
     case SHT_MIPS_LIBLIST:
       if (strcmp (name, ".liblist") != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_MSYM:
       if (strcmp (name, ".msym") != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_CONFLICT:
       if (strcmp (name, ".conflict") != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_GPTAB:
       if (strncmp (name, ".gptab.", sizeof ".gptab." - 1) != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_UCODE:
       if (strcmp (name, ".ucode") != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_DEBUG:
       if (strcmp (name, ".mdebug") != 0)
-	return false;
+	return FALSE;
       flags = SEC_DEBUGGING;
       break;
     case SHT_MIPS_REGINFO:
       if (strcmp (name, ".reginfo") != 0
 	  || hdr->sh_size != sizeof (Elf32_External_RegInfo))
-	return false;
+	return FALSE;
       flags = (SEC_LINK_ONCE | SEC_LINK_DUPLICATES_SAME_SIZE);
       break;
     case SHT_MIPS_IFACE:
       if (strcmp (name, ".MIPS.interfaces") != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_CONTENT:
       if (strncmp (name, ".MIPS.content", sizeof ".MIPS.content" - 1) != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_OPTIONS:
       if (strcmp (name, MIPS_ELF_OPTIONS_SECTION_NAME (abfd)) != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_DWARF:
       if (strncmp (name, ".debug_", sizeof ".debug_" - 1) != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_SYMBOL_LIB:
       if (strcmp (name, ".MIPS.symlib") != 0)
-	return false;
+	return FALSE;
       break;
     case SHT_MIPS_EVENTS:
       if (strncmp (name, ".MIPS.events", sizeof ".MIPS.events" - 1) != 0
 	  && strncmp (name, ".MIPS.post_rel",
 		      sizeof ".MIPS.post_rel" - 1) != 0)
-	return false;
+	return FALSE;
       break;
     default:
-      return false;
+      return FALSE;
     }
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
 
   if (flags)
     {
@@ -3489,7 +3489,7 @@ _bfd_mips_elf_section_from_shdr (abfd, hdr, name)
 				   (bfd_get_section_flags (abfd,
 							   hdr->bfd_section)
 				    | flags)))
-	return false;
+	return FALSE;
     }
 
   /* FIXME: We should record sh_info for a .gptab section.  */
@@ -3506,7 +3506,7 @@ _bfd_mips_elf_section_from_shdr (abfd, hdr, name)
       if (! bfd_get_section_contents (abfd, hdr->bfd_section, (PTR) &ext,
 				      (file_ptr) 0,
 				      (bfd_size_type) sizeof ext))
-	return false;
+	return FALSE;
       bfd_mips_elf32_swap_reginfo_in (abfd, &ext, &s);
       elf_gp (abfd) = s.ri_gp_value;
     }
@@ -3521,12 +3521,12 @@ _bfd_mips_elf_section_from_shdr (abfd, hdr, name)
 
       contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
       if (contents == NULL)
-	return false;
+	return FALSE;
       if (! bfd_get_section_contents (abfd, hdr->bfd_section, contents,
 				      (file_ptr) 0, hdr->sh_size))
 	{
 	  free (contents);
-	  return false;
+	  return FALSE;
 	}
       l = contents;
       lend = contents + hdr->sh_size;
@@ -3563,14 +3563,14 @@ _bfd_mips_elf_section_from_shdr (abfd, hdr, name)
       free (contents);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the correct type for a MIPS ELF section.  We do this by the
    section name, which is a hack, but ought to work.  This routine is
    used by both the 32-bit and the 64-bit ABI.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_fake_sections (abfd, hdr, sec)
      bfd *abfd;
      Elf_Internal_Shdr *hdr;
@@ -3701,12 +3701,12 @@ _bfd_mips_elf_fake_sections (abfd, hdr, sec)
       BFD_ASSERT (esd->rel_hdr2 == NULL);
       esd->rel_hdr2 = (Elf_Internal_Shdr *) bfd_zalloc (abfd, amt);
       if (!esd->rel_hdr2)
-	return false;
+	return FALSE;
       _bfd_elf_init_reloc_shdr (abfd, esd->rel_hdr2, sec,
 				!elf_section_data (sec)->use_rela_p);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Given a BFD section, try to locate the corresponding ELF section
@@ -3715,7 +3715,7 @@ _bfd_mips_elf_fake_sections (abfd, hdr, sec)
    but for non-PIC objects we will certainly want support for at least
    the .scommon section.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_section_from_bfd_section (abfd, sec, retval)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec;
@@ -3724,20 +3724,20 @@ _bfd_mips_elf_section_from_bfd_section (abfd, sec, retval)
   if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
     {
       *retval = SHN_MIPS_SCOMMON;
-      return true;
+      return TRUE;
     }
   if (strcmp (bfd_get_section_name (abfd, sec), ".acommon") == 0)
     {
       *retval = SHN_MIPS_ACOMMON;
-      return true;
+      return TRUE;
     }
-  return false;
+  return FALSE;
 }
 
 /* Hook called by the linker routine which adds symbols from an object
    file.  We must handle the special MIPS section numbers here.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3753,7 +3753,7 @@ _bfd_mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
     {
       /* Skip IRIX5 rld entry name.  */
       *namep = NULL;
-      return true;
+      return TRUE;
     }
 
   switch (sym->st_shndx)
@@ -3781,12 +3781,12 @@ _bfd_mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
 	  elf_text_section = bfd_zalloc (abfd, amt);
 	  if (elf_text_section == NULL)
-	    return false;
+	    return FALSE;
 
 	  amt = sizeof (asymbol);
 	  elf_text_symbol = bfd_zalloc (abfd, amt);
 	  if (elf_text_symbol == NULL)
-	    return false;
+	    return FALSE;
 
 	  /* Initialize the section.  */
 
@@ -3822,12 +3822,12 @@ _bfd_mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 
 	  elf_data_section = bfd_zalloc (abfd, amt);
 	  if (elf_data_section == NULL)
-	    return false;
+	    return FALSE;
 
 	  amt = sizeof (asymbol);
 	  elf_data_symbol = bfd_zalloc (abfd, amt);
 	  if (elf_data_symbol == NULL)
-	    return false;
+	    return FALSE;
 
 	  /* Initialize the section.  */
 
@@ -3868,9 +3868,9 @@ _bfd_mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       bh = NULL;
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, abfd, *namep, BSF_GLOBAL, *secp,
-	      (bfd_vma) *valp, (const char *) NULL, false,
+	      (bfd_vma) *valp, (const char *) NULL, FALSE,
 	      get_elf_backend_data (abfd)->collect, &bh)))
-	return false;
+	return FALSE;
 
       h = (struct elf_link_hash_entry *) bh;
       h->elf_link_hash_flags &= ~ELF_LINK_NON_ELF;
@@ -3878,9 +3878,9 @@ _bfd_mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       h->type = STT_OBJECT;
 
       if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	return false;
+	return FALSE;
 
-      mips_elf_hash_table (info)->use_rld_obj_head = true;
+      mips_elf_hash_table (info)->use_rld_obj_head = TRUE;
     }
 
   /* If this is a mips16 text symbol, add 1 to the value to make it
@@ -3889,14 +3889,14 @@ _bfd_mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
   if (sym->st_other == STO_MIPS16)
     ++*valp;
 
-  return true;
+  return TRUE;
 }
 
 /* This hook function is called before the linker writes out a global
    symbol.  We mark symbols as small common if appropriate.  This is
    also where we undo the increment of the value for a mips16 symbol.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -3915,14 +3915,14 @@ _bfd_mips_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec)
       && (sym->st_value & 1) != 0)
     --sym->st_value;
 
-  return true;
+  return TRUE;
 }
 
 /* Functions for the dynamic linker.  */
 
 /* Create dynamic sections when linking against a dynamic object.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3941,19 +3941,19 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
   if (s != NULL)
     {
       if (! bfd_set_section_flags (abfd, s, flags))
-	return false;
+	return FALSE;
     }
 
   /* We need to create .got section.  */
   if (! mips_elf_create_got_section (abfd, info))
-    return false;
+    return FALSE;
 
   /* Create the .msym section on IRIX6.  It is used by the dynamic
      linker to speed up dynamic relocations, and to avoid computing
      the ELF hash for symbols.  */
   if (IRIX_COMPAT (abfd) == ict_irix6
       && !mips_elf_create_msym_section (abfd))
-    return false;
+    return FALSE;
 
   /* Create .stub section.  */
   if (bfd_get_section_by_name (abfd,
@@ -3964,7 +3964,7 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_CODE)
 	  || ! bfd_set_section_alignment (abfd, s,
 					  MIPS_ELF_LOG_FILE_ALIGN (abfd)))
-	return false;
+	return FALSE;
     }
 
   if ((IRIX_COMPAT (abfd) == ict_irix5 || IRIX_COMPAT (abfd) == ict_none)
@@ -3976,7 +3976,7 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
 	  || ! bfd_set_section_flags (abfd, s, flags &~ (flagword) SEC_READONLY)
 	  || ! bfd_set_section_alignment (abfd, s,
 					  MIPS_ELF_LOG_FILE_ALIGN (abfd)))
-	return false;
+	return FALSE;
     }
 
   /* On IRIX5, we adjust add some additional symbols and change the
@@ -3990,9 +3990,9 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
 	  bh = NULL;
 	  if (! (_bfd_generic_link_add_one_symbol
 		 (info, abfd, *namep, BSF_GLOBAL, bfd_und_section_ptr,
-		  (bfd_vma) 0, (const char *) NULL, false,
+		  (bfd_vma) 0, (const char *) NULL, FALSE,
 		  get_elf_backend_data (abfd)->collect, &bh)))
-	    return false;
+	    return FALSE;
 
 	  h = (struct elf_link_hash_entry *) bh;
 	  h->elf_link_hash_flags &= ~ELF_LINK_NON_ELF;
@@ -4000,14 +4000,14 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
 	  h->type = STT_SECTION;
 
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
 
       /* We need to create a .compact_rel section.  */
       if (SGI_COMPAT (abfd))
 	{
 	  if (!mips_elf_create_compact_rel_section (abfd, info))
-	    return false;
+	    return FALSE;
 	}
 
       /* Change alignments of some sections.  */
@@ -4036,9 +4036,9 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
       bh = NULL;
       if (!(_bfd_generic_link_add_one_symbol
 	    (info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr,
-	     (bfd_vma) 0, (const char *) NULL, false,
+	     (bfd_vma) 0, (const char *) NULL, FALSE,
 	     get_elf_backend_data (abfd)->collect, &bh)))
-	return false;
+	return FALSE;
 
       h = (struct elf_link_hash_entry *) bh;
       h->elf_link_hash_flags &= ~ELF_LINK_NON_ELF;
@@ -4046,7 +4046,7 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
       h->type = STT_SECTION;
 
       if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	return false;
+	return FALSE;
 
       if (! mips_elf_hash_table (info)->use_rld_obj_head)
 	{
@@ -4061,9 +4061,9 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
 	  bh = NULL;
 	  if (!(_bfd_generic_link_add_one_symbol
 		(info, abfd, name, BSF_GLOBAL, s,
-		 (bfd_vma) 0, (const char *) NULL, false,
+		 (bfd_vma) 0, (const char *) NULL, FALSE,
 		 get_elf_backend_data (abfd)->collect, &bh)))
-	    return false;
+	    return FALSE;
 
 	  h = (struct elf_link_hash_entry *) bh;
 	  h->elf_link_hash_flags &= ~ELF_LINK_NON_ELF;
@@ -4071,17 +4071,17 @@ _bfd_mips_elf_create_dynamic_sections (abfd, info)
 	  h->type = STT_OBJECT;
 
 	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -4101,7 +4101,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
   struct elf_backend_data *bed;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -4149,7 +4149,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 			     (Elf_Internal_Rela *) NULL,
 			     info->keep_memory));
 	      if (sec_relocs == NULL)
-		return false;
+		return FALSE;
 
 	      rend = sec_relocs + o->reloc_count;
 	      for (r = sec_relocs; r < rend; r++)
@@ -4172,7 +4172,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
                  can easily discard it by setting the SEC_EXCLUDE
                  flag.  */
 	      sec->flags |= SEC_EXCLUDE;
-	      return true;
+	      return TRUE;
 	    }
 
 	  /* Record this stub in an array of local symbol stubs for
@@ -4190,7 +4190,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	      amt = symcount * sizeof (asection *);
 	      n = (asection **) bfd_zalloc (abfd, amt);
 	      if (n == NULL)
-		return false;
+		return FALSE;
 	      elf_tdata (abfd)->local_stubs = n;
 	    }
 
@@ -4211,7 +4211,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	  /* H is the symbol this stub is for.  */
 
 	  h->fn_stub = sec;
-	  mips_elf_hash_table (info)->mips16_stubs_seen = true;
+	  mips_elf_hash_table (info)->mips16_stubs_seen = TRUE;
 	}
     }
   else if (strncmp (name, CALL_STUB, sizeof CALL_STUB - 1) == 0
@@ -4236,7 +4236,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	     the linker maps input sections to output sections, we can
 	     easily discard it by setting the SEC_EXCLUDE flag.  */
 	  sec->flags |= SEC_EXCLUDE;
-	  return true;
+	  return TRUE;
 	}
 
       h = ((struct mips_elf_link_hash_entry *)
@@ -4260,11 +4260,11 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
       if (*loc != NULL || h->root.other == STO_MIPS16)
 	{
 	  sec->flags |= SEC_EXCLUDE;
-	  return true;
+	  return TRUE;
 	}
 
       *loc = sec;
-      mips_elf_hash_table (info)->mips16_stubs_seen = true;
+      mips_elf_hash_table (info)->mips16_stubs_seen = TRUE;
     }
 
   if (dynobj == NULL)
@@ -4305,7 +4305,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	    (_("%s: Malformed reloc detected for section %s"),
 	     bfd_archive_filename (abfd), name);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       else
 	{
@@ -4336,7 +4336,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	      if (dynobj == NULL)
 		elf_hash_table (info)->dynobj = dynobj = abfd;
 	      if (! mips_elf_create_got_section (dynobj, info))
-		return false;
+		return FALSE;
 	      g = mips_elf_got_info (dynobj, &sgot);
 	      break;
 
@@ -4383,7 +4383,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 		(_("%s: CALL16 reloc at 0x%lx not against global symbol"),
 		 bfd_archive_filename (abfd), (unsigned long) rel->r_offset);
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  /* Fall through.  */
 
@@ -4393,7 +4393,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	    {
 	      /* This symbol requires a global offset table entry.  */
 	      if (! mips_elf_record_global_got_symbol (h, info, g))
-		return false;
+		return FALSE;
 
 	      /* We need a stub, not a plt entry for the undefined
 		 function.  But we record it as if it needs plt.  See
@@ -4409,7 +4409,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	case R_MIPS_GOT_DISP:
 	  /* This symbol requires a global offset table entry.  */
 	  if (h && ! mips_elf_record_global_got_symbol (h, info, g))
-	    return false;
+	    return FALSE;
 	  break;
 
 	case R_MIPS_32:
@@ -4436,7 +4436,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 						       | SEC_READONLY))
 			  || ! bfd_set_section_alignment (dynobj, sreloc,
 							  4))
-			return false;
+			return FALSE;
 		    }
 		}
 #define MIPS_READONLY_SECTION (SEC_ALLOC | SEC_LOAD | SEC_READONLY)
@@ -4465,7 +4465,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 		      == MIPS_READONLY_SECTION)
 		    /* We need it to tell the dynamic linker if there
 		       are relocations against the text segment.  */
-		    hmips->readonly_reloc = true;
+		    hmips->readonly_reloc = TRUE;
 		}
 
 	      /* Even though we don't directly need a GOT entry for
@@ -4474,7 +4474,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 		 dynamic relocations against it.  */
 	      if (h != NULL
 		  && ! mips_elf_record_global_got_symbol (h, info, g))
-		return false;
+		return FALSE;
 	    }
 
 	  if (SGI_COMPAT (abfd))
@@ -4495,14 +4495,14 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	     Reconstruct it for later use during GC.  */
 	case R_MIPS_GNU_VTINHERIT:
 	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	  /* This relocation describes which C++ vtable entries are actually
 	     used.  Record for later use during GC.  */
 	case R_MIPS_GNU_VTENTRY:
 	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-	    return false;
+	    return FALSE;
 	  break;
 
 	default:
@@ -4519,7 +4519,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	      struct mips_elf_link_hash_entry *mh;
 
 	      mh = (struct mips_elf_link_hash_entry *) h;
-	      mh->no_fn_stub = true;
+	      mh->no_fn_stub = TRUE;
 	    }
 	  break;
 	case R_MIPS_CALL16:
@@ -4543,11 +4543,11 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
 	  struct mips_elf_link_hash_entry *mh;
 
 	  mh = (struct mips_elf_link_hash_entry *) h;
-	  mh->need_fn_stub = true;
+	  mh->need_fn_stub = TRUE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -4556,7 +4556,7 @@ _bfd_mips_elf_check_relocs (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -4601,7 +4601,7 @@ _bfd_mips_elf_adjust_dynamic_symbol (info, h)
       && (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
     {
       if (! elf_hash_table (info)->dynamic_sections_created)
-	return true;
+	return TRUE;
 
       /* If this symbol is not defined in a regular file, then set
 	 the symbol to the stub location.  This is required to make
@@ -4625,7 +4625,7 @@ _bfd_mips_elf_adjust_dynamic_symbol (info, h)
 
 	  /* The last half word of the stub will be filled with the index
 	     of this symbol in .dynsym section.  */
-	  return true;
+	  return TRUE;
 	}
     }
   else if ((h->type == STT_FUNC)
@@ -4634,7 +4634,7 @@ _bfd_mips_elf_adjust_dynamic_symbol (info, h)
       /* This will set the entry for this symbol in the GOT to 0, and
          the dynamic linker will take care of this.  */
       h->root.u.def.value = 0;
-      return true;
+      return TRUE;
     }
 
   /* If this is a weak symbol, and there is a real definition, the
@@ -4646,20 +4646,20 @@ _bfd_mips_elf_adjust_dynamic_symbol (info, h)
 		  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
      is not a function.  */
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called after all the input files have been read,
    and the input sections have been assigned to output sections.  We
    check for any mips16 stub sections that we can discard.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_always_size_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -4674,25 +4674,25 @@ _bfd_mips_elf_always_size_sections (output_bfd, info)
 
   if (info->relocateable
       || ! mips_elf_hash_table (info)->mips16_stubs_seen)
-    return true;
+    return TRUE;
 
   mips_elf_link_hash_traverse (mips_elf_hash_table (info),
 			       mips_elf_check_mips16_stubs,
 			       (PTR) NULL);
 
-  return true;
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean reltext;
+  bfd_boolean reltext;
   struct mips_got_info *g = NULL;
 
   dynobj = elf_hash_table (info)->dynobj;
@@ -4715,11 +4715,11 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  reltext = false;
+  reltext = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       /* It's OK to base decisions on the section name, because none
 	 of the dynobj section names depend upon the input files.  */
@@ -4728,7 +4728,7 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
       if ((s->flags & SEC_LINKER_CREATED) == 0)
 	continue;
 
-      strip = false;
+      strip = FALSE;
 
       if (strncmp (name, ".rel", 4) == 0)
 	{
@@ -4743,7 +4743,7 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
 		  && strcmp (name,
 			     bfd_get_section_name (s->output_section->owner,
 						   s->output_section)) == 0)
-		strip = true;
+		strip = TRUE;
 	    }
 	  else
 	    {
@@ -4763,7 +4763,7 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
 		   && (target->flags & SEC_READONLY) != 0
 		   && (target->flags & SEC_ALLOC) != 0)
 		  || strcmp (outname, ".rel.dyn") == 0)
-		reltext = true;
+		reltext = TRUE;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -4819,7 +4819,7 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
 	     that need GOT entries at the end of the symbol table.  We
 	     do that here.  */
  	  if (! mips_elf_sort_hash_table (info, 1))
- 	    return false;
+ 	    return FALSE;
 
 	  if (g->global_gotsym != NULL)
 	    i = elf_hash_table (info)->dynsymcount - g->global_gotsym->dynindx;
@@ -4868,7 +4868,7 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
       if (s->contents == NULL && s->_raw_size != 0)
 	{
 	  bfd_set_error (bfd_error_no_memory);
-	  return false;
+	  return FALSE;
 	}
     }
 
@@ -4884,11 +4884,11 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
 	  /* SGI object has the equivalence of DT_DEBUG in the
 	     DT_MIPS_RLD_MAP entry.  */
 	  if (!MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_RLD_MAP, 0))
-	    return false;
+	    return FALSE;
 	  if (!SGI_COMPAT (output_bfd))
 	    {
 	      if (!MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_DEBUG, 0))
-		return false;
+		return FALSE;
 	    }
 	}
       else
@@ -4897,7 +4897,7 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
 	  if (!SGI_COMPAT (output_bfd))
 	    {
 	      if (!MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_DEBUG, 0))
-		return false;
+		return FALSE;
 	    }
 	}
 
@@ -4907,106 +4907,106 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
       if ((info->flags & DF_TEXTREL) != 0)
 	{
 	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_TEXTREL, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_PLTGOT, 0))
-	return false;
+	return FALSE;
 
       if (bfd_get_section_by_name (dynobj, ".rel.dyn"))
 	{
 	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_REL, 0))
-	    return false;
+	    return FALSE;
 
 	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELSZ, 0))
-	    return false;
+	    return FALSE;
 
 	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELENT, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (SGI_COMPAT (output_bfd))
 	{
 	  if (!MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_CONFLICTNO, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (SGI_COMPAT (output_bfd))
 	{
 	  if (!MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_LIBLISTNO, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (bfd_get_section_by_name (dynobj, ".conflict") != NULL)
 	{
 	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_CONFLICT, 0))
-	    return false;
+	    return FALSE;
 
 	  s = bfd_get_section_by_name (dynobj, ".liblist");
 	  BFD_ASSERT (s != NULL);
 
 	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_LIBLIST, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_RLD_VERSION, 0))
-	return false;
+	return FALSE;
 
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_FLAGS, 0))
-	return false;
+	return FALSE;
 
 #if 0
       /* Time stamps in executable files are a bad idea.  */
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_TIME_STAMP, 0))
-	return false;
+	return FALSE;
 #endif
 
 #if 0 /* FIXME  */
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_ICHECKSUM, 0))
-	return false;
+	return FALSE;
 #endif
 
 #if 0 /* FIXME  */
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_IVERSION, 0))
-	return false;
+	return FALSE;
 #endif
 
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_BASE_ADDRESS, 0))
-	return false;
+	return FALSE;
 
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_LOCAL_GOTNO, 0))
-	return false;
+	return FALSE;
 
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_SYMTABNO, 0))
-	return false;
+	return FALSE;
 
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_UNREFEXTNO, 0))
-	return false;
+	return FALSE;
 
       if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_GOTSYM, 0))
-	return false;
+	return FALSE;
 
       if (IRIX_COMPAT (dynobj) == ict_irix5
 	  && ! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_HIPAGENO, 0))
-	return false;
+	return FALSE;
 
       if (IRIX_COMPAT (dynobj) == ict_irix6
 	  && (bfd_get_section_by_name
 	      (dynobj, MIPS_ELF_OPTIONS_SECTION_NAME (dynobj)))
 	  && !MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_OPTIONS, 0))
-	return false;
+	return FALSE;
 
       if (bfd_get_section_by_name (dynobj, ".msym")
 	  && !MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_MSYM, 0))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Relocate a MIPS ELF section.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 				contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -5021,7 +5021,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *relend;
   bfd_vma addend = 0;
-  boolean use_saved_addend_p = false;
+  bfd_boolean use_saved_addend_p = FALSE;
   struct elf_backend_data *bed;
 
   bed = get_elf_backend_data (output_bfd);
@@ -5031,10 +5031,10 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       const char *name;
       bfd_vma value;
       reloc_howto_type *howto;
-      boolean require_jalx;
-      /* True if the relocation is a RELA relocation, rather than a
+      bfd_boolean require_jalx;
+      /* TRUE if the relocation is a RELA relocation, rather than a
          REL relocation.  */
-      boolean rela_relocation_p = true;
+      bfd_boolean rela_relocation_p = TRUE;
       unsigned int r_type = ELF_R_TYPE (output_bfd, rel->r_info);
       const char * msg = (const char *) NULL;
 
@@ -5047,7 +5047,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	     space.  Thus, when they use an R_MIPS_64 they mean what is
 	     usually meant by R_MIPS_32, with the exception that the
 	     stored value is sign-extended to 64 bits.  */
-	  howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, R_MIPS_32, false);
+	  howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, R_MIPS_32, FALSE);
 
 	  /* On big-endian systems, we need to lie about the position
 	     of the reloc.  */
@@ -5079,7 +5079,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	  if (rel_hdr->sh_entsize == MIPS_ELF_REL_SIZE (input_bfd))
 	    {
 	      /* Note that this is a REL relocation.  */
-	      rela_relocation_p = false;
+	      rela_relocation_p = FALSE;
 
 	      /* Get the addend, which is stored in the input file.  */
 	      addend = mips_elf_obtain_contents (howto, rel, input_bfd,
@@ -5094,7 +5094,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		  || r_type == R_MIPS_GNU_REL_HI16
 		  || (r_type == R_MIPS_GOT16
 		      && mips_elf_local_relocation_p (input_bfd, rel,
-						      local_sections, false)))
+						      local_sections, FALSE)))
 		{
 		  bfd_vma l;
 		  const Elf_Internal_Rela *lo16_relocation;
@@ -5115,10 +5115,10 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		  lo16_relocation = mips_elf_next_relocation (input_bfd, lo,
 							      rel, relend);
 		  if (lo16_relocation == NULL)
-		    return false;
+		    return FALSE;
 
 		  /* Obtain the addend kept there.  */
-		  lo16_howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, lo, false);
+		  lo16_howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, lo, FALSE);
 		  l = mips_elf_obtain_contents (lo16_howto, lo16_relocation,
 						input_bfd, contents);
 		  l &= lo16_howto->src_mask;
@@ -5171,7 +5171,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	     that we're adjusting GP in this relocateable object.  */
 
 	  if (! mips_elf_local_relocation_p (input_bfd, rel, local_sections,
-					     false))
+					     FALSE))
 	    /* There's nothing to do for non-local relocations.  */
 	    continue;
 
@@ -5259,8 +5259,8 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	      if (! mips_elf_perform_relocation (info, howto, rel, addend,
 						 input_bfd, input_section,
-						 contents, false))
-		return false;
+						 contents, FALSE))
+		return FALSE;
 	    }
 
 	  /* Go on to the next relocation.  */
@@ -5274,9 +5274,9 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       if (rel + 1 < relend
 	  && rel->r_offset == rel[1].r_offset
 	  && ELF_R_TYPE (input_bfd, rel[1].r_info) != R_MIPS_NONE)
-	use_saved_addend_p = true;
+	use_saved_addend_p = TRUE;
       else
-	use_saved_addend_p = false;
+	use_saved_addend_p = FALSE;
 
       addend >>= howto->rightshift;
 
@@ -5303,7 +5303,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	  msg = _("internal error: unsupported relocation error");
 	  info->callbacks->warning
 	    (info, msg, name, input_bfd, input_section, rel->r_offset);
-	  return false;
+	  return FALSE;
 
 	case bfd_reloc_overflow:
 	  if (use_saved_addend_p)
@@ -5316,7 +5316,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->reloc_overflow)
 		     (info, name, howto->name, (bfd_vma) 0,
 		      input_bfd, input_section, rel->r_offset)))
-		return false;
+		return FALSE;
 	    }
 	  break;
 
@@ -5385,10 +5385,10 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       if (! mips_elf_perform_relocation (info, howto, rel, value,
 					 input_bfd, input_section,
 					 contents, require_jalx))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* If NAME is one of the special IRIX6 symbols defined by the linker,
@@ -5445,7 +5445,7 @@ mips_elf_irix6_finish_dynamic_symbol (abfd, name, sym)
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -5479,7 +5479,7 @@ _bfd_mips_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
 
       /* FIXME: Can h->dynindex be more than 64K?  */
       if (h->dynindx & 0xffff0000)
-	return false;
+	return FALSE;
 
       /* Fill the stub.  */
       bfd_put_32 (output_bfd, STUB_LW (output_bfd), stub);
@@ -5630,12 +5630,12 @@ _bfd_mips_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
       && (sym->st_value & 1) != 0)
     --sym->st_value;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -5674,13 +5674,13 @@ _bfd_mips_elf_finish_dynamic_sections (output_bfd, info)
 	  const char *name;
 	  size_t elemsize;
 	  asection *s;
-	  boolean swap_out_p;
+	  bfd_boolean swap_out_p;
 
 	  /* Read in the current dynamic entry.  */
 	  (*get_elf_backend_data (dynobj)->s->swap_dyn_in) (dynobj, b, &dyn);
 
 	  /* Assume that we're going to modify it and write it out.  */
-	  swap_out_p = true;
+	  swap_out_p = TRUE;
 
 	  switch (dyn.d_tag)
 	    {
@@ -5745,12 +5745,12 @@ _bfd_mips_elf_finish_dynamic_sections (output_bfd, info)
 
 	    case DT_MIPS_ICHECKSUM:
 	      /* XXX FIXME: */
-	      swap_out_p = false;
+	      swap_out_p = FALSE;
 	      break;
 
 	    case DT_MIPS_IVERSION:
 	      /* XXX FIXME: */
-	      swap_out_p = false;
+	      swap_out_p = FALSE;
 	      break;
 
 	    case DT_MIPS_BASE_ADDRESS:
@@ -5812,7 +5812,7 @@ _bfd_mips_elf_finish_dynamic_sections (output_bfd, info)
 	      break;
 
 	    default:
-	      swap_out_p = false;
+	      swap_out_p = FALSE;
 	      break;
 	    }
 
@@ -5918,7 +5918,7 @@ _bfd_mips_elf_finish_dynamic_sections (output_bfd, info)
       memset (s->contents, 0, MIPS_ELF_REL_SIZE (dynobj));
   }
 
-  return true;
+  return TRUE;
 }
 
 /* The final processing done just before writing out a MIPS ELF object
@@ -5928,7 +5928,7 @@ _bfd_mips_elf_finish_dynamic_sections (output_bfd, info)
 void
 _bfd_mips_elf_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
   unsigned int i;
@@ -6113,7 +6113,7 @@ _bfd_mips_elf_additional_program_headers (abfd)
 
 /* Modify the segment map for an IRIX5 executable.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_modify_segment_map (abfd)
      bfd *abfd;
 {
@@ -6134,7 +6134,7 @@ _bfd_mips_elf_modify_segment_map (abfd)
 	  amt = sizeof *m;
 	  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
 	  if (m == NULL)
-	    return false;
+	    return FALSE;
 
 	  m->p_type = PT_MIPS_REGINFO;
 	  m->count = 1;
@@ -6186,7 +6186,7 @@ _bfd_mips_elf_modify_segment_map (abfd)
 	  options_segment->next = *pm;
 	  options_segment->p_type = PT_MIPS_OPTIONS;
 	  options_segment->p_flags = PF_R;
-	  options_segment->p_flags_valid = true;
+	  options_segment->p_flags_valid = TRUE;
 	  options_segment->count = 1;
 	  options_segment->sections[0] = s;
 	  *pm = options_segment;
@@ -6210,7 +6210,7 @@ _bfd_mips_elf_modify_segment_map (abfd)
 		  amt = sizeof *m;
 		  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
 		  if (m == NULL)
-		    return false;
+		    return FALSE;
 
 		  m->p_type = PT_MIPS_RTPROC;
 
@@ -6301,7 +6301,7 @@ _bfd_mips_elf_modify_segment_map (abfd)
 	  amt = sizeof *n + (bfd_size_type) (c - 1) * sizeof (asection *);
 	  n = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
 	  if (n == NULL)
-	    return false;
+	    return FALSE;
 	  *n = *m;
 	  n->count = c;
 
@@ -6323,7 +6323,7 @@ _bfd_mips_elf_modify_segment_map (abfd)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the section that should be marked against GC for a given
@@ -6370,7 +6370,7 @@ _bfd_mips_elf_gc_mark_hook (sec, info, rel, h, sym)
 
 /* Update the got entry reference counts for the section being removed.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -6412,7 +6412,7 @@ _bfd_mips_elf_gc_sweep_hook (abfd, info, sec, relocs)
       }
 #endif
 
-  return true;
+  return TRUE;
 }
 
 /* Copy data from a MIPS ELF indirect symbol to its direct symbol,
@@ -6436,20 +6436,20 @@ _bfd_mips_elf_copy_indirect_symbol (bed, dir, ind)
   indmips = (struct mips_elf_link_hash_entry *) ind;
   dirmips->possibly_dynamic_relocs += indmips->possibly_dynamic_relocs;
   if (indmips->readonly_reloc)
-    dirmips->readonly_reloc = true;
+    dirmips->readonly_reloc = TRUE;
   if (dirmips->min_dyn_reloc_index == 0
       || (indmips->min_dyn_reloc_index != 0
 	  && indmips->min_dyn_reloc_index < dirmips->min_dyn_reloc_index))
     dirmips->min_dyn_reloc_index = indmips->min_dyn_reloc_index;
   if (indmips->no_fn_stub)
-    dirmips->no_fn_stub = true;
+    dirmips->no_fn_stub = TRUE;
 }
 
 void
 _bfd_mips_elf_hide_symbol (info, entry, force_local)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *entry;
-     boolean force_local;
+     bfd_boolean force_local;
 {
   bfd *dynobj;
   asection *got;
@@ -6459,7 +6459,7 @@ _bfd_mips_elf_hide_symbol (info, entry, force_local)
   h = (struct mips_elf_link_hash_entry *) entry;
   if (h->forced_local)
     return;
-  h->forced_local = true;
+  h->forced_local = TRUE;
 
   dynobj = elf_hash_table (info)->dynobj;
   got = bfd_get_section_by_name (dynobj, ".got");
@@ -6474,31 +6474,31 @@ _bfd_mips_elf_hide_symbol (info, entry, force_local)
 
 #define PDR_SIZE 32
 
-boolean
+bfd_boolean
 _bfd_mips_elf_discard_info (abfd, cookie, info)
      bfd *abfd;
      struct elf_reloc_cookie *cookie;
      struct bfd_link_info *info;
 {
   asection *o;
-  boolean ret = false;
+  bfd_boolean ret = FALSE;
   unsigned char *tdata;
   size_t i, skip;
 
   o = bfd_get_section_by_name (abfd, ".pdr");
   if (! o)
-    return false;
+    return FALSE;
   if (o->_raw_size == 0)
-    return false;
+    return FALSE;
   if (o->_raw_size % PDR_SIZE != 0)
-    return false;
+    return FALSE;
   if (o->output_section != NULL
       && bfd_is_abs_section (o->output_section))
-    return false;
+    return FALSE;
 
   tdata = bfd_zmalloc (o->_raw_size / PDR_SIZE);
   if (! tdata)
-    return false;
+    return FALSE;
 
   cookie->rels = (MNAME(abfd,_bfd_elf,link_read_relocs)
 		  (abfd, o, (PTR) NULL,
@@ -6507,7 +6507,7 @@ _bfd_mips_elf_discard_info (abfd, cookie, info)
   if (!cookie->rels)
     {
       free (tdata);
-      return false;
+      return FALSE;
     }
 
   cookie->rel = cookie->rels;
@@ -6526,7 +6526,7 @@ _bfd_mips_elf_discard_info (abfd, cookie, info)
     {
       elf_section_data (o)->tdata = tdata;
       o->_cooked_size = o->_raw_size - skip * PDR_SIZE;
-      ret = true;
+      ret = TRUE;
     }
   else
     free (tdata);
@@ -6537,16 +6537,16 @@ _bfd_mips_elf_discard_info (abfd, cookie, info)
   return ret;
 }
 
-boolean
+bfd_boolean
 _bfd_mips_elf_ignore_discarded_relocs (sec)
      asection *sec;
 {
   if (strcmp (sec->name, ".pdr") == 0)
-    return true;
-  return false;
+    return TRUE;
+  return FALSE;
 }
 
-boolean
+bfd_boolean
 _bfd_mips_elf_write_section (output_bfd, sec, contents)
      bfd *output_bfd;
      asection *sec;
@@ -6556,10 +6556,10 @@ _bfd_mips_elf_write_section (output_bfd, sec, contents)
   int i;
 
   if (strcmp (sec->name, ".pdr") != 0)
-    return false;
+    return FALSE;
 
   if (elf_section_data (sec)->tdata == NULL)
-    return false;
+    return FALSE;
 
   to = contents;
   end = contents + sec->_raw_size;
@@ -6576,7 +6576,7 @@ _bfd_mips_elf_write_section (output_bfd, sec, contents)
   bfd_set_section_contents (output_bfd, sec->output_section, contents,
 			    (file_ptr) sec->output_offset,
 			    sec->_cooked_size);
-  return true;
+  return TRUE;
 }
 
 /* MIPS ELF uses a special find_nearest_line routine in order the
@@ -6588,7 +6588,7 @@ struct mips_elf_find_line
   struct ecoff_find_line i;
 };
 
-boolean
+bfd_boolean
 _bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 				 functionname_ptr, line_ptr)
      bfd *abfd;
@@ -6604,14 +6604,14 @@ _bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
   if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr))
-    return true;
+    return TRUE;
 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr,
 				     (unsigned) (ABI_64_P (abfd) ? 8 : 0),
 				     &elf_tdata (abfd)->dwarf2_find_line_info))
-    return true;
+    return TRUE;
 
   msec = bfd_get_section_by_name (abfd, ".mdebug");
   if (msec != NULL)
@@ -6641,13 +6641,13 @@ _bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 	  if (fi == NULL)
 	    {
 	      msec->flags = origflags;
-	      return false;
+	      return FALSE;
 	    }
 
 	  if (! _bfd_mips_elf_read_ecoff_info (abfd, msec, &fi->d))
 	    {
 	      msec->flags = origflags;
-	      return false;
+	      return FALSE;
 	    }
 
 	  /* Swap in the FDR information.  */
@@ -6656,7 +6656,7 @@ _bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 	  if (fi->d.fdr == NULL)
 	    {
 	      msec->flags = origflags;
-	      return false;
+	      return FALSE;
 	    }
 	  external_fdr_size = swap->external_fdr_size;
 	  fdr_ptr = fi->d.fdr;
@@ -6681,7 +6681,7 @@ _bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 				  line_ptr))
 	{
 	  msec->flags = origflags;
-	  return true;
+	  return TRUE;
 	}
 
       msec->flags = origflags;
@@ -6698,7 +6698,7 @@ _bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
    remember the bytes we are writing out, so that we can install the
    GP value in the section_processing routine.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -6715,7 +6715,7 @@ _bfd_mips_elf_set_section_contents (abfd, section, location, offset, count)
 	  bfd_size_type amt = sizeof (struct bfd_elf_section_data);
 	  section->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
 	  if (elf_section_data (section) == NULL)
-	    return false;
+	    return FALSE;
 	}
       c = (bfd_byte *) elf_section_data (section)->tdata;
       if (c == NULL)
@@ -6728,7 +6728,7 @@ _bfd_mips_elf_set_section_contents (abfd, section, location, offset, count)
 	    size = section->_raw_size;
 	  c = (bfd_byte *) bfd_zalloc (abfd, size);
 	  if (c == NULL)
-	    return false;
+	    return FALSE;
 	  elf_section_data (section)->tdata = (PTR) c;
 	}
 
@@ -6749,7 +6749,7 @@ _bfd_elf_mips_get_relocated_section_contents (abfd, link_info, link_order,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   /* Get enough memory to hold the stuff */
@@ -6777,7 +6777,7 @@ _bfd_elf_mips_get_relocated_section_contents (abfd, link_info, link_order,
 
   /* We're not relaxing the section, so just copy the size info */
   input_section->_cooked_size = input_section->_raw_size;
-  input_section->reloc_done = true;
+  input_section->reloc_done = TRUE;
 
   reloc_count = bfd_canonicalize_reloc (input_bfd,
 					input_section,
@@ -6802,7 +6802,7 @@ _bfd_elf_mips_get_relocated_section_contents (abfd, link_info, link_order,
 	  lh = 0;
 	else
 	  {
-	    h = bfd_hash_lookup (&link_info->hash->table, "_gp", false, false);
+	    h = bfd_hash_lookup (&link_info->hash->table, "_gp", FALSE, FALSE);
 	    lh = (struct bfd_link_hash_entry *) h;
 	  }
       lookup:
@@ -6888,7 +6888,7 @@ _bfd_elf_mips_get_relocated_section_contents (abfd, link_info, link_order,
 		  if (!((*link_info->callbacks->undefined_symbol)
 			(link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
 			 input_bfd, input_section, (*parent)->address,
-			 true)))
+			 TRUE)))
 		    goto error_return;
 		  break;
 		case bfd_reloc_dangerous:
@@ -6951,9 +6951,9 @@ _bfd_mips_elf_link_hash_table_create (abfd)
 #endif
   ret->procedure_count = 0;
   ret->compact_rel_size = 0;
-  ret->use_rld_obj_head = false;
+  ret->use_rld_obj_head = FALSE;
   ret->rld_value = 0;
-  ret->mips16_stubs_seen = false;
+  ret->mips16_stubs_seen = FALSE;
 
   return &ret->root.root;
 }
@@ -6962,7 +6962,7 @@ _bfd_mips_elf_link_hash_table_create (abfd)
    the .mdebug sections.  We need to merge all instances of these
    sections together, not write them all out sequentially.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -7024,7 +7024,7 @@ _bfd_mips_elf_final_link (abfd, info)
       if (! mips_elf_sort_hash_table (info, (info->shared
 					     ? bfd_count_sections (abfd) + 1
 					     : 1)))
-	return false;
+	return FALSE;
 
       /* Make sure we didn't grow the global .got region.  */
       dynobj = elf_hash_table (info)->dynobj;
@@ -7072,7 +7072,7 @@ _bfd_mips_elf_final_link (abfd, info)
 	  (*secpp)->link_order_head = NULL;
 	  bfd_section_list_remove (abfd, secpp);
 	  --abfd->section_count;
-	    
+
 	  break;
 	}
     }
@@ -7083,7 +7083,7 @@ _bfd_mips_elf_final_link (abfd, info)
     {
       struct bfd_link_hash_entry *h;
 
-      h = bfd_link_hash_lookup (info->hash, "_gp", false, false, true);
+      h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
       if (h != (struct bfd_link_hash_entry *) NULL
 	  && h->type == bfd_link_hash_defined)
 	elf_gp (abfd) = (h->u.def.value
@@ -7153,7 +7153,7 @@ _bfd_mips_elf_final_link (abfd, info)
 					      (PTR) &ext,
 					      (file_ptr) 0,
 					      (bfd_size_type) sizeof ext))
-		return false;
+		return FALSE;
 
 	      bfd_mips_elf32_swap_reginfo_in (input_bfd, &ext, &sub);
 
@@ -7222,7 +7222,7 @@ _bfd_mips_elf_final_link (abfd, info)
 
 	  mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);
 	  if (mdebug_handle == (PTR) NULL)
-	    return false;
+	    return FALSE;
 
 	  esym.jmptbl = 0;
 	  esym.cobol_main = 0;
@@ -7247,7 +7247,7 @@ _bfd_mips_elf_final_link (abfd, info)
 		esym.asym.value = last;
 	      if (!bfd_ecoff_debug_one_external (abfd, &debug, swap,
 						 secname[i], &esym))
-		return false;
+		return FALSE;
 	    }
 
 	  for (p = o->link_order_head;
@@ -7291,12 +7291,12 @@ _bfd_mips_elf_final_link (abfd, info)
 		 ecoff_debug_info structure, so we do that now.  */
 	      if (! _bfd_mips_elf_read_ecoff_info (input_bfd, input_section,
 						   &input_debug))
-		return false;
+		return FALSE;
 
 	      if (! (bfd_ecoff_debug_accumulate
 		     (mdebug_handle, abfd, &debug, swap, input_bfd,
 		      &input_debug, input_swap, info)))
-		return false;
+		return FALSE;
 
 	      /* Loop through the external symbols.  For each one with
 		 interesting information, try to find the symbol in
@@ -7322,7 +7322,7 @@ _bfd_mips_elf_final_link (abfd, info)
 
 		  name = input_debug.ssext + ext.asym.iss;
 		  h = mips_elf_link_hash_lookup (mips_elf_hash_table (info),
-						 name, false, false, true);
+						 name, FALSE, FALSE, TRUE);
 		  if (h == NULL || h->esym.ifd != -2)
 		    continue;
 
@@ -7367,13 +7367,13 @@ _bfd_mips_elf_final_link (abfd, info)
 		  if (rtproc_sec == NULL
 		      || ! bfd_set_section_flags (abfd, rtproc_sec, flags)
 		      || ! bfd_set_section_alignment (abfd, rtproc_sec, 4))
-		    return false;
+		    return FALSE;
 		}
 
 	      if (! mips_elf_create_procedure_table (mdebug_handle, abfd,
 						     info, rtproc_sec,
 						     &debug))
-		return false;
+		return FALSE;
 	    }
 
 	  /* Build the external symbol information.  */
@@ -7381,12 +7381,12 @@ _bfd_mips_elf_final_link (abfd, info)
 	  einfo.info = info;
 	  einfo.debug = &debug;
 	  einfo.swap = swap;
-	  einfo.failed = false;
+	  einfo.failed = FALSE;
 	  mips_elf_link_hash_traverse (mips_elf_hash_table (info),
 				       mips_elf_output_extsym,
 				       (PTR) &einfo);
 	  if (einfo.failed)
-	    return false;
+	    return FALSE;
 
 	  /* Set the size of the .mdebug section.  */
 	  o->_raw_size = bfd_ecoff_debug_size (abfd, &debug, swap);
@@ -7459,7 +7459,7 @@ _bfd_mips_elf_final_link (abfd, info)
 		(_("%s: illegal section name `%s'"),
 		 bfd_get_filename (abfd), o->name);
 	      bfd_set_error (bfd_error_nonrepresentable_section);
-	      return false;
+	      return FALSE;
 	    }
 
 	  /* The linker script always combines .gptab.data and
@@ -7483,7 +7483,7 @@ _bfd_mips_elf_final_link (abfd, info)
 	  amt = c * sizeof (Elf32_gptab);
 	  tab = (Elf32_gptab *) bfd_malloc (amt);
 	  if (tab == NULL)
-	    return false;
+	    return FALSE;
 	  tab[0].gt_header.gt_current_g_value = elf_gp_size (abfd);
 	  tab[0].gt_header.gt_unused = 0;
 
@@ -7521,7 +7521,7 @@ _bfd_mips_elf_final_link (abfd, info)
 		  Elf32_gptab int_gptab;
 		  unsigned long val;
 		  unsigned long add;
-		  boolean exact;
+		  bfd_boolean exact;
 		  unsigned int look;
 
 		  if (! (bfd_get_section_contents
@@ -7530,7 +7530,7 @@ _bfd_mips_elf_final_link (abfd, info)
 			  (bfd_size_type) sizeof (Elf32_External_gptab))))
 		    {
 		      free (tab);
-		      return false;
+		      return FALSE;
 		    }
 
 		  bfd_mips_elf32_swap_gptab_in (input_bfd, &ext_gptab,
@@ -7538,14 +7538,14 @@ _bfd_mips_elf_final_link (abfd, info)
 		  val = int_gptab.gt_entry.gt_g_value;
 		  add = int_gptab.gt_entry.gt_bytes - last;
 
-		  exact = false;
+		  exact = FALSE;
 		  for (look = 1; look < c; look++)
 		    {
 		      if (tab[look].gt_entry.gt_g_value >= val)
 			tab[look].gt_entry.gt_bytes += add;
 
 		      if (tab[look].gt_entry.gt_g_value == val)
-			exact = true;
+			exact = TRUE;
 		    }
 
 		  if (! exact)
@@ -7559,7 +7559,7 @@ _bfd_mips_elf_final_link (abfd, info)
 		      if (new_tab == NULL)
 			{
 			  free (tab);
-			  return false;
+			  return FALSE;
 			}
 		      tab = new_tab;
 		      tab[c].gt_entry.gt_g_value = val;
@@ -7602,7 +7602,7 @@ _bfd_mips_elf_final_link (abfd, info)
 	  if (ext_tab == NULL)
 	    {
 	      free (tab);
-	      return false;
+	      return FALSE;
 	    }
 
 	  for (j = 0; j < c; j++)
@@ -7620,7 +7620,7 @@ _bfd_mips_elf_final_link (abfd, info)
 
   /* Invoke the regular ELF backend linker to do all the work.  */
   if (!MNAME(abfd,bfd_elf,bfd_final_link) (abfd, info))
-    return false;
+    return FALSE;
 
   /* Now write out the computed sections.  */
 
@@ -7632,7 +7632,7 @@ _bfd_mips_elf_final_link (abfd, info)
       if (! bfd_set_section_contents (abfd, reginfo_sec, (PTR) &ext,
 				      (file_ptr) 0,
 				      (bfd_size_type) sizeof ext))
-	return false;
+	return FALSE;
     }
 
   if (mdebug_sec != (asection *) NULL)
@@ -7641,7 +7641,7 @@ _bfd_mips_elf_final_link (abfd, info)
       if (! bfd_ecoff_write_accumulated_debug (mdebug_handle, abfd, &debug,
 					       swap, info,
 					       mdebug_sec->filepos))
-	return false;
+	return FALSE;
 
       bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info);
     }
@@ -7652,7 +7652,7 @@ _bfd_mips_elf_final_link (abfd, info)
 				      gptab_data_sec->contents,
 				      (file_ptr) 0,
 				      gptab_data_sec->_raw_size))
-	return false;
+	return FALSE;
     }
 
   if (gptab_bss_sec != (asection *) NULL)
@@ -7661,7 +7661,7 @@ _bfd_mips_elf_final_link (abfd, info)
 				      gptab_bss_sec->contents,
 				      (file_ptr) 0,
 				      gptab_bss_sec->_raw_size))
-	return false;
+	return FALSE;
     }
 
   if (SGI_COMPAT (abfd))
@@ -7673,19 +7673,19 @@ _bfd_mips_elf_final_link (abfd, info)
 					  rtproc_sec->contents,
 					  (file_ptr) 0,
 					  rtproc_sec->_raw_size))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
-/* Return true if machine EXTENSION is an extension of machine BASE,
+/* Return TRUE if machine EXTENSION is an extension of machine BASE,
    meaning that it should be safe to link code for the two machines
    and set the output machine to EXTENSION.  EXTENSION and BASE are
    both submasks of EF_MIPS_MACH.  */
 
-static boolean
+static bfd_boolean
 _bfd_mips_elf_mach_extends_p (base, extension)
      flagword base, extension;
 {
@@ -7703,24 +7703,24 @@ _bfd_mips_elf_mach_extends_p (base, extension)
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   flagword old_flags;
   flagword new_flags;
-  boolean ok;
-  boolean null_input_bfd = true;
+  bfd_boolean ok;
+  bfd_boolean null_input_bfd = TRUE;
   asection *sec;
 
   /* Check if we have the same endianess */
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   new_flags = elf_elfheader (ibfd)->e_flags;
   elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_NOREORDER;
@@ -7728,7 +7728,7 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
 
   if (! elf_flags_init (obfd))
     {
-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;
       elf_elfheader (obfd)->e_flags = new_flags;
       elf_elfheader (obfd)->e_ident[EI_CLASS]
 	= elf_elfheader (ibfd)->e_ident[EI_CLASS];
@@ -7738,10 +7738,10 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
 	{
 	  if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
 				   bfd_get_mach (ibfd)))
-	    return false;
+	    return FALSE;
 	}
 
-      return true;
+      return TRUE;
     }
 
   /* Check flag compatibility.  */
@@ -7750,7 +7750,7 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
   old_flags &= ~EF_MIPS_NOREORDER;
 
   if (new_flags == old_flags)
-    return true;
+    return TRUE;
 
   /* Check to see if the input BFD actually contains any sections.
      If not, its flags may not have been initialised either, but it cannot
@@ -7766,14 +7766,14 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
 	       || !strcmp (sec->name, ".bss"))
 	      && sec->_raw_size != 0))
 	{
-	  null_input_bfd = false;
+	  null_input_bfd = FALSE;
 	  break;
 	}
     }
   if (null_input_bfd)
-    return true;
+    return TRUE;
 
-  ok = true;
+  ok = TRUE;
 
   if ((new_flags & EF_MIPS_PIC) != (old_flags & EF_MIPS_PIC))
     {
@@ -7782,7 +7782,7 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
       (*_bfd_error_handler)
 	(_("%s: linking PIC files with non-PIC files"),
 	 bfd_archive_filename (ibfd));
-      ok = false;
+      ok = FALSE;
     }
 
   if ((new_flags & EF_MIPS_CPIC) != (old_flags & EF_MIPS_CPIC))
@@ -7792,7 +7792,7 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
       (*_bfd_error_handler)
 	(_("%s: linking abicalls files with non-abicalls files"),
 	 bfd_archive_filename (ibfd));
-      ok = false;
+      ok = FALSE;
     }
 
   /* Compare the ISA's.  */
@@ -7820,7 +7820,7 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
 	      (*_bfd_error_handler)
 	       (_("%s: ISA mismatch (-mips%d) with previous modules (-mips%d)"),
 		bfd_archive_filename (ibfd), new_isa, old_isa);
-	      ok = false;
+	      ok = FALSE;
 	    }
 	  else
 	    {
@@ -7847,7 +7847,7 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
 	     bfd_archive_filename (ibfd),
 	     _bfd_elf_mips_mach (new_flags),
 	     _bfd_elf_mips_mach (old_flags));
-	  ok = false;
+	  ok = FALSE;
 	}
 
       new_flags &= ~(EF_MIPS_ARCH | EF_MIPS_MACH);
@@ -7870,7 +7870,7 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
 	     bfd_archive_filename (ibfd),
 	     elf_mips_abi_name (ibfd),
 	     elf_mips_abi_name (obfd));
-	  ok = false;
+	  ok = FALSE;
 	}
       new_flags &= ~EF_MIPS_ABI;
       old_flags &= ~EF_MIPS_ABI;
@@ -7892,21 +7892,21 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
 	(_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
 	 bfd_archive_filename (ibfd), (unsigned long) new_flags,
 	 (unsigned long) old_flags);
-      ok = false;
+      ok = FALSE;
     }
 
   if (! ok)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Function to keep MIPS specific file flags like as EF_MIPS_PIC.  */
 
-boolean
+bfd_boolean
 _bfd_mips_elf_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
@@ -7915,11 +7915,11 @@ _bfd_mips_elf_set_private_flags (abfd, flags)
 	      || elf_elfheader (abfd)->e_flags == flags);
 
   elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 _bfd_mips_elf_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
@@ -7981,5 +7981,5 @@ _bfd_mips_elf_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/elfxx-mips.h b/bfd/elfxx-mips.h
index 2c8ac2f2fb4..9b935c6f649 100644
--- a/bfd/elfxx-mips.h
+++ b/bfd/elfxx-mips.h
@@ -22,85 +22,86 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 extern void _bfd_mips_elf_symbol_processing
   PARAMS ((bfd *, asymbol *));
-extern boolean _bfd_mips_elf_section_processing
+extern bfd_boolean _bfd_mips_elf_section_processing
   PARAMS ((bfd *, Elf_Internal_Shdr *));
-extern boolean _bfd_mips_elf_section_from_shdr
+extern bfd_boolean _bfd_mips_elf_section_from_shdr
   PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
-extern boolean _bfd_mips_elf_fake_sections
+extern bfd_boolean _bfd_mips_elf_fake_sections
   PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
-extern boolean _bfd_mips_elf_section_from_bfd_section
+extern bfd_boolean _bfd_mips_elf_section_from_bfd_section
   PARAMS ((bfd *, asection *, int *));
-extern boolean _bfd_mips_elf_add_symbol_hook
+extern bfd_boolean _bfd_mips_elf_add_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
 	   const char **, flagword *, asection **, bfd_vma *));
-extern boolean _bfd_mips_elf_link_output_symbol_hook
+extern bfd_boolean _bfd_mips_elf_link_output_symbol_hook
   PARAMS ((bfd *, struct bfd_link_info *, const char *, Elf_Internal_Sym *,
 	   asection *));
-extern boolean _bfd_mips_elf_create_dynamic_sections
+extern bfd_boolean _bfd_mips_elf_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_mips_elf_check_relocs
+extern bfd_boolean _bfd_mips_elf_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
-extern boolean _bfd_mips_elf_adjust_dynamic_symbol
+extern bfd_boolean _bfd_mips_elf_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-extern boolean _bfd_mips_elf_always_size_sections
+extern bfd_boolean _bfd_mips_elf_always_size_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_mips_elf_size_dynamic_sections
+extern bfd_boolean _bfd_mips_elf_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_mips_elf_relocate_section
+extern bfd_boolean _bfd_mips_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-extern boolean _bfd_mips_elf_finish_dynamic_symbol
+extern bfd_boolean _bfd_mips_elf_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
-extern boolean _bfd_mips_elf_finish_dynamic_sections
+extern bfd_boolean _bfd_mips_elf_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 extern void _bfd_mips_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
+  PARAMS ((bfd *, bfd_boolean));
 extern int _bfd_mips_elf_additional_program_headers
   PARAMS ((bfd *));
-extern boolean _bfd_mips_elf_modify_segment_map
+extern bfd_boolean _bfd_mips_elf_modify_segment_map
   PARAMS ((bfd *));
 extern asection * _bfd_mips_elf_gc_mark_hook
   PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
 	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-extern boolean _bfd_mips_elf_gc_sweep_hook
+extern bfd_boolean _bfd_mips_elf_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 extern void _bfd_mips_elf_copy_indirect_symbol
   PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
 	   struct elf_link_hash_entry *));
 extern void _bfd_mips_elf_hide_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
-extern boolean _bfd_mips_elf_ignore_discarded_relocs
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean));
+extern bfd_boolean _bfd_mips_elf_ignore_discarded_relocs
   PARAMS ((asection *));
-extern boolean _bfd_mips_elf_find_nearest_line
+extern bfd_boolean _bfd_mips_elf_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
-extern boolean _bfd_mips_elf_set_section_contents
+extern bfd_boolean _bfd_mips_elf_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
 extern bfd_byte *_bfd_elf_mips_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
+	   bfd_byte *, bfd_boolean, asymbol **));
 extern struct bfd_link_hash_table *_bfd_mips_elf_link_hash_table_create
   PARAMS ((bfd *));
-extern boolean _bfd_mips_elf_final_link
+extern bfd_boolean _bfd_mips_elf_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_mips_elf_merge_private_bfd_data
+extern bfd_boolean _bfd_mips_elf_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
-extern boolean _bfd_mips_elf_set_private_flags
+extern bfd_boolean _bfd_mips_elf_set_private_flags
   PARAMS ((bfd *, flagword));
-extern boolean _bfd_mips_elf_print_private_bfd_data
+extern bfd_boolean _bfd_mips_elf_print_private_bfd_data
   PARAMS ((bfd *, PTR));
-extern boolean _bfd_mips_elf_discard_info
+extern bfd_boolean _bfd_mips_elf_discard_info
   PARAMS ((bfd *, struct elf_reloc_cookie *, struct bfd_link_info *));
-extern boolean _bfd_mips_elf_write_section
+extern bfd_boolean _bfd_mips_elf_write_section
   PARAMS ((bfd *, asection *, bfd_byte *));
 
-extern boolean _bfd_mips_elf_read_ecoff_info
+extern bfd_boolean _bfd_mips_elf_read_ecoff_info
   PARAMS ((bfd *, asection *, struct ecoff_debug_info *));
 extern bfd_reloc_status_type _bfd_mips_elf_gprel16_with_gp
-  PARAMS ((bfd *, asymbol *, arelent *, asection *, boolean, PTR, bfd_vma));
+  PARAMS ((bfd *, asymbol *, arelent *, asection *, bfd_boolean, PTR,
+	   bfd_vma));
 extern bfd_reloc_status_type _bfd_mips_elf32_gprel16_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 extern unsigned long _bfd_elf_mips_mach
diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h
index f5b6a35ad02..c3ff1047c28 100644
--- a/bfd/elfxx-target.h
+++ b/bfd/elfxx-target.h
@@ -159,11 +159,11 @@
 #endif
 #ifndef bfd_elfNN_bfd_merge_private_bfd_data
 #define bfd_elfNN_bfd_merge_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
 #endif
 #ifndef bfd_elfNN_bfd_set_private_flags
 #define bfd_elfNN_bfd_set_private_flags \
-  ((boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
 #endif
 #ifndef bfd_elfNN_bfd_is_local_label_name
 #define bfd_elfNN_bfd_is_local_label_name _bfd_elf_is_local_label_name
@@ -250,10 +250,10 @@
 #endif
 
 #ifndef elf_backend_collect
-#define elf_backend_collect false
+#define elf_backend_collect FALSE
 #endif
 #ifndef elf_backend_type_change_ok
-#define elf_backend_type_change_ok false
+#define elf_backend_type_change_ok FALSE
 #endif
 
 #ifndef elf_backend_sym_is_global
diff --git a/bfd/format.c b/bfd/format.c
index 33291d0f944..8cc7b7a1670 100644
--- a/bfd/format.c
+++ b/bfd/format.c
@@ -52,7 +52,7 @@ FUNCTION
 	bfd_check_format
 
 SYNOPSIS
-	boolean bfd_check_format(bfd *abfd, bfd_format format);
+	bfd_boolean bfd_check_format(bfd *abfd, bfd_format format);
 
 DESCRIPTION
 	Verify if the file attached to the BFD @var{abfd} is compatible
@@ -67,7 +67,7 @@ DESCRIPTION
 	matches, it is used.  If not, exactly one target must recognize
 	the file, or an error results.
 
-	The function returns <<true>> on success, otherwise <<false>>
+	The function returns <<TRUE>> on success, otherwise <<FALSE>>
 	with one of the following error codes:
 
 	o <<bfd_error_invalid_operation>> -
@@ -85,7 +85,7 @@ DESCRIPTION
 	more than one backend recognised the file format.
 */
 
-boolean
+bfd_boolean
 bfd_check_format (abfd, format)
      bfd *abfd;
      bfd_format format;
@@ -98,10 +98,10 @@ FUNCTION
 	bfd_check_format_matches
 
 SYNOPSIS
-	boolean bfd_check_format_matches(bfd *abfd, bfd_format format, char ***matching);
+	bfd_boolean bfd_check_format_matches(bfd *abfd, bfd_format format, char ***matching);
 
 DESCRIPTION
-	Like <<bfd_check_format>>, except when it returns false with
+	Like <<bfd_check_format>>, except when it returns FALSE with
 	<<bfd_errno>> set to <<bfd_error_file_ambiguously_recognized>>.  In that
 	case, if @var{matching} is not NULL, it will be filled in with
 	a NULL-terminated list of the names of the formats that matched,
@@ -112,7 +112,7 @@ DESCRIPTION
 	should free it.
 */
 
-boolean
+bfd_boolean
 bfd_check_format_matches (abfd, format, matching)
      bfd *abfd;
      bfd_format format;
@@ -129,11 +129,11 @@ bfd_check_format_matches (abfd, format, matching)
       || (unsigned int) abfd->format >= (unsigned int) bfd_type_end)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (abfd->format != bfd_unknown)
-    return (boolean) (abfd->format == format);
+    return abfd->format == format;
 
   /* Since the target type was defaulted, check them
      all in the hope that one will be uniquely recognized.  */
@@ -149,7 +149,7 @@ bfd_check_format_matches (abfd, format, matching)
       amt = sizeof (*matching_vector) * 2 * _bfd_target_vector_entries;
       matching_vector = (const bfd_target **) bfd_malloc (amt);
       if (!matching_vector)
-	return false;
+	return FALSE;
     }
 
   right_targ = 0;
@@ -162,7 +162,7 @@ bfd_check_format_matches (abfd, format, matching)
   if (!abfd->target_defaulted)
     {
       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)	/* rewind! */
-	return false;
+	return FALSE;
 
       right_targ = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
 
@@ -173,7 +173,7 @@ bfd_check_format_matches (abfd, format, matching)
 	  if (matching)
 	    free ((PTR) matching_vector);
 
-	  return true;			/* File position has moved, BTW.  */
+	  return TRUE;			/* File position has moved, BTW.  */
 	}
 
       /* For a long time the code has dropped through to check all
@@ -198,7 +198,7 @@ bfd_check_format_matches (abfd, format, matching)
 
 	  bfd_set_error (bfd_error_file_not_recognized);
 
-	  return false;
+	  return FALSE;
 	}
     }
 
@@ -213,7 +213,7 @@ bfd_check_format_matches (abfd, format, matching)
       abfd->xvec = *target;	/* Change BFD's target temporarily */
 
       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       /* If _bfd_check_format neglects to set bfd_error, assume
 	 bfd_error_wrong_format.  We didn't used to even pay any
@@ -271,7 +271,7 @@ bfd_check_format_matches (abfd, format, matching)
 	  if (matching)
 	    free ((PTR) matching_vector);
 
-	  return false;
+	  return FALSE;
 	}
     }
 
@@ -322,7 +322,7 @@ bfd_check_format_matches (abfd, format, matching)
       if (matching)
 	free ((PTR) matching_vector);
 
-      return true;			/* File position has moved, BTW.  */
+      return TRUE;			/* File position has moved, BTW.  */
     }
 
   abfd->xvec = save_targ;		/* Restore original target type.  */
@@ -353,7 +353,7 @@ bfd_check_format_matches (abfd, format, matching)
 	}
     }
 
-  return false;
+  return FALSE;
 }
 
 /*
@@ -361,7 +361,7 @@ FUNCTION
 	bfd_set_format
 
 SYNOPSIS
-	boolean bfd_set_format(bfd *abfd, bfd_format format);
+	bfd_boolean bfd_set_format(bfd *abfd, bfd_format format);
 
 DESCRIPTION
 	This function sets the file format of the BFD @var{abfd} to the
@@ -370,7 +370,7 @@ DESCRIPTION
 	is not open for writing, then an error occurs.
 */
 
-boolean
+bfd_boolean
 bfd_set_format (abfd, format)
      bfd *abfd;
      bfd_format format;
@@ -379,11 +379,11 @@ bfd_set_format (abfd, format)
       || (unsigned int) abfd->format >= (unsigned int) bfd_type_end)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (abfd->format != bfd_unknown)
-    return (boolean) (abfd->format == format);
+    return abfd->format == format;
 
   /* Presume the answer is yes.  */
   abfd->format = format;
@@ -391,10 +391,10 @@ bfd_set_format (abfd, format)
   if (!BFD_SEND_FMT (abfd, _bfd_set_format, (abfd)))
     {
       abfd->format = bfd_unknown;
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /*
diff --git a/bfd/freebsd.h b/bfd/freebsd.h
index c2e3af02cf4..424484f6148 100644
--- a/bfd/freebsd.h
+++ b/bfd/freebsd.h
@@ -1,5 +1,5 @@
 /* BFD back-end definitions used by all FreeBSD targets.
-   Copyright 1990, 1991, 1992, 1996, 1997, 2000, 2001
+   Copyright 1990, 1991, 1992, 1996, 1997, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -61,7 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define SWAP_MAGIC(ext) bfd_getl32 (ext)
 
 #define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd));
 
 #include "aout-target.h"
 
@@ -69,7 +69,7 @@ static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
    Section contents have already been written.  We write the
    file header, symbols, and relocation.  */
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -102,5 +102,5 @@ MY(write_object_contents) (abfd)
 
   WRITE_HEADERS(abfd, execp);
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/genlink.h b/bfd/genlink.h
index 215666a336c..b6a9086b06e 100644
--- a/bfd/genlink.h
+++ b/bfd/genlink.h
@@ -1,5 +1,5 @@
 /* genlink.h -- interface to the BFD generic linker
-   Copyright 1993, 1994, 1996 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1996, 2002 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -42,7 +42,7 @@ struct generic_link_hash_entry
 {
   struct bfd_link_hash_entry root;
   /* Whether this symbol has been written out.  */
-  boolean written;
+  bfd_boolean written;
   /* Symbol from input BFD.  */
   asymbol *sym;
 };
@@ -65,7 +65,7 @@ struct generic_link_hash_table
 #define _bfd_generic_link_hash_traverse(table, func, info)		\
   (bfd_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the generic link hash table from the info structure.  This is
@@ -82,7 +82,7 @@ struct generic_link_hash_table
 
 /* Add the symbols of input_bfd to the symbols being built for
    output_bfd.  */
-extern boolean _bfd_generic_link_output_symbols
+extern bfd_boolean _bfd_generic_link_output_symbols
   PARAMS ((bfd *output_bfd, bfd *input_bfd, struct bfd_link_info *,
 	   size_t *psymalloc));
 
@@ -100,7 +100,7 @@ struct generic_write_global_symbol_info
 /* Write out a single global symbol.  This is expected to be called
    via _bfd_generic_link_hash_traverse.  The second argument must
    actually be a struct generic_write_global_symbol_info *.  */
-extern boolean _bfd_generic_link_write_global_symbol
+extern bfd_boolean _bfd_generic_link_write_global_symbol
   PARAMS ((struct generic_link_hash_entry *, PTR));
 
 /* Generic link hash table entry creation routine.  */
diff --git a/bfd/hash.c b/bfd/hash.c
index e7c77feb6f8..8ae0c7a63ef 100644
--- a/bfd/hash.c
+++ b/bfd/hash.c
@@ -67,7 +67,7 @@ SUBSECTION
 	<<bfd_hash_table_init>> (if you know approximately how many
 	entries you will need, the function <<bfd_hash_table_init_n>>,
 	which takes a @var{size} argument, may be used).
-	<<bfd_hash_table_init>> returns <<false>> if some sort of
+	<<bfd_hash_table_init>> returns <<FALSE>> if some sort of
 	error occurs.
 
 @findex bfd_hash_newfunc
@@ -96,24 +96,24 @@ SUBSECTION
 	The function <<bfd_hash_lookup>> is used both to look up a
 	string in the hash table and to create a new entry.
 
-	If the @var{create} argument is <<false>>, <<bfd_hash_lookup>>
+	If the @var{create} argument is <<FALSE>>, <<bfd_hash_lookup>>
 	will look up a string.  If the string is found, it will
 	returns a pointer to a <<struct bfd_hash_entry>>.  If the
 	string is not found in the table <<bfd_hash_lookup>> will
 	return <<NULL>>.  You should not modify any of the fields in
 	the returns <<struct bfd_hash_entry>>.
 
-	If the @var{create} argument is <<true>>, the string will be
+	If the @var{create} argument is <<TRUE>>, the string will be
 	entered into the hash table if it is not already there.
 	Either way a pointer to a <<struct bfd_hash_entry>> will be
 	returned, either to the existing structure or to a newly
 	created one.  In this case, a <<NULL>> return means that an
 	error occurred.
 
-	If the @var{create} argument is <<true>>, and a new entry is
+	If the @var{create} argument is <<TRUE>>, and a new entry is
 	created, the @var{copy} argument is used to decide whether to
 	copy the string onto the hash table objalloc or not.  If
-	@var{copy} is passed as <<false>>, you must be careful not to
+	@var{copy} is passed as <<FALSE>>, you must be careful not to
 	deallocate or modify the string as long as the hash table
 	exists.
 
@@ -133,7 +133,7 @@ SUBSECTION
 	generic pointer passed to <<bfd_hash_traverse>>.  The function
 	must return a <<boolean>> value, which indicates whether to
 	continue traversing the hash table.  If the function returns
-	<<false>>, <<bfd_hash_traverse>> will stop the traversal and
+	<<FALSE>>, <<bfd_hash_traverse>> will stop the traversal and
 	return immediately.
 
 INODE
@@ -299,7 +299,7 @@ SUBSUBSECTION
 
 /* Create a new hash table, given a number of entries.  */
 
-boolean
+bfd_boolean
 bfd_hash_table_init_n (table, newfunc, size)
      struct bfd_hash_table *table;
      struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
@@ -315,24 +315,24 @@ bfd_hash_table_init_n (table, newfunc, size)
   if (table->memory == NULL)
     {
       bfd_set_error (bfd_error_no_memory);
-      return false;
+      return FALSE;
     }
   table->table = ((struct bfd_hash_entry **)
 		  objalloc_alloc ((struct objalloc *) table->memory, alloc));
   if (table->table == NULL)
     {
       bfd_set_error (bfd_error_no_memory);
-      return false;
+      return FALSE;
     }
   memset ((PTR) table->table, 0, alloc);
   table->size = size;
   table->newfunc = newfunc;
-  return true;
+  return TRUE;
 }
 
 /* Create a new hash table with the default number of entries.  */
 
-boolean
+bfd_boolean
 bfd_hash_table_init (table, newfunc)
      struct bfd_hash_table *table;
      struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
@@ -358,8 +358,8 @@ struct bfd_hash_entry *
 bfd_hash_lookup (table, string, create, copy)
      struct bfd_hash_table *table;
      const char *string;
-     boolean create;
-     boolean copy;
+     bfd_boolean create;
+     bfd_boolean copy;
 {
   register const unsigned char *s;
   register unsigned long hash;
@@ -479,7 +479,7 @@ bfd_hash_allocate (table, size)
 void
 bfd_hash_traverse (table, func, info)
      struct bfd_hash_table *table;
-     boolean (*func) PARAMS ((struct bfd_hash_entry *, PTR));
+     bfd_boolean (*func) PARAMS ((struct bfd_hash_entry *, PTR));
      PTR info;
 {
   unsigned int i;
@@ -532,7 +532,7 @@ struct bfd_strtab_hash
   struct strtab_hash_entry *last;
   /* Whether to precede strings with a two byte length, as in the
      XCOFF .debug section.  */
-  boolean xcoff;
+  bfd_boolean xcoff;
 };
 
 static struct bfd_hash_entry *strtab_hash_newfunc
@@ -597,7 +597,7 @@ _bfd_stringtab_init ()
   table->size = 0;
   table->first = NULL;
   table->last = NULL;
-  table->xcoff = false;
+  table->xcoff = FALSE;
 
   return table;
 }
@@ -613,7 +613,7 @@ _bfd_xcoff_stringtab_init ()
 
   ret = _bfd_stringtab_init ();
   if (ret != NULL)
-    ret->xcoff = true;
+    ret->xcoff = TRUE;
   return ret;
 }
 
@@ -628,21 +628,21 @@ _bfd_stringtab_free (table)
 }
 
 /* Get the index of a string in a strtab, adding it if it is not
-   already present.  If HASH is false, we don't really use the hash
+   already present.  If HASH is FALSE, we don't really use the hash
    table, and we don't eliminate duplicate strings.  */
 
 bfd_size_type
 _bfd_stringtab_add (tab, str, hash, copy)
      struct bfd_strtab_hash *tab;
      const char *str;
-     boolean hash;
-     boolean copy;
+     bfd_boolean hash;
+     bfd_boolean copy;
 {
   register struct strtab_hash_entry *entry;
 
   if (hash)
     {
-      entry = strtab_hash_lookup (tab, str, true, copy);
+      entry = strtab_hash_lookup (tab, str, TRUE, copy);
       if (entry == NULL)
 	return (bfd_size_type) -1;
     }
@@ -699,12 +699,12 @@ _bfd_stringtab_size (tab)
 /* Write out a strtab.  ABFD must already be at the right location in
    the file.  */
 
-boolean
+bfd_boolean
 _bfd_stringtab_emit (abfd, tab)
      register bfd *abfd;
      struct bfd_strtab_hash *tab;
 {
-  register boolean xcoff;
+  register bfd_boolean xcoff;
   register struct strtab_hash_entry *entry;
 
   xcoff = tab->xcoff;
@@ -724,12 +724,12 @@ _bfd_stringtab_emit (abfd, tab)
 	  /* The output length includes the null byte.  */
 	  bfd_put_16 (abfd, (bfd_vma) len, buf);
 	  if (bfd_bwrite ((PTR) buf, (bfd_size_type) 2, abfd) != 2)
-	    return false;
+	    return FALSE;
 	}
 
       if (bfd_bwrite ((PTR) str, (bfd_size_type) len, abfd) != len)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/hp300hpux.c b/bfd/hp300hpux.c
index 458023959a6..d4eb3aad1e3 100644
--- a/bfd/hp300hpux.c
+++ b/bfd/hp300hpux.c
@@ -1,5 +1,5 @@
 /* BFD backend for hp-ux 9000/300
-   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2000, 2001
+   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Written by Glenn Engel.
 
@@ -194,16 +194,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "aoutx.h"
 
-static const bfd_target * MY (callback) PARAMS ((bfd *));
-static boolean            MY (write_object_contents) PARAMS ((bfd *));
-static void               convert_sym_type PARAMS ((struct external_nlist *, aout_symbol_type *, bfd *));
-
-boolean                   MY (slurp_symbol_table) PARAMS ((bfd *));
-void                      MY (swap_std_reloc_in) PARAMS ((bfd *, struct hp300hpux_reloc *, arelent *, asymbol **, bfd_size_type));
-boolean                   MY (slurp_reloc_table) PARAMS ((bfd *, sec_ptr, asymbol **));
-long                      MY (get_symtab) PARAMS ((bfd *, asymbol **));
-long                      MY (get_symtab_upper_bound) PARAMS ((bfd *));
-long                      MY (canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+static const bfd_target * MY (callback)
+  PARAMS ((bfd *));
+static bfd_boolean MY (write_object_contents)
+  PARAMS ((bfd *));
+static void convert_sym_type
+  PARAMS ((struct external_nlist *, aout_symbol_type *, bfd *));
+
+bfd_boolean MY (slurp_symbol_table)
+  PARAMS ((bfd *));
+void MY (swap_std_reloc_in)
+  PARAMS ((bfd *, struct hp300hpux_reloc *, arelent *, asymbol **,
+	   bfd_size_type));
+bfd_boolean MY (slurp_reloc_table)
+  PARAMS ((bfd *, sec_ptr, asymbol **));
+long MY (get_symtab)
+  PARAMS ((bfd *, asymbol **));
+long MY (get_symtab_upper_bound)
+  PARAMS ((bfd *));
+long MY (canonicalize_reloc)
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
 
 /* Since the hpux symbol table has nlist elements interspersed with
    strings and we need to insert som strings for secondary symbols, we
@@ -271,9 +281,10 @@ MY (callback) (abfd)
   return abfd->xvec;
 }
 
-extern boolean aout_32_write_syms PARAMS ((bfd * abfd));
+extern bfd_boolean aout_32_write_syms
+  PARAMS ((bfd * abfd));
 
-static boolean
+static bfd_boolean
 MY (write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -307,10 +318,10 @@ MY (write_object_contents) (abfd)
   /* this is really the sym table size but we store it in drelocs */
   H_PUT_32 (abfd, (bfd_get_symcount (abfd) * 12), exec_bytes.e_drelocs);
 
-  if (bfd_seek (abfd, (file_ptr) 0, false) != 0
+  if (bfd_seek (abfd, (file_ptr) 0, FALSE) != 0
       || (bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
 	  != EXEC_BYTES_SIZE))
-    return false;
+    return FALSE;
 
   /* Write out the symbols, and then the relocs.  We must write out
        the symbols first so that we know the symbol indices.  */
@@ -320,25 +331,25 @@ MY (write_object_contents) (abfd)
       /* Skip the relocs to where we want to put the symbols.  */
       if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*execp) + execp->a_drsize),
 		    SEEK_SET) != 0)
-	return false;
+	return FALSE;
     }
 
   if (!MY (write_syms) (abfd))
-    return false;
+    return FALSE;
 
   if (bfd_get_symcount (abfd) != 0)
     {
       if (bfd_seek (abfd, (file_ptr) N_TRELOFF (*execp), SEEK_CUR) != 0)
-	return false;
+	return FALSE;
       if (!NAME (aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))
-	return false;
+	return FALSE;
       if (bfd_seek (abfd, (file_ptr) N_DRELOFF (*execp), SEEK_CUR) != 0)
-	return false;
+	return FALSE;
       if (!NAME (aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* convert the hp symbol type to be the same as aout64.h usage so we */
@@ -523,7 +534,7 @@ NAME (aout,swap_exec_header_in) (abfd, raw_bytes, execp)
    ...
 */
 
-boolean
+bfd_boolean
 MY (slurp_symbol_table) (abfd)
      bfd *abfd;
 {
@@ -538,19 +549,19 @@ MY (slurp_symbol_table) (abfd)
 
   /* If there's no work to be done, don't do any */
   if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
-    return true;
+    return TRUE;
   symbol_bytes = exec_hdr (abfd)->a_syms;
 
   amt = symbol_bytes + SYM_EXTRA_BYTES;
   strings = (char *) bfd_alloc (abfd, amt);
   if (!strings)
-    return false;
+    return FALSE;
   syms = (struct external_nlist *) (strings + SYM_EXTRA_BYTES);
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
       || bfd_bread ((PTR) syms, symbol_bytes, abfd) != symbol_bytes)
     {
       bfd_release (abfd, syms);
-      return false;
+      return FALSE;
     }
 
   sym_end = (struct external_nlist *) (((char *) syms) + symbol_bytes);
@@ -570,7 +581,7 @@ MY (slurp_symbol_table) (abfd)
   amt *= sizeof (aout_symbol_type);
   cached = (aout_symbol_type *) bfd_zalloc (abfd, amt);
   if (cached == NULL && num_syms != 0)
-    return false;
+    return FALSE;
 
   /* as we march thru the hp symbol table, convert it into a list of
      null terminated strings to hold the symbol names.  Make sure any
@@ -597,7 +608,7 @@ MY (slurp_symbol_table) (abfd)
 	cache_save = *cache_ptr;
 	convert_sym_type (sym_pointer, cache_ptr, abfd);
 	if (!translate_from_native_sym_flags (abfd, cache_ptr))
-	  return false;
+	  return FALSE;
 
 	/********************************************************/
 	/* for hpux, the 'lenght' value indicates the length of */
@@ -626,7 +637,7 @@ MY (slurp_symbol_table) (abfd)
 
   obj_aout_symbols (abfd) = cached;
 
-  return true;
+  return TRUE;
 }
 
 void
@@ -708,7 +719,7 @@ MY (swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
     }
 }
 
-boolean
+bfd_boolean
 MY (slurp_reloc_table) (abfd, asect, symbols)
      bfd *abfd;
      sec_ptr asect;
@@ -724,10 +735,10 @@ MY (slurp_reloc_table) (abfd, asect, symbols)
   arelent *cache_ptr;
 
   if (asect->relocation)
-    return true;
+    return TRUE;
 
   if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
+    return TRUE;
 
   if (asect == obj_datasec (abfd))
     {
@@ -742,31 +753,31 @@ MY (slurp_reloc_table) (abfd, asect, symbols)
     }
 
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 
 doit:
   if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   each_size = obj_reloc_entry_size (abfd);
 
   count = reloc_size / each_size;
 
   reloc_cache = (arelent *) bfd_zalloc (abfd, count * sizeof (arelent));
   if (!reloc_cache && count != 0)
-    return false;
+    return FALSE;
 
   relocs = (PTR) bfd_alloc (abfd, reloc_size);
   if (!relocs && reloc_size != 0)
     {
       bfd_release (abfd, reloc_cache);
-      return false;
+      return FALSE;
     }
 
   if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
     {
       bfd_release (abfd, relocs);
       bfd_release (abfd, reloc_cache);
-      return false;
+      return FALSE;
     }
 
   rptr = (struct hp300hpux_reloc *) relocs;
@@ -782,7 +793,7 @@ doit:
   bfd_release (abfd, relocs);
   asect->relocation = reloc_cache;
   asect->reloc_count = count;
-  return true;
+  return TRUE;
 }
 
 /************************************************************************/
@@ -791,12 +802,13 @@ doit:
 /* call aout_32 versions if the input file was generated by gcc         */
 /************************************************************************/
 
-long aout_32_get_symtab PARAMS ((bfd * abfd, asymbol ** location));
-long aout_32_get_symtab_upper_bound PARAMS ((bfd * abfd));
-
-long aout_32_canonicalize_reloc PARAMS ((bfd * abfd, sec_ptr section,
-					 arelent ** relptr,
-					 asymbol ** symbols));
+long aout_32_get_symtab
+  PARAMS ((bfd * abfd, asymbol ** location));
+long aout_32_get_symtab_upper_bound
+  PARAMS ((bfd * abfd));
+long aout_32_canonicalize_reloc
+  PARAMS ((bfd * abfd, sec_ptr section, arelent ** relptr,
+	   asymbol ** symbols));
 
 long
 MY (get_symtab) (abfd, location)
diff --git a/bfd/hppabsd-core.c b/bfd/hppabsd-core.c
index 4ae6315157b..31aa2f14270 100644
--- a/bfd/hppabsd-core.c
+++ b/bfd/hppabsd-core.c
@@ -48,15 +48,19 @@
 #include <sys/user.h>		/* After a.out.h  */
 #include <sys/file.h>
 
-static asection *make_bfd_asection PARAMS ((bfd *, const char *,
-					    flagword, bfd_size_type,
-					    file_ptr, unsigned int));
-static const bfd_target *hppabsd_core_core_file_p PARAMS ((bfd *));
-static char *hppabsd_core_core_file_failing_command PARAMS ((bfd *));
-static int hppabsd_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean hppabsd_core_core_file_matches_executable_p
+static asection *make_bfd_asection
+  PARAMS ((bfd *, const char *, flagword, bfd_size_type, file_ptr,
+	   unsigned int));
+static const bfd_target *hppabsd_core_core_file_p
+  PARAMS ((bfd *));
+static char *hppabsd_core_core_file_failing_command
+  PARAMS ((bfd *));
+static int hppabsd_core_core_file_failing_signal
+  PARAMS ((bfd *));
+static bfd_boolean hppabsd_core_core_file_matches_executable_p
   PARAMS ((bfd *, bfd *));
-static void swap_abort PARAMS ((void));
+static void swap_abort
+  PARAMS ((void));
 
 /* These are stored in the bfd's tdata.  */
 
@@ -218,12 +222,12 @@ hppabsd_core_core_file_failing_signal (abfd)
 }
 
 /* ARGSUSED */
-static boolean
+static bfd_boolean
 hppabsd_core_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd, *exec_bfd;
 {
   /* There's no way to know this...  */
-  return true;
+  return TRUE;
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
diff --git a/bfd/hpux-core.c b/bfd/hpux-core.c
index 81d85eaa221..b4869fc8241 100644
--- a/bfd/hpux-core.c
+++ b/bfd/hpux-core.c
@@ -103,12 +103,16 @@ struct hpux_core_struct
 static asection *make_bfd_asection
   PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma,
 	   unsigned int));
-static const bfd_target *hpux_core_core_file_p PARAMS ((bfd *));
-static char *hpux_core_core_file_failing_command PARAMS ((bfd *));
-static int hpux_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean hpux_core_core_file_matches_executable_p
+static const bfd_target *hpux_core_core_file_p
+  PARAMS ((bfd *));
+static char *hpux_core_core_file_failing_command
+  PARAMS ((bfd *));
+static int hpux_core_core_file_failing_signal
+  PARAMS ((bfd *));
+static bfd_boolean hpux_core_core_file_matches_executable_p
   PARAMS ((bfd *, bfd *));
-static void swap_abort PARAMS ((void));
+static void swap_abort
+  PARAMS ((void));
 
 static asection *
 make_bfd_asection (abfd, name, flags, _raw_size, vma, alignment_power)
@@ -332,12 +336,12 @@ hpux_core_core_file_failing_signal (abfd)
 }
 
 /* ARGSUSED */
-static boolean
+static bfd_boolean
 hpux_core_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd ATTRIBUTE_UNUSED;
      bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
-  return true;			/* FIXME, We have no way of telling at this point */
+  return TRUE;			/* FIXME, We have no way of telling at this point */
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
diff --git a/bfd/i386aout.c b/bfd/i386aout.c
index c68dbec4b23..b2d106f6231 100644
--- a/bfd/i386aout.c
+++ b/bfd/i386aout.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries.
-   Copyright 1990, 1991, 1992, 1994, 1996, 1997, 2001
+   Copyright 1990, 1991, 1992, 1994, 1996, 1997, 2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -54,12 +54,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "aout/aout64.h"
 #include "libaout.h"
 
-static boolean i386aout_write_object_contents PARAMS ((bfd *));
-static boolean MY (set_sizes) PARAMS ((bfd *));
+static bfd_boolean i386aout_write_object_contents PARAMS ((bfd *));
+static bfd_boolean MY (set_sizes) PARAMS ((bfd *));
 
 /* Set the machine type correctly.  */
 
-static boolean
+static bfd_boolean
 i386aout_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -72,7 +72,7 @@ i386aout_write_object_contents (abfd)
 
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 #define MY_write_object_contents i386aout_write_object_contents
diff --git a/bfd/i386linux.c b/bfd/i386linux.c
index c144822ac2a..5a2d382b940 100644
--- a/bfd/i386linux.c
+++ b/bfd/i386linux.c
@@ -51,11 +51,11 @@ extern const bfd_target MY(vec);
 
 static void MY_final_link_callback
   PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-static boolean i386linux_bfd_final_link
+static bfd_boolean i386linux_bfd_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean i386linux_write_object_contents PARAMS ((bfd *));
+static bfd_boolean i386linux_write_object_contents PARAMS ((bfd *));
 
-static boolean
+static bfd_boolean
 i386linux_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -68,7 +68,7 @@ i386linux_bfd_final_link (abfd, info)
 
 /* Set the machine type correctly.  */
 
-static boolean
+static bfd_boolean
 i386linux_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -81,7 +81,7 @@ i386linux_write_object_contents (abfd)
 
   WRITE_HEADERS(abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 #define MY_write_object_contents i386linux_write_object_contents
@@ -179,15 +179,15 @@ static struct bfd_link_hash_table *linux_link_hash_table_create
 static struct fixup *new_fixup
   PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
 	   bfd_vma, int));
-static boolean linux_link_create_dynamic_sections
+static bfd_boolean linux_link_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean linux_add_one_symbol
+static bfd_boolean linux_add_one_symbol
   PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-	   bfd_vma, const char *, boolean, boolean,
+	   bfd_vma, const char *, bfd_boolean, bfd_boolean,
 	   struct bfd_link_hash_entry **));
-static boolean linux_tally_symbols
+static bfd_boolean linux_tally_symbols
   PARAMS ((struct linux_link_hash_entry *, PTR));
-static boolean linux_finish_dynamic_link
+static bfd_boolean linux_finish_dynamic_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Routine to create an entry in an Linux link hash table.  */
@@ -259,7 +259,7 @@ linux_link_hash_table_create (abfd)
 #define linux_link_hash_traverse(table, func, info)			\
   (aout_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the Linux link hash table from the info structure.  This is
@@ -299,7 +299,7 @@ new_fixup (info, h, value, builtin)
    know the size of the section, but that's OK - we just need to
    create it for now.  */
 
-static boolean
+static bfd_boolean
 linux_link_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -316,18 +316,18 @@ linux_link_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags)
       || ! bfd_set_section_alignment (abfd, s, 2))
-    return false;
+    return FALSE;
   s->_raw_size = 0;
   s->contents = 0;
 
-  return true;
+  return TRUE;
 }
 
 /* Function to add a single symbol to the linker hash table.  This is
    a wrapper around _bfd_generic_link_add_one_symbol which handles the
    tweaking needed for dynamic linking support.  */
 
-static boolean
+static bfd_boolean
 linux_add_one_symbol (info, abfd, name, flags, section, value, string,
 		      copy, collect, hashp)
      struct bfd_link_info *info;
@@ -337,12 +337,12 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
      asection *section;
      bfd_vma value;
      const char *string;
-     boolean copy;
-     boolean collect;
+     bfd_boolean copy;
+     bfd_boolean collect;
      struct bfd_link_hash_entry **hashp;
 {
   struct linux_link_hash_entry *h;
-  boolean insert;
+  bfd_boolean insert;
 
   /* Look up and see if we already have this symbol in the hash table.
      If we do, and the defining entry is from a shared library, we
@@ -352,7 +352,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
      be able to link Linux a.out and ELF objects together, but serious
      confusion is possible.  */
 
-  insert = false;
+  insert = FALSE;
 
   if (! info->relocateable
       && linux_hash_table (info)->dynobj == NULL
@@ -361,16 +361,16 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
       && abfd->xvec == info->hash->creator)
     {
       if (! linux_link_create_dynamic_sections (abfd, info))
-	return false;
+	return FALSE;
       linux_hash_table (info)->dynobj = abfd;
-      insert = true;
+      insert = TRUE;
     }
 
   if (bfd_is_abs_section (section)
       && abfd->xvec == info->hash->creator)
     {
-      h = linux_link_hash_lookup (linux_hash_table (info), name, false,
-				  false, false);
+      h = linux_link_hash_lookup (linux_hash_table (info), name, FALSE,
+				  FALSE, FALSE);
       if (h != NULL
 	  && (h->root.root.type == bfd_link_hash_defined
 	      || h->root.root.type == bfd_link_hash_defweak))
@@ -382,10 +382,10 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
 
 	  f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
 	  if (f == NULL)
-	    return false;
+	    return FALSE;
 	  f->jump = IS_PLT_SYM (name);
 
-	  return true;
+	  return TRUE;
 	}
     }
 
@@ -393,7 +393,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
   if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
 					  value, string, copy, collect,
 					  hashp))
-    return false;
+    return FALSE;
 
   /* Insert a pointer to our table in the set vector.  The dynamic
      linker requires this information */
@@ -410,11 +410,11 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
 	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
-	      false, false, NULL)))
-	return false;
+	      FALSE, FALSE, NULL)))
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We will crawl the hash table and come here for every global symbol.
@@ -427,7 +427,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
 
    This function is called via linux_link_hash_traverse.  */
 
-static boolean
+static bfd_boolean
 linux_tally_symbols (h, data)
      struct linux_link_hash_entry *h;
      PTR data;
@@ -436,7 +436,7 @@ linux_tally_symbols (h, data)
   struct fixup *f, *f1;
   int is_plt;
   struct linux_link_hash_entry *h1, *h2;
-  boolean exists;
+  bfd_boolean exists;
 
   if (h->root.root.type == bfd_link_hash_warning)
     h = (struct linux_link_hash_entry *) h->root.root.u.i.link;
@@ -482,12 +482,12 @@ linux_tally_symbols (h, data)
       h1 = linux_link_hash_lookup (linux_hash_table (info),
 				   (h->root.root.root.string
 				    + sizeof PLT_REF_PREFIX - 1),
-				   false, false, true);
+				   FALSE, FALSE, TRUE);
       /* h2 does not follow indirect symbols. */
       h2 = linux_link_hash_lookup (linux_hash_table (info),
 				   (h->root.root.root.string
 				    + sizeof PLT_REF_PREFIX - 1),
-				   false, false, false);
+				   FALSE, FALSE, FALSE);
 
       /* The real symbol must exist but if it is also an ABS symbol,
 	 there is no need to have a fixup.  This is because they both
@@ -505,7 +505,7 @@ linux_tally_symbols (h, data)
 	     involving this symbol.  If so, convert it to a regular
 	     fixup.  In the end, this relaxes some of the requirements
 	     about the order of performing fixups.  */
-	  exists = false;
+	  exists = FALSE;
 	  for (f1 = linux_hash_table (info)->fixup_list;
 	       f1 != NULL;
 	       f1 = f1->next)
@@ -514,7 +514,7 @@ linux_tally_symbols (h, data)
 		  || (! f1->builtin && ! f1->jump))
 		continue;
 	      if (f1->h == h1)
-		exists = true;
+		exists = TRUE;
 	      if (! exists
 		  && bfd_is_abs_section (h->root.root.u.def.section))
 		{
@@ -524,7 +524,7 @@ linux_tally_symbols (h, data)
 	      f1->h = h1;
 	      f1->jump = is_plt;
 	      f1->builtin = 0;
-	      exists = true;
+	      exists = TRUE;
 	    }
 	  if (! exists
 	      && bfd_is_abs_section (h->root.root.u.def.section))
@@ -542,10 +542,10 @@ linux_tally_symbols (h, data)
       /* Quick and dirty way of stripping these symbols from the
 	 symtab. */
       if (bfd_is_abs_section (h->root.root.u.def.section))
-	h->root.written = true;
+	h->root.written = TRUE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called to set the size of the .linux-dynamic section is.
@@ -554,7 +554,7 @@ linux_tally_symbols (h, data)
    we just scan the hash tables to find out how many additional fixups
    are required.  */
 
-boolean
+bfd_boolean
 bfd_i386linux_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -563,7 +563,7 @@ bfd_i386linux_size_dynamic_sections (output_bfd, info)
   asection *s;
 
   if (output_bfd->xvec != &MY(vec))
-    return true;
+    return TRUE;
 
   /* First find the fixups... */
   linux_link_hash_traverse (linux_hash_table (info),
@@ -587,7 +587,7 @@ bfd_i386linux_size_dynamic_sections (output_bfd, info)
     {
       if (linux_hash_table (info)->fixup_count > 0)
 	abort ();
-      return true;
+      return TRUE;
     }
 
   /* Allocate memory for our fixup table.  We will fill it in later.  */
@@ -599,17 +599,17 @@ bfd_i386linux_size_dynamic_sections (output_bfd, info)
       s->_raw_size *= 8;
       s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We come here once we are ready to actually write the fixup table to
    the output file.  Scan the fixup tables and so forth and generate
    the stuff we need.  */
 
-static boolean
+static bfd_boolean
 linux_finish_dynamic_link (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -623,7 +623,7 @@ linux_finish_dynamic_link (output_bfd, info)
   unsigned int fixups_written;
 
   if (linux_hash_table (info)->dynobj == NULL)
-    return true;
+    return TRUE;
 
   s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
 			       ".linux-dynamic");
@@ -739,7 +739,7 @@ linux_finish_dynamic_link (output_bfd, info)
 
   h = linux_link_hash_lookup (linux_hash_table (info),
 			      "__BUILTIN_FIXUPS__",
-			      false, false, false);
+			      FALSE, FALSE, FALSE);
 
   if (h != NULL
       && (h->root.root.type == bfd_link_hash_defined
@@ -760,12 +760,12 @@ linux_finish_dynamic_link (output_bfd, info)
 
   if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset),
 		SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (bfd_bwrite ((PTR) s->contents, s->_raw_size, output_bfd) != s->_raw_size)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 #define MY_bfd_link_hash_table_create linux_link_hash_table_create
diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c
index fc58767a97f..6bf6e727b21 100644
--- a/bfd/i386lynx.c
+++ b/bfd/i386lynx.c
@@ -56,29 +56,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0		      \
 	    || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, \
 			  abfd) != EXEC_BYTES_SIZE)			      \
-	  return false;							      \
+	  return FALSE;							      \
 	/* Now write out reloc info, followed by syms and strings */	      \
   									      \
 	if (bfd_get_symcount (abfd) != 0) 				      \
 	    {								      \
 	      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET)    \
 		  != 0)							      \
-	        return false;						      \
+	        return FALSE;						      \
 									      \
-	      if (! NAME(aout,write_syms) (abfd)) return false;		      \
+	      if (! NAME(aout,write_syms) (abfd)) return FALSE;		      \
 									      \
 	      if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET)   \
 		  != 0)							      \
-	        return false;						      \
+	        return FALSE;						      \
 									      \
 	      if (!NAME(lynx,squirt_out_relocs) (abfd, obj_textsec (abfd)))   \
-		return false;						      \
+		return FALSE;						      \
 	      if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET)   \
 		  != 0)							      \
 	        return 0;						      \
 									      \
 	      if (!NAME(lynx,squirt_out_relocs) (abfd, obj_datasec (abfd)))   \
-		return false;						      \
+		return FALSE;						      \
 	    }								      \
       }
 #endif
@@ -86,19 +86,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libaout.h"
 #include "aout/aout64.h"
 
-void NAME (lynx,swap_std_reloc_out) PARAMS ((bfd *, arelent *, struct reloc_std_external *));
-void NAME (lynx,swap_ext_reloc_out) PARAMS ((bfd *, arelent *, struct reloc_ext_external *));
-void NAME (lynx,swap_ext_reloc_in)  PARAMS ((bfd *, struct reloc_ext_external *, arelent *, asymbol **, bfd_size_type));
-void NAME (lynx,swap_std_reloc_in)  PARAMS ((bfd *, struct reloc_std_external *, arelent *, asymbol **, bfd_size_type));
-boolean NAME (lynx,slurp_reloc_table) PARAMS ((bfd *, sec_ptr, asymbol **));
-boolean NAME (lynx,squirt_out_relocs) PARAMS ((bfd *, asection *));
-long NAME (lynx,canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+void NAME (lynx,swap_std_reloc_out)
+  PARAMS ((bfd *, arelent *, struct reloc_std_external *));
+void NAME (lynx,swap_ext_reloc_out)
+  PARAMS ((bfd *, arelent *, struct reloc_ext_external *));
+void NAME (lynx,swap_ext_reloc_in)
+  PARAMS ((bfd *, struct reloc_ext_external *, arelent *, asymbol **,
+	   bfd_size_type));
+void NAME (lynx,swap_std_reloc_in)
+  PARAMS ((bfd *, struct reloc_std_external *, arelent *, asymbol **,
+	   bfd_size_type));
+bfd_boolean NAME (lynx,slurp_reloc_table)
+  PARAMS ((bfd *, sec_ptr, asymbol **));
+bfd_boolean NAME (lynx,squirt_out_relocs)
+  PARAMS ((bfd *, asection *));
+long NAME (lynx,canonicalize_reloc)
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
 
 #ifdef LYNX_CORE
 
 char *lynx_core_file_failing_command ();
 int lynx_core_file_failing_signal ();
-boolean lynx_core_file_matches_executable_p ();
+bfd_boolean lynx_core_file_matches_executable_p ();
 const bfd_target *lynx_core_file_p ();
 
 #define	MY_core_file_failing_command lynx_core_file_failing_command
@@ -151,7 +160,7 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr)
      Absolute symbols can come in in two ways, either as an offset
      from the abs section, or as a symbol which has an abs value.
      check for that here
-     */
+  */
 
 
   if (bfd_is_com_section (output_section)
@@ -161,7 +170,7 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr)
       if (bfd_abs_section_ptr->symbol == sym)
 	{
 	  /* Whoops, looked like an abs symbol, but is really an offset
-	   from the abs section */
+	     from the abs section */
 	  r_index = 0;
 	  r_extern = 0;
 	}
@@ -388,7 +397,7 @@ NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
 
 /* Reloc hackery */
 
-boolean
+bfd_boolean
 NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
      bfd *abfd;
      sec_ptr asect;
@@ -401,10 +410,10 @@ NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
   size_t each_size;
 
   if (asect->relocation)
-    return true;
+    return TRUE;
 
   if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
+    return TRUE;
 
   if (asect == obj_datasec (abfd))
     {
@@ -419,11 +428,11 @@ NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
     }
 
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 
 doit:
   if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   each_size = obj_reloc_entry_size (abfd);
 
   count = reloc_size / each_size;
@@ -431,20 +440,20 @@ doit:
 
   reloc_cache = (arelent *) bfd_zmalloc (count * sizeof (arelent));
   if (!reloc_cache && count != 0)
-    return false;
+    return FALSE;
 
   relocs = (PTR) bfd_alloc (abfd, reloc_size);
   if (!relocs && reloc_size != 0)
     {
       free (reloc_cache);
-      return false;
+      return FALSE;
     }
 
   if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
     {
       bfd_release (abfd, relocs);
       free (reloc_cache);
-      return false;
+      return FALSE;
     }
 
   if (each_size == RELOC_EXT_SIZE)
@@ -476,14 +485,14 @@ doit:
   bfd_release (abfd, relocs);
   asect->relocation = reloc_cache;
   asect->reloc_count = count;
-  return true;
+  return TRUE;
 }
 
 
 
 /* Write out a relocation section into an object file.  */
 
-boolean
+bfd_boolean
 NAME(lynx,squirt_out_relocs) (abfd, section)
      bfd *abfd;
      asection *section;
@@ -496,14 +505,14 @@ NAME(lynx,squirt_out_relocs) (abfd, section)
   bfd_size_type natsize;
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   each_size = obj_reloc_entry_size (abfd);
   natsize = count;
   natsize *= each_size;
   native = (unsigned char *) bfd_zalloc (abfd, natsize);
   if (!native)
-    return false;
+    return FALSE;
 
   generic = section->orelocation;
 
@@ -525,11 +534,11 @@ NAME(lynx,squirt_out_relocs) (abfd, section)
   if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
     {
       bfd_release (abfd, native);
-      return false;
+      return FALSE;
     }
   bfd_release (abfd, native);
 
-  return true;
+  return TRUE;
 }
 
 /* This is stupid.  This function should be a boolean predicate */
diff --git a/bfd/i386mach3.c b/bfd/i386mach3.c
index 4364eb84bd0..0e4c4e752e3 100644
--- a/bfd/i386mach3.c
+++ b/bfd/i386mach3.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries.
-   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2001
+   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -50,7 +50,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define MY(OP) CONCAT2 (i386mach3_,OP)
 #define TARGETNAME "a.out-mach3"
 
-static boolean MY (set_sizes) PARAMS ((bfd *));
+static bfd_boolean MY (set_sizes) PARAMS ((bfd *));
 #define MY_backend_data &MY(backend_data)
 static const struct aout_backend_data MY(backend_data) = {
   0,				/* zmagic contiguous */
diff --git a/bfd/i386msdos.c b/bfd/i386msdos.c
index 5c060ecf58e..7d5a0d4a40e 100644
--- a/bfd/i386msdos.c
+++ b/bfd/i386msdos.c
@@ -56,19 +56,22 @@ struct exe_header
 #define EXE_LOAD_LOW	0xffff
 #define EXE_PAGE_SIZE	512
 
-static int     msdos_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean msdos_write_object_contents PARAMS ((bfd *));
-static boolean msdos_set_section_contents PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+static int msdos_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean msdos_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean msdos_set_section_contents
+  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
 
 static int
 msdos_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
 
-static boolean
+static bfd_boolean
 msdos_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -103,7 +106,7 @@ msdos_write_object_contents (abfd)
   if (high_vma > (bfd_vma)0xffff)
     {
       bfd_set_error(bfd_error_file_too_big);
-      return false;
+      return FALSE;
     }
 
   /* Constants.  */
@@ -127,12 +130,12 @@ msdos_write_object_contents (abfd)
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
       || bfd_bwrite (hdr, (bfd_size_type) sizeof(hdr), abfd) != sizeof(hdr))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 msdos_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -142,7 +145,7 @@ msdos_set_section_contents (abfd, section, location, offset, count)
 {
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   section->filepos = EXE_PAGE_SIZE + bfd_get_section_vma (abfd, section);
 
@@ -150,10 +153,10 @@ msdos_set_section_contents (abfd, section, location, offset, count)
     {
       if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
           || bfd_bwrite (location, count, abfd) != count)
-        return false;
+        return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 
diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c
index cafad3e30d0..d9a34e34131 100644
--- a/bfd/i386os9k.c
+++ b/bfd/i386os9k.c
@@ -27,14 +27,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libaout.h"		/* BFD a.out internal data structures */
 #include "os9k.h"
 
-static const bfd_target * os9k_callback PARAMS ((bfd *));
-static const bfd_target * os9k_object_p PARAMS ((bfd *));
-static int                os9k_sizeof_headers PARAMS ((bfd *, boolean));
-boolean                   os9k_swap_exec_header_in PARAMS ((bfd *, mh_com *, struct internal_exec *));
+static const bfd_target * os9k_callback
+  PARAMS ((bfd *));
+static const bfd_target * os9k_object_p
+  PARAMS ((bfd *));
+static int os9k_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+bfd_boolean os9k_swap_exec_header_in
+  PARAMS ((bfd *, mh_com *, struct internal_exec *));
 
 /* Swaps the information in an executable header taken from a raw byte
    stream memory image, into the internal exec_header structure.  */
-boolean
+bfd_boolean
 os9k_swap_exec_header_in (abfd, raw_bytes, execp)
      bfd *abfd;
      mh_com *raw_bytes;
@@ -59,7 +63,7 @@ os9k_swap_exec_header_in (abfd, raw_bytes, execp)
 	  != sizeof (dmemstart))
       || (bfd_bread (&dmemsize, (bfd_size_type) sizeof (dmemsize), abfd)
 	  != sizeof (dmemsize)))
-    return false;
+    return FALSE;
 
   execp->a_tload = 0;
   execp->a_dload = H_GET_32 (abfd, (unsigned char *) &dmemstart);
@@ -70,7 +74,7 @@ os9k_swap_exec_header_in (abfd, raw_bytes, execp)
   execp->a_trsize = 0;
   execp->a_drsize = 0;
 
-  return true;
+  return TRUE;
 }
 
 #if 0
@@ -193,7 +197,7 @@ struct bout_data_struct
   struct internal_exec e;
 };
 
-static boolean
+static bfd_boolean
 os9k_mkobject (abfd)
      bfd *abfd;
 {
@@ -202,7 +206,7 @@ os9k_mkobject (abfd)
 
   rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, amt);
   if (rawptr == NULL)
-    return false;
+    return FALSE;
 
   abfd->tdata.bout_data = rawptr;
   exec_hdr (abfd) = &rawptr->e;
@@ -211,17 +215,17 @@ os9k_mkobject (abfd)
   obj_datasec (abfd) = (asection *) NULL;
   obj_bsssec (abfd) = (asection *) NULL;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 os9k_write_object_contents (abfd)
      bfd *abfd;
 {
   struct external_exec swapped_hdr;
 
   if (! aout_32_make_sections (abfd))
-    return false;
+    return FALSE;
 
   exec_hdr (abfd)->a_info = BMAGIC;
 
@@ -247,35 +251,35 @@ os9k_write_object_contents (abfd)
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
       || bfd_bwrite ((PTR) & swapped_hdr, (bfd_size_type) EXEC_BYTES_SIZE,
 		    abfd) != EXEC_BYTES_SIZE)
-    return false;
+    return FALSE;
 
   /* Now write out reloc info, followed by syms and strings.  */
   if (bfd_get_symcount (abfd) != 0)
     {
       if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
       if (!aout_32_write_syms (abfd))
-	return false;
+	return FALSE;
 
       if (bfd_seek (abfd, (file_ptr) (N_TROFF (*exec_hdr (abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
       if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd)))
-	return false;
+	return FALSE;
       if (bfd_seek (abfd, (file_ptr) (N_DROFF (*exec_hdr (abfd))), SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
 
       if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd)))
-	return false;
+	return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 os9k_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -287,7 +291,7 @@ os9k_set_section_contents (abfd, section, location, offset, count)
   if (! abfd->output_has_begun)
     {				/* set by bfd.c handler */
       if (! aout_32_make_sections (abfd))
-	return false;
+	return FALSE;
 
       obj_textsec (abfd)->filepos = sizeof (struct internal_exec);
       obj_datasec (abfd)->filepos = obj_textsec (abfd)->filepos
@@ -296,19 +300,19 @@ os9k_set_section_contents (abfd, section, location, offset, count)
     }
   /* Regardless, once we know what we're doing, we might as well get going.  */
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (count != 0)
     return bfd_bwrite ((PTR) location, (bfd_size_type) count, abfd) == count;
 
-  return true;
+  return TRUE;
 }
 #endif	/* 0 */
 
 static int
 os9k_sizeof_headers (ignore_abfd, ignore)
      bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     boolean ignore ATTRIBUTE_UNUSED;
+     bfd_boolean ignore ATTRIBUTE_UNUSED;
 {
   return sizeof (struct internal_exec);
 }
diff --git a/bfd/ieee.c b/bfd/ieee.c
index d1c5eb13b40..779fd712df0 100644
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -40,93 +40,151 @@ struct output_buffer_struct
   int buffer;
 };
 
-static boolean ieee_write_byte PARAMS ((bfd *, int));
-static boolean ieee_write_2bytes PARAMS ((bfd *, int));
-static boolean ieee_write_int PARAMS ((bfd *, bfd_vma));
-static boolean ieee_write_id PARAMS ((bfd *, const char *));
-static unsigned short read_2bytes PARAMS ((common_header_type *));
-static void bfd_get_string PARAMS ((common_header_type *, char *, size_t));
-static char *read_id PARAMS ((common_header_type *));
-static boolean ieee_write_expression
-  PARAMS ((bfd *, bfd_vma, asymbol *, boolean, unsigned int));
-static void ieee_write_int5 PARAMS ((bfd_byte *, bfd_vma));
-static boolean ieee_write_int5_out PARAMS ((bfd *, bfd_vma));
-static boolean parse_int PARAMS ((common_header_type *, bfd_vma *));
-static int parse_i PARAMS ((common_header_type *, boolean *));
-static bfd_vma must_parse_int PARAMS ((common_header_type *));
+static bfd_boolean ieee_write_byte
+  PARAMS ((bfd *, int));
+static bfd_boolean ieee_write_2bytes
+  PARAMS ((bfd *, int));
+static bfd_boolean ieee_write_int
+  PARAMS ((bfd *, bfd_vma));
+static bfd_boolean ieee_write_id
+  PARAMS ((bfd *, const char *));
+static unsigned short read_2bytes
+  PARAMS ((common_header_type *));
+static void bfd_get_string
+  PARAMS ((common_header_type *, char *, size_t));
+static char *read_id
+  PARAMS ((common_header_type *));
+static bfd_boolean ieee_write_expression
+  PARAMS ((bfd *, bfd_vma, asymbol *, bfd_boolean, unsigned int));
+static void ieee_write_int5
+  PARAMS ((bfd_byte *, bfd_vma));
+static bfd_boolean ieee_write_int5_out
+  PARAMS ((bfd *, bfd_vma));
+static bfd_boolean parse_int
+  PARAMS ((common_header_type *, bfd_vma *));
+static int parse_i
+  PARAMS ((common_header_type *, bfd_boolean *));
+static bfd_vma must_parse_int
+  PARAMS ((common_header_type *));
 static void parse_expression
   PARAMS ((ieee_data_type *, bfd_vma *, ieee_symbol_index_type *,
-	   boolean *, unsigned int *, asection **));
-static file_ptr ieee_part_after PARAMS ((ieee_data_type *, file_ptr));
+	   bfd_boolean *, unsigned int *, asection **));
+static file_ptr ieee_part_after
+  PARAMS ((ieee_data_type *, file_ptr));
 static ieee_symbol_type *get_symbol
   PARAMS ((bfd *, ieee_data_type *, ieee_symbol_type *, unsigned int *,
 	   ieee_symbol_type ***, unsigned int *, int));
-static boolean ieee_slurp_external_symbols PARAMS ((bfd *));
-static boolean ieee_slurp_symbol_table PARAMS ((bfd *));
-static long ieee_get_symtab_upper_bound PARAMS ((bfd *));
-static long ieee_get_symtab PARAMS ((bfd *, asymbol **));
+static bfd_boolean ieee_slurp_external_symbols
+  PARAMS ((bfd *));
+static bfd_boolean ieee_slurp_symbol_table
+  PARAMS ((bfd *));
+static long ieee_get_symtab_upper_bound
+  PARAMS ((bfd *));
+static long ieee_get_symtab
+  PARAMS ((bfd *, asymbol **));
 static asection *get_section_entry
   PARAMS ((bfd *, ieee_data_type *i, unsigned int));
-static void ieee_slurp_sections PARAMS ((bfd *));
-static boolean ieee_slurp_debug PARAMS ((bfd *));
-const bfd_target *ieee_archive_p PARAMS ((bfd *));
-const bfd_target *ieee_object_p PARAMS ((bfd *));
-static void ieee_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
+static void ieee_slurp_sections
+  PARAMS ((bfd *));
+static bfd_boolean ieee_slurp_debug
+  PARAMS ((bfd *));
+const bfd_target *ieee_archive_p
+  PARAMS ((bfd *));
+const bfd_target *ieee_object_p
+  PARAMS ((bfd *));
+static void ieee_get_symbol_info
+  PARAMS ((bfd *, asymbol *, symbol_info *));
 static void ieee_print_symbol
   PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-static boolean do_one
+static bfd_boolean do_one
   PARAMS ((ieee_data_type *, ieee_per_section_type *, unsigned char *,
 	   asection *, int));
-static boolean ieee_slurp_section_data PARAMS ((bfd *));
-static boolean ieee_new_section_hook PARAMS ((bfd *, asection *));
-static long ieee_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-static boolean ieee_get_section_contents
+static bfd_boolean ieee_slurp_section_data
+  PARAMS ((bfd *));
+static bfd_boolean ieee_new_section_hook
+  PARAMS ((bfd *, asection *));
+static long ieee_get_reloc_upper_bound
+  PARAMS ((bfd *, sec_ptr));
+static bfd_boolean ieee_get_section_contents
   PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
 static long ieee_canonicalize_reloc
   PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
-static int comp PARAMS ((const PTR, const PTR));
-static boolean ieee_write_section_part PARAMS ((bfd *));
-static boolean do_with_relocs PARAMS ((bfd *, asection *));
-static boolean do_as_repeat PARAMS ((bfd *, asection *));
-static boolean do_without_relocs PARAMS ((bfd *, asection *));
-static boolean ieee_mkobject PARAMS ((bfd *));
-static void fill PARAMS ((void));
-static void flush PARAMS ((void));
-static void write_int PARAMS ((int));
-static void copy_id PARAMS ((void));
-static void copy_expression PARAMS ((void));
-static void fill_int PARAMS ((struct output_buffer_struct *));
-static void drop_int PARAMS ((struct output_buffer_struct *));
-static void copy_int PARAMS ((void));
-static void f1_record PARAMS ((void));
-static void f0_record PARAMS ((void));
-static void copy_till_end PARAMS ((void));
-static void f2_record PARAMS ((void));
-static void f8_record PARAMS ((void));
-static void e2_record PARAMS ((void));
-static void block PARAMS ((void));
-static void relocate_debug PARAMS ((bfd *, bfd *));
-static boolean ieee_write_debug_part PARAMS ((bfd *));
-static boolean ieee_write_data_part PARAMS ((bfd *));
-static boolean init_for_output PARAMS ((bfd *));
-static boolean ieee_set_section_contents
+static int comp
+  PARAMS ((const PTR, const PTR));
+static bfd_boolean ieee_write_section_part
+  PARAMS ((bfd *));
+static bfd_boolean do_with_relocs
+  PARAMS ((bfd *, asection *));
+static bfd_boolean do_as_repeat
+  PARAMS ((bfd *, asection *));
+static bfd_boolean do_without_relocs
+  PARAMS ((bfd *, asection *));
+static bfd_boolean ieee_mkobject
+  PARAMS ((bfd *));
+static void fill
+  PARAMS ((void));
+static void flush
+  PARAMS ((void));
+static void write_int
+  PARAMS ((int));
+static void copy_id
+  PARAMS ((void));
+static void copy_expression
+  PARAMS ((void));
+static void fill_int
+  PARAMS ((struct output_buffer_struct *));
+static void drop_int
+  PARAMS ((struct output_buffer_struct *));
+static void copy_int
+  PARAMS ((void));
+static void f1_record
+  PARAMS ((void));
+static void f0_record
+  PARAMS ((void));
+static void copy_till_end
+  PARAMS ((void));
+static void f2_record
+  PARAMS ((void));
+static void f8_record
+  PARAMS ((void));
+static void e2_record
+  PARAMS ((void));
+static void block
+  PARAMS ((void));
+static void relocate_debug
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean ieee_write_debug_part
+  PARAMS ((bfd *));
+static bfd_boolean ieee_write_data_part
+  PARAMS ((bfd *));
+static bfd_boolean init_for_output
+  PARAMS ((bfd *));
+static bfd_boolean ieee_set_section_contents
   PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
-static boolean ieee_write_external_part PARAMS ((bfd *));
-static boolean ieee_write_me_part PARAMS ((bfd *));
-static boolean ieee_write_processor PARAMS ((bfd *));
-static boolean ieee_write_object_contents PARAMS ((bfd *));
-static asymbol *ieee_make_empty_symbol PARAMS ((bfd *));
-static bfd *ieee_openr_next_archived_file PARAMS ((bfd *, bfd *));
-static boolean ieee_find_nearest_line
+static bfd_boolean ieee_write_external_part
+  PARAMS ((bfd *));
+static bfd_boolean ieee_write_me_part
+  PARAMS ((bfd *));
+static bfd_boolean ieee_write_processor
+  PARAMS ((bfd *));
+static bfd_boolean ieee_write_object_contents
+  PARAMS ((bfd *));
+static asymbol *ieee_make_empty_symbol
+  PARAMS ((bfd *));
+static bfd *ieee_openr_next_archived_file
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean ieee_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
-static int ieee_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
-static int ieee_sizeof_headers PARAMS ((bfd *, boolean));
+static int ieee_generic_stat_arch_elt
+  PARAMS ((bfd *, struct stat *));
+static int ieee_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
 
 /* Functions for writing to ieee files in the strange way that the
    standard requires. */
 
-static boolean
+static bfd_boolean
 ieee_write_byte (abfd, barg)
      bfd *abfd;
      int barg;
@@ -135,11 +193,11 @@ ieee_write_byte (abfd, barg)
 
   byte = barg;
   if (bfd_bwrite ((PTR) &byte, (bfd_size_type) 1, abfd) != 1)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 ieee_write_2bytes (abfd, bytes)
      bfd *abfd;
      int bytes;
@@ -149,11 +207,11 @@ ieee_write_2bytes (abfd, bytes)
   buffer[0] = bytes >> 8;
   buffer[1] = bytes & 0xff;
   if (bfd_bwrite ((PTR) buffer, (bfd_size_type) 2, abfd) != 2)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 ieee_write_int (abfd, value)
      bfd *abfd;
      bfd_vma value;
@@ -161,7 +219,7 @@ ieee_write_int (abfd, value)
   if (value <= 127)
     {
       if (! ieee_write_byte (abfd, (bfd_byte) value))
-	return false;
+	return FALSE;
     }
   else
     {
@@ -181,31 +239,31 @@ ieee_write_int (abfd, value)
       if (! ieee_write_byte (abfd,
 			     (bfd_byte) ((int) ieee_number_repeat_start_enum
 					 + length)))
-	return false;
+	return FALSE;
       switch (length)
 	{
 	case 4:
 	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 24)))
-	    return false;
+	    return FALSE;
 	  /* Fall through.  */
 	case 3:
 	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 16)))
-	    return false;
+	    return FALSE;
 	  /* Fall through.  */
 	case 2:
 	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 8)))
-	    return false;
+	    return FALSE;
 	  /* Fall through.  */
 	case 1:
 	  if (! ieee_write_byte (abfd, (bfd_byte) (value)))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 ieee_write_id (abfd, id)
      bfd *abfd;
      const char *id;
@@ -215,19 +273,19 @@ ieee_write_id (abfd, id)
   if (length <= 127)
     {
       if (! ieee_write_byte (abfd, (bfd_byte) length))
-	return false;
+	return FALSE;
     }
   else if (length < 255)
     {
       if (! ieee_write_byte (abfd, ieee_extension_length_1_enum)
 	  || ! ieee_write_byte (abfd, (bfd_byte) length))
-	return false;
+	return FALSE;
     }
   else if (length < 65535)
     {
       if (! ieee_write_byte (abfd, ieee_extension_length_2_enum)
 	  || ! ieee_write_2bytes (abfd, (int) length))
-	return false;
+	return FALSE;
     }
   else
     {
@@ -235,12 +293,12 @@ ieee_write_id (abfd, id)
 	(_("%s: string too long (%d chars, max 65535)"),
 	 bfd_get_filename (abfd), length);
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (bfd_bwrite ((PTR) id, (bfd_size_type) length, abfd) != length)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /***************************************************************************
@@ -305,12 +363,12 @@ read_id (ieee)
   return string;
 }
 
-static boolean
+static bfd_boolean
 ieee_write_expression (abfd, value, symbol, pcrel, index)
      bfd *abfd;
      bfd_vma value;
      asymbol *symbol;
-     boolean pcrel;
+     bfd_boolean pcrel;
      unsigned int index;
 {
   unsigned int term_count = 0;
@@ -318,7 +376,7 @@ ieee_write_expression (abfd, value, symbol, pcrel, index)
   if (value != 0)
     {
       if (! ieee_write_int (abfd, value))
-	return false;
+	return FALSE;
       term_count++;
     }
 
@@ -328,7 +386,7 @@ ieee_write_expression (abfd, value, symbol, pcrel, index)
       /* Def of a common symbol */
       if (! ieee_write_byte (abfd, ieee_variable_X_enum)
 	  || ! ieee_write_int (abfd, symbol->value))
-	return false;
+	return FALSE;
       term_count++;
     }
   else if (! bfd_is_abs_section (symbol->section))
@@ -339,7 +397,7 @@ ieee_write_expression (abfd, value, symbol, pcrel, index)
 	{
 	  if (! ieee_write_byte (abfd, ieee_variable_I_enum)
 	      || ! ieee_write_int (abfd, symbol->value))
-	    return false;
+	    return FALSE;
 	  term_count++;
 	}
       else if (symbol->flags & (BSF_LOCAL | BSF_SECTION_SYM))
@@ -350,12 +408,12 @@ ieee_write_expression (abfd, value, symbol, pcrel, index)
 	      || ! ieee_write_byte (abfd,
 				    (bfd_byte) (symbol->section->index
 						+ IEEE_SECTION_NUMBER_BASE)))
-	    return false;
+	    return FALSE;
 	  term_count++;
 	  if (symbol->value != 0)
 	    {
 	      if (! ieee_write_int (abfd, symbol->value))
-		return false;
+		return FALSE;
 	      term_count++;
 	    }
 	}
@@ -366,7 +424,7 @@ ieee_write_expression (abfd, value, symbol, pcrel, index)
 	     bfd_get_filename (abfd), bfd_asymbol_name (symbol),
 	     symbol->flags);
 	  bfd_set_error (bfd_error_invalid_operation);
-	  return false;
+	  return FALSE;
 	}
     }
 
@@ -377,24 +435,24 @@ ieee_write_expression (abfd, value, symbol, pcrel, index)
 	  || ! ieee_write_byte (abfd,
 				(bfd_byte) (index + IEEE_SECTION_NUMBER_BASE))
 	  || ! ieee_write_byte (abfd, ieee_function_minus_enum))
-	return false;
+	return FALSE;
     }
 
   /* Handle the degenerate case of a 0 address.  */
   if (term_count == 0)
     {
       if (! ieee_write_int (abfd, (bfd_vma) 0))
-	return false;
+	return FALSE;
     }
 
   while (term_count > 1)
     {
       if (! ieee_write_byte (abfd, ieee_function_plus_enum))
-	return false;
+	return FALSE;
       term_count--;
     }
 
-  return true;
+  return TRUE;
 }
 
 /*****************************************************************************/
@@ -414,7 +472,7 @@ ieee_write_int5 (buffer, value)
   buffer[4] = (value >> 0) & 0xff;
 }
 
-static boolean
+static bfd_boolean
 ieee_write_int5_out (abfd, value)
      bfd *abfd;
      bfd_vma value;
@@ -423,11 +481,11 @@ ieee_write_int5_out (abfd, value)
 
   ieee_write_int5 (b, value);
   if (bfd_bwrite ((PTR) b, (bfd_size_type) 5, abfd) != 5)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 parse_int (ieee, value_ptr)
      common_header_type *ieee;
      bfd_vma *value_ptr;
@@ -438,7 +496,7 @@ parse_int (ieee, value_ptr)
     {
       *value_ptr = value;
       next_byte (ieee);
-      return true;
+      return TRUE;
     }
   else if (value >= 0x80 && value <= 0x88)
     {
@@ -451,15 +509,15 @@ parse_int (ieee, value_ptr)
 	  count--;
 	}
       *value_ptr = result;
-      return true;
+      return TRUE;
     }
-  return false;
+  return FALSE;
 }
 
 static int
 parse_i (ieee, ok)
      common_header_type *ieee;
-     boolean *ok;
+     bfd_boolean *ok;
 {
   bfd_vma x;
   *ok = parse_int (ieee, &x);
@@ -486,12 +544,12 @@ typedef struct
 #if KEEPMINUSPCININST
 
 #define SRC_MASK(arg) arg
-#define PCREL_OFFSET false
+#define PCREL_OFFSET FALSE
 
 #else
 
 #define SRC_MASK(arg) 0
-#define PCREL_OFFSET true
+#define PCREL_OFFSET TRUE
 
 #endif
 
@@ -500,57 +558,57 @@ static reloc_howto_type abs32_howto =
 	 0,
 	 2,
 	 32,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 0,
 	 "abs32",
-	 true,
+	 TRUE,
 	 0xffffffff,
 	 0xffffffff,
-	 false);
+	 FALSE);
 
 static reloc_howto_type abs16_howto =
   HOWTO (1,
 	 0,
 	 1,
 	 16,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 0,
 	 "abs16",
-	 true,
+	 TRUE,
 	 0x0000ffff,
 	 0x0000ffff,
-	 false);
+	 FALSE);
 
 static reloc_howto_type abs8_howto =
   HOWTO (1,
 	 0,
 	 0,
 	 8,
-	 false,
+	 FALSE,
 	 0,
 	 complain_overflow_bitfield,
 	 0,
 	 "abs8",
-	 true,
+	 TRUE,
 	 0x000000ff,
 	 0x000000ff,
-	 false);
+	 FALSE);
 
 static reloc_howto_type rel32_howto =
   HOWTO (1,
 	 0,
 	 2,
 	 32,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_signed,
 	 0,
 	 "rel32",
-	 true,
+	 TRUE,
 	 SRC_MASK (0xffffffff),
 	 0xffffffff,
 	 PCREL_OFFSET);
@@ -560,12 +618,12 @@ static reloc_howto_type rel16_howto =
 	 0,
 	 1,
 	 16,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_signed,
 	 0,
 	 "rel16",
-	 true,
+	 TRUE,
 	 SRC_MASK (0x0000ffff),
 	 0x0000ffff,
 	 PCREL_OFFSET);
@@ -575,12 +633,12 @@ static reloc_howto_type rel8_howto =
 	 0,
 	 0,
 	 8,
-	 true,
+	 TRUE,
 	 0,
 	 complain_overflow_signed,
 	 0,
 	 "rel8",
-	 true,
+	 TRUE,
 	 SRC_MASK (0x000000ff),
 	 0x000000ff,
 	 PCREL_OFFSET);
@@ -592,7 +650,7 @@ parse_expression (ieee, value, symbol, pcrel, extra, section)
      ieee_data_type *ieee;
      bfd_vma *value;
      ieee_symbol_index_type *symbol;
-     boolean *pcrel;
+     bfd_boolean *pcrel;
      unsigned int *extra;
      asection **section;
 
@@ -603,7 +661,7 @@ parse_expression (ieee, value, symbol, pcrel, extra, section)
 #define INC sp++;
 #define DEC sp--;
 
-  boolean loop = true;
+  bfd_boolean loop = TRUE;
   ieee_value_type stack[10];
 
   /* The stack pointer always points to the next unused location */
@@ -621,7 +679,7 @@ parse_expression (ieee, value, symbol, pcrel, extra, section)
 	  {
 	    int section_n;
 	    next_byte (&(ieee->h));
-	    *pcrel = true;
+	    *pcrel = TRUE;
 	    section_n = must_parse_int (&(ieee->h));
 	    PUSH (NOSYMBOL, bfd_abs_section_ptr, 0);
 	    break;
@@ -706,7 +764,7 @@ parse_expression (ieee, value, symbol, pcrel, extra, section)
 	    else
 	      {
 		/* Thats all that we can understand.  */
-		loop = false;
+		loop = FALSE;
 	      }
 	  }
 	}
@@ -803,7 +861,7 @@ get_symbol (abfd, ieee, last_symbol, symbol_count, pptr, max_index, this_type)
   return last_symbol;
 }
 
-static boolean
+static bfd_boolean
 ieee_slurp_external_symbols (abfd)
      bfd *abfd;
 {
@@ -814,9 +872,9 @@ ieee_slurp_external_symbols (abfd)
   ieee_symbol_type **prev_reference_ptr = &ieee->external_reference;
   ieee_symbol_type *symbol = (ieee_symbol_type *) NULL;
   unsigned int symbol_count = 0;
-  boolean loop = true;
+  bfd_boolean loop = TRUE;
   last_index = 0xffffff;
-  ieee->symbol_table_full = true;
+  ieee->symbol_table_full = TRUE;
 
   ieee_seek (ieee, offset);
 
@@ -831,7 +889,7 @@ ieee_slurp_external_symbols (abfd)
 			       &prev_symbols_ptr,
 			       &ieee->external_symbol_max_index, 'I');
 	  if (symbol == NULL)
-	    return false;
+	    return FALSE;
 
 	  symbol->symbol.the_bfd = abfd;
 	  symbol->symbol.name = read_id (&(ieee->h));
@@ -845,7 +903,7 @@ ieee_slurp_external_symbols (abfd)
 			       &prev_symbols_ptr,
 			       &ieee->external_symbol_max_index, 'D');
 	  if (symbol == NULL)
-	    return false;
+	    return FALSE;
 
 	  BFD_ASSERT (symbol->index >= ieee->external_symbol_min_index);
 
@@ -878,7 +936,7 @@ ieee_slurp_external_symbols (abfd)
 		       bfd_archive_filename (abfd), symbol_attribute_def,
 		       symbol_name_index);
 		    bfd_set_error (bfd_error_bad_value);
-		    return false;
+		    return FALSE;
 		    break;
 		  }
 		break;
@@ -902,7 +960,7 @@ ieee_slurp_external_symbols (abfd)
 		      (_("%s: unexpected ATN type %d in external part"),
 			 bfd_archive_filename (abfd), (int) value);
 		    bfd_set_error (bfd_error_bad_value);
-		    return false;
+		    return FALSE;
 		  }
 		parse_int (&ieee->h, &value);
 		parse_int (&ieee->h, &value);
@@ -924,7 +982,7 @@ ieee_slurp_external_symbols (abfd)
 			  (_("%s: unexpected type after ATN"),
 			     bfd_archive_filename (abfd));
 			bfd_set_error (bfd_error_bad_value);
-			return false;
+			return FALSE;
 		      }
 		  }
 	      }
@@ -934,7 +992,7 @@ ieee_slurp_external_symbols (abfd)
 	  {
 	    unsigned int symbol_name_index;
 	    ieee_symbol_index_type symbol_ignore;
-	    boolean pcrel_ignore;
+	    bfd_boolean pcrel_ignore;
 	    unsigned int extra;
 	    next_byte (&(ieee->h));
 	    next_byte (&(ieee->h));
@@ -1000,7 +1058,7 @@ ieee_slurp_external_symbols (abfd)
 			       &prev_reference_ptr,
 			       &ieee->external_reference_max_index, 'X');
 	  if (symbol == NULL)
-	    return false;
+	    return FALSE;
 
 	  symbol->symbol.the_bfd = abfd;
 	  symbol->symbol.name = read_id (&(ieee->h));
@@ -1013,7 +1071,7 @@ ieee_slurp_external_symbols (abfd)
 	  break;
 
 	default:
-	  loop = false;
+	  loop = FALSE;
 	}
     }
 
@@ -1045,26 +1103,26 @@ ieee_slurp_external_symbols (abfd)
   if (symbol_count != abfd->symcount)
     {
       /* There are gaps in the table -- */
-      ieee->symbol_table_full = false;
+      ieee->symbol_table_full = FALSE;
     }
 
   *prev_symbols_ptr = (ieee_symbol_type *) NULL;
   *prev_reference_ptr = (ieee_symbol_type *) NULL;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 ieee_slurp_symbol_table (abfd)
      bfd *abfd;
 {
   if (! IEEE_DATA (abfd)->read_symbols)
     {
       if (! ieee_slurp_external_symbols (abfd))
-	return false;
-      IEEE_DATA (abfd)->read_symbols = true;
+	return FALSE;
+      IEEE_DATA (abfd)->read_symbols = TRUE;
     }
-  return true;
+  return TRUE;
 }
 
 static long
@@ -1212,7 +1270,7 @@ ieee_slurp_sections (abfd)
     {
       bfd_byte section_type[3];
       ieee_seek (ieee, offset);
-      while (true)
+      while (TRUE)
 	{
 	  switch (this_byte (&(ieee->h)))
 	    {
@@ -1371,7 +1429,7 @@ ieee_slurp_sections (abfd)
    at the area in the file so that program which understand can dig it
    out.  */
 
-static boolean
+static bfd_boolean
 ieee_slurp_debug (abfd)
      bfd *abfd;
 {
@@ -1380,18 +1438,18 @@ ieee_slurp_debug (abfd)
   file_ptr debug_end;
 
   if (ieee->w.r.debug_information_part == 0)
-    return true;
+    return TRUE;
 
   sec = bfd_make_section (abfd, ".debug");
   if (sec == NULL)
-    return false;
+    return FALSE;
   sec->flags |= SEC_DEBUGGING | SEC_HAS_CONTENTS;
   sec->filepos = ieee->w.r.debug_information_part;
 
   debug_end = ieee_part_after (ieee, ieee->w.r.debug_information_part);
   sec->_raw_size = debug_end - ieee->w.r.debug_information_part;
 
-  return true;
+  return TRUE;
 }
 
 /***********************************************************************
@@ -1566,8 +1624,8 @@ ieee_object_p (abfd)
   if (this_byte_and_next (&(ieee->h)) != Module_Beginning)
     goto got_wrong_format;
 
-  ieee->read_symbols = false;
-  ieee->read_data = false;
+  ieee->read_symbols = FALSE;
+  ieee->read_data = FALSE;
   ieee->section_count = 0;
   ieee->external_symbol_max_index = 0;
   ieee->external_symbol_min_index = IEEE_PUBLIC_BASE;
@@ -1679,7 +1737,7 @@ ieee_object_p (abfd)
 
   for (part = 0; part < N_W_VARIABLES; part++)
     {
-      boolean ok;
+      bfd_boolean ok;
       if (read_2bytes (&(ieee->h)) != (int) ieee_assign_value_to_variable_enum)
 	{
 	  goto fail;
@@ -1796,7 +1854,7 @@ ieee_print_symbol (abfd, afile, symbol, how)
     }
 }
 
-static boolean
+static bfd_boolean
 do_one (ieee, current_map, location_ptr, s, iterations)
      ieee_data_type *ieee;
      ieee_per_section_type *current_map;
@@ -1823,7 +1881,7 @@ do_one (ieee, current_map, location_ptr, s, iterations)
 
     case ieee_load_with_relocation_enum:
       {
-	boolean loop = true;
+	bfd_boolean loop = TRUE;
 	next_byte (&(ieee->h));
 	while (loop)
 	  {
@@ -1836,14 +1894,14 @@ do_one (ieee, current_map, location_ptr, s, iterations)
 	      case ieee_function_either_open_b_enum:
 		{
 		  unsigned int extra = 4;
-		  boolean pcrel = false;
+		  bfd_boolean pcrel = FALSE;
 		  asection *section;
 		  ieee_reloc_type *r;
 		  bfd_size_type amt = sizeof (ieee_reloc_type);
 
 		  r = (ieee_reloc_type *) bfd_alloc (ieee->h.abfd, amt);
 		  if (!r)
-		    return false;
+		    return FALSE;
 
 		  *(current_map->reloc_tail_ptr) = r;
 		  current_map->reloc_tail_ptr = &r->next;
@@ -1962,7 +2020,7 @@ do_one (ieee, current_map, location_ptr, s, iterations)
 
 		    default:
 		      BFD_FAIL ();
-		      return false;
+		      return FALSE;
 		    }
 		}
 		break;
@@ -1980,7 +2038,7 @@ do_one (ieee, current_map, location_ptr, s, iterations)
 		    }
 		  else
 		    {
-		      loop = false;
+		      loop = FALSE;
 		    }
 		}
 	      }
@@ -1988,15 +2046,15 @@ do_one (ieee, current_map, location_ptr, s, iterations)
 	    /* Prevent more than the first load-item of an LR record
 	       from being repeated (MRI convention). */
 	    if (iterations != 1)
-	      loop = false;
+	      loop = FALSE;
 	  }
       }
     }
-  return true;
+  return TRUE;
 }
 
 /* Read in all the section data and relocation stuff too */
-static boolean
+static bfd_boolean
 ieee_slurp_section_data (abfd)
      bfd *abfd;
 {
@@ -2008,8 +2066,8 @@ ieee_slurp_section_data (abfd)
   asection *s;
   /* Seek to the start of the data area */
   if (ieee->read_data)
-    return true;
-  ieee->read_data = true;
+    return TRUE;
+  ieee->read_data = TRUE;
   ieee_seek (ieee, ieee->w.r.data_part);
 
   /* Allocate enough space for all the section contents */
@@ -2021,19 +2079,19 @@ ieee_slurp_section_data (abfd)
 	continue;
       per->data = (bfd_byte *) bfd_alloc (ieee->h.abfd, s->_raw_size);
       if (!per->data)
-	return false;
+	return FALSE;
       /*SUPPRESS 68*/
       per->reloc_tail_ptr =
 	(ieee_reloc_type **) & (s->relocation);
     }
 
-  while (true)
+  while (TRUE)
     {
       switch (this_byte (&(ieee->h)))
 	{
 	  /* IF we see anything strange then quit */
 	default:
-	  return true;
+	  return TRUE;
 
 	case ieee_set_current_section_enum:
 	  next_byte (&(ieee->h));
@@ -2057,7 +2115,7 @@ ieee_slurp_section_data (abfd)
 		bfd_vma value;
 		ieee_symbol_index_type symbol;
 		unsigned int extra;
-		boolean pcrel;
+		bfd_boolean pcrel;
 		next_byte (&(ieee->h));
 		must_parse_int (&(ieee->h));	/* Throw away section #*/
 		parse_expression (ieee, &value,
@@ -2075,10 +2133,10 @@ ieee_slurp_section_data (abfd)
 		next_byte (&(ieee->h));
 	      abfd->start_address = must_parse_int (&(ieee->h));
 	      /* We've got to the end of the data now - */
-	      return true;
+	      return TRUE;
 	    default:
 	      BFD_FAIL ();
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 	case ieee_repeat_data_enum:
@@ -2113,7 +2171,7 @@ ieee_slurp_section_data (abfd)
 		    ieee->h.input_p = start;
 		    if (!do_one (ieee, current_map, location_ptr, s,
 				 (int) iterations))
-		      return false;
+		      return FALSE;
 		    iterations--;
 		  }
 	      }
@@ -2123,13 +2181,13 @@ ieee_slurp_section_data (abfd)
 	case ieee_load_with_relocation_enum:
 	  {
 	    if (!do_one (ieee, current_map, location_ptr, s, 1))
-	      return false;
+	      return FALSE;
 	  }
 	}
     }
 }
 
-static boolean
+static bfd_boolean
 ieee_new_section_hook (abfd, newsect)
      bfd *abfd;
      asection *newsect;
@@ -2137,10 +2195,10 @@ ieee_new_section_hook (abfd, newsect)
   newsect->used_by_bfd = (PTR)
     bfd_alloc (abfd, (bfd_size_type) sizeof (ieee_per_section_type));
   if (!newsect->used_by_bfd)
-    return false;
+    return FALSE;
   ieee_per_section (newsect)->data = (bfd_byte *) NULL;
   ieee_per_section (newsect)->section = newsect;
-  return true;
+  return TRUE;
 }
 
 static long
@@ -2155,7 +2213,7 @@ ieee_get_reloc_upper_bound (abfd, asect)
   return (asect->reloc_count + 1) * sizeof (arelent *);
 }
 
-static boolean
+static bfd_boolean
 ieee_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -2169,7 +2227,7 @@ ieee_get_section_contents (abfd, section, location, offset, count)
 					      offset, count);
   ieee_slurp_section_data (abfd);
   (void) memcpy ((PTR) location, (PTR) (p->data + offset), (unsigned) count);
-  return true;
+  return TRUE;
 }
 
 static long
@@ -2227,7 +2285,7 @@ comp (ap, bp)
 
 /* Write the section headers.  */
 
-static boolean
+static bfd_boolean
 ieee_write_section_part (abfd)
      bfd *abfd;
 {
@@ -2243,19 +2301,19 @@ ieee_write_section_part (abfd)
 	      || ! ieee_write_byte (abfd,
 				    (bfd_byte) (s->index
 						+ IEEE_SECTION_NUMBER_BASE)))
-	    return false;
+	    return FALSE;
 
 	  if (abfd->flags & EXEC_P)
 	    {
 	      /* This image is executable, so output absolute sections */
 	      if (! ieee_write_byte (abfd, ieee_variable_A_enum)
 		  || ! ieee_write_byte (abfd, ieee_variable_S_enum))
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
 	      if (! ieee_write_byte (abfd, ieee_variable_C_enum))
-		return false;
+		return FALSE;
 	    }
 
 	  switch (s->flags & (SEC_CODE | SEC_DATA | SEC_ROM))
@@ -2263,24 +2321,24 @@ ieee_write_section_part (abfd)
 	    case SEC_CODE | SEC_LOAD:
 	    case SEC_CODE:
 	      if (! ieee_write_byte (abfd, ieee_variable_P_enum))
-		return false;
+		return FALSE;
 	      break;
 	    case SEC_DATA:
 	    default:
 	      if (! ieee_write_byte (abfd, ieee_variable_D_enum))
-		return false;
+		return FALSE;
 	      break;
 	    case SEC_ROM:
 	    case SEC_ROM | SEC_DATA:
 	    case SEC_ROM | SEC_LOAD:
 	    case SEC_ROM | SEC_DATA | SEC_LOAD:
 	      if (! ieee_write_byte (abfd, ieee_variable_R_enum))
-		return false;
+		return FALSE;
 	    }
 
 
 	  if (! ieee_write_id (abfd, s->name))
-	    return false;
+	    return FALSE;
 #if 0
 	  ieee_write_int (abfd, 0);	/* Parent */
 	  ieee_write_int (abfd, 0);	/* Brother */
@@ -2292,7 +2350,7 @@ ieee_write_section_part (abfd)
 				    (bfd_byte) (s->index
 						+ IEEE_SECTION_NUMBER_BASE))
 	      || ! ieee_write_int (abfd, (bfd_vma) 1 << s->alignment_power))
-	    return false;
+	    return FALSE;
 
 	  /* Size */
 	  if (! ieee_write_2bytes (abfd, ieee_section_size_enum)
@@ -2300,7 +2358,7 @@ ieee_write_section_part (abfd)
 				    (bfd_byte) (s->index
 						+ IEEE_SECTION_NUMBER_BASE))
 	      || ! ieee_write_int (abfd, s->_raw_size))
-	    return false;
+	    return FALSE;
 	  if (abfd->flags & EXEC_P)
 	    {
 	      /* Relocateable sections don't have asl records */
@@ -2311,16 +2369,16 @@ ieee_write_section_part (abfd)
 					 (s->index
 					  + IEEE_SECTION_NUMBER_BASE)))
 		  || ! ieee_write_int (abfd, s->lma))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 
-static boolean
+static bfd_boolean
 do_with_relocs (abfd, s)
      bfd *abfd;
      asection *s;
@@ -2344,17 +2402,17 @@ do_with_relocs (abfd, s)
       || ! ieee_write_2bytes (abfd, ieee_set_current_pc_enum)
       || ! ieee_write_byte (abfd,
 			    (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE)))
-    return false;
+    return FALSE;
 
   if ((abfd->flags & EXEC_P) != 0 && relocs_to_go == 0)
     {
       if (! ieee_write_int (abfd, s->lma))
-	return false;
+	return FALSE;
     }
   else
     {
       if (! ieee_write_expression (abfd, (bfd_vma) 0, s->symbol, 0, 0))
-	return false;
+	return FALSE;
     }
 
   if (relocs_to_go == 0)
@@ -2375,13 +2433,13 @@ do_with_relocs (abfd, s)
 	  if (run != 0)
 	    {
 	      if (! ieee_write_byte (abfd, ieee_load_constant_bytes_enum))
-		return false;
+		return FALSE;
 	      /* Output a stream of bytes */
 	      if (! ieee_write_int (abfd, run))
-		return false;
+		return FALSE;
 	      if (bfd_bwrite ((PTR) (stream + current_byte_index), run, abfd)
 		  != run)
-		return false;
+		return FALSE;
 	      current_byte_index += run;
 	    }
 	}
@@ -2389,7 +2447,7 @@ do_with_relocs (abfd, s)
   else
     {
       if (! ieee_write_byte (abfd, ieee_load_with_relocation_enum))
-	return false;
+	return FALSE;
 
       /* Output the data stream as the longest sequence of bytes
 	 possible, allowing for the a reasonable packet size and
@@ -2400,7 +2458,7 @@ do_with_relocs (abfd, s)
 	  /* Outputting a section without data, fill it up */
 	  stream = (unsigned char *) bfd_zalloc (abfd, s->_raw_size);
 	  if (!stream)
-	    return false;
+	    return FALSE;
 	}
       while (current_byte_index < s->_raw_size)
 	{
@@ -2425,10 +2483,10 @@ do_with_relocs (abfd, s)
 	    {
 	      /* Output a stream of bytes */
 	      if (! ieee_write_int (abfd, run))
-		return false;
+		return FALSE;
 	      if (bfd_bwrite ((PTR) (stream + current_byte_index), run, abfd)
 		  != run)
-		return false;
+		return FALSE;
 	      current_byte_index += run;
 	    }
 	  /* Output any relocations here */
@@ -2468,7 +2526,7 @@ do_with_relocs (abfd, s)
 		    default:
 		      ov = 0;
 		      BFD_FAIL ();
-		      return false;
+		      return FALSE;
 		    }
 
 		  ov &= r->howto->src_mask;
@@ -2479,7 +2537,7 @@ do_with_relocs (abfd, s)
 
 		  if (! ieee_write_byte (abfd,
 					 ieee_function_either_open_b_enum))
-		    return false;
+		    return FALSE;
 
 /*		  abort();*/
 
@@ -2489,7 +2547,7 @@ do_with_relocs (abfd, s)
 						   *(r->sym_ptr_ptr),
 						   r->howto->pc_relative,
 						   (unsigned) s->index))
-			return false;
+			return FALSE;
 		    }
 		  else
 		    {
@@ -2497,7 +2555,7 @@ do_with_relocs (abfd, s)
 						   (asymbol *) NULL,
 						   r->howto->pc_relative,
 						   (unsigned) s->index))
-			return false;
+			return FALSE;
 		    }
 
 		  if (number_of_maus_in_address
@@ -2505,11 +2563,11 @@ do_with_relocs (abfd, s)
 		    {
 		      bfd_vma rsize = bfd_get_reloc_size (r->howto);
 		      if (! ieee_write_int (abfd, rsize))
-			return false;
+			return FALSE;
 		    }
 		  if (! ieee_write_byte (abfd,
 					 ieee_function_either_close_b_enum))
-		    return false;
+		    return FALSE;
 
 		  relocs_to_go--;
 		  p++;
@@ -2519,14 +2577,14 @@ do_with_relocs (abfd, s)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* If there are no relocations in the output section then we can be
    clever about how we write.  We block items up into a max of 127
    bytes.  */
 
-static boolean
+static bfd_boolean
 do_as_repeat (abfd, s)
      bfd *abfd;
      asection *s;
@@ -2542,17 +2600,17 @@ do_as_repeat (abfd, s)
 	  || ! ieee_write_byte (abfd,
 				(bfd_byte) (s->index
 					    + IEEE_SECTION_NUMBER_BASE)))
-	return false;
+	return FALSE;
 
       if ((abfd->flags & EXEC_P) != 0)
 	{
 	  if (! ieee_write_int (abfd, s->lma))
-	    return false;
+	    return FALSE;
 	}
       else
 	{
 	  if (! ieee_write_expression (abfd, (bfd_vma) 0, s->symbol, 0, 0))
-	    return false;
+	    return FALSE;
 	}
 
       if (! ieee_write_byte (abfd, ieee_repeat_data_enum)
@@ -2560,13 +2618,13 @@ do_as_repeat (abfd, s)
 	  || ! ieee_write_byte (abfd, ieee_load_constant_bytes_enum)
 	  || ! ieee_write_byte (abfd, 1)
 	  || ! ieee_write_byte (abfd, 0))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 do_without_relocs (abfd, s)
      bfd *abfd;
      asection *s;
@@ -2576,7 +2634,7 @@ do_without_relocs (abfd, s)
   if (stream == 0 || ((s->flags & SEC_LOAD) == 0))
     {
       if (! do_as_repeat (abfd, s))
-	return false;
+	return FALSE;
     }
   else
     {
@@ -2586,15 +2644,15 @@ do_without_relocs (abfd, s)
 	  if (stream[i] != 0)
 	    {
 	      if (! do_with_relocs (abfd, s))
-		return false;
-	      return true;
+		return FALSE;
+	      return TRUE;
 	    }
 	}
       if (! do_as_repeat (abfd, s))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 
@@ -2608,7 +2666,7 @@ static bfd *input_bfd;
 static bfd *output_bfd;
 static int output_buffer;
 
-static boolean
+static bfd_boolean
 ieee_mkobject (abfd)
      bfd *abfd;
 {
@@ -3280,14 +3338,14 @@ relocate_debug (output, input)
 /* Gather together all the debug information from each input BFD into
    one place, relocating it and emitting it as we go.  */
 
-static boolean
+static bfd_boolean
 ieee_write_debug_part (abfd)
      bfd *abfd;
 {
   ieee_data_type *ieee = IEEE_DATA (abfd);
   bfd_chain_type *chain = ieee->chain_root;
   unsigned char obuff[OBS];
-  boolean some_debug = false;
+  bfd_boolean some_debug = FALSE;
   file_ptr here = bfd_tell (abfd);
 
   output_ptr_start = output_ptr = obuff;
@@ -3305,12 +3363,12 @@ ieee_write_debug_part (abfd)
       if (s == NULL)
 	{
 	  ieee->w.r.debug_information_part = 0;
-	  return true;
+	  return TRUE;
 	}
 
       ieee->w.r.debug_information_part = here;
       if (bfd_bwrite (s->contents, s->_raw_size, abfd) != s->_raw_size)
-	return false;
+	return FALSE;
     }
   else
     {
@@ -3322,7 +3380,7 @@ ieee_write_debug_part (abfd)
 	    {
 	      if (bfd_seek (entry, entry_ieee->w.r.debug_information_part,
 			    SEEK_SET) != 0)
-		return false;
+		return FALSE;
 	      relocate_debug (abfd, entry);
 	    }
 
@@ -3340,12 +3398,12 @@ ieee_write_debug_part (abfd)
       flush ();
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write the data in an ieee way.  */
 
-static boolean
+static bfd_boolean
 ieee_write_data_part (abfd)
      bfd *abfd;
 {
@@ -3364,20 +3422,20 @@ ieee_write_data_part (abfd)
       if (s->reloc_count != 0)
 	{
 	  if (! do_with_relocs (abfd, s))
-	    return false;
+	    return FALSE;
 	}
       else
 	{
 	  if (! do_without_relocs (abfd, s))
-	    return false;
+	    return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 
-static boolean
+static bfd_boolean
 init_for_output (abfd)
      bfd *abfd;
 {
@@ -3391,10 +3449,10 @@ init_for_output (abfd)
 	  bfd_size_type size = s->_raw_size;
 	  ieee_per_section (s)->data = (bfd_byte *) (bfd_alloc (abfd, size));
 	  if (!ieee_per_section (s)->data)
-	    return false;
+	    return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /** exec and core file sections */
@@ -3402,7 +3460,7 @@ init_for_output (abfd)
 /* set section contents is complicated with IEEE since the format is
 * not a byte image, but a record stream.
 */
-static boolean
+static bfd_boolean
 ieee_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -3417,23 +3475,23 @@ ieee_set_section_contents (abfd, section, location, offset, count)
 	  bfd_size_type size = section->_raw_size;
 	  section->contents = (unsigned char *) bfd_alloc (abfd, size);
 	  if (section->contents == NULL)
-	    return false;
+	    return FALSE;
 	}
       /* bfd_set_section_contents has already checked that everything
          is within range.  */
       memcpy (section->contents + offset, location, (size_t) count);
-      return true;
+      return TRUE;
     }
 
   if (ieee_per_section (section)->data == (bfd_byte *) NULL)
     {
       if (!init_for_output (abfd))
-	return false;
+	return FALSE;
     }
   memcpy ((PTR) (ieee_per_section (section)->data + offset),
 	  (PTR) location,
 	  (unsigned int) count);
-  return true;
+  return TRUE;
 }
 
 /* Write the external symbols of a file.  IEEE considers two sorts of
@@ -3441,7 +3499,7 @@ ieee_set_section_contents (abfd, section, location, offset, count)
    forms to index them as well.  When we write them out we turn their
    symbol values into indexes from the right base.  */
 
-static boolean
+static bfd_boolean
 ieee_write_external_part (abfd)
      bfd *abfd;
 {
@@ -3451,7 +3509,7 @@ ieee_write_external_part (abfd)
   unsigned int reference_index = IEEE_REFERENCE_BASE;
   unsigned int public_index = IEEE_PUBLIC_BASE + 2;
   file_ptr here = bfd_tell (abfd);
-  boolean hadone = false;
+  bfd_boolean hadone = FALSE;
   if (abfd->outsymbols != (asymbol **) NULL)
     {
 
@@ -3464,10 +3522,10 @@ ieee_write_external_part (abfd)
 	      if (! ieee_write_byte (abfd, ieee_external_reference_enum)
 		  || ! ieee_write_int (abfd, (bfd_vma) reference_index)
 		  || ! ieee_write_id (abfd, p->name))
-		return false;
+		return FALSE;
 	      p->value = reference_index;
 	      reference_index++;
-	      hadone = true;
+	      hadone = TRUE;
 	    }
 	  else if (bfd_is_com_section (p->section))
 	    {
@@ -3479,10 +3537,10 @@ ieee_write_external_part (abfd)
 					ieee_weak_external_reference_enum)
 		  || ! ieee_write_int (abfd, (bfd_vma) reference_index)
 		  || ! ieee_write_int (abfd, p->value))
-		return false;
+		return FALSE;
 	      p->value = reference_index;
 	      reference_index++;
-	      hadone = true;
+	      hadone = TRUE;
 	    }
 	  else if (p->flags & BSF_GLOBAL)
 	    {
@@ -3496,12 +3554,12 @@ ieee_write_external_part (abfd)
 		  || ! ieee_write_byte (abfd, 15) /* instruction address */
 		  || ! ieee_write_byte (abfd, 19) /* static symbol */
 		  || ! ieee_write_byte (abfd, 1)) /* one of them */
-		return false;
+		return FALSE;
 
 	      /* Write out the value */
 	      if (! ieee_write_2bytes (abfd, ieee_value_record_enum)
 		  || ! ieee_write_int (abfd, (bfd_vma) public_index))
-		return false;
+		return FALSE;
 	      if (! bfd_is_abs_section (p->section))
 		{
 		  if (abfd->flags & EXEC_P)
@@ -3513,7 +3571,7 @@ ieee_write_external_part (abfd)
 			      (p->value
 			       + p->section->output_offset
 			       + p->section->output_section->vma))))
-			return false;
+			return FALSE;
 		    }
 		  else
 		    {
@@ -3521,8 +3579,8 @@ ieee_write_external_part (abfd)
 			     (abfd,
 			      p->value + p->section->output_offset,
 			      p->section->output_section->symbol,
-			      false, 0)))
-			return false;
+			      FALSE, 0)))
+			return FALSE;
 		    }
 		}
 	      else
@@ -3530,12 +3588,12 @@ ieee_write_external_part (abfd)
 		  if (! ieee_write_expression (abfd,
 					       p->value,
 					       bfd_abs_section_ptr->symbol,
-					       false, 0))
-		    return false;
+					       FALSE, 0))
+		    return FALSE;
 		}
 	      p->value = public_index;
 	      public_index++;
-	      hadone = true;
+	      hadone = TRUE;
 	    }
 	  else
 	    {
@@ -3547,7 +3605,7 @@ ieee_write_external_part (abfd)
   if (hadone)
     ieee->w.r.external_part = here;
 
-  return true;
+  return TRUE;
 }
 
 
@@ -3572,7 +3630,7 @@ static const unsigned char envi[] =
 /*    0xf1, 0xce, 0x21, 0, 54, 2,1,1	tool & version # */
 };
 
-static boolean
+static bfd_boolean
 ieee_write_me_part (abfd)
      bfd *abfd;
 {
@@ -3584,17 +3642,17 @@ ieee_write_me_part (abfd)
 	  || ! ieee_write_byte (abfd, ieee_function_either_open_b_enum)
 	  || ! ieee_write_int (abfd, abfd->start_address)
 	  || ! ieee_write_byte (abfd, ieee_function_either_close_b_enum))
-	return false;
+	return FALSE;
     }
   ieee->w.r.me_record = bfd_tell (abfd);
   if (! ieee_write_byte (abfd, ieee_module_end_enum))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Write out the IEEE processor ID.  */
 
-static boolean
+static bfd_boolean
 ieee_write_processor (abfd)
      bfd *abfd;
 {
@@ -3605,22 +3663,22 @@ ieee_write_processor (abfd)
     {
     default:
       if (! ieee_write_id (abfd, bfd_printable_name (abfd)))
-	return false;
+	return FALSE;
       break;
 
     case bfd_arch_a29k:
       if (! ieee_write_id (abfd, "29000"))
-	return false;
+	return FALSE;
       break;
 
     case bfd_arch_h8300:
       if (! ieee_write_id (abfd, "H8/300"))
-	return false;
+	return FALSE;
       break;
 
     case bfd_arch_h8500:
       if (! ieee_write_id (abfd, "H8/500"))
-	return false;
+	return FALSE;
       break;
 
     case bfd_arch_i960:
@@ -3630,23 +3688,23 @@ ieee_write_processor (abfd)
 	case bfd_mach_i960_core:
 	case bfd_mach_i960_ka_sa:
 	  if (! ieee_write_id (abfd, "80960KA"))
-	    return false;
+	    return FALSE;
 	  break;
 
 	case bfd_mach_i960_kb_sb:
 	  if (! ieee_write_id (abfd, "80960KB"))
-	    return false;
+	    return FALSE;
 	  break;
 
 	case bfd_mach_i960_ca:
 	  if (! ieee_write_id (abfd, "80960CA"))
-	    return false;
+	    return FALSE;
 	  break;
 
 	case bfd_mach_i960_mc:
 	case bfd_mach_i960_xa:
 	  if (! ieee_write_id (abfd, "80960MC"))
-	    return false;
+	    return FALSE;
 	  break;
 	}
       break;
@@ -3673,15 +3731,15 @@ ieee_write_processor (abfd)
 	  }
 
 	if (! ieee_write_id (abfd, id))
-	  return false;
+	  return FALSE;
       }
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 ieee_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -3691,49 +3749,49 @@ ieee_write_object_contents (abfd)
 
   /* Fast forward over the header area */
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (! ieee_write_byte (abfd, ieee_module_beginning_enum)
       || ! ieee_write_processor (abfd)
       || ! ieee_write_id (abfd, abfd->filename))
-    return false;
+    return FALSE;
 
   /* Fast forward over the variable bits */
   if (! ieee_write_byte (abfd, ieee_address_descriptor_enum))
-    return false;
+    return FALSE;
 
   /* Bits per MAU */
   if (! ieee_write_byte (abfd, (bfd_byte) (bfd_arch_bits_per_byte (abfd))))
-    return false;
+    return FALSE;
   /* MAU's per address */
   if (! ieee_write_byte (abfd,
 			 (bfd_byte) (bfd_arch_bits_per_address (abfd)
 				     / bfd_arch_bits_per_byte (abfd))))
-    return false;
+    return FALSE;
 
   old = bfd_tell (abfd);
   if (bfd_seek (abfd, (file_ptr) (8 * N_W_VARIABLES), SEEK_CUR) != 0)
-    return false;
+    return FALSE;
 
   ieee->w.r.extension_record = bfd_tell (abfd);
   if (bfd_bwrite ((char *) exten, (bfd_size_type) sizeof (exten), abfd)
       != sizeof (exten))
-    return false;
+    return FALSE;
   if (abfd->flags & EXEC_P)
     {
       if (! ieee_write_byte (abfd, 0x1)) /* Absolute */
-	return false;
+	return FALSE;
     }
   else
     {
       if (! ieee_write_byte (abfd, 0x2)) /* Relocateable */
-	return false;
+	return FALSE;
     }
 
   ieee->w.r.environmental_record = bfd_tell (abfd);
   if (bfd_bwrite ((char *) envi, (bfd_size_type) sizeof (envi), abfd)
       != sizeof (envi))
-    return false;
+    return FALSE;
 
   /* The HP emulator database requires a timestamp in the file.  */
   {
@@ -3752,7 +3810,7 @@ ieee_write_object_contents (abfd)
 	|| ! ieee_write_int (abfd, (bfd_vma) t->tm_hour)
 	|| ! ieee_write_int (abfd, (bfd_vma) t->tm_min)
 	|| ! ieee_write_int (abfd, (bfd_vma) t->tm_sec))
-      return false;
+      return FALSE;
   }
 
   output_bfd = abfd;
@@ -3760,11 +3818,11 @@ ieee_write_object_contents (abfd)
   flush ();
 
   if (! ieee_write_section_part (abfd))
-    return false;
+    return FALSE;
   /* First write the symbols.  This changes their values into table
     indeces so we cant use it after this point.  */
   if (! ieee_write_external_part (abfd))
-    return false;
+    return FALSE;
 
   /*  ieee_write_byte(abfd, ieee_record_seperator_enum);*/
 
@@ -3773,31 +3831,31 @@ ieee_write_object_contents (abfd)
 
   /* Write any debugs we have been told about.  */
   if (! ieee_write_debug_part (abfd))
-    return false;
+    return FALSE;
 
   /* Can only write the data once the symbols have been written, since
      the data contains relocation information which points to the
      symbols.  */
   if (! ieee_write_data_part (abfd))
-    return false;
+    return FALSE;
 
   /* At the end we put the end!  */
   if (! ieee_write_me_part (abfd))
-    return false;
+    return FALSE;
 
   /* Generate the header */
   if (bfd_seek (abfd, old, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   for (i = 0; i < N_W_VARIABLES; i++)
     {
       if (! ieee_write_2bytes (abfd, ieee_assign_value_to_variable_enum)
 	  || ! ieee_write_byte (abfd, (bfd_byte) i)
 	  || ! ieee_write_int5_out (abfd, (bfd_vma) ieee->w.offset[i]))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Native-level interface to symbols. */
@@ -3830,7 +3888,7 @@ ieee_openr_next_archived_file (arch, prev)
       /* Reset the index - the first two entries are bogus*/
       ar->element_index = 2;
     }
-  while (true)
+  while (TRUE)
     {
       ieee_ar_obstack_type *p = ar->elements + ar->element_index;
       ar->element_index++;
@@ -3855,7 +3913,7 @@ ieee_openr_next_archived_file (arch, prev)
     }
 }
 
-static boolean
+static bfd_boolean
 ieee_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 			functionname_ptr, line_ptr)
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -3866,7 +3924,7 @@ ieee_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
      const char **functionname_ptr ATTRIBUTE_UNUSED;
      unsigned int *line_ptr ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
 
 static int
@@ -3904,7 +3962,7 @@ ieee_generic_stat_arch_elt (abfd, buf)
 static int
 ieee_sizeof_headers (abfd, x)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean x ATTRIBUTE_UNUSED;
+     bfd_boolean x ATTRIBUTE_UNUSED;
 {
   return 0;
 }
@@ -3944,7 +4002,7 @@ ieee_bfd_debug_info_accumulate (abfd, section)
   /* Only bother once per bfd */
   if (ieee->done_debug)
     return;
-  ieee->done_debug = true;
+  ieee->done_debug = TRUE;
 
   /* Don't bother if there is no debug info */
   if (ieee->w.r.debug_information_part == 0)
@@ -3981,11 +4039,12 @@ ieee_bfd_debug_info_accumulate (abfd, section)
 #define ieee_slurp_armap bfd_true
 #define ieee_slurp_extended_name_table bfd_true
 #define ieee_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
+  ((bfd_boolean (*) \
+    PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
    bfd_true)
 #define ieee_truncate_arname bfd_dont_truncate_arname
 #define ieee_write_armap \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
    bfd_true)
 #define ieee_read_ar_hdr bfd_nullvoidptr
diff --git a/bfd/ihex.c b/bfd/ihex.c
index 8188c01c89e..2f4aa569f48 100644
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -125,23 +125,32 @@ The MRI compiler uses this, which is a repeat of type 5:
 #include "libiberty.h"
 #include "safe-ctype.h"
 
-static void ihex_init PARAMS ((void));
-static boolean ihex_mkobject PARAMS ((bfd *));
-static INLINE int ihex_get_byte PARAMS ((bfd *, boolean *));
-static void ihex_bad_byte PARAMS ((bfd *, unsigned int, int, boolean));
-static boolean ihex_scan PARAMS ((bfd *));
-static const bfd_target *ihex_object_p PARAMS ((bfd *));
-static boolean ihex_read_section PARAMS ((bfd *, asection *, bfd_byte *));
-static boolean ihex_get_section_contents
+static void ihex_init
+  PARAMS ((void));
+static bfd_boolean ihex_mkobject
+  PARAMS ((bfd *));
+static INLINE int ihex_get_byte
+  PARAMS ((bfd *, bfd_boolean *));
+static void ihex_bad_byte
+  PARAMS ((bfd *, unsigned int, int, bfd_boolean));
+static bfd_boolean ihex_scan
+  PARAMS ((bfd *));
+static const bfd_target *ihex_object_p
+  PARAMS ((bfd *));
+static bfd_boolean ihex_read_section
+  PARAMS ((bfd *, asection *, bfd_byte *));
+static bfd_boolean ihex_get_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean ihex_set_section_contents
+static bfd_boolean ihex_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean ihex_write_record
+static bfd_boolean ihex_write_record
   PARAMS ((bfd *, size_t, unsigned int, unsigned int, bfd_byte *));
-static boolean ihex_write_object_contents PARAMS ((bfd *));
-static boolean ihex_set_arch_mach
+static bfd_boolean ihex_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean ihex_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static int ihex_sizeof_headers PARAMS ((bfd *, boolean));
+static int ihex_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
 
 /* The number of bytes we put on one line during output.  */
 
@@ -178,18 +187,18 @@ struct ihex_data_struct
 static void
 ihex_init ()
 {
-  static boolean inited;
+  static bfd_boolean inited;
 
   if (! inited)
     {
-      inited = true;
+      inited = TRUE;
       hex_init ();
     }
 }
 
 /* Create an ihex object.  */
 
-static boolean
+static bfd_boolean
 ihex_mkobject (abfd)
      bfd *abfd;
 {
@@ -198,12 +207,12 @@ ihex_mkobject (abfd)
 
   tdata = (struct ihex_data_struct *) bfd_alloc (abfd, amt);
   if (tdata == NULL)
-    return false;
+    return FALSE;
 
   abfd->tdata.ihex_data = tdata;
   tdata->head = NULL;
   tdata->tail = NULL;
-  return true;
+  return TRUE;
 }
 
 /* Read a byte from a BFD.  Set *ERRORPTR if an error occurred.
@@ -212,14 +221,14 @@ ihex_mkobject (abfd)
 static INLINE int
 ihex_get_byte (abfd, errorptr)
      bfd *abfd;
-     boolean *errorptr;
+     bfd_boolean *errorptr;
 {
   bfd_byte c;
 
   if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1)
     {
       if (bfd_get_error () != bfd_error_file_truncated)
-	*errorptr = true;
+	*errorptr = TRUE;
       return EOF;
     }
 
@@ -233,7 +242,7 @@ ihex_bad_byte (abfd, lineno, c, error)
      bfd *abfd;
      unsigned int lineno;
      int c;
-     boolean error;
+     bfd_boolean error;
 {
   if (c == EOF)
     {
@@ -261,7 +270,7 @@ ihex_bad_byte (abfd, lineno, c, error)
 /* Read an Intel hex file and turn it into sections.  We create a new
    section for each contiguous set of bytes.  */
 
-static boolean
+static bfd_boolean
 ihex_scan (abfd)
      bfd *abfd;
 {
@@ -269,7 +278,7 @@ ihex_scan (abfd)
   bfd_vma extbase;
   asection *sec;
   unsigned int lineno;
-  boolean error;
+  bfd_boolean error;
   bfd_byte *buf = NULL;
   size_t bufsize;
   int c;
@@ -283,7 +292,7 @@ ihex_scan (abfd)
   extbase = 0;
   sec = NULL;
   lineno = 1;
-  error = false;
+  error = FALSE;
   bufsize = 0;
 
   while ((c = ihex_get_byte (abfd, &error)) != EOF)
@@ -407,7 +416,7 @@ ihex_scan (abfd)
 		abfd->start_address = addr;
 	      if (buf != NULL)
 		free (buf);
-	      return true;
+	      return TRUE;
 
 	    case 2:
 	      /* An extended address record.  */
@@ -496,12 +505,12 @@ ihex_scan (abfd)
   if (buf != NULL)
     free (buf);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (buf != NULL)
     free (buf);
-  return false;
+  return FALSE;
 }
 
 /* Try to recognize an Intel Hex file.  */
@@ -563,7 +572,7 @@ ihex_object_p (abfd)
 
 /* Read the contents of a section in an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_read_section (abfd, section, contents)
      bfd *abfd;
      asection *section;
@@ -573,14 +582,14 @@ ihex_read_section (abfd, section, contents)
   bfd_byte *p;
   bfd_byte *buf = NULL;
   size_t bufsize;
-  boolean error;
+  bfd_boolean error;
 
   if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0)
     goto error_return;
 
   p = contents;
   bufsize = 0;
-  error = false;
+  error = FALSE;
   while ((c = ihex_get_byte (abfd, &error)) != EOF)
     {
       char hdr[8];
@@ -631,7 +640,7 @@ ihex_read_section (abfd, section, contents)
 	  /* We've read everything in the section.  */
 	  if (buf != NULL)
 	    free (buf);
-	  return true;
+	  return TRUE;
 	}
 
       /* Skip the checksum.  */
@@ -651,17 +660,17 @@ ihex_read_section (abfd, section, contents)
   if (buf != NULL)
     free (buf);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (buf != NULL)
     free (buf);
-  return false;
+  return FALSE;
 }
 
 /* Get the contents of a section in an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -673,20 +682,20 @@ ihex_get_section_contents (abfd, section, location, offset, count)
     {
       section->used_by_bfd = bfd_alloc (abfd, section->_raw_size);
       if (section->used_by_bfd == NULL)
-	return false;
+	return FALSE;
       if (! ihex_read_section (abfd, section, section->used_by_bfd))
-	return false;
+	return FALSE;
     }
 
   memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
 	  (size_t) count);
 
-  return true;
+  return TRUE;
 }
 
 /* Set the contents of a section in an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -702,16 +711,16 @@ ihex_set_section_contents (abfd, section, location, offset, count)
   if (count == 0
       || (section->flags & SEC_ALLOC) == 0
       || (section->flags & SEC_LOAD) == 0)
-    return true;
+    return TRUE;
 
   amt = sizeof (struct ihex_data_list);
   n = (struct ihex_data_list *) bfd_alloc (abfd, amt);
   if (n == NULL)
-    return false;
+    return FALSE;
 
   data = (bfd_byte *) bfd_alloc (abfd, count);
   if (data == NULL)
-    return false;
+    return FALSE;
   memcpy (data, location, (size_t) count);
 
   n->data = data;
@@ -742,12 +751,12 @@ ihex_set_section_contents (abfd, section, location, offset, count)
 	tdata->tail = n;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write a record out to an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_write_record (abfd, count, addr, type, data)
      bfd *abfd;
      size_t count;
@@ -785,14 +794,14 @@ ihex_write_record (abfd, count, addr, type, data)
 
   total = 9 + count * 2 + 4;
   if (bfd_bwrite (buf, (bfd_size_type) total, abfd) != total)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Write out an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -834,7 +843,7 @@ ihex_write_object_contents (abfd)
 		  addr[0] = (bfd_byte)(segbase >> 12) & 0xff;
 		  addr[1] = (bfd_byte)(segbase >> 4) & 0xff;
 		  if (! ihex_write_record (abfd, 2, 0, 2, addr))
-		    return false;
+		    return FALSE;
 		}
 	      else
 		{
@@ -849,7 +858,7 @@ ihex_write_object_contents (abfd)
 		      addr[0] = 0;
 		      addr[1] = 0;
 		      if (! ihex_write_record (abfd, 2, 0, 2, addr))
-			return false;
+			return FALSE;
 		      segbase = 0;
 		    }
 
@@ -863,12 +872,12 @@ ihex_write_object_contents (abfd)
 			(_("%s: address 0x%s out of range for Intel Hex file"),
 			 bfd_get_filename (abfd), buf);
 		      bfd_set_error (bfd_error_bad_value);
-		      return false;
+		      return FALSE;
 		    }
 		  addr[0] = (bfd_byte)(extbase >> 24) & 0xff;
 		  addr[1] = (bfd_byte)(extbase >> 16) & 0xff;
 		  if (! ihex_write_record (abfd, 2, 0, 4, addr))
-		    return false;
+		    return FALSE;
 		}
 	    }
 
@@ -879,7 +888,7 @@ ihex_write_object_contents (abfd)
             now = 0x10000 - rec_addr;
 
 	  if (! ihex_write_record (abfd, now, rec_addr, 0, p))
-	    return false;
+	    return FALSE;
 
 	  where += now;
 	  p += now;
@@ -901,7 +910,7 @@ ihex_write_object_contents (abfd)
 	  startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
 	  startbuf[3] = (bfd_byte)start & 0xff;
 	  if (! ihex_write_record (abfd, 4, 0, 3, startbuf))
-	    return false;
+	    return FALSE;
 	}
       else
 	{
@@ -910,20 +919,20 @@ ihex_write_object_contents (abfd)
 	  startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
 	  startbuf[3] = (bfd_byte)start & 0xff;
 	  if (! ihex_write_record (abfd, 4, 0, 5, startbuf))
-	    return false;
+	    return FALSE;
 	}
     }
 
   if (! ihex_write_record (abfd, 0, 0, 1, NULL))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Set the architecture for the output file.  The architecture is
    irrelevant, so we ignore errors about unknown architectures.  */
 
-static boolean
+static bfd_boolean
 ihex_set_arch_mach (abfd, arch, mach)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -932,9 +941,9 @@ ihex_set_arch_mach (abfd, arch, mach)
   if (! bfd_default_set_arch_mach (abfd, arch, mach))
     {
       if (arch != bfd_arch_unknown)
-	return false;
+	return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 /* Get the size of the headers, for the linker.  */
@@ -943,7 +952,7 @@ ihex_set_arch_mach (abfd, arch, mach)
 static int
 ihex_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
diff --git a/bfd/irix-core.c b/bfd/irix-core.c
index b1a575b034d..1dd35fe7507 100644
--- a/bfd/irix-core.c
+++ b/bfd/irix-core.c
@@ -43,16 +43,22 @@ struct sgi_core_struct
 
 static asection *make_bfd_asection
   PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
-static const bfd_target *irix_core_core_file_p PARAMS ((bfd *));
-static char *irix_core_core_file_failing_command PARAMS ((bfd *));
-static int irix_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean irix_core_core_file_matches_executable_p
+static const bfd_target *irix_core_core_file_p
+  PARAMS ((bfd *));
+static char *irix_core_core_file_failing_command
+  PARAMS ((bfd *));
+static int irix_core_core_file_failing_signal
+  PARAMS ((bfd *));
+static bfd_boolean irix_core_core_file_matches_executable_p
   PARAMS ((bfd *, bfd *));
-static void swap_abort PARAMS ((void));
+static void swap_abort
+  PARAMS ((void));
 #ifdef CORE_MAGIC64
-static int do_sections64 PARAMS ((bfd *, struct coreout *));
+static int do_sections64
+  PARAMS ((bfd *, struct coreout *));
 #endif
-static int do_sections PARAMS ((bfd *, struct coreout *));
+static int do_sections
+  PARAMS ((bfd *, struct coreout *));
 
 /* Helper function for irix_core_core_file_p:
    32-bit and 64-bit versions.  */
@@ -280,11 +286,11 @@ irix_core_core_file_failing_signal (abfd)
   return core_signal (abfd);
 }
 
-static boolean
+static bfd_boolean
 irix_core_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd, *exec_bfd;
 {
-  return true;			/* XXX - FIXME */
+  return TRUE;			/* XXX - FIXME */
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
diff --git a/bfd/libaout.h b/bfd/libaout.h
index a76b935d394..38587b32f2d 100644
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -1,6 +1,6 @@
 /* BFD back-end data structures for a.out (and similar) files.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001
+   2000, 2001, 2002
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -131,7 +131,7 @@ struct aout_link_hash_entry
 {
   struct bfd_link_hash_entry root;
   /* Whether this symbol has been written out.  */
-  boolean written;
+  bfd_boolean written;
   /* Symbol index in output file.  */
   int indx;
 };
@@ -154,7 +154,7 @@ struct aout_link_hash_table
 #define aout_link_hash_traverse(table, func, info)			\
   (bfd_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the a.out link hash table from the info structure.  This is
@@ -193,7 +193,7 @@ struct aout_backend_data
 
   /* Callback for setting the page and segment sizes, if they can't be
      trivially determined from the architecture.  */
-  boolean (*set_sizes)
+  bfd_boolean (*set_sizes)
     PARAMS ((bfd *));
 
   /* zmagic files only. For go32, the length of the exec header contributes
@@ -203,39 +203,39 @@ struct aout_backend_data
 
   /* Callback from the add symbols phase of the linker code to handle
      a dynamic object.  */
-  boolean (*add_dynamic_symbols)
+  bfd_boolean (*add_dynamic_symbols)
     PARAMS ((bfd *, struct bfd_link_info *, struct external_nlist **,
 	     bfd_size_type *, char **));
 
   /* Callback from the add symbols phase of the linker code to handle
      adding a single symbol to the global linker hash table.  */
-  boolean (*add_one_symbol)
+  bfd_boolean (*add_one_symbol)
     PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
-	     asection *, bfd_vma, const char *, boolean, boolean,
+	     asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
 	     struct bfd_link_hash_entry **));
 
   /* Called to handle linking a dynamic object.  */
-  boolean (*link_dynamic_object)
+  bfd_boolean (*link_dynamic_object)
     PARAMS ((struct bfd_link_info *, bfd *));
 
   /* Called for each global symbol being written out by the linker.
      This should write out the dynamic symbol information.  */
-  boolean (*write_dynamic_symbol)
+  bfd_boolean (*write_dynamic_symbol)
     PARAMS ((bfd *, struct bfd_link_info *, struct aout_link_hash_entry *));
 
   /* If this callback is not NULL, the linker calls it for each reloc.
      RELOC is a pointer to the unswapped reloc.  If *SKIP is set to
-     true, the reloc will be skipped.  *RELOCATION may be changed to
+     TRUE, the reloc will be skipped.  *RELOCATION may be changed to
      change the effects of the relocation.  */
-  boolean (*check_dynamic_reloc)
+  bfd_boolean (*check_dynamic_reloc)
     PARAMS ((struct bfd_link_info *info, bfd *input_bfd,
 	     asection *input_section, struct aout_link_hash_entry *h,
-	     PTR reloc, bfd_byte *contents, boolean *skip,
+	     PTR reloc, bfd_byte *contents, bfd_boolean *skip,
 	     bfd_vma *relocation));
 
   /* Called at the end of a link to finish up any dynamic linking
      information.  */
-  boolean (*finish_dynamic_link)
+  bfd_boolean (*finish_dynamic_link)
     PARAMS ((bfd *, struct bfd_link_info *));
 };
 #define aout_backend_info(abfd) \
@@ -491,41 +491,41 @@ struct aout_section_data_struct
 
 /* Prototype declarations for functions defined in aoutx.h  */
 
-extern boolean NAME(aout,squirt_out_relocs)
+extern bfd_boolean NAME(aout,squirt_out_relocs)
   PARAMS ((bfd *, asection *));
 
-extern boolean NAME(aout,make_sections)
+extern bfd_boolean NAME(aout,make_sections)
   PARAMS ((bfd *));
 
 extern const bfd_target * NAME(aout,some_aout_object_p)
   PARAMS ((bfd *, struct internal_exec *, const bfd_target *(*) (bfd *)));
 
-extern boolean NAME(aout,mkobject)
+extern bfd_boolean NAME(aout,mkobject)
   PARAMS ((bfd *));
 
 extern enum machine_type NAME(aout,machine_type)
-  PARAMS ((enum bfd_architecture, unsigned long, boolean *));
+  PARAMS ((enum bfd_architecture, unsigned long, bfd_boolean *));
 
-extern boolean NAME(aout,set_arch_mach)
+extern bfd_boolean NAME(aout,set_arch_mach)
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
 
-extern boolean NAME(aout,new_section_hook)
+extern bfd_boolean NAME(aout,new_section_hook)
   PARAMS ((bfd *, asection *));
 
-extern boolean NAME(aout,set_section_contents)
+extern bfd_boolean NAME(aout,set_section_contents)
   PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
 
 extern asymbol * NAME(aout,make_empty_symbol)
   PARAMS ((bfd *));
 
-extern boolean NAME(aout,translate_symbol_table)
+extern bfd_boolean NAME(aout,translate_symbol_table)
   PARAMS ((bfd *, aout_symbol_type *, struct external_nlist *, bfd_size_type,
-	   char *, bfd_size_type, boolean));
+	   char *, bfd_size_type, bfd_boolean));
 
-extern boolean NAME(aout,slurp_symbol_table)
+extern bfd_boolean NAME(aout,slurp_symbol_table)
   PARAMS ((bfd *));
 
-extern boolean NAME(aout,write_syms)
+extern bfd_boolean NAME(aout,write_syms)
   PARAMS ((bfd *));
 
 extern void NAME(aout,reclaim_symbol_table)
@@ -547,7 +547,7 @@ extern void NAME(aout,swap_std_reloc_in)
 extern reloc_howto_type * NAME(aout,reloc_type_lookup)
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 
-extern boolean NAME(aout,slurp_reloc_table)
+extern bfd_boolean NAME(aout,slurp_reloc_table)
   PARAMS ((bfd *, sec_ptr, asymbol **));
 
 extern long NAME(aout,canonicalize_reloc)
@@ -568,20 +568,20 @@ extern void NAME(aout,print_symbol)
 extern void NAME(aout,get_symbol_info)
   PARAMS ((bfd *, asymbol *, symbol_info *));
 
-extern boolean NAME(aout,find_nearest_line)
+extern bfd_boolean NAME(aout,find_nearest_line)
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
 
 extern long NAME(aout,read_minisymbols)
-  PARAMS ((bfd *, boolean, PTR *, unsigned int *));
+  PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *));
 
 extern asymbol * NAME(aout,minisymbol_to_symbol)
-  PARAMS ((bfd *, boolean, const PTR, asymbol *));
+  PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *));
 
 extern int NAME(aout,sizeof_headers)
-  PARAMS ((bfd *, boolean));
+  PARAMS ((bfd *, bfd_boolean));
 
-extern boolean NAME(aout,adjust_sizes_and_vmas)
+extern bfd_boolean NAME(aout,adjust_sizes_and_vmas)
   PARAMS ((bfd *, bfd_size_type *, file_ptr *));
 
 extern void NAME(aout,swap_exec_header_in)
@@ -593,7 +593,7 @@ extern void NAME(aout,swap_exec_header_out)
 extern struct bfd_hash_entry * NAME(aout,link_hash_newfunc)
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 
-extern boolean NAME(aout,link_hash_table_init)
+extern bfd_boolean NAME(aout,link_hash_table_init)
   PARAMS ((struct aout_link_hash_table *, bfd *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
@@ -602,14 +602,14 @@ extern boolean NAME(aout,link_hash_table_init)
 extern struct bfd_link_hash_table * NAME(aout,link_hash_table_create)
   PARAMS ((bfd *));
 
-extern boolean NAME(aout,link_add_symbols)
+extern bfd_boolean NAME(aout,link_add_symbols)
   PARAMS ((bfd *, struct bfd_link_info *));
 
-extern boolean NAME(aout,final_link)
+extern bfd_boolean NAME(aout,final_link)
   PARAMS ((bfd *, struct bfd_link_info *,
 	   void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *)));
 
-extern boolean NAME(aout,bfd_free_cached_info)
+extern bfd_boolean NAME(aout,bfd_free_cached_info)
   PARAMS ((bfd *));
 
 /* A.out uses the generic versions of these routines... */
@@ -647,28 +647,28 @@ extern boolean NAME(aout,bfd_free_cached_info)
 	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0		      \
 	    || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, \
 			  abfd) != EXEC_BYTES_SIZE)			      \
-	  return false;							      \
+	  return FALSE;							      \
 	/* Now write out reloc info, followed by syms and strings */	      \
   									      \
 	if (bfd_get_outsymbols (abfd) != (asymbol **) NULL		      \
 	    && bfd_get_symcount (abfd) != 0) 				      \
 	  {								      \
 	    if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)\
-	      return false;						      \
+	      return FALSE;						      \
 									      \
 	    if (! NAME(aout,write_syms) (abfd))				      \
-	      return false;						      \
+	      return FALSE;						      \
 	  }								      \
 									      \
 	if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) != 0)   \
-	  return false;						      	      \
+	  return FALSE;						      	      \
 	if (!NAME(aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))         \
-	  return false;						      	      \
+	  return FALSE;						      	      \
 									      \
 	if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) != 0)   \
-	  return false;						      	      \
+	  return FALSE;						      	      \
 	if (!NAME(aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))         \
-	  return false;						      	      \
+	  return FALSE;						      	      \
       }
 #endif
 
diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
index 00d5bd3a6b9..726883cb943 100644
--- a/bfd/libbfd-in.h
+++ b/bfd/libbfd-in.h
@@ -83,70 +83,105 @@ struct areltdata {
 
 #define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
 
-extern PTR bfd_malloc PARAMS ((bfd_size_type));
-extern PTR bfd_realloc PARAMS ((PTR, bfd_size_type));
-extern PTR bfd_zmalloc PARAMS ((bfd_size_type));
+extern PTR bfd_malloc
+  PARAMS ((bfd_size_type));
+extern PTR bfd_realloc
+  PARAMS ((PTR, bfd_size_type));
+extern PTR bfd_zmalloc
+  PARAMS ((bfd_size_type));
 
 extern bfd_error_handler_type _bfd_error_handler;
 
 /* These routines allocate and free things on the BFD's objalloc.  */
 
-extern PTR bfd_alloc PARAMS ((bfd *, bfd_size_type));
-extern PTR bfd_zalloc PARAMS ((bfd *, bfd_size_type));
-extern void bfd_release PARAMS ((bfd *, PTR));
-
-bfd *	_bfd_create_empty_archive_element_shell PARAMS ((bfd *obfd));
-bfd *	_bfd_look_for_bfd_in_cache PARAMS ((bfd *, file_ptr));
-boolean _bfd_add_bfd_to_archive_cache PARAMS ((bfd *, file_ptr, bfd *));
-boolean	_bfd_generic_mkarchive PARAMS ((bfd *abfd));
-const bfd_target *bfd_generic_archive_p PARAMS ((bfd *abfd));
-boolean	bfd_slurp_armap PARAMS ((bfd *abfd));
-boolean bfd_slurp_bsd_armap_f2 PARAMS ((bfd *abfd));
+extern PTR bfd_alloc
+  PARAMS ((bfd *, bfd_size_type));
+extern PTR bfd_zalloc
+  PARAMS ((bfd *, bfd_size_type));
+extern void bfd_release
+  PARAMS ((bfd *, PTR));
+
+bfd * _bfd_create_empty_archive_element_shell
+  PARAMS ((bfd *obfd));
+bfd * _bfd_look_for_bfd_in_cache
+  PARAMS ((bfd *, file_ptr));
+bfd_boolean _bfd_add_bfd_to_archive_cache
+  PARAMS ((bfd *, file_ptr, bfd *));
+bfd_boolean _bfd_generic_mkarchive
+  PARAMS ((bfd *abfd));
+const bfd_target *bfd_generic_archive_p
+  PARAMS ((bfd *abfd));
+bfd_boolean bfd_slurp_armap
+  PARAMS ((bfd *abfd));
+bfd_boolean bfd_slurp_bsd_armap_f2
+  PARAMS ((bfd *abfd));
 #define bfd_slurp_bsd_armap bfd_slurp_armap
 #define bfd_slurp_coff_armap bfd_slurp_armap
-boolean	_bfd_slurp_extended_name_table PARAMS ((bfd *abfd));
-extern boolean _bfd_construct_extended_name_table
-  PARAMS ((bfd *, boolean, char **, bfd_size_type *));
-boolean	_bfd_write_archive_contents PARAMS ((bfd *abfd));
-boolean _bfd_compute_and_write_armap PARAMS ((bfd *, unsigned int elength));
-bfd *_bfd_get_elt_at_filepos PARAMS ((bfd *archive, file_ptr filepos));
-extern bfd *_bfd_generic_get_elt_at_index PARAMS ((bfd *, symindex));
-bfd * _bfd_new_bfd PARAMS ((void));
-void _bfd_delete_bfd PARAMS ((bfd *));
-
-boolean	bfd_false PARAMS ((bfd *ignore));
-boolean	bfd_true PARAMS ((bfd *ignore));
-PTR	bfd_nullvoidptr PARAMS ((bfd *ignore));
-int	bfd_0 PARAMS ((bfd *ignore));
-unsigned int	bfd_0u PARAMS ((bfd *ignore));
-long	bfd_0l PARAMS ((bfd *ignore));
-long	_bfd_n1 PARAMS ((bfd *ignore));
-void	bfd_void PARAMS ((bfd *ignore));
-
-bfd *_bfd_new_bfd_contained_in PARAMS ((bfd *));
-const bfd_target *_bfd_dummy_target PARAMS ((bfd *abfd));
-
-void	bfd_dont_truncate_arname PARAMS ((bfd *abfd, const char *filename,
-					char *hdr));
-void	bfd_bsd_truncate_arname PARAMS ((bfd *abfd, const char *filename,
-					char *hdr));
-void	bfd_gnu_truncate_arname PARAMS ((bfd *abfd, const char *filename,
-					char *hdr));
-
-boolean	bsd_write_armap PARAMS ((bfd *arch, unsigned int elength,
-				  struct orl *map, unsigned int orl_count, int stridx));
-
-boolean	coff_write_armap PARAMS ((bfd *arch, unsigned int elength,
-				   struct orl *map, unsigned int orl_count, int stridx));
-
-extern PTR _bfd_generic_read_ar_hdr PARAMS ((bfd *));
-
-extern PTR _bfd_generic_read_ar_hdr_mag PARAMS ((bfd *, const char *));
-
-bfd *	bfd_generic_openr_next_archived_file PARAMS ((bfd *archive,
-						     bfd *last_file));
-
-int	bfd_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
+bfd_boolean _bfd_slurp_extended_name_table
+  PARAMS ((bfd *abfd));
+extern bfd_boolean _bfd_construct_extended_name_table
+  PARAMS ((bfd *, bfd_boolean, char **, bfd_size_type *));
+bfd_boolean _bfd_write_archive_contents
+  PARAMS ((bfd *abfd));
+bfd_boolean _bfd_compute_and_write_armap
+  PARAMS ((bfd *, unsigned int elength));
+bfd *_bfd_get_elt_at_filepos
+  PARAMS ((bfd *archive, file_ptr filepos));
+extern bfd *_bfd_generic_get_elt_at_index
+  PARAMS ((bfd *, symindex));
+bfd * _bfd_new_bfd
+  PARAMS ((void));
+void _bfd_delete_bfd
+  PARAMS ((bfd *));
+
+bfd_boolean bfd_false
+  PARAMS ((bfd *ignore));
+bfd_boolean bfd_true
+  PARAMS ((bfd *ignore));
+PTR bfd_nullvoidptr
+  PARAMS ((bfd *ignore));
+int bfd_0
+  PARAMS ((bfd *ignore));
+unsigned int bfd_0u
+  PARAMS ((bfd *ignore));
+long bfd_0l
+  PARAMS ((bfd *ignore));
+long _bfd_n1
+  PARAMS ((bfd *ignore));
+void bfd_void
+  PARAMS ((bfd *ignore));
+
+bfd *_bfd_new_bfd_contained_in
+  PARAMS ((bfd *));
+const bfd_target *_bfd_dummy_target
+  PARAMS ((bfd *abfd));
+
+void bfd_dont_truncate_arname
+  PARAMS ((bfd *abfd, const char *filename, char *hdr));
+void bfd_bsd_truncate_arname
+  PARAMS ((bfd *abfd, const char *filename, char *hdr));
+void bfd_gnu_truncate_arname
+  PARAMS ((bfd *abfd, const char *filename, char *hdr));
+
+bfd_boolean bsd_write_armap
+  PARAMS ((bfd *arch, unsigned int elength, struct orl *map,
+	   unsigned int orl_count, int stridx));
+
+bfd_boolean coff_write_armap
+  PARAMS ((bfd *arch, unsigned int elength, struct orl *map,
+	   unsigned int orl_count, int stridx));
+
+extern PTR _bfd_generic_read_ar_hdr
+  PARAMS ((bfd *));
+
+extern PTR _bfd_generic_read_ar_hdr_mag
+  PARAMS ((bfd *, const char *));
+
+bfd * bfd_generic_openr_next_archived_file
+  PARAMS ((bfd *archive, bfd *last_file));
+
+int bfd_generic_stat_arch_elt
+  PARAMS ((bfd *, struct stat *));
 
 #define _bfd_read_ar_hdr(abfd) \
   BFD_SEND (abfd, _bfd_read_ar_hdr_fn, (abfd))
@@ -157,34 +192,36 @@ int	bfd_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
 #define _bfd_generic_close_and_cleanup bfd_true
 #define _bfd_generic_bfd_free_cached_info bfd_true
 #define _bfd_generic_new_section_hook \
-  ((boolean (*) PARAMS ((bfd *, asection *))) bfd_true)
-extern boolean _bfd_generic_get_section_contents
+  ((bfd_boolean (*) PARAMS ((bfd *, asection *))) bfd_true)
+extern bfd_boolean _bfd_generic_get_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-extern boolean _bfd_generic_get_section_contents_in_window
+extern bfd_boolean _bfd_generic_get_section_contents_in_window
   PARAMS ((bfd *, asection *, bfd_window *, file_ptr, bfd_size_type));
 
 /* Generic routines to use for BFD_JUMP_TABLE_COPY.  Use
    BFD_JUMP_TABLE_COPY (_bfd_generic).  */
 
 #define _bfd_generic_bfd_copy_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
 #define _bfd_generic_bfd_merge_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
 #define _bfd_generic_bfd_set_private_flags \
-  ((boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
 #define _bfd_generic_bfd_copy_private_section_data \
-  ((boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_true)
 #define _bfd_generic_bfd_copy_private_symbol_data \
-  ((boolean (*) PARAMS ((bfd *, asymbol *, bfd *, asymbol *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, asymbol *, bfd *, asymbol *))) bfd_true)
 #define _bfd_generic_bfd_print_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, PTR))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, PTR))) bfd_true)
 
 /* Routines to use for BFD_JUMP_TABLE_CORE when there is no core file
    support.  Use BFD_JUMP_TABLE_CORE (_bfd_nocore).  */
 
-extern char *_bfd_nocore_core_file_failing_command PARAMS ((bfd *));
-extern int _bfd_nocore_core_file_failing_signal PARAMS ((bfd *));
-extern boolean _bfd_nocore_core_file_matches_executable_p
+extern char *_bfd_nocore_core_file_failing_command
+  PARAMS ((bfd *));
+extern int _bfd_nocore_core_file_failing_signal
+  PARAMS ((bfd *));
+extern bfd_boolean _bfd_nocore_core_file_matches_executable_p
   PARAMS ((bfd *, bfd *));
 
 /* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive
@@ -193,12 +230,13 @@ extern boolean _bfd_nocore_core_file_matches_executable_p
 #define _bfd_noarchive_slurp_armap bfd_false
 #define _bfd_noarchive_slurp_extended_name_table bfd_false
 #define _bfd_noarchive_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
+  ((bfd_boolean (*) \
+    PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
    bfd_false)
 #define _bfd_noarchive_truncate_arname \
   ((void (*) PARAMS ((bfd *, const char *, char *))) bfd_void)
 #define _bfd_noarchive_write_armap \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
    bfd_false)
 #define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr
@@ -215,7 +253,7 @@ extern boolean _bfd_nocore_core_file_matches_executable_p
 #define _bfd_archive_bsd_slurp_armap bfd_slurp_bsd_armap
 #define _bfd_archive_bsd_slurp_extended_name_table \
   _bfd_slurp_extended_name_table
-extern boolean _bfd_archive_bsd_construct_extended_name_table
+extern bfd_boolean _bfd_archive_bsd_construct_extended_name_table
   PARAMS ((bfd *, char **, bfd_size_type *, const char **));
 #define _bfd_archive_bsd_truncate_arname bfd_bsd_truncate_arname
 #define _bfd_archive_bsd_write_armap bsd_write_armap
@@ -225,7 +263,8 @@ extern boolean _bfd_archive_bsd_construct_extended_name_table
 #define _bfd_archive_bsd_get_elt_at_index _bfd_generic_get_elt_at_index
 #define _bfd_archive_bsd_generic_stat_arch_elt \
   bfd_generic_stat_arch_elt
-extern boolean _bfd_archive_bsd_update_armap_timestamp PARAMS ((bfd *));
+extern bfd_boolean _bfd_archive_bsd_update_armap_timestamp
+  PARAMS ((bfd *));
 
 /* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get COFF style
    archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff).  */
@@ -233,7 +272,7 @@ extern boolean _bfd_archive_bsd_update_armap_timestamp PARAMS ((bfd *));
 #define _bfd_archive_coff_slurp_armap bfd_slurp_coff_armap
 #define _bfd_archive_coff_slurp_extended_name_table \
   _bfd_slurp_extended_name_table
-extern boolean _bfd_archive_coff_construct_extended_name_table
+extern bfd_boolean _bfd_archive_coff_construct_extended_name_table
   PARAMS ((bfd *, char **, bfd_size_type *, const char **));
 #define _bfd_archive_coff_truncate_arname bfd_dont_truncate_arname
 #define _bfd_archive_coff_write_armap coff_write_armap
@@ -257,20 +296,20 @@ extern boolean _bfd_archive_coff_construct_extended_name_table
 #define _bfd_nosymbols_get_symbol_info \
   ((void (*) PARAMS ((bfd *, asymbol *, symbol_info *))) bfd_void)
 #define _bfd_nosymbols_bfd_is_local_label_name \
-  ((boolean (*) PARAMS ((bfd *, const char *))) bfd_false)
+  ((bfd_boolean (*) PARAMS ((bfd *, const char *))) bfd_false)
 #define _bfd_nosymbols_get_lineno \
   ((alent *(*) PARAMS ((bfd *, asymbol *))) bfd_nullvoidptr)
 #define _bfd_nosymbols_find_nearest_line \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **, \
 	     const char **, unsigned int *))) \
    bfd_false)
 #define _bfd_nosymbols_bfd_make_debug_symbol \
   ((asymbol *(*) PARAMS ((bfd *, PTR, unsigned long))) bfd_nullvoidptr)
 #define _bfd_nosymbols_read_minisymbols \
-  ((long (*) PARAMS ((bfd *, boolean, PTR *, unsigned int *))) _bfd_n1)
+  ((long (*) PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *))) _bfd_n1)
 #define _bfd_nosymbols_minisymbol_to_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, boolean, const PTR, asymbol *))) \
+  ((asymbol *(*) PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *))) \
    bfd_nullvoidptr)
 
 /* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc
@@ -288,42 +327,43 @@ extern boolean _bfd_archive_coff_construct_extended_name_table
    be written.  Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite).  */
 
 #define _bfd_nowrite_set_arch_mach \
-  ((boolean (*) PARAMS ((bfd *, enum bfd_architecture, unsigned long))) \
+  ((bfd_boolean (*) PARAMS ((bfd *, enum bfd_architecture, unsigned long))) \
    bfd_false)
 #define _bfd_nowrite_set_section_contents \
-  ((boolean (*) PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type))) \
+  ((bfd_boolean (*) \
+   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type))) \
    bfd_false)
 
 /* Generic routines to use for BFD_JUMP_TABLE_WRITE.  Use
    BFD_JUMP_TABLE_WRITE (_bfd_generic).  */
 
 #define _bfd_generic_set_arch_mach bfd_default_set_arch_mach
-extern boolean _bfd_generic_set_section_contents
+extern bfd_boolean _bfd_generic_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
 
 /* Routines to use for BFD_JUMP_TABLE_LINK for targets which do not
    support linking.  Use BFD_JUMP_TABLE_LINK (_bfd_nolink).  */
 
-#define _bfd_nolink_sizeof_headers ((int (*) PARAMS ((bfd *, boolean))) bfd_0)
+#define _bfd_nolink_sizeof_headers ((int (*) PARAMS ((bfd *, bfd_boolean))) bfd_0)
 #define _bfd_nolink_bfd_get_relocated_section_contents \
   ((bfd_byte *(*) \
     PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, \
-	     bfd_byte *, boolean, asymbol **))) \
+	     bfd_byte *, bfd_boolean, asymbol **))) \
    bfd_nullvoidptr)
 #define _bfd_nolink_bfd_relax_section \
-  ((boolean (*) \
-    PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *))) \
+  ((bfd_boolean (*) \
+    PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *))) \
    bfd_false)
 #define _bfd_nolink_bfd_gc_sections \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, struct bfd_link_info *))) \
    bfd_false)
 #define _bfd_nolink_bfd_merge_sections \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, struct bfd_link_info *))) \
    bfd_false)
 #define _bfd_nolink_bfd_discard_group \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, struct sec *))) \
    bfd_false)
 #define _bfd_nolink_bfd_link_hash_table_create \
@@ -331,13 +371,13 @@ extern boolean _bfd_generic_set_section_contents
 #define _bfd_nolink_bfd_link_hash_table_free \
   ((void (*) PARAMS ((struct bfd_link_hash_table *))) bfd_void)
 #define _bfd_nolink_bfd_link_add_symbols \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
+  ((bfd_boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
 #define _bfd_nolink_bfd_link_just_syms \
   ((void (*) PARAMS ((asection *, struct bfd_link_info *))) bfd_void)
 #define _bfd_nolink_bfd_final_link \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
+  ((bfd_boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
 #define _bfd_nolink_bfd_link_split_section \
-  ((boolean (*) PARAMS ((bfd *, struct sec *))) bfd_false)
+  ((bfd_boolean (*) PARAMS ((bfd *, struct sec *))) bfd_false)
 
 /* Routines to use for BFD_JUMP_TABLE_DYNAMIC for targets which do not
    have dynamic symbols or relocs.  Use BFD_JUMP_TABLE_DYNAMIC
@@ -352,26 +392,27 @@ extern boolean _bfd_generic_set_section_contents
 
 /* Generic routine to determine of the given symbol is a local
    label.  */
-extern boolean bfd_generic_is_local_label_name PARAMS ((bfd *, const char *));
+extern bfd_boolean bfd_generic_is_local_label_name
+  PARAMS ((bfd *, const char *));
 
 /* Generic minisymbol routines.  */
 extern long _bfd_generic_read_minisymbols
-  PARAMS ((bfd *, boolean, PTR *, unsigned int *));
+  PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *));
 extern asymbol *_bfd_generic_minisymbol_to_symbol
-  PARAMS ((bfd *, boolean, const PTR, asymbol *));
+  PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *));
 
 /* Find the nearest line using .stab/.stabstr sections.  */
-extern boolean _bfd_stab_section_find_nearest_line
-  PARAMS ((bfd *, asymbol **, asection *, bfd_vma, boolean *, const char **,
-	   const char **, unsigned int *, PTR *));
+extern bfd_boolean _bfd_stab_section_find_nearest_line
+  PARAMS ((bfd *, asymbol **, asection *, bfd_vma, bfd_boolean *,
+	   const char **, const char **, unsigned int *, PTR *));
 
 /* Find the neaderst line using DWARF 1 debugging information.  */
-extern boolean _bfd_dwarf1_find_nearest_line
+extern bfd_boolean _bfd_dwarf1_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
 
 /* Find the nearest line using DWARF 2 debugging information.  */
-extern boolean _bfd_dwarf2_find_nearest_line
+extern bfd_boolean _bfd_dwarf2_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *, unsigned int,
 	   PTR *));
@@ -387,7 +428,7 @@ extern struct bfd_hash_entry *_bfd_link_hash_newfunc
 	   const char *string));
 
 /* Initialize a bfd_link_hash_table.  */
-extern boolean _bfd_link_hash_table_init
+extern bfd_boolean _bfd_link_hash_table_init
   PARAMS ((struct bfd_link_hash_table *, bfd *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
@@ -402,47 +443,47 @@ extern void _bfd_generic_link_hash_table_free
   PARAMS ((struct bfd_link_hash_table *));
 
 /* Generic add symbol routine.  */
-extern boolean _bfd_generic_link_add_symbols
+extern bfd_boolean _bfd_generic_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Generic add symbol routine.  This version is used by targets for
    which the linker must collect constructors and destructors by name,
    as the collect2 program does.  */
-extern boolean _bfd_generic_link_add_symbols_collect
+extern bfd_boolean _bfd_generic_link_add_symbols_collect
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Generic archive add symbol routine.  */
-extern boolean _bfd_generic_link_add_archive_symbols
+extern bfd_boolean _bfd_generic_link_add_archive_symbols
   PARAMS ((bfd *, struct bfd_link_info *,
-	   boolean (*checkfn) (bfd *, struct bfd_link_info *, boolean *)));
+	   bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *)));
 
 /* Forward declaration to avoid prototype errors.  */
 typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
 
 /* Generic routine to add a single symbol.  */
-extern boolean _bfd_generic_link_add_one_symbol
+extern bfd_boolean _bfd_generic_link_add_one_symbol
   PARAMS ((struct bfd_link_info *, bfd *, const char *name, flagword,
-	   asection *, bfd_vma, const char *, boolean copy,
-	   boolean constructor, struct bfd_link_hash_entry **));
+	   asection *, bfd_vma, const char *, bfd_boolean copy,
+	   bfd_boolean constructor, struct bfd_link_hash_entry **));
 
 /* Generic routine to mark section as supplying symbols only.  */
 extern void _bfd_generic_link_just_syms
   PARAMS ((asection *, struct bfd_link_info *));
 
 /* Generic link routine.  */
-extern boolean _bfd_generic_final_link
+extern bfd_boolean _bfd_generic_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
-extern boolean _bfd_generic_link_split_section
+extern bfd_boolean _bfd_generic_link_split_section
   PARAMS ((bfd *, struct sec *));
 
 /* Generic reloc_link_order processing routine.  */
-extern boolean _bfd_generic_reloc_link_order
+extern bfd_boolean _bfd_generic_reloc_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   struct bfd_link_order *));
 
 /* Default link order processing routine.  */
-extern boolean _bfd_default_link_order
+extern bfd_boolean _bfd_default_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   struct bfd_link_order *));
 
@@ -461,22 +502,23 @@ extern bfd_reloc_status_type _bfd_relocate_contents
 
 /* Link stabs in sections in the first pass.  */
 
-extern boolean _bfd_link_section_stabs
+extern bfd_boolean _bfd_link_section_stabs
   PARAMS ((bfd *, PTR *, asection *, asection *, PTR *));
 
 /* Eliminate stabs for discarded functions and symbols.  */
-extern boolean _bfd_discard_section_stabs
+extern bfd_boolean _bfd_discard_section_stabs
   PARAMS ((bfd *, asection *, PTR,
-	   boolean (*) (bfd_vma, PTR), PTR));
+	   bfd_boolean (*) (bfd_vma, PTR), PTR));
 
 /* Write out the .stab section when linking stabs in sections.  */
 
-extern boolean _bfd_write_section_stabs
+extern bfd_boolean _bfd_write_section_stabs
   PARAMS ((bfd *, PTR *, asection *, PTR *, bfd_byte *));
 
 /* Write out the .stabstr string table when linking stabs in sections.  */
 
-extern boolean _bfd_write_stab_strings PARAMS ((bfd *, PTR *));
+extern bfd_boolean _bfd_write_stab_strings
+  PARAMS ((bfd *, PTR *));
 
 /* Find an offset within a .stab section when linking stabs in
    sections.  */
@@ -486,17 +528,17 @@ extern bfd_vma _bfd_stab_section_offset
 
 /* Attempt to merge a SEC_MERGE section.  */
 
-extern boolean _bfd_merge_section
+extern bfd_boolean _bfd_merge_section
   PARAMS ((bfd *, PTR *, asection *, PTR *));
 
 /* Attempt to merge SEC_MERGE sections.  */
 
-extern boolean _bfd_merge_sections
+extern bfd_boolean _bfd_merge_sections
   PARAMS ((bfd *, PTR, void (*)(bfd *, asection *)));
 
 /* Write out a merged section.  */
 
-extern boolean _bfd_write_merged_section
+extern bfd_boolean _bfd_write_merged_section
   PARAMS ((bfd *, asection *, PTR));
 
 /* Find an offset within a modified SEC_MERGE section.  */
@@ -505,27 +547,33 @@ extern bfd_vma _bfd_merged_section_offset
   PARAMS ((bfd *, asection **, PTR, bfd_vma, bfd_vma));
 
 /* Create a string table.  */
-extern struct bfd_strtab_hash *_bfd_stringtab_init PARAMS ((void));
+extern struct bfd_strtab_hash *_bfd_stringtab_init
+  PARAMS ((void));
 
 /* Create an XCOFF .debug section style string table.  */
-extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init PARAMS ((void));
+extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init
+  PARAMS ((void));
 
 /* Free a string table.  */
-extern void _bfd_stringtab_free PARAMS ((struct bfd_strtab_hash *));
+extern void _bfd_stringtab_free
+  PARAMS ((struct bfd_strtab_hash *));
 
 /* Get the size of a string table.  */
-extern bfd_size_type _bfd_stringtab_size PARAMS ((struct bfd_strtab_hash *));
+extern bfd_size_type _bfd_stringtab_size
+  PARAMS ((struct bfd_strtab_hash *));
 
 /* Add a string to a string table.  */
 extern bfd_size_type _bfd_stringtab_add
-  PARAMS ((struct bfd_strtab_hash *, const char *, boolean hash,
-	   boolean copy));
+  PARAMS ((struct bfd_strtab_hash *, const char *, bfd_boolean hash,
+	   bfd_boolean copy));
 
 /* Write out a string table.  */
-extern boolean _bfd_stringtab_emit PARAMS ((bfd *, struct bfd_strtab_hash *));
+extern bfd_boolean _bfd_stringtab_emit
+  PARAMS ((bfd *, struct bfd_strtab_hash *));
 
 /* Check that endianness of input and output file match.  */
-extern boolean _bfd_generic_verify_endian_match PARAMS ((bfd *, bfd *));
+extern bfd_boolean _bfd_generic_verify_endian_match
+  PARAMS ((bfd *, bfd *));
 
 /* Macros to tell if bfds are read or write enabled.
 
@@ -539,7 +587,8 @@ extern boolean _bfd_generic_verify_endian_match PARAMS ((bfd *, bfd *));
 #define	bfd_read_p(abfd) ((abfd)->direction == read_direction || (abfd)->direction == both_direction)
 #define	bfd_write_p(abfd) ((abfd)->direction == write_direction || (abfd)->direction == both_direction)
 
-void	bfd_assert PARAMS ((const char*,int));
+void bfd_assert
+  PARAMS ((const char*,int));
 
 #define BFD_ASSERT(x) \
 { if (!(x)) bfd_assert(__FILE__,__LINE__); }
@@ -547,8 +596,8 @@ void	bfd_assert PARAMS ((const char*,int));
 #define BFD_FAIL() \
 { bfd_assert(__FILE__,__LINE__); }
 
-extern void _bfd_abort PARAMS ((const char *, int, const char *))
-     ATTRIBUTE_NORETURN;
+extern void _bfd_abort
+  PARAMS ((const char *, int, const char *)) ATTRIBUTE_NORETURN;
 
 /* if gcc >= 2.6, we can give a function name, too */
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6)
@@ -558,7 +607,8 @@ extern void _bfd_abort PARAMS ((const char *, int, const char *))
 #undef abort
 #define abort() _bfd_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
 
-FILE *	bfd_cache_lookup_worker PARAMS ((bfd *));
+FILE *	bfd_cache_lookup_worker
+  PARAMS ((bfd *));
 
 extern bfd *bfd_last_cache;
 
@@ -577,22 +627,27 @@ extern const bfd_target * const *bfd_associated_vector;
 struct ecoff_find_line;
 #endif
 
-extern boolean _bfd_ecoff_locate_line
+extern bfd_boolean _bfd_ecoff_locate_line
   PARAMS ((bfd *, asection *, bfd_vma, struct ecoff_debug_info * const,
 	   const struct ecoff_debug_swap * const, struct ecoff_find_line *,
 	   const char **, const char **, unsigned int *));
-extern boolean _bfd_ecoff_get_accumulated_pdr PARAMS ((PTR, bfd_byte *));
-extern boolean _bfd_ecoff_get_accumulated_sym PARAMS ((PTR, bfd_byte *));
-extern boolean _bfd_ecoff_get_accumulated_ss PARAMS ((PTR, bfd_byte *));
-
-extern bfd_vma _bfd_get_gp_value PARAMS ((bfd *));
-extern void _bfd_set_gp_value PARAMS ((bfd *, bfd_vma));
+extern bfd_boolean _bfd_ecoff_get_accumulated_pdr
+  PARAMS ((PTR, bfd_byte *));
+extern bfd_boolean _bfd_ecoff_get_accumulated_sym
+  PARAMS ((PTR, bfd_byte *));
+extern bfd_boolean _bfd_ecoff_get_accumulated_ss
+  PARAMS ((PTR, bfd_byte *));
+
+extern bfd_vma _bfd_get_gp_value
+  PARAMS ((bfd *));
+extern void _bfd_set_gp_value
+  PARAMS ((bfd *, bfd_vma));
 
 /* Function shared by the COFF and ELF SH backends, which have no
    other common header files.  */
 
-extern boolean _bfd_sh_align_load_span
+extern bfd_boolean _bfd_sh_align_load_span
   PARAMS ((bfd *, asection *, bfd_byte *,
-	   boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
-	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, boolean *));
+	   bfd_boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
+	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *));
 
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index a264f288361..da93831e6db 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -41,22 +41,22 @@ DESCRIPTION
 /* A routine which is used in target vectors for unsupported
    operations.  */
 
-boolean
+bfd_boolean
 bfd_false (ignore)
      bfd *ignore ATTRIBUTE_UNUSED;
 {
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 }
 
 /* A routine which is used in target vectors for supported operations
    which do not actually do anything.  */
 
-boolean
+bfd_boolean
 bfd_true (ignore)
      bfd *ignore ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* A routine which is used in target vectors for unsupported
@@ -108,13 +108,13 @@ bfd_void (ignore)
 {
 }
 
-boolean
+bfd_boolean
 _bfd_nocore_core_file_matches_executable_p (ignore_core_bfd, ignore_exec_bfd)
      bfd *ignore_core_bfd ATTRIBUTE_UNUSED;
      bfd *ignore_exec_bfd ATTRIBUTE_UNUSED;
 {
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 }
 
 /* Routine to handle core_file_failing_command entry point for targets
@@ -225,7 +225,7 @@ INTERNAL_FUNCTION
 	bfd_write_bigendian_4byte_int
 
 SYNOPSIS
-	boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
+	bfd_boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
 
 DESCRIPTION
 	Write a 4 byte integer @var{i} to the output BFD @var{abfd}, in big
@@ -233,14 +233,14 @@ DESCRIPTION
 	archives.
 
 */
-boolean
+bfd_boolean
 bfd_write_bigendian_4byte_int (abfd, i)
      bfd *abfd;
      unsigned int i;
 {
   bfd_byte buffer[4];
   bfd_putb32 ((bfd_vma) i, buffer);
-  return (boolean) (bfd_bwrite ((PTR) buffer, (bfd_size_type) 4, abfd) == 4);
+  return bfd_bwrite ((PTR) buffer, (bfd_size_type) 4, abfd) == 4;
 }
 
 
@@ -699,7 +699,7 @@ bfd_put_bits (data, addr, bits, big_p)
      bfd_vma data;
      bfd_byte *addr;
      int bits;
-     boolean big_p;
+     bfd_boolean big_p;
 {
   int i;
   int bytes;
@@ -721,7 +721,7 @@ bfd_vma
 bfd_get_bits (addr, bits, big_p)
      bfd_byte *addr;
      int bits;
-     boolean big_p;
+     bfd_boolean big_p;
 {
   bfd_vma data;
   int i;
@@ -744,7 +744,7 @@ bfd_get_bits (addr, bits, big_p)
 
 /* Default implementation */
 
-boolean
+bfd_boolean
 _bfd_generic_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -753,22 +753,22 @@ _bfd_generic_get_section_contents (abfd, section, location, offset, count)
      bfd_size_type count;
 {
   if (count == 0)
-    return true;
+    return TRUE;
 
   if (offset + count > section->_raw_size)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
       || bfd_bread (location, count, abfd) != count)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
      bfd *abfd ATTRIBUTE_UNUSED;
      sec_ptr section ATTRIBUTE_UNUSED;
@@ -778,7 +778,7 @@ _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
 {
 #ifdef USE_MMAP
   if (count == 0)
-    return true;
+    return TRUE;
   if (abfd->xvec->_bfd_get_section_contents != _bfd_generic_get_section_contents)
     {
       /* We don't know what changes the bfd's get_section_contents
@@ -790,13 +790,13 @@ _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
       w->i = ((bfd_window_internal *)
 	      bfd_zmalloc ((bfd_size_type) sizeof (bfd_window_internal)));
       if (w->i == NULL)
-	return false;
+	return FALSE;
       w->i->data = (PTR) bfd_malloc (count);
       if (w->i->data == NULL)
 	{
 	  free (w->i);
 	  w->i = NULL;
-	  return false;
+	  return FALSE;
 	}
       w->i->mapped = 0;
       w->i->refcount = 1;
@@ -806,9 +806,9 @@ _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
     }
   if (offset + count > section->_raw_size
       || ! bfd_get_file_window (abfd, section->filepos + offset, count, w,
-				true))
-    return false;
-  return true;
+				TRUE))
+    return FALSE;
+  return TRUE;
 #else
   abort ();
 #endif
@@ -818,7 +818,7 @@ _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
    NEW sections is disallowed.  It is useful in patching existing sections
    in read-write files, though.  See other set_section_contents functions
    to see why it doesn't work for new sections.  */
-boolean
+bfd_boolean
 _bfd_generic_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -827,13 +827,13 @@ _bfd_generic_set_section_contents (abfd, section, location, offset, count)
      bfd_size_type count;
 {
   if (count == 0)
-    return true;
+    return TRUE;
 
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
       || bfd_bwrite (location, count, abfd) != count)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -859,20 +859,20 @@ bfd_log2 (x)
   return result;
 }
 
-boolean
+bfd_boolean
 bfd_generic_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   char locals_prefix = (bfd_get_symbol_leading_char (abfd) == '_') ? 'L' : '.';
 
-  return (boolean) (name[0] == locals_prefix);
+  return name[0] == locals_prefix;
 }
 
 /*  Can be used from / for bfd_merge_private_bfd_data to check that
     endianness matches between input and output file.  Returns
-    true for a match, otherwise returns false and emits an error.  */
-boolean
+    TRUE for a match, otherwise returns FALSE and emits an error.  */
+bfd_boolean
 _bfd_generic_verify_endian_match (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -891,10 +891,10 @@ _bfd_generic_verify_endian_match (ibfd, obfd)
       (*_bfd_error_handler) (msg, bfd_archive_filename (ibfd));
 
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Give a warning at runtime if someone compiles code which calls
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index b961807b6f3..540b233b335 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -88,70 +88,105 @@ struct areltdata {
 
 #define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
 
-extern PTR bfd_malloc PARAMS ((bfd_size_type));
-extern PTR bfd_realloc PARAMS ((PTR, bfd_size_type));
-extern PTR bfd_zmalloc PARAMS ((bfd_size_type));
+extern PTR bfd_malloc
+  PARAMS ((bfd_size_type));
+extern PTR bfd_realloc
+  PARAMS ((PTR, bfd_size_type));
+extern PTR bfd_zmalloc
+  PARAMS ((bfd_size_type));
 
 extern bfd_error_handler_type _bfd_error_handler;
 
 /* These routines allocate and free things on the BFD's objalloc.  */
 
-extern PTR bfd_alloc PARAMS ((bfd *, bfd_size_type));
-extern PTR bfd_zalloc PARAMS ((bfd *, bfd_size_type));
-extern void bfd_release PARAMS ((bfd *, PTR));
-
-bfd *	_bfd_create_empty_archive_element_shell PARAMS ((bfd *obfd));
-bfd *	_bfd_look_for_bfd_in_cache PARAMS ((bfd *, file_ptr));
-boolean _bfd_add_bfd_to_archive_cache PARAMS ((bfd *, file_ptr, bfd *));
-boolean	_bfd_generic_mkarchive PARAMS ((bfd *abfd));
-const bfd_target *bfd_generic_archive_p PARAMS ((bfd *abfd));
-boolean	bfd_slurp_armap PARAMS ((bfd *abfd));
-boolean bfd_slurp_bsd_armap_f2 PARAMS ((bfd *abfd));
+extern PTR bfd_alloc
+  PARAMS ((bfd *, bfd_size_type));
+extern PTR bfd_zalloc
+  PARAMS ((bfd *, bfd_size_type));
+extern void bfd_release
+  PARAMS ((bfd *, PTR));
+
+bfd * _bfd_create_empty_archive_element_shell
+  PARAMS ((bfd *obfd));
+bfd * _bfd_look_for_bfd_in_cache
+  PARAMS ((bfd *, file_ptr));
+bfd_boolean _bfd_add_bfd_to_archive_cache
+  PARAMS ((bfd *, file_ptr, bfd *));
+bfd_boolean _bfd_generic_mkarchive
+  PARAMS ((bfd *abfd));
+const bfd_target *bfd_generic_archive_p
+  PARAMS ((bfd *abfd));
+bfd_boolean bfd_slurp_armap
+  PARAMS ((bfd *abfd));
+bfd_boolean bfd_slurp_bsd_armap_f2
+  PARAMS ((bfd *abfd));
 #define bfd_slurp_bsd_armap bfd_slurp_armap
 #define bfd_slurp_coff_armap bfd_slurp_armap
-boolean	_bfd_slurp_extended_name_table PARAMS ((bfd *abfd));
-extern boolean _bfd_construct_extended_name_table
-  PARAMS ((bfd *, boolean, char **, bfd_size_type *));
-boolean	_bfd_write_archive_contents PARAMS ((bfd *abfd));
-boolean _bfd_compute_and_write_armap PARAMS ((bfd *, unsigned int elength));
-bfd *_bfd_get_elt_at_filepos PARAMS ((bfd *archive, file_ptr filepos));
-extern bfd *_bfd_generic_get_elt_at_index PARAMS ((bfd *, symindex));
-bfd * _bfd_new_bfd PARAMS ((void));
-void _bfd_delete_bfd PARAMS ((bfd *));
-
-boolean	bfd_false PARAMS ((bfd *ignore));
-boolean	bfd_true PARAMS ((bfd *ignore));
-PTR	bfd_nullvoidptr PARAMS ((bfd *ignore));
-int	bfd_0 PARAMS ((bfd *ignore));
-unsigned int	bfd_0u PARAMS ((bfd *ignore));
-long	bfd_0l PARAMS ((bfd *ignore));
-long	_bfd_n1 PARAMS ((bfd *ignore));
-void	bfd_void PARAMS ((bfd *ignore));
-
-bfd *_bfd_new_bfd_contained_in PARAMS ((bfd *));
-const bfd_target *_bfd_dummy_target PARAMS ((bfd *abfd));
-
-void	bfd_dont_truncate_arname PARAMS ((bfd *abfd, const char *filename,
-					char *hdr));
-void	bfd_bsd_truncate_arname PARAMS ((bfd *abfd, const char *filename,
-					char *hdr));
-void	bfd_gnu_truncate_arname PARAMS ((bfd *abfd, const char *filename,
-					char *hdr));
-
-boolean	bsd_write_armap PARAMS ((bfd *arch, unsigned int elength,
-				  struct orl *map, unsigned int orl_count, int stridx));
-
-boolean	coff_write_armap PARAMS ((bfd *arch, unsigned int elength,
-				   struct orl *map, unsigned int orl_count, int stridx));
-
-extern PTR _bfd_generic_read_ar_hdr PARAMS ((bfd *));
-
-extern PTR _bfd_generic_read_ar_hdr_mag PARAMS ((bfd *, const char *));
-
-bfd *	bfd_generic_openr_next_archived_file PARAMS ((bfd *archive,
-						     bfd *last_file));
-
-int	bfd_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
+bfd_boolean _bfd_slurp_extended_name_table
+  PARAMS ((bfd *abfd));
+extern bfd_boolean _bfd_construct_extended_name_table
+  PARAMS ((bfd *, bfd_boolean, char **, bfd_size_type *));
+bfd_boolean _bfd_write_archive_contents
+  PARAMS ((bfd *abfd));
+bfd_boolean _bfd_compute_and_write_armap
+  PARAMS ((bfd *, unsigned int elength));
+bfd *_bfd_get_elt_at_filepos
+  PARAMS ((bfd *archive, file_ptr filepos));
+extern bfd *_bfd_generic_get_elt_at_index
+  PARAMS ((bfd *, symindex));
+bfd * _bfd_new_bfd
+  PARAMS ((void));
+void _bfd_delete_bfd
+  PARAMS ((bfd *));
+
+bfd_boolean bfd_false
+  PARAMS ((bfd *ignore));
+bfd_boolean bfd_true
+  PARAMS ((bfd *ignore));
+PTR bfd_nullvoidptr
+  PARAMS ((bfd *ignore));
+int bfd_0
+  PARAMS ((bfd *ignore));
+unsigned int bfd_0u
+  PARAMS ((bfd *ignore));
+long bfd_0l
+  PARAMS ((bfd *ignore));
+long _bfd_n1
+  PARAMS ((bfd *ignore));
+void bfd_void
+  PARAMS ((bfd *ignore));
+
+bfd *_bfd_new_bfd_contained_in
+  PARAMS ((bfd *));
+const bfd_target *_bfd_dummy_target
+  PARAMS ((bfd *abfd));
+
+void bfd_dont_truncate_arname
+  PARAMS ((bfd *abfd, const char *filename, char *hdr));
+void bfd_bsd_truncate_arname
+  PARAMS ((bfd *abfd, const char *filename, char *hdr));
+void bfd_gnu_truncate_arname
+  PARAMS ((bfd *abfd, const char *filename, char *hdr));
+
+bfd_boolean bsd_write_armap
+  PARAMS ((bfd *arch, unsigned int elength, struct orl *map,
+	   unsigned int orl_count, int stridx));
+
+bfd_boolean coff_write_armap
+  PARAMS ((bfd *arch, unsigned int elength, struct orl *map,
+	   unsigned int orl_count, int stridx));
+
+extern PTR _bfd_generic_read_ar_hdr
+  PARAMS ((bfd *));
+
+extern PTR _bfd_generic_read_ar_hdr_mag
+  PARAMS ((bfd *, const char *));
+
+bfd * bfd_generic_openr_next_archived_file
+  PARAMS ((bfd *archive, bfd *last_file));
+
+int bfd_generic_stat_arch_elt
+  PARAMS ((bfd *, struct stat *));
 
 #define _bfd_read_ar_hdr(abfd) \
   BFD_SEND (abfd, _bfd_read_ar_hdr_fn, (abfd))
@@ -162,34 +197,36 @@ int	bfd_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
 #define _bfd_generic_close_and_cleanup bfd_true
 #define _bfd_generic_bfd_free_cached_info bfd_true
 #define _bfd_generic_new_section_hook \
-  ((boolean (*) PARAMS ((bfd *, asection *))) bfd_true)
-extern boolean _bfd_generic_get_section_contents
+  ((bfd_boolean (*) PARAMS ((bfd *, asection *))) bfd_true)
+extern bfd_boolean _bfd_generic_get_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-extern boolean _bfd_generic_get_section_contents_in_window
+extern bfd_boolean _bfd_generic_get_section_contents_in_window
   PARAMS ((bfd *, asection *, bfd_window *, file_ptr, bfd_size_type));
 
 /* Generic routines to use for BFD_JUMP_TABLE_COPY.  Use
    BFD_JUMP_TABLE_COPY (_bfd_generic).  */
 
 #define _bfd_generic_bfd_copy_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
 #define _bfd_generic_bfd_merge_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
 #define _bfd_generic_bfd_set_private_flags \
-  ((boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
 #define _bfd_generic_bfd_copy_private_section_data \
-  ((boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_true)
 #define _bfd_generic_bfd_copy_private_symbol_data \
-  ((boolean (*) PARAMS ((bfd *, asymbol *, bfd *, asymbol *))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, asymbol *, bfd *, asymbol *))) bfd_true)
 #define _bfd_generic_bfd_print_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, PTR))) bfd_true)
+  ((bfd_boolean (*) PARAMS ((bfd *, PTR))) bfd_true)
 
 /* Routines to use for BFD_JUMP_TABLE_CORE when there is no core file
    support.  Use BFD_JUMP_TABLE_CORE (_bfd_nocore).  */
 
-extern char *_bfd_nocore_core_file_failing_command PARAMS ((bfd *));
-extern int _bfd_nocore_core_file_failing_signal PARAMS ((bfd *));
-extern boolean _bfd_nocore_core_file_matches_executable_p
+extern char *_bfd_nocore_core_file_failing_command
+  PARAMS ((bfd *));
+extern int _bfd_nocore_core_file_failing_signal
+  PARAMS ((bfd *));
+extern bfd_boolean _bfd_nocore_core_file_matches_executable_p
   PARAMS ((bfd *, bfd *));
 
 /* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive
@@ -198,12 +235,13 @@ extern boolean _bfd_nocore_core_file_matches_executable_p
 #define _bfd_noarchive_slurp_armap bfd_false
 #define _bfd_noarchive_slurp_extended_name_table bfd_false
 #define _bfd_noarchive_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
+  ((bfd_boolean (*) \
+    PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
    bfd_false)
 #define _bfd_noarchive_truncate_arname \
   ((void (*) PARAMS ((bfd *, const char *, char *))) bfd_void)
 #define _bfd_noarchive_write_armap \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
    bfd_false)
 #define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr
@@ -220,7 +258,7 @@ extern boolean _bfd_nocore_core_file_matches_executable_p
 #define _bfd_archive_bsd_slurp_armap bfd_slurp_bsd_armap
 #define _bfd_archive_bsd_slurp_extended_name_table \
   _bfd_slurp_extended_name_table
-extern boolean _bfd_archive_bsd_construct_extended_name_table
+extern bfd_boolean _bfd_archive_bsd_construct_extended_name_table
   PARAMS ((bfd *, char **, bfd_size_type *, const char **));
 #define _bfd_archive_bsd_truncate_arname bfd_bsd_truncate_arname
 #define _bfd_archive_bsd_write_armap bsd_write_armap
@@ -230,7 +268,8 @@ extern boolean _bfd_archive_bsd_construct_extended_name_table
 #define _bfd_archive_bsd_get_elt_at_index _bfd_generic_get_elt_at_index
 #define _bfd_archive_bsd_generic_stat_arch_elt \
   bfd_generic_stat_arch_elt
-extern boolean _bfd_archive_bsd_update_armap_timestamp PARAMS ((bfd *));
+extern bfd_boolean _bfd_archive_bsd_update_armap_timestamp
+  PARAMS ((bfd *));
 
 /* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get COFF style
    archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff).  */
@@ -238,7 +277,7 @@ extern boolean _bfd_archive_bsd_update_armap_timestamp PARAMS ((bfd *));
 #define _bfd_archive_coff_slurp_armap bfd_slurp_coff_armap
 #define _bfd_archive_coff_slurp_extended_name_table \
   _bfd_slurp_extended_name_table
-extern boolean _bfd_archive_coff_construct_extended_name_table
+extern bfd_boolean _bfd_archive_coff_construct_extended_name_table
   PARAMS ((bfd *, char **, bfd_size_type *, const char **));
 #define _bfd_archive_coff_truncate_arname bfd_dont_truncate_arname
 #define _bfd_archive_coff_write_armap coff_write_armap
@@ -262,20 +301,20 @@ extern boolean _bfd_archive_coff_construct_extended_name_table
 #define _bfd_nosymbols_get_symbol_info \
   ((void (*) PARAMS ((bfd *, asymbol *, symbol_info *))) bfd_void)
 #define _bfd_nosymbols_bfd_is_local_label_name \
-  ((boolean (*) PARAMS ((bfd *, const char *))) bfd_false)
+  ((bfd_boolean (*) PARAMS ((bfd *, const char *))) bfd_false)
 #define _bfd_nosymbols_get_lineno \
   ((alent *(*) PARAMS ((bfd *, asymbol *))) bfd_nullvoidptr)
 #define _bfd_nosymbols_find_nearest_line \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **, \
 	     const char **, unsigned int *))) \
    bfd_false)
 #define _bfd_nosymbols_bfd_make_debug_symbol \
   ((asymbol *(*) PARAMS ((bfd *, PTR, unsigned long))) bfd_nullvoidptr)
 #define _bfd_nosymbols_read_minisymbols \
-  ((long (*) PARAMS ((bfd *, boolean, PTR *, unsigned int *))) _bfd_n1)
+  ((long (*) PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *))) _bfd_n1)
 #define _bfd_nosymbols_minisymbol_to_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, boolean, const PTR, asymbol *))) \
+  ((asymbol *(*) PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *))) \
    bfd_nullvoidptr)
 
 /* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc
@@ -293,42 +332,43 @@ extern boolean _bfd_archive_coff_construct_extended_name_table
    be written.  Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite).  */
 
 #define _bfd_nowrite_set_arch_mach \
-  ((boolean (*) PARAMS ((bfd *, enum bfd_architecture, unsigned long))) \
+  ((bfd_boolean (*) PARAMS ((bfd *, enum bfd_architecture, unsigned long))) \
    bfd_false)
 #define _bfd_nowrite_set_section_contents \
-  ((boolean (*) PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type))) \
+  ((bfd_boolean (*) \
+   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type))) \
    bfd_false)
 
 /* Generic routines to use for BFD_JUMP_TABLE_WRITE.  Use
    BFD_JUMP_TABLE_WRITE (_bfd_generic).  */
 
 #define _bfd_generic_set_arch_mach bfd_default_set_arch_mach
-extern boolean _bfd_generic_set_section_contents
+extern bfd_boolean _bfd_generic_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
 
 /* Routines to use for BFD_JUMP_TABLE_LINK for targets which do not
    support linking.  Use BFD_JUMP_TABLE_LINK (_bfd_nolink).  */
 
-#define _bfd_nolink_sizeof_headers ((int (*) PARAMS ((bfd *, boolean))) bfd_0)
+#define _bfd_nolink_sizeof_headers ((int (*) PARAMS ((bfd *, bfd_boolean))) bfd_0)
 #define _bfd_nolink_bfd_get_relocated_section_contents \
   ((bfd_byte *(*) \
     PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, \
-	     bfd_byte *, boolean, asymbol **))) \
+	     bfd_byte *, bfd_boolean, asymbol **))) \
    bfd_nullvoidptr)
 #define _bfd_nolink_bfd_relax_section \
-  ((boolean (*) \
-    PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *))) \
+  ((bfd_boolean (*) \
+    PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *))) \
    bfd_false)
 #define _bfd_nolink_bfd_gc_sections \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, struct bfd_link_info *))) \
    bfd_false)
 #define _bfd_nolink_bfd_merge_sections \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, struct bfd_link_info *))) \
    bfd_false)
 #define _bfd_nolink_bfd_discard_group \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, struct sec *))) \
    bfd_false)
 #define _bfd_nolink_bfd_link_hash_table_create \
@@ -336,13 +376,13 @@ extern boolean _bfd_generic_set_section_contents
 #define _bfd_nolink_bfd_link_hash_table_free \
   ((void (*) PARAMS ((struct bfd_link_hash_table *))) bfd_void)
 #define _bfd_nolink_bfd_link_add_symbols \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
+  ((bfd_boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
 #define _bfd_nolink_bfd_link_just_syms \
   ((void (*) PARAMS ((asection *, struct bfd_link_info *))) bfd_void)
 #define _bfd_nolink_bfd_final_link \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
+  ((bfd_boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
 #define _bfd_nolink_bfd_link_split_section \
-  ((boolean (*) PARAMS ((bfd *, struct sec *))) bfd_false)
+  ((bfd_boolean (*) PARAMS ((bfd *, struct sec *))) bfd_false)
 
 /* Routines to use for BFD_JUMP_TABLE_DYNAMIC for targets which do not
    have dynamic symbols or relocs.  Use BFD_JUMP_TABLE_DYNAMIC
@@ -357,26 +397,27 @@ extern boolean _bfd_generic_set_section_contents
 
 /* Generic routine to determine of the given symbol is a local
    label.  */
-extern boolean bfd_generic_is_local_label_name PARAMS ((bfd *, const char *));
+extern bfd_boolean bfd_generic_is_local_label_name
+  PARAMS ((bfd *, const char *));
 
 /* Generic minisymbol routines.  */
 extern long _bfd_generic_read_minisymbols
-  PARAMS ((bfd *, boolean, PTR *, unsigned int *));
+  PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *));
 extern asymbol *_bfd_generic_minisymbol_to_symbol
-  PARAMS ((bfd *, boolean, const PTR, asymbol *));
+  PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *));
 
 /* Find the nearest line using .stab/.stabstr sections.  */
-extern boolean _bfd_stab_section_find_nearest_line
-  PARAMS ((bfd *, asymbol **, asection *, bfd_vma, boolean *, const char **,
-	   const char **, unsigned int *, PTR *));
+extern bfd_boolean _bfd_stab_section_find_nearest_line
+  PARAMS ((bfd *, asymbol **, asection *, bfd_vma, bfd_boolean *,
+	   const char **, const char **, unsigned int *, PTR *));
 
 /* Find the neaderst line using DWARF 1 debugging information.  */
-extern boolean _bfd_dwarf1_find_nearest_line
+extern bfd_boolean _bfd_dwarf1_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
 
 /* Find the nearest line using DWARF 2 debugging information.  */
-extern boolean _bfd_dwarf2_find_nearest_line
+extern bfd_boolean _bfd_dwarf2_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *, unsigned int,
 	   PTR *));
@@ -392,7 +433,7 @@ extern struct bfd_hash_entry *_bfd_link_hash_newfunc
 	   const char *string));
 
 /* Initialize a bfd_link_hash_table.  */
-extern boolean _bfd_link_hash_table_init
+extern bfd_boolean _bfd_link_hash_table_init
   PARAMS ((struct bfd_link_hash_table *, bfd *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
@@ -407,47 +448,47 @@ extern void _bfd_generic_link_hash_table_free
   PARAMS ((struct bfd_link_hash_table *));
 
 /* Generic add symbol routine.  */
-extern boolean _bfd_generic_link_add_symbols
+extern bfd_boolean _bfd_generic_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Generic add symbol routine.  This version is used by targets for
    which the linker must collect constructors and destructors by name,
    as the collect2 program does.  */
-extern boolean _bfd_generic_link_add_symbols_collect
+extern bfd_boolean _bfd_generic_link_add_symbols_collect
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Generic archive add symbol routine.  */
-extern boolean _bfd_generic_link_add_archive_symbols
+extern bfd_boolean _bfd_generic_link_add_archive_symbols
   PARAMS ((bfd *, struct bfd_link_info *,
-	   boolean (*checkfn) (bfd *, struct bfd_link_info *, boolean *)));
+	   bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *)));
 
 /* Forward declaration to avoid prototype errors.  */
 typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
 
 /* Generic routine to add a single symbol.  */
-extern boolean _bfd_generic_link_add_one_symbol
+extern bfd_boolean _bfd_generic_link_add_one_symbol
   PARAMS ((struct bfd_link_info *, bfd *, const char *name, flagword,
-	   asection *, bfd_vma, const char *, boolean copy,
-	   boolean constructor, struct bfd_link_hash_entry **));
+	   asection *, bfd_vma, const char *, bfd_boolean copy,
+	   bfd_boolean constructor, struct bfd_link_hash_entry **));
 
 /* Generic routine to mark section as supplying symbols only.  */
 extern void _bfd_generic_link_just_syms
   PARAMS ((asection *, struct bfd_link_info *));
 
 /* Generic link routine.  */
-extern boolean _bfd_generic_final_link
+extern bfd_boolean _bfd_generic_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
-extern boolean _bfd_generic_link_split_section
+extern bfd_boolean _bfd_generic_link_split_section
   PARAMS ((bfd *, struct sec *));
 
 /* Generic reloc_link_order processing routine.  */
-extern boolean _bfd_generic_reloc_link_order
+extern bfd_boolean _bfd_generic_reloc_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   struct bfd_link_order *));
 
 /* Default link order processing routine.  */
-extern boolean _bfd_default_link_order
+extern bfd_boolean _bfd_default_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   struct bfd_link_order *));
 
@@ -466,22 +507,23 @@ extern bfd_reloc_status_type _bfd_relocate_contents
 
 /* Link stabs in sections in the first pass.  */
 
-extern boolean _bfd_link_section_stabs
+extern bfd_boolean _bfd_link_section_stabs
   PARAMS ((bfd *, PTR *, asection *, asection *, PTR *));
 
 /* Eliminate stabs for discarded functions and symbols.  */
-extern boolean _bfd_discard_section_stabs
+extern bfd_boolean _bfd_discard_section_stabs
   PARAMS ((bfd *, asection *, PTR,
-	   boolean (*) (bfd_vma, PTR), PTR));
+	   bfd_boolean (*) (bfd_vma, PTR), PTR));
 
 /* Write out the .stab section when linking stabs in sections.  */
 
-extern boolean _bfd_write_section_stabs
+extern bfd_boolean _bfd_write_section_stabs
   PARAMS ((bfd *, PTR *, asection *, PTR *, bfd_byte *));
 
 /* Write out the .stabstr string table when linking stabs in sections.  */
 
-extern boolean _bfd_write_stab_strings PARAMS ((bfd *, PTR *));
+extern bfd_boolean _bfd_write_stab_strings
+  PARAMS ((bfd *, PTR *));
 
 /* Find an offset within a .stab section when linking stabs in
    sections.  */
@@ -491,17 +533,17 @@ extern bfd_vma _bfd_stab_section_offset
 
 /* Attempt to merge a SEC_MERGE section.  */
 
-extern boolean _bfd_merge_section
+extern bfd_boolean _bfd_merge_section
   PARAMS ((bfd *, PTR *, asection *, PTR *));
 
 /* Attempt to merge SEC_MERGE sections.  */
 
-extern boolean _bfd_merge_sections
+extern bfd_boolean _bfd_merge_sections
   PARAMS ((bfd *, PTR, void (*)(bfd *, asection *)));
 
 /* Write out a merged section.  */
 
-extern boolean _bfd_write_merged_section
+extern bfd_boolean _bfd_write_merged_section
   PARAMS ((bfd *, asection *, PTR));
 
 /* Find an offset within a modified SEC_MERGE section.  */
@@ -510,27 +552,33 @@ extern bfd_vma _bfd_merged_section_offset
   PARAMS ((bfd *, asection **, PTR, bfd_vma, bfd_vma));
 
 /* Create a string table.  */
-extern struct bfd_strtab_hash *_bfd_stringtab_init PARAMS ((void));
+extern struct bfd_strtab_hash *_bfd_stringtab_init
+  PARAMS ((void));
 
 /* Create an XCOFF .debug section style string table.  */
-extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init PARAMS ((void));
+extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init
+  PARAMS ((void));
 
 /* Free a string table.  */
-extern void _bfd_stringtab_free PARAMS ((struct bfd_strtab_hash *));
+extern void _bfd_stringtab_free
+  PARAMS ((struct bfd_strtab_hash *));
 
 /* Get the size of a string table.  */
-extern bfd_size_type _bfd_stringtab_size PARAMS ((struct bfd_strtab_hash *));
+extern bfd_size_type _bfd_stringtab_size
+  PARAMS ((struct bfd_strtab_hash *));
 
 /* Add a string to a string table.  */
 extern bfd_size_type _bfd_stringtab_add
-  PARAMS ((struct bfd_strtab_hash *, const char *, boolean hash,
-	   boolean copy));
+  PARAMS ((struct bfd_strtab_hash *, const char *, bfd_boolean hash,
+	   bfd_boolean copy));
 
 /* Write out a string table.  */
-extern boolean _bfd_stringtab_emit PARAMS ((bfd *, struct bfd_strtab_hash *));
+extern bfd_boolean _bfd_stringtab_emit
+  PARAMS ((bfd *, struct bfd_strtab_hash *));
 
 /* Check that endianness of input and output file match.  */
-extern boolean _bfd_generic_verify_endian_match PARAMS ((bfd *, bfd *));
+extern bfd_boolean _bfd_generic_verify_endian_match
+  PARAMS ((bfd *, bfd *));
 
 /* Macros to tell if bfds are read or write enabled.
 
@@ -544,7 +592,8 @@ extern boolean _bfd_generic_verify_endian_match PARAMS ((bfd *, bfd *));
 #define	bfd_read_p(abfd) ((abfd)->direction == read_direction || (abfd)->direction == both_direction)
 #define	bfd_write_p(abfd) ((abfd)->direction == write_direction || (abfd)->direction == both_direction)
 
-void	bfd_assert PARAMS ((const char*,int));
+void bfd_assert
+  PARAMS ((const char*,int));
 
 #define BFD_ASSERT(x) \
 { if (!(x)) bfd_assert(__FILE__,__LINE__); }
@@ -552,8 +601,8 @@ void	bfd_assert PARAMS ((const char*,int));
 #define BFD_FAIL() \
 { bfd_assert(__FILE__,__LINE__); }
 
-extern void _bfd_abort PARAMS ((const char *, int, const char *))
-     ATTRIBUTE_NORETURN;
+extern void _bfd_abort
+  PARAMS ((const char *, int, const char *)) ATTRIBUTE_NORETURN;
 
 /* if gcc >= 2.6, we can give a function name, too */
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6)
@@ -563,7 +612,8 @@ extern void _bfd_abort PARAMS ((const char *, int, const char *))
 #undef abort
 #define abort() _bfd_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
 
-FILE *	bfd_cache_lookup_worker PARAMS ((bfd *));
+FILE *	bfd_cache_lookup_worker
+  PARAMS ((bfd *));
 
 extern bfd *bfd_last_cache;
 
@@ -582,28 +632,33 @@ extern const bfd_target * const *bfd_associated_vector;
 struct ecoff_find_line;
 #endif
 
-extern boolean _bfd_ecoff_locate_line
+extern bfd_boolean _bfd_ecoff_locate_line
   PARAMS ((bfd *, asection *, bfd_vma, struct ecoff_debug_info * const,
 	   const struct ecoff_debug_swap * const, struct ecoff_find_line *,
 	   const char **, const char **, unsigned int *));
-extern boolean _bfd_ecoff_get_accumulated_pdr PARAMS ((PTR, bfd_byte *));
-extern boolean _bfd_ecoff_get_accumulated_sym PARAMS ((PTR, bfd_byte *));
-extern boolean _bfd_ecoff_get_accumulated_ss PARAMS ((PTR, bfd_byte *));
-
-extern bfd_vma _bfd_get_gp_value PARAMS ((bfd *));
-extern void _bfd_set_gp_value PARAMS ((bfd *, bfd_vma));
+extern bfd_boolean _bfd_ecoff_get_accumulated_pdr
+  PARAMS ((PTR, bfd_byte *));
+extern bfd_boolean _bfd_ecoff_get_accumulated_sym
+  PARAMS ((PTR, bfd_byte *));
+extern bfd_boolean _bfd_ecoff_get_accumulated_ss
+  PARAMS ((PTR, bfd_byte *));
+
+extern bfd_vma _bfd_get_gp_value
+  PARAMS ((bfd *));
+extern void _bfd_set_gp_value
+  PARAMS ((bfd *, bfd_vma));
 
 /* Function shared by the COFF and ELF SH backends, which have no
    other common header files.  */
 
-extern boolean _bfd_sh_align_load_span
+extern bfd_boolean _bfd_sh_align_load_span
   PARAMS ((bfd *, asection *, bfd_byte *,
-	   boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
-	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, boolean *));
+	   bfd_boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
+	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *));
 
 /* Extracted from init.c.  */
 /* Extracted from libbfd.c.  */
-boolean
+bfd_boolean
 bfd_write_bigendian_4byte_int PARAMS ((bfd *, unsigned int));
 
 unsigned int
@@ -626,10 +681,10 @@ extern bfd *bfd_last_cache;
     ((x)==bfd_last_cache? \
       (FILE*) (bfd_last_cache->iostream): \
        bfd_cache_lookup_worker(x))
-boolean
+bfd_boolean
 bfd_cache_init PARAMS ((bfd *abfd));
 
-boolean
+bfd_boolean
 bfd_cache_close PARAMS ((bfd *abfd));
 
 FILE*
@@ -1324,16 +1379,16 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
 reloc_howto_type *
 bfd_default_reloc_type_lookup PARAMS ((bfd *abfd, bfd_reloc_code_real_type  code));
 
-boolean
+bfd_boolean
 bfd_generic_relax_section PARAMS ((bfd *abfd,
     asection *section,
     struct bfd_link_info *,
-    boolean *));
+    bfd_boolean *));
 
-boolean
+bfd_boolean
 bfd_generic_gc_sections PARAMS ((bfd *, struct bfd_link_info *));
 
-boolean
+bfd_boolean
 bfd_generic_merge_sections PARAMS ((bfd *, struct bfd_link_info *));
 
 bfd_byte *
@@ -1341,12 +1396,12 @@ bfd_generic_get_relocated_section_contents PARAMS ((bfd *abfd,
     struct bfd_link_info *link_info,
     struct bfd_link_order *link_order,
     bfd_byte *data,
-    boolean relocateable,
+    bfd_boolean relocateable,
     asymbol **symbols));
 
 /* Extracted from archures.c.  */
 extern const bfd_arch_info_type bfd_default_arch_struct;
-boolean
+bfd_boolean
 bfd_default_set_arch_mach PARAMS ((bfd *abfd,
     enum bfd_architecture arch,
     unsigned long mach));
@@ -1355,7 +1410,7 @@ const bfd_arch_info_type *
 bfd_default_compatible PARAMS ((const bfd_arch_info_type *a,
     const bfd_arch_info_type *b));
 
-boolean
+bfd_boolean
 bfd_default_scan PARAMS ((const struct bfd_arch_info *info, const char *string));
 
 /* Extracted from elf.c.  */
diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h
index efc2fee268b..fac76506d4a 100644
--- a/bfd/libcoff-in.h
+++ b/bfd/libcoff-in.h
@@ -74,16 +74,16 @@ typedef struct coff_tdata
   /* The unswapped external symbols.  May be NULL.  Read by
      _bfd_coff_get_external_symbols.  */
   PTR external_syms;
-  /* If this is true, the external_syms may not be freed.  */
-  boolean keep_syms;
+  /* If this is TRUE, the external_syms may not be freed.  */
+  bfd_boolean keep_syms;
 
   /* The string table.  May be NULL.  Read by
      _bfd_coff_read_string_table.  */
   char *strings;
-  /* If this is true, the strings may not be freed.  */
-  boolean keep_strings;
-  /* If this is true, the strings have been written out already.  */
-  boolean strings_written;
+  /* If this is TRUE, the strings may not be freed.  */
+  bfd_boolean keep_strings;
+  /* If this is TRUE, the strings have been written out already.  */
+  bfd_boolean strings_written;
 
   /* is this a PE format coff file */
   int pe;
@@ -117,10 +117,10 @@ typedef struct pe_tdata
   struct internal_extra_pe_aouthdr pe_opthdr;
   int dll;
   int has_reloc_section;
-  boolean (*in_reloc_p) PARAMS((bfd *, reloc_howto_type *));
+  bfd_boolean (*in_reloc_p) PARAMS((bfd *, reloc_howto_type *));
   flagword real_flags;
   int target_subsystem;
-  boolean force_minimum_alignment;
+  bfd_boolean force_minimum_alignment;
 } pe_data_type;
 
 #define pe_data(bfd)		((bfd)->tdata.pe_obj_data)
@@ -132,11 +132,11 @@ struct xcoff_tdata
   /* Basic COFF information.  */
   coff_data_type coff;
 
-  /* True if this is an XCOFF64 file. */
-  boolean xcoff64;
+  /* TRUE if this is an XCOFF64 file. */
+  bfd_boolean xcoff64;
 
-  /* True if a large a.out header should be generated.  */
-  boolean full_aouthdr;
+  /* TRUE if a large a.out header should be generated.  */
+  bfd_boolean full_aouthdr;
 
   /* TOC value.  */
   bfd_vma toc;
@@ -184,12 +184,12 @@ struct coff_section_tdata
 {
   /* The relocs, swapped into COFF internal form.  This may be NULL.  */
   struct internal_reloc *relocs;
-  /* If this is true, the relocs entry may not be freed.  */
-  boolean keep_relocs;
+  /* If this is TRUE, the relocs entry may not be freed.  */
+  bfd_boolean keep_relocs;
   /* The section contents.  This may be NULL.  */
   bfd_byte *contents;
-  /* If this is true, the contents entry may not be freed.  */
-  boolean keep_contents;
+  /* If this is TRUE, the contents entry may not be freed.  */
+  bfd_boolean keep_contents;
   /* Information cached by coff_find_nearest_line.  */
   bfd_vma offset;
   unsigned int i;
@@ -291,7 +291,7 @@ struct coff_link_hash_table
 #define coff_link_hash_traverse(table, func, info)			\
   (bfd_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the COFF linker hash table from a link_info structure.  */
@@ -311,23 +311,23 @@ extern int coff_count_linenumbers
   PARAMS ((bfd *));
 extern struct coff_symbol_struct *coff_symbol_from
   PARAMS ((bfd *, asymbol *));
-extern boolean coff_renumber_symbols
+extern bfd_boolean coff_renumber_symbols
   PARAMS ((bfd *, int *));
 extern void coff_mangle_symbols
   PARAMS ((bfd *));
-extern boolean coff_write_symbols
+extern bfd_boolean coff_write_symbols
   PARAMS ((bfd *));
-extern boolean coff_write_linenumbers
+extern bfd_boolean coff_write_linenumbers
   PARAMS ((bfd *));
 extern alent *coff_get_lineno
   PARAMS ((bfd *, asymbol *));
 extern asymbol *coff_section_symbol
   PARAMS ((bfd *, char *));
-extern boolean _bfd_coff_get_external_symbols
+extern bfd_boolean _bfd_coff_get_external_symbols
   PARAMS ((bfd *));
 extern const char *_bfd_coff_read_string_table
   PARAMS ((bfd *));
-extern boolean _bfd_coff_free_symbols
+extern bfd_boolean _bfd_coff_free_symbols
   PARAMS ((bfd *));
 extern struct coff_ptr_struct *coff_get_normalized_symtab
   PARAMS ((bfd *));
@@ -339,20 +339,20 @@ extern void coff_print_symbol
   PARAMS ((bfd *, PTR filep, asymbol *, bfd_print_symbol_type));
 extern void coff_get_symbol_info
   PARAMS ((bfd *, asymbol *, symbol_info *ret));
-extern boolean _bfd_coff_is_local_label_name
+extern bfd_boolean _bfd_coff_is_local_label_name
   PARAMS ((bfd *, const char *));
 extern asymbol *coff_bfd_make_debug_symbol
   PARAMS ((bfd *, PTR, unsigned long));
-extern boolean coff_find_nearest_line
+extern bfd_boolean coff_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
 extern int coff_sizeof_headers
-  PARAMS ((bfd *, boolean));
-extern boolean bfd_coff_reloc16_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
+  PARAMS ((bfd *, bfd_boolean));
+extern bfd_boolean bfd_coff_reloc16_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
 extern bfd_byte *bfd_coff_reloc16_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
+	   bfd_byte *, bfd_boolean, asymbol **));
 extern bfd_vma bfd_coff_reloc16_get_value
    PARAMS ((arelent *, struct bfd_link_info *, asection *));
 extern void bfd_perform_slip
@@ -454,11 +454,11 @@ struct coff_final_link_info
   /* Output BFD.  */
   bfd *output_bfd;
   /* Used to indicate failure in traversal routine.  */
-  boolean failed;
+  bfd_boolean failed;
   /* If doing "task linking" set only during the time when we want the
      global symbol writer to convert the storage class of defined global
      symbols from global to static. */
-  boolean global_to_static;
+  bfd_boolean global_to_static;
   /* Hash table for long symbol names.  */
   struct bfd_strtab_hash *strtab;
   /* When doing a relocateable link, an array of information kept for
@@ -532,7 +532,7 @@ struct coff_section_alignment_entry
 
 extern struct bfd_hash_entry *_bfd_coff_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern boolean _bfd_coff_link_hash_table_init
+extern bfd_boolean _bfd_coff_link_hash_table_init
   PARAMS ((struct coff_link_hash_table *, bfd *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
@@ -541,26 +541,26 @@ extern struct bfd_link_hash_table *_bfd_coff_link_hash_table_create
   PARAMS ((bfd *));
 extern const char *_bfd_coff_internal_syment_name
   PARAMS ((bfd *, const struct internal_syment *, char *));
-extern boolean _bfd_coff_link_add_symbols
+extern bfd_boolean _bfd_coff_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_coff_final_link
+extern bfd_boolean _bfd_coff_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 extern struct internal_reloc *_bfd_coff_read_internal_relocs
-  PARAMS ((bfd *, asection *, boolean, bfd_byte *, boolean,
+  PARAMS ((bfd *, asection *, bfd_boolean, bfd_byte *, bfd_boolean,
 	   struct internal_reloc *));
-extern boolean _bfd_coff_generic_relocate_section
+extern bfd_boolean _bfd_coff_generic_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 
 extern struct bfd_hash_entry *_bfd_coff_debug_merge_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern boolean _bfd_coff_write_global_sym
+extern bfd_boolean _bfd_coff_write_global_sym
   PARAMS ((struct coff_link_hash_entry *, PTR));
-extern boolean _bfd_coff_write_task_globals
+extern bfd_boolean _bfd_coff_write_task_globals
   PARAMS ((struct coff_link_hash_entry *, PTR));
-extern boolean _bfd_coff_link_input_bfd
+extern bfd_boolean _bfd_coff_link_input_bfd
   PARAMS ((struct coff_final_link_info *, bfd *));
-extern boolean _bfd_coff_reloc_link_order
+extern bfd_boolean _bfd_coff_reloc_link_order
   PARAMS ((bfd *, struct coff_final_link_info *, asection *,
 	   struct bfd_link_order *));
 
@@ -582,19 +582,19 @@ extern struct bfd_link_hash_table *_bfd_xcoff_bfd_link_hash_table_create
   PARAMS ((bfd *));
 extern void _bfd_xcoff_bfd_link_hash_table_free
   PARAMS ((struct bfd_link_hash_table *));
-extern boolean _bfd_xcoff_bfd_link_add_symbols
+extern bfd_boolean _bfd_xcoff_bfd_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_xcoff_bfd_final_link
+extern bfd_boolean _bfd_xcoff_bfd_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_ppc_xcoff_relocate_section
+extern bfd_boolean _bfd_ppc_xcoff_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 
 /* Functions in coff-ppc.c.  FIXME: These are called be pe.em in the
    linker, and so should start with bfd and be declared in bfd.h.  */
 
-extern boolean ppc_allocate_toc_section
+extern bfd_boolean ppc_allocate_toc_section
   PARAMS ((struct bfd_link_info *));
-extern boolean ppc_process_before_allocation
+extern bfd_boolean ppc_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *));
 
diff --git a/bfd/libcoff.h b/bfd/libcoff.h
index ea9c5700b1f..c0279e5e88d 100644
--- a/bfd/libcoff.h
+++ b/bfd/libcoff.h
@@ -78,16 +78,16 @@ typedef struct coff_tdata
   /* The unswapped external symbols.  May be NULL.  Read by
      _bfd_coff_get_external_symbols.  */
   PTR external_syms;
-  /* If this is true, the external_syms may not be freed.  */
-  boolean keep_syms;
+  /* If this is TRUE, the external_syms may not be freed.  */
+  bfd_boolean keep_syms;
 
   /* The string table.  May be NULL.  Read by
      _bfd_coff_read_string_table.  */
   char *strings;
-  /* If this is true, the strings may not be freed.  */
-  boolean keep_strings;
-  /* If this is true, the strings have been written out already.  */
-  boolean strings_written;
+  /* If this is TRUE, the strings may not be freed.  */
+  bfd_boolean keep_strings;
+  /* If this is TRUE, the strings have been written out already.  */
+  bfd_boolean strings_written;
 
   /* is this a PE format coff file */
   int pe;
@@ -121,10 +121,10 @@ typedef struct pe_tdata
   struct internal_extra_pe_aouthdr pe_opthdr;
   int dll;
   int has_reloc_section;
-  boolean (*in_reloc_p) PARAMS((bfd *, reloc_howto_type *));
+  bfd_boolean (*in_reloc_p) PARAMS((bfd *, reloc_howto_type *));
   flagword real_flags;
   int target_subsystem;
-  boolean force_minimum_alignment;
+  bfd_boolean force_minimum_alignment;
 } pe_data_type;
 
 #define pe_data(bfd)		((bfd)->tdata.pe_obj_data)
@@ -136,11 +136,11 @@ struct xcoff_tdata
   /* Basic COFF information.  */
   coff_data_type coff;
 
-  /* True if this is an XCOFF64 file. */
-  boolean xcoff64;
+  /* TRUE if this is an XCOFF64 file. */
+  bfd_boolean xcoff64;
 
-  /* True if a large a.out header should be generated.  */
-  boolean full_aouthdr;
+  /* TRUE if a large a.out header should be generated.  */
+  bfd_boolean full_aouthdr;
 
   /* TOC value.  */
   bfd_vma toc;
@@ -188,12 +188,12 @@ struct coff_section_tdata
 {
   /* The relocs, swapped into COFF internal form.  This may be NULL.  */
   struct internal_reloc *relocs;
-  /* If this is true, the relocs entry may not be freed.  */
-  boolean keep_relocs;
+  /* If this is TRUE, the relocs entry may not be freed.  */
+  bfd_boolean keep_relocs;
   /* The section contents.  This may be NULL.  */
   bfd_byte *contents;
-  /* If this is true, the contents entry may not be freed.  */
-  boolean keep_contents;
+  /* If this is TRUE, the contents entry may not be freed.  */
+  bfd_boolean keep_contents;
   /* Information cached by coff_find_nearest_line.  */
   bfd_vma offset;
   unsigned int i;
@@ -295,7 +295,7 @@ struct coff_link_hash_table
 #define coff_link_hash_traverse(table, func, info)			\
   (bfd_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the COFF linker hash table from a link_info structure.  */
@@ -315,23 +315,23 @@ extern int coff_count_linenumbers
   PARAMS ((bfd *));
 extern struct coff_symbol_struct *coff_symbol_from
   PARAMS ((bfd *, asymbol *));
-extern boolean coff_renumber_symbols
+extern bfd_boolean coff_renumber_symbols
   PARAMS ((bfd *, int *));
 extern void coff_mangle_symbols
   PARAMS ((bfd *));
-extern boolean coff_write_symbols
+extern bfd_boolean coff_write_symbols
   PARAMS ((bfd *));
-extern boolean coff_write_linenumbers
+extern bfd_boolean coff_write_linenumbers
   PARAMS ((bfd *));
 extern alent *coff_get_lineno
   PARAMS ((bfd *, asymbol *));
 extern asymbol *coff_section_symbol
   PARAMS ((bfd *, char *));
-extern boolean _bfd_coff_get_external_symbols
+extern bfd_boolean _bfd_coff_get_external_symbols
   PARAMS ((bfd *));
 extern const char *_bfd_coff_read_string_table
   PARAMS ((bfd *));
-extern boolean _bfd_coff_free_symbols
+extern bfd_boolean _bfd_coff_free_symbols
   PARAMS ((bfd *));
 extern struct coff_ptr_struct *coff_get_normalized_symtab
   PARAMS ((bfd *));
@@ -343,20 +343,20 @@ extern void coff_print_symbol
   PARAMS ((bfd *, PTR filep, asymbol *, bfd_print_symbol_type));
 extern void coff_get_symbol_info
   PARAMS ((bfd *, asymbol *, symbol_info *ret));
-extern boolean _bfd_coff_is_local_label_name
+extern bfd_boolean _bfd_coff_is_local_label_name
   PARAMS ((bfd *, const char *));
 extern asymbol *coff_bfd_make_debug_symbol
   PARAMS ((bfd *, PTR, unsigned long));
-extern boolean coff_find_nearest_line
+extern bfd_boolean coff_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
 	   const char **, unsigned int *));
 extern int coff_sizeof_headers
-  PARAMS ((bfd *, boolean));
-extern boolean bfd_coff_reloc16_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
+  PARAMS ((bfd *, bfd_boolean));
+extern bfd_boolean bfd_coff_reloc16_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
 extern bfd_byte *bfd_coff_reloc16_get_relocated_section_contents
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
+	   bfd_byte *, bfd_boolean, asymbol **));
 extern bfd_vma bfd_coff_reloc16_get_value
    PARAMS ((arelent *, struct bfd_link_info *, asection *));
 extern void bfd_perform_slip
@@ -458,11 +458,11 @@ struct coff_final_link_info
   /* Output BFD.  */
   bfd *output_bfd;
   /* Used to indicate failure in traversal routine.  */
-  boolean failed;
+  bfd_boolean failed;
   /* If doing "task linking" set only during the time when we want the
      global symbol writer to convert the storage class of defined global
      symbols from global to static. */
-  boolean global_to_static;
+  bfd_boolean global_to_static;
   /* Hash table for long symbol names.  */
   struct bfd_strtab_hash *strtab;
   /* When doing a relocateable link, an array of information kept for
@@ -536,7 +536,7 @@ struct coff_section_alignment_entry
 
 extern struct bfd_hash_entry *_bfd_coff_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern boolean _bfd_coff_link_hash_table_init
+extern bfd_boolean _bfd_coff_link_hash_table_init
   PARAMS ((struct coff_link_hash_table *, bfd *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
@@ -545,26 +545,26 @@ extern struct bfd_link_hash_table *_bfd_coff_link_hash_table_create
   PARAMS ((bfd *));
 extern const char *_bfd_coff_internal_syment_name
   PARAMS ((bfd *, const struct internal_syment *, char *));
-extern boolean _bfd_coff_link_add_symbols
+extern bfd_boolean _bfd_coff_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_coff_final_link
+extern bfd_boolean _bfd_coff_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 extern struct internal_reloc *_bfd_coff_read_internal_relocs
-  PARAMS ((bfd *, asection *, boolean, bfd_byte *, boolean,
+  PARAMS ((bfd *, asection *, bfd_boolean, bfd_byte *, bfd_boolean,
 	   struct internal_reloc *));
-extern boolean _bfd_coff_generic_relocate_section
+extern bfd_boolean _bfd_coff_generic_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 
 extern struct bfd_hash_entry *_bfd_coff_debug_merge_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern boolean _bfd_coff_write_global_sym
+extern bfd_boolean _bfd_coff_write_global_sym
   PARAMS ((struct coff_link_hash_entry *, PTR));
-extern boolean _bfd_coff_write_task_globals
+extern bfd_boolean _bfd_coff_write_task_globals
   PARAMS ((struct coff_link_hash_entry *, PTR));
-extern boolean _bfd_coff_link_input_bfd
+extern bfd_boolean _bfd_coff_link_input_bfd
   PARAMS ((struct coff_final_link_info *, bfd *));
-extern boolean _bfd_coff_reloc_link_order
+extern bfd_boolean _bfd_coff_reloc_link_order
   PARAMS ((bfd *, struct coff_final_link_info *, asection *,
 	   struct bfd_link_order *));
 
@@ -586,20 +586,20 @@ extern struct bfd_link_hash_table *_bfd_xcoff_bfd_link_hash_table_create
   PARAMS ((bfd *));
 extern void _bfd_xcoff_bfd_link_hash_table_free
   PARAMS ((struct bfd_link_hash_table *));
-extern boolean _bfd_xcoff_bfd_link_add_symbols
+extern bfd_boolean _bfd_xcoff_bfd_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_xcoff_bfd_final_link
+extern bfd_boolean _bfd_xcoff_bfd_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_ppc_xcoff_relocate_section
+extern bfd_boolean _bfd_ppc_xcoff_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 
 /* Functions in coff-ppc.c.  FIXME: These are called be pe.em in the
    linker, and so should start with bfd and be declared in bfd.h.  */
 
-extern boolean ppc_allocate_toc_section
+extern bfd_boolean ppc_allocate_toc_section
   PARAMS ((struct bfd_link_info *));
-extern boolean ppc_process_before_allocation
+extern bfd_boolean ppc_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Extracted from coffcode.h.  */
@@ -653,7 +653,7 @@ typedef struct coff_symbol_struct
   struct lineno_cache_entry *lineno;
 
   /* Have the line numbers been relocated yet ? */
-  boolean done_lineno;
+  bfd_boolean done_lineno;
 } coff_symbol_type;
 /* COFF symbol classifications.  */
 
@@ -711,10 +711,10 @@ typedef struct
   unsigned int _bfd_relsz;
   unsigned int _bfd_linesz;
   unsigned int _bfd_filnmlen;
-  boolean _bfd_coff_long_filenames;
-  boolean _bfd_coff_long_section_names;
+  bfd_boolean _bfd_coff_long_filenames;
+  bfd_boolean _bfd_coff_long_section_names;
   unsigned int _bfd_coff_default_section_alignment_power;
-  boolean _bfd_coff_force_symnames_in_strings;
+  bfd_boolean _bfd_coff_force_symnames_in_strings;
   unsigned int _bfd_coff_debug_string_prefix_length;
 
   void (*_bfd_coff_swap_filehdr_in)
@@ -729,32 +729,32 @@ typedef struct
   void (*_bfd_coff_swap_reloc_in)
     PARAMS ((bfd *abfd, PTR, PTR));
 
-  boolean (*_bfd_coff_bad_format_hook)
+  bfd_boolean (*_bfd_coff_bad_format_hook)
     PARAMS ((bfd *, PTR));
 
-  boolean (*_bfd_coff_set_arch_mach_hook)
+  bfd_boolean (*_bfd_coff_set_arch_mach_hook)
     PARAMS ((bfd *, PTR));
 
   PTR (*_bfd_coff_mkobject_hook)
     PARAMS ((bfd *, PTR, PTR));
 
-  boolean (*_bfd_styp_to_sec_flags_hook)
+  bfd_boolean (*_bfd_styp_to_sec_flags_hook)
     PARAMS ((bfd *, PTR, const char *, asection *, flagword *));
 
   void (*_bfd_set_alignment_hook)
     PARAMS ((bfd *, asection *, PTR));
 
-  boolean (*_bfd_coff_slurp_symbol_table)
+  bfd_boolean (*_bfd_coff_slurp_symbol_table)
     PARAMS ((bfd *));
 
-  boolean (*_bfd_coff_symname_in_debug)
+  bfd_boolean (*_bfd_coff_symname_in_debug)
     PARAMS ((bfd *, struct internal_syment *));
 
-  boolean (*_bfd_coff_pointerize_aux_hook)
+  bfd_boolean (*_bfd_coff_pointerize_aux_hook)
     PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
             unsigned int, combined_entry_type *));
 
-  boolean (*_bfd_coff_print_aux)
+  bfd_boolean (*_bfd_coff_print_aux)
     PARAMS ((bfd *, FILE *, combined_entry_type *, combined_entry_type *,
             combined_entry_type *, unsigned int));
 
@@ -769,13 +769,13 @@ typedef struct
   enum coff_symbol_classification (*_bfd_coff_classify_symbol)
     PARAMS ((bfd *, struct internal_syment *));
 
-  boolean (*_bfd_coff_compute_section_file_positions)
+  bfd_boolean (*_bfd_coff_compute_section_file_positions)
     PARAMS ((bfd *));
 
-  boolean (*_bfd_coff_start_final_link)
+  bfd_boolean (*_bfd_coff_start_final_link)
     PARAMS ((bfd *, struct bfd_link_info *));
 
-  boolean (*_bfd_coff_relocate_section)
+  bfd_boolean (*_bfd_coff_relocate_section)
     PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
             struct internal_reloc *, struct internal_syment *, asection **));
 
@@ -784,19 +784,19 @@ typedef struct
             struct coff_link_hash_entry *, struct internal_syment *,
             bfd_vma *));
 
-  boolean (*_bfd_coff_adjust_symndx)
+  bfd_boolean (*_bfd_coff_adjust_symndx)
     PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-            struct internal_reloc *, boolean *));
+            struct internal_reloc *, bfd_boolean *));
 
-  boolean (*_bfd_coff_link_add_one_symbol)
+  bfd_boolean (*_bfd_coff_link_add_one_symbol)
     PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
-            asection *, bfd_vma, const char *, boolean, boolean,
+            asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
             struct bfd_link_hash_entry **));
 
-  boolean (*_bfd_coff_link_output_has_begun)
+  bfd_boolean (*_bfd_coff_link_output_has_begun)
     PARAMS ((bfd *, struct coff_final_link_info *));
 
-  boolean (*_bfd_coff_final_link_postscript)
+  bfd_boolean (*_bfd_coff_final_link_postscript)
     PARAMS ((bfd *, struct coff_final_link_info *));
 
 } bfd_coff_backend_data;
diff --git a/bfd/libecoff.h b/bfd/libecoff.h
index eb90a8cddb9..7fa50698b1c 100644
--- a/bfd/libecoff.h
+++ b/bfd/libecoff.h
@@ -44,10 +44,10 @@ struct ecoff_backend_data
   /* The page boundary used to align sections in a demand-paged
      executable file.  E.g., 0x1000.  */
   bfd_vma round;
-  /* True if the .rdata section is part of the text segment, as on the
-     Alpha.  False if .rdata is part of the data segment, as on the
+  /* TRUE if the .rdata section is part of the text segment, as on the
+     Alpha.  FALSE if .rdata is part of the data segment, as on the
      MIPS.  */
-  boolean rdata_in_text;
+  bfd_boolean rdata_in_text;
   /* Bitsize of constructor entries.  */
   unsigned int constructor_bitsize;
   /* Reloc to use for constructor entries.  */
@@ -60,18 +60,18 @@ struct ecoff_backend_data
   void (*swap_reloc_in) PARAMS ((bfd *, PTR, struct internal_reloc *));
   void (*swap_reloc_out) PARAMS ((bfd *, const struct internal_reloc *, PTR));
   /* Backend reloc tweaking.  */
-  void (*adjust_reloc_in) PARAMS ((bfd *, const struct internal_reloc *,
-				   arelent *));
-  void (*adjust_reloc_out) PARAMS ((bfd *, const arelent *,
-				    struct internal_reloc *));
+  void (*adjust_reloc_in)
+    PARAMS ((bfd *, const struct internal_reloc *, arelent *));
+  void (*adjust_reloc_out)
+    PARAMS ((bfd *, const arelent *, struct internal_reloc *));
   /* Relocate section contents while linking.  */
-  boolean (*relocate_section) PARAMS ((bfd *output_bfd, struct bfd_link_info *,
-				       bfd *input_bfd, asection *input_section,
-				       bfd_byte *contents,
-				       PTR external_relocs));
+  bfd_boolean (*relocate_section)
+    PARAMS ((bfd *output_bfd, struct bfd_link_info *, bfd *input_bfd,
+	     asection *input_section, bfd_byte *contents,
+	     PTR external_relocs));
   /* Do final adjustments to filehdr and aouthdr.  */
-  boolean (*adjust_headers) PARAMS ((bfd *, struct internal_filehdr *,
-				     struct internal_aouthdr *));
+  bfd_boolean (*adjust_headers)
+    PARAMS ((bfd *, struct internal_filehdr *, struct internal_aouthdr *));
   /* Read an element from an archive at a given file position.  This
      is needed because OSF/1 3.2 uses a weird archive format.  */
   bfd *(*get_elt_at_filepos) PARAMS ((bfd *, file_ptr));
@@ -128,12 +128,12 @@ typedef struct ecoff_tdata
      linking.  */
   asection **symndx_to_section;
 
-  /* True if this BFD was written by the backend linker.  */
-  boolean linker;
+  /* TRUE if this BFD was written by the backend linker.  */
+  bfd_boolean linker;
 
-  /* True if a warning that multiple global pointer values are
+  /* TRUE if a warning that multiple global pointer values are
      needed in the output binary was issued already.  */
-  boolean issued_multiple_gp_warning;
+  bfd_boolean issued_multiple_gp_warning;
 
   /* Used by find_nearest_line entry point.  The structure could be
      included directly in this one, but there's no point to wasting
@@ -143,7 +143,7 @@ typedef struct ecoff_tdata
   /* Whether the .rdata section is in the text segment for this
      particular ECOFF file.  This is not valid until
      ecoff_compute_section_file_positions is called.  */
-  boolean rdata_in_text;
+  bfd_boolean rdata_in_text;
 
 } ecoff_data_type;
 
@@ -157,8 +157,8 @@ typedef struct ecoff_symbol_struct
   /* The fdr for this symbol.  */
   FDR *fdr;
 
-  /* true if this is a local symbol rather than an external one.  */
-  boolean local;
+  /* TRUE if this is a local symbol rather than an external one.  */
+  bfd_boolean local;
 
   /* A pointer to the unswapped hidden information for this symbol.
      This is either a struct sym_ext or a struct ext_ext, depending on
@@ -249,27 +249,28 @@ struct ecoff_link_hash_table
 };
 
 /* Make an ECOFF object.  */
-extern boolean _bfd_ecoff_mkobject PARAMS ((bfd *));
+extern bfd_boolean _bfd_ecoff_mkobject PARAMS ((bfd *));
 
 /* Read in the ECOFF symbolic debugging information.  */
-extern boolean _bfd_ecoff_slurp_symbolic_info
+extern bfd_boolean _bfd_ecoff_slurp_symbolic_info
   PARAMS ((bfd *, asection *, struct ecoff_debug_info *));
 
 /* Generic ECOFF BFD backend vectors.  */
 
-extern boolean _bfd_ecoff_write_object_contents PARAMS ((bfd *abfd));
+extern bfd_boolean _bfd_ecoff_write_object_contents PARAMS ((bfd *abfd));
 extern const bfd_target *_bfd_ecoff_archive_p PARAMS ((bfd *abfd));
 
 #define	_bfd_ecoff_close_and_cleanup _bfd_generic_close_and_cleanup
 #define _bfd_ecoff_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-extern boolean _bfd_ecoff_new_section_hook
+extern bfd_boolean _bfd_ecoff_new_section_hook
   PARAMS ((bfd *, asection *));
-extern boolean _bfd_ecoff_get_section_contents
+extern bfd_boolean _bfd_ecoff_get_section_contents
   PARAMS ((bfd *, asection *, PTR location, file_ptr, bfd_size_type));
 
 #define _bfd_ecoff_bfd_link_split_section _bfd_generic_link_split_section
 
-extern boolean _bfd_ecoff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
+extern bfd_boolean _bfd_ecoff_bfd_copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
 #define _bfd_ecoff_bfd_copy_private_section_data \
   _bfd_generic_bfd_copy_private_section_data
 
@@ -283,12 +284,12 @@ extern boolean _bfd_ecoff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
   _bfd_generic_bfd_merge_private_bfd_data
 
 #define _bfd_ecoff_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-extern boolean _bfd_ecoff_slurp_armap PARAMS ((bfd *abfd));
+extern bfd_boolean _bfd_ecoff_slurp_armap PARAMS ((bfd *abfd));
 #define _bfd_ecoff_slurp_extended_name_table _bfd_slurp_extended_name_table
 #define _bfd_ecoff_construct_extended_name_table \
   _bfd_archive_bsd_construct_extended_name_table
 #define _bfd_ecoff_truncate_arname bfd_dont_truncate_arname
-extern boolean _bfd_ecoff_write_armap
+extern bfd_boolean _bfd_ecoff_write_armap
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
 #define _bfd_ecoff_read_ar_hdr _bfd_generic_read_ar_hdr
 #define _bfd_ecoff_openr_next_archived_file \
@@ -304,10 +305,10 @@ extern void _bfd_ecoff_print_symbol
   PARAMS ((bfd *, PTR filep, asymbol *, bfd_print_symbol_type));
 extern void _bfd_ecoff_get_symbol_info
   PARAMS ((bfd *, asymbol *, symbol_info *));
-extern boolean _bfd_ecoff_bfd_is_local_label_name
+extern bfd_boolean _bfd_ecoff_bfd_is_local_label_name
   PARAMS ((bfd *, const char *));
 #define _bfd_ecoff_get_lineno _bfd_nosymbols_get_lineno
-extern boolean _bfd_ecoff_find_nearest_line
+extern bfd_boolean _bfd_ecoff_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma offset,
 	   const char **filename_ptr, const char **fnname_ptr,
 	   unsigned int *retline_ptr));
@@ -320,21 +321,21 @@ extern long _bfd_ecoff_canonicalize_reloc
   PARAMS ((bfd *, asection *, arelent **, asymbol **symbols));
 /* ecoff_bfd_reloc_type_lookup defined by backend. */
 
-extern boolean _bfd_ecoff_set_arch_mach
+extern bfd_boolean _bfd_ecoff_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-extern boolean _bfd_ecoff_set_section_contents
+extern bfd_boolean _bfd_ecoff_set_section_contents
   PARAMS ((bfd *, asection *, PTR location, file_ptr, bfd_size_type));
 
-extern int _bfd_ecoff_sizeof_headers PARAMS ((bfd *abfd, boolean reloc));
+extern int _bfd_ecoff_sizeof_headers PARAMS ((bfd *abfd, bfd_boolean reloc));
 /* ecoff_bfd_get_relocated_section_contents defined by backend.  */
 /* ecoff_bfd_relax_section defined by backend.  */
 extern struct bfd_link_hash_table *_bfd_ecoff_bfd_link_hash_table_create
   PARAMS ((bfd *));
 #define _bfd_ecoff_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
-extern boolean _bfd_ecoff_bfd_link_add_symbols
+extern bfd_boolean _bfd_ecoff_bfd_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
 #define _bfd_ecoff_bfd_link_just_syms _bfd_generic_link_just_syms
-extern boolean _bfd_ecoff_bfd_final_link
+extern bfd_boolean _bfd_ecoff_bfd_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Hook functions for the generic COFF section reading code.  */
@@ -342,10 +343,11 @@ extern boolean _bfd_ecoff_bfd_final_link
 extern PTR _bfd_ecoff_mkobject_hook PARAMS ((bfd *, PTR filehdr, PTR aouthdr));
 #define _bfd_ecoff_set_alignment_hook \
   ((void (*) PARAMS ((bfd *, asection *, PTR))) bfd_void)
-extern boolean _bfd_ecoff_set_arch_mach_hook PARAMS ((bfd *abfd, PTR filehdr));
-extern boolean _bfd_ecoff_styp_to_sec_flags
+extern bfd_boolean _bfd_ecoff_set_arch_mach_hook
+  PARAMS ((bfd *abfd, PTR filehdr));
+extern bfd_boolean _bfd_ecoff_styp_to_sec_flags
   PARAMS ((bfd *, PTR, const char *, asection *, flagword *));
-extern boolean _bfd_ecoff_slurp_symbol_table PARAMS ((bfd *abfd));
+extern bfd_boolean _bfd_ecoff_slurp_symbol_table PARAMS ((bfd *abfd));
 
 /* ECOFF auxiliary information swapping routines.  These are the same
    for all ECOFF targets, so they are defined in ecofflink.c.  */
diff --git a/bfd/libieee.h b/bfd/libieee.h
index c48566c97f7..56c7ce1a20c 100644
--- a/bfd/libieee.h
+++ b/bfd/libieee.h
@@ -1,5 +1,5 @@
 /* IEEE-695 object file formats:  definitions internal to BFD.
-   Copyright 1990, 1991, 1992, 1994, 1996, 2001
+   Copyright 1990, 1991, 1992, 1994, 1996, 2001, 2002
    Free Software Foundation, Inc.
    Written by Cygnus Support.  Mostly Steve Chamberlain's fault.
 
@@ -56,7 +56,7 @@ typedef struct ieee_per_section
   /* For output */
   file_ptr current_pos;
   unsigned int current_byte;
-  boolean initialized;
+  bfd_boolean initialized;
   ieee_reloc_type **reloc_tail_ptr;
 } ieee_per_section_type;
 
@@ -72,8 +72,8 @@ typedef struct {
 typedef struct ieee_data_struct
 {
   common_header_type h;
-  boolean read_symbols;
-  boolean read_data;
+  bfd_boolean read_symbols;
+  bfd_boolean read_data;
   file_ptr output_cursor;
   /* Map of section indexes to section ptrs */
   asection **section_table;
@@ -103,10 +103,10 @@ typedef struct ieee_data_struct
   int external_reference_base_offset;
 
 
-  boolean symbol_table_full;
+  bfd_boolean symbol_table_full;
 
 
-boolean done_debug;
+bfd_boolean done_debug;
 
 
 bfd_chain_type *chain_head;
diff --git a/bfd/libnlm.h b/bfd/libnlm.h
index 4773d555ffc..314a21fe61b 100644
--- a/bfd/libnlm.h
+++ b/bfd/libnlm.h
@@ -1,5 +1,5 @@
 /* BFD back-end data structures for NLM (NetWare Loadable Modules) files.
-   Copyright 1993, 1994, 2001 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 2001, 2002 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -52,32 +52,33 @@ typedef struct
   struct nlm_relent *relocs;
 } nlmNAME(symbol_type);
 
-extern boolean nlm_mkobject PARAMS ((bfd *));
-extern boolean nlm_set_arch_mach PARAMS ((bfd *, enum bfd_architecture,
-					  unsigned long));
+extern bfd_boolean nlm_mkobject
+  PARAMS ((bfd *));
+extern bfd_boolean nlm_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
 
 extern void nlmNAME(get_symbol_info)
-     PARAMS ((bfd *, asymbol *, symbol_info *));
+  PARAMS ((bfd *, asymbol *, symbol_info *));
 extern long nlmNAME(get_symtab_upper_bound)
-     PARAMS ((bfd *));
+  PARAMS ((bfd *));
 extern long nlmNAME(get_symtab)
-     PARAMS ((bfd *, asymbol **));
+  PARAMS ((bfd *, asymbol **));
 extern asymbol *nlmNAME(make_empty_symbol)
-     PARAMS ((bfd *));
+  PARAMS ((bfd *));
 extern void nlmNAME(print_symbol)
-     PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
+  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
 extern long nlmNAME(get_reloc_upper_bound)
-     PARAMS ((bfd *, asection *));
+  PARAMS ((bfd *, asection *));
 extern long nlmNAME(canonicalize_reloc)
-     PARAMS ((bfd *, asection *, arelent **, asymbol **));
+  PARAMS ((bfd *, asection *, arelent **, asymbol **));
 extern const bfd_target *nlmNAME(object_p)
-     PARAMS ((bfd *));
-extern boolean nlmNAME(set_arch_mach)
-     PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-extern boolean nlmNAME(set_section_contents)
-     PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-extern boolean nlmNAME(write_object_contents)
-     PARAMS ((bfd *));
+  PARAMS ((bfd *));
+extern bfd_boolean nlmNAME(set_arch_mach)
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+extern bfd_boolean nlmNAME(set_section_contents)
+  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
+extern bfd_boolean nlmNAME(write_object_contents)
+  PARAMS ((bfd *));
 
 /* Some private data is stashed away for future use using the tdata pointer
    in the bfd structure.  */
@@ -165,16 +166,16 @@ struct nlm_backend_data
   /* Some NLM formats do not use the uninitialized data section, so
      all uninitialized data must be put into the regular data section
      instead.  */
-  boolean no_uninitialized_data;
+  bfd_boolean no_uninitialized_data;
   /* Some NLM formats have a prefix on the file.  If this function is
      not NULL, it will be called by nlm_object_p.  It should return
-     true if this file could match this format, and it should leave
+     TRUE if this file could match this format, and it should leave
      the BFD such that a bfd_bread will pick up the fixed header.  */
-  boolean (*nlm_backend_object_p) PARAMS ((bfd *));
+  bfd_boolean (*nlm_backend_object_p) PARAMS ((bfd *));
   /* Write out the prefix.  This function may be NULL.  This must
      write out the same number of bytes as is in the field
      optional_prefix_size.  */
-  boolean (*nlm_write_prefix) PARAMS ((bfd *));
+  bfd_boolean (*nlm_write_prefix) PARAMS ((bfd *));
   /* Read a relocation fixup from abfd.  The reloc information is
      machine specific.  The second argument is the symbol if this is
      an import, or NULL if this is a reloc fixup.  This function
@@ -182,36 +183,33 @@ struct nlm_backend_data
      belongs in, and the fourth argument to the reloc itself; it does
      not need to fill in the sym_ptr_ptr field for a reloc against an
      import symbol.  */
-  boolean (*nlm_read_reloc) PARAMS ((bfd *, nlmNAME(symbol_type) *,
-				     asection **, arelent *));
+  bfd_boolean (*nlm_read_reloc)
+    PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
   /* To make objcopy to an i386 NLM work, the i386 backend needs a
      chance to work over the relocs.  This is a bit icky.  */
-  boolean (*nlm_mangle_relocs) PARAMS ((bfd *, asection *, PTR data,
-					bfd_vma offset,
-					bfd_size_type count));
+  bfd_boolean (*nlm_mangle_relocs)
+    PARAMS ((bfd *, asection *, PTR data, bfd_vma offset, bfd_size_type count));
   /* Read an import record from abfd.  It would be nice if this
      were in a machine-dependent format, but it doesn't seem to be. */
-  boolean (*nlm_read_import) PARAMS ((bfd *, nlmNAME(symbol_type) *));
+  bfd_boolean (*nlm_read_import) PARAMS ((bfd *, nlmNAME(symbol_type) *));
   /* Write an import record to abfd. */
-  boolean (*nlm_write_import) PARAMS ((bfd *, asection *, arelent *));
+  bfd_boolean (*nlm_write_import) PARAMS ((bfd *, asection *, arelent *));
   /* Set the section for a public symbol.  This may be NULL, in which
      case a default method will be used.  */
-  boolean (*nlm_set_public_section) PARAMS ((bfd *, nlmNAME(symbol_type) *));
+  bfd_boolean (*nlm_set_public_section)
+    PARAMS ((bfd *, nlmNAME(symbol_type) *));
   /* Get the offset to write out for a public symbol.  This may be
      NULL, in which case a default method will be used.  */
   bfd_vma (*nlm_get_public_offset) PARAMS ((bfd *, asymbol *));
   /* Swap the fixed header in and out */
-  void (*nlm_swap_fhdr_in) PARAMS ((bfd *,
-				    PTR,
-				    Nlm_Internal_Fixed_Header *));
-  void (*nlm_swap_fhdr_out) PARAMS ((bfd *,
-				     struct nlm_internal_fixed_header *,
-				     PTR));
+  void (*nlm_swap_fhdr_in)
+    PARAMS ((bfd *, PTR, Nlm_Internal_Fixed_Header *));
+  void (*nlm_swap_fhdr_out)
+    PARAMS ((bfd *, struct nlm_internal_fixed_header *, PTR));
   /* Write out an external reference.  */
-  boolean (*nlm_write_external) PARAMS ((bfd *, bfd_size_type,
-					 asymbol *,
-					 struct reloc_and_sec *));
-  boolean (*nlm_write_export) PARAMS ((bfd *, asymbol *, bfd_vma));
+  bfd_boolean (*nlm_write_external)
+    PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
+  bfd_boolean (*nlm_write_export) PARAMS ((bfd *, asymbol *, bfd_vma));
 };
 
 #define nlm_backend(bfd) \
diff --git a/bfd/liboasys.h b/bfd/liboasys.h
index 37c94c9d0d2..a91356b3778 100644
--- a/bfd/liboasys.h
+++ b/bfd/liboasys.h
@@ -1,5 +1,5 @@
 /* BFD internal declarations for Oasys file format handling.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1997
+   Copyright 1990, 1991, 1992, 1993, 1994, 1997, 2002
    Free Software Foundation, Inc.
    Scrawled by Steve Chamberlain of Cygnus Support.
 
@@ -39,14 +39,14 @@ typedef struct _oasys_per_section
   asection *section;
   bfd_byte *data;
   bfd_vma offset;
-  boolean had_vma;
+  bfd_boolean had_vma;
   oasys_reloc_type **reloc_tail_ptr;
   bfd_vma pc;
 
 
   file_ptr current_pos;
   unsigned int current_byte;
-  boolean initialized;
+  bfd_boolean initialized;
 } oasys_per_section_type;
 
 #define NSECTIONS 10
diff --git a/bfd/libpei.h b/bfd/libpei.h
index 6b232b48a71..7a5f9fe2394 100644
--- a/bfd/libpei.h
+++ b/bfd/libpei.h
@@ -1,5 +1,5 @@
 /* Support for the generic parts of PE/PEI; common header information.
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Written by Cygnus Solutions.
 
@@ -313,13 +313,13 @@ unsigned int _bfd_XXi_swap_aouthdr_out PARAMS ((bfd *, PTR, PTR));
 unsigned int _bfd_XXi_swap_scnhdr_out PARAMS ((bfd *, PTR, PTR));
 #define coff_swap_scnhdr_out _bfd_XXi_swap_scnhdr_out
 
-boolean _bfd_XX_print_private_bfd_data_common PARAMS ((bfd *, PTR));
+bfd_boolean _bfd_XX_print_private_bfd_data_common PARAMS ((bfd *, PTR));
 
-boolean _bfd_XX_bfd_copy_private_bfd_data_common PARAMS ((bfd *, bfd *));
+bfd_boolean _bfd_XX_bfd_copy_private_bfd_data_common PARAMS ((bfd *, bfd *));
 
 void _bfd_XX_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
 
-boolean _bfd_XXi_final_link_postscript
+bfd_boolean _bfd_XXi_final_link_postscript
   PARAMS ((bfd *, struct coff_final_link_info *));
 
 #ifndef coff_final_link_postscript
@@ -331,5 +331,5 @@ boolean _bfd_XXi_final_link_postscript
 
 unsigned int _bfd_XX_only_swap_filehdr_out PARAMS ((bfd*, PTR, PTR));
 unsigned int _bfd_XXi_only_swap_filehdr_out PARAMS ((bfd*, PTR, PTR));
-boolean _bfd_XX_bfd_copy_private_section_data
+bfd_boolean _bfd_XX_bfd_copy_private_section_data
   PARAMS ((bfd *, asection *, bfd *, asection *));
diff --git a/bfd/libxcoff.h b/bfd/libxcoff.h
index 819b51fa150..8537617fcf1 100644
--- a/bfd/libxcoff.h
+++ b/bfd/libxcoff.h
@@ -1,5 +1,5 @@
 /* BFD XCOFF object file private structure.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
    Written by Tom Rix, Redhat.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -68,11 +68,11 @@ struct xcoff_backend_data_rec
      2 : XCOFF64.  */
   unsigned long _xcoff_ldhdr_version;
 
-  boolean (* _xcoff_put_symbol_name)
+  bfd_boolean (* _xcoff_put_symbol_name)
     PARAMS ((bfd *, struct bfd_strtab_hash *, struct internal_syment *,
 	     const char *));
 
-  boolean (* _xcoff_put_ldsymbol_name)
+  bfd_boolean (* _xcoff_put_ldsymbol_name)
     PARAMS ((bfd *, struct xcoff_loader_info *, struct internal_ldsym *,
 	     const char *));
 
@@ -84,9 +84,9 @@ struct xcoff_backend_data_rec
   /* Line number and relocation overflow.
      XCOFF32 overflows to another section when the line number or the 
      relocation count exceeds 0xffff.  XCOFF64 does not overflow.  */
-  boolean (*_xcoff_is_lineno_count_overflow)
+  bfd_boolean (*_xcoff_is_lineno_count_overflow)
     PARAMS ((bfd *, bfd_vma));
-  boolean (*_xcoff_is_reloc_count_overflow)
+  bfd_boolean (*_xcoff_is_reloc_count_overflow)
     PARAMS ((bfd *, bfd_vma));
 
   /* Loader section symbol and relocation table offset
@@ -106,8 +106,8 @@ struct xcoff_backend_data_rec
 
   /* rtinit.  */
   unsigned int _xcoff_rtinit_size;
-  boolean (*_xcoff_generate_rtinit)
-    PARAMS ((bfd *, const char *, const char *, boolean));
+  bfd_boolean (*_xcoff_generate_rtinit)
+    PARAMS ((bfd *, const char *, const char *, bfd_boolean));
 };
 
 /* Look up an entry in an XCOFF link hash table.  */
@@ -120,7 +120,7 @@ struct xcoff_backend_data_rec
 #define xcoff_link_hash_traverse(table, func, info)			\
   (bfd_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
     (info)))
 
 /* Get the XCOFF link hash table from the info structure.  This is
@@ -227,19 +227,19 @@ struct xcoff_backend_data_rec
 #define XCOFF_COMPLAIN_FUNCTION_ARGS \
   bfd *, bfd_vma, bfd_vma, struct reloc_howto_struct *howto
 
-extern boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
+extern bfd_boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
   PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
-extern boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW])
+extern bfd_boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW])
   PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS));
 
 /* Relocation functions */
-boolean xcoff_reloc_type_noop PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
-boolean xcoff_reloc_type_fail PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
-boolean xcoff_reloc_type_pos PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
-boolean xcoff_reloc_type_neg PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
-boolean xcoff_reloc_type_rel PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
-boolean xcoff_reloc_type_toc PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
-boolean xcoff_reloc_type_ba PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
-boolean xcoff_reloc_type_crel PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+bfd_boolean xcoff_reloc_type_noop PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+bfd_boolean xcoff_reloc_type_fail PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+bfd_boolean xcoff_reloc_type_pos PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+bfd_boolean xcoff_reloc_type_neg PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+bfd_boolean xcoff_reloc_type_rel PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+bfd_boolean xcoff_reloc_type_toc PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+bfd_boolean xcoff_reloc_type_ba PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
+bfd_boolean xcoff_reloc_type_crel PARAMS ((XCOFF_RELOC_FUNCTION_ARGS));
 
 #endif /* LIBXCOFF_H */
diff --git a/bfd/linker.c b/bfd/linker.c
index a5ded1f5883..7c097dc72fd 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -200,7 +200,7 @@ SUBSUBSECTION
 	read the symbol information, the <<_bfd_link_add_symbols>>
 	routine should save it somewhere attached to the object file
 	BFD.  However, the information should only be saved if the
-	<<keep_memory>> field of the <<info>> argument is true, so
+	<<keep_memory>> field of the <<info>> argument is TRUE, so
 	that the <<-no-keep-memory>> linker switch is effective.
 
 	The a.out function which adds symbols from an object file is
@@ -406,32 +406,34 @@ SUBSUBSECTION
 	file at the end of <<NAME(aout,final_link)>>.
 */
 
-static boolean generic_link_read_symbols
+static bfd_boolean generic_link_read_symbols
   PARAMS ((bfd *));
-static boolean generic_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean collect));
-static boolean generic_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean collect));
-static boolean generic_link_check_archive_element_no_collect
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean generic_link_check_archive_element_collect
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean generic_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded, boolean collect));
-static boolean generic_link_add_symbol_list
+static bfd_boolean generic_link_add_symbols
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean collect));
+static bfd_boolean generic_link_add_object_symbols
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean collect));
+static bfd_boolean generic_link_check_archive_element_no_collect
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded));
+static bfd_boolean generic_link_check_archive_element_collect
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded));
+static bfd_boolean generic_link_check_archive_element
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded,
+	   bfd_boolean collect));
+static bfd_boolean generic_link_add_symbol_list
   PARAMS ((bfd *, struct bfd_link_info *, bfd_size_type count, asymbol **,
-	   boolean collect));
-static bfd *hash_entry_bfd PARAMS ((struct bfd_link_hash_entry *));
+	   bfd_boolean collect));
+static bfd *hash_entry_bfd
+  PARAMS ((struct bfd_link_hash_entry *));
 static void set_symbol_from_hash
   PARAMS ((asymbol *, struct bfd_link_hash_entry *));
-static boolean generic_add_output_symbol
+static bfd_boolean generic_add_output_symbol
   PARAMS ((bfd *, size_t *psymalloc, asymbol *));
-static boolean default_data_link_order
+static bfd_boolean default_data_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   struct bfd_link_order *));
-static boolean default_indirect_link_order
+static bfd_boolean default_indirect_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *, boolean));
+	   struct bfd_link_order *, bfd_boolean));
 
 /* The link hash table structure is defined in bfdlink.h.  It provides
    a base hash table which the backend specific hash tables are built
@@ -472,7 +474,7 @@ _bfd_link_hash_newfunc (entry, table, string)
 /* Initialize a link hash table.  The BFD argument is the one
    responsible for creating this table.  */
 
-boolean
+bfd_boolean
 _bfd_link_hash_table_init (table, abfd, newfunc)
      struct bfd_link_hash_table *table;
      bfd *abfd;
@@ -488,7 +490,7 @@ _bfd_link_hash_table_init (table, abfd, newfunc)
   return bfd_hash_table_init (&table->table, newfunc);
 }
 
-/* Look up a symbol in a link hash table.  If follow is true, we
+/* Look up a symbol in a link hash table.  If follow is TRUE, we
    follow bfd_link_hash_indirect and bfd_link_hash_warning links to
    the real symbol.  */
 
@@ -496,9 +498,9 @@ struct bfd_link_hash_entry *
 bfd_link_hash_lookup (table, string, create, copy, follow)
      struct bfd_link_hash_table *table;
      const char *string;
-     boolean create;
-     boolean copy;
-     boolean follow;
+     bfd_boolean create;
+     bfd_boolean copy;
+     bfd_boolean follow;
 {
   struct bfd_link_hash_entry *ret;
 
@@ -524,9 +526,9 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
      bfd *abfd;
      struct bfd_link_info *info;
      const char *string;
-     boolean create;
-     boolean copy;
-     boolean follow;
+     bfd_boolean create;
+     bfd_boolean copy;
+     bfd_boolean follow;
 {
   bfd_size_type amt;
 
@@ -541,7 +543,7 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
 #undef WRAP
 #define WRAP "__wrap_"
 
-      if (bfd_hash_lookup (info->wrap_hash, l, false, false) != NULL)
+      if (bfd_hash_lookup (info->wrap_hash, l, FALSE, FALSE) != NULL)
 	{
 	  char *n;
 	  struct bfd_link_hash_entry *h;
@@ -559,7 +561,7 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
 	  n[1] = '\0';
 	  strcat (n, WRAP);
 	  strcat (n, l);
-	  h = bfd_link_hash_lookup (info->hash, n, create, true, follow);
+	  h = bfd_link_hash_lookup (info->hash, n, create, TRUE, follow);
 	  free (n);
 	  return h;
 	}
@@ -572,7 +574,7 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
       if (*l == '_'
 	  && strncmp (l, REAL, sizeof REAL - 1) == 0
 	  && bfd_hash_lookup (info->wrap_hash, l + sizeof REAL - 1,
-			      false, false) != NULL)
+			      FALSE, FALSE) != NULL)
 	{
 	  char *n;
 	  struct bfd_link_hash_entry *h;
@@ -590,7 +592,7 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
 	  n[0] = bfd_get_symbol_leading_char (abfd);
 	  n[1] = '\0';
 	  strcat (n, l + sizeof REAL - 1);
-	  h = bfd_link_hash_lookup (info->hash, n, create, true, follow);
+	  h = bfd_link_hash_lookup (info->hash, n, create, TRUE, follow);
 	  free (n);
 	  return h;
 	}
@@ -610,11 +612,11 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
 void
 bfd_link_hash_traverse (table, func, info)
      struct bfd_link_hash_table *table;
-     boolean (*func) PARAMS ((struct bfd_link_hash_entry *, PTR));
+     bfd_boolean (*func) PARAMS ((struct bfd_link_hash_entry *, PTR));
      PTR info;
 {
   bfd_hash_traverse (&table->table,
-		     ((boolean (*) PARAMS ((struct bfd_hash_entry *, PTR)))
+		     ((bfd_boolean (*) PARAMS ((struct bfd_hash_entry *, PTR)))
 		      func),
 		     info);
 }
@@ -660,7 +662,7 @@ _bfd_generic_link_hash_newfunc (entry, table, string)
 
       /* Set local fields.  */
       ret = (struct generic_link_hash_entry *) entry;
-      ret->written = false;
+      ret->written = FALSE;
       ret->sym = NULL;
     }
 
@@ -706,7 +708,7 @@ _bfd_generic_link_hash_table_free (hash)
    the hash table pointing to different instances of the symbol
    structure.  */
 
-static boolean
+static bfd_boolean
 generic_link_read_symbols (abfd)
      bfd *abfd;
 {
@@ -717,30 +719,30 @@ generic_link_read_symbols (abfd)
 
       symsize = bfd_get_symtab_upper_bound (abfd);
       if (symsize < 0)
-	return false;
+	return FALSE;
       bfd_get_outsymbols (abfd) =
 	(asymbol **) bfd_alloc (abfd, (bfd_size_type) symsize);
       if (bfd_get_outsymbols (abfd) == NULL && symsize != 0)
-	return false;
+	return FALSE;
       symcount = bfd_canonicalize_symtab (abfd, bfd_get_outsymbols (abfd));
       if (symcount < 0)
-	return false;
+	return FALSE;
       bfd_get_symcount (abfd) = symcount;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Generic function to add symbols to from an object file to the
    global hash table.  This version does not automatically collect
    constructors by name.  */
 
-boolean
+bfd_boolean
 _bfd_generic_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
-  return generic_link_add_symbols (abfd, info, false);
+  return generic_link_add_symbols (abfd, info, FALSE);
 }
 
 /* Generic function to add symbols from an object file to the global
@@ -750,12 +752,12 @@ _bfd_generic_link_add_symbols (abfd, info)
    constructors and destructors; these are approximately those targets
    for which gcc uses collect2 and do not support stabs.  */
 
-boolean
+bfd_boolean
 _bfd_generic_link_add_symbols_collect (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
-  return generic_link_add_symbols (abfd, info, true);
+  return generic_link_add_symbols (abfd, info, TRUE);
 }
 
 /* Indicate that we are only retrieving symbol values from this
@@ -773,13 +775,13 @@ _bfd_generic_link_just_syms (sec, info)
 
 /* Add symbols from an object file to the global hash table.  */
 
-static boolean
+static bfd_boolean
 generic_link_add_symbols (abfd, info, collect)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean collect;
+     bfd_boolean collect;
 {
-  boolean ret;
+  bfd_boolean ret;
 
   switch (bfd_get_format (abfd))
     {
@@ -795,7 +797,7 @@ generic_link_add_symbols (abfd, info, collect)
       break;
     default:
       bfd_set_error (bfd_error_wrong_format);
-      ret = false;
+      ret = FALSE;
     }
 
   return ret;
@@ -803,17 +805,17 @@ generic_link_add_symbols (abfd, info, collect)
 
 /* Add symbols from an object file to the global hash table.  */
 
-static boolean
+static bfd_boolean
 generic_link_add_object_symbols (abfd, info, collect)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean collect;
+     bfd_boolean collect;
 {
   bfd_size_type symcount;
   struct symbol_cache_entry **outsyms;
 
   if (! generic_link_read_symbols (abfd))
-    return false;
+    return FALSE;
   symcount = _bfd_generic_link_get_symcount (abfd);
   outsyms = _bfd_generic_link_get_symbols (abfd);
   return generic_link_add_symbol_list (abfd, info, symcount, outsyms, collect);
@@ -848,7 +850,7 @@ struct archive_hash_table
 
 static struct bfd_hash_entry *archive_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean archive_hash_table_init
+static bfd_boolean archive_hash_table_init
   PARAMS ((struct archive_hash_table *,
 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
 				       struct bfd_hash_table *,
@@ -887,7 +889,7 @@ archive_hash_newfunc (entry, table, string)
 
 /* Initialize an archive hash table.  */
 
-static boolean
+static bfd_boolean
 archive_hash_table_init (table, newfunc)
      struct archive_hash_table *table;
      struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
@@ -927,10 +929,10 @@ archive_hash_table_init (table, newfunc)
    re-search the symbol table each time a new object file was added.
 
    The CHECKFN argument is used to see if an object file should be
-   included.  CHECKFN should set *PNEEDED to true if the object file
+   included.  CHECKFN should set *PNEEDED to TRUE if the object file
    should be included, and must also call the bfd_link_info
    add_archive_element callback function and handle adding the symbols
-   to the global hash table.  CHECKFN should only return false if some
+   to the global hash table.  CHECKFN should only return FALSE if some
    sort of error occurs.
 
    For some formats, such as a.out, it is possible to look through an
@@ -944,12 +946,12 @@ archive_hash_table_init (table, newfunc)
    may create new undefined symbols which cause a previously examined
    object file to be included.  */
 
-boolean
+bfd_boolean
 _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean (*checkfn) PARAMS ((bfd *, struct bfd_link_info *,
-				 boolean *pneeded));
+     bfd_boolean (*checkfn)
+       PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded));
 {
   carsym *arsyms;
   carsym *arsym_end;
@@ -963,9 +965,9 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
     {
       /* An empty archive is a special case.  */
       if (bfd_openr_next_archived_file (abfd, (bfd *) NULL) == NULL)
-	return true;
+	return TRUE;
       bfd_set_error (bfd_error_no_armap);
-      return false;
+      return FALSE;
     }
 
   arsyms = bfd_ardata (abfd)->symdefs;
@@ -974,13 +976,13 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
   /* In order to quickly determine whether an symbol is defined in
      this archive, we build a hash table of the symbols.  */
   if (! archive_hash_table_init (&arsym_hash, archive_hash_newfunc))
-    return false;
+    return FALSE;
   for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++)
     {
       struct archive_hash_entry *arh;
       struct archive_list *l, **pp;
 
-      arh = archive_hash_lookup (&arsym_hash, arsym->name, true, false);
+      arh = archive_hash_lookup (&arsym_hash, arsym->name, TRUE, FALSE);
       if (arh == (struct archive_hash_entry *) NULL)
 	goto error_return;
       l = ((struct archive_list *)
@@ -1032,7 +1034,7 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
 	}
 
       /* Look for this symbol in the archive symbol map.  */
-      arh = archive_hash_lookup (&arsym_hash, h->root.string, false, false);
+      arh = archive_hash_lookup (&arsym_hash, h->root.string, FALSE, FALSE);
       if (arh == (struct archive_hash_entry *) NULL)
 	{
 	  /* If we haven't found the exact symbol we're looking for,
@@ -1042,10 +1044,10 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
 	      bfd_size_type amt = strlen (h->root.string) + 10;
 	      char *buf = (char *) bfd_malloc (amt);
 	      if (buf == NULL)
-		return false;
+		return FALSE;
 
 	      sprintf (buf, "__imp_%s", h->root.string);
-	      arh = archive_hash_lookup (&arsym_hash, buf, false, false);
+	      arh = archive_hash_lookup (&arsym_hash, buf, FALSE, FALSE);
 	      free(buf);
 	    }
 	  if (arh == (struct archive_hash_entry *) NULL)
@@ -1058,7 +1060,7 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
       for (l = arh->defs; l != (struct archive_list *) NULL; l = l->next)
 	{
 	  bfd *element;
-	  boolean needed;
+	  bfd_boolean needed;
 
 	  /* If the symbol has gotten defined along the way, quit.  */
 	  if (h->type != bfd_link_hash_undefined
@@ -1107,11 +1109,11 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
   /* Save PASS in case we are called again.  */
   abfd->archive_pass = pass;
 
-  return true;
+  return TRUE;
 
  error_return:
   archive_hash_table_free (&arsym_hash);
-  return false;
+  return FALSE;
 }
 
 /* See if we should include an archive element.  This version is used
@@ -1119,44 +1121,44 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
    the symbol name, presumably because we have some other mechanism
    for finding them.  */
 
-static boolean
+static bfd_boolean
 generic_link_check_archive_element_no_collect (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
-  return generic_link_check_archive_element (abfd, info, pneeded, false);
+  return generic_link_check_archive_element (abfd, info, pneeded, FALSE);
 }
 
 /* See if we should include an archive element.  This version is used
    when we want to automatically collect constructors based on the
    symbol name, as collect2 does.  */
 
-static boolean
+static bfd_boolean
 generic_link_check_archive_element_collect (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
-  return generic_link_check_archive_element (abfd, info, pneeded, true);
+  return generic_link_check_archive_element (abfd, info, pneeded, TRUE);
 }
 
 /* See if we should include an archive element.  Optionally collect
    constructors.  */
 
-static boolean
+static bfd_boolean
 generic_link_check_archive_element (abfd, info, pneeded, collect)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
-     boolean collect;
+     bfd_boolean *pneeded;
+     bfd_boolean collect;
 {
   asymbol **pp, **ppend;
 
-  *pneeded = false;
+  *pneeded = FALSE;
 
   if (! generic_link_read_symbols (abfd))
-    return false;
+    return FALSE;
 
   pp = _bfd_generic_link_get_symbols (abfd);
   ppend = pp + _bfd_generic_link_get_symcount (abfd);
@@ -1177,8 +1179,8 @@ generic_link_check_archive_element (abfd, info, pneeded, collect)
 	 symbol (type bfd_link_hash_undefweak) is not considered to be
 	 a reference when pulling files out of an archive.  See the
 	 SVR4 ABI, p. 4-27.  */
-      h = bfd_link_hash_lookup (info->hash, bfd_asymbol_name (p), false,
-				false, true);
+      h = bfd_link_hash_lookup (info->hash, bfd_asymbol_name (p), FALSE,
+				FALSE, TRUE);
       if (h == (struct bfd_link_hash_entry *) NULL
 	  || (h->type != bfd_link_hash_undefined
 	      && h->type != bfd_link_hash_common))
@@ -1194,14 +1196,14 @@ generic_link_check_archive_element (abfd, info, pneeded, collect)
 	  /* This object file defines this symbol, so pull it in.  */
 	  if (! (*info->callbacks->add_archive_element) (info, abfd,
 							 bfd_asymbol_name (p)))
-	    return false;
+	    return FALSE;
 	  symcount = _bfd_generic_link_get_symcount (abfd);
 	  symbols = _bfd_generic_link_get_symbols (abfd);
 	  if (! generic_link_add_symbol_list (abfd, info, symcount,
 					      symbols, collect))
-	    return false;
-	  *pneeded = true;
-	  return true;
+	    return FALSE;
+	  *pneeded = TRUE;
+	  return TRUE;
 	}
 
       /* P is a common symbol.  */
@@ -1220,9 +1222,9 @@ generic_link_check_archive_element (abfd, info, pneeded, collect)
 		 file.  This is for the -u option in the linker.  */
 	      if (! (*info->callbacks->add_archive_element)
 		  (info, abfd, bfd_asymbol_name (p)))
-		return false;
-	      *pneeded = true;
-	      return true;
+		return FALSE;
+	      *pneeded = TRUE;
+	      return TRUE;
 	    }
 
 	  /* Turn the symbol into a common symbol but do not link in
@@ -1238,7 +1240,7 @@ generic_link_check_archive_element (abfd, info, pneeded, collect)
 	     bfd_hash_allocate (&info->hash->table,
 				sizeof (struct bfd_link_hash_common_entry)));
 	  if (h->u.c.p == NULL)
-	    return false;
+	    return FALSE;
 
 	  size = bfd_asymbol_value (p);
 	  h->u.c.size = size;
@@ -1267,22 +1269,22 @@ generic_link_check_archive_element (abfd, info, pneeded, collect)
     }
 
   /* This archive element is not needed.  */
-  return true;
+  return TRUE;
 }
 
 /* Add the symbols from an object file to the global hash table.  ABFD
    is the object file.  INFO is the linker information.  SYMBOL_COUNT
    is the number of symbols.  SYMBOLS is the list of symbols.  COLLECT
-   is true if constructors should be automatically collected by name
+   is TRUE if constructors should be automatically collected by name
    as is done by collect2.  */
 
-static boolean
+static bfd_boolean
 generic_link_add_symbol_list (abfd, info, symbol_count, symbols, collect)
      bfd *abfd;
      struct bfd_link_info *info;
      bfd_size_type symbol_count;
      asymbol **symbols;
-     boolean collect;
+     bfd_boolean collect;
 {
   asymbol **pp, **ppend;
 
@@ -1331,8 +1333,8 @@ generic_link_add_symbol_list (abfd, info, symbol_count, symbols, collect)
 	  bh = NULL;
 	  if (! (_bfd_generic_link_add_one_symbol
 		 (info, abfd, name, p->flags, bfd_get_section (p),
-		  p->value, string, false, collect, &bh)))
-	    return false;
+		  p->value, string, FALSE, collect, &bh)))
+	    return FALSE;
 	  h = (struct generic_link_hash_entry *) bh;
 
 	  /* If this is a constructor symbol, and the linker didn't do
@@ -1379,7 +1381,7 @@ generic_link_add_symbol_list (abfd, info, symbol_count, symbols, collect)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We use a state table to deal with adding symbols from an object
@@ -1506,15 +1508,15 @@ hash_entry_bfd (h)
    STRING is used for either an indirect symbol, in which case it is
      the name of the symbol to indirect to, or a warning symbol, in
      which case it is the warning string.
-   COPY is true if NAME or STRING must be copied into locally
+   COPY is TRUE if NAME or STRING must be copied into locally
      allocated memory if they need to be saved.
-   COLLECT is true if we should automatically collect gcc constructor
+   COLLECT is TRUE if we should automatically collect gcc constructor
      or destructor names as collect2 does.
    HASHP, if not NULL, is a place to store the created hash table
      entry; if *HASHP is not NULL, the caller has already looked up
      the hash table entry, and stored it in *HASHP.  */
 
-boolean
+bfd_boolean
 _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 				  string, copy, collect, hashp)
      struct bfd_link_info *info;
@@ -1524,13 +1526,13 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
      asection *section;
      bfd_vma value;
      const char *string;
-     boolean copy;
-     boolean collect;
+     bfd_boolean copy;
+     bfd_boolean collect;
      struct bfd_link_hash_entry **hashp;
 {
   enum link_row row;
   struct bfd_link_hash_entry *h;
-  boolean cycle;
+  bfd_boolean cycle;
 
   if (bfd_is_ind_section (section)
       || (flags & BSF_INDIRECT) != 0)
@@ -1558,25 +1560,25 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
   else
     {
       if (row == UNDEF_ROW || row == UNDEFW_ROW)
-	h = bfd_wrapped_link_hash_lookup (abfd, info, name, true, copy, false);
+	h = bfd_wrapped_link_hash_lookup (abfd, info, name, TRUE, copy, FALSE);
       else
-	h = bfd_link_hash_lookup (info->hash, name, true, copy, false);
+	h = bfd_link_hash_lookup (info->hash, name, TRUE, copy, FALSE);
       if (h == NULL)
 	{
 	  if (hashp != NULL)
 	    *hashp = NULL;
-	  return false;
+	  return FALSE;
 	}
     }
 
   if (info->notice_all
       || (info->notice_hash != (struct bfd_hash_table *) NULL
-	  && (bfd_hash_lookup (info->notice_hash, name, false, false)
+	  && (bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE)
 	      != (struct bfd_hash_entry *) NULL)))
     {
       if (! (*info->callbacks->notice) (info, h->root.string, abfd, section,
 					value))
-	return false;
+	return FALSE;
     }
 
   if (hashp != (struct bfd_link_hash_entry **) NULL)
@@ -1586,7 +1588,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
     {
       enum link_action action;
 
-      cycle = false;
+      cycle = FALSE;
       action = link_action[(int) row][(int) h->type];
       switch (action)
 	{
@@ -1618,7 +1620,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 		 (info, h->root.string,
 		  h->u.c.p->section->owner, bfd_link_hash_common, h->u.c.size,
 		  abfd, bfd_link_hash_defined, (bfd_vma) 0)))
-	    return false;
+	    return FALSE;
 	  /* Fall through.  */
 	case DEF:
 	case DEFW:
@@ -1678,7 +1680,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 			if (! ((*info->callbacks->constructor)
 			       (info, c == 'I',
 				h->root.string, abfd, section, value)))
-			  return false;
+			  return FALSE;
 		      }
 		  }
 	      }
@@ -1696,7 +1698,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 	     bfd_hash_allocate (&info->hash->table,
 				sizeof (struct bfd_link_hash_common_entry)));
 	  if (h->u.c.p == NULL)
-	    return false;
+	    return FALSE;
 
 	  h->u.c.size = value;
 
@@ -1751,7 +1753,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 		 (info, h->root.string,
 		  h->u.c.p->section->owner, bfd_link_hash_common, h->u.c.size,
 		  abfd, bfd_link_hash_common, value)))
-	    return false;
+	    return FALSE;
 	  if (value > h->u.c.size)
 	    {
 	      unsigned int power;
@@ -1802,7 +1804,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 	    if (! ((*info->callbacks->multiple_common)
 		   (info, h->root.string, obfd, h->type, (bfd_vma) 0,
 		    abfd, bfd_link_hash_common, value)))
-	      return false;
+	      return FALSE;
 	  }
 	  break;
 
@@ -1844,7 +1846,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 	      if (! ((*info->callbacks->multiple_definition)
 		     (info, h->root.string, msec->owner, msec, mval,
 		      abfd, section, value)))
-		return false;
+		return FALSE;
 	    }
 	  break;
 
@@ -1855,7 +1857,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 		 (info, h->root.string,
 		  h->u.c.p->section->owner, bfd_link_hash_common, h->u.c.size,
 		  abfd, bfd_link_hash_indirect, (bfd_vma) 0)))
-	    return false;
+	    return FALSE;
 	  /* Fall through.  */
 	case IND:
 	  /* Create an indirect symbol.  */
@@ -1864,10 +1866,10 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 
 	    /* STRING is the name of the symbol we want to indirect
 	       to.  */
-	    inh = bfd_wrapped_link_hash_lookup (abfd, info, string, true,
-						copy, false);
+	    inh = bfd_wrapped_link_hash_lookup (abfd, info, string, TRUE,
+						copy, FALSE);
 	    if (inh == (struct bfd_link_hash_entry *) NULL)
-	      return false;
+	      return FALSE;
 	    if (inh->type == bfd_link_hash_indirect
 		&& inh->u.i.link == h)
 	      {
@@ -1875,7 +1877,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 		  (_("%s: indirect symbol `%s' to `%s' is a loop"),
 		   bfd_archive_filename (abfd), name, string);
 		bfd_set_error (bfd_error_invalid_operation);
-		return false;
+		return FALSE;
 	      }
 	    if (inh->type == bfd_link_hash_new)
 	      {
@@ -1890,7 +1892,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 	    if (h->type != bfd_link_hash_new)
 	      {
 		row = UNDEF_ROW;
-		cycle = true;
+		cycle = TRUE;
 	      }
 
 	    h->type = bfd_link_hash_indirect;
@@ -1902,7 +1904,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 	  /* Add an entry to a set.  */
 	  if (! (*info->callbacks->add_to_set) (info, h, BFD_RELOC_CTOR,
 						abfd, section, value))
-	    return false;
+	    return FALSE;
 	  break;
 
 	case WARNC:
@@ -1913,7 +1915,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 						 h->root.string, abfd,
 						 (asection *) NULL,
 						 (bfd_vma) 0))
-		return false;
+		return FALSE;
 	      /* Only issue a warning once.  */
 	      h->u.i.warning = NULL;
 	    }
@@ -1921,7 +1923,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 	case CYCLE:
 	  /* Try again with the referenced symbol.  */
 	  h = h->u.i.link;
-	  cycle = true;
+	  cycle = TRUE;
 	  break;
 
 	case REFC:
@@ -1929,7 +1931,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 	  if (h->next == NULL && info->hash->undefs_tail != h)
 	    h->next = h;
 	  h = h->u.i.link;
-	  cycle = true;
+	  cycle = TRUE;
 	  break;
 
 	case WARN:
@@ -1937,7 +1939,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 	  if (! (*info->callbacks->warning) (info, string, h->root.string,
 					     hash_entry_bfd (h),
 					     (asection *) NULL, (bfd_vma) 0))
-	    return false;
+	    return FALSE;
 	  break;
 
 	case CWARN:
@@ -1952,7 +1954,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 						 hash_entry_bfd (h),
 						 (asection *) NULL,
 						 (bfd_vma) 0))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	  /* Fall through.  */
@@ -1967,7 +1969,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 		    ((struct bfd_hash_entry *) NULL, &info->hash->table,
 		     h->root.string)));
 	    if (sub == NULL)
-	      return false;
+	      return FALSE;
 	    *sub = *h;
 	    sub->type = bfd_link_hash_warning;
 	    sub->u.i.link = h;
@@ -1980,7 +1982,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
 
 		w = bfd_hash_allocate (&info->hash->table, len);
 		if (w == NULL)
-		  return false;
+		  return FALSE;
 		memcpy (w, string, len);
 		sub->u.i.warning = w;
 	      }
@@ -1996,12 +1998,12 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
     }
   while (cycle);
 
-  return true;
+  return TRUE;
 }
 
 /* Generic final link routine.  */
 
-boolean
+bfd_boolean
 _bfd_generic_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2020,12 +2022,12 @@ _bfd_generic_final_link (abfd, info)
   for (o = abfd->sections; o != NULL; o = o->next)
     for (p = o->link_order_head; p != NULL; p = p->next)
       if (p->type == bfd_indirect_link_order)
-	p->u.indirect.section->linker_mark = (unsigned int) true;
+	p->u.indirect.section->linker_mark = TRUE;
 
   /* Build the output symbol table.  */
   for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next)
     if (! _bfd_generic_link_output_symbols (abfd, sub, info, &outsymalloc))
-      return false;
+      return FALSE;
 
   /* Accumulate the global symbols.  */
   wginfo.info = info;
@@ -2039,7 +2041,7 @@ _bfd_generic_final_link (abfd, info)
      shouldn't really need one, since we have SYMCOUNT, but some old
      code still expects one.  */
   if (! generic_add_output_symbol (abfd, &outsymalloc, NULL))
-    return false;
+    return FALSE;
 
   if (info->relocateable)
     {
@@ -2070,17 +2072,17 @@ _bfd_generic_final_link (abfd, info)
 		  relsize = bfd_get_reloc_upper_bound (input_bfd,
 						       input_section);
 		  if (relsize < 0)
-		    return false;
+		    return FALSE;
 		  relocs = (arelent **) bfd_malloc ((bfd_size_type) relsize);
 		  if (!relocs && relsize != 0)
-		    return false;
+		    return FALSE;
 		  symbols = _bfd_generic_link_get_symbols (input_bfd);
 		  reloc_count = bfd_canonicalize_reloc (input_bfd,
 							input_section,
 							relocs,
 							symbols);
 		  if (reloc_count < 0)
-		    return false;
+		    return FALSE;
 		  BFD_ASSERT ((unsigned long) reloc_count
 			      == input_section->reloc_count);
 		  o->reloc_count += reloc_count;
@@ -2095,7 +2097,7 @@ _bfd_generic_final_link (abfd, info)
 	      amt *= sizeof (arelent *);
 	      o->orelocation = (arelent **) bfd_alloc (abfd, amt);
 	      if (!o->orelocation)
-		return false;
+		return FALSE;
 	      o->flags |= SEC_RELOC;
 	      /* Reset the count so that it can be used as an index
 		 when putting in the output relocs.  */
@@ -2118,26 +2120,26 @@ _bfd_generic_final_link (abfd, info)
 	    case bfd_section_reloc_link_order:
 	    case bfd_symbol_reloc_link_order:
 	      if (! _bfd_generic_reloc_link_order (abfd, info, o, p))
-		return false;
+		return FALSE;
 	      break;
 	    case bfd_indirect_link_order:
-	      if (! default_indirect_link_order (abfd, info, o, p, true))
-		return false;
+	      if (! default_indirect_link_order (abfd, info, o, p, TRUE))
+		return FALSE;
 	      break;
 	    default:
 	      if (! _bfd_default_link_order (abfd, info, o, p))
-		return false;
+		return FALSE;
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Add an output symbol to the output BFD.  */
 
-static boolean
+static bfd_boolean
 generic_add_output_symbol (output_bfd, psymalloc, sym)
      bfd *output_bfd;
      size_t *psymalloc;
@@ -2156,7 +2158,7 @@ generic_add_output_symbol (output_bfd, psymalloc, sym)
       amt *= sizeof (asymbol *);
       newsyms = (asymbol **) bfd_realloc (bfd_get_outsymbols (output_bfd), amt);
       if (newsyms == (asymbol **) NULL)
-	return false;
+	return FALSE;
       bfd_get_outsymbols (output_bfd) = newsyms;
     }
 
@@ -2164,12 +2166,12 @@ generic_add_output_symbol (output_bfd, psymalloc, sym)
   if (sym != NULL)
     ++ bfd_get_symcount (output_bfd);
 
-  return true;
+  return TRUE;
 }
 
 /* Handle the symbols for an input BFD.  */
 
-boolean
+bfd_boolean
 _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
      bfd *output_bfd;
      bfd *input_bfd;
@@ -2180,7 +2182,7 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
   asymbol **sym_end;
 
   if (! generic_link_read_symbols (input_bfd))
-    return false;
+    return FALSE;
 
   /* Create a filename symbol if we are supposed to.  */
   if (info->create_object_symbols_section != (asection *) NULL)
@@ -2197,7 +2199,7 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
 
 	      newsym = bfd_make_empty_symbol (input_bfd);
 	      if (!newsym)
-		return false;
+		return FALSE;
 	      newsym->name = input_bfd->filename;
 	      newsym->value = 0;
 	      newsym->flags = BSF_LOCAL | BSF_FILE;
@@ -2205,7 +2207,7 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
 
 	      if (! generic_add_output_symbol (output_bfd, psymalloc,
 					       newsym))
-		return false;
+		return FALSE;
 
 	      break;
 	    }
@@ -2220,7 +2222,7 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
     {
       asymbol *sym;
       struct generic_link_hash_entry *h;
-      boolean output;
+      bfd_boolean output;
 
       h = (struct generic_link_hash_entry *) NULL;
       sym = *sym_ptr;
@@ -2251,11 +2253,11 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
 	    h = ((struct generic_link_hash_entry *)
 		 bfd_wrapped_link_hash_lookup (output_bfd, info,
 					       bfd_asymbol_name (sym),
-					       false, false, true));
+					       FALSE, FALSE, TRUE));
 	  else
 	    h = _bfd_generic_link_hash_lookup (_bfd_generic_hash_table (info),
 					       bfd_asymbol_name (sym),
-					       false, false, true);
+					       FALSE, FALSE, TRUE);
 
 	  if (h != (struct generic_link_hash_entry *) NULL)
 	    {
@@ -2319,9 +2321,9 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
       if (info->strip == strip_all
 	  || (info->strip == strip_some
 	      && (bfd_hash_lookup (info->keep_hash, bfd_asymbol_name (sym),
-				   false, false)
+				   FALSE, FALSE)
 		  == (struct bfd_hash_entry *) NULL)))
-	output = false;
+	output = FALSE;
       else if ((sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0)
 	{
 	  /* If this symbol is marked as occurring now, rather
@@ -2330,48 +2332,48 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
 	     better way.  */
 	  if (bfd_asymbol_bfd (sym) == input_bfd
 	      && (sym->flags & BSF_NOT_AT_END) != 0)
-	    output = true;
+	    output = TRUE;
 	  else
-	    output = false;
+	    output = FALSE;
 	}
       else if (bfd_is_ind_section (sym->section))
-	output = false;
+	output = FALSE;
       else if ((sym->flags & BSF_DEBUGGING) != 0)
 	{
 	  if (info->strip == strip_none)
-	    output = true;
+	    output = TRUE;
 	  else
-	    output = false;
+	    output = FALSE;
 	}
       else if (bfd_is_und_section (sym->section)
 	       || bfd_is_com_section (sym->section))
-	output = false;
+	output = FALSE;
       else if ((sym->flags & BSF_LOCAL) != 0)
 	{
 	  if ((sym->flags & BSF_WARNING) != 0)
-	    output = false;
+	    output = FALSE;
 	  else
 	    {
 	      switch (info->discard)
 		{
 		default:
 		case discard_all:
-		  output = false;
+		  output = FALSE;
 		  break;
 		case discard_sec_merge:
-		  output = true;
+		  output = TRUE;
 		  if (info->relocateable
 		      || ! (sym->section->flags & SEC_MERGE))
 		    break;
 		  /* FALLTHROUGH */
 		case discard_l:
 		  if (bfd_is_local_label (input_bfd, sym))
-		    output = false;
+		    output = FALSE;
 		  else
-		    output = true;
+		    output = TRUE;
 		  break;
 		case discard_none:
-		  output = true;
+		  output = TRUE;
 		  break;
 		}
 	    }
@@ -2379,9 +2381,9 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
       else if ((sym->flags & BSF_CONSTRUCTOR))
 	{
 	  if (info->strip != strip_all)
-	    output = true;
+	    output = TRUE;
 	  else
-	    output = false;
+	    output = FALSE;
 	}
       else
 	abort ();
@@ -2393,18 +2395,18 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
 	 field set.  */
       if ((sym->section->flags & SEC_HAS_CONTENTS) != 0
 	  && ! sym->section->linker_mark)
-	output = false;
+	output = FALSE;
 
       if (output)
 	{
 	  if (! generic_add_output_symbol (output_bfd, psymalloc, sym))
-	    return false;
+	    return FALSE;
 	  if (h != (struct generic_link_hash_entry *) NULL)
-	    h->written = true;
+	    h->written = TRUE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the section and value of a generic BFD symbol based on a linker
@@ -2473,7 +2475,7 @@ set_symbol_from_hash (sym, h)
 /* Write out a global symbol, if it hasn't already been written out.
    This is called for each symbol in the hash table.  */
 
-boolean
+bfd_boolean
 _bfd_generic_link_write_global_symbol (h, data)
      struct generic_link_hash_entry *h;
      PTR data;
@@ -2486,15 +2488,15 @@ _bfd_generic_link_write_global_symbol (h, data)
     h = (struct generic_link_hash_entry *) h->root.u.i.link;
 
   if (h->written)
-    return true;
+    return TRUE;
 
-  h->written = true;
+  h->written = TRUE;
 
   if (wginfo->info->strip == strip_all
       || (wginfo->info->strip == strip_some
 	  && bfd_hash_lookup (wginfo->info->keep_hash, h->root.root.string,
-			      false, false) == NULL))
-    return true;
+			      FALSE, FALSE) == NULL))
+    return TRUE;
 
   if (h->sym != (asymbol *) NULL)
     sym = h->sym;
@@ -2502,7 +2504,7 @@ _bfd_generic_link_write_global_symbol (h, data)
     {
       sym = bfd_make_empty_symbol (wginfo->output_bfd);
       if (!sym)
-	return false;
+	return FALSE;
       sym->name = h->root.root.string;
       sym->flags = 0;
     }
@@ -2518,12 +2520,12 @@ _bfd_generic_link_write_global_symbol (h, data)
       abort ();
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Create a relocation.  */
 
-boolean
+bfd_boolean
 _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2539,14 +2541,14 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
 
   r = (arelent *) bfd_alloc (abfd, (bfd_size_type) sizeof (arelent));
   if (r == (arelent *) NULL)
-    return false;
+    return FALSE;
 
   r->address = link_order->offset;
   r->howto = bfd_reloc_type_lookup (abfd, link_order->u.reloc.p->reloc);
   if (r->howto == 0)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   /* Get the symbol to use for the relocation.  */
@@ -2559,16 +2561,16 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
       h = ((struct generic_link_hash_entry *)
 	   bfd_wrapped_link_hash_lookup (abfd, info,
 					 link_order->u.reloc.p->u.name,
-					 false, false, true));
+					 FALSE, FALSE, TRUE));
       if (h == (struct generic_link_hash_entry *) NULL
 	  || ! h->written)
 	{
 	  if (! ((*info->callbacks->unattached_reloc)
 		 (info, link_order->u.reloc.p->u.name,
 		  (bfd *) NULL, (asection *) NULL, (bfd_vma) 0)))
-	    return false;
+	    return FALSE;
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       r->sym_ptr_ptr = &h->sym;
     }
@@ -2582,13 +2584,13 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
       bfd_size_type size;
       bfd_reloc_status_type rstat;
       bfd_byte *buf;
-      boolean ok;
+      bfd_boolean ok;
       file_ptr loc;
 
       size = bfd_get_reloc_size (r->howto);
       buf = (bfd_byte *) bfd_zmalloc (size);
       if (buf == (bfd_byte *) NULL)
-	return false;
+	return FALSE;
       rstat = _bfd_relocate_contents (r->howto, abfd,
 				      (bfd_vma) link_order->u.reloc.p->addend,
 				      buf);
@@ -2609,7 +2611,7 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
 		  (bfd *) NULL, (asection *) NULL, (bfd_vma) 0)))
 	    {
 	      free (buf);
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 	}
@@ -2618,7 +2620,7 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
 				     (bfd_size_type) size);
       free (buf);
       if (! ok)
-	return false;
+	return FALSE;
 
       r->addend = 0;
     }
@@ -2626,7 +2628,7 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
   sec->orelocation[sec->reloc_count] = r;
   ++sec->reloc_count;
 
-  return true;
+  return TRUE;
 }
 
 /* Allocate a new link_order for a section.  */
@@ -2658,7 +2660,7 @@ bfd_new_link_order (abfd, section)
    the reloc_link_order types here, since they depend upon the details
    of how the particular backends generates relocs.  */
 
-boolean
+bfd_boolean
 _bfd_default_link_order (abfd, info, sec, link_order)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2674,7 +2676,7 @@ _bfd_default_link_order (abfd, info, sec, link_order)
       abort ();
     case bfd_indirect_link_order:
       return default_indirect_link_order (abfd, info, sec, link_order,
-					  false);
+					  FALSE);
     case bfd_data_link_order:
       return default_data_link_order (abfd, info, sec, link_order);
     }
@@ -2682,7 +2684,7 @@ _bfd_default_link_order (abfd, info, sec, link_order)
 
 /* Default routine to handle a bfd_data_link_order.  */
 
-static boolean
+static bfd_boolean
 default_data_link_order (abfd, info, sec, link_order)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -2693,13 +2695,13 @@ default_data_link_order (abfd, info, sec, link_order)
   size_t fill_size;
   bfd_byte *fill;
   file_ptr loc;
-  boolean result;
+  bfd_boolean result;
 
   BFD_ASSERT ((sec->flags & SEC_HAS_CONTENTS) != 0);
 
   size = link_order->size;
   if (size == 0)
-    return true;
+    return TRUE;
 
   fill = link_order->u.data.contents;
   fill_size = link_order->u.data.size;
@@ -2708,7 +2710,7 @@ default_data_link_order (abfd, info, sec, link_order)
       bfd_byte *p;
       fill = (bfd_byte *) bfd_malloc (size);
       if (fill == NULL)
-	return false;
+	return FALSE;
       p = fill;
       if (fill_size == 1)
 	memset (p, (int) link_order->u.data.contents[0], (size_t) size);
@@ -2737,14 +2739,14 @@ default_data_link_order (abfd, info, sec, link_order)
 
 /* Default routine to handle a bfd_indirect_link_order.  */
 
-static boolean
+static bfd_boolean
 default_indirect_link_order (output_bfd, info, output_section, link_order,
 			     generic_linker)
      bfd *output_bfd;
      struct bfd_link_info *info;
      asection *output_section;
      struct bfd_link_order *link_order;
-     boolean generic_linker;
+     bfd_boolean generic_linker;
 {
   asection *input_section;
   bfd *input_bfd;
@@ -2756,7 +2758,7 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
   BFD_ASSERT ((output_section->flags & SEC_HAS_CONTENTS) != 0);
 
   if (link_order->size == 0)
-    return true;
+    return TRUE;
 
   input_section = link_order->u.indirect.section;
   input_bfd = input_section->owner;
@@ -2778,7 +2780,7 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
 	(_("Attempt to do relocateable link with %s input and %s output"),
 	 bfd_get_target (input_bfd), bfd_get_target (output_bfd));
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
   if (! generic_linker)
@@ -2791,7 +2793,7 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
 	 a specific linker, presumably because we are linking
 	 different types of object files together.  */
       if (! generic_link_read_symbols (input_bfd))
-	return false;
+	return FALSE;
 
       /* Since we have been called by a specific linker, rather than
 	 the generic linker, the values of the symbols will not be
@@ -2823,11 +2825,11 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
 	      else if (bfd_is_und_section (bfd_get_section (sym)))
 		h = bfd_wrapped_link_hash_lookup (output_bfd, info,
 						  bfd_asymbol_name (sym),
-						  false, false, true);
+						  FALSE, FALSE, TRUE);
 	      else
 		h = bfd_link_hash_lookup (info->hash,
 					  bfd_asymbol_name (sym),
-					  false, false, true);
+					  FALSE, FALSE, TRUE);
 	      if (h != NULL)
 		set_symbol_from_hash (sym, h);
 	    }
@@ -2853,12 +2855,12 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
 
   if (contents != NULL)
     free (contents);
-  return true;
+  return TRUE;
 
  error_return:
   if (contents != NULL)
     free (contents);
-  return false;
+  return FALSE;
 }
 
 /* A little routine to count the number of relocs in a link_order
@@ -2887,7 +2889,7 @@ FUNCTION
 	bfd_link_split_section
 
 SYNOPSIS
-        boolean bfd_link_split_section(bfd *abfd, asection *sec);
+        bfd_boolean bfd_link_split_section(bfd *abfd, asection *sec);
 
 DESCRIPTION
 	Return nonzero if @var{sec} should be split during a
@@ -2899,10 +2901,10 @@ DESCRIPTION
 
 */
 
-boolean
+bfd_boolean
 _bfd_generic_link_split_section (abfd, sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
diff --git a/bfd/lynx-core.c b/bfd/lynx-core.c
index af513aca75c..08bf2331c53 100644
--- a/bfd/lynx-core.c
+++ b/bfd/lynx-core.c
@@ -224,11 +224,11 @@ lynx_core_file_failing_signal (abfd)
   return core_signal (abfd);
 }
 
-boolean
+bfd_boolean
 lynx_core_file_matches_executable_p  (core_bfd, exec_bfd)
      bfd *core_bfd, *exec_bfd;
 {
-  return true;		/* FIXME, We have no way of telling at this point */
+  return TRUE;		/* FIXME, We have no way of telling at this point */
 }
 
 #endif /* LYNX_CORE */
diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c
index 863a61d68f8..a526998c51a 100644
--- a/bfd/m68klinux.c
+++ b/bfd/m68klinux.c
@@ -52,11 +52,11 @@ extern const bfd_target MY(vec);
 
 static void MY_final_link_callback
   PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-static boolean m68klinux_bfd_final_link
+static bfd_boolean m68klinux_bfd_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean m68klinux_write_object_contents PARAMS ((bfd *));
+static bfd_boolean m68klinux_write_object_contents PARAMS ((bfd *));
 
-static boolean
+static bfd_boolean
 m68klinux_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -69,7 +69,7 @@ m68klinux_bfd_final_link (abfd, info)
 
 /* Set the machine type correctly.  */
 
-static boolean
+static bfd_boolean
 m68klinux_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -82,7 +82,7 @@ m68klinux_write_object_contents (abfd)
 
   WRITE_HEADERS(abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 #define MY_write_object_contents m68klinux_write_object_contents
@@ -180,15 +180,15 @@ static struct bfd_link_hash_table *linux_link_hash_table_create
 static struct fixup *new_fixup
   PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
 	   bfd_vma, int));
-static boolean linux_link_create_dynamic_sections
+static bfd_boolean linux_link_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean linux_add_one_symbol
+static bfd_boolean linux_add_one_symbol
   PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-	   bfd_vma, const char *, boolean, boolean,
+	   bfd_vma, const char *, bfd_boolean, bfd_boolean,
 	   struct bfd_link_hash_entry **));
-static boolean linux_tally_symbols
+static bfd_boolean linux_tally_symbols
   PARAMS ((struct linux_link_hash_entry *, PTR));
-static boolean linux_finish_dynamic_link
+static bfd_boolean linux_finish_dynamic_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Routine to create an entry in an Linux link hash table.  */
@@ -263,7 +263,7 @@ linux_link_hash_table_create (abfd)
 #define linux_link_hash_traverse(table, func, info)			\
   (aout_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),	\
     (info)))
 
 /* Get the Linux link hash table from the info structure.  This is
@@ -303,7 +303,7 @@ new_fixup (info, h, value, builtin)
    know the size of the section, but that's OK - we just need to
    create it for now.  */
 
-static boolean
+static bfd_boolean
 linux_link_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -320,18 +320,18 @@ linux_link_create_dynamic_sections (abfd, info)
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags)
       || ! bfd_set_section_alignment (abfd, s, 2))
-    return false;
+    return FALSE;
   s->_raw_size = 0;
   s->contents = 0;
 
-  return true;
+  return TRUE;
 }
 
 /* Function to add a single symbol to the linker hash table.  This is
    a wrapper around _bfd_generic_link_add_one_symbol which handles the
    tweaking needed for dynamic linking support.  */
 
-static boolean
+static bfd_boolean
 linux_add_one_symbol (info, abfd, name, flags, section, value, string,
 		      copy, collect, hashp)
      struct bfd_link_info *info;
@@ -341,12 +341,12 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
      asection *section;
      bfd_vma value;
      const char *string;
-     boolean copy;
-     boolean collect;
+     bfd_boolean copy;
+     bfd_boolean collect;
      struct bfd_link_hash_entry **hashp;
 {
   struct linux_link_hash_entry *h;
-  boolean insert;
+  bfd_boolean insert;
 
   /* Look up and see if we already have this symbol in the hash table.
      If we do, and the defining entry is from a shared library, we
@@ -356,7 +356,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
      be able to link Linux a.out and ELF objects together, but serious
      confusion is possible.  */
 
-  insert = false;
+  insert = FALSE;
 
   if (! info->relocateable
       && linux_hash_table (info)->dynobj == NULL
@@ -365,16 +365,16 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
       && abfd->xvec == info->hash->creator)
     {
       if (! linux_link_create_dynamic_sections (abfd, info))
-	return false;
+	return FALSE;
       linux_hash_table (info)->dynobj = abfd;
-      insert = true;
+      insert = TRUE;
     }
 
   if (bfd_is_abs_section (section)
       && abfd->xvec == info->hash->creator)
     {
-      h = linux_link_hash_lookup (linux_hash_table (info), name, false,
-				  false, false);
+      h = linux_link_hash_lookup (linux_hash_table (info), name, FALSE,
+				  FALSE, FALSE);
       if (h != NULL
 	  && (h->root.root.type == bfd_link_hash_defined
 	      || h->root.root.type == bfd_link_hash_defweak))
@@ -386,10 +386,10 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
 
 	  f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
 	  if (f == NULL)
-	    return false;
+	    return FALSE;
 	  f->jump = IS_PLT_SYM (name);
 
-	  return true;
+	  return TRUE;
 	}
     }
 
@@ -397,7 +397,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
   if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
 					  value, string, copy, collect,
 					  hashp))
-    return false;
+    return FALSE;
 
   /* Insert a pointer to our table in the set vector.  The dynamic
      linker requires this information */
@@ -414,11 +414,11 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
       if (! (_bfd_generic_link_add_one_symbol
 	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
 	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
-	      false, false, NULL)))
-	return false;
+	      FALSE, FALSE, NULL)))
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We will crawl the hash table and come here for every global symbol.
@@ -431,7 +431,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
 
    This function is called via linux_link_hash_traverse.  */
 
-static boolean
+static bfd_boolean
 linux_tally_symbols (h, data)
      struct linux_link_hash_entry *h;
      PTR data;
@@ -440,7 +440,7 @@ linux_tally_symbols (h, data)
   struct fixup *f, *f1;
   int is_plt;
   struct linux_link_hash_entry *h1, *h2;
-  boolean exists;
+  bfd_boolean exists;
 
   if (h->root.root.type == bfd_link_hash_warning)
     h = (struct linux_link_hash_entry *) h->root.root.u.i.link;
@@ -486,12 +486,12 @@ linux_tally_symbols (h, data)
       h1 = linux_link_hash_lookup (linux_hash_table (info),
 				   (h->root.root.root.string
 				    + sizeof PLT_REF_PREFIX - 1),
-				   false, false, true);
+				   FALSE, FALSE, TRUE);
       /* h2 does not follow indirect symbols.  */
       h2 = linux_link_hash_lookup (linux_hash_table (info),
 				   (h->root.root.root.string
 				    + sizeof PLT_REF_PREFIX - 1),
-				   false, false, false);
+				   FALSE, FALSE, FALSE);
 
       /* The real symbol must exist but if it is also an ABS symbol,
 	 there is no need to have a fixup.  This is because they both
@@ -509,7 +509,7 @@ linux_tally_symbols (h, data)
 	     involving this symbol.  If so, convert it to a regular
 	     fixup.  In the end, this relaxes some of the requirements
 	     about the order of performing fixups.  */
-	  exists = false;
+	  exists = FALSE;
 	  for (f1 = linux_hash_table (info)->fixup_list;
 	       f1 != NULL;
 	       f1 = f1->next)
@@ -518,7 +518,7 @@ linux_tally_symbols (h, data)
 		  || (! f1->builtin && ! f1->jump))
 		continue;
 	      if (f1->h == h1)
-		exists = true;
+		exists = TRUE;
 	      if (! exists
 		  && bfd_is_abs_section (h->root.root.u.def.section))
 		{
@@ -528,7 +528,7 @@ linux_tally_symbols (h, data)
 	      f1->h = h1;
 	      f1->jump = is_plt;
 	      f1->builtin = 0;
-	      exists = true;
+	      exists = TRUE;
 	    }
 	  if (! exists
 	      && bfd_is_abs_section (h->root.root.u.def.section))
@@ -546,10 +546,10 @@ linux_tally_symbols (h, data)
       /* Quick and dirty way of stripping these symbols from the
 	 symtab.  */
       if (bfd_is_abs_section (h->root.root.u.def.section))
-	h->root.written = true;
+	h->root.written = TRUE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called to set the size of the .linux-dynamic section is.
@@ -558,7 +558,7 @@ linux_tally_symbols (h, data)
    we just scan the hash tables to find out how many additional fixups
    are required.  */
 
-boolean
+bfd_boolean
 bfd_m68klinux_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -567,7 +567,7 @@ bfd_m68klinux_size_dynamic_sections (output_bfd, info)
   asection *s;
 
   if (output_bfd->xvec != &MY(vec))
-    return true;
+    return TRUE;
 
   /* First find the fixups...  */
   linux_link_hash_traverse (linux_hash_table (info),
@@ -591,7 +591,7 @@ bfd_m68klinux_size_dynamic_sections (output_bfd, info)
     {
       if (linux_hash_table (info)->fixup_count > 0)
 	abort ();
-      return true;
+      return TRUE;
     }
 
   /* Allocate memory for our fixup table.  We will fill it in later.  */
@@ -605,18 +605,18 @@ bfd_m68klinux_size_dynamic_sections (output_bfd, info)
       if (s->contents == NULL)
 	{
 	  bfd_set_error (bfd_error_no_memory);
-	  return false;
+	  return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We come here once we are ready to actually write the fixup table to
    the output file.  Scan the fixup tables and so forth and generate
    the stuff we need.  */
 
-static boolean
+static bfd_boolean
 linux_finish_dynamic_link (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -630,7 +630,7 @@ linux_finish_dynamic_link (output_bfd, info)
   unsigned int fixups_written;
 
   if (linux_hash_table (info)->dynobj == NULL)
-    return true;
+    return TRUE;
 
   s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
 			       ".linux-dynamic");
@@ -744,7 +744,7 @@ linux_finish_dynamic_link (output_bfd, info)
 
   h = linux_link_hash_lookup (linux_hash_table (info),
 			      "__BUILTIN_FIXUPS__",
-			      false, false, false);
+			      FALSE, FALSE, FALSE);
 
   if (h != NULL
       && (h->root.root.type == bfd_link_hash_defined
@@ -765,12 +765,12 @@ linux_finish_dynamic_link (output_bfd, info)
 
   if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset),
 		SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (bfd_bwrite ((PTR) s->contents, s->_raw_size, output_bfd) != s->_raw_size)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 #define MY_bfd_link_hash_table_create linux_link_hash_table_create
diff --git a/bfd/m68klynx.c b/bfd/m68klynx.c
index 4261b11885c..00571ca71f6 100644
--- a/bfd/m68klynx.c
+++ b/bfd/m68klynx.c
@@ -1,5 +1,5 @@
 /* BFD back-end for m68k binaries under LynxOS.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -45,7 +45,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 char *lynx_core_file_failing_command();
 int lynx_core_file_failing_signal();
-boolean lynx_core_file_matches_executable_p();
+bfd_boolean lynx_core_file_matches_executable_p();
 const bfd_target *lynx_core_file_p();
 
 #define	MY_core_file_failing_command lynx_core_file_failing_command
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 1daaf985ff7..4c4736ada0d 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -70,38 +70,71 @@
 #define bfd_mach_o_bfd_merge_sections bfd_generic_merge_sections
 #define bfd_mach_o_bfd_discard_group bfd_generic_discard_group
 
-static boolean  bfd_mach_o_bfd_copy_private_symbol_data  PARAMS ((bfd *, asymbol *, bfd *, asymbol *));
-static boolean  bfd_mach_o_bfd_copy_private_section_data PARAMS ((bfd *, asection *, bfd *, asection *));
-static boolean  bfd_mach_o_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-static long     bfd_mach_o_count_symbols             PARAMS ((bfd *));
-static long     bfd_mach_o_get_symtab_upper_bound    PARAMS ((bfd *));
-static long     bfd_mach_o_get_symtab                PARAMS ((bfd *, asymbol **));
-static void     bfd_mach_o_get_symbol_info           PARAMS ((bfd *, asymbol *, symbol_info *));
-static void     bfd_mach_o_print_symbol              PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-static void     bfd_mach_o_convert_architecture      PARAMS ((bfd_mach_o_cpu_type, bfd_mach_o_cpu_subtype, enum bfd_architecture *, unsigned long *));
-static boolean  bfd_mach_o_write_contents            PARAMS ((bfd *));
-static int      bfd_mach_o_sizeof_headers            PARAMS ((bfd *, boolean));
-static asymbol *   bfd_mach_o_make_empty_symbol      PARAMS ((bfd *));
-static int      bfd_mach_o_write_header              PARAMS ((bfd *, bfd_mach_o_header *));
-static int      bfd_mach_o_read_header               PARAMS ((bfd *, bfd_mach_o_header *));
-static asection *  bfd_mach_o_make_bfd_section       PARAMS ((bfd *, bfd_mach_o_section *));
-static int      bfd_mach_o_scan_read_section         PARAMS ((bfd *, bfd_mach_o_section *, bfd_vma));
-static int      bfd_mach_o_scan_write_section        PARAMS ((bfd *, bfd_mach_o_section *, bfd_vma));
-static int      bfd_mach_o_scan_write_symtab_symbols PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_write_thread         PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_read_dylinker        PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_read_dylib           PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_read_prebound_dylib  PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_read_thread          PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_write_symtab         PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_read_dysymtab        PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_read_symtab          PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_read_segment         PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_write_segment        PARAMS ((bfd *, bfd_mach_o_load_command *));
-static int      bfd_mach_o_scan_read_command         PARAMS ((bfd *, bfd_mach_o_load_command *));
-static void     bfd_mach_o_flatten_sections          PARAMS ((bfd *));
-static const char * bfd_mach_o_i386_flavour_string   PARAMS ((unsigned int));
-static const char * bfd_mach_o_ppc_flavour_string    PARAMS ((unsigned int));
+static bfd_boolean bfd_mach_o_bfd_copy_private_symbol_data
+  PARAMS ((bfd *, asymbol *, bfd *, asymbol *));
+static bfd_boolean bfd_mach_o_bfd_copy_private_section_data
+  PARAMS ((bfd *, asection *, bfd *, asection *));
+static bfd_boolean bfd_mach_o_bfd_copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static long bfd_mach_o_count_symbols
+  PARAMS ((bfd *));
+static long bfd_mach_o_get_symtab_upper_bound
+  PARAMS ((bfd *));
+static long bfd_mach_o_get_symtab
+  PARAMS ((bfd *, asymbol **));
+static void bfd_mach_o_get_symbol_info
+  PARAMS ((bfd *, asymbol *, symbol_info *));
+static void bfd_mach_o_print_symbol
+  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
+static void bfd_mach_o_convert_architecture
+  PARAMS ((bfd_mach_o_cpu_type, bfd_mach_o_cpu_subtype,
+	   enum bfd_architecture *, unsigned long *));
+static bfd_boolean bfd_mach_o_write_contents
+  PARAMS ((bfd *));
+static int bfd_mach_o_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+static asymbol * bfd_mach_o_make_empty_symbol
+  PARAMS ((bfd *));
+static int bfd_mach_o_write_header
+  PARAMS ((bfd *, bfd_mach_o_header *));
+static int bfd_mach_o_read_header
+  PARAMS ((bfd *, bfd_mach_o_header *));
+static asection * bfd_mach_o_make_bfd_section
+  PARAMS ((bfd *, bfd_mach_o_section *));
+static int bfd_mach_o_scan_read_section
+  PARAMS ((bfd *, bfd_mach_o_section *, bfd_vma));
+static int bfd_mach_o_scan_write_section
+  PARAMS ((bfd *, bfd_mach_o_section *, bfd_vma));
+static int bfd_mach_o_scan_write_symtab_symbols
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_write_thread
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_read_dylinker
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_read_dylib
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_read_prebound_dylib
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_read_thread
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_write_symtab
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_read_dysymtab
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_read_symtab
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_read_segment
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_write_segment
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static int bfd_mach_o_scan_read_command
+  PARAMS ((bfd *, bfd_mach_o_load_command *));
+static void bfd_mach_o_flatten_sections
+  PARAMS ((bfd *));
+static const char * bfd_mach_o_i386_flavour_string
+  PARAMS ((unsigned int));
+static const char * bfd_mach_o_ppc_flavour_string
+  PARAMS ((unsigned int));
 
 /* The flags field of a section structure is separated into two parts a section
    type and section attributes.  The section types are mutually exclusive (it
@@ -129,7 +162,7 @@ static const char * bfd_mach_o_ppc_flavour_string    PARAMS ((unsigned int));
 #define N_SECT 0xe
 #define N_INDR 0xa
 
-boolean
+bfd_boolean
 bfd_mach_o_valid (abfd)
      bfd *abfd;
 {
@@ -149,33 +182,33 @@ bfd_mach_o_valid (abfd)
 /* Copy any private info we understand from the input symbol
    to the output symbol.  */
 
-static boolean
+static bfd_boolean
 bfd_mach_o_bfd_copy_private_symbol_data (ibfd, isymbol, obfd, osymbol)
      bfd *ibfd ATTRIBUTE_UNUSED;
      asymbol *isymbol ATTRIBUTE_UNUSED;
      bfd *obfd ATTRIBUTE_UNUSED;
      asymbol *osymbol ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Copy any private info we understand from the input section
    to the output section.  */
 
-static boolean
+static bfd_boolean
 bfd_mach_o_bfd_copy_private_section_data (ibfd, isection, obfd, osection)
      bfd *ibfd ATTRIBUTE_UNUSED;
      asection *isection ATTRIBUTE_UNUSED;
      bfd *obfd ATTRIBUTE_UNUSED;
      asection *osection ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Copy any private info we understand from the input bfd
    to the output bfd.  */
 
-static boolean
+static bfd_boolean
 bfd_mach_o_bfd_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
@@ -185,7 +218,7 @@ bfd_mach_o_bfd_copy_private_bfd_data (ibfd, obfd)
 
   obfd->tdata.mach_o_data = ibfd->tdata.mach_o_data;
   obfd->tdata.mach_o_data->ibfd = ibfd;
-  return true;
+  return TRUE;
 }
 
 static long
@@ -325,7 +358,7 @@ bfd_mach_o_convert_architecture (mtype, msubtype, type, subtype)
     }
 }
 
-static boolean
+static bfd_boolean
 bfd_mach_o_write_contents (abfd)
      bfd *abfd;
 {
@@ -362,11 +395,11 @@ bfd_mach_o_write_contents (abfd)
 
 	    bfd_seek (abfd, curoff, SEEK_SET);
 	    if (bfd_bread ((PTR) buf, thisread, abfd) != thisread)
-	      return false;
+	      return FALSE;
 
 	    bfd_seek (abfd, curoff, SEEK_SET);
 	    if (bfd_bwrite ((PTR) buf, thisread, abfd) != thisread)
-	      return false;
+	      return FALSE;
 
 	    nbytes -= thisread;
 	    curoff += thisread;
@@ -377,7 +410,7 @@ bfd_mach_o_write_contents (abfd)
 
   /* Now write header information.  */
   if (bfd_mach_o_write_header (abfd, &mdata->header) != 0)
-    return false;
+    return FALSE;
 
   for (i = 0; i < mdata->header.ncmds; i++)
     {
@@ -392,24 +425,24 @@ bfd_mach_o_write_contents (abfd)
 
       bfd_seek (abfd, cur->offset, SEEK_SET);
       if (bfd_bwrite ((PTR) buf, 8, abfd) != 8)
-	return false;
+	return FALSE;
 
       switch (cur->type)
 	{
 	case BFD_MACH_O_LC_SEGMENT:
 	  if (bfd_mach_o_scan_write_segment (abfd, cur) != 0)
-	    return false;
+	    return FALSE;
 	  break;
 	case BFD_MACH_O_LC_SYMTAB:
 	  if (bfd_mach_o_scan_write_symtab (abfd, cur) != 0)
-	    return false;
+	    return FALSE;
 	  break;
 	case BFD_MACH_O_LC_SYMSEG:
 	  break;
 	case BFD_MACH_O_LC_THREAD:
 	case BFD_MACH_O_LC_UNIXTHREAD:
 	  if (bfd_mach_o_scan_write_thread (abfd, cur) != 0)
-	    return false;
+	    return FALSE;
 	  break;
 	case BFD_MACH_O_LC_LOADFVMLIB:
 	case BFD_MACH_O_LC_IDFVMLIB:
@@ -430,17 +463,17 @@ bfd_mach_o_write_contents (abfd)
 	  fprintf (stderr,
 		   "unable to write unknown load command 0x%lx\n",
 		   (long) cur->type);
-	  return false;
+	  return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 static int
 bfd_mach_o_sizeof_headers (a, b)
      bfd *a ATTRIBUTE_UNUSED;
-     boolean b ATTRIBUTE_UNUSED;
+     bfd_boolean b ATTRIBUTE_UNUSED;
 {
   return 0;
 }
@@ -1682,7 +1715,7 @@ bfd_mach_o_scan (abfd, header, mdata)
   return 0;
 }
 
-boolean
+bfd_boolean
 bfd_mach_o_mkobject (abfd)
      bfd *abfd;
 {
@@ -1691,7 +1724,7 @@ bfd_mach_o_mkobject (abfd)
   mdata = ((bfd_mach_o_data_struct *)
 	   bfd_alloc (abfd, sizeof (bfd_mach_o_data_struct)));
   if (mdata == NULL)
-    return false;
+    return FALSE;
   abfd->tdata.mach_o_data = mdata;
 
   mdata->header.magic = 0;
@@ -1709,7 +1742,7 @@ bfd_mach_o_mkobject (abfd)
   mdata->sections = NULL;
   mdata->ibfd = NULL;
 
-  return true;
+  return TRUE;
 }
 
 const bfd_target *
@@ -2149,12 +2182,12 @@ bfd_mach_o_core_file_failing_signal (abfd)
   return 0;
 }
 
-boolean
+bfd_boolean
 bfd_mach_o_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd ATTRIBUTE_UNUSED;
      bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 #define TARGET_NAME mach_o_be_vec
diff --git a/bfd/mach-o.h b/bfd/mach-o.h
index f78027321de..c94f01d9af6 100644
--- a/bfd/mach-o.h
+++ b/bfd/mach-o.h
@@ -463,25 +463,46 @@ mach_o_data_struct;
 
 typedef struct mach_o_data_struct bfd_mach_o_data_struct;
 
-boolean            bfd_mach_o_valid                     PARAMS ((bfd *));
-int                bfd_mach_o_scan_read_symtab_symbol   PARAMS ((bfd *, bfd_mach_o_symtab_command *, asymbol *, unsigned long));
-int                bfd_mach_o_scan_read_symtab_strtab   PARAMS ((bfd *, bfd_mach_o_symtab_command *));
-int                bfd_mach_o_scan_read_symtab_symbols  PARAMS ((bfd *, bfd_mach_o_symtab_command *));
-int                bfd_mach_o_scan_read_dysymtab_symbol PARAMS ((bfd *, bfd_mach_o_dysymtab_command *, bfd_mach_o_symtab_command *, asymbol *, unsigned long));
-int                bfd_mach_o_scan_start_address        PARAMS ((bfd *));
-int                bfd_mach_o_scan                      PARAMS ((bfd *, bfd_mach_o_header *, bfd_mach_o_data_struct *));
-boolean            bfd_mach_o_mkobject                  PARAMS ((bfd *));
-const bfd_target * bfd_mach_o_object_p                  PARAMS ((bfd *));
-const bfd_target * bfd_mach_o_core_p                    PARAMS ((bfd *));
-const bfd_target * bfd_mach_o_archive_p                 PARAMS ((bfd *));
-bfd *              bfd_mach_o_openr_next_archived_file  PARAMS ((bfd *, bfd *));
-int                bfd_mach_o_lookup_section            PARAMS ((bfd *, asection *, bfd_mach_o_load_command **, bfd_mach_o_section **));
-int                bfd_mach_o_lookup_command            PARAMS ((bfd *, bfd_mach_o_load_command_type, bfd_mach_o_load_command **));
-unsigned long      bfd_mach_o_stack_addr                PARAMS ((enum bfd_mach_o_cpu_type));
-int                bfd_mach_o_core_fetch_environment    PARAMS ((bfd *, unsigned char **, unsigned int *));
-char *             bfd_mach_o_core_file_failing_command PARAMS ((bfd *));
-int                bfd_mach_o_core_file_failing_signal  PARAMS ((bfd *));
-boolean            bfd_mach_o_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
+bfd_boolean bfd_mach_o_valid
+  PARAMS ((bfd *));
+int bfd_mach_o_scan_read_symtab_symbol
+  PARAMS ((bfd *, bfd_mach_o_symtab_command *, asymbol *, unsigned long));
+int bfd_mach_o_scan_read_symtab_strtab
+  PARAMS ((bfd *, bfd_mach_o_symtab_command *));
+int bfd_mach_o_scan_read_symtab_symbols
+  PARAMS ((bfd *, bfd_mach_o_symtab_command *));
+int bfd_mach_o_scan_read_dysymtab_symbol
+  PARAMS ((bfd *, bfd_mach_o_dysymtab_command *, bfd_mach_o_symtab_command *,
+	   asymbol *, unsigned long));
+int bfd_mach_o_scan_start_address
+  PARAMS ((bfd *));
+int bfd_mach_o_scan
+  PARAMS ((bfd *, bfd_mach_o_header *, bfd_mach_o_data_struct *));
+bfd_boolean bfd_mach_o_mkobject
+  PARAMS ((bfd *));
+const bfd_target * bfd_mach_o_object_p
+  PARAMS ((bfd *));
+const bfd_target * bfd_mach_o_core_p
+  PARAMS ((bfd *));
+const bfd_target * bfd_mach_o_archive_p
+  PARAMS ((bfd *));
+bfd * bfd_mach_o_openr_next_archived_file
+  PARAMS ((bfd *, bfd *));
+int bfd_mach_o_lookup_section
+  PARAMS ((bfd *, asection *, bfd_mach_o_load_command **,
+	   bfd_mach_o_section **));
+int bfd_mach_o_lookup_command
+  PARAMS ((bfd *, bfd_mach_o_load_command_type, bfd_mach_o_load_command **));
+unsigned long bfd_mach_o_stack_addr
+  PARAMS ((enum bfd_mach_o_cpu_type));
+int bfd_mach_o_core_fetch_environment
+  PARAMS ((bfd *, unsigned char **, unsigned int *));
+char * bfd_mach_o_core_file_failing_command
+  PARAMS ((bfd *));
+int bfd_mach_o_core_file_failing_signal
+  PARAMS ((bfd *));
+bfd_boolean bfd_mach_o_core_file_matches_executable_p
+  PARAMS ((bfd *, bfd *));
 
 extern const bfd_target mach_o_be_vec;
 extern const bfd_target mach_o_le_vec;
diff --git a/bfd/merge.c b/bfd/merge.c
index 9dc2e708344..ec75a7be7e9 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -68,7 +68,7 @@ struct sec_merge_hash
   /* Entity size.  */
   unsigned int entsize;
   /* Are entries fixed size or zero terminated strings?  */
-  boolean strings;
+  bfd_boolean strings;
 };
 
 struct sec_merge_info
@@ -100,20 +100,24 @@ struct sec_merge_sec_info
 static struct bfd_hash_entry *sec_merge_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct sec_merge_hash_entry *sec_merge_hash_lookup
-  PARAMS ((struct sec_merge_hash *, const char *, unsigned int, boolean));
+  PARAMS ((struct sec_merge_hash *, const char *, unsigned int, bfd_boolean));
 static struct sec_merge_hash *sec_merge_init
-  PARAMS ((unsigned int, boolean));
+  PARAMS ((unsigned int, bfd_boolean));
 static struct sec_merge_hash_entry *sec_merge_add
   PARAMS ((struct sec_merge_hash *, const char *, unsigned int,
 	   struct sec_merge_sec_info *));
-static boolean sec_merge_emit
+static bfd_boolean sec_merge_emit
   PARAMS ((bfd *, struct sec_merge_hash_entry *));
-static int cmplengthentry PARAMS ((const PTR, const PTR));
-static int last4_eq PARAMS ((const PTR, const PTR));
-static int last_eq PARAMS ((const PTR, const PTR));
-static boolean record_section
+static int cmplengthentry
+  PARAMS ((const PTR, const PTR));
+static int last4_eq
+  PARAMS ((const PTR, const PTR));
+static int last_eq
+  PARAMS ((const PTR, const PTR));
+static bfd_boolean record_section
   PARAMS ((struct sec_merge_info *, struct sec_merge_sec_info *));
-static void merge_strings PARAMS ((struct sec_merge_info *));
+static void merge_strings
+  PARAMS ((struct sec_merge_info *));
 
 /* Routine to create an entry in a section merge hashtab.  */
 
@@ -156,7 +160,7 @@ sec_merge_hash_lookup (table, string, alignment, create)
      struct sec_merge_hash *table;
      const char *string;
      unsigned int alignment;
-     boolean create;
+     bfd_boolean create;
 {
   register const unsigned char *s;
   register unsigned long hash;
@@ -259,7 +263,7 @@ sec_merge_hash_lookup (table, string, alignment, create)
 static struct sec_merge_hash *
 sec_merge_init (entsize, strings)
      unsigned int entsize;
-     boolean strings;
+     bfd_boolean strings;
 {
   struct sec_merge_hash *table;
   bfd_size_type amt = sizeof (struct sec_merge_hash);
@@ -295,7 +299,7 @@ sec_merge_add (tab, str, alignment, secinfo)
 {
   register struct sec_merge_hash_entry *entry;
 
-  entry = sec_merge_hash_lookup (tab, str, alignment, true);
+  entry = sec_merge_hash_lookup (tab, str, alignment, TRUE);
   if (entry == NULL)
     return NULL;
 
@@ -313,7 +317,7 @@ sec_merge_add (tab, str, alignment, secinfo)
   return entry;
 }
 
-static boolean
+static bfd_boolean
 sec_merge_emit (abfd, entry)
      register bfd *abfd;
      struct sec_merge_hash_entry *entry;
@@ -353,13 +357,13 @@ sec_merge_emit (abfd, entry)
   if (alignment_power)
     free (pad);
 
-  return (boolean) (entry == NULL || entry->secinfo != secinfo);
+  return entry == NULL || entry->secinfo != secinfo;
 }
 
 /* This function is called for each input file from the add_symbols
    pass of the linker.  */
 
-boolean
+bfd_boolean
 _bfd_merge_section (abfd, psinfo, sec, psecinfo)
      bfd *abfd;
      PTR *psinfo;
@@ -375,12 +379,12 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
       || (sec->flags & SEC_EXCLUDE)
       || (sec->flags & SEC_MERGE) == 0
       || sec->entsize == 0)
-    return true;
+    return TRUE;
 
   if ((sec->flags & SEC_RELOC) != 0)
     {
       /* We aren't prepared to handle relocations in merged sections.  */
-      return true;
+      return TRUE;
     }
 
   align = bfd_get_section_alignment (sec->owner, sec);
@@ -396,7 +400,7 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
 	 of alignment.  For non-string constants, alignment must
 	 be smaller than or equal to entity size and entity size
 	 must be integer multiple of alignment.  */
-      return true;
+      return TRUE;
     }
 
   for (sinfo = (struct sec_merge_info *) *psinfo; sinfo; sinfo = sinfo->next)
@@ -446,11 +450,11 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
 				  (bfd_vma) 0, sec->_raw_size))
     goto error_return;
 
-  return true;
+  return TRUE;
 
  error_return:
   *psecinfo = NULL;
-  return false;
+  return FALSE;
 }
 
 /* Compare two sec_merge_hash_entry structures.  This is called via qsort.  */
@@ -533,21 +537,21 @@ last_eq (a, b)
 }
 
 /* Record one section into the hash table.  */
-static boolean
+static bfd_boolean
 record_section (sinfo, secinfo)
      struct sec_merge_info *sinfo;
      struct sec_merge_sec_info *secinfo;
 {
   asection *sec = secinfo->sec;
   struct sec_merge_hash_entry *entry;
-  boolean nul;
+  bfd_boolean nul;
   unsigned char *p, *end;
   bfd_vma mask, eltalign;
   unsigned int align, i;
 
   align = bfd_get_section_alignment (sec->owner, sec);
   end = secinfo->contents + sec->_raw_size;
-  nul = false;
+  nul = FALSE;
   mask = ((bfd_vma) 1 << align) - 1;
   if (sec->flags & SEC_STRINGS)
     {
@@ -567,7 +571,7 @@ record_section (sinfo, secinfo)
 		{
 		  if (!nul && !((p - secinfo->contents) & mask))
 		    {
-		      nul = true;
+		      nul = TRUE;
 		      entry = sec_merge_add (sinfo->htab, "",
 					     (unsigned) mask + 1, secinfo);
 		      if (! entry)
@@ -587,7 +591,7 @@ record_section (sinfo, secinfo)
 		    break;
 		  if (!nul && !((p - secinfo->contents) & mask))
 		    {
-		      nul = true;
+		      nul = TRUE;
 		      entry = sec_merge_add (sinfo->htab, p,
 					     (unsigned) mask + 1, secinfo);
 		      if (! entry)
@@ -608,12 +612,12 @@ record_section (sinfo, secinfo)
 	}
     }
 
-  return true;
+  return TRUE;
 
 error_return:
   for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next)
     *secinfo->psecinfo = NULL;
-  return false;
+  return FALSE;
 }
 
 /* This is a helper function for _bfd_merge_sections.  It attempts to
@@ -643,9 +647,9 @@ merge_strings (sinfo)
   qsort (array, (size_t) sinfo->htab->size,
 	 sizeof (struct sec_merge_hash_entry *), cmplengthentry);
 
-  last4tab = htab_create_alloc ((size_t) sinfo->htab->size * 4, 
+  last4tab = htab_create_alloc ((size_t) sinfo->htab->size * 4,
 				NULL, last4_eq, NULL, calloc, free);
-  lasttab = htab_create_alloc ((size_t) sinfo->htab->size * 4, 
+  lasttab = htab_create_alloc ((size_t) sinfo->htab->size * 4,
 			       NULL, last_eq, NULL, calloc, free);
   if (lasttab == NULL || last4tab == NULL)
     goto alloc_failure;
@@ -765,7 +769,7 @@ alloc_failure:
 /* This function is called once after all SEC_MERGE sections are registered
    with _bfd_merge_section.  */
 
-boolean
+bfd_boolean
 _bfd_merge_sections (abfd, xsinfo, remove_hook)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR xsinfo;
@@ -837,12 +841,12 @@ _bfd_merge_sections (abfd, xsinfo, remove_hook)
 	    secinfo->sec->_cooked_size = 0;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out the merged section.  */
 
-boolean
+bfd_boolean
 _bfd_write_merged_section (output_bfd, sec, psecinfo)
      bfd *output_bfd;
      asection *sec;
@@ -854,16 +858,16 @@ _bfd_write_merged_section (output_bfd, sec, psecinfo)
   secinfo = (struct sec_merge_sec_info *) psecinfo;
 
   if (!secinfo->first)
-    return true;
+    return TRUE;
 
   pos = sec->output_section->filepos + sec->output_offset;
   if (bfd_seek (output_bfd, pos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (! sec_merge_emit (output_bfd, secinfo->first))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust an address in the SEC_MERGE section.  Given OFFSET within
@@ -928,7 +932,7 @@ _bfd_merged_section_offset (output_bfd, psec, psecinfo, offset, addend)
       p = secinfo->contents
 	  + ((offset + addend) / sec->entsize) * sec->entsize;
     }
-  entry = sec_merge_hash_lookup (secinfo->htab, p, 0, false);
+  entry = sec_merge_hash_lookup (secinfo->htab, p, 0, FALSE);
   if (!entry)
     {
       if (! secinfo->htab->strings)
diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c
index f2802ab2a5b..581ace299ec 100644
--- a/bfd/mipsbsd.c
+++ b/bfd/mipsbsd.c
@@ -53,7 +53,7 @@ static void MY(set_arch_mach) PARAMS ((bfd *abfd, unsigned long machtype));
 static void MY(choose_reloc_size) PARAMS ((bfd *abfd));
 
 #define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd));
 
 /* We can't use MY(x) here because it leads to a recursive call to CONCAT2
    when expanded inside JUMP_TABLE.  */
@@ -130,7 +130,7 @@ MY (choose_reloc_size) (abfd)
   Section contents have already been written.  We write the
   file header, symbols, and relocation.  */
 
-static boolean
+static bfd_boolean
 MY (write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -181,7 +181,7 @@ MY (write_object_contents) (abfd)
 
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 /* MIPS relocation types.  */
@@ -290,20 +290,20 @@ mips_fix_hi16_s (abfd, reloc_entry, symbol, data, input_section,
 }
 
 static reloc_howto_type mips_howto_table_ext[] = {
-  {MIPS_RELOC_32,      0, 2, 32, false, 0,  complain_overflow_bitfield, 0,
-	"32",       false, 0, 0xffffffff, false},
-  {MIPS_RELOC_JMP,     2, 2, 26, false, 0, complain_overflow_dont,
+  {MIPS_RELOC_32,      0, 2, 32, FALSE, 0,  complain_overflow_bitfield, 0,
+	"32",       FALSE, 0, 0xffffffff, FALSE},
+  {MIPS_RELOC_JMP,     2, 2, 26, FALSE, 0, complain_overflow_dont,
 	mips_fix_jmp_addr,
-	"MIPS_JMP", false, 0, 0x03ffffff, false},
-  {MIPS_RELOC_WDISP16, 2, 2, 16, true,  0, complain_overflow_signed, 0,
-	"WDISP16",  false, 0, 0x0000ffff, false},
-  {MIPS_RELOC_HI16,   16, 2, 16, false, 0, complain_overflow_bitfield, 0,
-	"HI16",     false, 0, 0x0000ffff, false},
-  {MIPS_RELOC_HI16_S, 16, 2, 16, false, 0, complain_overflow_bitfield,
+	"MIPS_JMP", FALSE, 0, 0x03ffffff, FALSE},
+  {MIPS_RELOC_WDISP16, 2, 2, 16, TRUE,  0, complain_overflow_signed, 0,
+	"WDISP16",  FALSE, 0, 0x0000ffff, FALSE},
+  {MIPS_RELOC_HI16,   16, 2, 16, FALSE, 0, complain_overflow_bitfield, 0,
+	"HI16",     FALSE, 0, 0x0000ffff, FALSE},
+  {MIPS_RELOC_HI16_S, 16, 2, 16, FALSE, 0, complain_overflow_bitfield,
         mips_fix_hi16_s,
-        "HI16_S",   false, 0, 0x0000ffff, false},
-  {MIPS_RELOC_LO16,    0, 2, 16, false, 0, complain_overflow_dont, 0,
-	"LO16",     false, 0, 0x0000ffff, false},
+        "HI16_S",   FALSE, 0, 0x0000ffff, FALSE},
+  {MIPS_RELOC_LO16,    0, 2, 16, FALSE, 0, complain_overflow_dont, 0,
+	"LO16",     FALSE, 0, 0x0000ffff, FALSE},
 };
 
 static reloc_howto_type *
diff --git a/bfd/mmo.c b/bfd/mmo.c
index 96c654e8ee9..f734fa93c87 100644
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -302,7 +302,7 @@ struct mmo_data_struct
 
     /* When we're reading bytes recursively, check this occasionally.
        Also holds write errors.  */
-    boolean have_error;
+    bfd_boolean have_error;
 
     /* Max symbol length that may appear in the lop_stab table.  Note that
        this table might just hold a subset of symbols for not-really large
@@ -342,7 +342,7 @@ struct mmo_section_data_struct
 struct mmo_write_sec_info
   {
     asection *reg_section;
-    boolean retval;
+    bfd_boolean retval;
   };
 
 /* Used when trying to find a section corresponding to addr.  */
@@ -352,73 +352,113 @@ struct mmo_find_sec_info
     bfd_vma addr;
   };
 
-static boolean mmo_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
+static bfd_boolean mmo_bfd_copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
 static void mmo_write_section_unless_reg_contents
  PARAMS ((bfd *, asection *, PTR));
-static void mmo_find_sec_w_addr PARAMS ((bfd *, asection *, PTR));
-static void mmo_find_sec_w_addr_grow PARAMS ((bfd *, asection *, PTR));
-static asection *mmo_make_section PARAMS ((bfd *, const char *));
-static void mmo_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
+static void mmo_find_sec_w_addr
+  PARAMS ((bfd *, asection *, PTR));
+static void mmo_find_sec_w_addr_grow
+  PARAMS ((bfd *, asection *, PTR));
+static asection *mmo_make_section
+  PARAMS ((bfd *, const char *));
+static void mmo_get_symbol_info
+  PARAMS ((bfd *, asymbol *, symbol_info *));
 static void mmo_print_symbol
- PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-static void mmo_init PARAMS ((void));
-static boolean mmo_mkobject PARAMS ((bfd *));
-static boolean mmo_scan PARAMS ((bfd *));
-static asection *mmo_decide_section PARAMS ((bfd *, bfd_vma));
-static asection *mmo_get_generic_spec_data_section PARAMS ((bfd *, int));
-static asection *mmo_get_spec_section PARAMS ((bfd *, int));
-static INLINE bfd_byte *mmo_get_loc PARAMS ((asection *, bfd_vma, int));
-static void mmo_xore_64 PARAMS ((asection *, bfd_vma vma, bfd_vma value));
-static void mmo_xore_32 PARAMS ((asection *, bfd_vma vma, unsigned int));
-static void mmo_xore_16 PARAMS ((asection *, bfd_vma vma, unsigned int));
-static const bfd_target *mmo_object_p PARAMS ((bfd *));
-static void mmo_map_set_sizes PARAMS ((bfd *, asection *, PTR));
-static boolean mmo_get_symbols PARAMS ((bfd *));
-static boolean mmo_create_symbol PARAMS ((bfd *, const char *, bfd_vma,
-					  enum mmo_sym_type, unsigned int));
-static boolean mmo_get_section_contents
+  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
+static void mmo_init
+  PARAMS ((void));
+static bfd_boolean mmo_mkobject
+  PARAMS ((bfd *));
+static bfd_boolean mmo_scan
+  PARAMS ((bfd *));
+static asection *mmo_decide_section
+  PARAMS ((bfd *, bfd_vma));
+static asection *mmo_get_generic_spec_data_section
+  PARAMS ((bfd *, int));
+static asection *mmo_get_spec_section
+  PARAMS ((bfd *, int));
+static INLINE bfd_byte *mmo_get_loc
+  PARAMS ((asection *, bfd_vma, int));
+static void mmo_xore_64
+  PARAMS ((asection *, bfd_vma vma, bfd_vma value));
+static void mmo_xore_32
+  PARAMS ((asection *, bfd_vma vma, unsigned int));
+static void mmo_xore_16
+  PARAMS ((asection *, bfd_vma vma, unsigned int));
+static const bfd_target *mmo_object_p
+  PARAMS ((bfd *));
+static void mmo_map_set_sizes
+  PARAMS ((bfd *, asection *, PTR));
+static bfd_boolean mmo_get_symbols
+  PARAMS ((bfd *));
+static bfd_boolean mmo_create_symbol
+  PARAMS ((bfd *, const char *, bfd_vma, enum mmo_sym_type, unsigned int));
+static bfd_boolean mmo_get_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static long mmo_get_symtab_upper_bound PARAMS ((bfd *));
-static long mmo_get_symtab PARAMS ((bfd *, asymbol **));
-static void mmo_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static void mmo_print_symbol PARAMS ((bfd *, PTR, asymbol *,
-				      bfd_print_symbol_type));
-static boolean mmo_set_section_contents
+static long mmo_get_symtab_upper_bound
+  PARAMS ((bfd *));
+static long mmo_get_symtab
+  PARAMS ((bfd *, asymbol **));
+static void mmo_get_symbol_info
+  PARAMS ((bfd *, asymbol *, symbol_info *));
+static void mmo_print_symbol
+  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
+static bfd_boolean mmo_set_section_contents
   PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
-static int mmo_sizeof_headers PARAMS ((bfd *, boolean));
-static long mmo_get_reloc_upper_bound PARAMS ((bfd *, asection *));
+static int mmo_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+static long mmo_get_reloc_upper_bound
+  PARAMS ((bfd *, asection *));
 
-static boolean mmo_internal_write_header PARAMS ((bfd *));
-static boolean mmo_internal_write_post PARAMS ((bfd *, int, asection *));
-static boolean mmo_internal_add_3_sym
- PARAMS ((bfd *, struct mmo_symbol_trie *, const struct mmo_symbol *));
+static bfd_boolean mmo_internal_write_header
+  PARAMS ((bfd *));
+static bfd_boolean mmo_internal_write_post
+  PARAMS ((bfd *, int, asection *));
+static bfd_boolean mmo_internal_add_3_sym
+  PARAMS ((bfd *, struct mmo_symbol_trie *, const struct mmo_symbol *));
 static unsigned int mmo_internal_3_length
- PARAMS ((bfd *, struct mmo_symbol_trie *));
+  PARAMS ((bfd *, struct mmo_symbol_trie *));
 static void mmo_internal_3_dump
- PARAMS ((bfd *, struct mmo_symbol_trie *));
-static void mmo_beb128_out PARAMS ((bfd *, int, int));
-static boolean mmo_internal_write_section
+  PARAMS ((bfd *, struct mmo_symbol_trie *));
+static void mmo_beb128_out
+  PARAMS ((bfd *, int, int));
+static bfd_boolean mmo_internal_write_section
   PARAMS ((bfd *, asection *));
-static void mmo_write_tetra PARAMS ((bfd *, unsigned int));
-static void mmo_write_tetra_raw PARAMS ((bfd *, unsigned int));
-static void mmo_write_octa PARAMS ((bfd *, bfd_vma));
-static void mmo_write_octa_raw PARAMS ((bfd *, bfd_vma));
-static boolean mmo_write_chunk
+static void mmo_write_tetra
+  PARAMS ((bfd *, unsigned int));
+static void mmo_write_tetra_raw
+  PARAMS ((bfd *, unsigned int));
+static void mmo_write_octa
+  PARAMS ((bfd *, bfd_vma));
+static void mmo_write_octa_raw
+  PARAMS ((bfd *, bfd_vma));
+static bfd_boolean mmo_write_chunk
   PARAMS ((bfd *, const bfd_byte *, unsigned int));
-static boolean mmo_flush_chunk PARAMS ((bfd *));
-static boolean mmo_write_loc_chunk
+static bfd_boolean mmo_flush_chunk
+  PARAMS ((bfd *));
+static bfd_boolean mmo_write_loc_chunk
   PARAMS ((bfd *, bfd_vma, const bfd_byte *, unsigned int, bfd_vma *));
-static boolean mmo_write_chunk_list PARAMS ((bfd *, mmo_data_list_type *));
-static boolean mmo_write_loc_chunk_list
+static bfd_boolean mmo_write_chunk_list
   PARAMS ((bfd *, mmo_data_list_type *));
-static boolean mmo_write_symbols_and_terminator PARAMS ((bfd *));
-static flagword mmo_sec_flags_from_bfd_flags PARAMS ((flagword));
-static flagword bfd_sec_flags_from_mmo_flags PARAMS ((flagword));
-static bfd_byte mmo_get_byte PARAMS ((bfd *));
-static void mmo_write_byte PARAMS ((bfd *, bfd_byte));
-static boolean mmo_new_section_hook PARAMS ((bfd *, asection *));
-static int mmo_sort_mmo_symbols PARAMS ((const PTR, const PTR));
-static boolean mmo_write_object_contents PARAMS ((bfd *));
+static bfd_boolean mmo_write_loc_chunk_list
+  PARAMS ((bfd *, mmo_data_list_type *));
+static bfd_boolean mmo_write_symbols_and_terminator
+  PARAMS ((bfd *));
+static flagword mmo_sec_flags_from_bfd_flags
+  PARAMS ((flagword));
+static flagword bfd_sec_flags_from_mmo_flags
+  PARAMS ((flagword));
+static bfd_byte mmo_get_byte
+  PARAMS ((bfd *));
+static void mmo_write_byte
+  PARAMS ((bfd *, bfd_byte));
+static bfd_boolean mmo_new_section_hook
+  PARAMS ((bfd *, asection *));
+static int mmo_sort_mmo_symbols
+  PARAMS ((const PTR, const PTR));
+static bfd_boolean mmo_write_object_contents
+  PARAMS ((bfd *));
 static long mmo_canonicalize_reloc
   PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
 
@@ -475,7 +515,7 @@ mmo_make_section (abfd, secname)
 static void
 mmo_init ()
 {
-  static boolean inited = false;
+  static bfd_boolean inited = FALSE;
   int i = 0;
   int j = 0;
   static const char letters[]
@@ -483,7 +523,7 @@ mmo_init ()
 
   if (inited)
     return;
-  inited = true;
+  inited = TRUE;
 
   /* Fill in the set of valid symbol characters.  */
   strcpy (valid_mmo_symbol_character_set, letters);
@@ -563,7 +603,7 @@ mmo_object_p (abfd)
 
 /* Set up the mmo tdata information.  */
 
-static boolean
+static bfd_boolean
 mmo_mkobject (abfd)
      bfd *abfd;
 {
@@ -577,7 +617,7 @@ mmo_mkobject (abfd)
 	 initialize most.  */
       tdata_type *tdata = (tdata_type *) bfd_zmalloc (sizeof (tdata_type));
       if (tdata == NULL)
-	return false;
+	return FALSE;
 
       created = time (NULL);
       bfd_put_32 (abfd, created, tdata->created);
@@ -585,24 +625,24 @@ mmo_mkobject (abfd)
       abfd->tdata.mmo_data = tdata;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 mmo_bfd_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   if (bfd_get_flavour (ibfd) != bfd_target_mmo_flavour
       || bfd_get_flavour (obfd) != bfd_target_mmo_flavour)
-    return true;
+    return TRUE;
 
   /* Copy the time the copied-from file was created.  If people want the
      time the file was last *modified*, they have that in the normal file
      information.  */
   memcpy (obfd->tdata.mmo_data->created, ibfd->tdata.mmo_data->created,
 	  sizeof (obfd->tdata.mmo_data->created));
-  return true;
+  return TRUE;
 }
 
 /* Helper functions for mmo_decide_section, used through
@@ -775,7 +815,7 @@ mmo_write_tetra_raw (abfd, value)
   bfd_put_32 (abfd, value, buf);
 
   if (bfd_bwrite ((PTR) buf, 4, abfd) != 4)
-    abfd->tdata.mmo_data->have_error = true;
+    abfd->tdata.mmo_data->have_error = TRUE;
 }
 
 /* Write a 32-bit word to output file; lop_quote if necessary.  */
@@ -816,13 +856,13 @@ mmo_write_octa_raw (abfd, value)
 /* Write quoted contents.  Intended to be called multiple times in
    sequence, followed by a call to mmo_flush_chunk.  */
 
-static INLINE boolean
+static INLINE bfd_boolean
 mmo_write_chunk (abfd, loc, len)
      bfd *abfd;
      const bfd_byte *loc;
      unsigned int len;
 {
-  boolean retval = true;
+  bfd_boolean retval = TRUE;
 
   /* Fill up a tetra from bytes remaining from a previous chunk.  */
   if (abfd->tdata.mmo_data->byte_no != 0)
@@ -861,14 +901,14 @@ mmo_write_chunk (abfd, loc, len)
     }
 
   if (! retval)
-    abfd->tdata.mmo_data->have_error = true;
+    abfd->tdata.mmo_data->have_error = TRUE;
   return retval;
 }
 
 /* Flush remaining bytes, from a previous mmo_write_chunk, zero-padded to
    4 bytes.  */
 
-static INLINE boolean
+static INLINE bfd_boolean
 mmo_flush_chunk (abfd)
      bfd *abfd;
 {
@@ -886,14 +926,14 @@ mmo_flush_chunk (abfd)
 
 /* Same, but from a list.  */
 
-static INLINE boolean
+static INLINE bfd_boolean
 mmo_write_chunk_list (abfd, datap)
      bfd *abfd;
      mmo_data_list_type *datap;
 {
   for (; datap != NULL; datap = datap->next)
     if (! mmo_write_chunk (abfd, datap->data, datap->size))
-      return false;
+      return FALSE;
 
   return mmo_flush_chunk (abfd);
 }
@@ -902,7 +942,7 @@ mmo_write_chunk_list (abfd, datap)
    mmo_flush_chunk after calling this function.  The location is only
    output if different than *LAST_VMAP, which is updated after this call.  */
 
-static boolean
+static bfd_boolean
 mmo_write_loc_chunk (abfd, vma, loc, len, last_vmap)
      bfd *abfd;
      bfd_vma vma;
@@ -953,7 +993,7 @@ mmo_write_loc_chunk (abfd, vma, loc, len, last_vmap)
 
 /* Same, but from a list.  */
 
-static INLINE boolean
+static INLINE bfd_boolean
 mmo_write_loc_chunk_list (abfd, datap)
      bfd *abfd;
      mmo_data_list_type *datap;
@@ -964,7 +1004,7 @@ mmo_write_loc_chunk_list (abfd, datap)
   for (; datap != NULL; datap = datap->next)
     if (! mmo_write_loc_chunk (abfd, datap->where, datap->data, datap->size,
 			       &last_vma))
-      return false;
+      return FALSE;
 
   return mmo_flush_chunk (abfd);
 }
@@ -1169,7 +1209,7 @@ mmo_get_byte (abfd)
       if (! abfd->tdata.mmo_data->have_error
 	  && bfd_bread (abfd->tdata.mmo_data->buf, 4, abfd) != 4)
 	{
-	  abfd->tdata.mmo_data->have_error = true;
+	  abfd->tdata.mmo_data->have_error = TRUE;
 
 	  /* A value somewhat safe against tripping on some inconsistency
 	     when mopping up after this error.  */
@@ -1195,13 +1235,13 @@ mmo_write_byte (abfd, value)
     {
       if (! abfd->tdata.mmo_data->have_error
 	  && bfd_bwrite (abfd->tdata.mmo_data->buf, 4, abfd) != 4)
-	abfd->tdata.mmo_data->have_error = true;
+	abfd->tdata.mmo_data->have_error = TRUE;
     }
 }
 
 /* Create a symbol.  */
 
-static boolean
+static bfd_boolean
 mmo_create_symbol (abfd, symname, addr, sym_type, serno)
      bfd *abfd;
      const char *symname;
@@ -1213,11 +1253,11 @@ mmo_create_symbol (abfd, symname, addr, sym_type, serno)
 
   n = (struct mmo_symbol *) bfd_alloc (abfd, sizeof (struct mmo_symbol));
   if (n == NULL)
-    return false;
+    return FALSE;
 
   n->name = bfd_alloc (abfd, strlen (symname) + 1);
   if (n->name == NULL)
-    return false;
+    return FALSE;
 
   strcpy ((PTR) n->name, symname);
 
@@ -1245,15 +1285,15 @@ mmo_create_symbol (abfd, symname, addr, sym_type, serno)
 	(_("%s: invalid mmo file: initialization value for $255 is not `Main'\n"),
 	 bfd_get_filename (abfd));
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Read in symbols.  */
 
-static boolean
+static bfd_boolean
 mmo_get_symbols (abfd)
      bfd *abfd;
 {
@@ -1360,7 +1400,7 @@ SUBSECTION
 
   /* Check first if we have a bad hair day.  */
   if (abfd->tdata.mmo_data->have_error)
-    return false;
+    return FALSE;
 
   if (m & MMO3_LEFT)
     /* Traverse left trie. */
@@ -1393,8 +1433,8 @@ SUBSECTION
 		 bfd_get_filename (abfd), c, c2,
 		 abfd->tdata.mmo_data->lop_stab_symbol);
 	      bfd_set_error (bfd_error_bad_value);
-	      abfd->tdata.mmo_data->have_error = true;
-	      return false;
+	      abfd->tdata.mmo_data->have_error = TRUE;
+	      return FALSE;
 	    }
 	  else
 	    c = c2;
@@ -1448,7 +1488,7 @@ SUBSECTION
 				      abfd->tdata.mmo_data->lop_stab_symbol
 				      + 1,
 				      addr, sym_type, serno))
-	    abfd->tdata.mmo_data->have_error = true;
+	    abfd->tdata.mmo_data->have_error = TRUE;
 	}
 
       if (m & MMO3_MIDDLE)
@@ -1586,13 +1626,13 @@ mmo_map_set_sizes (abfd, sec, ignored)
 
 /* Read the mmo file and turn it into sections.  */
 
-static boolean
+static bfd_boolean
 mmo_scan (abfd)
      bfd *abfd;
 {
   unsigned int i;
   unsigned int lineno = 1;
-  boolean error = false;
+  bfd_boolean error = FALSE;
   bfd_vma vma = 0;
   asection *sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME);
   asection *non_spec_sec = NULL;
@@ -2039,7 +2079,7 @@ mmo_scan (abfd)
     bfd_set_error (bfd_error_bad_value);
 
  error_return:
-  error = true;
+  error = TRUE;
  done:
   /* Mark the .text and .data section with their normal attribute if they
      contain anything.  This is not redundant wrt. mmo_decide_section,
@@ -2051,7 +2091,7 @@ mmo_scan (abfd)
       && ! bfd_set_section_flags (abfd, sec,
 				  bfd_get_section_flags (abfd, sec)
 				  | SEC_ALLOC | SEC_LOAD | SEC_CODE))
-    error = true;
+    error = TRUE;
 
   sec = bfd_get_section_by_name (abfd, MMO_DATA_SECTION_NAME);
   if (sec != NULL
@@ -2059,7 +2099,7 @@ mmo_scan (abfd)
       && ! bfd_set_section_flags (abfd, sec,
 				  bfd_get_section_flags (abfd, sec)
 				  | SEC_ALLOC | SEC_LOAD))
-    error = true;
+    error = TRUE;
 
   /* Free whatever resources we took.  */
   for (i = 0; i < sizeof (file_names) / sizeof (file_names[0]); i++)
@@ -2071,7 +2111,7 @@ mmo_scan (abfd)
 /* A hook to set up object file dependent section information.  For mmo,
    we point out the shape of allocated section contents.  */
 
-static boolean
+static bfd_boolean
 mmo_new_section_hook (abfd, newsect)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *newsect;
@@ -2082,17 +2122,17 @@ mmo_new_section_hook (abfd, newsect)
     (PTR) bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct));
 
   if (!newsect->used_by_bfd)
-    return false;
+    return FALSE;
 
   /* Always align to at least 32-bit words.  */
   newsect->alignment_power = 2;
-  return true;
+  return TRUE;
 }
 
 /* We already have section contents loaded for sections that have
    contents.  */
 
-static boolean
+static bfd_boolean
 mmo_get_section_contents (abfd, sec, location, offset, bytes_to_do)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
@@ -2116,7 +2156,7 @@ mmo_get_section_contents (abfd, sec, location, offset, bytes_to_do)
       while (loc == NULL && (chunk_size /= 2) != 0);
 
       if (chunk_size == 0)
-	return false;
+	return FALSE;
 
       memcpy (location, loc, chunk_size);
 
@@ -2124,7 +2164,7 @@ mmo_get_section_contents (abfd, sec, location, offset, bytes_to_do)
       bytes_to_do -= chunk_size;
       offset += chunk_size;
     }
-  return true;
+  return TRUE;
 }
 
 /* Return the amount of memory needed to read the symbol table.  */
@@ -2191,7 +2231,7 @@ mmo_get_symtab (abfd, alocation)
 
       csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
       if (csymbols == NULL && symcount != 0)
-	return false;
+	return FALSE;
       abfd->tdata.mmo_data->csymbols = csymbols;
 
       for (msp = (struct mmo_symbol **) alocation, c = csymbols;
@@ -2289,27 +2329,27 @@ mmo_print_symbol (abfd, afile, symbol, how)
 static int
 mmo_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
 
 /* Write the (section-neutral) file preamble.  */
 
-static boolean
+static bfd_boolean
 mmo_internal_write_header (abfd)
      bfd *abfd;
 {
   const char lop_pre_bfd[] = { LOP, LOP_PRE, 1, 1};
 
   if (bfd_bwrite (lop_pre_bfd, 4, abfd) != 4)
-    return false;
+    return FALSE;
 
   /* Copy creation time of original file.  */
   if (bfd_bwrite (abfd->tdata.mmo_data->created, 4, abfd) != 4)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Write the LOP_POST record, with global register initializations.
@@ -2317,7 +2357,7 @@ mmo_internal_write_header (abfd)
    registers at DATA.  The Z = 255 field is filled in with the
    start-address.  */
 
-static boolean
+static bfd_boolean
 mmo_internal_write_post (abfd, z, sec)
      bfd *abfd;
      int z;
@@ -2332,7 +2372,7 @@ mmo_internal_write_post (abfd, z, sec)
       bfd_byte *data = mmo_get_loc (sec, i * 8, 8);
 
       if (bfd_bwrite (data, 8, abfd) != 8)
-	return false;
+	return FALSE;
     }
 
   /* For Z == $255, we always emit the start location; supposedly Main,
@@ -2404,7 +2444,7 @@ bfd_sec_flags_from_mmo_flags (flags)
 
 /* Write a section.  */
 
-static boolean
+static bfd_boolean
 mmo_internal_write_section (abfd, sec)
      bfd *abfd;
      asection *sec;
@@ -2438,7 +2478,7 @@ mmo_internal_write_section (abfd, sec)
       /* This would normally be an abort call since this can't happen, but
          we don't do that.  */
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
   else if (strncmp (sec->name, MMIX_OTHER_SPEC_SECTION_PREFIX,
 		    strlen (MMIX_OTHER_SPEC_SECTION_PREFIX)) == 0)
@@ -2565,7 +2605,7 @@ EXAMPLE
       /* Writing a LOP_LOC ends the LOP_SPEC data, and makes data actually
 	 loaded.  */
       if (bfd_get_section_flags (abfd, sec) & SEC_LOAD)
-	  return 
+	  return
 	    ! abfd->tdata.mmo_data->have_error
 	    && mmo_write_loc_chunk_list (abfd,
 					 ((struct mmo_section_data_struct *)
@@ -2576,12 +2616,12 @@ EXAMPLE
 				 ((struct mmo_section_data_struct *)
 				  (sec->used_by_bfd))->head);
     }
-  return true;
+  return TRUE;
 }
 
 /* We save up all data before output.  */
 
-static boolean
+static bfd_boolean
 mmo_set_section_contents (abfd, sec, location, offset, bytes_to_do)
      bfd *abfd ATTRIBUTE_UNUSED;
      sec_ptr sec;
@@ -2604,7 +2644,7 @@ mmo_set_section_contents (abfd, sec, location, offset, bytes_to_do)
       while (loc == NULL && (chunk_size /= 2) != 0);
 
       if (chunk_size == 0)
-	return false;
+	return FALSE;
 
       memcpy (loc, location, chunk_size);
 
@@ -2612,12 +2652,12 @@ mmo_set_section_contents (abfd, sec, location, offset, bytes_to_do)
       bytes_to_do -= chunk_size;
       offset += chunk_size;
     }
-  return true;
+  return TRUE;
 }
 
 /* Add a symbol to a trie-tree.  */
 
-static boolean
+static bfd_boolean
 mmo_internal_add_3_sym (abfd, rootp, symp)
      bfd *abfd;
      struct mmo_symbol_trie *rootp;
@@ -2670,11 +2710,11 @@ mmo_internal_add_3_sym (abfd, rootp, symp)
 	(_("%s: invalid symbol table: duplicate symbol `%s'\n"),
 	 bfd_get_filename (abfd), trie->sym.name);
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   memcpy (&trie->sym, symp, sizeof *symp);
-  return true;
+  return TRUE;
 }
 
 /* Find out the length of the serialized version of a trie in bytes.  */
@@ -2849,7 +2889,7 @@ mmo_internal_3_dump (abfd, trie)
 
 /* Write symbols in mmo format.  Also write the lop_end terminator.  */
 
-static boolean
+static bfd_boolean
 mmo_write_symbols_and_terminator (abfd)
      bfd *abfd;
 {
@@ -2882,7 +2922,7 @@ mmo_write_symbols_and_terminator (abfd)
      symbols.  Make sure we have room for it.  */
   table = bfd_alloc (abfd, (count + 1) * sizeof (asymbol *));
   if (table == NULL)
-    return false;
+    return FALSE;
 
   memcpy (table, orig_table, count * sizeof (asymbol *));
 
@@ -2922,7 +2962,7 @@ mmo_write_symbols_and_terminator (abfd)
  than the start address %s\n"),
 	       bfd_get_filename (abfd), vmas_main, vmas_start);
 	    bfd_set_error (bfd_error_bad_value);
-	    return false;
+	    return FALSE;
 	  }
 	break;
       }
@@ -2985,7 +3025,7 @@ mmo_write_symbols_and_terminator (abfd)
 	  sym.serno = serno++;
 
 	  if (! mmo_internal_add_3_sym (abfd, &root, &sym))
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -3026,7 +3066,7 @@ mmo_write_symbols_and_terminator (abfd)
       root.right = NULL;
 
       if (! mmo_internal_add_3_sym (abfd, &root, &sym))
-	return false;
+	return FALSE;
 
       root.symchar = ':';
       root.middle = root.left;
@@ -3042,7 +3082,7 @@ mmo_write_symbols_and_terminator (abfd)
   /* Put out the lop_stab mark.  */
   bfd_put_32 (abfd, (LOP << 24) | (LOP_STAB << 16), buf);
   if (bfd_bwrite (buf, 4, abfd) != 4)
-    return false;
+    return FALSE;
 
   /* Dump out symbols.  */
   mmo_internal_3_dump (abfd, &root);
@@ -3058,7 +3098,7 @@ mmo_write_symbols_and_terminator (abfd)
 	 bfd_get_filename (abfd), trie_len,
 	 (abfd->tdata.mmo_data->byte_no + 3)/4);
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   /* Dump out remaining bytes in the buffer and handle I/O errors by
@@ -3071,7 +3111,7 @@ mmo_write_symbols_and_terminator (abfd)
 
       if (abfd->tdata.mmo_data->have_error
 	  || bfd_bwrite (abfd->tdata.mmo_data->buf, 4, abfd) != 4)
-	return false;
+	return FALSE;
     }
 
   bfd_put_32 (abfd, (LOP << 24) | (LOP_END << 16) | trie_len, buf);
@@ -3112,7 +3152,7 @@ mmo_write_section_unless_reg_contents (abfd, sec, p)
  contents\n"),
 	     bfd_get_filename (abfd), sec->name);
 	  bfd_set_error (bfd_error_bad_value);
-	  infop->retval = false;
+	  infop->retval = FALSE;
 	  return;
 	}
 
@@ -3125,7 +3165,7 @@ mmo_write_section_unless_reg_contents (abfd, sec, p)
 /* Do the actual output of a file.  Assumes mmo_set_section_contents is
    already called. */
 
-static boolean
+static bfd_boolean
 mmo_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -3133,16 +3173,16 @@ mmo_write_object_contents (abfd)
 
   /* First, there are a few words of preamble.  */
   if (! mmo_internal_write_header (abfd))
-    return false;
+    return FALSE;
 
   wsecinfo.reg_section = NULL;
-  wsecinfo.retval = true;
+  wsecinfo.retval = TRUE;
 
   bfd_map_over_sections (abfd, mmo_write_section_unless_reg_contents,
 			 (PTR) &wsecinfo);
 
   if (! wsecinfo.retval)
-    return false;
+    return FALSE;
 
   if (wsecinfo.reg_section != NULL)
     {
@@ -3177,15 +3217,15 @@ mmo_write_object_contents (abfd)
 	       (long) sec->_raw_size,
 	       (unsigned long) (sec->vma >> 32), (unsigned long) (sec->vma));
 
-	  return false;
+	  return FALSE;
 	}
 
       if (! mmo_internal_write_post (abfd, z, sec))
-	return false;
+	return FALSE;
     }
   else
     if (! mmo_internal_write_post (abfd, 255, NULL))
-      return false;
+      return FALSE;
 
   return mmo_write_symbols_and_terminator (abfd);
 }
diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c
index 2787c46eb89..a9f1260271c 100644
--- a/bfd/netbsd-core.c
+++ b/bfd/netbsd-core.c
@@ -40,12 +40,16 @@ struct netbsd_core_struct {
 
 /* forward declarations */
 
-static const bfd_target *netbsd_core_file_p PARAMS ((bfd *abfd));
-static char *netbsd_core_file_failing_command PARAMS ((bfd *abfd));
-static int netbsd_core_file_failing_signal PARAMS ((bfd *abfd));
-static boolean netbsd_core_file_matches_executable_p
+static const bfd_target *netbsd_core_file_p
+  PARAMS ((bfd *abfd));
+static char *netbsd_core_file_failing_command
+  PARAMS ((bfd *abfd));
+static int netbsd_core_file_failing_signal
+  PARAMS ((bfd *abfd));
+static bfd_boolean netbsd_core_file_matches_executable_p
   PARAMS ((bfd *core_bfd, bfd *exec_bfd));
-static void swap_abort PARAMS ((void));
+static void swap_abort
+  PARAMS ((void));
 
 /* Handle NetBSD-style core dump file.  */
 
@@ -185,12 +189,12 @@ netbsd_core_file_failing_signal (abfd)
 }
 
 /* ARGSUSED */
-static boolean
+static bfd_boolean
 netbsd_core_file_matches_executable_p  (core_bfd, exec_bfd)
      bfd *core_bfd ATTRIBUTE_UNUSED;
      bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
-  return true;		/* FIXME, We have no way of telling at this point */
+  return TRUE;		/* FIXME, We have no way of telling at this point */
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
diff --git a/bfd/netbsd.h b/bfd/netbsd.h
index 05580328b05..04a4eabfdfd 100644
--- a/bfd/netbsd.h
+++ b/bfd/netbsd.h
@@ -1,5 +1,5 @@
 /* BFD back-end definitions used by all NetBSD targets.
-   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 2000
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 2000, 2002
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -64,7 +64,7 @@ USA.  */
 #define MY_entry_is_text_address 1
 
 #define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd));
 #define MY_text_includes_header 1
 
 #include "aout-target.h"
@@ -73,7 +73,7 @@ static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
    Section contents have already been written.  We write the
    file header, symbols, and relocation.  */
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -114,5 +114,5 @@ MY(write_object_contents) (abfd)
 
   WRITE_HEADERS(abfd, execp);
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/nlm.c b/bfd/nlm.c
index 1c1498b1733..ec3237f3ce5 100644
--- a/bfd/nlm.c
+++ b/bfd/nlm.c
@@ -1,5 +1,5 @@
 /* NLM (NetWare Loadable Module) executable support for BFD.
-   Copyright 1993, 1994, 2001 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -25,26 +25,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Make an NLM object.  We just need to allocate the backend
    information.  */
 
-boolean
+bfd_boolean
 nlm_mkobject (abfd)
      bfd * abfd;
 {
   bfd_size_type amt = sizeof (struct nlm_obj_tdata);
   nlm_tdata (abfd) = (struct nlm_obj_tdata *) bfd_zalloc (abfd, amt);
   if (nlm_tdata (abfd) == NULL)
-    return (false);
+    return FALSE;
 
   if (nlm_architecture (abfd) != bfd_arch_unknown)
     bfd_default_set_arch_mach (abfd, nlm_architecture (abfd),
 			       nlm_machine (abfd));
 
   /* since everything is done at close time, do we need any initialization? */
-  return (true);
+  return TRUE;
 }
 
 /* Set the architecture and machine for an NLM object.  */
 
-boolean
+bfd_boolean
 nlm_set_arch_mach (abfd, arch, machine)
      bfd * abfd;
      enum bfd_architecture arch;
diff --git a/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c
index 6099c2b016e..7f74b52c0a4 100644
--- a/bfd/nlm32-alpha.c
+++ b/bfd/nlm32-alpha.c
@@ -33,30 +33,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "libnlm.h"
 
-static boolean nlm_alpha_backend_object_p
+static bfd_boolean nlm_alpha_backend_object_p
   PARAMS ((bfd *));
-static boolean nlm_alpha_write_prefix
+static bfd_boolean nlm_alpha_write_prefix
   PARAMS ((bfd *));
-static boolean nlm_alpha_read_reloc
+static bfd_boolean nlm_alpha_read_reloc
   PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_alpha_mangle_relocs
+static bfd_boolean nlm_alpha_mangle_relocs
   PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_alpha_read_import
+static bfd_boolean nlm_alpha_read_import
   PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static boolean nlm_alpha_write_import
+static bfd_boolean nlm_alpha_write_import
   PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_alpha_set_public_section
+static bfd_boolean nlm_alpha_set_public_section
   PARAMS ((bfd *, nlmNAME(symbol_type) *));
 static bfd_vma nlm_alpha_get_public_offset
   PARAMS ((bfd *, asymbol *));
-static boolean nlm_alpha_write_external
+static bfd_boolean nlm_alpha_write_external
   PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
 
 /* Alpha NLM's have a prefix header before the standard NLM.  This
    function reads it in, verifies the version, and seeks the bfd to
    the location before the regular NLM header.  */
 
-static boolean
+static bfd_boolean
 nlm_alpha_backend_object_p (abfd)
      bfd *abfd;
 {
@@ -64,24 +64,24 @@ nlm_alpha_backend_object_p (abfd)
   file_ptr size;
 
   if (bfd_bread ((PTR) &s, (bfd_size_type) sizeof s, abfd) != sizeof s)
-    return false;
+    return FALSE;
 
   if (H_GET_32 (abfd, s.magic) != NLM32_ALPHA_MAGIC)
-    return false;
+    return FALSE;
 
   /* FIXME: Should we check the format number?  */
 
   /* Skip to the end of the header.  */
   size = H_GET_32 (abfd, s.size);
   if (bfd_seek (abfd, size, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Write out the prefix.  */
 
-static boolean
+static bfd_boolean
 nlm_alpha_write_prefix (abfd)
      bfd *abfd;
 {
@@ -92,8 +92,8 @@ nlm_alpha_write_prefix (abfd)
   H_PUT_32 (abfd, 2, s.format);
   H_PUT_32 (abfd, sizeof s, s.size);
   if (bfd_bwrite ((PTR) &s, (bfd_size_type) sizeof s, abfd) != sizeof s)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* How to process the various reloc types.  */
@@ -107,45 +107,45 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "IGNORE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit reference to a symbol.  */
   HOWTO (ALPHA_R_REFLONG,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "REFLONG",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit reference to a symbol.  */
   HOWTO (ALPHA_R_REFQUAD,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "REFQUAD",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffffffffffff,	/* src_mask */
 	 0xffffffffffffffff,	/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit GP relative offset.  This is just like REFLONG except
      that when the value is used the value of the gp register will be
@@ -154,15 +154,15 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPREL32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Used for an instruction that refers to memory off the GP
      register.  The offset is 16 bits of the 32 bit instruction.  This
@@ -171,15 +171,15 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "LITERAL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* This reloc only appears immediately following a LITERAL reloc.
      It identifies a use of the literal.  It seems that the linker can
@@ -194,15 +194,15 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "LITUSE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Load the gp register.  This is always used for a ldah instruction
      which loads the upper 16 bits of the gp register.  The next reloc
@@ -219,15 +219,15 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPDISP",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 21 bit branch.  The native assembler generates these for
      branches within the text segment, and also fills in the PC
@@ -237,90 +237,90 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 21,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "BRADDR",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0x1fffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A hint for a jump to a register.  */
   HOWTO (ALPHA_R_HINT,		/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 14,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "HINT",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x3fff,		/* src_mask */
 	 0x3fff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "SREL64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffffffffffff,	/* src_mask */
 	 0xffffffffffffffff,	/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Push a value on the reloc evaluation stack.  */
   HOWTO (ALPHA_R_OP_PUSH,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "OP_PUSH",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Store the value from the stack at the given address.  Store it in
      a bitfield of size r_size starting at bit position r_offset.  */
@@ -328,15 +328,15 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "OP_STORE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0xffffffffffffffff,	/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Subtract the reloc address from the value on the top of the
      relocation stack.  */
@@ -344,15 +344,15 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "OP_PSUB",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Shift the value on the top of the relocation stack right by the
      given value.  */
@@ -360,30 +360,30 @@ static reloc_howto_type nlm32_alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			 /* special_function */
 	 "OP_PRSHIFT",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Adjust the GP value for a new range in the object file.  */
   HOWTO (ALPHA_R_GPVALUE,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "GPVALUE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false)			/* pcrel_offset */
+	 FALSE)			/* pcrel_offset */
 };
 
 static reloc_howto_type nlm32_alpha_nw_howto =
@@ -391,21 +391,21 @@ static reloc_howto_type nlm32_alpha_nw_howto =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "NW_RELOC",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* Read an Alpha NLM reloc.  This routine keeps some static data which
    it uses when handling local relocs.  This only works correctly
    because all the local relocs are read at once.  */
 
-static boolean
+static bfd_boolean
 nlm_alpha_read_reloc (abfd, sym, secp, rel)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -422,7 +422,7 @@ nlm_alpha_read_reloc (abfd, sym, secp, rel)
 
   /* Read the reloc from the file.  */
   if (bfd_bread (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
-    return false;
+    return FALSE;
 
   /* Swap in the reloc information.  */
   r_vaddr = H_GET_64 (abfd, ext.r_vaddr);
@@ -596,12 +596,12 @@ nlm_alpha_read_reloc (abfd, sym, secp, rel)
   else
     rel->howto = &nlm32_alpha_howto_table[r_type];
 
-  return true;
+  return TRUE;
 }
 
 /* Mangle Alpha NLM relocs for output.  */
 
-static boolean
+static bfd_boolean
 nlm_alpha_mangle_relocs (abfd, sec, data, offset, count)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
@@ -609,12 +609,12 @@ nlm_alpha_mangle_relocs (abfd, sec, data, offset, count)
      bfd_vma offset ATTRIBUTE_UNUSED;
      bfd_size_type count ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Read an ALPHA NLM import record */
 
-static boolean
+static bfd_boolean
 nlm_alpha_read_import (abfd, sym)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -628,13 +628,13 @@ nlm_alpha_read_import (abfd, sym)
 
   if (bfd_bread ((PTR) &symlength, (bfd_size_type) sizeof (symlength), abfd)
       != sizeof (symlength))
-    return false;
+    return FALSE;
   sym -> symbol.the_bfd = abfd;
   name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
   if (name == NULL)
-    return false;
+    return FALSE;
   if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
-    return false;
+    return FALSE;
   name[symlength] = '\0';
   sym -> symbol.name = name;
   sym -> symbol.flags = 0;
@@ -642,12 +642,12 @@ nlm_alpha_read_import (abfd, sym)
   sym -> symbol.section = bfd_und_section_ptr;
   if (bfd_bread ((PTR) temp, (bfd_size_type) sizeof (temp), abfd)
       != sizeof (temp))
-    return false;
+    return FALSE;
   rcount = H_GET_32 (abfd, temp);
   amt = rcount * sizeof (struct nlm_relent);
   nlm_relocs = (struct nlm_relent *) bfd_alloc (abfd, amt);
   if (!nlm_relocs)
-    return false;
+    return FALSE;
   sym -> relocs = nlm_relocs;
   sym -> rcnt = 0;
   while (sym -> rcnt < rcount)
@@ -655,18 +655,18 @@ nlm_alpha_read_import (abfd, sym)
       asection *section;
 
       if (! nlm_alpha_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
-	return false;
+	return FALSE;
       nlm_relocs -> section = section;
       nlm_relocs++;
       sym -> rcnt++;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write an Alpha NLM reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_alpha_write_import (abfd, sec, rel)
      bfd *abfd;
      asection *sec;
@@ -766,9 +766,9 @@ nlm_alpha_write_import (abfd, sec, rel)
 
   /* Write out the relocation.  */
   if (bfd_bwrite (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Alpha NetWare does not use the high bit to determine whether a
@@ -779,7 +779,7 @@ nlm_alpha_write_import (abfd, sec, rel)
 
 /* Set the section for a public symbol.  */
 
-static boolean
+static bfd_boolean
 nlm_alpha_set_public_section (abfd, sym)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -800,7 +800,7 @@ nlm_alpha_set_public_section (abfd, sym)
       /* The data segment had better be aligned.  */
       BFD_ASSERT ((bfd_section_size (abfd, code_sec) & 0xf) == 0);
     }
-  return true;
+  return TRUE;
 }
 
 /* Get the offset to write out for a public symbol.  */
@@ -815,7 +815,7 @@ nlm_alpha_get_public_offset (abfd, sym)
 
 /* Write an Alpha NLM external symbol.  */
 
-static boolean
+static bfd_boolean
 nlm_alpha_write_external (abfd, count, sym, relocs)
      bfd *abfd;
      bfd_size_type count;
@@ -831,11 +831,11 @@ nlm_alpha_write_external (abfd, count, sym, relocs)
   if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
        != sizeof (bfd_byte))
       || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
-    return false;
+    return FALSE;
 
   bfd_put_32 (abfd, count + 2, temp);
   if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
-    return false;
+    return FALSE;
 
   /* The first two relocs for each external symbol are the .lita
      address and the GP value.  */
@@ -845,20 +845,20 @@ nlm_alpha_write_external (abfd, count, sym, relocs)
   r.address = nlm_alpha_backend_data (abfd)->lita_address;
   r.addend = nlm_alpha_backend_data (abfd)->lita_size + 1;
   if (! nlm_alpha_write_import (abfd, (asection *) NULL, &r))
-    return false;
+    return FALSE;
 
   r.address = nlm_alpha_backend_data (abfd)->gp;
   r.addend = 0;
   if (! nlm_alpha_write_import (abfd, (asection *) NULL, &r))
-    return false;
+    return FALSE;
 
   for (i = 0; i < count; i++)
     {
       if (! nlm_alpha_write_import (abfd, relocs[i].sec, relocs[i].rel))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 #include "nlmswap.h"
@@ -870,7 +870,7 @@ static const struct nlm_backend_data nlm32_alpha_backend =
   sizeof (struct nlm32_alpha_external_prefix_header),
   bfd_arch_alpha,
   0,
-  true, /* no uninitialized data permitted by Alpha NetWare.  */
+  TRUE, /* no uninitialized data permitted by Alpha NetWare.  */
   nlm_alpha_backend_object_p,
   nlm_alpha_write_prefix,
   nlm_alpha_read_reloc,
diff --git a/bfd/nlm32-i386.c b/bfd/nlm32-i386.c
index 095ab63f96c..ce9595e4a2b 100644
--- a/bfd/nlm32-i386.c
+++ b/bfd/nlm32-i386.c
@@ -28,15 +28,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "libnlm.h"
 
-static boolean nlm_i386_read_reloc
+static bfd_boolean nlm_i386_read_reloc
   PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_i386_write_import
+static bfd_boolean nlm_i386_write_import
   PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_i386_mangle_relocs
+static bfd_boolean nlm_i386_mangle_relocs
   PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_i386_read_import
+static bfd_boolean nlm_i386_read_import
   PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static boolean nlm_i386_write_external
+static bfd_boolean nlm_i386_write_external
   PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
 
 /* Adjust the reloc location by an absolute value.  */
@@ -46,15 +46,15 @@ static reloc_howto_type nlm_i386_abs_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "32",			/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* Adjust the reloc location by a PC relative displacement.  */
 
@@ -63,19 +63,19 @@ static reloc_howto_type nlm_i386_pcrel_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "DISP32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 true);			/* pcrel_offset */
+	 TRUE);			/* pcrel_offset */
 
 /* Read a NetWare i386 reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_i386_read_reloc (abfd, sym, secp, rel)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -87,7 +87,7 @@ nlm_i386_read_reloc (abfd, sym, secp, rel)
   const char *name;
 
   if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
-    return false;
+    return FALSE;
 
   val = bfd_get_32 (abfd, temp);
 
@@ -145,12 +145,12 @@ nlm_i386_read_reloc (abfd, sym, secp, rel)
   rel->address = val;
   rel->addend = 0;
 
-  return true;
+  return TRUE;
 }
 
 /* Write a NetWare i386 reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_i386_write_import (abfd, sec, rel)
      bfd *abfd;
      asection *sec;
@@ -174,7 +174,7 @@ nlm_i386_write_import (abfd, sec, rel)
       || rel->howto->dst_mask != 0xffffffff)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   sym = *rel->sym_ptr_ptr;
@@ -202,7 +202,7 @@ nlm_i386_write_import (abfd, sec, rel)
       if (rel->howto->pc_relative)
 	{
 	  bfd_set_error (bfd_error_invalid_operation);
-	  return false;
+	  return FALSE;
 	}
 
       /* The high bit is 1 if the reloc is against the code section, 0
@@ -222,16 +222,16 @@ nlm_i386_write_import (abfd, sec, rel)
 	  if (! rel->howto->pcrel_offset)
 	    {
 	      bfd_set_error (bfd_error_invalid_operation);
-	      return false;
+	      return FALSE;
 	    }
 	}
     }
 
   bfd_put_32 (abfd, val, temp);
   if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* I want to be able to use objcopy to turn an i386 a.out or COFF file
@@ -243,7 +243,7 @@ nlm_i386_write_import (abfd, sec, rel)
    This is actually a fairly general concept.  However, this is not a
    general implementation.  */
 
-static boolean
+static bfd_boolean
 nlm_i386_mangle_relocs (abfd, sec, data, offset, count)
      bfd *abfd;
      asection *sec;
@@ -335,11 +335,11 @@ nlm_i386_mangle_relocs (abfd, sec, data, offset, count)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Read a NetWare i386 import record */
-static boolean
+static bfd_boolean
 nlm_i386_read_import (abfd, sym)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -352,13 +352,13 @@ nlm_i386_read_import (abfd, sym)
 
   if (bfd_bread ((PTR) &symlength, (bfd_size_type) sizeof (symlength), abfd)
       != sizeof (symlength))
-    return false;
+    return FALSE;
   sym -> symbol.the_bfd = abfd;
   name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
   if (name == NULL)
-    return false;
+    return FALSE;
   if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
-    return false;
+    return FALSE;
   name[symlength] = '\0';
   sym -> symbol.name = name;
   sym -> symbol.flags = 0;
@@ -366,12 +366,12 @@ nlm_i386_read_import (abfd, sym)
   sym -> symbol.section = bfd_und_section_ptr;
   if (bfd_bread ((PTR) temp, (bfd_size_type) sizeof (temp), abfd)
       != sizeof (temp))
-    return false;
+    return FALSE;
   rcount = H_GET_32 (abfd, temp);
   nlm_relocs = ((struct nlm_relent *)
 		bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
   if (!nlm_relocs)
-    return false;
+    return FALSE;
   sym -> relocs = nlm_relocs;
   sym -> rcnt = 0;
   while (sym -> rcnt < rcount)
@@ -379,17 +379,17 @@ nlm_i386_read_import (abfd, sym)
       asection *section;
 
       if (! nlm_i386_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
-	return false;
+	return FALSE;
       nlm_relocs -> section = section;
       nlm_relocs++;
       sym -> rcnt++;
     }
-  return true;
+  return TRUE;
 }
 
 /* Write out an external reference.  */
 
-static boolean
+static bfd_boolean
 nlm_i386_write_external (abfd, count, sym, relocs)
      bfd *abfd;
      bfd_size_type count;
@@ -404,19 +404,19 @@ nlm_i386_write_external (abfd, count, sym, relocs)
   if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
        != sizeof (bfd_byte))
       || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
-    return false;
+    return FALSE;
 
   bfd_put_32 (abfd, count, temp);
   if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
-    return false;
+    return FALSE;
 
   for (i = 0; i < count; i++)
     {
       if (! nlm_i386_write_import (abfd, relocs[i].sec, relocs[i].rel))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 #include "nlmswap.h"
@@ -428,7 +428,7 @@ static const struct nlm_backend_data nlm32_i386_backend =
   0,	/* optional_prefix_size */
   bfd_arch_i386,
   0,
-  false,
+  FALSE,
   0,	/* backend_object_p */
   0,	/* write_prefix_func */
   nlm_i386_read_reloc,
diff --git a/bfd/nlm32-ppc.c b/bfd/nlm32-ppc.c
index 884b85a818f..9f5f9c053e0 100644
--- a/bfd/nlm32-ppc.c
+++ b/bfd/nlm32-ppc.c
@@ -32,31 +32,31 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libnlm.h"
 
 #ifdef OLDFORMAT
-static boolean nlm_powerpc_backend_object_p
+static bfd_boolean nlm_powerpc_backend_object_p
   PARAMS ((bfd *));
-static boolean nlm_powerpc_write_prefix
+static bfd_boolean nlm_powerpc_write_prefix
   PARAMS ((bfd *));
 #endif
 
-static boolean nlm_powerpc_read_reloc
+static bfd_boolean nlm_powerpc_read_reloc
   PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_powerpc_mangle_relocs
+static bfd_boolean nlm_powerpc_mangle_relocs
   PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_powerpc_read_import
+static bfd_boolean nlm_powerpc_read_import
   PARAMS ((bfd *, nlmNAME(symbol_type) *));
 
 #ifdef OLDFORMAT
-static boolean nlm_powerpc_write_reloc
+static bfd_boolean nlm_powerpc_write_reloc
   PARAMS ((bfd *, asection *, arelent *, int));
 #endif
 
-static boolean nlm_powerpc_write_import
+static bfd_boolean nlm_powerpc_write_import
   PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_powerpc_write_external
+static bfd_boolean nlm_powerpc_write_external
   PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
 
 #ifndef OLDFORMAT
-static boolean nlm_powerpc_set_public_section
+static bfd_boolean nlm_powerpc_set_public_section
   PARAMS ((bfd *, nlmNAME(symbol_type) *));
 static bfd_vma nlm_powerpc_get_public_offset
   PARAMS ((bfd *, asymbol *));
@@ -70,25 +70,25 @@ static bfd_vma nlm_powerpc_get_public_offset
    function reads it in, verifies the version, and seeks the bfd to
    the location before the regular NLM header.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_backend_object_p (abfd)
      bfd *abfd;
 {
   struct nlm32_powerpc_external_prefix_header s;
 
   if (bfd_bread ((PTR) &s, (bfd_size_type) sizeof s, abfd) != sizeof s)
-    return false;
+    return FALSE;
 
   if (memcmp (s.signature, NLM32_POWERPC_SIGNATURE, sizeof s.signature) != 0
       || H_GET_32 (abfd, s.headerVersion) != NLM32_POWERPC_HEADER_VERSION)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Write out the prefix.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_write_prefix (abfd)
      bfd *abfd;
 {
@@ -102,9 +102,9 @@ nlm_powerpc_write_prefix (abfd)
   /* FIXME: What should we do about the date?  */
 
   if (bfd_bwrite ((PTR) &s, (bfd_size_type) sizeof s, abfd) != sizeof s)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 #endif /* OLDFORMAT */
@@ -118,19 +118,19 @@ static reloc_howto_type nlm_powerpc_howto =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "32",			/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
+	 FALSE);		/* pcrel_offset */
 
 /* Read a PowerPC NLM reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_read_reloc (abfd, sym, secp, rel)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -142,7 +142,7 @@ nlm_powerpc_read_reloc (abfd, sym, secp, rel)
   const char *name;
 
   if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
-    return false;
+    return FALSE;
 
   val = bfd_get_32 (abfd, temp);
 
@@ -187,7 +187,7 @@ nlm_powerpc_read_reloc (abfd, sym, secp, rel)
   rel->address = val << 2;
   rel->addend = 0;
 
-  return true;
+  return TRUE;
 }
 
 #else /* OLDFORMAT */
@@ -204,105 +204,105 @@ static reloc_howto_type nlm_powerpc_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_POS",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* 32 bit relocation, but store negative value.  */
   HOWTO (1,	                /* type */
 	 0,	                /* rightshift */
 	 -2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_NEG",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* 32 bit PC relative relocation.  */
   HOWTO (2,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 true,	                /* pc_relative */
+	 TRUE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_REL",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* 16 bit TOC relative relocation.  */
   HOWTO (3,	                /* type */
 	 0,	                /* rightshift */
 	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_TOC",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* I don't really know what this is.  */
   HOWTO (4,	                /* type */
 	 1,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_RTB",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* External TOC relative symbol.  */
   HOWTO (5,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_GL",                /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Local TOC relative symbol.  */
   HOWTO (6,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_TCL",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   { 7 },
 
@@ -311,15 +311,15 @@ static reloc_howto_type nlm_powerpc_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 26,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_BA",                /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0x3fffffc,	        /* src_mask */
 	 0x3fffffc,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   { 9 },
 
@@ -328,15 +328,15 @@ static reloc_howto_type nlm_powerpc_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 26,	                /* bitsize */
-	 true,	                /* pc_relative */
+	 TRUE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_BR",                /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0x3fffffc,	        /* src_mask */
 	 0x3fffffc,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   { 0xb },
 
@@ -345,30 +345,30 @@ static reloc_howto_type nlm_powerpc_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_RL",                /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Load address.  */
   HOWTO (0xd,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_RLA",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   { 0xe },
 
@@ -377,15 +377,15 @@ static reloc_howto_type nlm_powerpc_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_REF",               /* name */
-	 false,	                /* partial_inplace */
+	 FALSE,	                /* partial_inplace */
 	 0,		        /* src_mask */
 	 0,     	   	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   { 0x10 },
   { 0x11 },
@@ -395,150 +395,150 @@ static reloc_howto_type nlm_powerpc_howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_TRL",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* TOC relative load address.  */
   HOWTO (0x13,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_TRLA",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Modifiable relative branch.  */
   HOWTO (0x14,	                /* type */
 	 1,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_RRTBI",             /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Modifiable absolute branch.  */
   HOWTO (0x15,	                /* type */
 	 1,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_RRTBA",             /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,	        /* src_mask */
 	 0xffffffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Modifiable call absolute indirect.  */
   HOWTO (0x16,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_CAI",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Modifiable call relative.  */
   HOWTO (0x17,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_REL",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (0x18,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_RBA",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (0x19,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_RBAC",              /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Modifiable branch relative.  */
   HOWTO (0x1a,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 26,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_REL",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 
   /* Modifiable branch absolute.  */
   HOWTO (0x1b,	                /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 16,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 0,		        /* special_function */
 	 "R_REL",               /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffff,	        /* src_mask */
 	 0xffff,        	/* dst_mask */
-	 false)                 /* pcrel_offset */
+	 FALSE)                 /* pcrel_offset */
 };
 
 #define HOWTO_COUNT (sizeof nlm_powerpc_howto_table		\
@@ -546,7 +546,7 @@ static reloc_howto_type nlm_powerpc_howto_table[] =
 
 /* Read a PowerPC NLM reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_read_reloc (abfd, sym, secp, rel)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -562,7 +562,7 @@ nlm_powerpc_read_reloc (abfd, sym, secp, rel)
 
   /* Read the reloc from the file.  */
   if (bfd_bread (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
-    return false;
+    return FALSE;
 
   /* Swap in the fields.  */
   l_vaddr = H_GET_32 (abfd, ext.l_vaddr);
@@ -595,7 +595,7 @@ nlm_powerpc_read_reloc (abfd, sym, secp, rel)
       else
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       rel->sym_ptr_ptr = sec->symbol_ptr_ptr;
@@ -625,19 +625,19 @@ nlm_powerpc_read_reloc (abfd, sym, secp, rel)
   else
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   rel->address = l_vaddr;
 
-  return true;
+  return TRUE;
 }
 
 #endif /* OLDFORMAT */
 
 /* Mangle PowerPC NLM relocs for output.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_mangle_relocs (abfd, sec, data, offset, count)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
@@ -645,12 +645,12 @@ nlm_powerpc_mangle_relocs (abfd, sec, data, offset, count)
      bfd_vma offset ATTRIBUTE_UNUSED;
      bfd_size_type count ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Read a PowerPC NLM import record */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_read_import (abfd, sym)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -663,13 +663,13 @@ nlm_powerpc_read_import (abfd, sym)
 
   if (bfd_bread ((PTR) &symlength, (bfd_size_type) sizeof (symlength), abfd)
       != sizeof (symlength))
-    return (false);
+    return FALSE;
   sym -> symbol.the_bfd = abfd;
   name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
   if (name == NULL)
-    return false;
+    return FALSE;
   if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
-    return (false);
+    return FALSE;
   name[symlength] = '\0';
   sym -> symbol.name = name;
   sym -> symbol.flags = 0;
@@ -677,12 +677,12 @@ nlm_powerpc_read_import (abfd, sym)
   sym -> symbol.section = bfd_und_section_ptr;
   if (bfd_bread ((PTR) temp, (bfd_size_type) sizeof (temp), abfd)
       != sizeof (temp))
-    return (false);
+    return FALSE;
   rcount = H_GET_32 (abfd, temp);
   nlm_relocs = ((struct nlm_relent *)
 		bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
   if (nlm_relocs == (struct nlm_relent *) NULL)
-    return false;
+    return FALSE;
   sym -> relocs = nlm_relocs;
   sym -> rcnt = 0;
   while (sym -> rcnt < rcount)
@@ -690,19 +690,19 @@ nlm_powerpc_read_import (abfd, sym)
       asection *section;
 
       if (! nlm_powerpc_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
-	return false;
+	return FALSE;
       nlm_relocs -> section = section;
       nlm_relocs++;
       sym -> rcnt++;
     }
-  return true;
+  return TRUE;
 }
 
 #ifndef OLDFORMAT
 
 /* Write a PowerPC NLM reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_write_import (abfd, sec, rel)
      bfd *abfd;
      asection *sec;
@@ -724,7 +724,7 @@ nlm_powerpc_write_import (abfd, sec, rel)
       || rel->howto->dst_mask != 0xffffffff)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   sym = *rel->sym_ptr_ptr;
@@ -737,7 +737,7 @@ nlm_powerpc_write_import (abfd, sec, rel)
   if ((val & 3) != 0)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
   val >>= 2;
 
@@ -762,9 +762,9 @@ nlm_powerpc_write_import (abfd, sec, rel)
 
   bfd_put_32 (abfd, val, temp);
   if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 #else /* OLDFORMAT */
@@ -773,7 +773,7 @@ nlm_powerpc_write_import (abfd, sec, rel)
 
 /* Write a PowerPC NLM reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_write_reloc (abfd, sec, rel, indx)
      bfd *abfd;
      asection *sec;
@@ -813,7 +813,7 @@ nlm_powerpc_write_reloc (abfd, sec, rel, indx)
       else
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
     }
 
@@ -841,7 +841,7 @@ nlm_powerpc_write_reloc (abfd, sec, rel, indx)
   if (howto >= nlm_powerpc_howto_table + HOWTO_COUNT)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   l_rtype = howto->type;
@@ -862,21 +862,21 @@ nlm_powerpc_write_reloc (abfd, sec, rel, indx)
   else
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   H_PUT_16 (abfd, l_rsecnm, ext.l_rsecnm);
   H_PUT_32 (abfd, address, ext.l_vaddr);
 
   if (bfd_bwrite (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Write a PowerPC NLM import.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_write_import (abfd, sec, rel)
      bfd *abfd;
      asection *sec;
@@ -891,7 +891,7 @@ nlm_powerpc_write_import (abfd, sec, rel)
    count of the symbol index.  FIXME: I don't know if this is
    necessary, and the index never gets reset.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_write_external (abfd, count, sym, relocs)
      bfd *abfd;
      bfd_size_type count;
@@ -909,21 +909,21 @@ nlm_powerpc_write_external (abfd, count, sym, relocs)
   if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
        != sizeof (bfd_byte))
       || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
-    return false;
+    return FALSE;
 
   bfd_put_32 (abfd, count, temp);
   if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
-    return false;
+    return FALSE;
 
   for (i = 0; i < count; i++)
     {
 #ifndef OLDFORMAT
       if (! nlm_powerpc_write_import (abfd, relocs[i].sec, relocs[i].rel))
-	return false;
+	return FALSE;
 #else
       if (! nlm_powerpc_write_reloc (abfd, relocs[i].sec,
 				     relocs[i].rel, indx))
-	return false;
+	return FALSE;
 #endif
     }
 
@@ -931,7 +931,7 @@ nlm_powerpc_write_external (abfd, count, sym, relocs)
   ++indx;
 #endif
 
-  return true;
+  return TRUE;
 }
 
 #ifndef OLDFORMAT
@@ -941,7 +941,7 @@ nlm_powerpc_write_external (abfd, count, sym, relocs)
 
 /* Set the section for a public symbol.  */
 
-static boolean
+static bfd_boolean
 nlm_powerpc_set_public_section (abfd, sym)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -961,7 +961,7 @@ nlm_powerpc_set_public_section (abfd, sym)
 
   sym->symbol.value <<= 2;
 
-  return true;
+  return TRUE;
 }
 
 /* Get the offset to write out for a public symbol.  */
@@ -1013,7 +1013,7 @@ static const struct nlm_backend_data nlm32_powerpc_backend =
 #endif
   bfd_arch_powerpc,
   0,
-  false,
+  FALSE,
 #ifndef OLDFORMAT
   0,	/* backend_object_p */
   0,	/* write_prefix */
diff --git a/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c
index 76b7328f991..5094ed0db1d 100644
--- a/bfd/nlm32-sparc.c
+++ b/bfd/nlm32-sparc.c
@@ -28,19 +28,19 @@
 
 #include "libnlm.h"
 
-static boolean nlm_sparc_read_reloc
+static bfd_boolean nlm_sparc_read_reloc
   PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_sparc_write_reloc
+static bfd_boolean nlm_sparc_write_reloc
   PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_sparc_mangle_relocs
+static bfd_boolean nlm_sparc_mangle_relocs
   PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_sparc_read_import
+static bfd_boolean nlm_sparc_read_import
   PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static boolean nlm_sparc_write_import
+static bfd_boolean nlm_sparc_write_import
   PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_sparc_write_external
+static bfd_boolean nlm_sparc_write_external
   PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
-static boolean nlm_sparc_write_export
+static bfd_boolean nlm_sparc_write_export
   PARAMS ((bfd *, asymbol *, bfd_vma));
 
 enum reloc_type
@@ -82,30 +82,30 @@ static const char *const reloc_type_names[] =
 
 static reloc_howto_type nlm32_sparc_howto_table[] =
   {
-    HOWTO (R_SPARC_NONE,    0,0, 0,false,0,complain_overflow_dont,    0,"R_SPARC_NONE",    false,0,0x00000000,true),
-    HOWTO (R_SPARC_8,       0,0, 8,false,0,complain_overflow_bitfield,0,"R_SPARC_8",       false,0,0x000000ff,true),
-    HOWTO (R_SPARC_16,      0,1,16,false,0,complain_overflow_bitfield,0,"R_SPARC_16",      false,0,0x0000ffff,true),
-    HOWTO (R_SPARC_32,      0,2,32,false,0,complain_overflow_bitfield,0,"R_SPARC_32",      false,0,0xffffffff,true),
-    HOWTO (R_SPARC_DISP8,   0,0, 8,true, 0,complain_overflow_signed,  0,"R_SPARC_DISP8",   false,0,0x000000ff,true),
-    HOWTO (R_SPARC_DISP16,  0,1,16,true, 0,complain_overflow_signed,  0,"R_SPARC_DISP16",  false,0,0x0000ffff,true),
-    HOWTO (R_SPARC_DISP32,  0,2,32,true, 0,complain_overflow_signed,  0,"R_SPARC_DISP32",  false,0,0x00ffffff,true),
-    HOWTO (R_SPARC_WDISP30, 2,2,30,true, 0,complain_overflow_signed,  0,"R_SPARC_WDISP30", false,0,0x3fffffff,true),
-    HOWTO (R_SPARC_WDISP22, 2,2,22,true, 0,complain_overflow_signed,  0,"R_SPARC_WDISP22", false,0,0x003fffff,true),
-    HOWTO (R_SPARC_HI22,   10,2,22,false,0,complain_overflow_dont,    0,"R_SPARC_HI22",    false,0,0x003fffff,true),
-    HOWTO (R_SPARC_22,      0,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_22",      false,0,0x003fffff,true),
-    HOWTO (R_SPARC_13,      0,2,13,false,0,complain_overflow_bitfield,0,"R_SPARC_13",      false,0,0x00001fff,true),
-    HOWTO (R_SPARC_LO10,    0,2,10,false,0,complain_overflow_dont,    0,"R_SPARC_LO10",    false,0,0x000003ff,true),
-    HOWTO (R_SPARC_GOT10,   0,2,10,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT10",   false,0,0x000003ff,true),
-    HOWTO (R_SPARC_GOT13,   0,2,13,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT13",   false,0,0x00001fff,true),
-    HOWTO (R_SPARC_GOT22,  10,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT22",   false,0,0x003fffff,true),
-    HOWTO (R_SPARC_PC10,    0,2,10,false,0,complain_overflow_bitfield,0,"R_SPARC_PC10",    false,0,0x000003ff,true),
-    HOWTO (R_SPARC_PC22,    0,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_PC22",    false,0,0x003fffff,true),
-    HOWTO (R_SPARC_WPLT30,  0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_WPLT30",  false,0,0x00000000,true),
-    HOWTO (R_SPARC_COPY,    0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_COPY",    false,0,0x00000000,true),
-    HOWTO (R_SPARC_GLOB_DAT,0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_GLOB_DAT",false,0,0x00000000,true),
-    HOWTO (R_SPARC_JMP_SLOT,0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_JMP_SLOT",false,0,0x00000000,true),
-    HOWTO (R_SPARC_RELATIVE,0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_RELATIVE",false,0,0x00000000,true),
-    HOWTO (R_SPARC_UA32,    0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_UA32",    false,0,0x00000000,true),
+    HOWTO (R_SPARC_NONE,    0,0, 0,FALSE,0,complain_overflow_dont,    0,"R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+    HOWTO (R_SPARC_8,       0,0, 8,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_8",       FALSE,0,0x000000ff,TRUE),
+    HOWTO (R_SPARC_16,      0,1,16,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_16",      FALSE,0,0x0000ffff,TRUE),
+    HOWTO (R_SPARC_32,      0,2,32,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_32",      FALSE,0,0xffffffff,TRUE),
+    HOWTO (R_SPARC_DISP8,   0,0, 8,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_DISP8",   FALSE,0,0x000000ff,TRUE),
+    HOWTO (R_SPARC_DISP16,  0,1,16,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_DISP16",  FALSE,0,0x0000ffff,TRUE),
+    HOWTO (R_SPARC_DISP32,  0,2,32,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_DISP32",  FALSE,0,0x00ffffff,TRUE),
+    HOWTO (R_SPARC_WDISP30, 2,2,30,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_WDISP30", FALSE,0,0x3fffffff,TRUE),
+    HOWTO (R_SPARC_WDISP22, 2,2,22,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_WDISP22", FALSE,0,0x003fffff,TRUE),
+    HOWTO (R_SPARC_HI22,   10,2,22,FALSE,0,complain_overflow_dont,    0,"R_SPARC_HI22",    FALSE,0,0x003fffff,TRUE),
+    HOWTO (R_SPARC_22,      0,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_22",      FALSE,0,0x003fffff,TRUE),
+    HOWTO (R_SPARC_13,      0,2,13,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_13",      FALSE,0,0x00001fff,TRUE),
+    HOWTO (R_SPARC_LO10,    0,2,10,FALSE,0,complain_overflow_dont,    0,"R_SPARC_LO10",    FALSE,0,0x000003ff,TRUE),
+    HOWTO (R_SPARC_GOT10,   0,2,10,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT10",   FALSE,0,0x000003ff,TRUE),
+    HOWTO (R_SPARC_GOT13,   0,2,13,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT13",   FALSE,0,0x00001fff,TRUE),
+    HOWTO (R_SPARC_GOT22,  10,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT22",   FALSE,0,0x003fffff,TRUE),
+    HOWTO (R_SPARC_PC10,    0,2,10,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_PC10",    FALSE,0,0x000003ff,TRUE),
+    HOWTO (R_SPARC_PC22,    0,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_PC22",    FALSE,0,0x003fffff,TRUE),
+    HOWTO (R_SPARC_WPLT30,  0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_WPLT30",  FALSE,0,0x00000000,TRUE),
+    HOWTO (R_SPARC_COPY,    0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_COPY",    FALSE,0,0x00000000,TRUE),
+    HOWTO (R_SPARC_GLOB_DAT,0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_GLOB_DAT",FALSE,0,0x00000000,TRUE),
+    HOWTO (R_SPARC_JMP_SLOT,0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_JMP_SLOT",FALSE,0,0x00000000,TRUE),
+    HOWTO (R_SPARC_RELATIVE,0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_RELATIVE",FALSE,0,0x00000000,TRUE),
+    HOWTO (R_SPARC_UA32,    0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_UA32",    FALSE,0,0x00000000,TRUE),
 };
 
 /* Read a NetWare sparc reloc.  */
@@ -118,7 +118,7 @@ struct nlm32_sparc_reloc_ext
     unsigned char pad1[3];
   };
 
-static boolean
+static bfd_boolean
 nlm_sparc_read_reloc (abfd, sym, secp, rel)
      bfd *abfd;
      nlmNAME(symbol_type) *sym ATTRIBUTE_UNUSED;
@@ -132,7 +132,7 @@ nlm_sparc_read_reloc (abfd, sym, secp, rel)
   asection *code_sec, *data_sec;
 
   if (bfd_bread (&tmp_reloc, (bfd_size_type) 12, abfd) != 12)
-    return false;
+    return FALSE;
 
   code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
   data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
@@ -160,13 +160,13 @@ nlm_sparc_read_reloc (abfd, sym, secp, rel)
   fprintf (stderr, "%s:  address = %08lx, addend = %08lx, type = %d, howto = %08lx\n",
 	   __FUNCTION__, rel->address, rel->addend, type, rel->howto);
 #endif
-  return true;
+  return TRUE;
 
 }
 
 /* Write a NetWare sparc reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_sparc_write_reloc (abfd, sec, rel)
      bfd *abfd;
      asection *sec;
@@ -225,15 +225,15 @@ nlm_sparc_write_reloc (abfd, sec, rel)
   bfd_put_8 (abfd, (short) (rel->howto->type), tmp_reloc.type);
 
   if (bfd_bwrite (&tmp_reloc, (bfd_size_type) 12, abfd) != 12)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Mangle relocs for SPARC NetWare.  We can just use the standard
    SPARC relocs.  */
 
-static boolean
+static bfd_boolean
 nlm_sparc_mangle_relocs (abfd, sec, data, offset, count)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
@@ -241,12 +241,12 @@ nlm_sparc_mangle_relocs (abfd, sec, data, offset, count)
      bfd_vma offset ATTRIBUTE_UNUSED;
      bfd_size_type count ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Read a NetWare sparc import record.  */
 
-static boolean
+static bfd_boolean
 nlm_sparc_read_import (abfd, sym)
      bfd *abfd;
      nlmNAME(symbol_type) *sym;
@@ -260,7 +260,7 @@ nlm_sparc_read_import (abfd, sym)
   /* First, read in the number of relocation
      entries for this symbol.  */
   if (bfd_bread ((PTR) temp, (bfd_size_type) 4, abfd) != 4)
-    return false;
+    return FALSE;
 
   rcount = bfd_get_32 (abfd, temp);
 
@@ -268,16 +268,16 @@ nlm_sparc_read_import (abfd, sym)
 
   if (bfd_bread ((PTR) &symlength, (bfd_size_type) sizeof (symlength), abfd)
       != sizeof (symlength))
-    return false;
+    return FALSE;
   sym -> symbol.the_bfd = abfd;
   name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
   if (name == NULL)
-    return false;
+    return FALSE;
 
   /* Then read in the symbol.  */
 
   if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
-    return false;
+    return FALSE;
   name[symlength] = '\0';
   sym -> symbol.name = name;
   sym -> symbol.flags = 0;
@@ -289,7 +289,7 @@ nlm_sparc_read_import (abfd, sym)
   nlm_relocs = ((struct nlm_relent *)
 		bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
   if (!nlm_relocs)
-    return false;
+    return FALSE;
   sym -> relocs = nlm_relocs;
   sym -> rcnt = 0;
   while (sym -> rcnt < rcount)
@@ -297,16 +297,16 @@ nlm_sparc_read_import (abfd, sym)
       asection *section;
 
       if (! nlm_sparc_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
-	return false;
+	return FALSE;
       nlm_relocs -> section = section;
       nlm_relocs++;
       sym -> rcnt++;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 nlm_sparc_write_import (abfd, sec, rel)
      bfd *abfd;
      asection *sec;
@@ -336,18 +336,18 @@ nlm_sparc_write_import (abfd, sec, rel)
 #endif
   bfd_put_32 (abfd, base + (*rel->sym_ptr_ptr)->value, temp);
   if (bfd_bwrite ((PTR) temp, (bfd_size_type) 4, abfd) != 4)
-    return false;
+    return FALSE;
   bfd_put_32 (abfd, (bfd_vma) 1, temp);
   if (bfd_bwrite ((PTR) temp, (bfd_size_type) 4, abfd) != 4)
-    return false;
+    return FALSE;
   if (! nlm_sparc_write_reloc (abfd, sec, rel))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Write out an external reference.  */
 
-static boolean
+static bfd_boolean
 nlm_sparc_write_external (abfd, count, sym, relocs)
      bfd *abfd;
      bfd_size_type count;
@@ -360,24 +360,24 @@ nlm_sparc_write_external (abfd, count, sym, relocs)
 
   bfd_put_32 (abfd, count, temp);
   if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
-    return false;
+    return FALSE;
 
   len = strlen (sym->name);
   if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
        != sizeof (bfd_byte))
       || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
-    return false;
+    return FALSE;
 
   for (i = 0; i < count; i++)
     {
       if (! nlm_sparc_write_reloc (abfd, relocs[i].sec, relocs[i].rel))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 nlm_sparc_write_export (abfd, sym, value)
      bfd *abfd;
      asymbol *sym;
@@ -396,9 +396,9 @@ nlm_sparc_write_export (abfd, sym, value)
   if (bfd_bwrite (temp, (bfd_size_type) 4, abfd) != 4
       || bfd_bwrite (&len, (bfd_size_type) 1, abfd) != 1
       || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 #undef nlm_swap_fixed_header_in
@@ -413,7 +413,7 @@ static const struct nlm_backend_data nlm32_sparc_backend =
     0,	/* optional_prefix_size */
     bfd_arch_sparc,
     0,
-    false,
+    FALSE,
     0,	/* backend_object_p */
     0,	/* write_prefix_func */
     nlm_sparc_read_reloc,
diff --git a/bfd/nlmcode.h b/bfd/nlmcode.h
index 0e089b3faed..5eeb41eba46 100644
--- a/bfd/nlmcode.h
+++ b/bfd/nlmcode.h
@@ -59,23 +59,23 @@
 
 /* Forward declarations of static functions.  */
 
-static boolean add_bfd_section
+static bfd_boolean add_bfd_section
   PARAMS ((bfd *, char *, file_ptr, bfd_size_type, flagword));
-static boolean nlm_swap_variable_header_in
+static bfd_boolean nlm_swap_variable_header_in
   PARAMS ((bfd *));
-static boolean nlm_swap_variable_header_out
+static bfd_boolean nlm_swap_variable_header_out
   PARAMS ((bfd *));
-static boolean find_nonzero
+static bfd_boolean find_nonzero
   PARAMS ((PTR, size_t));
-static boolean nlm_swap_auxiliary_headers_in
+static bfd_boolean nlm_swap_auxiliary_headers_in
   PARAMS ((bfd *));
-static boolean nlm_swap_auxiliary_headers_out
+static bfd_boolean nlm_swap_auxiliary_headers_out
   PARAMS ((bfd *));
-static boolean nlm_slurp_symbol_table
+static bfd_boolean nlm_slurp_symbol_table
   PARAMS ((bfd *));
-static boolean nlm_slurp_reloc_fixups
+static bfd_boolean nlm_slurp_reloc_fixups
   PARAMS ((bfd *));
-static boolean nlm_compute_section_file_positions
+static bfd_boolean nlm_compute_section_file_positions
   PARAMS ((bfd *));
 static int nlm_external_reloc_compare
   PARAMS ((const void *, const void *));
@@ -96,7 +96,7 @@ nlm_object_p (abfd)
      bfd *abfd;
 {
   struct nlm_obj_tdata *preserved_tdata = nlm_tdata (abfd);
-  boolean (*backend_object_p) PARAMS ((bfd *));
+  bfd_boolean (*backend_object_p) PARAMS ((bfd *));
   PTR x_fxdhdr = NULL;
   Nlm_Internal_Fixed_Header *i_fxdhdrp;
   struct nlm_obj_tdata *new_tdata = NULL;
@@ -221,7 +221,7 @@ got_no_match:
 
 /* Add a section to the bfd.  */
 
-static boolean
+static bfd_boolean
 add_bfd_section (abfd, name, offset, size, flags)
      bfd *abfd;
      char *name;
@@ -233,7 +233,7 @@ add_bfd_section (abfd, name, offset, size, flags)
 
   newsect = bfd_make_section (abfd, name);
   if (newsect == NULL)
-    return false;
+    return FALSE;
 
   newsect->vma = 0;		/* NLM's are relocatable.  */
   newsect->_raw_size = size;
@@ -241,13 +241,13 @@ add_bfd_section (abfd, name, offset, size, flags)
   newsect->flags = flags;
   newsect->alignment_power = bfd_log2 ((bfd_vma) 0);	/* FIXME */
 
-  return true;
+  return TRUE;
 }
 
 /* Read and swap in the variable length header.  All the fields must
    exist in the NLM, and must exist in the order they are read here.  */
 
-static boolean
+static bfd_boolean
 nlm_swap_variable_header_in (abfd)
      bfd *abfd;
 {
@@ -259,24 +259,24 @@ nlm_swap_variable_header_in (abfd)
   amt = sizeof (nlm_variable_header (abfd)->descriptionLength);
   if (bfd_bread ((PTR) &nlm_variable_header (abfd)->descriptionLength,
 		amt, abfd) != amt)
-    return false;
+    return FALSE;
   amt = nlm_variable_header (abfd)->descriptionLength + 1;
   if (bfd_bread ((PTR) nlm_variable_header (abfd)->descriptionText,
 		amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Read and convert the stackSize field.  */
 
   amt = sizeof (temp);
   if (bfd_bread ((PTR) temp, amt, abfd) != amt)
-    return false;
+    return FALSE;
   nlm_variable_header (abfd)->stackSize = get_word (abfd, (bfd_byte *) temp);
 
   /* Read and convert the reserved field.  */
 
   amt = sizeof (temp);
   if (bfd_bread ((PTR) temp, amt, abfd) != amt)
-    return false;
+    return FALSE;
   nlm_variable_header (abfd)->reserved = get_word (abfd, (bfd_byte *) temp);
 
   /* Read the oldThreadName field.  This field is a fixed length string.  */
@@ -284,36 +284,36 @@ nlm_swap_variable_header_in (abfd)
   amt = sizeof (nlm_variable_header (abfd)->oldThreadName);
   if (bfd_bread ((PTR) nlm_variable_header (abfd)->oldThreadName,
 		amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Read the screen name length and text members.  */
 
   amt = sizeof (nlm_variable_header (abfd)->screenNameLength);
   if (bfd_bread ((PTR) & nlm_variable_header (abfd)->screenNameLength,
 		amt, abfd) != amt)
-    return false;
+    return FALSE;
   amt = nlm_variable_header (abfd)->screenNameLength + 1;
   if (bfd_bread ((PTR) nlm_variable_header (abfd)->screenName,
 		amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Read the thread name length and text members.  */
 
   amt = sizeof (nlm_variable_header (abfd)->threadNameLength);
   if (bfd_bread ((PTR) & nlm_variable_header (abfd)->threadNameLength,
 		amt, abfd) != amt)
-    return false;
+    return FALSE;
   amt = nlm_variable_header (abfd)->threadNameLength + 1;
   if (bfd_bread ((PTR) nlm_variable_header (abfd)->threadName,
 		amt, abfd) != amt)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Swap and write out the variable length header.  All the fields must
    exist in the NLM, and must exist in this order.  */
 
-static boolean
+static bfd_boolean
 nlm_swap_variable_header_out (abfd)
      bfd *abfd;
 {
@@ -324,52 +324,52 @@ nlm_swap_variable_header_out (abfd)
   amt = sizeof (nlm_variable_header (abfd)->descriptionLength);
   if (bfd_bwrite ((PTR) & nlm_variable_header (abfd)->descriptionLength, amt,
 		 abfd) != amt)
-    return false;
+    return FALSE;
   amt = nlm_variable_header (abfd)->descriptionLength + 1;
   if (bfd_bwrite ((PTR) nlm_variable_header (abfd)->descriptionText, amt,
 		 abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Convert and write the stackSize field.  */
   put_word (abfd, (bfd_vma) nlm_variable_header (abfd)->stackSize,
 	    (bfd_byte *) temp);
   amt = sizeof (temp);
   if (bfd_bwrite ((PTR) temp, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Convert and write the reserved field.  */
   put_word (abfd, (bfd_vma) nlm_variable_header (abfd)->reserved,
 	    (bfd_byte *) temp);
   amt = sizeof (temp);
   if (bfd_bwrite ((PTR) temp, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Write the oldThreadName field.  This field is a fixed length string.  */
   amt = sizeof (nlm_variable_header (abfd)->oldThreadName);
   if (bfd_bwrite ((PTR) nlm_variable_header (abfd)->oldThreadName, amt,
 		 abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Write the screen name length and text members.  */
   amt = sizeof (nlm_variable_header (abfd)->screenNameLength);
   if (bfd_bwrite ((PTR) & nlm_variable_header (abfd)->screenNameLength, amt,
 		 abfd) != amt)
-    return false;
+    return FALSE;
   amt = nlm_variable_header (abfd)->screenNameLength + 1;
   if (bfd_bwrite ((PTR) nlm_variable_header (abfd)->screenName, amt,
 		 abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Write the thread name length and text members.  */
   amt = sizeof (nlm_variable_header (abfd)->threadNameLength);
   if (bfd_bwrite ((PTR) & nlm_variable_header (abfd)->threadNameLength, amt,
 		 abfd) != amt)
-    return false;
+    return FALSE;
   amt = nlm_variable_header (abfd)->threadNameLength + 1;
   if (bfd_bwrite ((PTR) nlm_variable_header (abfd)->threadName, amt,
 		 abfd) != amt)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Read and swap in the contents of all the auxiliary headers.  Because of
@@ -381,7 +381,7 @@ nlm_swap_variable_header_out (abfd)
    of auxiliary header added will break all existing tools that don't
    recognize it.  */
 
-static boolean
+static bfd_boolean
 nlm_swap_auxiliary_headers_in (abfd)
      bfd *abfd;
 {
@@ -394,16 +394,16 @@ nlm_swap_auxiliary_headers_in (abfd)
       position = bfd_tell (abfd);
       amt = sizeof (tempstr);
       if (bfd_bread ((PTR) tempstr, amt, abfd) != amt)
-	return false;
+	return FALSE;
       if (bfd_seek (abfd, position, SEEK_SET) != 0)
-	return false;
+	return FALSE;
       if (strncmp (tempstr, "VeRsIoN#", 8) == 0)
 	{
 	  Nlm_External_Version_Header thdr;
 
 	  amt = sizeof (thdr);
 	  if (bfd_bread ((PTR) &thdr, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  memcpy (nlm_version_header (abfd)->stamp, thdr.stamp,
 		  sizeof (thdr.stamp));
 	  nlm_version_header (abfd)->majorVersion =
@@ -425,7 +425,7 @@ nlm_swap_auxiliary_headers_in (abfd)
 
 	  amt = sizeof (thdr);
 	  if (bfd_bread ((PTR) &thdr, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  memcpy (nlm_extended_header (abfd)->stamp, thdr.stamp,
 		  sizeof (thdr.stamp));
 	  nlm_extended_header (abfd)->languageID =
@@ -492,16 +492,16 @@ nlm_swap_auxiliary_headers_in (abfd)
 	  amt = sizeof (nlm_copyright_header (abfd)->stamp);
 	  if (bfd_bread ((PTR) nlm_copyright_header (abfd)->stamp,
 			amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  if (bfd_bread ((PTR) &(nlm_copyright_header (abfd)
 				->copyrightMessageLength),
 			(bfd_size_type) 1, abfd) != 1)
-	    return false;
+	    return FALSE;
 	  /* The copyright message is a variable length string.  */
 	  amt = nlm_copyright_header (abfd)->copyrightMessageLength + 1;
 	  if (bfd_bread ((PTR) nlm_copyright_header (abfd)->copyrightMessage,
 			amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	}
       else if (strncmp (tempstr, "CuStHeAd", 8) == 0)
 	{
@@ -515,11 +515,11 @@ nlm_swap_auxiliary_headers_in (abfd)
 	  /* Read the stamp ("CuStHeAd").  */
 	  amt = sizeof (thdr.stamp);
 	  if (bfd_bread ((PTR) thdr.stamp, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  /* Read the length of this custom header.  */
 	  amt = sizeof (thdr.length);
 	  if (bfd_bread ((PTR) thdr.length, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  hdrLength = get_word (abfd, (bfd_byte *) thdr.length);
 	  /* Read further fields if we have them.  */
 	  if (hdrLength < NLM_TARGET_LONG_SIZE)
@@ -528,7 +528,7 @@ nlm_swap_auxiliary_headers_in (abfd)
 	    {
 	      amt = sizeof (thdr.dataOffset);
 	      if (bfd_bread ((PTR) thdr.dataOffset, amt, abfd) != amt)
-		return false;
+		return FALSE;
 	      dataOffset = get_word (abfd, (bfd_byte *) thdr.dataOffset);
 	    }
 	  if (hdrLength < 2 * NLM_TARGET_LONG_SIZE)
@@ -537,7 +537,7 @@ nlm_swap_auxiliary_headers_in (abfd)
 	    {
 	      amt = sizeof (thdr.dataLength);
 	      if (bfd_bread ((PTR) thdr.dataLength, amt, abfd) != amt)
-		return false;
+		return FALSE;
 	      dataLength = get_word (abfd, (bfd_byte *) thdr.dataLength);
 	    }
 	  if (hdrLength < 2 * NLM_TARGET_LONG_SIZE + 8)
@@ -546,7 +546,7 @@ nlm_swap_auxiliary_headers_in (abfd)
 	    {
 	      amt = sizeof (dataStamp);
 	      if (bfd_bread ((PTR) dataStamp, amt, abfd) != amt)
-		return false;
+		return FALSE;
 	    }
 
 	  /* Read the rest of the header, if any.  */
@@ -560,9 +560,9 @@ nlm_swap_auxiliary_headers_in (abfd)
 	      hdrLength -= 2 * NLM_TARGET_LONG_SIZE + 8;
 	      hdr = bfd_alloc (abfd, hdrLength);
 	      if (hdr == NULL)
-		return false;
+		return FALSE;
 	      if (bfd_bread (hdr, hdrLength, abfd) != hdrLength)
-		return false;
+		return FALSE;
 	    }
 
 	  /* If we have found a Cygnus header, process it.  Otherwise,
@@ -578,14 +578,14 @@ nlm_swap_auxiliary_headers_in (abfd)
 
 	      pos = bfd_tell (abfd);
 	      if (bfd_seek (abfd, dataOffset, SEEK_SET) != 0)
-		return false;
+		return FALSE;
 	      contents = (bfd_byte *) bfd_alloc (abfd, dataLength);
 	      if (contents == NULL)
-		return false;
+		return FALSE;
 	      if (bfd_bread (contents, dataLength, abfd) != dataLength)
-		return false;
+		return FALSE;
 	      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
-		return false;
+		return FALSE;
 
 	      memcpy (nlm_cygnus_ext_header (abfd), "CyGnUsEx", 8);
 	      nlm_cygnus_ext_header (abfd)->offset = dataOffset;
@@ -629,7 +629,7 @@ nlm_swap_auxiliary_headers_in (abfd)
 
 		  newsec = bfd_make_section_anyway (abfd, name);
 		  if (newsec == (asection *) NULL)
-		    return false;
+		    return FALSE;
 		  newsec->_raw_size = size;
 		  if (filepos != 0)
 		    {
@@ -653,12 +653,12 @@ nlm_swap_auxiliary_headers_in (abfd)
       else
 	break;
     }
-  return true;
+  return TRUE;
 }
 
 /* Return whether there is a non-zero byte in a memory block.  */
 
-static boolean
+static bfd_boolean
 find_nonzero (buf, size)
      PTR buf;
      size_t size;
@@ -667,15 +667,15 @@ find_nonzero (buf, size)
 
   while (size-- != 0)
     if (*p++ != 0)
-      return true;
-  return false;
+      return TRUE;
+  return FALSE;
 }
 
 /* Swap out the contents of the auxiliary headers.  We create those
    auxiliary headers which have been set non-zero.  We do not require
    the caller to set up the stamp fields.  */
 
-static boolean
+static bfd_boolean
 nlm_swap_auxiliary_headers_out (abfd)
      bfd *abfd;
 {
@@ -702,7 +702,7 @@ nlm_swap_auxiliary_headers_out (abfd)
 		(bfd_byte *) thdr.day);
       if (bfd_bwrite ((PTR) &thdr, (bfd_size_type) sizeof (thdr), abfd)
 	  != sizeof (thdr))
-	return false;
+	return FALSE;
     }
 
   /* Note - the CoPyRiGhT tag is emitted before the MeSsAgEs
@@ -717,17 +717,17 @@ nlm_swap_auxiliary_headers_out (abfd)
       memcpy (thdr.stamp, "CoPyRiGhT=", 10);
       amt = sizeof (thdr.stamp);
       if (bfd_bwrite ((PTR) thdr.stamp, amt, abfd) != amt)
-	return false;
+	return FALSE;
       thdr.copyrightMessageLength[0] =
 	nlm_copyright_header (abfd)->copyrightMessageLength;
       amt = 1;
       if (bfd_bwrite ((PTR) thdr.copyrightMessageLength, amt, abfd) != amt)
-	return false;
+	return FALSE;
       /* The copyright message is a variable length string.  */
       amt = nlm_copyright_header (abfd)->copyrightMessageLength + 1;
       if (bfd_bwrite ((PTR) nlm_copyright_header (abfd)->copyrightMessage,
 		     amt, abfd) != amt)
-	return false;
+	return FALSE;
     }
 
   /* Write out the extended header if there is one.  */
@@ -826,7 +826,7 @@ nlm_swap_auxiliary_headers_out (abfd)
 		(bfd_byte *) thdr.reserved5);
       if (bfd_bwrite ((PTR) &thdr, (bfd_size_type) sizeof (thdr), abfd)
 	  != sizeof (thdr))
-	return false;
+	return FALSE;
     }
 
   /* Write out the custom header if there is one.   */
@@ -834,7 +834,7 @@ nlm_swap_auxiliary_headers_out (abfd)
 		    sizeof (Nlm_Internal_Custom_Header)))
     {
       Nlm_External_Custom_Header thdr;
-      boolean ds;
+      bfd_boolean ds;
       bfd_size_type hdrLength;
 
       ds = find_nonzero ((PTR) nlm_custom_header (abfd)->dataStamp,
@@ -852,7 +852,7 @@ nlm_swap_auxiliary_headers_out (abfd)
 	  BFD_ASSERT (nlm_custom_header (abfd)->hdrLength == 0);
 	  amt = sizeof (thdr) - sizeof (thdr.dataStamp);
 	  if (bfd_bwrite ((PTR) &thdr, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	}
       else
 	{
@@ -860,10 +860,10 @@ nlm_swap_auxiliary_headers_out (abfd)
 		  sizeof (thdr.dataStamp));
 	  amt = sizeof (thdr);
 	  if (bfd_bwrite ((PTR) &thdr, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  amt = nlm_custom_header (abfd)->hdrLength;
 	  if (bfd_bwrite (nlm_custom_header (abfd)->hdr, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -883,10 +883,10 @@ nlm_swap_auxiliary_headers_out (abfd)
       memcpy (thdr.dataStamp, "CyGnUsEx", 8);
       amt = sizeof (thdr);
       if (bfd_bwrite ((PTR) &thdr, amt, abfd) != amt)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We read the NLM's public symbols and use it to generate a bfd symbol
@@ -1009,7 +1009,7 @@ nlm_print_symbol (abfd, afile, symbol, how)
    When we return, the bfd symcount is either zero or contains the correct
    number of symbols.  */
 
-static boolean
+static bfd_boolean
 nlm_slurp_symbol_table (abfd)
      bfd *abfd;
 {
@@ -1020,12 +1020,12 @@ nlm_slurp_symbol_table (abfd)
   unsigned char symlength;	/* Symbol length read into here.  */
   unsigned char symtype;	/* Type of debugging symbol.  */
   bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* Symbol offsets read into here.  */
-  boolean (*read_import_func) PARAMS ((bfd *, nlm_symbol_type *));
-  boolean (*set_public_section_func) PARAMS ((bfd *, nlm_symbol_type *));
+  bfd_boolean (*read_import_func) PARAMS ((bfd *, nlm_symbol_type *));
+  bfd_boolean (*set_public_section_func) PARAMS ((bfd *, nlm_symbol_type *));
   bfd_size_type amt;
 
   if (nlm_get_symbols (abfd) != NULL)
-    return true;
+    return TRUE;
 
   /* Read each raw NLM symbol, using the information to create a canonical bfd
      symbol table entry.
@@ -1041,15 +1041,15 @@ nlm_slurp_symbol_table (abfd)
 		 + i_fxdhdrp->numberOfDebugRecords
 		 + i_fxdhdrp->numberOfExternalReferences);
   if (totsymcount == 0)
-    return true;
+    return TRUE;
 
   if (bfd_seek (abfd, i_fxdhdrp->publicsOffset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   amt = totsymcount * sizeof (nlm_symbol_type);
   sym = ((nlm_symbol_type *) bfd_zalloc (abfd, amt));
   if (!sym)
-    return false;
+    return FALSE;
   nlm_set_symbols (abfd, sym);
 
   /* We use the bfd's symcount directly as the control count, so that early
@@ -1062,19 +1062,19 @@ nlm_slurp_symbol_table (abfd)
     {
       amt = sizeof (symlength);
       if (bfd_bread ((PTR) &symlength, amt, abfd) != amt)
-	return false;
+	return FALSE;
       amt = symlength;
       sym->symbol.the_bfd = abfd;
       sym->symbol.name = bfd_alloc (abfd, amt + 1);
       if (!sym->symbol.name)
-	return false;
+	return FALSE;
       if (bfd_bread ((PTR) sym->symbol.name, amt, abfd) != amt)
-	return false;
+	return FALSE;
       /* Cast away const.  */
       ((char *) (sym->symbol.name))[symlength] = '\0';
       amt = sizeof (temp);
       if (bfd_bread ((PTR) temp, amt, abfd) != amt)
-	return false;
+	return FALSE;
       sym->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
       sym->symbol.value = get_word (abfd, temp);
       if (set_public_section_func)
@@ -1082,7 +1082,7 @@ nlm_slurp_symbol_table (abfd)
 	  /* Most backends can use the code below, but unfortunately
 	     some use a different scheme.  */
 	  if (! (*set_public_section_func) (abfd, sym))
-	    return false;
+	    return FALSE;
 	}
       else
 	{
@@ -1109,27 +1109,27 @@ nlm_slurp_symbol_table (abfd)
   if (i_fxdhdrp->numberOfDebugRecords > 0)
     {
       if (bfd_seek (abfd, i_fxdhdrp->debugInfoOffset, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       symcount += i_fxdhdrp->numberOfDebugRecords;
       while (abfd->symcount < symcount)
 	{
 	  amt = sizeof (symtype);
 	  if (bfd_bread ((PTR) &symtype, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  amt = sizeof (temp);
 	  if (bfd_bread ((PTR) temp, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  amt = sizeof (symlength);
 	  if (bfd_bread ((PTR) &symlength, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  amt = symlength;
 	  sym->symbol.the_bfd = abfd;
 	  sym->symbol.name = bfd_alloc (abfd, amt + 1);
 	  if (!sym->symbol.name)
-	    return false;
+	    return FALSE;
 	  if (bfd_bread ((PTR) sym->symbol.name, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  /* Cast away const.  */
 	  ((char *) (sym->symbol.name))[symlength] = '\0';
 	  sym->symbol.flags = BSF_LOCAL;
@@ -1161,19 +1161,19 @@ nlm_slurp_symbol_table (abfd)
   if (read_import_func != NULL)
     {
       if (bfd_seek (abfd, i_fxdhdrp->externalReferencesOffset, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       symcount += i_fxdhdrp->numberOfExternalReferences;
       while (abfd->symcount < symcount)
 	{
 	  if (! (*read_import_func) (abfd, sym))
-	    return false;
+	    return FALSE;
 	  sym++;
 	  abfd->symcount++;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Get the relocs for an NLM file.  There are two types of relocs.
@@ -1189,25 +1189,25 @@ nlm_slurp_symbol_table (abfd)
    section pointers are needed because the relocs are not sorted by
    section.  */
 
-static boolean
+static bfd_boolean
 nlm_slurp_reloc_fixups (abfd)
      bfd *abfd;
 {
-  boolean (*read_func) PARAMS ((bfd *, nlm_symbol_type *, asection **,
-				arelent *));
+  bfd_boolean (*read_func)
+    PARAMS ((bfd *, nlm_symbol_type *, asection **, arelent *));
   bfd_size_type count, amt;
   arelent *rels;
   asection **secs;
 
   if (nlm_relocation_fixups (abfd) != NULL)
-    return true;
+    return TRUE;
   read_func = nlm_read_reloc_func (abfd);
   if (read_func == NULL)
-    return true;
+    return TRUE;
 
   if (bfd_seek (abfd, nlm_fixed_header (abfd)->relocationFixupOffset,
 		SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   count = nlm_fixed_header (abfd)->numberOfRelocationFixups;
   amt = count * sizeof (arelent);
@@ -1215,7 +1215,7 @@ nlm_slurp_reloc_fixups (abfd)
   amt = count * sizeof (asection *);
   secs = (asection **) bfd_alloc (abfd, amt);
   if ((rels == NULL || secs == NULL) && count != 0)
-    return false;
+    return FALSE;
   nlm_relocation_fixups (abfd) = rels;
   nlm_relocation_fixup_secs (abfd) = secs;
 
@@ -1227,13 +1227,13 @@ nlm_slurp_reloc_fixups (abfd)
 	{
 	  nlm_relocation_fixups (abfd) = NULL;
 	  nlm_relocation_fixup_secs (abfd) = NULL;
-	  return false;
+	  return FALSE;
 	}
       ++secs;
       ++rels;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Get the number of relocs.  This really just returns an upper bound,
@@ -1358,7 +1358,7 @@ nlm_canonicalize_reloc (abfd, sec, relptr, symbols)
    move the symbols at this point so that mangle_relocs can see the
    final values.  */
 
-static boolean
+static bfd_boolean
 nlm_compute_section_file_positions (abfd)
      bfd *abfd;
 {
@@ -1372,7 +1372,7 @@ nlm_compute_section_file_positions (abfd)
   asymbol **sym_ptr_ptr;
 
   if (abfd->output_has_begun)
-    return true;
+    return TRUE;
 
   /* Make sure we have a section to hold uninitialized data.  */
   bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
@@ -1381,11 +1381,11 @@ nlm_compute_section_file_positions (abfd)
       if (!add_bfd_section (abfd, NLM_UNINITIALIZED_DATA_NAME,
 			    (file_ptr) 0, (bfd_size_type) 0,
 			    SEC_ALLOC))
-	return false;
+	return FALSE;
       bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
     }
 
-  abfd->output_has_begun = true;
+  abfd->output_has_begun = TRUE;
 
   /* The fixed header.  */
   sofar = nlm_optional_prefix_size (abfd) + nlm_fixed_header_size (abfd);
@@ -1556,7 +1556,7 @@ nlm_compute_section_file_positions (abfd)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the contents of a section.  To do this we need to know where
@@ -1564,7 +1564,7 @@ nlm_compute_section_file_positions (abfd)
    that the sizes of all the sections must be set, and all the
    variable size header information must be known.  */
 
-boolean
+bfd_boolean
 nlm_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -1574,10 +1574,10 @@ nlm_set_section_contents (abfd, section, location, offset, count)
 {
   if (! abfd->output_has_begun
       && ! nlm_compute_section_file_positions (abfd))
-    return false;
+    return FALSE;
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   /* i386 NetWare has a very restricted set of relocs.  In order for
      objcopy to work, the NLM i386 backend needs a chance to rework
@@ -1585,23 +1585,23 @@ nlm_set_section_contents (abfd, section, location, offset, count)
      the relocs are already acceptable, this will not do anything.  */
   if (section->reloc_count != 0)
     {
-      boolean (*mangle_relocs_func) PARAMS ((bfd *, asection *, PTR,
-					     bfd_vma, bfd_size_type));
+      bfd_boolean (*mangle_relocs_func)
+	PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
 
       mangle_relocs_func = nlm_mangle_relocs_func (abfd);
       if (mangle_relocs_func != NULL)
 	{
 	  if (!(*mangle_relocs_func) (abfd, section, location,
 				      (bfd_vma) offset, count))
-	    return false;
+	    return FALSE;
 	}
     }
 
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
       || bfd_bwrite (location, count, abfd) != count)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* We need to sort a list of relocs associated with sections when we
@@ -1655,17 +1655,17 @@ nlm_external_reloc_compare (p1, p2)
    section.  The exports and debugging records are obtained from the
    list of outsymbols.  */
 
-boolean
+bfd_boolean
 nlm_write_object_contents (abfd)
      bfd *abfd;
 {
   asection *sec;
-  boolean (*write_import_func) PARAMS ((bfd *, asection *, arelent *));
+  bfd_boolean (*write_import_func) PARAMS ((bfd *, asection *, arelent *));
   bfd_size_type external_reloc_count, internal_reloc_count, i, c;
   struct reloc_and_sec *external_relocs;
   asymbol **sym_ptr_ptr;
   file_ptr last;
-  boolean (*write_prefix_func) PARAMS ((bfd *));
+  bfd_boolean (*write_prefix_func) PARAMS ((bfd *));
   unsigned char *fixed_header = NULL;
   file_ptr pos;
   bfd_size_type amt;
@@ -1831,7 +1831,7 @@ nlm_write_object_contents (abfd)
   if (sym_ptr_ptr != (asymbol **) NULL)
     {
       bfd_vma (*get_public_offset_func) PARAMS ((bfd *, asymbol *));
-      boolean (*write_export_func) PARAMS ((bfd *, asymbol *, bfd_vma));
+      bfd_boolean (*write_export_func) PARAMS ((bfd *, asymbol *, bfd_vma));
 
       asymbol **sym_end;
 
@@ -2034,10 +2034,10 @@ nlm_write_object_contents (abfd)
 
   if (fixed_header != NULL)
     free (fixed_header);
-  return true;
+  return TRUE;
 
 error_return:
   if (fixed_header != NULL)
     free (fixed_header);
-  return false;
+  return FALSE;
 }
diff --git a/bfd/oasys.c b/bfd/oasys.c
index 9035a4fddda..494e155bffc 100644
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -27,62 +27,85 @@
 #include "oasys.h"
 #include "liboasys.h"
 
-static boolean oasys_slurp_section_data PARAMS ((bfd * const));
-static boolean oasys_read_record PARAMS ((bfd *, oasys_record_union_type *));
-static boolean oasys_write_sections PARAMS ((bfd *));
-static boolean oasys_write_record
+static bfd_boolean oasys_slurp_section_data
+  PARAMS ((bfd * const));
+static bfd_boolean oasys_read_record
+  PARAMS ((bfd *, oasys_record_union_type *));
+static bfd_boolean oasys_write_sections
+  PARAMS ((bfd *));
+static bfd_boolean oasys_write_record
   PARAMS ((bfd *, oasys_record_enum_type, oasys_record_union_type *, size_t));
-static boolean oasys_write_syms PARAMS ((bfd *));
-static boolean oasys_write_header PARAMS ((bfd *));
-static boolean oasys_write_end PARAMS ((bfd *));
-static boolean oasys_write_data PARAMS ((bfd *));
-static size_t oasys_string_length PARAMS ((oasys_record_union_type *));
-static boolean oasys_slurp_symbol_table PARAMS ((bfd *const));
-static long int oasys_get_symtab_upper_bound PARAMS ((bfd *const));
-static const bfd_target *oasys_archive_p PARAMS ((bfd *));
-static boolean oasys_mkobject PARAMS ((bfd *));
-static const bfd_target *oasys_object_p PARAMS ((bfd *));
-static void oasys_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
+static bfd_boolean oasys_write_syms
+  PARAMS ((bfd *));
+static bfd_boolean oasys_write_header
+  PARAMS ((bfd *));
+static bfd_boolean oasys_write_end
+  PARAMS ((bfd *));
+static bfd_boolean oasys_write_data
+  PARAMS ((bfd *));
+static size_t oasys_string_length
+  PARAMS ((oasys_record_union_type *));
+static bfd_boolean oasys_slurp_symbol_table
+  PARAMS ((bfd *const));
+static long int oasys_get_symtab_upper_bound
+  PARAMS ((bfd *const));
+static const bfd_target *oasys_archive_p
+  PARAMS ((bfd *));
+static bfd_boolean oasys_mkobject
+  PARAMS ((bfd *));
+static const bfd_target *oasys_object_p
+  PARAMS ((bfd *));
+static void oasys_get_symbol_info
+  PARAMS ((bfd *, asymbol *, symbol_info *));
 static void oasys_print_symbol
   PARAMS ((bfd *, void *, asymbol *, bfd_print_symbol_type));
-static boolean oasys_new_section_hook PARAMS ((bfd *, asection *));
-static long int oasys_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-static boolean oasys_get_section_contents
+static bfd_boolean oasys_new_section_hook
+  PARAMS ((bfd *, asection *));
+static long int oasys_get_reloc_upper_bound
+  PARAMS ((bfd *, sec_ptr));
+static bfd_boolean oasys_get_section_contents
   PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
-static int comp PARAMS ((const void *, const void *));
-static boolean oasys_write_object_contents PARAMS ((bfd *));
-static boolean oasys_set_section_contents
+static int comp
+  PARAMS ((const void *, const void *));
+static bfd_boolean oasys_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean oasys_set_section_contents
   PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
-static asymbol *oasys_make_empty_symbol PARAMS ((bfd *));
-static bfd *oasys_openr_next_archived_file PARAMS ((bfd *, bfd *));
-static boolean oasys_find_nearest_line
+static asymbol *oasys_make_empty_symbol
+  PARAMS ((bfd *));
+static bfd *oasys_openr_next_archived_file
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean oasys_find_nearest_line
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma,
 	   const char **, const char **, unsigned int *));
-static int oasys_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
-static int oasys_sizeof_headers PARAMS ((bfd *, boolean));
+static int oasys_generic_stat_arch_elt
+  PARAMS ((bfd *, struct stat *));
+static int oasys_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
 
-long oasys_get_symtab PARAMS ((bfd *, asymbol **));
+long oasys_get_symtab
+  PARAMS ((bfd *, asymbol **));
 long oasys_canonicalize_reloc
   PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
 
 /* Read in all the section data and relocation stuff too.  */
 
-static boolean
+static bfd_boolean
 oasys_read_record (abfd, record)
      bfd *abfd;
      oasys_record_union_type *record;
 {
   bfd_size_type amt = sizeof (record->header);
   if (bfd_bread ((PTR) record, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   amt = record->header.length - sizeof (record->header);
   if ((long) amt <= 0)
-    return true;
+    return TRUE;
   if (bfd_bread ((PTR) ((char *) record + sizeof (record->header)), amt, abfd)
       != amt)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 static size_t
@@ -109,13 +132,13 @@ moving in, and the defined symbols at the end of the table moving back.
 
 */
 
-static boolean
+static bfd_boolean
 oasys_slurp_symbol_table (abfd)
      bfd *const abfd;
 {
   oasys_record_union_type record;
   oasys_data_type *data = OASYS_DATA (abfd);
-  boolean loop = true;
+  bfd_boolean loop = TRUE;
   asymbol *dest_defined;
   asymbol *dest;
   char *string_ptr;
@@ -123,7 +146,7 @@ oasys_slurp_symbol_table (abfd)
 
   if (data->symbols != (asymbol *) NULL)
     {
-      return true;
+      return TRUE;
     }
   /* Buy enough memory for all the symbols and all the names */
   amt = abfd->symcount;
@@ -138,18 +161,18 @@ oasys_slurp_symbol_table (abfd)
   data->strings = bfd_alloc (abfd, amt);
 
   if (!data->symbols || !data->strings)
-    return false;
+    return FALSE;
 
   dest_defined = data->symbols + abfd->symcount - 1;
 
   string_ptr = data->strings;
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   while (loop)
     {
 
       if (! oasys_read_record (abfd, &record))
-	return false;
+	return FALSE;
       switch (record.header.type)
 	{
 	case oasys_record_is_header_enum:
@@ -229,10 +252,10 @@ oasys_slurp_symbol_table (abfd)
 	  }
 	  break;
 	default:
-	  loop = false;
+	  loop = FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 static long
@@ -405,7 +428,7 @@ oasys_archive_p (abfd)
   return abfd->xvec;
 }
 
-static boolean
+static bfd_boolean
 oasys_mkobject (abfd)
      bfd *abfd;
 {
@@ -421,8 +444,8 @@ oasys_object_p (abfd)
 {
   oasys_data_type *oasys;
   oasys_data_type *save = OASYS_DATA (abfd);
-  boolean loop = true;
-  boolean had_usefull = false;
+  bfd_boolean loop = TRUE;
+  bfd_boolean had_usefull = FALSE;
 
   abfd->tdata.oasys_obj_data = 0;
   oasys_mkobject (abfd);
@@ -449,14 +472,14 @@ oasys_object_p (abfd)
       switch ((oasys_record_enum_type) (record.header.type))
 	{
 	case oasys_record_is_header_enum:
-	  had_usefull = true;
+	  had_usefull = TRUE;
 	  break;
 	case oasys_record_is_symbol_enum:
 	case oasys_record_is_local_enum:
 	  /* Count symbols and remember their size for a future malloc   */
 	  abfd->symcount++;
 	  oasys->symbol_string_length += 1 + oasys_string_length (&record);
-	  had_usefull = true;
+	  had_usefull = TRUE;
 	  break;
 	case oasys_record_is_section_enum:
 	  {
@@ -487,7 +510,7 @@ oasys_object_p (abfd)
 	    s->_raw_size = H_GET_32 (abfd, record.section.value);
 	    s->vma = H_GET_32 (abfd, record.section.vma);
 	    s->flags = 0;
-	    had_usefull = true;
+	    had_usefull = TRUE;
 	  }
 	  break;
 	case oasys_record_is_data_enum:
@@ -498,7 +521,7 @@ oasys_object_p (abfd)
 	case oasys_record_is_end_enum:
 	  if (! had_usefull)
 	    goto fail;
-	  loop = false;
+	  loop = FALSE;
 	  break;
 	default:
 	  goto fail;
@@ -578,20 +601,20 @@ oasys_print_symbol (abfd, afile, symbol, how)
 static reloc_howto_type howto_table[] =
 {
 
-  HOWTO (0, 0, 1, 16, false, 0, complain_overflow_bitfield, 0, "abs16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (0, 0, 2, 32, false, 0, complain_overflow_bitfield, 0, "abs32", true, 0xffffffff, 0xffffffff, false),
-  HOWTO (0, 0, 1, 16, true, 0, complain_overflow_signed, 0, "pcrel16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (0, 0, 2, 32, true, 0, complain_overflow_signed, 0, "pcrel32", true, 0xffffffff, 0xffffffff, false)
+  HOWTO (0, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, 0, "abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (0, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "abs32", TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (0, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "pcrel16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (0, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0, "pcrel32", TRUE, 0xffffffff, 0xffffffff, FALSE)
 };
 
 /* Read in all the section data and relocation stuff too */
-static boolean
+static bfd_boolean
 oasys_slurp_section_data (abfd)
      bfd *const abfd;
 {
   oasys_record_union_type record;
   oasys_data_type *data = OASYS_DATA (abfd);
-  boolean loop = true;
+  bfd_boolean loop = TRUE;
   oasys_per_section_type *per;
   asection *s;
   bfd_size_type amt;
@@ -601,18 +624,18 @@ oasys_slurp_section_data (abfd)
     {
       per = oasys_per_section (s);
       if (per->initialized)
-	return true;
+	return TRUE;
     }
 
   if (data->first_data_record == 0)
-    return true;
+    return TRUE;
 
   if (bfd_seek (abfd, data->first_data_record, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   while (loop)
     {
       if (! oasys_read_record (abfd, &record))
-	return false;
+	return FALSE;
       switch (record.header.type)
 	{
 	case oasys_record_is_header_enum:
@@ -636,11 +659,11 @@ oasys_slurp_section_data (abfd)
 	      {
 		per->data = (bfd_byte *) bfd_zalloc (abfd, section->_raw_size);
 		if (!per->data)
-		  return false;
+		  return FALSE;
 		per->reloc_tail_ptr
 		  = (oasys_reloc_type **) &section->relocation;
-		per->had_vma = false;
-		per->initialized = true;
+		per->had_vma = FALSE;
+		per->initialized = TRUE;
 		section->reloc_count = 0;
 		section->flags = SEC_ALLOC;
 	      }
@@ -650,7 +673,7 @@ oasys_slurp_section_data (abfd)
 	      {
 		/* Take the first vma we see as the base */
 		section->vma = dst_offset;
-		per->had_vma = true;
+		per->had_vma = TRUE;
 	      }
 
 	    dst_offset -= section->vma;
@@ -705,7 +728,7 @@ oasys_slurp_section_data (abfd)
 				  r = (oasys_reloc_type *) bfd_alloc (abfd,
 								      amt);
 				  if (!r)
-				    return false;
+				    return FALSE;
 				  *(per->reloc_tail_ptr) = r;
 				  per->reloc_tail_ptr = &r->next;
 				  r->next = (oasys_reloc_type *) NULL;
@@ -747,7 +770,7 @@ oasys_slurp_section_data (abfd)
 				  r = (oasys_reloc_type *) bfd_alloc (abfd,
 								      amt);
 				  if (!r)
-				    return false;
+				    return FALSE;
 				  *(per->reloc_tail_ptr) = r;
 				  per->reloc_tail_ptr = &r->next;
 				  r->next = (oasys_reloc_type *) NULL;
@@ -793,15 +816,15 @@ oasys_slurp_section_data (abfd)
 	case oasys_record_is_section_enum:
 	  break;
 	default:
-	  loop = false;
+	  loop = FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 
 }
 
-static boolean
+static bfd_boolean
 oasys_new_section_hook (abfd, newsect)
      bfd *abfd;
      asection *newsect;
@@ -809,17 +832,17 @@ oasys_new_section_hook (abfd, newsect)
   newsect->used_by_bfd = (PTR)
     bfd_alloc (abfd, (bfd_size_type) sizeof (oasys_per_section_type));
   if (!newsect->used_by_bfd)
-    return false;
+    return FALSE;
   oasys_per_section (newsect)->data = (bfd_byte *) NULL;
   oasys_per_section (newsect)->section = newsect;
   oasys_per_section (newsect)->offset = 0;
-  oasys_per_section (newsect)->initialized = false;
+  oasys_per_section (newsect)->initialized = FALSE;
   newsect->alignment_power = 1;
   /* Turn the section string into an index */
 
   sscanf (newsect->name, "%u", &newsect->target_index);
 
-  return true;
+  return TRUE;
 }
 
 
@@ -833,7 +856,7 @@ oasys_get_reloc_upper_bound (abfd, asect)
   return (asect->reloc_count + 1) * sizeof (arelent *);
 }
 
-static boolean
+static bfd_boolean
 oasys_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -851,7 +874,7 @@ oasys_get_section_contents (abfd, section, location, offset, count)
     {
       (void) memcpy (location, (PTR) (p->data + offset), (size_t) count);
     }
-  return true;
+  return TRUE;
 }
 
 
@@ -890,7 +913,7 @@ oasys_canonicalize_reloc (ignore_abfd, section, relptr, symbols)
 
 
 /* Calculate the checksum and write one record */
-static boolean
+static bfd_boolean
 oasys_write_record (abfd, type, record, size)
      bfd *abfd;
      oasys_record_enum_type type;
@@ -913,13 +936,13 @@ oasys_write_record (abfd, type, record, size)
     }
   record->header.check_sum = 0xff & (-checksum);
   if (bfd_bwrite ((PTR) record, (bfd_size_type) size, abfd) != size)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 
 /* Write out all the symbols */
-static boolean
+static bfd_boolean
 oasys_write_syms (abfd)
      bfd *abfd;
 {
@@ -995,7 +1018,7 @@ oasys_write_syms (abfd)
 				    (oasys_record_union_type *) & symbol,
 				    offsetof (oasys_symbol_record_type,
 					      name[0]) + l))
-	    return false;
+	    return FALSE;
 	}
       else
 	{
@@ -1004,17 +1027,17 @@ oasys_write_syms (abfd)
 				    (oasys_record_union_type *) & symbol,
 				    offsetof (oasys_symbol_record_type,
 					      name[0]) + l))
-	    return false;
+	    return FALSE;
 	}
       g->value = index - 1;
     }
 
-  return true;
+  return TRUE;
 }
 
 
  /* Write a section header for each section */
-static boolean
+static bfd_boolean
 oasys_write_sections (abfd)
      bfd *abfd;
 {
@@ -1029,7 +1052,7 @@ oasys_write_sections (abfd)
 	    (_("%s: can not represent section `%s' in oasys"),
 	     bfd_get_filename (abfd), s->name);
 	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return false;
+	  return FALSE;
 	}
       out.relb = RELOCATION_TYPE_REL | s->target_index;
       H_PUT_32 (abfd, s->_cooked_size, out.value);
@@ -1039,12 +1062,12 @@ oasys_write_sections (abfd)
 				oasys_record_is_section_enum,
 				(oasys_record_union_type *) & out,
 				sizeof (out)))
-	return false;
+	return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 oasys_write_header (abfd)
      bfd *abfd;
 {
@@ -1070,12 +1093,12 @@ oasys_write_header (abfd)
 			    (oasys_record_union_type *) & r,
 			    offsetof (oasys_header_record_type,
 				      description[0])))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 oasys_write_end (abfd)
      bfd *abfd;
 {
@@ -1089,10 +1112,10 @@ oasys_write_end (abfd)
 			    oasys_record_is_end_enum,
 			    (oasys_record_union_type *) & end,
 			    sizeof (end)))
-    return false;
+    return FALSE;
   if (bfd_bwrite ((PTR) &null, (bfd_size_type) 1, abfd) != 1)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 static int
@@ -1109,7 +1132,7 @@ comp (ap, bp)
  Writing data..
 
 */
-static boolean
+static bfd_boolean
 oasys_write_data (abfd)
      bfd *abfd;
 {
@@ -1286,29 +1309,29 @@ oasys_write_data (abfd)
 		     (abfd, oasys_record_is_data_enum,
 		      ((oasys_record_union_type *) &processed_data),
 		      (size_t) (dst - (bfd_byte *) &processed_data))))
-		return false;
+		return FALSE;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 oasys_write_object_contents (abfd)
      bfd *abfd;
 {
   if (! oasys_write_header (abfd))
-    return false;
+    return FALSE;
   if (! oasys_write_syms (abfd))
-    return false;
+    return FALSE;
   if (! oasys_write_sections (abfd))
-    return false;
+    return FALSE;
   if (! oasys_write_data (abfd))
-    return false;
+    return FALSE;
   if (! oasys_write_end (abfd))
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 
@@ -1319,7 +1342,7 @@ oasys_write_object_contents (abfd)
 /* set section contents is complicated with OASYS since the format is
 * not a byte image, but a record stream.
 */
-static boolean
+static bfd_boolean
 oasys_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -1334,13 +1357,13 @@ oasys_set_section_contents (abfd, section, location, offset, count)
 	  oasys_per_section (section)->data =
 	    (bfd_byte *) (bfd_alloc (abfd, section->_cooked_size));
 	  if (!oasys_per_section (section)->data)
-	    return false;
+	    return FALSE;
 	}
       (void) memcpy ((PTR) (oasys_per_section (section)->data + offset),
 		     location,
 		     (size_t) count);
     }
-  return true;
+  return TRUE;
 }
 
 
@@ -1406,7 +1429,7 @@ oasys_openr_next_archived_file (arch, prev)
     }
 }
 
-static boolean
+static bfd_boolean
 oasys_find_nearest_line (abfd, section, symbols, offset,
 			 filename_ptr, functionname_ptr, line_ptr)
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -1417,7 +1440,7 @@ oasys_find_nearest_line (abfd, section, symbols, offset,
      const char **functionname_ptr ATTRIBUTE_UNUSED;
      unsigned int *line_ptr ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 
 }
 
@@ -1443,7 +1466,7 @@ oasys_generic_stat_arch_elt (abfd, buf)
 static int
 oasys_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
@@ -1454,11 +1477,11 @@ oasys_sizeof_headers (abfd, exec)
 #define oasys_slurp_armap bfd_true
 #define oasys_slurp_extended_name_table bfd_true
 #define oasys_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
+  ((bfd_boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
    bfd_true)
 #define oasys_truncate_arname bfd_dont_truncate_arname
 #define oasys_write_armap \
-  ((boolean (*) \
+  ((bfd_boolean (*) \
     PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
    bfd_true)
 #define oasys_read_ar_hdr bfd_nullvoidptr
diff --git a/bfd/opncls.c b/bfd/opncls.c
index af8ff7e4a63..32d223ebb74 100644
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -75,13 +75,13 @@ _bfd_new_bfd ()
   nbfd->format = bfd_unknown;
   nbfd->my_archive = (bfd *) NULL;
   nbfd->origin = 0;
-  nbfd->opened_once = false;
-  nbfd->output_has_begun = false;
+  nbfd->opened_once = FALSE;
+  nbfd->output_has_begun = FALSE;
   nbfd->section_count = 0;
   nbfd->usrdata = (PTR) NULL;
-  nbfd->cacheable = false;
+  nbfd->cacheable = FALSE;
   nbfd->flags = BFD_NO_FLAGS;
-  nbfd->mtime_set = false;
+  nbfd->mtime_set = FALSE;
 
   return nbfd;
 }
@@ -275,7 +275,7 @@ bfd_fdopenr (filename, target, fd)
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
-  nbfd->opened_once = true;
+  nbfd->opened_once = TRUE;
 
   return nbfd;
 }
@@ -388,7 +388,7 @@ FUNCTION
 	bfd_close
 
 SYNOPSIS
-	boolean bfd_close(bfd *abfd);
+	bfd_boolean bfd_close (bfd *abfd);
 
 DESCRIPTION
 
@@ -403,24 +403,24 @@ DESCRIPTION
 	if it was passed in to BFD by <<bfd_fdopenr>>).
 
 RETURNS
-	<<true>> is returned if all is ok, otherwise <<false>>.
+	<<TRUE>> is returned if all is ok, otherwise <<FALSE>>.
 */
 
 
-boolean
+bfd_boolean
 bfd_close (abfd)
      bfd *abfd;
 {
-  boolean ret;
+  bfd_boolean ret;
 
   if (bfd_write_p (abfd))
     {
       if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
-	return false;
+	return FALSE;
     }
 
   if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
-    return false;
+    return FALSE;
 
   ret = bfd_cache_close (abfd);
 
@@ -453,7 +453,7 @@ FUNCTION
 	bfd_close_all_done
 
 SYNOPSIS
-	boolean bfd_close_all_done(bfd *);
+	bfd_boolean bfd_close_all_done (bfd *);
 
 DESCRIPTION
 	Close a BFD.  Differs from <<bfd_close>> since it does not
@@ -467,14 +467,14 @@ DESCRIPTION
 	All memory attached to the BFD is released.
 
 RETURNS
-	<<true>> is returned if all is ok, otherwise <<false>>.
+	<<TRUE>> is returned if all is ok, otherwise <<FALSE>>.
 */
 
-boolean
+bfd_boolean
 bfd_close_all_done (abfd)
      bfd *abfd;
 {
-  boolean ret;
+  bfd_boolean ret;
 
   ret = bfd_cache_close (abfd);
 
@@ -539,7 +539,7 @@ FUNCTION
 	bfd_make_writable
 
 SYNOPSIS
-	boolean bfd_make_writable(bfd *abfd);
+	bfd_boolean bfd_make_writable (bfd *abfd);
 
 DESCRIPTION
 	Takes a BFD as created by <<bfd_create>> and converts it
@@ -548,10 +548,10 @@ DESCRIPTION
 	you will call <<bfd_make_readable>> on this bfd later.
 
 RETURNS
-	<<true>> is returned if all is ok, otherwise <<false>>.
+	<<TRUE>> is returned if all is ok, otherwise <<FALSE>>.
 */
 
-boolean
+bfd_boolean
 bfd_make_writable(abfd)
      bfd *abfd;
 {
@@ -560,7 +560,7 @@ bfd_make_writable(abfd)
   if (abfd->direction != no_direction)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   bim = ((struct bfd_in_memory *)
@@ -574,7 +574,7 @@ bfd_make_writable(abfd)
   abfd->direction = write_direction;
   abfd->where = 0;
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -582,7 +582,7 @@ FUNCTION
 	bfd_make_readable
 
 SYNOPSIS
-	boolean bfd_make_readable(bfd *abfd);
+	bfd_boolean bfd_make_readable (bfd *abfd);
 
 DESCRIPTION
 	Takes a BFD as created by <<bfd_create>> and
@@ -592,23 +592,23 @@ DESCRIPTION
 	direction.
 
 RETURNS
-	<<true>> is returned if all is ok, otherwise <<false>>.  */
+	<<TRUE>> is returned if all is ok, otherwise <<FALSE>>.  */
 
-boolean
+bfd_boolean
 bfd_make_readable(abfd)
      bfd *abfd;
 {
   if (abfd->direction != write_direction || !(abfd->flags & BFD_IN_MEMORY))
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
-    return false;
+    return FALSE;
 
   if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
-    return false;
+    return FALSE;
 
 
   abfd->arch_info = &bfd_default_arch_struct;
@@ -617,15 +617,15 @@ bfd_make_readable(abfd)
   abfd->format = bfd_unknown;
   abfd->my_archive = (bfd *) NULL;
   abfd->origin = 0;
-  abfd->opened_once = false;
-  abfd->output_has_begun = false;
+  abfd->opened_once = FALSE;
+  abfd->output_has_begun = FALSE;
   abfd->section_count = 0;
   abfd->usrdata = (PTR) NULL;
-  abfd->cacheable = false;
+  abfd->cacheable = FALSE;
   abfd->flags = BFD_IN_MEMORY;
-  abfd->mtime_set = false;
+  abfd->mtime_set = FALSE;
 
-  abfd->target_defaulted = true;
+  abfd->target_defaulted = TRUE;
   abfd->direction = read_direction;
   abfd->sections = 0;
   abfd->symcount = 0;
@@ -635,7 +635,7 @@ bfd_make_readable(abfd)
   bfd_section_list_clear (abfd);
   bfd_check_format (abfd, bfd_object);
 
-  return true;
+  return TRUE;
 }
 
 /*
diff --git a/bfd/osf-core.c b/bfd/osf-core.c
index 862342ec974..95292a3e4bc 100644
--- a/bfd/osf-core.c
+++ b/bfd/osf-core.c
@@ -32,11 +32,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 static asection *make_bfd_asection
   PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
-static const bfd_target *osf_core_core_file_p PARAMS ((bfd *));
-static char *osf_core_core_file_failing_command PARAMS ((bfd *));
-static int osf_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean osf_core_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
-static void swap_abort PARAMS ((void));
+static const bfd_target *osf_core_core_file_p
+  PARAMS ((bfd *));
+static char *osf_core_core_file_failing_command
+  PARAMS ((bfd *));
+static int osf_core_core_file_failing_signal
+  PARAMS ((bfd *));
+static bfd_boolean osf_core_core_file_matches_executable_p
+  PARAMS ((bfd *, bfd *));
+static void swap_abort
+  PARAMS ((void));
 
 /* These are stored in the bfd's tdata */
 
@@ -168,12 +173,12 @@ osf_core_core_file_failing_signal (abfd)
 }
 
 /* ARGSUSED */
-static boolean
+static bfd_boolean
 osf_core_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd ATTRIBUTE_UNUSED;
      bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
-  return true;		/* FIXME, We have no way of telling at this point */
+  return TRUE;		/* FIXME, We have no way of telling at this point */
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c
index f8fd85866dc..f96956a608f 100644
--- a/bfd/pc532-mach.c
+++ b/bfd/pc532-mach.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Mach3/532 a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1994, 1995, 2000, 2001
+   Copyright 1990, 1991, 1992, 1994, 1995, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -79,10 +79,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 reloc_howto_type *ns32kaout_bfd_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 
-static boolean MY(write_object_contents)
+static bfd_boolean MY(write_object_contents)
   PARAMS ((bfd *abfd));
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -106,7 +106,7 @@ MY(write_object_contents) (abfd)
 
   WRITE_HEADERS(abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 #define MY_write_object_contents MY(write_object_contents)
diff --git a/bfd/pdp11.c b/bfd/pdp11.c
index f7514367f7d..95d78a1103d 100644
--- a/bfd/pdp11.c
+++ b/bfd/pdp11.c
@@ -131,7 +131,7 @@ struct pdp11_external_nlist
 #define MY_entry_is_text_address 1
 
 #define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd));
 #define MY_text_includes_header 1
 
 bfd_vma		bfd_getp32	   PARAMS ((const bfd_byte *));
@@ -358,10 +358,10 @@ struct pdp11_aout_reloc_external
 
 #define RINDEX(x)	(((x) & 0xfff0) >> 4)
 
-static boolean aout_get_external_symbols PARAMS ((bfd *));
-static boolean translate_from_native_sym_flags
+static bfd_boolean aout_get_external_symbols PARAMS ((bfd *));
+static bfd_boolean translate_from_native_sym_flags
   PARAMS ((bfd *, aout_symbol_type *));
-static boolean translate_to_native_sym_flags
+static bfd_boolean translate_to_native_sym_flags
   PARAMS ((bfd *, asymbol *, struct external_nlist *));
 static void adjust_o_magic PARAMS ((bfd *, struct internal_exec *));
 static void adjust_z_magic PARAMS ((bfd *, struct internal_exec *));
@@ -399,8 +399,8 @@ DESCRIPTION
 reloc_howto_type howto_table_pdp11[] =
 {
   /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone */
-HOWTO( 0,	       0,  1,  16,  false, 0, complain_overflow_signed,0,"16",	true, 0x0000ffff,0x0000ffff, false),
-HOWTO( 1,	       0,  1,  16,  true,  0, complain_overflow_signed,0,"DISP16",	true, 0x0000ffff,0x0000ffff, false),
+HOWTO( 0,	       0,  1,  16,  FALSE, 0, complain_overflow_signed,0,"16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+HOWTO( 1,	       0,  1,  16,  TRUE,  0, complain_overflow_signed,0,"DISP16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
 };
 
 #define TABLE_SIZE(TABLE)	(sizeof(TABLE)/sizeof(TABLE[0]))
@@ -451,11 +451,11 @@ pdp11_aout_write_headers (abfd, execp)
   NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
       != EXEC_BYTES_SIZE)
-    return false;
+    return FALSE;
 
   /* Now write out reloc info, followed by syms and strings */
 
@@ -463,34 +463,34 @@ pdp11_aout_write_headers (abfd, execp)
       && bfd_get_symcount (abfd) != 0)
     {
       if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       if (! NAME(aout,write_syms) (abfd))
-	return false;
+	return FALSE;
     }
 
   if (obj_textsec (abfd)->reloc_count > 0 ||
       obj_datasec (abfd)->reloc_count > 0)
     {
       if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) != 0)
-	return false;
+	return FALSE;
       if (!NAME(aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))
-	return false;
+	return FALSE;
 
       if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) != 0)
-	return false;
+	return FALSE;
       if (!NAME(aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write an object file.
    Section contents have already been written.  We write the
    file header, symbols, and relocation.  */
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -622,20 +622,20 @@ NAME(aout,swap_exec_header_out) (abfd, execp, raw_bytes)
 
 /* Make all the section for an a.out file.  */
 
-boolean
+bfd_boolean
 NAME(aout,make_sections) (abfd)
      bfd *abfd;
 {
   if (obj_textsec (abfd) == (asection *) NULL
       && bfd_make_section (abfd, ".text") == (asection *) NULL)
-    return false;
+    return FALSE;
   if (obj_datasec (abfd) == (asection *) NULL
       && bfd_make_section (abfd, ".data") == (asection *) NULL)
-    return false;
+    return FALSE;
   if (obj_bsssec (abfd) == (asection *) NULL
       && bfd_make_section (abfd, ".bss") == (asection *) NULL)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /*
@@ -869,13 +869,13 @@ FUNCTION
 	aout_@var{size}_mkobject
 
 SYNOPSIS
-	boolean aout_@var{size}_mkobject, (bfd *abfd);
+	bfd_boolean aout_@var{size}_mkobject, (bfd *abfd);
 
 DESCRIPTION
 	Initialize BFD @var{abfd} for use with a.out files.
 */
 
-boolean
+bfd_boolean
 NAME(aout,mkobject) (abfd)
      bfd *abfd;
 {
@@ -888,7 +888,7 @@ NAME(aout,mkobject) (abfd)
   rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt);
 
   if (rawptr == NULL)
-    return false;
+    return FALSE;
 
   abfd->tdata.aout_data = rawptr;
   exec_hdr (abfd) = &(rawptr->e);
@@ -897,7 +897,7 @@ NAME(aout,mkobject) (abfd)
   obj_datasec (abfd) = (asection *)NULL;
   obj_bsssec (abfd) = (asection *)NULL;
 
-  return true;
+  return TRUE;
 }
 
 
@@ -924,12 +924,12 @@ enum machine_type
 NAME(aout,machine_type) (arch, machine, unknown)
      enum bfd_architecture arch;
      unsigned long machine;
-     boolean *unknown;
+     bfd_boolean *unknown;
 {
   enum machine_type arch_flags;
 
   arch_flags = M_UNKNOWN;
-  *unknown = true;
+  *unknown = TRUE;
 
   switch (arch)
     {
@@ -947,7 +947,7 @@ NAME(aout,machine_type) (arch, machine, unknown)
       switch (machine)
 	{
 	case 0:		      arch_flags = M_68010; break;
-	case bfd_mach_m68000: arch_flags = M_UNKNOWN; *unknown = false; break;
+	case bfd_mach_m68000: arch_flags = M_UNKNOWN; *unknown = FALSE; break;
 	case bfd_mach_m68010: arch_flags = M_68010; break;
 	case bfd_mach_m68020: arch_flags = M_68020; break;
 	default:	      arch_flags = M_UNKNOWN; break;
@@ -1001,11 +1001,11 @@ NAME(aout,machine_type) (arch, machine, unknown)
 
     case bfd_arch_pdp11:
       /* TODO: arch_flags = M_PDP11; */
-      *unknown = false;
+      *unknown = FALSE;
       break;
 
     case bfd_arch_vax:
-      *unknown = false;
+      *unknown = FALSE;
       break;
 
     default:
@@ -1013,7 +1013,7 @@ NAME(aout,machine_type) (arch, machine, unknown)
     }
 
   if (arch_flags != M_UNKNOWN)
-    *unknown = false;
+    *unknown = FALSE;
 
   return arch_flags;
 }
@@ -1024,7 +1024,7 @@ FUNCTION
 	aout_@var{size}_set_arch_mach
 
 SYNOPSIS
-	boolean aout_@var{size}_set_arch_mach,
+	bfd_boolean aout_@var{size}_set_arch_mach,
 	 (bfd *,
 	  enum bfd_architecture arch,
 	  unsigned long machine));
@@ -1035,22 +1035,22 @@ DESCRIPTION
 	can support the architecture required.
 */
 
-boolean
+bfd_boolean
 NAME(aout,set_arch_mach) (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
      unsigned long machine;
 {
   if (! bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
+    return FALSE;
 
   if (arch != bfd_arch_unknown)
     {
-      boolean unknown;
+      bfd_boolean unknown;
 
       NAME(aout,machine_type) (arch, machine, &unknown);
       if (unknown)
-	return false;
+	return FALSE;
     }
 
   obj_reloc_entry_size (abfd) = RELOC_SIZE;
@@ -1284,7 +1284,7 @@ adjust_n_magic (abfd, execp)
   N_SET_MAGIC (*execp, NMAGIC);
 }
 
-boolean
+bfd_boolean
 NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end)
      bfd *abfd;
      bfd_size_type *text_size;
@@ -1293,10 +1293,10 @@ NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end)
   struct internal_exec *execp = exec_hdr (abfd);
 
   if (! NAME(aout,make_sections) (abfd))
-    return false;
+    return FALSE;
 
   if (adata(abfd).magic != undecided_magic)
-    return true;
+    return TRUE;
 
   obj_textsec(abfd)->_raw_size =
     align_power(obj_textsec(abfd)->_raw_size,
@@ -1369,7 +1369,7 @@ NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end)
 	   obj_bsssec(abfd)->vma, obj_bsssec(abfd)->_raw_size);
 #endif
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -1377,7 +1377,7 @@ FUNCTION
 	aout_@var{size}_new_section_hook
 
 SYNOPSIS
-        boolean aout_@var{size}_new_section_hook,
+        bfd_boolean aout_@var{size}_new_section_hook,
 	   (bfd *abfd,
 	    asection *newsect));
 
@@ -1385,7 +1385,7 @@ DESCRIPTION
 	Called by the BFD in response to a @code{bfd_make_section}
 	request.
 */
-boolean
+bfd_boolean
 NAME(aout,new_section_hook) (abfd, newsect)
      bfd *abfd;
      asection *newsect;
@@ -1401,7 +1401,7 @@ NAME(aout,new_section_hook) (abfd, newsect)
 	{
 	  obj_textsec(abfd)= newsect;
 	  newsect->target_index = N_TEXT;
-	  return true;
+	  return TRUE;
 	}
 
     if (obj_datasec (abfd) == NULL
@@ -1409,7 +1409,7 @@ NAME(aout,new_section_hook) (abfd, newsect)
       {
 	obj_datasec (abfd) = newsect;
 	newsect->target_index = N_DATA;
-	return true;
+	return TRUE;
       }
 
     if (obj_bsssec (abfd) == NULL
@@ -1417,15 +1417,15 @@ NAME(aout,new_section_hook) (abfd, newsect)
       {
 	obj_bsssec (abfd) = newsect;
 	newsect->target_index = N_BSS;
-	return true;
+	return TRUE;
       }
   }
 
   /* We allow more than three sections internally */
-  return true;
+  return TRUE;
 }
 
-boolean
+bfd_boolean
 NAME(aout,set_section_contents) (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -1439,13 +1439,13 @@ NAME(aout,set_section_contents) (abfd, section, location, offset, count)
   if (! abfd->output_has_begun)
     {
       if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
-	return false;
+	return FALSE;
     }
 
   if (section == obj_bsssec (abfd))
     {
       bfd_set_error (bfd_error_no_contents);
-      return false;
+      return FALSE;
     }
 
   if (section != obj_textsec (abfd)
@@ -1455,22 +1455,22 @@ NAME(aout,set_section_contents) (abfd, section, location, offset, count)
 	("%s: can not represent section `%s' in a.out object file format",
 	 bfd_get_filename (abfd), bfd_get_section_name (abfd, section));
       bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
+      return FALSE;
     }
 
   if (count != 0)
     {
       if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
 	  || bfd_bwrite (location, count, abfd) != count)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Read the external symbols from an a.out file.  */
 
-static boolean
+static bfd_boolean
 aout_get_external_symbols (abfd)
      bfd *abfd;
 {
@@ -1484,8 +1484,8 @@ aout_get_external_symbols (abfd)
 #ifdef USE_MMAP
       if (! bfd_get_file_window (abfd, obj_sym_filepos (abfd),
 				 exec_hdr (abfd)->a_syms,
-				 &obj_aout_sym_window (abfd), true))
-	return false;
+				 &obj_aout_sym_window (abfd), TRUE))
+	return FALSE;
       syms = (struct external_nlist *) obj_aout_sym_window (abfd).data;
 #else
       /* We allocate using malloc to make the values easy to free
@@ -1493,14 +1493,14 @@ aout_get_external_symbols (abfd)
 	 possible to free them.  */
       syms = (struct external_nlist *) bfd_malloc (count * EXTERNAL_NLIST_SIZE);
       if (syms == (struct external_nlist *) NULL && count != 0)
-	return false;
+	return FALSE;
 
       if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
 	  || (bfd_bread (syms, exec_hdr (abfd)->a_syms, abfd)
 	      != exec_hdr (abfd)->a_syms))
 	{
 	  free (syms);
-	  return false;
+	  return FALSE;
 	}
 #endif
 
@@ -1519,25 +1519,25 @@ aout_get_external_symbols (abfd)
       if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
 	  || (bfd_bread ((PTR) string_chars, (bfd_size_type) BYTES_IN_LONG,
 			abfd) != BYTES_IN_LONG))
-	return false;
+	return FALSE;
       stringsize = H_GET_32 (abfd, string_chars);
 
 #ifdef USE_MMAP
       if (! bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize,
-				 &obj_aout_string_window (abfd), true))
-	return false;
+				 &obj_aout_string_window (abfd), TRUE))
+	return FALSE;
       strings = (char *) obj_aout_string_window (abfd).data;
 #else
       strings = (char *) bfd_malloc (stringsize + 1);
       if (strings == NULL)
-	return false;
+	return FALSE;
 
       /* Skip space for the string count in the buffer for convenience
 	 when using indexes.  */
       if (bfd_bread (strings + 4, stringsize - 4, abfd) != stringsize - 4)
 	{
 	  free (strings);
-	  return false;
+	  return FALSE;
 	}
 #endif
 
@@ -1550,7 +1550,7 @@ aout_get_external_symbols (abfd)
       obj_aout_external_string_size (abfd) = stringsize;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Translate an a.out symbol into a BFD symbol.  The desc, other, type
@@ -1558,7 +1558,7 @@ aout_get_external_symbols (abfd)
    nlist structure.  This function is responsible for setting
    symbol->flags and symbol->section, and adjusting symbol->value.  */
 
-static boolean
+static bfd_boolean
 translate_from_native_sym_flags (abfd, cache_ptr)
      bfd *abfd;
      aout_symbol_type *cache_ptr;
@@ -1595,7 +1595,7 @@ translate_from_native_sym_flags (abfd, cache_ptr)
       cache_ptr->symbol.section = sec;
       cache_ptr->symbol.value -= sec->vma;
 
-      return true;
+      return TRUE;
     }
 
   /* Get the default visibility.  This does not apply to all types, so
@@ -1646,12 +1646,12 @@ translate_from_native_sym_flags (abfd, cache_ptr)
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set the fields of SYM_POINTER according to CACHE_PTR.  */
 
-static boolean
+static bfd_boolean
 translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
      bfd *abfd;
      asymbol *cache_ptr;
@@ -1677,7 +1677,7 @@ translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
 	 bfd_archive_filename (abfd),
 	 cache_ptr->name != NULL ? cache_ptr->name : "*unknown*");
       bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
+      return FALSE;
     }
 
   if (sec->output_section != NULL)
@@ -1704,7 +1704,7 @@ translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
 	("%s: can not represent section `%s' in a.out object file format",
 	 bfd_archive_filename (abfd), bfd_get_section_name (abfd, sec));
       bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
+      return FALSE;
     }
 
   /* Turn the symbol from section relative to absolute again */
@@ -1752,7 +1752,7 @@ translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
 
   PUT_WORD(abfd, value, sym_pointer->e_value);
 
-  return true;
+  return TRUE;
 }
 
 /* Native-level interface to symbols. */
@@ -1772,7 +1772,7 @@ NAME(aout,make_empty_symbol) (abfd)
 
 /* Translate a set of internal symbols into external symbols.  */
 
-boolean
+bfd_boolean
 NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
      bfd *abfd;
      aout_symbol_type *in;
@@ -1780,7 +1780,7 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
      bfd_size_type count;
      char *str;
      bfd_size_type strsize;
-     boolean dynamic;
+     bfd_boolean dynamic;
 {
   struct external_nlist *ext_end;
 
@@ -1802,7 +1802,7 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
       else if (x < strsize)
 	in->symbol.name = str + x;
       else
-	return false;
+	return FALSE;
 
       in->symbol.value = GET_SWORD (abfd,  ext->e_value);
       /* TODO: is 0 a safe value here? */
@@ -1812,20 +1812,20 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
       in->symbol.udata.p = NULL;
 
       if (! translate_from_native_sym_flags (abfd, in))
-	return false;
+	return FALSE;
 
       if (dynamic)
 	in->symbol.flags |= BSF_DYNAMIC;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We read the symbols into a buffer, which is discarded when this
    function exits.  We read the strings into a buffer large enough to
    hold them all plus all the cached symbol entries. */
 
-boolean
+bfd_boolean
 NAME(aout,slurp_symbol_table) (abfd)
      bfd *abfd;
 {
@@ -1835,18 +1835,18 @@ NAME(aout,slurp_symbol_table) (abfd)
 
   /* If there's no work to be done, don't do any */
   if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
-    return true;
+    return TRUE;
 
   old_external_syms = obj_aout_external_syms (abfd);
 
   if (! aout_get_external_symbols (abfd))
-    return false;
+    return FALSE;
 
   cached_size = obj_aout_external_sym_count (abfd);
   cached_size *= sizeof (aout_symbol_type);
   cached = (aout_symbol_type *) bfd_zmalloc (cached_size);
   if (cached == NULL && cached_size != 0)
-    return false;
+    return FALSE;
 
   /* Convert from external symbol information to internal.  */
   if (! (NAME(aout,translate_symbol_table)
@@ -1855,10 +1855,10 @@ NAME(aout,slurp_symbol_table) (abfd)
 	  obj_aout_external_sym_count (abfd),
 	  obj_aout_external_strings (abfd),
 	  obj_aout_external_string_size (abfd),
-	  false)))
+	  FALSE)))
     {
       free (cached);
-      return false;
+      return FALSE;
     }
 
   bfd_get_symcount (abfd) = obj_aout_external_sym_count (abfd);
@@ -1880,7 +1880,7 @@ NAME(aout,slurp_symbol_table) (abfd)
       obj_aout_external_syms (abfd) = NULL;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We use a hash table when writing out symbols so that we only write
@@ -1893,8 +1893,8 @@ NAME(aout,slurp_symbol_table) (abfd)
    if BFD_TRADITIONAL_FORMAT is set.  */
 
 static bfd_size_type add_to_stringtab
-  PARAMS ((bfd *, struct bfd_strtab_hash *, const char *, boolean));
-static boolean emit_stringtab PARAMS ((bfd *, struct bfd_strtab_hash *));
+  PARAMS ((bfd *, struct bfd_strtab_hash *, const char *, bfd_boolean));
+static bfd_boolean emit_stringtab PARAMS ((bfd *, struct bfd_strtab_hash *));
 
 /* Get the index of a string in a strtab, adding it if it is not
    already present.  */
@@ -1904,9 +1904,9 @@ add_to_stringtab (abfd, tab, str, copy)
      bfd *abfd;
      struct bfd_strtab_hash *tab;
      const char *str;
-     boolean copy;
+     bfd_boolean copy;
 {
-  boolean hash;
+  bfd_boolean hash;
   bfd_size_type index;
 
   /* An index of 0 always means the empty string.  */
@@ -1915,9 +1915,9 @@ add_to_stringtab (abfd, tab, str, copy)
 
   /* Don't hash if BFD_TRADITIONAL_FORMAT is set, because SunOS dbx
      doesn't understand a hashed string table.  */
-  hash = true;
+  hash = TRUE;
   if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-    hash = false;
+    hash = FALSE;
 
   index = _bfd_stringtab_add (tab, str, hash, copy);
 
@@ -1934,7 +1934,7 @@ add_to_stringtab (abfd, tab, str, copy)
 /* Write out a strtab.  ABFD is already at the right location in the
    file.  */
 
-static boolean
+static bfd_boolean
 emit_stringtab (abfd, tab)
      register bfd *abfd;
      struct bfd_strtab_hash *tab;
@@ -1945,12 +1945,12 @@ emit_stringtab (abfd, tab)
   H_PUT_32 (abfd, _bfd_stringtab_size (tab) + BYTES_IN_LONG, buffer);
   if (bfd_bwrite ((PTR) buffer, (bfd_size_type) BYTES_IN_LONG, abfd)
       != BYTES_IN_LONG)
-    return false;
+    return FALSE;
 
   return _bfd_stringtab_emit (abfd, tab);
 }
 
-boolean
+bfd_boolean
 NAME(aout,write_syms) (abfd)
      bfd *abfd;
 {
@@ -1960,7 +1960,7 @@ NAME(aout,write_syms) (abfd)
 
   strtab = _bfd_stringtab_init ();
   if (strtab == NULL)
-    return false;
+    return FALSE;
 
   for (count = 0; count < bfd_get_symcount (abfd); count++)
     {
@@ -1970,7 +1970,7 @@ NAME(aout,write_syms) (abfd)
 
       PUT_WORD (abfd, 0, nsp.e_unused);
 
-      indx = add_to_stringtab (abfd, strtab, g->name, false);
+      indx = add_to_stringtab (abfd, strtab, g->name, FALSE);
       if (indx == (bfd_size_type) -1)
 	goto error_return;
       PUT_WORD (abfd, indx, nsp.e_strx);
@@ -1999,11 +1999,11 @@ NAME(aout,write_syms) (abfd)
 
   _bfd_stringtab_free (strtab);
 
-  return true;
+  return TRUE;
 
 error_return:
   _bfd_stringtab_free (strtab);
-  return false;
+  return FALSE;
 }
 
 
@@ -2190,7 +2190,7 @@ pdp11_aout_swap_reloc_in (abfd, bytes, cache_ptr, offset,
 
 /* Read and swap the relocs for a section.  */
 
-boolean
+bfd_boolean
 NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
      bfd *abfd;
      sec_ptr asect;
@@ -2206,10 +2206,10 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
   arelent *cache_ptr;
 
   if (asect->relocation)
-    return true;
+    return TRUE;
 
   if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
+    return TRUE;
 
   if (asect == obj_datasec (abfd))
     reloc_size = exec_hdr(abfd)->a_drsize;
@@ -2220,22 +2220,22 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
   else
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   each_size = obj_reloc_entry_size (abfd);
 
   relocs = bfd_malloc (reloc_size);
   if (relocs == NULL && reloc_size != 0)
-    return false;
+    return FALSE;
 
   if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
     {
       free (relocs);
-      return false;
+      return FALSE;
     }
 
   count = reloc_size / each_size;
@@ -2258,7 +2258,7 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
 
   reloc_cache = (arelent *) bfd_zmalloc (count * sizeof (arelent));
   if (reloc_cache == NULL && count != 0)
-    return false;
+    return FALSE;
 
   cache_ptr = reloc_cache;
 
@@ -2291,12 +2291,12 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
   asect->relocation = reloc_cache;
   asect->reloc_count = cache_ptr - reloc_cache;
 
-  return true;
+  return TRUE;
 }
 
 /* Write out a relocation section into an object file.  */
 
-boolean
+bfd_boolean
 NAME(aout,squirt_out_relocs) (abfd, section)
      bfd *abfd;
      asection *section;
@@ -2311,13 +2311,13 @@ NAME(aout,squirt_out_relocs) (abfd, section)
      relocation information, even if there is none. */
   if ((count == 0 || section->orelocation == NULL) &&
       <writing_executable>)
-    return true;
+    return TRUE;
 #endif
 
   natsize = bfd_get_section_size_before_reloc (section);
   native = (unsigned char *) bfd_zalloc (abfd, natsize);
   if (!native)
-    return false;
+    return FALSE;
 
   generic = section->orelocation;
   if (generic != NULL)
@@ -2337,11 +2337,11 @@ NAME(aout,squirt_out_relocs) (abfd, section)
   if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
     {
       bfd_release (abfd, native);
-      return false;
+      return FALSE;
     }
 
   bfd_release (abfd, native);
-  return true;
+  return TRUE;
 }
 
 /* This is stupid.  This function should be a boolean predicate */
@@ -2520,7 +2520,7 @@ NAME(aout,print_symbol) (abfd, afile, symbol, how)
 long
 NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep)
      bfd *abfd;
-     boolean dynamic;
+     bfd_boolean dynamic;
      PTR *minisymsp;
      unsigned int *sizep;
 {
@@ -2556,7 +2556,7 @@ NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep)
 asymbol *
 NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
      bfd *abfd;
-     boolean dynamic;
+     bfd_boolean dynamic;
      const PTR minisym;
      asymbol *sym;
 {
@@ -2574,7 +2574,7 @@ NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
 	  (bfd_size_type) 1,
 	  obj_aout_external_strings (abfd),
 	  obj_aout_external_string_size (abfd),
-	  false)))
+	  FALSE)))
     return NULL;
 
   return sym;
@@ -2586,7 +2586,7 @@ NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
  wanted location.
 */
 
-boolean
+bfd_boolean
 NAME(aout,find_nearest_line)
      (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)
      bfd *abfd;
@@ -2738,7 +2738,7 @@ NAME(aout,find_nearest_line)
       buf = (char *) bfd_malloc ((bfd_size_type) filelen + funclen + 3);
       adata (abfd).line_buf = buf;
       if (buf == NULL)
-	return false;
+	return FALSE;
     }
 
   if (main_file_name != NULL)
@@ -2776,13 +2776,13 @@ NAME(aout,find_nearest_line)
       *functionname_ptr = buf;
     }
 
-  return true;
+  return TRUE;
 }
 
 int
 NAME(aout,sizeof_headers) (abfd, execable)
      bfd *abfd;
-     boolean execable ATTRIBUTE_UNUSED;
+     bfd_boolean execable ATTRIBUTE_UNUSED;
 {
   return adata(abfd).exec_bytes_size;
 }
@@ -2790,14 +2790,14 @@ NAME(aout,sizeof_headers) (abfd, execable)
 /* Free all information we have cached for this BFD.  We can always
    read it again later if we need it.  */
 
-boolean
+bfd_boolean
 NAME(aout,bfd_free_cached_info) (abfd)
      bfd *abfd;
 {
   asection *o;
 
   if (bfd_get_format (abfd) != bfd_object)
-    return true;
+    return TRUE;
 
 #define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; }
   BFCI_FREE (obj_aout_symbols (abfd));
@@ -2814,19 +2814,19 @@ NAME(aout,bfd_free_cached_info) (abfd)
     BFCI_FREE (o->relocation);
 #undef BFCI_FREE
 
-  return true;
+  return TRUE;
 }
 
 /* a.out link code.  */
 
-static boolean aout_link_add_object_symbols
+static bfd_boolean aout_link_add_object_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean aout_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean aout_link_free_symbols PARAMS ((bfd *));
-static boolean aout_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean aout_link_add_symbols
+static bfd_boolean aout_link_check_archive_element
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean aout_link_free_symbols PARAMS ((bfd *));
+static bfd_boolean aout_link_check_ar_symbols
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded));
+static bfd_boolean aout_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Routine to create an entry in an a.out link hash table.  */
@@ -2854,7 +2854,7 @@ NAME(aout,link_hash_newfunc) (entry, table, string)
   if (ret)
     {
       /* Set local fields.  */
-      ret->written = false;
+      ret->written = FALSE;
       ret->indx = -1;
     }
 
@@ -2863,7 +2863,7 @@ NAME(aout,link_hash_newfunc) (entry, table, string)
 
 /* Initialize an a.out link hash table.  */
 
-boolean
+bfd_boolean
 NAME(aout,link_hash_table_init) (table, abfd, newfunc)
      struct aout_link_hash_table *table;
      bfd *abfd;
@@ -2898,7 +2898,7 @@ NAME(aout,link_hash_table_create) (abfd)
 /* Given an a.out BFD, add symbols to the global hash table as
    appropriate.  */
 
-boolean
+bfd_boolean
 NAME(aout,link_add_symbols) (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2912,27 +2912,27 @@ NAME(aout,link_add_symbols) (abfd, info)
 	(abfd, info, aout_link_check_archive_element);
     default:
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 }
 
 /* Add symbols from an a.out object file.  */
 
-static boolean
+static bfd_boolean
 aout_link_add_object_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   if (! aout_get_external_symbols (abfd))
-    return false;
+    return FALSE;
   if (! aout_link_add_symbols (abfd, info))
-    return false;
+    return FALSE;
   if (! info->keep_memory)
     {
       if (! aout_link_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
@@ -2940,36 +2940,36 @@ aout_link_add_object_symbols (abfd, info)
    needed in the link or not.  This is called from
    _bfd_generic_link_add_archive_symbols.  */
 
-static boolean
+static bfd_boolean
 aout_link_check_archive_element (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
   if (! aout_get_external_symbols (abfd))
-    return false;
+    return FALSE;
 
   if (! aout_link_check_ar_symbols (abfd, info, pneeded))
-    return false;
+    return FALSE;
 
   if (*pneeded)
     {
       if (! aout_link_add_symbols (abfd, info))
-	return false;
+	return FALSE;
     }
 
   if (! info->keep_memory || ! *pneeded)
     {
       if (! aout_link_free_symbols (abfd))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Free up the internal symbols read from an a.out file.  */
 
-static boolean
+static bfd_boolean
 aout_link_free_symbols (abfd)
      bfd *abfd;
 {
@@ -2991,7 +2991,7 @@ aout_link_free_symbols (abfd)
 #endif
       obj_aout_external_strings (abfd) = (char *) NULL;
     }
-  return true;
+  return TRUE;
 }
 
 /* Look through the internal symbols to see if this object file should
@@ -3001,17 +3001,17 @@ aout_link_free_symbols (abfd)
    known symbol but we do not include the object file in the link
    (unless there is some other reason to include it).  */
 
-static boolean
+static bfd_boolean
 aout_link_check_ar_symbols (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
   register struct external_nlist *p;
   struct external_nlist *pend;
   char *strings;
 
-  *pneeded = false;
+  *pneeded = FALSE;
 
   /* Look through all the symbols.  */
   p = obj_aout_external_syms (abfd);
@@ -3031,7 +3031,7 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 	continue;
 
       name = strings + GET_WORD (abfd, p->e_strx);
-      h = bfd_link_hash_lookup (info->hash, name, false, false, true);
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
 
       /* We are only interested in symbols that are currently
 	 undefined or common.  */
@@ -3061,9 +3061,9 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 	     seems a bit crazy to me, and I haven't implemented it.
 	     However, it might be correct.  */
 	  if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-	    return false;
-	  *pneeded = true;
-	  return true;
+	    return FALSE;
+	  *pneeded = TRUE;
+	  return TRUE;
 	}
 
       if (type == (N_UNDF | N_EXT))
@@ -3090,9 +3090,9 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 		      if (! (*info->callbacks->add_archive_element) (info,
 								     abfd,
 								     name))
-			return false;
-		      *pneeded = true;
-		      return true;
+			return FALSE;
+		      *pneeded = TRUE;
+		      return TRUE;
 		    }
 		  /* Turn the current link symbol into a common
 		     symbol.  It is already on the undefs list.  */
@@ -3101,7 +3101,7 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 			      bfd_hash_allocate (&info->hash->table,
 				  sizeof (struct bfd_link_hash_common_entry)));
 		  if (h->u.c.p == NULL)
-		    return false;
+		    return FALSE;
 
 		  h->u.c.size = value;
 
@@ -3129,25 +3129,24 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
     }
 
   /* We do not need this object file.  */
-  return true;
+  return TRUE;
 }
 
 /* Add all symbols from an object file to the hash table.  */
 
-static boolean
+static bfd_boolean
 aout_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
-  boolean (*add_one_symbol) PARAMS ((struct bfd_link_info *, bfd *,
-				     const char *, flagword, asection *,
-				     bfd_vma, const char *, boolean,
-				     boolean,
-				     struct bfd_link_hash_entry **));
+  bfd_boolean (*add_one_symbol)
+    PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+	     bfd_vma, const char *, bfd_boolean, bfd_boolean,
+	     struct bfd_link_hash_entry **));
   struct external_nlist *syms;
   bfd_size_type sym_count;
   char *strings;
-  boolean copy;
+  bfd_boolean copy;
   struct aout_link_hash_entry **sym_hash;
   register struct external_nlist *p;
   struct external_nlist *pend;
@@ -3156,15 +3155,15 @@ aout_link_add_symbols (abfd, info)
   sym_count = obj_aout_external_sym_count (abfd);
   strings = obj_aout_external_strings (abfd);
   if (info->keep_memory)
-    copy = false;
+    copy = FALSE;
   else
-    copy = true;
+    copy = TRUE;
 
   if (aout_backend_info (abfd)->add_dynamic_symbols != NULL)
     {
       if (! ((*aout_backend_info (abfd)->add_dynamic_symbols)
 	     (abfd, info, &syms, &sym_count, &strings)))
-	return false;
+	return FALSE;
     }
 
   /* We keep a list of the linker hash table entries that correspond
@@ -3175,7 +3174,7 @@ aout_link_add_symbols (abfd, info)
 	      bfd_alloc (abfd,
 			 sym_count * sizeof (struct aout_link_hash_entry *)));
   if (sym_hash == NULL && sym_count != 0)
-    return false;
+    return FALSE;
   obj_aout_sym_hashes (abfd) = sym_hash;
 
   add_one_symbol = aout_backend_info (abfd)->add_one_symbol;
@@ -3251,9 +3250,9 @@ aout_link_add_symbols (abfd, info)
 	}
 
       if (! ((*add_one_symbol)
-	     (info, abfd, name, flags, section, value, string, copy, false,
+	     (info, abfd, name, flags, section, value, string, copy, FALSE,
 	      (struct bfd_link_hash_entry **) sym_hash)))
-	return false;
+	return FALSE;
 
       /* Restrict the maximum alignment of a common symbol based on
 	 the architecture, since a.out has no way to represent
@@ -3276,7 +3275,7 @@ aout_link_add_symbols (abfd, info)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* A hash table used for header files with N_BINCL entries.  */
@@ -3339,22 +3338,22 @@ struct aout_final_link_info
 
 static struct bfd_hash_entry *aout_link_includes_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean aout_link_input_bfd
+static bfd_boolean aout_link_input_bfd
   PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
-static boolean aout_link_write_symbols
+static bfd_boolean aout_link_write_symbols
   PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
-static boolean aout_link_write_other_symbol
+static bfd_boolean aout_link_write_other_symbol
   PARAMS ((struct aout_link_hash_entry *, PTR));
-static boolean aout_link_input_section
+static bfd_boolean aout_link_input_section
   PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
 	   asection *input_section, file_ptr *reloff_ptr,
 	   bfd_size_type rel_size));
 static INLINE asection *aout_reloc_type_to_section
   PARAMS ((bfd *, int));
-static boolean aout_link_reloc_link_order
+static bfd_boolean aout_link_reloc_link_order
   PARAMS ((struct aout_final_link_info *, asection *,
 	   struct bfd_link_order *));
-static boolean pdp11_aout_link_input_section
+static bfd_boolean pdp11_aout_link_input_section
   PARAMS ((struct aout_final_link_info *finfo,
 	   bfd *input_bfd,
 	   asection *input_section,
@@ -3401,14 +3400,14 @@ aout_link_includes_newfunc (entry, table, string)
    of bfd_link_order structures which list all the input sections for
    the output section.  */
 
-boolean
+bfd_boolean
 NAME(aout,final_link) (abfd, info, callback)
      bfd *abfd;
      struct bfd_link_info *info;
      void (*callback) PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
 {
   struct aout_final_link_info aout_info;
-  boolean includes_hash_initialized = false;
+  bfd_boolean includes_hash_initialized = FALSE;
   register bfd *sub;
   bfd_size_type trsize, drsize;
   bfd_size_type max_contents_size;
@@ -3418,7 +3417,7 @@ NAME(aout,final_link) (abfd, info, callback)
   file_ptr text_end;
   register struct bfd_link_order *p;
   asection *o;
-  boolean have_link_order_relocs;
+  bfd_boolean have_link_order_relocs;
 
   if (info->shared)
     abfd->flags |= DYNAMIC;
@@ -3434,7 +3433,7 @@ NAME(aout,final_link) (abfd, info, callback)
 			       aout_link_includes_newfunc,
 			       251))
     goto error_return;
-  includes_hash_initialized = true;
+  includes_hash_initialized = TRUE;
 
   /* Figure out the largest section size.  Also, if generating
      relocateable output, count the relocs.  */
@@ -3557,7 +3556,7 @@ NAME(aout,final_link) (abfd, info, callback)
     struct aout_link_hash_entry *h;
 
     h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
-			       false, false, false);
+			       FALSE, FALSE, FALSE);
     if (h != NULL)
       aout_link_write_other_symbol (h, &aout_info);
   }
@@ -3584,7 +3583,7 @@ NAME(aout,final_link) (abfd, info, callback)
      We use the output_has_begun field of the input BFDs to see
      whether we have already handled it.  */
   for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next)
-    sub->output_has_begun = false;
+    sub->output_has_begun = FALSE;
 
   /* Mark all sections which are to be included in the link.  This
      will normally be every section.  We need to do this so that we
@@ -3595,11 +3594,11 @@ NAME(aout,final_link) (abfd, info, callback)
       for (p = o->link_order_head; p != NULL; p = p->next)
 	{
 	  if (p->type == bfd_indirect_link_order)
-	    p->u.indirect.section->linker_mark = true;
+	    p->u.indirect.section->linker_mark = TRUE;
 	}
     }
 
-  have_link_order_relocs = false;
+  have_link_order_relocs = FALSE;
   for (o = abfd->sections; o != (asection *) NULL; o = o->next)
     {
       for (p = o->link_order_head;
@@ -3617,14 +3616,14 @@ NAME(aout,final_link) (abfd, info, callback)
 		{
 		  if (! aout_link_input_bfd (&aout_info, input_bfd))
 		    goto error_return;
-		  input_bfd->output_has_begun = true;
+		  input_bfd->output_has_begun = TRUE;
 		}
 	    }
 	  else if (p->type == bfd_section_reloc_link_order
 		   || p->type == bfd_symbol_reloc_link_order)
 	    {
 	      /* These are handled below.  */
-	      have_link_order_relocs = true;
+	      have_link_order_relocs = TRUE;
 	    }
 	  else
 	    {
@@ -3684,7 +3683,7 @@ NAME(aout,final_link) (abfd, info, callback)
   if (includes_hash_initialized)
     {
       bfd_hash_table_free (&aout_info.includes.root);
-      includes_hash_initialized = false;
+      includes_hash_initialized = FALSE;
     }
 
   /* Finish up any dynamic linking we may be doing.  */
@@ -3725,7 +3724,7 @@ NAME(aout,final_link) (abfd, info, callback)
 	goto error_return;
     }
 
-  return true;
+  return TRUE;
 
  error_return:
   if (aout_info.contents != NULL)
@@ -3738,12 +3737,12 @@ NAME(aout,final_link) (abfd, info, callback)
     free (aout_info.output_syms);
   if (includes_hash_initialized)
     bfd_hash_table_free (&aout_info.includes.root);
-  return false;
+  return FALSE;
 }
 
 /* Link an a.out input BFD into the output file.  */
 
-static boolean
+static bfd_boolean
 aout_link_input_bfd (finfo, input_bfd)
      struct aout_final_link_info *finfo;
      bfd *input_bfd;
@@ -3761,16 +3760,16 @@ aout_link_input_bfd (finfo, input_bfd)
     }
 
   /* Get the symbols.  We probably have them already, unless
-     finfo->info->keep_memory is false.  */
+     finfo->info->keep_memory is FALSE.  */
   if (! aout_get_external_symbols (input_bfd))
-    return false;
+    return FALSE;
 
   sym_count = obj_aout_external_sym_count (input_bfd);
 
   /* Write out the symbols and get a map of the new indices.  The map
      is placed into finfo->symbol_map.  */
   if (! aout_link_write_symbols (finfo, input_bfd))
-    return false;
+    return FALSE;
 
   /* Relocate and write out the sections.  These functions use the
      symbol map created by aout_link_write_symbols.  The linker_mark
@@ -3782,7 +3781,7 @@ aout_link_input_bfd (finfo, input_bfd)
 				     obj_textsec (input_bfd),
 				     &finfo->treloff,
 				     exec_hdr (input_bfd)->a_trsize))
-	return false;
+	return FALSE;
     }
   if (obj_datasec (input_bfd)->linker_mark)
     {
@@ -3790,7 +3789,7 @@ aout_link_input_bfd (finfo, input_bfd)
 				     obj_datasec (input_bfd),
 				     &finfo->dreloff,
 				     exec_hdr (input_bfd)->a_drsize))
-	return false;
+	return FALSE;
     }
 
   /* If we are not keeping memory, we don't need the symbols any
@@ -3799,16 +3798,16 @@ aout_link_input_bfd (finfo, input_bfd)
   if (! finfo->info->keep_memory)
     {
       if (! aout_link_free_symbols (input_bfd))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust and write out the symbols for an a.out file.  Set the new
    symbol indices into a symbol_map.  */
 
-static boolean
+static bfd_boolean
 aout_link_write_symbols (finfo, input_bfd)
      struct aout_final_link_info *finfo;
      bfd *input_bfd;
@@ -3824,8 +3823,8 @@ aout_link_write_symbols (finfo, input_bfd)
   struct external_nlist *sym_end;
   struct aout_link_hash_entry **sym_hash;
   int *symbol_map;
-  boolean pass;
-  boolean skip_next;
+  bfd_boolean pass;
+  bfd_boolean skip_next;
 
   output_bfd = finfo->output_bfd;
   sym_count = obj_aout_external_sym_count (input_bfd);
@@ -3839,14 +3838,14 @@ aout_link_write_symbols (finfo, input_bfd)
   if (strip != strip_all
       && (strip != strip_some
 	  || bfd_hash_lookup (finfo->info->keep_hash, input_bfd->filename,
-			      false, false) != NULL)
+			      FALSE, FALSE) != NULL)
       && discard != discard_all)
     {
       H_PUT_8 (output_bfd, N_TEXT, outsym->e_type);
       strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
-				       input_bfd->filename, false);
+				       input_bfd->filename, FALSE);
       if (strtab_index == (bfd_size_type) -1)
-	return false;
+	return FALSE;
       PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
       PUT_WORD (output_bfd,
 		(bfd_get_section_vma (output_bfd,
@@ -3857,8 +3856,8 @@ aout_link_write_symbols (finfo, input_bfd)
       ++outsym;
     }
 
-  pass = false;
-  skip_next = false;
+  pass = FALSE;
+  skip_next = FALSE;
   sym = obj_aout_external_syms (input_bfd);
   sym_end = sym + sym_count;
   sym_hash = obj_aout_sym_hashes (input_bfd);
@@ -3869,10 +3868,10 @@ aout_link_write_symbols (finfo, input_bfd)
       const char *name;
       int type;
       struct aout_link_hash_entry *h;
-      boolean skip;
+      bfd_boolean skip;
       asection *symsec;
       bfd_vma val = 0;
-      boolean copy;
+      bfd_boolean copy;
 
       /* We set *symbol_map to 0 above for all symbols.  If it has
          already been set to -1 for this symbol, it means that we are
@@ -3896,14 +3895,14 @@ aout_link_write_symbols (finfo, input_bfd)
 	  /* Pass this symbol through.  It is the target of an
 	     indirect or warning symbol.  */
 	  val = GET_WORD (input_bfd, sym->e_value);
-	  pass = false;
+	  pass = FALSE;
 	}
       else if (skip_next)
 	{
 	  /* Skip this symbol, which is the target of an indirect
 	     symbol that we have changed to no longer be an indirect
 	     symbol.  */
-	  skip_next = false;
+	  skip_next = FALSE;
 	  continue;
 	}
       else
@@ -3945,34 +3944,34 @@ aout_link_write_symbols (finfo, input_bfd)
 	    {
 	      if ((type & N_TYPE) == N_INDR
 		  || type == N_WARNING)
-		skip_next = true;
+		skip_next = TRUE;
 	      *symbol_map = h->indx;
 	      continue;
 	    }
 
 	  /* See if we are stripping this symbol.  */
-	  skip = false;
+	  skip = FALSE;
 	  switch (strip)
 	    {
 	    case strip_none:
 	      break;
 	    case strip_debugger:
 	      if ((type & N_STAB) != 0)
-		skip = true;
+		skip = TRUE;
 	      break;
 	    case strip_some:
-	      if (bfd_hash_lookup (finfo->info->keep_hash, name, false, false)
+	      if (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
 		  == NULL)
-		skip = true;
+		skip = TRUE;
 	      break;
 	    case strip_all:
-	      skip = true;
+	      skip = TRUE;
 	      break;
 	    }
 	  if (skip)
 	    {
 	      if (h != (struct aout_link_hash_entry *) NULL)
-		h->written = true;
+		h->written = TRUE;
 	      continue;
 	    }
 
@@ -4001,7 +4000,7 @@ aout_link_write_symbols (finfo, input_bfd)
 		 the indirect symbol was defined, we output it with
 		 the correct definition so the debugger will
 		 understand it.  */
-	      pass = true;
+	      pass = TRUE;
 	      val = GET_WORD (input_bfd, sym->e_value);
 	      symsec = NULL;
 	    }
@@ -4017,7 +4016,7 @@ aout_link_write_symbols (finfo, input_bfd)
 		 a case we do not want to output the next symbol,
 		 which is the target of the indirection.  */
 	      if ((type & N_TYPE) == N_INDR)
-		skip_next = true;
+		skip_next = TRUE;
 
 	      symsec = NULL;
 
@@ -4109,7 +4108,7 @@ aout_link_write_symbols (finfo, input_bfd)
 	     it is a local symbol see if we should discard it.  */
 	  if (h != (struct aout_link_hash_entry *) NULL)
 	    {
-	      h->written = true;
+	      h->written = TRUE;
 	      h->indx = obj_aout_external_sym_count (output_bfd);
 	    }
 	  else if ((type & N_TYPE) != N_SETT
@@ -4125,15 +4124,15 @@ aout_link_write_symbols (finfo, input_bfd)
 		case discard_l:
 		  if ((type & N_STAB) == 0
 		      && bfd_is_local_label_name (input_bfd, name))
-		    skip = true;
+		    skip = TRUE;
 		  break;
 		case discard_all:
-		  skip = true;
+		  skip = TRUE;
 		  break;
 		}
 	      if (skip)
 		{
-		  pass = false;
+		  pass = FALSE;
 		  continue;
 		}
 	    }
@@ -4191,9 +4190,9 @@ aout_link_write_symbols (finfo, input_bfd)
                  symbol.  */
 	      copy = ! finfo->info->keep_memory;
 	      incl_entry = aout_link_includes_lookup (&finfo->includes,
-						      name, true, copy);
+						      name, TRUE, copy);
 	      if (incl_entry == NULL)
-		return false;
+		return FALSE;
 	      for (t = incl_entry->totals; t != NULL; t = t->next)
 		if (t->total == val)
 		  break;
@@ -4205,7 +4204,7 @@ aout_link_write_symbols (finfo, input_bfd)
 		       bfd_hash_allocate (&finfo->includes.root,
 					  sizeof *t));
 		  if (t == NULL)
-		    return false;
+		    return FALSE;
 		  t->total = val;
 		  t->next = incl_entry->totals;
 		  incl_entry->totals = t;
@@ -4248,7 +4247,7 @@ aout_link_write_symbols (finfo, input_bfd)
       /* Copy this symbol into the list of symbols we are going to
 	 write out.  */
       H_PUT_8 (output_bfd, type, outsym->e_type);
-      copy = false;
+      copy = FALSE;
       if (! finfo->info->keep_memory)
 	{
 	  /* name points into a string table which we are going to
@@ -4257,12 +4256,12 @@ aout_link_write_symbols (finfo, input_bfd)
 	  if (h != (struct aout_link_hash_entry *) NULL)
 	    name = h->root.root.string;
 	  else
-	    copy = true;
+	    copy = TRUE;
 	}
       strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
 				       name, copy);
       if (strtab_index == (bfd_size_type) -1)
-	return false;
+	return FALSE;
       PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
       PUT_WORD (output_bfd, val, outsym->e_value);
       *symbol_map = obj_aout_external_sym_count (output_bfd);
@@ -4276,21 +4275,21 @@ aout_link_write_symbols (finfo, input_bfd)
       bfd_size_type size;
 
       if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
-	return false;
+	return FALSE;
       size = outsym - finfo->output_syms;
       size *= EXTERNAL_NLIST_SIZE;
       if (bfd_bwrite ((PTR) finfo->output_syms, size, output_bfd) != size)
-	return false;
+	return FALSE;
       finfo->symoff += size;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out a symbol that was not associated with an a.out input
    object.  */
 
-static boolean
+static bfd_boolean
 aout_link_write_other_symbol (h, data)
      struct aout_link_hash_entry *h;
      PTR data;
@@ -4307,7 +4306,7 @@ aout_link_write_other_symbol (h, data)
     {
       h = (struct aout_link_hash_entry *) h->root.u.i.link;
       if (h->root.type == bfd_link_hash_new)
-	return true;
+	return TRUE;
     }
 
   output_bfd = finfo->output_bfd;
@@ -4323,28 +4322,28 @@ aout_link_write_other_symbol (h, data)
     }
 
   if (h->written)
-    return true;
+    return TRUE;
 
-  h->written = true;
+  h->written = TRUE;
 
   /* An indx of -2 means the symbol must be written.  */
   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) == NULL)))
-    return true;
+				  FALSE, FALSE) == NULL)))
+    return TRUE;
 
   switch (h->root.type)
     {
     default:
       abort ();
       /* Avoid variable not initialized warnings.  */
-      return true;
+      return TRUE;
     case bfd_link_hash_new:
       /* This can happen for set symbols when sets are not being
          built.  */
-      return true;
+      return TRUE;
     case bfd_link_hash_undefined:
       type = N_UNDF | N_EXT;
       val = 0;
@@ -4382,12 +4381,12 @@ aout_link_write_other_symbol (h, data)
     case bfd_link_hash_warning:
       /* FIXME: Ignore these for now.  The circumstances under which
 	 they should be written out are not clear to me.  */
-      return true;
+      return TRUE;
     }
 
   H_PUT_8 (output_bfd, type, outsym.e_type);
   indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string,
-			   false);
+			   FALSE);
   if (indx == (bfd_size_type) -1)
     {
       /* FIXME: No way to handle errors.  */
@@ -4408,12 +4407,12 @@ aout_link_write_other_symbol (h, data)
   h->indx = obj_aout_external_sym_count (output_bfd);
   ++obj_aout_external_sym_count (output_bfd);
 
-  return true;
+  return TRUE;
 }
 
 /* Link an a.out section into the output file.  */
 
-static boolean
+static bfd_boolean
 aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
 			 rel_size)
      struct aout_final_link_info *finfo;
@@ -4430,7 +4429,7 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
   if (! bfd_get_section_contents (input_bfd, input_section,
 				  (PTR) finfo->contents,
 				  (file_ptr) 0, input_size))
-    return false;
+    return FALSE;
 
   /* Read in the relocs if we haven't already done it.  */
   if (aout_section_data (input_section) != NULL
@@ -4443,7 +4442,7 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
 	{
 	  if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
 	      || bfd_bread (relocs, rel_size, input_bfd) != rel_size)
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -4451,7 +4450,7 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
   if (! pdp11_aout_link_input_section (finfo, input_bfd, input_section,
 				       (struct pdp11_aout_reloc_external *) relocs,
 				       rel_size, finfo->contents))
-    return false;
+    return FALSE;
 
   /* Write out the section contents.  */
   if (! bfd_set_section_contents (finfo->output_bfd,
@@ -4459,16 +4458,16 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
 				  (PTR) finfo->contents,
 				  (file_ptr) input_section->output_offset,
 				  input_size))
-    return false;
+    return FALSE;
 
   /* If we are producing relocateable output, the relocs were
      modified, and we now write them out.  */
   if (finfo->info->relocateable && rel_size > 0)
     {
       if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
-	return false;
+	return FALSE;
       if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size)
-	return false;
+	return FALSE;
       *reloff_ptr += rel_size;
 
       /* Assert that the relocs have not run into the symbols, and
@@ -4480,7 +4479,7 @@ aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
 			  <= obj_datasec (finfo->output_bfd)->rel_filepos)));
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Get the section corresponding to a reloc index.  */
@@ -4507,7 +4506,7 @@ aout_reloc_type_to_section (abfd, type)
     }
 }
 
-static boolean
+static bfd_boolean
 pdp11_aout_link_input_section (finfo, input_bfd, input_section, relocs,
 			       rel_size, contents)
      struct aout_final_link_info *finfo;
@@ -4517,13 +4516,12 @@ pdp11_aout_link_input_section (finfo, input_bfd, input_section, relocs,
      bfd_size_type rel_size;
      bfd_byte *contents;
 {
-  boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *,
-					  bfd *, asection *,
-					  struct aout_link_hash_entry *,
-					  PTR, bfd_byte *, boolean *,
-					  bfd_vma *));
+  bfd_boolean (*check_dynamic_reloc)
+    PARAMS ((struct bfd_link_info *, bfd *, asection *,
+	     struct aout_link_hash_entry *, PTR, bfd_byte *, bfd_boolean *,
+	     bfd_vma *));
   bfd *output_bfd;
-  boolean relocateable;
+  bfd_boolean relocateable;
   struct external_nlist *syms;
   char *strings;
   struct aout_link_hash_entry **sym_hashes;
@@ -4631,10 +4629,10 @@ pdp11_aout_link_input_section (finfo, input_bfd, input_section, relocs,
 			  if (h->indx < 0)
 			    {
 			      h->indx = -2;
-			      h->written = false;
+			      h->written = FALSE;
 			      if (! aout_link_write_other_symbol (h,
 								  (PTR) finfo))
-				return false;
+				return FALSE;
 			    }
 			  r_index = h->indx;
 			}
@@ -4647,7 +4645,7 @@ pdp11_aout_link_input_section (finfo, input_bfd, input_section, relocs,
 			  if (! ((*finfo->info->callbacks->unattached_reloc)
 				 (finfo->info, name, input_bfd, input_section,
 				  r_addr)))
-			    return false;
+			    return FALSE;
 			  r_index = 0;
 			}
 		    }
@@ -4703,11 +4701,11 @@ fprintf (stderr, "TODO: change the address of the relocation\n");
 	}
       else
 	{
-	  boolean hundef;
+	  bfd_boolean hundef;
 
 	  /* We are generating an executable, and must do a full
 	     relocation.  */
-	  hundef = false;
+	  hundef = FALSE;
 	  if (r_extern)
 	    {
 	      h = sym_hashes[r_index];
@@ -4725,7 +4723,7 @@ fprintf (stderr, "TODO: change the address of the relocation\n");
 		relocation = 0;
 	      else
 		{
-		  hundef = true;
+		  hundef = TRUE;
 		  relocation = 0;
 		}
 	    }
@@ -4743,12 +4741,12 @@ fprintf (stderr, "TODO: change the address of the relocation\n");
 
 	  if (check_dynamic_reloc != NULL)
 	    {
-	      boolean skip;
+	      bfd_boolean skip;
 
 	      if (! ((*check_dynamic_reloc)
 		     (finfo->info, input_bfd, input_section, h,
 		      (PTR) rel, contents, &skip, &relocation)))
-		return false;
+		return FALSE;
 	      if (skip)
 		continue;
 	    }
@@ -4766,8 +4764,8 @@ fprintf (stderr, "TODO: change the address of the relocation\n");
 		name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
 	      if (! ((*finfo->info->callbacks->undefined_symbol)
 		     (finfo->info, name, input_bfd, input_section,
-		      r_addr, true)))
-		return false;
+		      r_addr, TRUE)))
+		return FALSE;
 	    }
 
 	  r = MY_final_link_relocate (howto,
@@ -4802,19 +4800,19 @@ fprintf (stderr, "TODO: change the address of the relocation\n");
 		if (! ((*finfo->info->callbacks->reloc_overflow)
 		       (finfo->info, name, howto->name,
 			(bfd_vma) 0, input_bfd, input_section, r_addr)))
-		  return false;
+		  return FALSE;
 	      }
 	      break;
 	    }
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Handle a link order which is supposed to generate a reloc.  */
 
-static boolean
+static bfd_boolean
 aout_link_reloc_link_order (finfo, o, p)
      struct aout_final_link_info *finfo;
      asection *o;
@@ -4850,7 +4848,7 @@ aout_link_reloc_link_order (finfo, o, p)
       r_extern = 1;
       h = ((struct aout_link_hash_entry *)
 	   bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info,
-					 pr->u.name, false, false, true));
+					 pr->u.name, FALSE, FALSE, TRUE));
       if (h != (struct aout_link_hash_entry *) NULL
 	  && h->indx >= 0)
 	r_index = h->indx;
@@ -4861,9 +4859,9 @@ aout_link_reloc_link_order (finfo, o, p)
 	     here.  I don't think that will ever matter for a global
 	     symbol.  */
 	  h->indx = -2;
-	  h->written = false;
+	  h->written = FALSE;
 	  if (! aout_link_write_other_symbol (h, (PTR) finfo))
-	    return false;
+	    return FALSE;
 	  r_index = h->indx;
 	}
       else
@@ -4871,7 +4869,7 @@ aout_link_reloc_link_order (finfo, o, p)
 	  if (! ((*finfo->info->callbacks->unattached_reloc)
 		 (finfo->info, pr->u.name, (bfd *) NULL,
 		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
+	    return FALSE;
 	  r_index = 0;
 	}
     }
@@ -4880,7 +4878,7 @@ aout_link_reloc_link_order (finfo, o, p)
   if (howto == 0)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   if (o == obj_textsec (finfo->output_bfd))
@@ -4950,12 +4948,12 @@ aout_link_reloc_link_order (finfo, o, p)
       bfd_size_type size;
       bfd_reloc_status_type r;
       bfd_byte *buf;
-      boolean ok;
+      bfd_boolean ok;
 
       size = bfd_get_reloc_size (howto);
       buf = (bfd_byte *) bfd_zmalloc (size);
       if (buf == (bfd_byte *) NULL)
-	return false;
+	return FALSE;
       r = MY_relocate_contents (howto, finfo->output_bfd,
 				pr->addend, buf);
       switch (r)
@@ -4976,7 +4974,7 @@ aout_link_reloc_link_order (finfo, o, p)
 		  (asection *) NULL, (bfd_vma) 0)))
 	    {
 	      free (buf);
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 	}
@@ -4986,13 +4984,13 @@ aout_link_reloc_link_order (finfo, o, p)
 				     size);
       free (buf);
       if (! ok)
-	return false;
+	return FALSE;
     }
 
   rel_size = obj_reloc_entry_size (finfo->output_bfd);
   if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0
       || bfd_bwrite (rel_ptr, rel_size, finfo->output_bfd) != rel_size)
-    return false;
+    return FALSE;
 
   *reloff_ptr += rel_size;
 
@@ -5003,7 +5001,7 @@ aout_link_reloc_link_order (finfo, o, p)
 		  || (*reloff_ptr
 		      <= obj_datasec (finfo->output_bfd)->rel_filepos)));
 
-  return true;
+  return TRUE;
 }
 /* end of modified aoutx.h */
 
diff --git a/bfd/pe-arm.c b/bfd/pe-arm.c
index dbb478940b5..8b5d1c7e101 100644
--- a/bfd/pe-arm.c
+++ b/bfd/pe-arm.c
@@ -1,5 +1,5 @@
 /* BFD back-end for ARM PECOFF files.
-   Copyright 1995, 1996, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #endif
 
 #define COFF_WITH_PE
-#define PCRELOFFSET          true
+#define PCRELOFFSET          TRUE
 #define COFF_LONG_SECTION_NAMES
 
 #ifndef bfd_arm_allocate_interworking_sections
diff --git a/bfd/pe-i386.c b/bfd/pe-i386.c
index 9c75f95e9fb..a912cffd998 100644
--- a/bfd/pe-i386.c
+++ b/bfd/pe-i386.c
@@ -23,7 +23,7 @@
 #define TARGET_SYM i386pe_vec
 #define TARGET_NAME "pe-i386"
 #define COFF_WITH_PE
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 #define TARGET_UNDERSCORE '_'
 #define COFF_LONG_SECTION_NAMES
 #define COFF_LONG_FILENAMES
diff --git a/bfd/pe-mcore.c b/bfd/pe-mcore.c
index 8119f815895..1fcb0dd42cd 100644
--- a/bfd/pe-mcore.c
+++ b/bfd/pe-mcore.c
@@ -1,5 +1,5 @@
 /* BFD back-end for MCore PECOFF files.
-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #endif
 
 #define COFF_WITH_PE
-#define PCRELOFFSET          true
+#define PCRELOFFSET          TRUE
 #define COFF_LONG_SECTION_NAMES
 
 #define MCORE_PE
diff --git a/bfd/pe-mips.c b/bfd/pe-mips.c
index c78726d1c3b..c9a4d5841d9 100644
--- a/bfd/pe-mips.c
+++ b/bfd/pe-mips.c
@@ -1,6 +1,6 @@
 /* BFD back-end for MIPS PE COFF files.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001 Free Software Foundation, Inc.
+   2000, 2001, 2002 Free Software Foundation, Inc.
    Modified from coff-i386.c by DJ Delorie, dj@cygnus.com
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define COFF_WITH_PE
 #define COFF_LONG_SECTION_NAMES
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -40,26 +40,27 @@ static bfd_reloc_status_type coff_mips_reloc
 static reloc_howto_type *coff_mips_rtype_to_howto
   PARAMS ((bfd *, asection *, struct internal_reloc *,
 	   struct coff_link_hash_entry *, struct internal_syment *,
-
 	   bfd_vma *));
 #if 0
-static void mips_ecoff_swap_reloc_in PARAMS ((bfd *, PTR,
-					      struct internal_reloc *));
-static void mips_ecoff_swap_reloc_out PARAMS ((bfd *,
-					       const struct internal_reloc *,
-					       PTR));
-static void mips_adjust_reloc_in PARAMS ((bfd *,
-					  const struct internal_reloc *,
-					  arelent *));
-static void mips_adjust_reloc_out PARAMS ((bfd *, const arelent *,
-					   struct internal_reloc *));
+static void mips_ecoff_swap_reloc_in
+  PARAMS ((bfd *, PTR, struct internal_reloc *));
+static void mips_ecoff_swap_reloc_out
+  PARAMS ((bfd *, const struct internal_reloc *, PTR));
+static void mips_adjust_reloc_in
+  PARAMS ((bfd *, const struct internal_reloc *, arelent *));
+static void mips_adjust_reloc_out
+  PARAMS ((bfd *, const arelent *, struct internal_reloc *));
 #endif
 
-static boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
-static reloc_howto_type * coff_mips_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void mips_swap_reloc_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int mips_swap_reloc_out PARAMS ((bfd *, PTR, PTR));
-static boolean coff_pe_mips_relocate_section
+static bfd_boolean in_reloc_p
+  PARAMS ((bfd *, reloc_howto_type *));
+static reloc_howto_type * coff_mips_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void mips_swap_reloc_in
+  PARAMS ((bfd *, PTR, PTR));
+static unsigned int mips_swap_reloc_out
+  PARAMS ((bfd *, PTR, PTR));
+static bfd_boolean coff_pe_mips_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 
@@ -175,10 +176,10 @@ coff_mips_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 }
 
 #ifdef COFF_WITH_PE
-/* Return true if this relocation should
+/* Return TRUE if this relocation should
    appear in the output .reloc section.  */
 
-static boolean
+static bfd_boolean
 in_reloc_p (abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type *howto;
@@ -188,7 +189,7 @@ in_reloc_p (abfd, howto)
 #endif
 
 #ifndef PCRELOFFSET
-#define PCRELOFFSET false
+#define PCRELOFFSET FALSE
 #endif
 
 static reloc_howto_type howto_table[] =
@@ -200,52 +201,52 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 0,			/* special_function */
 	 "IGNORE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 16 bit reference to a symbol, normally from a data section.  */
   HOWTO (MIPS_R_REFHALF,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_mips_reloc,	/* special_function */
 	 "REFHALF",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit reference to a symbol, normally from a data section.  */
   HOWTO (MIPS_R_REFWORD,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_mips_reloc,	/* special_function */
 	 "REFWORD",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 26 bit absolute jump address.  */
   HOWTO (MIPS_R_JMPADDR,	/* type */
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 26,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 			/* This needs complex overflow
@@ -253,10 +254,10 @@ static reloc_howto_type howto_table[] =
 				   bits must match the PC.  */
 	 coff_mips_reloc,	/* special_function */
 	 "JMPADDR",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The high 16 bits of a symbol value.  Handled by the function
      mips_refhi_reloc.  */
@@ -264,30 +265,30 @@ static reloc_howto_type howto_table[] =
 	 16,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_mips_reloc,	/* special_function */
 	 "REFHI",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* The low 16 bits of a symbol value.  */
   HOWTO (MIPS_R_REFLO,		/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 coff_mips_reloc,	/* special_function */
 	 "REFLO",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A reference to an offset from the gp register.  Handled by the
      function mips_gprel_reloc.  */
@@ -295,15 +296,15 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 coff_mips_reloc,	/* special_function */
 	 "GPREL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A reference to a literal using an offset from the gp register.
      Handled by the function mips_gprel_reloc.  */
@@ -311,15 +312,15 @@ static reloc_howto_type howto_table[] =
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 coff_mips_reloc,	/* special_function */
 	 "LITERAL",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   EMPTY_HOWTO (8),
   EMPTY_HOWTO (9),
@@ -351,30 +352,30 @@ static reloc_howto_type howto_table[] =
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_mips_reloc,       /* special_function */
 	 "rva32",	        /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
   EMPTY_HOWTO (35),
   EMPTY_HOWTO (36),
   HOWTO (MIPS_R_PAIR,           /* type */
 	 0,	                /* rightshift */
 	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
 	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
+	 FALSE,	                /* pc_relative */
 	 0,	                /* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 coff_mips_reloc,       /* special_function */
 	 "PAIR",	        /* name */
-	 true,	                /* partial_inplace */
+	 TRUE,	                /* partial_inplace */
 	 0xffffffff,            /* src_mask */
 	 0xffffffff,            /* dst_mask */
-	 false),                /* pcrel_offset */
+	 FALSE),                /* pcrel_offset */
 };
 
 /* Turn a howto into a reloc  nunmber */
@@ -632,7 +633,7 @@ mips_swap_reloc_out (abfd, src, dst)
 #define coff_swap_reloc_out mips_swap_reloc_out
 #define NO_COFF_RELOCS
 
-static boolean
+static bfd_boolean
 coff_pe_mips_relocate_section (output_bfd, info, input_bfd,
 			       input_section, contents, relocs, syms,
 			       sections)
@@ -646,12 +647,12 @@ coff_pe_mips_relocate_section (output_bfd, info, input_bfd,
      asection **sections;
 {
   bfd_vma gp;
-  boolean gp_undefined;
+  bfd_boolean gp_undefined;
   size_t adjust;
   struct internal_reloc *rel;
   struct internal_reloc *rel_end;
   unsigned int i;
-  boolean got_lo;
+  bfd_boolean got_lo;
 
   if (info->relocateable)
   {
@@ -659,7 +660,7 @@ coff_pe_mips_relocate_section (output_bfd, info, input_bfd,
 %s: `ld -r' not supported with PE MIPS objects\n"),
 			   bfd_archive_filename (input_bfd));
     bfd_set_error (bfd_error_bad_value);
-    return false;
+    return FALSE;
   }
 
   BFD_ASSERT (input_bfd->xvec->byteorder
@@ -673,11 +674,11 @@ coff_pe_mips_relocate_section (output_bfd, info, input_bfd,
 
   gp = _bfd_get_gp_value (output_bfd);
   if (gp == 0)
-    gp_undefined = true;
+    gp_undefined = TRUE;
   else
-    gp_undefined = false;
+    gp_undefined = FALSE;
 
-  got_lo = false;
+  got_lo = FALSE;
 
   adjust = 0;
 
@@ -719,7 +720,7 @@ coff_pe_mips_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
@@ -771,8 +772,8 @@ coff_pe_mips_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;
 	    }
 	}
 
@@ -820,7 +821,7 @@ coff_pe_mips_relocate_section (output_bfd, info, input_bfd,
 	      (*_bfd_error_handler) (_("%s: jump too far away\n"),
 				     bfd_archive_filename (input_bfd));
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  tmp &= 0xfc000000;
 	  tmp |= (targ/4) & 0x3ffffff;
@@ -847,7 +848,7 @@ coff_pe_mips_relocate_section (output_bfd, info, input_bfd,
 	      (*_bfd_error_handler) (_("%s: bad pair/reflo after refhi\n"),
 				     bfd_archive_filename (input_bfd));
 	      bfd_set_error (bfd_error_bad_value);
-	      return false;
+	      return FALSE;
 	    }
 	  tmp &= 0xffff0000;
 	  tmp |= (targ >> 16) & 0xffff;
@@ -898,7 +899,7 @@ coff_pe_mips_relocate_section (output_bfd, info, input_bfd,
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 #define coff_relocate_section coff_pe_mips_relocate_section
@@ -909,15 +910,16 @@ coff_pe_mips_relocate_section (output_bfd, info, input_bfd,
    a leading dot for local labels, so if TARGET_UNDERSCORE is defined
    we treat all symbols starting with L as local.  */
 
-static boolean coff_mips_is_local_label_name PARAMS ((bfd *, const char *));
+static bfd_boolean coff_mips_is_local_label_name
+   PARAMS ((bfd *, const char *));
 
-static boolean
+static bfd_boolean
 coff_mips_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == 'L')
-    return true;
+    return TRUE;
 
   return _bfd_coff_is_local_label_name (abfd, name);
 }
diff --git a/bfd/pe-sh.c b/bfd/pe-sh.c
index 08526e6218e..684d9a7611f 100644
--- a/bfd/pe-sh.c
+++ b/bfd/pe-sh.c
@@ -1,5 +1,5 @@
 /* BFD back-end for SH PECOFF files.
-   Copyright 1995, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1995, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define TARGET_SHL_SYM shlpe_vec
 #define TARGET_SHL_NAME "pe-shl"
 #define COFF_WITH_PE
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 #define TARGET_UNDERSCORE '_'
 #define COFF_LONG_SECTION_NAMES
 
diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index b643f3c2366..70236785661 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -91,10 +91,10 @@
 
 static void add_data_entry
   PARAMS ((bfd *, struct internal_extra_pe_aouthdr *, int, char *, bfd_vma));
-static boolean pe_print_pdata PARAMS ((bfd *, PTR));
-static boolean pe_print_reloc PARAMS ((bfd *, PTR));
-static boolean pe_print_idata PARAMS ((bfd *, PTR));
-static boolean pe_print_edata PARAMS ((bfd *, PTR));
+static bfd_boolean pe_print_pdata PARAMS ((bfd *, PTR));
+static bfd_boolean pe_print_reloc PARAMS ((bfd *, PTR));
+static bfd_boolean pe_print_idata PARAMS ((bfd *, PTR));
+static bfd_boolean pe_print_edata PARAMS ((bfd *, PTR));
 
 
 void
@@ -1016,7 +1016,7 @@ static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] =
    PPC- specific code.  */
 #endif
 
-static boolean
+static bfd_boolean
 pe_print_idata (abfd, vfile)
      bfd *abfd;
      PTR vfile;
@@ -1048,12 +1048,12 @@ pe_print_idata (abfd, vfile)
       /* Maybe the extra header isn't there.  Look for the section.  */
       section = bfd_get_section_by_name (abfd, ".idata");
       if (section == NULL)
-	return true;
+	return TRUE;
 
       addr = section->vma;
       datasize = bfd_section_size (abfd, section);
       if (datasize == 0)
-	return true;
+	return TRUE;
     }
   else
     {
@@ -1069,7 +1069,7 @@ pe_print_idata (abfd, vfile)
 	{
 	  fprintf (file,
 		   _("\nThere is an import table, but the section containing it could not be found\n"));
-	  return true;
+	  return TRUE;
 	}
     }
 
@@ -1098,7 +1098,7 @@ pe_print_idata (abfd, vfile)
       amt = bfd_section_size (abfd, rel_section);
       data = (bfd_byte *) bfd_malloc (amt);
       if (data == NULL && amt != 0)
-	return false;
+	return FALSE;
 
       bfd_get_section_contents (abfd, rel_section, (PTR) data, (bfd_vma) 0,
 				amt);
@@ -1134,11 +1134,11 @@ pe_print_idata (abfd, vfile)
   amt = dataoff + datasize;
   data = (bfd_byte *) bfd_malloc (amt);
   if (data == NULL)
-    return false;
+    return FALSE;
 
   /* Read the whole section.  Some of the fields might be before dataoff.  */
   if (! bfd_get_section_contents (abfd, section, (PTR) data, (bfd_vma) 0, amt))
-    return false;
+    return FALSE;
 
   adj = section->vma - extra->ImageBase;
 
@@ -1290,10 +1290,10 @@ pe_print_idata (abfd, vfile)
 
   free (data);
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 pe_print_edata (abfd, vfile)
      bfd *abfd;
      PTR vfile;
@@ -1332,12 +1332,12 @@ pe_print_edata (abfd, vfile)
       /* Maybe the extra header isn't there.  Look for the section.  */
       section = bfd_get_section_by_name (abfd, ".edata");
       if (section == NULL)
-	return true;
+	return TRUE;
 
       addr = section->vma;
       datasize = bfd_section_size (abfd, section);
       if (datasize == 0)
-	return true;
+	return TRUE;
     }
   else
     {
@@ -1355,7 +1355,7 @@ pe_print_edata (abfd, vfile)
 	{
 	  fprintf (file,
 		   _("\nThere is an export table, but the section containing it could not be found\n"));
-	  return true;
+	  return TRUE;
 	}
     }
 
@@ -1367,11 +1367,11 @@ pe_print_edata (abfd, vfile)
 
   data = (bfd_byte *) bfd_malloc (datasize);
   if (data == NULL)
-    return false;
+    return FALSE;
 
   if (! bfd_get_section_contents (abfd, section, (PTR) data,
 				  (file_ptr) dataoff, datasize))
-    return false;
+    return FALSE;
 
   /* Go get Export Directory Table.  */
   edt.export_flags   = bfd_get_32 (abfd, data +  0);
@@ -1508,7 +1508,7 @@ pe_print_edata (abfd, vfile)
 
   free (data);
 
-  return true;
+  return TRUE;
 }
 
 /* This really is architecture dependent.  On IA-64, a .pdata entry
@@ -1516,7 +1516,7 @@ pe_print_edata (abfd, vfile)
    specify the start and end address of the code range the entry
    covers and the address of the corresponding unwind info data.  */
 
-static boolean
+static bfd_boolean
 pe_print_pdata (abfd, vfile)
      bfd *abfd;
      PTR vfile;
@@ -1537,7 +1537,7 @@ pe_print_pdata (abfd, vfile)
   if (section == NULL
       || coff_section_data (abfd, section) == NULL
       || pei_section_data (abfd, section) == NULL)
-    return true;
+    return TRUE;
 
   stop = pei_section_data (abfd, section)->virt_size;
   if ((stop % onaline) != 0)
@@ -1558,11 +1558,11 @@ pe_print_pdata (abfd, vfile)
 
   datasize = bfd_section_size (abfd, section);
   if (datasize == 0)
-    return true;
+    return TRUE;
 
   data = (bfd_byte *) bfd_malloc (datasize);
   if (data == NULL && datasize != 0)
-    return false;
+    return FALSE;
 
   bfd_get_section_contents (abfd, section, (PTR) data, (bfd_vma) 0,
 			    datasize);
@@ -1639,7 +1639,7 @@ pe_print_pdata (abfd, vfile)
 
   free (data);
 
-  return true;
+  return TRUE;
 }
 
 #define IMAGE_REL_BASED_HIGHADJ 4
@@ -1660,7 +1660,7 @@ static const char * const tbl[] =
     "UNKNOWN",   /* MUST be last */
   };
 
-static boolean
+static bfd_boolean
 pe_print_reloc (abfd, vfile)
      bfd *abfd;
      PTR vfile;
@@ -1673,10 +1673,10 @@ pe_print_reloc (abfd, vfile)
   bfd_size_type start, stop;
 
   if (section == NULL)
-    return true;
+    return TRUE;
 
   if (bfd_section_size (abfd, section) == 0)
-    return true;
+    return TRUE;
 
   fprintf (file,
 	   _("\n\nPE File Base Relocations (interpreted .reloc section contents)\n"));
@@ -1684,7 +1684,7 @@ pe_print_reloc (abfd, vfile)
   datasize = bfd_section_size (abfd, section);
   data = (bfd_byte *) bfd_malloc (datasize);
   if (data == NULL && datasize != 0)
-    return false;
+    return FALSE;
 
   bfd_get_section_contents (abfd, section, (PTR) data, (bfd_vma) 0,
 			    datasize);
@@ -1743,12 +1743,12 @@ pe_print_reloc (abfd, vfile)
 
   free (data);
 
-  return true;
+  return TRUE;
 }
 
 /* Print out the program headers.  */
 
-boolean
+bfd_boolean
 _bfd_XX_print_private_bfd_data_common (abfd, vfile)
      bfd *abfd;
      PTR vfile;
@@ -1859,20 +1859,20 @@ _bfd_XX_print_private_bfd_data_common (abfd, vfile)
   pe_print_pdata (abfd, vfile);
   pe_print_reloc (abfd, vfile);
 
-  return true;
+  return TRUE;
 }
 
 /* Copy any private info we understand from the input bfd
    to the output bfd.  */
 
-boolean
+bfd_boolean
 _bfd_XX_bfd_copy_private_bfd_data_common (ibfd, obfd)
      bfd *ibfd, *obfd;
 {
   /* One day we may try to grok other private data.  */
   if (ibfd->xvec->flavour != bfd_target_coff_flavour
       || obfd->xvec->flavour != bfd_target_coff_flavour)
-    return true;
+    return TRUE;
 
   pe_data (obfd)->pe_opthdr = pe_data (ibfd)->pe_opthdr;
   pe_data (obfd)->dll = pe_data (ibfd)->dll;
@@ -1884,12 +1884,12 @@ _bfd_XX_bfd_copy_private_bfd_data_common (ibfd, obfd)
       pe_data (obfd)->pe_opthdr.DataDirectory[5].VirtualAddress = 0;
       pe_data (obfd)->pe_opthdr.DataDirectory[5].Size = 0;
     }
-  return true;
+  return TRUE;
 }
 
 /* Copy private section data.  */
 
-boolean
+bfd_boolean
 _bfd_XX_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
      bfd *ibfd;
      asection *isec;
@@ -1898,7 +1898,7 @@ _bfd_XX_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
 {
   if (bfd_get_flavour (ibfd) != bfd_target_coff_flavour
       || bfd_get_flavour (obfd) != bfd_target_coff_flavour)
-    return true;
+    return TRUE;
 
   if (coff_section_data (ibfd, isec) != NULL
       && pei_section_data (ibfd, isec) != NULL)
@@ -1908,7 +1908,7 @@ _bfd_XX_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
 	  bfd_size_type amt = sizeof (struct coff_section_tdata);
 	  osec->used_by_bfd = (PTR) bfd_zalloc (obfd, amt);
 	  if (osec->used_by_bfd == NULL)
-	    return false;
+	    return FALSE;
 	}
 
       if (pei_section_data (obfd, osec) == NULL)
@@ -1916,7 +1916,7 @@ _bfd_XX_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
 	  bfd_size_type amt = sizeof (struct pei_section_tdata);
 	  coff_section_data (obfd, osec)->tdata = (PTR) bfd_zalloc (obfd, amt);
 	  if (coff_section_data (obfd, osec)->tdata == NULL)
-	    return false;
+	    return FALSE;
 	}
 
       pei_section_data (obfd, osec)->virt_size =
@@ -1925,7 +1925,7 @@ _bfd_XX_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
 	pei_section_data (ibfd, isec)->pe_flags;
     }
 
-  return true;
+  return TRUE;
 }
 
 void
@@ -1948,7 +1948,7 @@ _bfd_XX_get_symbol_info (abfd, symbol, ret)
 /* Handle the .idata section and other things that need symbol table
    access.  */
 
-boolean
+bfd_boolean
 _bfd_XXi_final_link_postscript (abfd, pfinfo)
      bfd *abfd;
      struct coff_final_link_info *pfinfo;
@@ -1965,7 +1965,7 @@ _bfd_XXi_final_link_postscript (abfd, pfinfo)
   /* The import directory.  This is the address of .idata$2, with size
      of .idata$2 + .idata$3.  */
   h1 = coff_link_hash_lookup (coff_hash_table (info),
-			      ".idata$2", false, false, true);
+			      ".idata$2", FALSE, FALSE, TRUE);
   if (h1 != NULL)
     {
       pe_data (abfd)->pe_opthdr.DataDirectory[1].VirtualAddress =
@@ -1973,7 +1973,7 @@ _bfd_XXi_final_link_postscript (abfd, pfinfo)
 	 + h1->root.u.def.section->output_section->vma
 	 + h1->root.u.def.section->output_offset);
       h1 = coff_link_hash_lookup (coff_hash_table (info),
-				  ".idata$4", false, false, true);
+				  ".idata$4", FALSE, FALSE, TRUE);
       pe_data (abfd)->pe_opthdr.DataDirectory[1].Size =
 	((h1->root.u.def.value
 	  + h1->root.u.def.section->output_section->vma
@@ -1983,13 +1983,13 @@ _bfd_XXi_final_link_postscript (abfd, pfinfo)
       /* The import address table.  This is the size/address of
          .idata$5.  */
       h1 = coff_link_hash_lookup (coff_hash_table (info),
-				  ".idata$5", false, false, true);
+				  ".idata$5", FALSE, FALSE, TRUE);
       pe_data (abfd)->pe_opthdr.DataDirectory[12].VirtualAddress =
 	(h1->root.u.def.value
 	 + h1->root.u.def.section->output_section->vma
 	 + h1->root.u.def.section->output_offset);
       h1 = coff_link_hash_lookup (coff_hash_table (info),
-				  ".idata$6", false, false, true);
+				  ".idata$6", FALSE, FALSE, TRUE);
       pe_data (abfd)->pe_opthdr.DataDirectory[12].Size =
 	((h1->root.u.def.value
 	  + h1->root.u.def.section->output_section->vma
@@ -2000,5 +2000,5 @@ _bfd_XXi_final_link_postscript (abfd, pfinfo)
   /* If we couldn't find idata$2, we either have an excessively
      trivial program or are in DEEP trouble; we have to assume trivial
      program....  */
-  return true;
+  return TRUE;
 }
diff --git a/bfd/pef.c b/bfd/pef.c
index 2f120285ace..b4c5bfed1e8 100644
--- a/bfd/pef.c
+++ b/bfd/pef.c
@@ -72,7 +72,7 @@ PARAMS ((bfd *abfd, PTR afile, asymbol *symbol, bfd_print_symbol_type how));
 static void bfd_pef_convert_architecture
 PARAMS ((unsigned long architecture,
 	 enum bfd_architecture *type, unsigned long *subtype));
-static boolean bfd_pef_mkobject PARAMS ((bfd *abfd));
+static bfd_boolean bfd_pef_mkobject PARAMS ((bfd *abfd));
 static int bfd_pef_parse_traceback_table
 PARAMS ((bfd *abfd, asection *section, unsigned char *buf,
 	 size_t len, size_t pos, asymbol *sym, FILE *file));
@@ -97,7 +97,7 @@ static long bfd_pef_get_symtab_upper_bound PARAMS ((bfd *));
 static long bfd_pef_get_symtab PARAMS ((bfd *, asymbol **));
 static asymbol *bfd_pef_make_empty_symbol PARAMS ((bfd *));
 static void bfd_pef_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static int bfd_pef_sizeof_headers PARAMS ((bfd *, boolean));
+static int bfd_pef_sizeof_headers PARAMS ((bfd *, bfd_boolean));
 
 static int bfd_pef_xlib_read_header
 PARAMS ((bfd *abfd, bfd_pef_xlib_header *header));
@@ -154,11 +154,11 @@ bfd_pef_convert_architecture (architecture, type, subtype)
     *type = bfd_arch_m68k;
 }
 
-static boolean
+static bfd_boolean
 bfd_pef_mkobject (abfd)
      bfd *abfd ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 static int
@@ -1094,7 +1094,7 @@ bfd_pef_get_symbol_info (abfd, symbol, ret)
 static int
 bfd_pef_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
diff --git a/bfd/pei-arm.c b/bfd/pei-arm.c
index c202072d5b1..8eb23eb6faa 100644
--- a/bfd/pei-arm.c
+++ b/bfd/pei-arm.c
@@ -1,5 +1,5 @@
 /* BFD back-end for arm PE IMAGE COFF files.
-   Copyright 1995, 1996, 1999 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
-#define PCRELOFFSET        true
+#define PCRELOFFSET        TRUE
 #define COFF_LONG_SECTION_NAMES
 
 #include "coff-arm.c"
diff --git a/bfd/pei-i386.c b/bfd/pei-i386.c
index 9f577e669f7..63a63a84839 100644
--- a/bfd/pei-i386.c
+++ b/bfd/pei-i386.c
@@ -24,7 +24,7 @@
 #define TARGET_NAME "pei-i386"
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 #define TARGET_UNDERSCORE '_'
 #define COFF_LONG_SECTION_NAMES
 #define COFF_LONG_FILENAMES
diff --git a/bfd/pei-mcore.c b/bfd/pei-mcore.c
index 78c3b95aad9..416cb81b8bb 100644
--- a/bfd/pei-mcore.c
+++ b/bfd/pei-mcore.c
@@ -1,5 +1,5 @@
 /* BFD back-end for MCore PECOFF files.
-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
-#define PCRELOFFSET        true
+#define PCRELOFFSET        TRUE
 #define COFF_LONG_SECTION_NAMES
 
 #define MCORE_PE
diff --git a/bfd/pei-mips.c b/bfd/pei-mips.c
index 84c6ff0b0e3..976b2f995e0 100644
--- a/bfd/pei-mips.c
+++ b/bfd/pei-mips.c
@@ -1,5 +1,5 @@
 /* BFD back-end for MIPS PE IMAGE COFF files.
-   Copyright 1995, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1995, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define TARGET_SYM mipslpei_vec
 #define TARGET_NAME "pei-mips"
 #define COFF_IMAGE_WITH_PE
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 #define COFF_LONG_SECTION_NAMES
 
 #include "pe-mips.c"
diff --git a/bfd/pei-sh.c b/bfd/pei-sh.c
index c46b0dbe04e..b4cc579fa49 100644
--- a/bfd/pei-sh.c
+++ b/bfd/pei-sh.c
@@ -1,5 +1,5 @@
 /* BFD back-end for SH PE IMAGE COFF files.
-   Copyright 1995, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1995, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define IMAGE_BASE NT_IMAGE_BASE
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
-#define PCRELOFFSET true
+#define PCRELOFFSET TRUE
 #define TARGET_UNDERSCORE '_'
 #define COFF_LONG_SECTION_NAMES
 
diff --git a/bfd/peicode.h b/bfd/peicode.h
index a621acc4b27..2dff0ac3f68 100644
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -58,7 +58,7 @@ PE/PEI rearrangement (and code added): Donn Terry
 
 #include "libpei.h"
 
-static boolean (*pe_saved_coff_bfd_print_private_bfd_data)
+static bfd_boolean (*pe_saved_coff_bfd_print_private_bfd_data)
     PARAMS ((bfd *, PTR)) =
 #ifndef coff_bfd_print_private_bfd_data
      NULL;
@@ -67,10 +67,10 @@ static boolean (*pe_saved_coff_bfd_print_private_bfd_data)
 #undef coff_bfd_print_private_bfd_data
 #endif
 
-static boolean pe_print_private_bfd_data PARAMS ((bfd *, PTR));
+static bfd_boolean pe_print_private_bfd_data PARAMS ((bfd *, PTR));
 #define coff_bfd_print_private_bfd_data pe_print_private_bfd_data
 
-static boolean (*pe_saved_coff_bfd_copy_private_bfd_data)
+static bfd_boolean (*pe_saved_coff_bfd_copy_private_bfd_data)
     PARAMS ((bfd *, bfd *)) =
 #ifndef coff_bfd_copy_private_bfd_data
      NULL;
@@ -79,7 +79,7 @@ static boolean (*pe_saved_coff_bfd_copy_private_bfd_data)
 #undef coff_bfd_copy_private_bfd_data
 #endif
 
-static boolean pe_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
+static bfd_boolean pe_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
 #define coff_bfd_copy_private_bfd_data pe_bfd_copy_private_bfd_data
 
 #define coff_mkobject      pe_mkobject
@@ -91,7 +91,7 @@ static unsigned int coff_swap_reloc_out PARAMS ((bfd *, PTR, PTR));
 #endif
 static void coff_swap_filehdr_in PARAMS ((bfd *, PTR, PTR));
 static void coff_swap_scnhdr_in PARAMS ((bfd *, PTR, PTR));
-static boolean pe_mkobject PARAMS ((bfd *));
+static bfd_boolean pe_mkobject PARAMS ((bfd *));
 static PTR pe_mkobject_hook PARAMS ((bfd *, PTR, PTR));
 
 #ifdef COFF_IMAGE_WITH_PE
@@ -139,7 +139,7 @@ static void               pe_ILF_make_a_reloc     PARAMS ((pe_ILF_vars *, bfd_vm
 static void               pe_ILF_make_a_symbol    PARAMS ((pe_ILF_vars *, const char *, const char *, asection_ptr, flagword));
 static void               pe_ILF_save_relocs      PARAMS ((pe_ILF_vars *, asection_ptr));
 static void		  pe_ILF_make_a_symbol_reloc  PARAMS ((pe_ILF_vars *, bfd_vma, bfd_reloc_code_real_type, struct symbol_cache_entry **, unsigned int));
-static boolean            pe_ILF_build_a_bfd      PARAMS ((bfd *, unsigned int, bfd_byte *, bfd_byte *, unsigned int, unsigned int));
+static bfd_boolean        pe_ILF_build_a_bfd      PARAMS ((bfd *, unsigned int, bfd_byte *, bfd_byte *, unsigned int, unsigned int));
 static const bfd_target * pe_ILF_object_p         PARAMS ((bfd *));
 static const bfd_target * pe_bfd_object_p 	  PARAMS ((bfd *));
 #endif /* COFF_IMAGE_WITH_PE */
@@ -273,7 +273,7 @@ coff_swap_scnhdr_in (abfd, ext, in)
 #endif
 }
 
-static boolean
+static bfd_boolean
 pe_mkobject (abfd)
      bfd * abfd;
 {
@@ -283,7 +283,7 @@ pe_mkobject (abfd)
   abfd->tdata.pe_obj_data = (struct pe_tdata *) bfd_zalloc (abfd, amt);
 
   if (abfd->tdata.pe_obj_data == 0)
-    return false;
+    return FALSE;
 
   pe = pe_data (abfd);
 
@@ -299,7 +299,7 @@ pe_mkobject (abfd)
   pe->target_subsystem = PEI_TARGET_SUBSYSTEM;
 #endif
 
-  return true;
+  return TRUE;
 }
 
 /* Create the COFF backend specific information.  */
@@ -355,7 +355,7 @@ pe_mkobject_hook (abfd, filehdr, aouthdr)
   return (PTR) pe;
 }
 
-static boolean
+static bfd_boolean
 pe_print_private_bfd_data (abfd, vfile)
      bfd *abfd;
      PTR vfile;
@@ -363,7 +363,7 @@ pe_print_private_bfd_data (abfd, vfile)
   FILE *file = (FILE *) vfile;
 
   if (!_bfd_XX_print_private_bfd_data_common (abfd, vfile))
-    return false;
+    return FALSE;
 
   if (pe_saved_coff_bfd_print_private_bfd_data != NULL)
     {
@@ -372,23 +372,23 @@ pe_print_private_bfd_data (abfd, vfile)
       return pe_saved_coff_bfd_print_private_bfd_data (abfd, vfile);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Copy any private info we understand from the input bfd
    to the output bfd.  */
 
-static boolean
+static bfd_boolean
 pe_bfd_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd, *obfd;
 {
   if (!_bfd_XX_bfd_copy_private_bfd_data_common (ibfd, obfd))
-    return false;
+    return FALSE;
 
   if (pe_saved_coff_bfd_copy_private_bfd_data)
     return pe_saved_coff_bfd_copy_private_bfd_data (ibfd, obfd);
 
-  return true;
+  return TRUE;
 }
 
 #define coff_bfd_copy_private_section_data \
@@ -518,7 +518,7 @@ pe_ILF_save_relocs (pe_ILF_vars * vars,
     abort ();
 
   coff_section_data (vars->abfd, sec)->relocs = vars->int_reltab;
-  coff_section_data (vars->abfd, sec)->keep_relocs = true;
+  coff_section_data (vars->abfd, sec)->keep_relocs = TRUE;
 
   sec->relocation  = vars->reltab;
   sec->reloc_count = vars->relcount;
@@ -610,7 +610,7 @@ pe_ILF_make_a_symbol (pe_ILF_vars *  vars,
 #if 0 /* See comment above.  */
   sym->symbol.value   = 0;
   sym->symbol.udata.i = 0;
-  sym->done_lineno    = false;
+  sym->done_lineno    = FALSE;
   sym->lineno         = NULL;
 #endif
 
@@ -753,7 +753,7 @@ static jump_table jtab[] =
 #endif
 
 /* Build a full BFD from the information supplied in a ILF object.  */
-static boolean
+static bfd_boolean
 pe_ILF_build_a_bfd (bfd *           abfd,
 		    unsigned int    magic,
 		    bfd_byte *      symbol_name,
@@ -784,12 +784,12 @@ pe_ILF_build_a_bfd (bfd *           abfd,
       /* XXX code yet to be written.  */
       _bfd_error_handler (_("%s: Unhandled import type; %x"),
 			  bfd_archive_filename (abfd), import_type);
-      return false;
+      return FALSE;
 
     default:
       _bfd_error_handler (_("%s: Unrecognised import type; %x"),
 			  bfd_archive_filename (abfd), import_type);
-      return false;
+      return FALSE;
     }
 
   switch (import_name_type)
@@ -803,7 +803,7 @@ pe_ILF_build_a_bfd (bfd *           abfd,
     default:
       _bfd_error_handler (_("%s: Unrecognised import name type; %x"),
 			  bfd_archive_filename (abfd), import_name_type);
-      return false;
+      return FALSE;
     }
 
   /* Initialise local variables.
@@ -815,7 +815,7 @@ pe_ILF_build_a_bfd (bfd *           abfd,
      so allocate all the space that we will need right now.  */
   ptr = bfd_zalloc (abfd, (bfd_size_type) ILF_DATA_SIZE);
   if (ptr == NULL)
-    return false;
+    return FALSE;
 
   /* Create a bfd_in_memory structure.  */
   vars.bim = (struct bfd_in_memory *) ptr;
@@ -875,7 +875,7 @@ pe_ILF_build_a_bfd (bfd *           abfd,
   id4 = pe_ILF_make_a_section (& vars, ".idata$4", SIZEOF_IDATA4, 0);
   id5 = pe_ILF_make_a_section (& vars, ".idata$5", SIZEOF_IDATA5, 0);
   if (id4 == NULL || id5 == NULL)
-    return false;
+    return FALSE;
 
   /* Fill in the contents of these sections.  */
   if (import_name_type == IMPORT_ORDINAL)
@@ -894,7 +894,7 @@ pe_ILF_build_a_bfd (bfd *           abfd,
       /* Create .idata$6 - the Hint Name Table.  */
       id6 = pe_ILF_make_a_section (& vars, ".idata$6", SIZEOF_IDATA6, 0);
       if (id6 == NULL)
-	return false;
+	return FALSE;
 
       /* If necessary, trim the import symbol name.  */
       symbol = symbol_name;
@@ -950,7 +950,7 @@ pe_ILF_build_a_bfd (bfd *           abfd,
       /* Create the .text section.  */
       text = pe_ILF_make_a_section (& vars, ".text", jtab[i].size, SEC_CODE);
       if (text == NULL)
-	return false;
+	return FALSE;
 
       /* Copy in the jump code.  */
       memcpy (text->contents, jtab[i].data, jtab[i].size);
@@ -999,10 +999,10 @@ pe_ILF_build_a_bfd (bfd *           abfd,
 
   if (   ! bfd_set_start_address (abfd, (bfd_vma) 0)
       || ! bfd_coff_set_arch_mach_hook (abfd, & internal_f))
-    return false;
+    return FALSE;
 
   if (bfd_coff_mkobject_hook (abfd, (PTR) & internal_f, NULL) == NULL)
-    return false;
+    return FALSE;
 
   coff_data (abfd)->pe = 1;
 #ifdef THUMBPEMAGIC
@@ -1053,17 +1053,17 @@ pe_ILF_build_a_bfd (bfd *           abfd,
   obj_raw_syment_count (abfd) = vars.sym_index;
 
   obj_coff_external_syms (abfd) = (PTR) vars.esym_table;
-  obj_coff_keep_syms (abfd) = true;
+  obj_coff_keep_syms (abfd) = TRUE;
 
   obj_convert (abfd) = vars.sym_table;
   obj_conv_table_size (abfd) = vars.sym_index;
 
   obj_coff_strings (abfd) = vars.string_table;
-  obj_coff_keep_strings (abfd) = true;
+  obj_coff_keep_strings (abfd) = TRUE;
 
   abfd->flags |= HAS_SYMS;
 
-  return true;
+  return TRUE;
 }
 
 /* We have detected a Image Library Format archive element.
diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c
index 5b153bdff08..a4fe0ca4ba4 100644
--- a/bfd/ppcboot.c
+++ b/bfd/ppcboot.c
@@ -87,27 +87,27 @@ typedef struct ppcboot_data {
    a start symbol, an end symbol, and an absolute length symbol.  */
 #define PPCBOOT_SYMS 3
 
-static boolean ppcboot_mkobject PARAMS ((bfd *));
+static bfd_boolean ppcboot_mkobject PARAMS ((bfd *));
 static const bfd_target *ppcboot_object_p PARAMS ((bfd *));
-static boolean ppcboot_set_arch_mach
+static bfd_boolean ppcboot_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean ppcboot_get_section_contents
+static bfd_boolean ppcboot_get_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
 static long ppcboot_get_symtab_upper_bound PARAMS ((bfd *));
 static char *mangle_name PARAMS ((bfd *, char *));
 static long ppcboot_get_symtab PARAMS ((bfd *, asymbol **));
 static void ppcboot_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static boolean ppcboot_set_section_contents
+static bfd_boolean ppcboot_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static int ppcboot_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean ppcboot_bfd_print_private_bfd_data PARAMS ((bfd *, PTR));
+static int ppcboot_sizeof_headers PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean ppcboot_bfd_print_private_bfd_data PARAMS ((bfd *, PTR));
 
 #define ppcboot_set_tdata(abfd, ptr) ((abfd)->tdata.any = (PTR) (ptr))
 #define ppcboot_get_tdata(abfd) ((ppcboot_data_t *) ((abfd)->tdata.any))
 
 /* Create a ppcboot object.  Invoked via bfd_set_format.  */
 
-static boolean
+static bfd_boolean
 ppcboot_mkobject (abfd)
      bfd *abfd;
 {
@@ -117,12 +117,12 @@ ppcboot_mkobject (abfd)
       ppcboot_set_tdata (abfd, bfd_zalloc (abfd, amt));
     }
 
-  return true;
+  return TRUE;
 }
 
 
 /* Set the architecture to PowerPC */
-static boolean
+static bfd_boolean
 ppcboot_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -132,7 +132,7 @@ ppcboot_set_arch_mach (abfd, arch, machine)
     arch = bfd_arch_powerpc;
 
   else if (arch != bfd_arch_powerpc)
-    return false;
+    return FALSE;
 
   return bfd_default_set_arch_mach (abfd, arch, machine);
 }
@@ -229,7 +229,7 @@ ppcboot_object_p (abfd)
 
 /* Get contents of the only section.  */
 
-static boolean
+static bfd_boolean
 ppcboot_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section ATTRIBUTE_UNUSED;
@@ -239,8 +239,8 @@ ppcboot_get_section_contents (abfd, section, location, offset, count)
 {
   if (bfd_seek (abfd, offset + (file_ptr) sizeof (ppcboot_hdr_t), SEEK_SET) != 0
       || bfd_bread (location, count, abfd) != count)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 
@@ -298,7 +298,7 @@ ppcboot_get_symtab (abfd, alocation)
 
   syms = (asymbol *) bfd_alloc (abfd, amt);
   if (syms == NULL)
-    return false;
+    return FALSE;
 
   /* Start symbol.  */
   syms[0].the_bfd = abfd;
@@ -360,7 +360,7 @@ ppcboot_get_symbol_info (ignore_abfd, symbol, ret)
 
 /* Write section contents of a ppcboot file.  */
 
-static boolean
+static bfd_boolean
 ppcboot_set_section_contents (abfd, sec, data, offset, size)
      bfd *abfd;
      asection *sec;
@@ -384,7 +384,7 @@ ppcboot_set_section_contents (abfd, sec, data, offset, size)
       for (s = abfd->sections; s != NULL; s = s->next)
 	s->filepos = s->vma - low;
 
-      abfd->output_has_begun = true;
+      abfd->output_has_begun = TRUE;
     }
 
   return _bfd_generic_set_section_contents (abfd, sec, data, offset, size);
@@ -394,7 +394,7 @@ ppcboot_set_section_contents (abfd, sec, data, offset, size)
 static int
 ppcboot_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return sizeof (ppcboot_hdr_t);
 }
@@ -402,7 +402,7 @@ ppcboot_sizeof_headers (abfd, exec)
 
 /* Print out the program headers.  */
 
-static boolean
+static bfd_boolean
 ppcboot_bfd_print_private_bfd_data (abfd, farg)
      bfd *abfd;
      PTR farg;
@@ -460,7 +460,7 @@ ppcboot_bfd_print_private_bfd_data (abfd, farg)
     }
 
   fprintf (f, "\n");
-  return true;
+  return TRUE;
 }
 
 
diff --git a/bfd/ptrace-core.c b/bfd/ptrace-core.c
index f8db927ea86..23bc8dee8a3 100644
--- a/bfd/ptrace-core.c
+++ b/bfd/ptrace-core.c
@@ -49,11 +49,11 @@ struct trad_core_struct
 /* forward declarations */
 
 const bfd_target *ptrace_unix_core_file_p PARAMS ((bfd *abfd));
-char *		ptrace_unix_core_file_failing_command PARAMS ((bfd *abfd));
-int		ptrace_unix_core_file_failing_signal PARAMS ((bfd *abfd));
-boolean		ptrace_unix_core_file_matches_executable_p
-			 PARAMS ((bfd *core_bfd, bfd *exec_bfd));
-static void	swap_abort PARAMS ((void));
+char * ptrace_unix_core_file_failing_command PARAMS ((bfd *abfd));
+int ptrace_unix_core_file_failing_signal PARAMS ((bfd *abfd));
+bfd_boolean ptrace_unix_core_file_matches_executable_p
+  PARAMS ((bfd *core_bfd, bfd *exec_bfd));
+static void swap_abort PARAMS ((void));
 
 /* ARGSUSED */
 const bfd_target *
@@ -155,13 +155,13 @@ ptrace_unix_core_file_failing_signal (abfd)
 }
 
 /* ARGSUSED */
-boolean
+bfd_boolean
 ptrace_unix_core_file_matches_executable_p  (core_bfd, exec_bfd)
      bfd *core_bfd, *exec_bfd;
 {
   /* FIXME: Use pt_timdat field of the ptrace_user structure to match
      the date of the executable */
-  return true;
+  return TRUE;
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 0885e03232e..9b44c72ad3e 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -306,7 +306,7 @@ CODE_FRAGMENT
 .      data section of the addend.  The relocation function will
 .      subtract from the relocation value the address of the location
 .      being relocated.  *}
-.  boolean pc_relative;
+.  bfd_boolean pc_relative;
 .
 .  {*  The bit position of the reloc value in the destination.
 .      The relocated value is left shifted by this amount.  *}
@@ -342,7 +342,7 @@ CODE_FRAGMENT
 .     USE_REL targets set this field to TRUE.  Why this is so is peculiar
 .     to each particular target.  For relocs that aren't used in partial
 .     links (e.g. GOT stuff) it doesn't matter what this is set to.  *}
-.  boolean partial_inplace;
+.  bfd_boolean partial_inplace;
 .
 .  {* The src_mask selects which parts of the read in data
 .     are to be used in the relocation sum.  E.g., if this was an 8 bit
@@ -365,7 +365,7 @@ CODE_FRAGMENT
 .     be made just by adding in an ordinary offset (e.g., sun3 a.out).
 .     Some formats leave the displacement part of an instruction
 .     empty (e.g., m88k bcs); this flag signals the fact.  *}
-.  boolean pcrel_offset;
+.  bfd_boolean pcrel_offset;
 .};
 .
 */
@@ -386,15 +386,15 @@ DESCRIPTION
 
 .#define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \
 .  HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \
-.         NAME, false, 0, 0, IN)
+.         NAME, FALSE, 0, 0, IN)
 .
 
 DESCRIPTION
 	This is used to fill in an empty howto entry in an array.
 
 .#define EMPTY_HOWTO(C) \
-.  HOWTO ((C), 0, 0, 0, false, 0, complain_overflow_dont, NULL, \
-.         NULL, false, 0, 0, false)
+.  HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
+.         NULL, FALSE, 0, 0, FALSE)
 .
 
 DESCRIPTION
@@ -672,16 +672,16 @@ bfd_perform_relocation (abfd, reloc_entry, data, input_section, output_bfd,
 	 of the location within the section.  Some targets arrange for
 	 the addend to be the negative of the position of the location
 	 within the section; for example, i386-aout does this.  For
-	 i386-aout, pcrel_offset is false.  Some other targets do not
+	 i386-aout, pcrel_offset is FALSE.  Some other targets do not
 	 include the position of the location; for example, m88kbcs,
-	 or ELF.  For those targets, pcrel_offset is true.
+	 or ELF.  For those targets, pcrel_offset is TRUE.
 
 	 If we are producing relocateable output, then we must ensure
 	 that this reloc will be correctly computed when the final
-	 relocation is done.  If pcrel_offset is false we want to wind
+	 relocation is done.  If pcrel_offset is FALSE we want to wind
 	 up with the negative of the location within the section,
 	 which means we must adjust the existing addend by the change
-	 in the location within the section.  If pcrel_offset is true
+	 in the location within the section.  If pcrel_offset is TRUE
 	 we do not want to adjust the existing addend at all.
 
 	 FIXME: This seems logical to me, but for the case of
@@ -1064,16 +1064,16 @@ bfd_install_relocation (abfd, reloc_entry, data_start, data_start_offset,
 	 of the location within the section.  Some targets arrange for
 	 the addend to be the negative of the position of the location
 	 within the section; for example, i386-aout does this.  For
-	 i386-aout, pcrel_offset is false.  Some other targets do not
+	 i386-aout, pcrel_offset is FALSE.  Some other targets do not
 	 include the position of the location; for example, m88kbcs,
-	 or ELF.  For those targets, pcrel_offset is true.
+	 or ELF.  For those targets, pcrel_offset is TRUE.
 
 	 If we are producing relocateable output, then we must ensure
 	 that this reloc will be correctly computed when the final
-	 relocation is done.  If pcrel_offset is false we want to wind
+	 relocation is done.  If pcrel_offset is FALSE we want to wind
 	 up with the negative of the location within the section,
 	 which means we must adjust the existing addend by the change
-	 in the location within the section.  If pcrel_offset is true
+	 in the location within the section.  If pcrel_offset is TRUE
 	 we do not want to adjust the existing addend at all.
 
 	 FIXME: This seems logical to me, but for the case of
@@ -1375,9 +1375,9 @@ _bfd_final_link_relocate (howto, input_bfd, input_section, contents, address,
      location we are relocating.  Some targets (e.g., i386-aout)
      arrange for the contents of the section to be the negative of the
      offset of the location within the section; for such targets
-     pcrel_offset is false.  Other targets (e.g., m88kbcs or ELF)
+     pcrel_offset is FALSE.  Other targets (e.g., m88kbcs or ELF)
      simply leave the contents of the section as zero; for such
-     targets pcrel_offset is true.  If pcrel_offset is false we do not
+     targets pcrel_offset is TRUE.  If pcrel_offset is FALSE we do not
      need to subtract out the offset of the location within the
      section (which is just ADDRESS).  */
   if (howto->pc_relative)
@@ -1960,7 +1960,7 @@ ENUM
   BFD_RELOC_ALPHA_BRSGP
 ENUMDOC
   Like BFD_RELOC_23_PCREL_S2, except that the source and target must
-  share a common GP, and the target address is adjusted for 
+  share a common GP, and the target address is adjusted for
   STO_ALPHA_STD_GPLOAD.
 
 ENUM
@@ -3644,7 +3644,7 @@ bfd_reloc_type_lookup (abfd, code)
 }
 
 static reloc_howto_type bfd_howto_32 =
-HOWTO (0, 00, 2, 32, false, 0, complain_overflow_bitfield, 0, "VRT32", false, 0xffffffff, 0xffffffff, true);
+HOWTO (0, 00, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "VRT32", FALSE, 0xffffffff, 0xffffffff, TRUE);
 
 /*
 INTERNAL_FUNCTION
@@ -3712,26 +3712,26 @@ INTERNAL_FUNCTION
 	bfd_generic_relax_section
 
 SYNOPSIS
-	boolean bfd_generic_relax_section
+	bfd_boolean bfd_generic_relax_section
 	 (bfd *abfd,
 	  asection *section,
 	  struct bfd_link_info *,
-	  boolean *);
+	  bfd_boolean *);
 
 DESCRIPTION
 	Provides default handling for relaxing for back ends which
 	don't do relaxing -- i.e., does nothing.
 */
 
-boolean
+bfd_boolean
 bfd_generic_relax_section (abfd, section, link_info, again)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
-     boolean *again;
+     bfd_boolean *again;
 {
-  *again = false;
-  return true;
+  *again = FALSE;
+  return TRUE;
 }
 
 /*
@@ -3739,7 +3739,7 @@ INTERNAL_FUNCTION
 	bfd_generic_gc_sections
 
 SYNOPSIS
-	boolean bfd_generic_gc_sections
+	bfd_boolean bfd_generic_gc_sections
 	 (bfd *, struct bfd_link_info *);
 
 DESCRIPTION
@@ -3747,12 +3747,12 @@ DESCRIPTION
 	don't do section gc -- i.e., does nothing.
 */
 
-boolean
+bfd_boolean
 bfd_generic_gc_sections (abfd, link_info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /*
@@ -3760,7 +3760,7 @@ INTERNAL_FUNCTION
 	bfd_generic_merge_sections
 
 SYNOPSIS
-	boolean bfd_generic_merge_sections
+	bfd_boolean bfd_generic_merge_sections
 	 (bfd *, struct bfd_link_info *);
 
 DESCRIPTION
@@ -3768,12 +3768,12 @@ DESCRIPTION
 	which don't have SEC_MERGE support -- i.e., does nothing.
 */
 
-boolean
+bfd_boolean
 bfd_generic_merge_sections (abfd, link_info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /*
@@ -3786,7 +3786,7 @@ SYNOPSIS
 	     struct bfd_link_info *link_info,
 	     struct bfd_link_order *link_order,
 	     bfd_byte *data,
-	     boolean relocateable,
+	     bfd_boolean relocateable,
 	     asymbol **symbols);
 
 DESCRIPTION
@@ -3802,7 +3802,7 @@ bfd_generic_get_relocated_section_contents (abfd, link_info, link_order, data,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   /* Get enough memory to hold the stuff.  */
@@ -3830,7 +3830,7 @@ bfd_generic_get_relocated_section_contents (abfd, link_info, link_order, data,
 
   /* We're not relaxing the section, so just copy the size info.  */
   input_section->_cooked_size = input_section->_raw_size;
-  input_section->reloc_done = (unsigned int) true;
+  input_section->reloc_done = TRUE;
 
   reloc_count = bfd_canonicalize_reloc (input_bfd,
 					input_section,
@@ -3871,7 +3871,7 @@ bfd_generic_get_relocated_section_contents (abfd, link_info, link_order, data,
 		  if (!((*link_info->callbacks->undefined_symbol)
 			(link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
 			 input_bfd, input_section, (*parent)->address,
-			 true)))
+			 TRUE)))
 		    goto error_return;
 		  break;
 		case bfd_reloc_dangerous:
diff --git a/bfd/reloc16.c b/bfd/reloc16.c
index 44d4f4f4657..39f36e7b11f 100644
--- a/bfd/reloc16.c
+++ b/bfd/reloc16.c
@@ -1,6 +1,6 @@
 /* 8 and 16 bit COFF relocation functions, for BFD.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
+   2002 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    BFD generic relocs.  They should store the relocs in some location
    where coff_link_input_bfd can find them (and coff_link_input_bfd
    should be changed to use this location rather than rereading the
-   file) (unless info->keep_memory is false, in which case they should
+   file) (unless info->keep_memory is FALSE, in which case they should
    free up the relocs after dealing with them).  */
 
 #include "bfd.h"
@@ -64,7 +64,7 @@ bfd_coff_reloc16_get_value (reloc, link_info, input_section)
 	 the generic symbols.  */
       h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info,
 					bfd_asymbol_name (symbol),
-					false, false, true);
+					FALSE, FALSE, TRUE);
       if (h != (struct bfd_link_hash_entry *) NULL
 	  && (h->type == bfd_link_hash_defined
 	      || h->type == bfd_link_hash_defweak))
@@ -79,7 +79,7 @@ bfd_coff_reloc16_get_value (reloc, link_info, input_section)
 	  if (!((*link_info->callbacks->undefined_symbol)
 		(link_info, bfd_asymbol_name (symbol),
 		 input_section->owner, input_section, reloc->address,
-		 true)))
+		 TRUE)))
 	    abort ();
 	  value = 0;
 	}
@@ -136,12 +136,12 @@ bfd_perform_slip (abfd, slip, input_section, value)
     }
 }
 
-boolean
+bfd_boolean
 bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
      bfd *abfd;
      asection *input_section;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   /* Get enough memory to hold the stuff.  */
   bfd *input_bfd = input_section->owner;
@@ -153,14 +153,14 @@ bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
 
   /* We only do global relaxation once.  It is not safe to do it multiple
      times (see discussion of the "shrinks" array below).  */
-  *again = false;
+  *again = FALSE;
 
   if (reloc_size < 0)
-    return false;
+    return FALSE;
 
   reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
   if (!reloc_vector && reloc_size > 0)
-    return false;
+    return FALSE;
 
   /* Get the relocs and think about them.  */
   reloc_count =
@@ -169,7 +169,7 @@ bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
   if (reloc_count < 0)
     {
       free (reloc_vector);
-      return false;
+      return FALSE;
     }
 
   /* The reloc16.c and related relaxing code is very simple, the price
@@ -193,7 +193,7 @@ bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
       bfd_size_type amt;
 
       /* Allocate and initialize the shrinks array for this section.
-         The last element is used as an accumlator of shrinks.  */
+	 The last element is used as an accumlator of shrinks.  */
       amt = reloc_count + 1;
       amt *= sizeof (unsigned);
       shrinks = (unsigned *) bfd_zmalloc (amt);
@@ -232,7 +232,7 @@ bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
 
   input_section->_cooked_size -= shrink;
   free ((char *) reloc_vector);
-  return true;
+  return TRUE;
 }
 
 bfd_byte *
@@ -246,7 +246,7 @@ bfd_coff_reloc16_get_relocated_section_contents (in_abfd,
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
   /* Get enough memory to hold the stuff.  */
diff --git a/bfd/riscix.c b/bfd/riscix.c
index 6ec78246a7f..519514e4cf6 100644
--- a/bfd/riscix.c
+++ b/bfd/riscix.c
@@ -1,5 +1,5 @@
 /* BFD back-end for RISC iX (Acorn, arm) binaries.
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001
+   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
 
@@ -116,27 +116,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
     if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0			    \
 	|| bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,   \
 		      abfd) != EXEC_BYTES_SIZE)				    \
-      return false;							    \
+      return FALSE;							    \
     /* Now write out reloc info, followed by syms and strings */	    \
 									    \
     if (bfd_get_outsymbols (abfd) != (asymbol **) NULL			    \
 	&& bfd_get_symcount (abfd) != 0)				    \
       {									    \
 	if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)  \
-	  return false;							    \
+	  return FALSE;							    \
 									    \
-	if (! NAME(aout,write_syms) (abfd)) return false;		    \
+	if (! NAME(aout,write_syms) (abfd)) return FALSE;		    \
 									    \
 	if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) != 0) \
-	  return false;							    \
+	  return FALSE;							    \
 									    \
 	if (! riscix_squirt_out_relocs (abfd, obj_textsec (abfd)))	    \
-	  return false;							    \
+	  return FALSE;							    \
 	if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) != 0) \
-	  return false;							    \
+	  return FALSE;							    \
 									    \
 	if (!NAME(aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))	    \
-	  return false;							    \
+	  return FALSE;							    \
       }									    \
   }
 
@@ -159,7 +159,7 @@ riscix_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
 void
 riscix_swap_std_reloc_out PARAMS ((bfd *, arelent *, struct reloc_std_external *));
 
-boolean
+bfd_boolean
 riscix_squirt_out_relocs PARAMS ((bfd *, asection *));
 
 long
@@ -171,17 +171,17 @@ riscix_some_aout_object_p PARAMS ((bfd *, struct internal_exec *, const bfd_targ
 
 static reloc_howto_type riscix_std_reloc_howto[] = {
   /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone */
-  HOWTO( 0,              0,  0,   8,  false, 0, complain_overflow_bitfield,0,"8",        true, 0x000000ff,0x000000ff, false),
-  HOWTO( 1,              0,  1,   16, false, 0, complain_overflow_bitfield,0,"16",        true, 0x0000ffff,0x0000ffff, false),
-  HOWTO( 2,              0,  2,   32, false, 0, complain_overflow_bitfield,0,"32",        true, 0xffffffff,0xffffffff, false),
-  HOWTO( 3,              2,  3,   26, true, 0, complain_overflow_signed,  riscix_fix_pcrel_26 , "ARM26",      true, 0x00ffffff,0x00ffffff, false),
-  HOWTO( 4,              0,  0,   8,  true,  0, complain_overflow_signed,  0,"DISP8",     true, 0x000000ff,0x000000ff, true),
-  HOWTO( 5,              0,  1,   16, true,  0, complain_overflow_signed,  0,"DISP16",    true, 0x0000ffff,0x0000ffff, true),
-  HOWTO( 6,              0,  2,   32, true,  0, complain_overflow_signed,  0,"DISP32",    true, 0xffffffff,0xffffffff, true),
-  HOWTO( 7,              2,  3,   26, false, 0, complain_overflow_signed,  riscix_fix_pcrel_26_done, "ARM26D",true,0x00ffffff,0x00ffffff, false),
+  HOWTO( 0,              0,  0,   8,  FALSE, 0, complain_overflow_bitfield,0,"8",        TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO( 1,              0,  1,   16, FALSE, 0, complain_overflow_bitfield,0,"16",        TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO( 2,              0,  2,   32, FALSE, 0, complain_overflow_bitfield,0,"32",        TRUE, 0xffffffff,0xffffffff, FALSE),
+  HOWTO( 3,              2,  3,   26, TRUE, 0, complain_overflow_signed,  riscix_fix_pcrel_26 , "ARM26",      TRUE, 0x00ffffff,0x00ffffff, FALSE),
+  HOWTO( 4,              0,  0,   8,  TRUE,  0, complain_overflow_signed,  0,"DISP8",     TRUE, 0x000000ff,0x000000ff, TRUE),
+  HOWTO( 5,              0,  1,   16, TRUE,  0, complain_overflow_signed,  0,"DISP16",    TRUE, 0x0000ffff,0x0000ffff, TRUE),
+  HOWTO( 6,              0,  2,   32, TRUE,  0, complain_overflow_signed,  0,"DISP32",    TRUE, 0xffffffff,0xffffffff, TRUE),
+  HOWTO( 7,              2,  3,   26, FALSE, 0, complain_overflow_signed,  riscix_fix_pcrel_26_done, "ARM26D",TRUE,0x00ffffff,0x00ffffff, FALSE),
   EMPTY_HOWTO (-1),
-  HOWTO( 9,              0, -1,   16, false, 0, complain_overflow_bitfield,0,"NEG16",        true, 0x0000ffff,0x0000ffff, false),
-  HOWTO( 10,              0, -2,   32, false, 0, complain_overflow_bitfield,0,"NEG32",        true, 0xffffffff,0xffffffff, false)
+  HOWTO( 9,              0, -1,   16, FALSE, 0, complain_overflow_bitfield,0,"NEG16",        TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO( 10,              0, -2,   32, FALSE, 0, complain_overflow_bitfield,0,"NEG32",        TRUE, 0xffffffff,0xffffffff, FALSE)
 };
 
 #define RISCIX_TABLE_SIZE \
@@ -396,7 +396,7 @@ riscix_swap_std_reloc_out (abfd, g, natptr)
     }
 }
 
-boolean
+bfd_boolean
 riscix_squirt_out_relocs (abfd, section)
      bfd *abfd;
      asection *section;
@@ -408,14 +408,15 @@ riscix_squirt_out_relocs (abfd, section)
   unsigned int count = section->reloc_count;
   bfd_size_type natsize;
 
-  if (count == 0) return true;
+  if (count == 0)
+    return TRUE;
 
   each_size = obj_reloc_entry_size (abfd);
   natsize = each_size;
   natsize *= count;
   native = (unsigned char *) bfd_zalloc (abfd, natsize);
   if (!native)
-    return false;
+    return FALSE;
 
   generic = section->orelocation;
 
@@ -428,11 +429,11 @@ riscix_squirt_out_relocs (abfd, section)
   if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
     {
       bfd_release (abfd, native);
-      return false;
+      return FALSE;
     }
 
   bfd_release (abfd, native);
-  return true;
+  return TRUE;
 }
 
 /*
diff --git a/bfd/rs6000-core.c b/bfd/rs6000-core.c
index a61f25caa22..3fa0975dc31 100644
--- a/bfd/rs6000-core.c
+++ b/bfd/rs6000-core.c
@@ -253,19 +253,19 @@ typedef union {
 /* Try to read into CORE the header from the core file associated with ABFD.
    Return success.  */
 
-static boolean
+static bfd_boolean
 read_hdr (bfd *abfd, CoreHdr *core)
 {
   bfd_size_type size;
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   /* Read the leading portion that old and new core dump structures have in
      common.  */
   size = CORE_COMMONSZ;
   if (bfd_bread (core, size, abfd) != size)
-    return false;
+    return FALSE;
 
   /* Read the trailing portion of the structure.  */
   if (CORE_NEW (*core))
@@ -630,9 +630,9 @@ rs6000coff_core_p (abfd)
   return NULL;
 }
 
-/* Return `true' if given core is from the given executable.  */
+/* Return `TRUE' if given core is from the given executable.  */
 
-boolean
+bfd_boolean
 rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
      bfd *core_bfd;
      bfd *exec_bfd;
@@ -642,11 +642,11 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
   char *path, *s;
   size_t alloc;
   const char *str1, *str2;
-  boolean ret;
+  bfd_boolean ret;
   file_ptr c_loader;
 
   if (!read_hdr (core_bfd, &core))
-    return false;
+    return FALSE;
 
   if (CORE_NEW (core))
     c_loader = CNEW_LOADER (core.new);
@@ -659,12 +659,12 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
     size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
 
   if (bfd_seek (core_bfd, c_loader + size, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   alloc = 100;
   path = bfd_malloc ((bfd_size_type) alloc);
   if (path == NULL)
-    return false;
+    return FALSE;
   s = path;
 
   while (1)
@@ -672,7 +672,7 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
       if (bfd_bread (s, (bfd_size_type) 1, core_bfd) != 1)
 	{
 	  free (path);
-	  return false;
+	  return FALSE;
 	}
       if (*s == '\0')
 	break;
@@ -686,7 +686,7 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
 	  if (n == NULL)
 	    {
 	      free (path);
-	      return false;
+	      return FALSE;
 	    }
 	  s = n + (path - s);
 	  path = n;
@@ -701,9 +701,9 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
   str2 = str2 != NULL ? str2 + 1 : exec_bfd->filename;
 
   if (strcmp (str1, str2) == 0)
-    ret = true;
+    ret = TRUE;
   else
-    ret = false;
+    ret = FALSE;
 
   free (path);
 
diff --git a/bfd/sco5-core.c b/bfd/sco5-core.c
index 9f5b7934ac2..4928622fe19 100644
--- a/bfd/sco5-core.c
+++ b/bfd/sco5-core.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
+#include "libaout.h"		/* BFD a.out internal data structures */
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/dir.h>
 #include <signal.h>
 
-#include <sys/user.h>           /* After a.out.h  */
+#include <sys/user.h>		/* After a.out.h  */
 #include <sys/paccess.h>
 #include <sys/region.h>
 
@@ -40,15 +40,14 @@ struct sco5_core_struct
 
 /* forward declarations */
 
-static asection *
-make_bfd_asection PARAMS ((bfd *, const char *, flagword, bfd_size_type,
-                           bfd_vma, file_ptr));
+static asection *make_bfd_asection
+  PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
 static struct user *read_uarea PARAMS ((bfd *, int));
 const bfd_target *sco5_core_file_p PARAMS ((bfd *abfd));
 char *sco5_core_file_failing_command PARAMS ((bfd *abfd));
 int sco5_core_file_failing_signal PARAMS ((bfd *abfd));
-boolean sco5_core_file_matches_executable_p PARAMS ((bfd *core_bfd,
-						     bfd *exec_bfd));
+bfd_boolean sco5_core_file_matches_executable_p
+  PARAMS ((bfd *core_bfd, bfd *exec_bfd));
 static void swap_abort PARAMS ((void));
 
 static asection *
@@ -133,8 +132,8 @@ sco5_core_file_p (abfd)
       return NULL;
     if (fstat (fileno (stream), &statbuf) < 0)
       {
-        bfd_set_error (bfd_error_system_call);
-        return NULL;
+	bfd_set_error (bfd_error_system_call);
+	return NULL;
       }
     coresize = statbuf.st_size;
   }
@@ -168,24 +167,24 @@ sco5_core_file_p (abfd)
 	goto fail;
 
       if (!make_bfd_asection (abfd, ".reg", SEC_HAS_CONTENTS,
-                              (bfd_size_type) coffsets.u_usize,
-                              0 - (bfd_vma) u->u_ar0,
-                              (file_ptr) coffsets.u_user))
+			      (bfd_size_type) coffsets.u_usize,
+			      0 - (bfd_vma) u->u_ar0,
+			      (file_ptr) coffsets.u_user))
 	goto fail;
 
       if (!make_bfd_asection (abfd, ".data",
 			      SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
-                              ((bfd_size_type) u->u_exdata.ux_dsize
+			      ((bfd_size_type) u->u_exdata.ux_dsize
 			       + u->u_exdata.ux_bsize),
-                              (bfd_vma) u->u_exdata.ux_datorg,
-                              (file_ptr) coffsets.u_data))
+			      (bfd_vma) u->u_exdata.ux_datorg,
+			      (file_ptr) coffsets.u_data))
 	goto fail;
 
       if (!make_bfd_asection (abfd, ".stack",
 			      SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
-                              (bfd_size_type) u->u_ssize * NBPC,
-                              (bfd_vma) u->u_sub,
-                              (file_ptr) coffsets.u_stack))
+			      (bfd_size_type) u->u_ssize * NBPC,
+			      (bfd_vma) u->u_sub,
+			      (file_ptr) coffsets.u_stack))
 	goto fail;
 
       return abfd->xvec;		/* Done for version 1 */
@@ -222,10 +221,10 @@ sco5_core_file_p (abfd)
       if ((bfd_seek (abfd, (file_ptr) chead.cs_hseek, SEEK_SET) != 0)
 	  || (bfd_bread ((void *) &chead, (bfd_size_type) sizeof chead, abfd)
 	      != sizeof chead))
-        {
-          bfd_set_error (bfd_error_wrong_format);
+	{
+	  bfd_set_error (bfd_error_wrong_format);
 	  goto fail;
-        }
+	}
 
       switch (chead.cs_stype)
 	{
@@ -243,7 +242,7 @@ sco5_core_file_p (abfd)
 	  if (! u)
 	    goto fail;
 
-          /* This is tricky.  As the "register section", we give them
+	  /* This is tricky.  As the "register section", we give them
 	     the entire upage and stack.  u.u_ar0 points to where
 	     "register 0" is stored.  There are two tricks with this,
 	     though.  One is that the rest of the registers might be
@@ -263,33 +262,33 @@ sco5_core_file_p (abfd)
 
 	  chead.cs_vaddr = 0 - (bfd_vma) u->u_ar0;
 
-          secname = ".reg";
-          flags = SEC_HAS_CONTENTS;
+	  secname = ".reg";
+	  flags = SEC_HAS_CONTENTS;
 
-          break;
+	  break;
 	case CORES_PREGION:			/* A program region, map it */
 	  switch (chead.cs_x.csx_preg.csxp_rtyp)
 	    {
 	    case PT_DATA:
-	      secname = ".data";  	/* Data region.          */
+	      secname = ".data";	/* Data region.		 */
 	      break;
 	    case PT_STACK:
-	      secname = ".stack"; 	/* Stack region.         */
+	      secname = ".stack";	/* Stack region.	 */
 	      break;
 	    case PT_SHMEM:
-	      secname = ".shmem"; 	/* Shared memory         */
+	      secname = ".shmem";	/* Shared memory	 */
 	      break;
 	    case PT_LIBDAT:
-	      secname = ".libdat";	/* Shared library data   */
+	      secname = ".libdat";	/* Shared library data	 */
 	      break;
 	    case PT_V86:
-	      secname = ".virt86";	/* Virtual 8086 mode     */
+	      secname = ".virt86";	/* Virtual 8086 mode	 */
 	      break;
 	    case PT_SHFIL:
-	      secname = ".mmfile";	/* Memory mapped file    */
+	      secname = ".mmfile";	/* Memory mapped file	 */
 	      break;
 	    case PT_XDATA0:
-	      secname = ".Xdat0"; 	/* XENIX data region, virtual 0 */
+	      secname = ".Xdat0";	/* XENIX data region, virtual 0 */
 	      break;
 	    default:
 	      secname = "";
@@ -301,11 +300,11 @@ sco5_core_file_p (abfd)
 	case CORES_SCOUTSNAME:			/* struct scoutsname */
 	  secname = NULL;	/* Ignore these */
 	  break;
-        default:
-          (*_bfd_error_handler) ("Unhandled SCO core file section type %d\n",
-                                 chead.cs_stype);
-          continue;
-        }
+	default:
+	  (*_bfd_error_handler) ("Unhandled SCO core file section type %d\n",
+				 chead.cs_stype);
+	  continue;
+	}
 
       if (secname
 	  && !make_bfd_asection (abfd, secname, flags,
@@ -350,12 +349,12 @@ sco5_core_file_failing_signal (ignore_abfd)
 }
 
 /* ARGSUSED */
-boolean
+bfd_boolean
 sco5_core_file_matches_executable_p  (core_bfd, exec_bfd)
      bfd *core_bfd ATTRIBUTE_UNUSED;
      bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
-  return true;          /* FIXME, We have no way of telling at this point */
+  return TRUE;		/* FIXME, We have no way of telling at this point */
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
@@ -373,33 +372,33 @@ const bfd_target sco5_core_vec =
   {
     "sco5-core",
     bfd_target_unknown_flavour,
-    BFD_ENDIAN_LITTLE,         /* target byte order */
-    BFD_ENDIAN_LITTLE,         /* target headers byte order */
-    (HAS_RELOC | EXEC_P |       /* object flags */
+    BFD_ENDIAN_LITTLE,	       /* target byte order */
+    BFD_ENDIAN_LITTLE,	       /* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
      HAS_LINENO | HAS_DEBUG |
      HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
     (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,                                                     /* symbol prefix */
-    ' ',                                                   /* ar_pad_char */
-    16,                                                    /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 16 bit hdrs */
-
-    {                           /* bfd_check_format */
-     _bfd_dummy_target,         /* unknown format */
-     _bfd_dummy_target,         /* object file */
-     _bfd_dummy_target,         /* archive */
-     sco5_core_file_p      	/* a core file */
+    0,							   /* symbol prefix */
+    ' ',						   /* ar_pad_char */
+    16,							   /* ar_max_namelen */
+    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
+    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
+    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
+    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
+    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
+    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
+
+    {				/* bfd_check_format */
+     _bfd_dummy_target,		/* unknown format */
+     _bfd_dummy_target,		/* object file */
+     _bfd_dummy_target,		/* archive */
+     sco5_core_file_p		/* a core file */
     },
-    {                           /* bfd_set_format */
+    {				/* bfd_set_format */
      bfd_false, bfd_false,
      bfd_false, bfd_false
     },
-    {                           /* bfd_write_contents */
+    {				/* bfd_write_contents */
      bfd_false, bfd_false,
      bfd_false, bfd_false
     },
@@ -416,5 +415,5 @@ const bfd_target sco5_core_vec =
 
     NULL,
 
-    (PTR) 0                     /* backend_data */
+    (PTR) 0			/* backend_data */
 };
diff --git a/bfd/section.c b/bfd/section.c
index b5871e9bbfa..35a0e5a6a05 100644
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -761,7 +761,7 @@ bfd_get_section_by_name (abfd, name)
 {
   struct section_hash_entry *sh;
 
-  sh = section_hash_lookup (&abfd->section_htab, name, false, false);
+  sh = section_hash_lookup (&abfd->section_htab, name, FALSE, FALSE);
   if (sh != NULL)
     return &sh->section;
 
@@ -811,7 +811,7 @@ bfd_get_unique_section_name (abfd, templat, count)
 	abort ();
       sprintf (sname + len, ".%d", num++);
     }
-  while (section_hash_lookup (&abfd->section_htab, sname, false, false));
+  while (section_hash_lookup (&abfd->section_htab, sname, FALSE, FALSE));
 
   if (count != NULL)
     *count = num;
@@ -869,7 +869,7 @@ bfd_make_section_old_way (abfd, name)
   if (strcmp (name, BFD_IND_SECTION_NAME) == 0)
     return bfd_ind_section_ptr;
 
-  sh = section_hash_lookup (&abfd->section_htab, name, true, false);
+  sh = section_hash_lookup (&abfd->section_htab, name, TRUE, FALSE);
   if (sh == NULL)
     return NULL;
 
@@ -915,7 +915,7 @@ bfd_make_section_anyway (abfd, name)
       return NULL;
     }
 
-  sh = section_hash_lookup (&abfd->section_htab, name, true, false);
+  sh = section_hash_lookup (&abfd->section_htab, name, TRUE, FALSE);
   if (sh == NULL)
     return NULL;
 
@@ -969,7 +969,7 @@ bfd_make_section (abfd, name)
       || strcmp (name, BFD_IND_SECTION_NAME) == 0)
     return NULL;
 
-  sh = section_hash_lookup (&abfd->section_htab, name, true, false);
+  sh = section_hash_lookup (&abfd->section_htab, name, TRUE, FALSE);
   if (sh == NULL)
     return NULL;
 
@@ -989,12 +989,12 @@ FUNCTION
 	bfd_set_section_flags
 
 SYNOPSIS
-	boolean bfd_set_section_flags(bfd *abfd, asection *sec, flagword flags);
+	bfd_boolean bfd_set_section_flags (bfd *abfd, asection *sec, flagword flags);
 
 DESCRIPTION
 	Set the attributes of the section @var{sec} in the BFD
-	@var{abfd} to the value @var{flags}. Return <<true>> on success,
-	<<false>> on error. Possible error returns are:
+	@var{abfd} to the value @var{flags}. Return <<TRUE>> on success,
+	<<FALSE>> on error. Possible error returns are:
 
 	o <<bfd_error_invalid_operation>> -
 	The section cannot have one or more of the attributes
@@ -1004,7 +1004,7 @@ DESCRIPTION
 */
 
 /*ARGSUSED*/
-boolean
+bfd_boolean
 bfd_set_section_flags (abfd, section, flags)
      bfd *abfd ATTRIBUTE_UNUSED;
      sec_ptr section;
@@ -1019,12 +1019,12 @@ bfd_set_section_flags (abfd, section, flags)
   if ((flags & bfd_applicable_section_flags (abfd)) != flags)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 #endif
 
   section->flags = flags;
-  return true;
+  return TRUE;
 }
 
 /*
@@ -1076,11 +1076,11 @@ FUNCTION
 	bfd_set_section_size
 
 SYNOPSIS
-	boolean bfd_set_section_size(bfd *abfd, asection *sec, bfd_size_type val);
+	bfd_boolean bfd_set_section_size (bfd *abfd, asection *sec, bfd_size_type val);
 
 DESCRIPTION
 	Set @var{sec} to the size @var{val}. If the operation is
-	ok, then <<true>> is returned, else <<false>>.
+	ok, then <<TRUE>> is returned, else <<FALSE>>.
 
 	Possible error returns:
 	o <<bfd_error_invalid_operation>> -
@@ -1088,7 +1088,7 @@ DESCRIPTION
 
 */
 
-boolean
+bfd_boolean
 bfd_set_section_size (abfd, ptr, val)
      bfd *abfd;
      sec_ptr ptr;
@@ -1100,13 +1100,13 @@ bfd_set_section_size (abfd, ptr, val)
   if (abfd->output_has_begun)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   ptr->_cooked_size = val;
   ptr->_raw_size = val;
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -1114,9 +1114,9 @@ FUNCTION
 	bfd_set_section_contents
 
 SYNOPSIS
-	boolean bfd_set_section_contents (bfd *abfd, asection *section,
-					  PTR data, file_ptr offset,
-					  bfd_size_type count);
+	bfd_boolean bfd_set_section_contents (bfd *abfd, asection *section,
+					      PTR data, file_ptr offset,
+					      bfd_size_type count);
 
 DESCRIPTION
 	Sets the contents of the section @var{section} in BFD
@@ -1124,7 +1124,7 @@ DESCRIPTION
 	data is written to the output section starting at offset
 	@var{offset} for @var{count} octets.
 
-	Normally <<true>> is returned, else <<false>>. Possible error
+	Normally <<TRUE>> is returned, else <<FALSE>>. Possible error
 	returns are:
 	o <<bfd_error_no_contents>> -
 	The output section does not have the <<SEC_HAS_CONTENTS>>
@@ -1141,7 +1141,7 @@ DESCRIPTION
  ? bfd_get_section_size_after_reloc (sec) \
  : bfd_get_section_size_before_reloc (sec))
 
-boolean
+bfd_boolean
 bfd_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -1154,7 +1154,7 @@ bfd_set_section_contents (abfd, section, location, offset, count)
   if (!(bfd_get_section_flags (abfd, section) & SEC_HAS_CONTENTS))
     {
       bfd_set_error (bfd_error_no_contents);
-      return (false);
+      return FALSE;
     }
 
   sz = bfd_get_section_size_now (abfd, section);
@@ -1164,7 +1164,7 @@ bfd_set_section_contents (abfd, section, location, offset, count)
       || count != (size_t) count)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   switch (abfd->direction)
@@ -1172,7 +1172,7 @@ bfd_set_section_contents (abfd, section, location, offset, count)
     case read_direction:
     case no_direction:
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
 
     case write_direction:
       break;
@@ -1181,7 +1181,7 @@ bfd_set_section_contents (abfd, section, location, offset, count)
       /* File is opened for update. `output_has_begun' some time ago when
 	   the file was created.  Do not recompute sections sizes or alignments
 	   in _bfd_set_section_content.  */
-      abfd->output_has_begun = true;
+      abfd->output_has_begun = TRUE;
       break;
     }
 
@@ -1193,11 +1193,11 @@ bfd_set_section_contents (abfd, section, location, offset, count)
   if (BFD_SEND (abfd, _bfd_set_section_contents,
 		(abfd, section, location, offset, count)))
     {
-      abfd->output_has_begun = true;
-      return true;
+      abfd->output_has_begun = TRUE;
+      return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
 
 /*
@@ -1205,9 +1205,9 @@ FUNCTION
 	bfd_get_section_contents
 
 SYNOPSIS
-	boolean bfd_get_section_contents (bfd *abfd, asection *section,
-					  PTR location, file_ptr offset,
-					  bfd_size_type count);
+	bfd_boolean bfd_get_section_contents (bfd *abfd, asection *section,
+					      PTR location, file_ptr offset,
+					      bfd_size_type count);
 
 DESCRIPTION
 	Read data from @var{section} in BFD @var{abfd}
@@ -1218,11 +1218,11 @@ DESCRIPTION
 	If the contents of a constructor with the <<SEC_CONSTRUCTOR>>
 	flag set are requested or if the section does not have the
 	<<SEC_HAS_CONTENTS>> flag set, then the @var{location} is filled
-	with zeroes. If no errors occur, <<true>> is returned, else
-	<<false>>.
+	with zeroes. If no errors occur, <<TRUE>> is returned, else
+	<<FALSE>>.
 
 */
-boolean
+bfd_boolean
 bfd_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -1235,10 +1235,10 @@ bfd_get_section_contents (abfd, section, location, offset, count)
   if (section->flags & SEC_CONSTRUCTOR)
     {
       memset (location, 0, (size_t) count);
-      return true;
+      return TRUE;
     }
 
-  /* Even if reloc_done is true, this function reads unrelocated
+  /* Even if reloc_done is TRUE, this function reads unrelocated
      contents, so we want the raw size.  */
   sz = section->_raw_size;
   if ((bfd_size_type) offset > sz
@@ -1247,23 +1247,23 @@ bfd_get_section_contents (abfd, section, location, offset, count)
       || count != (size_t) count)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   if (count == 0)
     /* Don't bother.  */
-    return true;
+    return TRUE;
 
   if ((section->flags & SEC_HAS_CONTENTS) == 0)
     {
       memset (location, 0, (size_t) count);
-      return true;
+      return TRUE;
     }
 
   if ((section->flags & SEC_IN_MEMORY) != 0)
     {
       memcpy (location, section->contents + offset, (size_t) count);
-      return true;
+      return TRUE;
     }
 
   return BFD_SEND (abfd, _bfd_get_section_contents,
@@ -1275,13 +1275,13 @@ FUNCTION
 	bfd_copy_private_section_data
 
 SYNOPSIS
-	boolean bfd_copy_private_section_data (bfd *ibfd, asection *isec,
-					       bfd *obfd, asection *osec);
+	bfd_boolean bfd_copy_private_section_data (bfd *ibfd, asection *isec,
+						   bfd *obfd, asection *osec);
 
 DESCRIPTION
 	Copy private section information from @var{isec} in the BFD
 	@var{ibfd} to the section @var{osec} in the BFD @var{obfd}.
-	Return <<true>> on success, <<false>> on error.  Possible error
+	Return <<TRUE>> on success, <<FALSE>> on error.  Possible error
 	returns are:
 
 	o <<bfd_error_no_memory>> -
@@ -1343,16 +1343,16 @@ FUNCTION
 	bfd_generic_discard_group
 
 SYNOPSIS
-	boolean bfd_generic_discard_group (bfd *abfd, asection *group);
+	bfd_boolean bfd_generic_discard_group (bfd *abfd, asection *group);
 
 DESCRIPTION
 	Remove all members of @var{group} from the output.
 */
 
-boolean
+bfd_boolean
 bfd_generic_discard_group (abfd, group)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *group ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
diff --git a/bfd/simple.c b/bfd/simple.c
index f0f5ee64123..88f13370551 100644
--- a/bfd/simple.c
+++ b/bfd/simple.c
@@ -24,28 +24,28 @@
 #include "libbfd.h"
 #include "bfdlink.h"
 
-static boolean simple_dummy_warning
+static bfd_boolean simple_dummy_warning
   PARAMS ((struct bfd_link_info *, const char *, const char *, bfd *,
 	   asection *, bfd_vma));
 
-static boolean simple_dummy_undefined_symbol
+static bfd_boolean simple_dummy_undefined_symbol
   PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *,
-	   bfd_vma, boolean));
+	   bfd_vma, bfd_boolean));
 
-static boolean simple_dummy_reloc_overflow 
+static bfd_boolean simple_dummy_reloc_overflow
   PARAMS ((struct bfd_link_info *, const char *, const char *, bfd_vma,
 	   bfd *, asection *, bfd_vma));
 
-static boolean simple_dummy_reloc_dangerous
+static bfd_boolean simple_dummy_reloc_dangerous
   PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
 
-static boolean simple_dummy_unattached_reloc
+static bfd_boolean simple_dummy_unattached_reloc
   PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
 
 bfd_byte * bfd_simple_get_relocated_section_contents
   PARAMS ((bfd *, asection *, bfd_byte *));
 
-static boolean
+static bfd_boolean
 simple_dummy_warning (link_info, warning, symbol, abfd, section, address)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      const char *warning ATTRIBUTE_UNUSED;
@@ -54,22 +54,22 @@ simple_dummy_warning (link_info, warning, symbol, abfd, section, address)
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 simple_dummy_undefined_symbol (link_info, name, abfd, section, address, fatal)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
-     boolean fatal ATTRIBUTE_UNUSED;
+     bfd_boolean fatal ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 simple_dummy_reloc_overflow (link_info, name, reloc_name, addend, abfd,
 			     section, address)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
@@ -80,10 +80,10 @@ simple_dummy_reloc_overflow (link_info, name, reloc_name, addend, abfd,
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 simple_dummy_reloc_dangerous (link_info, message, abfd, section, address)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      const char *message ATTRIBUTE_UNUSED;
@@ -91,10 +91,10 @@ simple_dummy_reloc_dangerous (link_info, message, abfd, section, address)
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 simple_dummy_unattached_reloc (link_info, name, abfd, section, address)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
@@ -102,7 +102,7 @@ simple_dummy_unattached_reloc (link_info, name, abfd, section, address)
      asection *section ATTRIBUTE_UNUSED;
      bfd_vma address ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /*
diff --git a/bfd/som.c b/bfd/som.c
index edc691e34ea..0bf44d8e8df 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -150,122 +150,149 @@ struct som_misc_symbol_info {
 
 /* Forward declarations */
 
-static boolean som_mkobject PARAMS ((bfd *));
-static const bfd_target * som_object_setup PARAMS ((bfd *,
-						    struct header *,
-						    struct som_exec_auxhdr *,
-						    unsigned long));
-static boolean setup_sections PARAMS ((bfd *, struct header *, unsigned long));
-static const bfd_target * som_object_p PARAMS ((bfd *));
-static boolean som_write_object_contents PARAMS ((bfd *));
-static boolean som_slurp_string_table PARAMS ((bfd *));
-static unsigned int som_slurp_symbol_table PARAMS ((bfd *));
-static long som_get_symtab_upper_bound PARAMS ((bfd *));
-static long som_canonicalize_reloc PARAMS ((bfd *, sec_ptr,
-					    arelent **, asymbol **));
-static long som_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-static unsigned int som_set_reloc_info PARAMS ((unsigned char *, unsigned int,
-						arelent *, asection *,
-						asymbol **, boolean));
-static boolean som_slurp_reloc_table PARAMS ((bfd *, asection *,
-					      asymbol **, boolean));
-static long som_get_symtab PARAMS ((bfd *, asymbol **));
-static asymbol * som_make_empty_symbol PARAMS ((bfd *));
-static void som_print_symbol PARAMS ((bfd *, PTR,
-				      asymbol *, bfd_print_symbol_type));
-static boolean som_new_section_hook PARAMS ((bfd *, asection *));
-static boolean som_bfd_copy_private_symbol_data PARAMS ((bfd *, asymbol *,
-							  bfd *, asymbol *));
-static boolean som_bfd_copy_private_section_data PARAMS ((bfd *, asection *,
-							  bfd *, asection *));
-static boolean som_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
+static bfd_boolean som_mkobject
+  PARAMS ((bfd *));
+static const bfd_target * som_object_setup
+  PARAMS ((bfd *, struct header *, struct som_exec_auxhdr *, unsigned long));
+static bfd_boolean setup_sections
+  PARAMS ((bfd *, struct header *, unsigned long));
+static const bfd_target * som_object_p
+  PARAMS ((bfd *));
+static bfd_boolean som_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean som_slurp_string_table
+  PARAMS ((bfd *));
+static unsigned int som_slurp_symbol_table
+  PARAMS ((bfd *));
+static long som_get_symtab_upper_bound
+  PARAMS ((bfd *));
+static long som_canonicalize_reloc
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+static long som_get_reloc_upper_bound
+  PARAMS ((bfd *, sec_ptr));
+static unsigned int som_set_reloc_info
+  PARAMS ((unsigned char *, unsigned int, arelent *, asection *,
+	   asymbol **, bfd_boolean));
+static bfd_boolean som_slurp_reloc_table
+  PARAMS ((bfd *, asection *, asymbol **, bfd_boolean));
+static long som_get_symtab
+  PARAMS ((bfd *, asymbol **));
+static asymbol * som_make_empty_symbol
+  PARAMS ((bfd *));
+static void som_print_symbol
+  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
+static bfd_boolean som_new_section_hook
+  PARAMS ((bfd *, asection *));
+static bfd_boolean som_bfd_copy_private_symbol_data
+  PARAMS ((bfd *, asymbol *, bfd *, asymbol *));
+static bfd_boolean som_bfd_copy_private_section_data
+  PARAMS ((bfd *, asection *, bfd *, asection *));
+static bfd_boolean som_bfd_copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
 #define som_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
 #define som_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-static boolean som_bfd_is_local_label_name PARAMS ((bfd *, const char *));
-static boolean som_set_section_contents PARAMS ((bfd *, sec_ptr, PTR,
-						 file_ptr, bfd_size_type));
-static boolean som_get_section_contents PARAMS ((bfd *, sec_ptr, PTR,
-						 file_ptr, bfd_size_type));
-static boolean som_set_arch_mach PARAMS ((bfd *, enum bfd_architecture,
-					  unsigned long));
-static boolean som_find_nearest_line PARAMS ((bfd *, asection *,
-					      asymbol **, bfd_vma,
-					      const char **,
-					      const char **,
-					      unsigned int *));
-static void som_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static asection * bfd_section_from_som_symbol PARAMS ((bfd *,
-					struct symbol_dictionary_record *));
-static int log2 PARAMS ((unsigned int));
-static bfd_reloc_status_type hppa_som_reloc PARAMS ((bfd *, arelent *,
-						     asymbol *, PTR,
-						     asection *, bfd *,
-						     char **));
-static void som_initialize_reloc_queue PARAMS ((struct reloc_queue *));
-static void som_reloc_queue_insert PARAMS ((unsigned char *, unsigned int,
-					    struct reloc_queue *));
-static void som_reloc_queue_fix PARAMS ((struct reloc_queue *, unsigned int));
-static int som_reloc_queue_find PARAMS ((unsigned char *, unsigned int,
-					 struct reloc_queue *));
-static unsigned char * try_prev_fixup PARAMS ((bfd *, int *, unsigned char *,
-					       unsigned int,
-					       struct reloc_queue *));
-
-static unsigned char * som_reloc_skip PARAMS ((bfd *, unsigned int,
-					       unsigned char *, unsigned int *,
-					       struct reloc_queue *));
-static unsigned char * som_reloc_addend PARAMS ((bfd *, bfd_vma,
-						 unsigned char *,
-					         unsigned int *,
-						 struct reloc_queue *));
-static unsigned char * som_reloc_call PARAMS ((bfd *, unsigned char *,
-					       unsigned int *,
-					       arelent *, int,
-					       struct reloc_queue *));
-static unsigned long som_count_spaces PARAMS ((bfd *));
-static unsigned long som_count_subspaces PARAMS ((bfd *));
-static int compare_syms PARAMS ((const void *, const void *));
-static int compare_subspaces PARAMS ((const void *, const void *));
-static unsigned long som_compute_checksum PARAMS ((bfd *));
-static boolean som_prep_headers PARAMS ((bfd *));
-static int som_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean som_finish_writing PARAMS ((bfd *));
-static boolean som_build_and_write_symbol_table PARAMS ((bfd *));
-static void som_prep_for_fixups PARAMS ((bfd *, asymbol **, unsigned long));
-static boolean som_write_fixups PARAMS ((bfd *, unsigned long, unsigned int *));
-static boolean som_write_space_strings PARAMS ((bfd *, unsigned long,
-						unsigned int *));
-static boolean som_write_symbol_strings PARAMS ((bfd *, unsigned long,
-						 asymbol **, unsigned int,
-						 unsigned *,
-						 COMPUNIT *));
-static boolean som_begin_writing PARAMS ((bfd *));
+static bfd_boolean som_bfd_is_local_label_name
+  PARAMS ((bfd *, const char *));
+static bfd_boolean som_set_section_contents
+  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+static bfd_boolean som_get_section_contents
+  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+static bfd_boolean som_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static bfd_boolean som_find_nearest_line
+  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
+	   const char **, unsigned int *));
+static void som_get_symbol_info
+  PARAMS ((bfd *, asymbol *, symbol_info *));
+static asection * bfd_section_from_som_symbol
+  PARAMS ((bfd *, struct symbol_dictionary_record *));
+static int log2
+  PARAMS ((unsigned int));
+static bfd_reloc_status_type hppa_som_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static void som_initialize_reloc_queue
+  PARAMS ((struct reloc_queue *));
+static void som_reloc_queue_insert
+  PARAMS ((unsigned char *, unsigned int, struct reloc_queue *));
+static void som_reloc_queue_fix
+  PARAMS ((struct reloc_queue *, unsigned int));
+static int som_reloc_queue_find
+  PARAMS ((unsigned char *, unsigned int, struct reloc_queue *));
+static unsigned char * try_prev_fixup
+  PARAMS ((bfd *, int *, unsigned char *, unsigned int, struct reloc_queue *));
+
+static unsigned char * som_reloc_skip
+  PARAMS ((bfd *, unsigned int, unsigned char *, unsigned int *,
+	   struct reloc_queue *));
+static unsigned char * som_reloc_addend
+  PARAMS ((bfd *, bfd_vma, unsigned char *, unsigned int *,
+	   struct reloc_queue *));
+static unsigned char * som_reloc_call
+  PARAMS ((bfd *, unsigned char *, unsigned int *, arelent *, int,
+	   struct reloc_queue *));
+static unsigned long som_count_spaces
+  PARAMS ((bfd *));
+static unsigned long som_count_subspaces
+  PARAMS ((bfd *));
+static int compare_syms
+  PARAMS ((const void *, const void *));
+static int compare_subspaces
+  PARAMS ((const void *, const void *));
+static unsigned long som_compute_checksum
+  PARAMS ((bfd *));
+static bfd_boolean som_prep_headers
+  PARAMS ((bfd *));
+static int som_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean som_finish_writing
+  PARAMS ((bfd *));
+static bfd_boolean som_build_and_write_symbol_table
+  PARAMS ((bfd *));
+static void som_prep_for_fixups
+  PARAMS ((bfd *, asymbol **, unsigned long));
+static bfd_boolean som_write_fixups
+  PARAMS ((bfd *, unsigned long, unsigned int *));
+static bfd_boolean som_write_space_strings
+  PARAMS ((bfd *, unsigned long, unsigned int *));
+static bfd_boolean som_write_symbol_strings
+  PARAMS ((bfd *, unsigned long, asymbol **, unsigned int, unsigned *,
+	   COMPUNIT *));
+static bfd_boolean som_begin_writing
+  PARAMS ((bfd *));
 static reloc_howto_type * som_bfd_reloc_type_lookup
-	PARAMS ((bfd *, bfd_reloc_code_real_type));
-static char som_section_type PARAMS ((const char *));
-static int som_decode_symclass PARAMS ((asymbol *));
-static boolean som_bfd_count_ar_symbols PARAMS ((bfd *, struct lst_header *,
-						 symindex *));
-
-static boolean som_bfd_fill_in_ar_symbols PARAMS ((bfd *, struct lst_header *,
-						   carsym **syms));
-static boolean som_slurp_armap PARAMS ((bfd *));
-static boolean som_write_armap PARAMS ((bfd *, unsigned int, struct orl *,
-					unsigned int, int));
-static void som_bfd_derive_misc_symbol_info PARAMS ((bfd *, asymbol *,
-					     struct som_misc_symbol_info *));
-static boolean som_bfd_prep_for_ar_write PARAMS ((bfd *, unsigned int *,
-						  unsigned int *));
-static unsigned int som_bfd_ar_symbol_hash PARAMS ((asymbol *));
-static boolean som_bfd_ar_write_symbol_stuff PARAMS ((bfd *, unsigned int,
-						      unsigned int,
-						      struct lst_header,
-						      unsigned int));
-static boolean som_is_space PARAMS ((asection *));
-static boolean som_is_subspace PARAMS ((asection *));
-static boolean som_is_container PARAMS ((asection *, asection *));
-static boolean som_bfd_free_cached_info PARAMS ((bfd *));
-static boolean som_bfd_link_split_section PARAMS ((bfd *, asection *));
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static char som_section_type
+  PARAMS ((const char *));
+static int som_decode_symclass
+  PARAMS ((asymbol *));
+static bfd_boolean som_bfd_count_ar_symbols
+  PARAMS ((bfd *, struct lst_header *, symindex *));
+
+static bfd_boolean som_bfd_fill_in_ar_symbols
+  PARAMS ((bfd *, struct lst_header *, carsym **syms));
+static bfd_boolean som_slurp_armap
+  PARAMS ((bfd *));
+static bfd_boolean som_write_armap
+  PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
+static void som_bfd_derive_misc_symbol_info
+  PARAMS ((bfd *, asymbol *, struct som_misc_symbol_info *));
+static bfd_boolean som_bfd_prep_for_ar_write
+  PARAMS ((bfd *, unsigned int *, unsigned int *));
+static unsigned int som_bfd_ar_symbol_hash
+  PARAMS ((asymbol *));
+static bfd_boolean som_bfd_ar_write_symbol_stuff
+  PARAMS ((bfd *, unsigned int, unsigned int, struct lst_header,
+	   unsigned int));
+static bfd_boolean som_is_space
+  PARAMS ((asection *));
+static bfd_boolean som_is_subspace
+  PARAMS ((asection *));
+static bfd_boolean som_is_container
+  PARAMS ((asection *, asection *));
+static bfd_boolean som_bfd_free_cached_info
+  PARAMS ((bfd *));
+static bfd_boolean som_bfd_link_split_section
+  PARAMS ((bfd *, asection *));
 
 /* Map SOM section names to POSIX/BSD single-character symbol types.
 
@@ -778,7 +805,7 @@ static const int comp3_opcodes[] = {
 #endif
 
 #define SOM_HOWTO(TYPE, NAME)	\
-  HOWTO(TYPE, 0, 0, 32, false, 0, 0, hppa_som_reloc, NAME, false, 0, 0, false)
+  HOWTO(TYPE, 0, 0, 32, FALSE, 0, 0, hppa_som_reloc, NAME, FALSE, 0, 0, FALSE)
 
 static reloc_howto_type som_hppa_howto_table[] = {
   SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
@@ -1842,7 +1869,7 @@ som_object_setup (abfd, file_hdrp, aux_hdrp, current_offset)
    BFD sections which correspond to spaces will overlap the sections for the
    associated subspaces.  */
 
-static boolean
+static bfd_boolean
 setup_sections (abfd, file_hdr, current_offset)
      bfd *abfd;
      struct header *file_hdr;
@@ -1931,7 +1958,7 @@ setup_sections (abfd, file_hdr, current_offset)
 	goto error_return;
 
       /* Setup the start address and file loc from the first subspace
-         record.  */
+	 record.  */
       space_asect->vma = subspace.subspace_start;
       space_asect->filepos = subspace.file_loc_init_value + current_offset;
       space_asect->alignment_power = log2 (subspace.alignment);
@@ -2066,7 +2093,7 @@ setup_sections (abfd, file_hdr, current_offset)
 	}
 
       /* This can happen for a .o which defines symbols in otherwise
-         empty subspaces.  */
+	 empty subspaces.  */
       if (!save_subspace.file_loc_init_value)
 	{
 	  space_asect->_cooked_size = 0;
@@ -2114,7 +2141,7 @@ setup_sections (abfd, file_hdr, current_offset)
   if (subspace_sections != NULL)
     free (subspace_sections);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (space_strings != NULL)
@@ -2122,7 +2149,7 @@ setup_sections (abfd, file_hdr, current_offset)
 
   if (subspace_sections != NULL)
     free (subspace_sections);
-  return false;
+  return FALSE;
 }
 
 /* Read in a SOM object and make it into a BFD.  */
@@ -2269,7 +2296,7 @@ som_object_p (abfd)
 
 /* Create a SOM object.  */
 
-static boolean
+static bfd_boolean
 som_mkobject (abfd)
      bfd *abfd;
 {
@@ -2277,15 +2304,15 @@ som_mkobject (abfd)
   abfd->tdata.som_data = (struct som_data_struct *)
     bfd_zalloc (abfd, (bfd_size_type) sizeof (struct som_data_struct));
   if (abfd->tdata.som_data == NULL)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
 /* Initialize some information in the file header.  This routine makes
    not attempt at doing the right thing for a full executable; it
    is only meant to handle relocatable objects.  */
 
-static boolean
+static bfd_boolean
 som_prep_headers (abfd)
      bfd *abfd;
 {
@@ -2296,7 +2323,7 @@ som_prep_headers (abfd)
   /* Make and attach a file header to the BFD.  */
   file_hdr = (struct header *) bfd_zalloc (abfd, amt);
   if (file_hdr == NULL)
-    return false;
+    return FALSE;
   obj_som_file_hdr (abfd) = file_hdr;
 
   if (abfd->flags & (EXEC_P | DYNAMIC))
@@ -2307,7 +2334,7 @@ som_prep_headers (abfd)
       obj_som_exec_hdr (abfd) =
 	(struct som_exec_auxhdr *) bfd_zalloc (abfd, amt);
       if (obj_som_exec_hdr (abfd) == NULL)
-	return false;
+	return FALSE;
 
       if (abfd->flags & D_PAGED)
 	file_hdr->a_magic = DEMAND_MAGIC;
@@ -2351,7 +2378,7 @@ som_prep_headers (abfd)
 	  som_section_data (section)->space_dict =
 	    (struct space_dictionary_record *) bfd_zalloc (abfd, amt);
 	  if (som_section_data (section)->space_dict == NULL)
-	    return false;
+	    return FALSE;
 	  /* Set space attributes.  Note most attributes of SOM spaces
 	     are set based on the subspaces it contains.  */
 	  som_section_data (section)->space_dict->loader_fix_index = -1;
@@ -2374,7 +2401,7 @@ som_prep_headers (abfd)
 	  som_section_data (section)->subspace_dict =
 	    (struct subspace_dictionary_record *) bfd_zalloc (abfd, amt);
 	  if (som_section_data (section)->subspace_dict == NULL)
-	    return false;
+	    return FALSE;
 
 	  /* Set subspace attributes.  Basic stuff is done here, additional
 	     attributes are filled in later as more information becomes
@@ -2409,58 +2436,58 @@ som_prep_headers (abfd)
 	    som_section_data (section)->copy_data->quadrant;
 	}
     }
-  return true;
+  return TRUE;
 }
 
-/* Return true if the given section is a SOM space, false otherwise.  */
+/* Return TRUE if the given section is a SOM space, FALSE otherwise.  */
 
-static boolean
+static bfd_boolean
 som_is_space (section)
      asection *section;
 {
   /* If no copy data is available, then it's neither a space nor a
      subspace.  */
   if (som_section_data (section)->copy_data == NULL)
-    return false;
+    return FALSE;
 
   /* If the containing space isn't the same as the given section,
      then this isn't a space.  */
   if (som_section_data (section)->copy_data->container != section
       && (som_section_data (section)->copy_data->container->output_section
 	  != section))
-    return false;
+    return FALSE;
 
   /* OK.  Must be a space.  */
-  return true;
+  return TRUE;
 }
 
-/* Return true if the given section is a SOM subspace, false otherwise.  */
+/* Return TRUE if the given section is a SOM subspace, FALSE otherwise.  */
 
-static boolean
+static bfd_boolean
 som_is_subspace (section)
      asection *section;
 {
   /* If no copy data is available, then it's neither a space nor a
      subspace.  */
   if (som_section_data (section)->copy_data == NULL)
-    return false;
+    return FALSE;
 
   /* If the containing space is the same as the given section,
      then this isn't a subspace.  */
   if (som_section_data (section)->copy_data->container == section
       || (som_section_data (section)->copy_data->container->output_section
 	  == section))
-    return false;
+    return FALSE;
 
   /* OK.  Must be a subspace.  */
-  return true;
+  return TRUE;
 }
 
-/* Return true if the given space containins the given subspace.  It
+/* Return TRUE if the given space containins the given subspace.  It
    is safe to assume space really is a space, and subspace really
    is a subspace.  */
 
-static boolean
+static bfd_boolean
 som_is_container (space, subspace)
      asection *space, *subspace;
 {
@@ -2658,7 +2685,7 @@ som_prep_for_fixups (abfd, syms, num_syms)
     }
 }
 
-static boolean
+static bfd_boolean
 som_write_fixups (abfd, current_offset, total_reloc_sizep)
      bfd *abfd;
      unsigned long current_offset;
@@ -2728,7 +2755,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 	     for this subspace in preparation for writing out its fixup
 	     stream.  */
 	  if (bfd_seek (abfd, current_offset + total_reloc_size, SEEK_SET) != 0)
-	    return false;
+	    return FALSE;
 
 	  /* Buffer space has already been allocated.  Just perform some
 	     initialization here.  */
@@ -2767,7 +2794,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 		{
 		  amt = p - tmp_space;
 		  if (bfd_bwrite ((PTR) tmp_space, amt, abfd) != amt)
-		    return false;
+		    return FALSE;
 
 		  p = tmp_space;
 		  som_initialize_reloc_queue (reloc_queue);
@@ -3028,14 +3055,14 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 
 	  /* Last BFD relocation for a subspace has been processed.
 	     Map the rest of the subspace with R_NO_RELOCATION fixups.  */
-	  p = som_reloc_skip (abfd, bfd_section_size (abfd, subsection)
-			              - reloc_offset,
+	  p = som_reloc_skip (abfd, (bfd_section_size (abfd, subsection)
+				     - reloc_offset),
 			      p, &subspace_reloc_size, reloc_queue);
 
 	  /* Scribble out the relocations.  */
 	  amt = p - tmp_space;
 	  if (bfd_bwrite ((PTR) tmp_space, amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	  p = tmp_space;
 
 	  total_reloc_size += subspace_reloc_size;
@@ -3045,12 +3072,12 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
       section = section->next;
     }
   *total_reloc_sizep = total_reloc_size;
-  return true;
+  return TRUE;
 }
 
 /* Write out the space/subspace string table.  */
 
-static boolean
+static bfd_boolean
 som_write_space_strings (abfd, current_offset, string_sizep)
      bfd *abfd;
      unsigned long current_offset;
@@ -3068,7 +3095,7 @@ som_write_space_strings (abfd, current_offset, string_sizep)
   /* Seek to the start of the space strings in preparation for writing
      them out.  */
   if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   /* Walk through all the spaces and subspaces (order is not important)
      building up and writing string table entries for their names.  */
@@ -3085,27 +3112,27 @@ som_write_space_strings (abfd, current_offset, string_sizep)
       length = strlen (section->name);
 
       /* If there is not enough room for the next entry, then dump the
-         current buffer contents now and maybe allocate a larger
-         buffer.  Each entry will take 4 bytes to hold the string
-         length + the string itself + null terminator.  */
+	 current buffer contents now and maybe allocate a larger
+	 buffer.  Each entry will take 4 bytes to hold the string
+	 length + the string itself + null terminator.  */
       if (p - tmp_space + 5 + length > tmp_space_size)
 	{
 	  /* Flush buffer before refilling or reallocating.  */
 	  amt = p - tmp_space;
 	  if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 
 	  /* Reallocate if now empty buffer still too small.  */
 	  if (5 + length > tmp_space_size)
 	    {
 	      /* Ensure a minimum growth factor to avoid O(n**2) space
-                 consumption for n strings.  The optimal minimum
-                 factor seems to be 2, as no other value can guarantee
-                 wasting less than 50% space.  (Note that we cannot
-                 deallocate space allocated by `alloca' without
-                 returning from this function.)  The same technique is
-                 used a few more times below when a buffer is
-                 reallocated.  */
+		 consumption for n strings.  The optimal minimum
+		 factor seems to be 2, as no other value can guarantee
+		 wasting less than 50% space.  (Note that we cannot
+		 deallocate space allocated by `alloca' without
+		 returning from this function.)  The same technique is
+		 used a few more times below when a buffer is
+		 reallocated.  */
 	      tmp_space_size = MAX (2 * tmp_space_size, 5 + length);
 	      tmp_space = alloca (tmp_space_size);
 	    }
@@ -3144,14 +3171,14 @@ som_write_space_strings (abfd, current_offset, string_sizep)
      contained in a partial block.  */
   amt = p - tmp_space;
   if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
-    return false;
+    return FALSE;
   *string_sizep = strings_size;
-  return true;
+  return TRUE;
 }
 
 /* Write out the symbol string table.  */
 
-static boolean
+static bfd_boolean
 som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
 			  compilation_unit)
      bfd *abfd;
@@ -3190,7 +3217,7 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
   /* Seek to the start of the space strings in preparation for writing
      them out.  */
   if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (compilation_unit)
     {
@@ -3206,7 +3233,7 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
 	      /* Flush buffer before refilling or reallocating.  */
 	      amt = p - tmp_space;
 	      if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
-		return false;
+		return FALSE;
 
 	      /* Reallocate if now empty buffer still too small.  */
 	      if (5 + length > tmp_space_size)
@@ -3217,7 +3244,7 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
 		}
 
 	      /* Reset to beginning of the (possibly new) buffer
-                 space.  */
+		 space.  */
 	      p = tmp_space;
 	    }
 
@@ -3275,7 +3302,7 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
 	  /* Flush buffer before refilling or reallocating.  */
 	  amt = p - tmp_space;
 	  if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 
 	  /* Reallocate if now empty buffer still too small.  */
 	  if (5 + length > tmp_space_size)
@@ -3316,17 +3343,17 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
   /* Scribble out any partial block.  */
   amt = p - tmp_space;
   if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   *string_sizep = strings_size;
-  return true;
+  return TRUE;
 }
 
 /* Compute variable information to be placed in the SOM headers,
    space/subspace dictionaries, relocation streams, etc.  Begin
    writing parts of the object file.  */
 
-static boolean
+static bfd_boolean
 som_begin_writing (abfd)
      bfd *abfd;
 {
@@ -3372,14 +3399,14 @@ som_begin_writing (abfd)
       bfd_size_type len;
 
       if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       /* Write the aux_id structure and the string length.  */
       len = sizeof (struct aux_id) + sizeof (unsigned int);
       obj_som_file_hdr (abfd)->aux_header_size += len;
       current_offset += len;
       if (bfd_bwrite ((PTR) obj_som_version_hdr (abfd), len, abfd) != len)
-	return false;
+	return FALSE;
 
       /* Write the version string.  */
       len = obj_som_version_hdr (abfd)->header_id.length - sizeof (int);
@@ -3387,7 +3414,7 @@ som_begin_writing (abfd)
       current_offset += len;
       if (bfd_bwrite ((PTR) obj_som_version_hdr (abfd)->user_string, len, abfd)
 	  != len)
-	return false;
+	return FALSE;
     }
 
   if (obj_som_copyright_hdr (abfd) != NULL)
@@ -3395,14 +3422,14 @@ som_begin_writing (abfd)
       bfd_size_type len;
 
       if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       /* Write the aux_id structure and the string length.  */
       len = sizeof (struct aux_id) + sizeof (unsigned int);
       obj_som_file_hdr (abfd)->aux_header_size += len;
       current_offset += len;
       if (bfd_bwrite ((PTR) obj_som_copyright_hdr (abfd), len, abfd) != len)
-	return false;
+	return FALSE;
 
       /* Write the copyright string.  */
       len = obj_som_copyright_hdr (abfd)->header_id.length - sizeof (int);
@@ -3410,7 +3437,7 @@ som_begin_writing (abfd)
       current_offset += len;
       if (bfd_bwrite ((PTR) obj_som_copyright_hdr (abfd)->copyright, len, abfd)
 	  != len)
-	return false;
+	return FALSE;
     }
 
   /* Next comes the initialization pointers; we have no initialization
@@ -3458,7 +3485,7 @@ som_begin_writing (abfd)
 
   /* Scribble out the space strings.  */
   if (! som_write_space_strings (abfd, current_offset, &strings_size))
-    return false;
+    return FALSE;
 
   /* Record total string table size in the header and update the
      current offset.  */
@@ -3655,9 +3682,9 @@ som_begin_writing (abfd)
   if (abfd->flags & (EXEC_P | DYNAMIC))
     current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
   if (bfd_seek (abfd, (file_ptr) current_offset - 1, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   if (bfd_bwrite ((PTR) "", (bfd_size_type) 1, abfd) != 1)
-    return false;
+    return FALSE;
 
   obj_som_file_hdr (abfd)->unloadable_sp_size
     = current_offset - obj_som_file_hdr (abfd)->unloadable_sp_location;
@@ -3669,12 +3696,12 @@ som_begin_writing (abfd)
   /* Done.  Store the total size of the SOM so far.  */
   obj_som_file_hdr (abfd)->som_length = current_offset;
 
-  return true;
+  return TRUE;
 }
 
 /* Finally, scribble out the various headers to the disk.  */
 
-static boolean
+static bfd_boolean
 som_finish_writing (abfd)
      bfd *abfd;
 {
@@ -3730,7 +3757,7 @@ som_finish_writing (abfd)
   if (! som_write_symbol_strings (abfd, current_offset, syms,
 				  num_syms, &strings_size,
 				  obj_som_compilation_unit (abfd)))
-    return false;
+    return FALSE;
 
   /* Record total string table size in header and update the
      current offset.  */
@@ -3751,7 +3778,7 @@ som_finish_writing (abfd)
   /* Write the fixups and update fields in subspace headers which
      relate to the fixup stream.  */
   if (! som_write_fixups (abfd, current_offset, &total_reloc_size))
-    return false;
+    return FALSE;
 
   /* Record the total size of the fixup stream in the file header.  */
   obj_som_file_hdr (abfd)->fixup_request_total = total_reloc_size;
@@ -3762,7 +3789,7 @@ som_finish_writing (abfd)
   /* Now that the symbol table information is complete, build and
      write the symbol table.  */
   if (! som_build_and_write_symbol_table (abfd))
-    return false;
+    return FALSE;
 
   /* Subspaces are written first so that we can set up information
      about them in their containing spaces as the subspace is written.  */
@@ -3770,7 +3797,7 @@ som_finish_writing (abfd)
   /* Seek to the start of the subspace dictionary records.  */
   location = obj_som_file_hdr (abfd)->subspace_location;
   if (bfd_seek (abfd, location, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   section = abfd->sections;
   /* Now for each loadable space write out records for its subspaces.  */
@@ -3820,7 +3847,7 @@ som_finish_writing (abfd)
 	  amt = sizeof (struct subspace_dictionary_record);
 	  if (bfd_bwrite ((PTR) som_section_data (subsection)->subspace_dict,
 			 amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	}
       /* Goto the next section.  */
       section = section->next;
@@ -3876,7 +3903,7 @@ som_finish_writing (abfd)
 	  amt = sizeof (struct subspace_dictionary_record);
 	  if (bfd_bwrite ((PTR) som_section_data (subsection)->subspace_dict,
 			 amt, abfd) != amt)
-	    return false;
+	    return FALSE;
 	}
       /* Goto the next section.  */
       section = section->next;
@@ -3889,7 +3916,7 @@ som_finish_writing (abfd)
      dictionary records.  */
   location = obj_som_file_hdr (abfd)->space_location;
   if (bfd_seek (abfd, location, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   section = abfd->sections;
   for (i = 0; i < num_spaces; i++)
@@ -3902,7 +3929,7 @@ som_finish_writing (abfd)
       amt = sizeof (struct space_dictionary_record);
       if (bfd_bwrite ((PTR) som_section_data (section)->space_dict,
 		     amt, abfd) != amt)
-	return false;
+	return FALSE;
 
       /* Goto the next section.  */
       section = section->next;
@@ -3913,11 +3940,11 @@ som_finish_writing (abfd)
     {
       location = obj_som_file_hdr (abfd)->compiler_location;
       if (bfd_seek (abfd, location, SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       amt = COMPUNITSZ;
       if (bfd_bwrite ((PTR) obj_som_compilation_unit (abfd), amt, abfd) != amt)
-	return false;
+	return FALSE;
     }
 
   /* Setting of the system_id has to happen very late now that copying of
@@ -3938,10 +3965,10 @@ som_finish_writing (abfd)
   /* Only thing left to do is write out the file header.  It is always
      at location zero.  Seek there and write it.  */
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   amt = sizeof (struct header);
   if (bfd_bwrite ((PTR) obj_som_file_hdr (abfd), amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Now write the exec header.  */
   if (abfd->flags & (EXEC_P | DYNAMIC))
@@ -3970,18 +3997,18 @@ som_finish_writing (abfd)
 	  || exec_header->exec_dfile + exec_header->exec_dsize > som_length)
 	{
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
 
       if (bfd_seek (abfd, obj_som_file_hdr (abfd)->aux_header_location,
 		    SEEK_SET) != 0)
-	return false;
+	return FALSE;
 
       amt = AUX_HDR_SIZE;
       if (bfd_bwrite ((PTR) exec_header, amt, abfd) != amt)
-	return false;
+	return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 /* Compute and return the checksum for a SOM file header.  */
@@ -4116,16 +4143,16 @@ som_bfd_derive_misc_symbol_info (abfd, sym, info)
 
   /* The secondary_def field is for weak symbols.  */
   if (sym->flags & BSF_WEAK)
-    info->secondary_def = true;
+    info->secondary_def = TRUE;
   else
-    info->secondary_def = false;
+    info->secondary_def = FALSE;
 
 }
 
 /* Build and write, in one big chunk, the entire symbol table for
    this BFD.  */
 
-static boolean
+static bfd_boolean
 som_build_and_write_symbol_table (abfd)
      bfd *abfd;
 {
@@ -4170,23 +4197,23 @@ som_build_and_write_symbol_table (abfd)
   /* Everything is ready, seek to the right location and
      scribble out the symbol table.  */
   if (bfd_seek (abfd, symtab_location, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (bfd_bwrite ((PTR) som_symtab, symtab_size, abfd) != symtab_size)
     goto error_return;
 
   if (som_symtab != NULL)
     free (som_symtab);
-  return true;
+  return TRUE;
  error_return:
   if (som_symtab != NULL)
     free (som_symtab);
-  return false;
+  return FALSE;
 }
 
 /* Write an object in SOM format.  */
 
-static boolean
+static bfd_boolean
 som_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -4195,7 +4222,7 @@ som_write_object_contents (abfd)
       /* Set up fixed parts of the file, space, and subspace headers.
 	 Notify the world that output has begun.  */
       som_prep_headers (abfd);
-      abfd->output_has_begun = true;
+      abfd->output_has_begun = TRUE;
       /* Start writing the object file.  This include all the string
 	 tables, fixup streams, and other portions of the object file.  */
       som_begin_writing (abfd);
@@ -4206,7 +4233,7 @@ som_write_object_contents (abfd)
 
 /* Read and save the string table associated with the given BFD.  */
 
-static boolean
+static bfd_boolean
 som_slurp_string_table (abfd)
      bfd *abfd;
 {
@@ -4215,7 +4242,7 @@ som_slurp_string_table (abfd)
 
   /* Use the saved version if its available.  */
   if (obj_som_stringtab (abfd) != NULL)
-    return true;
+    return TRUE;
 
   /* I don't think this can currently happen, and I'm not sure it should
      really be an error, but it's better than getting unpredictable results
@@ -4223,24 +4250,24 @@ som_slurp_string_table (abfd)
   if (obj_som_stringtab_size (abfd) == 0)
     {
       bfd_set_error (bfd_error_no_symbols);
-      return false;
+      return FALSE;
     }
 
   /* Allocate and read in the string table.  */
   amt = obj_som_stringtab_size (abfd);
   stringtab = bfd_zmalloc (amt);
   if (stringtab == NULL)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, obj_som_str_filepos (abfd), SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (bfd_bread (stringtab, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Save our results and return success.  */
   obj_som_stringtab (abfd) = stringtab;
-  return true;
+  return TRUE;
 }
 
 /* Return the amount of data (in bytes) required to hold the symbol
@@ -4471,7 +4498,7 @@ som_slurp_symbol_table (abfd)
 	sym->symbol.flags |= BSF_DEBUGGING;
 
       /* Note increment at bottom of loop, since we skip some symbols
-         we can not include it as part of the for statement.  */
+	 we can not include it as part of the for statement.  */
       sym++;
     }
 
@@ -4484,12 +4511,12 @@ som_slurp_symbol_table (abfd)
  successful_return:
   if (buf != NULL)
     free (buf);
-  return (true);
+  return (TRUE);
 
  error_return:
   if (buf != NULL)
     free (buf);
-  return false;
+  return FALSE;
 }
 
 /* Canonicalize a SOM symbol table.  Return the number of entries
@@ -4563,7 +4590,7 @@ som_print_symbol (abfd, afile, symbol, how)
     }
 }
 
-static boolean
+static bfd_boolean
 som_bfd_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -4591,7 +4618,7 @@ som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
      arelent *internal_relocs;
      asection *section;
      asymbol **symbols;
-     boolean just_count;
+     bfd_boolean just_count;
 {
   unsigned int op, varname, deallocate_contents = 0;
   unsigned char *end_fixups = &fixup[end];
@@ -4881,7 +4908,7 @@ som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
 		  if (rptr->addend == 0 && !section->contents)
 		    {
 		      /* Got to read the damn contents first.  We don't
-		         bother saving the contents (yet).  Add it one
+			 bother saving the contents (yet).  Add it one
 			 day if the need arises.  */
 		      section->contents = bfd_malloc (section->_raw_size);
 		      if (section->contents == NULL)
@@ -4925,15 +4952,15 @@ som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
 /* Read in the relocs (aka fixups in SOM terms) for a section.
 
    som_get_reloc_upper_bound calls this routine with JUST_COUNT
-   set to true to indicate it only needs a count of the number
+   set to TRUE to indicate it only needs a count of the number
    of actual relocations.  */
 
-static boolean
+static bfd_boolean
 som_slurp_reloc_table (abfd, section, symbols, just_count)
      bfd *abfd;
      asection *section;
      asymbol **symbols;
-     boolean just_count;
+     bfd_boolean just_count;
 {
   char *external_relocs;
   unsigned int fixup_stream_size;
@@ -4944,7 +4971,7 @@ som_slurp_reloc_table (abfd, section, symbols, just_count)
   fixup_stream_size = som_section_data (section)->reloc_size;
   /* If there were no relocations, then there is nothing to do.  */
   if (section->reloc_count == 0)
-    return true;
+    return TRUE;
 
   /* If reloc_count is -1, then the relocation stream has not been
      parsed.  We must do so now to know how many relocations exist.  */
@@ -4953,45 +4980,45 @@ som_slurp_reloc_table (abfd, section, symbols, just_count)
       amt = fixup_stream_size;
       external_relocs = (char *) bfd_malloc (amt);
       if (external_relocs == (char *) NULL)
-	return false;
+	return FALSE;
       /* Read in the external forms.  */
       if (bfd_seek (abfd,
 		    obj_som_reloc_filepos (abfd) + section->rel_filepos,
 		    SEEK_SET)
 	  != 0)
-	return false;
+	return FALSE;
       if (bfd_bread (external_relocs, amt, abfd) != amt)
-	return false;
+	return FALSE;
 
       /* Let callers know how many relocations found.
 	 also save the relocation stream as we will
 	 need it again.  */
       section->reloc_count = som_set_reloc_info (external_relocs,
 						 fixup_stream_size,
-						 NULL, NULL, NULL, true);
+						 NULL, NULL, NULL, TRUE);
 
       som_section_data (section)->reloc_stream = external_relocs;
     }
 
   /* If the caller only wanted a count, then return now.  */
   if (just_count)
-    return true;
+    return TRUE;
 
   num_relocs = section->reloc_count;
   external_relocs = som_section_data (section)->reloc_stream;
   /* Return saved information about the relocations if it is available.  */
   if (section->relocation != (arelent *) NULL)
-    return true;
+    return TRUE;
 
   amt = num_relocs;
   amt *= sizeof (arelent);
   internal_relocs = (arelent *) bfd_zalloc (abfd, (amt));
   if (internal_relocs == (arelent *) NULL)
-    return false;
+    return FALSE;
 
   /* Process and internalize the relocations.  */
   som_set_reloc_info (external_relocs, fixup_stream_size,
-		      internal_relocs, section, symbols, false);
+		      internal_relocs, section, symbols, FALSE);
 
   /* We're done with the external relocations.  Free them.  */
   free (external_relocs);
@@ -4999,7 +5026,7 @@ som_slurp_reloc_table (abfd, section, symbols, just_count)
 
   /* Save our results and return success.  */
   section->relocation = internal_relocs;
-  return (true);
+  return TRUE;
 }
 
 /* Return the number of bytes required to store the relocation
@@ -5014,7 +5041,7 @@ som_get_reloc_upper_bound (abfd, asect)
      and parse it to determine how many relocations exist.  */
   if (asect->flags & SEC_RELOC)
     {
-      if (! som_slurp_reloc_table (abfd, asect, NULL, true))
+      if (! som_slurp_reloc_table (abfd, asect, NULL, TRUE))
 	return -1;
       return (asect->reloc_count + 1) * sizeof (arelent *);
     }
@@ -5035,7 +5062,7 @@ som_canonicalize_reloc (abfd, section, relptr, symbols)
   arelent *tblptr;
   int count;
 
-  if (! som_slurp_reloc_table (abfd, section, symbols, false))
+  if (! som_slurp_reloc_table (abfd, section, symbols, FALSE))
     return -1;
 
   count = section->reloc_count;
@@ -5052,7 +5079,7 @@ extern const bfd_target som_vec;
 
 /* A hook to set up object file dependent section information.  */
 
-static boolean
+static bfd_boolean
 som_new_section_hook (abfd, newsect)
      bfd *abfd;
      asection *newsect;
@@ -5060,17 +5087,17 @@ som_new_section_hook (abfd, newsect)
   bfd_size_type amt = sizeof (struct som_section_data_struct);
   newsect->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
   if (!newsect->used_by_bfd)
-    return false;
+    return FALSE;
   newsect->alignment_power = 3;
 
   /* We allow more than three sections internally.  */
-  return true;
+  return TRUE;
 }
 
 /* Copy any private info we understand from the input symbol
    to the output symbol.  */
 
-static boolean
+static bfd_boolean
 som_bfd_copy_private_symbol_data (ibfd, isymbol, obfd, osymbol)
      bfd *ibfd;
      asymbol *isymbol;
@@ -5083,20 +5110,20 @@ som_bfd_copy_private_symbol_data (ibfd, isymbol, obfd, osymbol)
   /* One day we may try to grok other private data.  */
   if (ibfd->xvec->flavour != bfd_target_som_flavour
       || obfd->xvec->flavour != bfd_target_som_flavour)
-    return false;
+    return FALSE;
 
   /* The only private information we need to copy is the argument relocation
      bits.  */
   output_symbol->tc_data.ap.hppa_arg_reloc =
     input_symbol->tc_data.ap.hppa_arg_reloc;
 
-  return true;
+  return TRUE;
 }
 
 /* Copy any private info we understand from the input section
    to the output section.  */
 
-static boolean
+static bfd_boolean
 som_bfd_copy_private_section_data (ibfd, isection, obfd, osection)
      bfd *ibfd;
      asection *isection;
@@ -5109,13 +5136,13 @@ som_bfd_copy_private_section_data (ibfd, isection, obfd, osection)
   if (ibfd->xvec->flavour != bfd_target_som_flavour
       || obfd->xvec->flavour != bfd_target_som_flavour
       || (!som_is_space (isection) && !som_is_subspace (isection)))
-    return true;
+    return TRUE;
 
   amt = sizeof (struct som_copyable_section_data_struct);
   som_section_data (osection)->copy_data =
     (struct som_copyable_section_data_struct *) bfd_zalloc (obfd, amt);
   if (som_section_data (osection)->copy_data == NULL)
-    return false;
+    return FALSE;
 
   memcpy (som_section_data (osection)->copy_data,
 	  som_section_data (isection)->copy_data,
@@ -5126,38 +5153,38 @@ som_bfd_copy_private_section_data (ibfd, isection, obfd, osection)
     som_section_data (osection)->copy_data->container =
       som_section_data (osection)->copy_data->container->output_section;
 
-  return true;
+  return TRUE;
 }
 
 /* Copy any private info we understand from the input bfd
    to the output bfd.  */
 
-static boolean
+static bfd_boolean
 som_bfd_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd, *obfd;
 {
   /* One day we may try to grok other private data.  */
   if (ibfd->xvec->flavour != bfd_target_som_flavour
       || obfd->xvec->flavour != bfd_target_som_flavour)
-    return true;
+    return TRUE;
 
   /* Allocate some memory to hold the data we need.  */
   obj_som_exec_data (obfd) = (struct som_exec_data *)
     bfd_zalloc (obfd, (bfd_size_type) sizeof (struct som_exec_data));
   if (obj_som_exec_data (obfd) == NULL)
-    return false;
+    return FALSE;
 
   /* Now copy the data.  */
   memcpy (obj_som_exec_data (obfd), obj_som_exec_data (ibfd),
 	  sizeof (struct som_exec_data));
 
-  return true;
+  return TRUE;
 }
 
 /* Set backend info for sections which can not be described
    in the BFD data structures.  */
 
-boolean
+bfd_boolean
 bfd_som_set_section_attributes (section, defined, private, sort_key, spnum)
      asection *section;
      int defined;
@@ -5173,20 +5200,20 @@ bfd_som_set_section_attributes (section, defined, private, sort_key, spnum)
 	(struct som_copyable_section_data_struct *) bfd_zalloc (section->owner,
 								amt);
       if (som_section_data (section)->copy_data == NULL)
-	return false;
+	return FALSE;
     }
   som_section_data (section)->copy_data->sort_key = sort_key;
   som_section_data (section)->copy_data->is_defined = defined;
   som_section_data (section)->copy_data->is_private = private;
   som_section_data (section)->copy_data->container = section;
   som_section_data (section)->copy_data->space_number = spnum;
-  return true;
+  return TRUE;
 }
 
 /* Set backend info for subsections which can not be described
    in the BFD data structures.  */
 
-boolean
+bfd_boolean
 bfd_som_set_subsection_attributes (section, container, access,
 				   sort_key, quadrant)
      asection *section;
@@ -5203,13 +5230,13 @@ bfd_som_set_subsection_attributes (section, container, access,
 	(struct som_copyable_section_data_struct *) bfd_zalloc (section->owner,
 								amt);
       if (som_section_data (section)->copy_data == NULL)
-	return false;
+	return FALSE;
     }
   som_section_data (section)->copy_data->sort_key = sort_key;
   som_section_data (section)->copy_data->access_control_bits = access;
   som_section_data (section)->copy_data->quadrant = quadrant;
   som_section_data (section)->copy_data->container = container;
-  return true;
+  return TRUE;
 }
 
 /* Set the full SOM symbol type.  SOM needs far more symbol information
@@ -5229,7 +5256,7 @@ bfd_som_set_symbol_type (symbol, type)
 /* Attach an auxiliary header to the BFD backend so that it may be
    written into the object file.  */
 
-boolean
+bfd_boolean
 bfd_som_attach_aux_hdr (abfd, type, string)
      bfd *abfd;
      int type;
@@ -5248,7 +5275,7 @@ bfd_som_attach_aux_hdr (abfd, type, string)
       obj_som_version_hdr (abfd) =
 	(struct user_string_aux_hdr *) bfd_zalloc (abfd, amt);
       if (!obj_som_version_hdr (abfd))
-	return false;
+	return FALSE;
       obj_som_version_hdr (abfd)->header_id.type = VERSION_AUX_ID;
       obj_som_version_hdr (abfd)->header_id.length = len + pad;
       obj_som_version_hdr (abfd)->header_id.length += sizeof (int);
@@ -5266,20 +5293,20 @@ bfd_som_attach_aux_hdr (abfd, type, string)
       obj_som_copyright_hdr (abfd) =
 	(struct copyright_aux_hdr *) bfd_zalloc (abfd, amt);
       if (!obj_som_copyright_hdr (abfd))
-	return false;
+	return FALSE;
       obj_som_copyright_hdr (abfd)->header_id.type = COPYRIGHT_AUX_ID;
       obj_som_copyright_hdr (abfd)->header_id.length = len + pad;
       obj_som_copyright_hdr (abfd)->header_id.length += sizeof (int);
       obj_som_copyright_hdr (abfd)->string_length = len;
       strcpy (obj_som_copyright_hdr (abfd)->copyright, string);
     }
-  return true;
+  return TRUE;
 }
 
 /* Attach an compilation unit header to the BFD backend so that it may be
    written into the object file.  */
 
-boolean
+bfd_boolean
 bfd_som_attach_compilation_unit (abfd, name, language_name, product_id,
 				 version_id)
      bfd *abfd;
@@ -5290,14 +5317,14 @@ bfd_som_attach_compilation_unit (abfd, name, language_name, product_id,
 {
   COMPUNIT *n = (COMPUNIT *) bfd_zalloc (abfd, (bfd_size_type) COMPUNITSZ);
   if (n == NULL)
-    return false;
+    return FALSE;
 
 #define STRDUP(f) \
   if (f != NULL) \
     { \
       n->f.n_name = bfd_alloc (abfd, (bfd_size_type) strlen (f) + 1); \
       if (n->f.n_name == NULL) \
-	return false; \
+	return FALSE; \
       strcpy (n->f.n_name, f); \
     }
 
@@ -5310,10 +5337,10 @@ bfd_som_attach_compilation_unit (abfd, name, language_name, product_id,
 
   obj_som_compilation_unit (abfd) = n;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 som_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -5322,15 +5349,15 @@ som_get_section_contents (abfd, section, location, offset, count)
      bfd_size_type count;
 {
   if (count == 0 || ((section->flags & SEC_HAS_CONTENTS) == 0))
-    return true;
+    return TRUE;
   if ((bfd_size_type) (offset+count) > section->_raw_size
       || bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0
       || bfd_bread (location, count, abfd) != count)
-    return (false); /* on error */
-  return (true);
+    return FALSE; /* on error */
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 som_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -5343,7 +5370,7 @@ som_set_section_contents (abfd, section, location, offset, count)
       /* Set up fixed parts of the file, space, and subspace headers.
 	 Notify the world that output has begun.  */
       som_prep_headers (abfd);
-      abfd->output_has_begun = true;
+      abfd->output_has_begun = TRUE;
       /* Start writing the object file.  This include all the string
 	 tables, fixup streams, and other portions of the object file.  */
       som_begin_writing (abfd);
@@ -5353,20 +5380,20 @@ som_set_section_contents (abfd, section, location, offset, count)
      are not generated at run time by the OS).  */
   if (!som_is_subspace (section)
       || ((section->flags & SEC_HAS_CONTENTS) == 0))
-    return true;
+    return TRUE;
 
   /* Seek to the proper offset within the object file and write the
      data.  */
   offset += som_section_data (section)->subspace_dict->file_loc_init_value;
   if (bfd_seek (abfd, offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (bfd_bwrite ((PTR) location, count, abfd) != count)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 som_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -5376,7 +5403,7 @@ som_set_arch_mach (abfd, arch, machine)
   return bfd_default_set_arch_mach (abfd, arch, machine);
 }
 
-static boolean
+static bfd_boolean
 som_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 		       functionname_ptr, line_ptr)
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -5387,18 +5414,18 @@ som_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
      const char **functionname_ptr ATTRIBUTE_UNUSED;
      unsigned int *line_ptr ATTRIBUTE_UNUSED;
 {
-  return (false);
+  return FALSE;
 }
 
 static int
 som_sizeof_headers (abfd, reloc)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean reloc ATTRIBUTE_UNUSED;
+     bfd_boolean reloc ATTRIBUTE_UNUSED;
 {
   (*_bfd_error_handler) (_("som_sizeof_headers unimplemented"));
   fflush (stderr);
   abort ();
-  return (0);
+  return 0;
 }
 
 /* Return the single-character symbol type corresponding to
@@ -5465,7 +5492,7 @@ som_get_symbol_info (ignore_abfd, symbol, ret)
 /* Count the number of symbols in the archive symbol table.  Necessary
    so that we can allocate space for all the carsyms at once.  */
 
-static boolean
+static bfd_boolean
 som_bfd_count_ar_symbols (abfd, lst_header, count)
      bfd *abfd;
      struct lst_header *lst_header;
@@ -5530,18 +5557,18 @@ som_bfd_count_ar_symbols (abfd, lst_header, count)
     }
   if (hash_table != NULL)
     free (hash_table);
-  return true;
+  return TRUE;
 
  error_return:
   if (hash_table != NULL)
     free (hash_table);
-  return false;
+  return FALSE;
 }
 
 /* Fill in the canonical archive symbols (SYMS) from the archive described
    by ABFD and LST_HEADER.  */
 
-static boolean
+static bfd_boolean
 som_bfd_fill_in_ar_symbols (abfd, lst_header, syms)
      bfd *abfd;
      struct lst_header *lst_header;
@@ -5671,19 +5698,19 @@ som_bfd_fill_in_ar_symbols (abfd, lst_header, syms)
     free (hash_table);
   if (som_dict != NULL)
     free (som_dict);
-  return true;
+  return TRUE;
 
  error_return:
   if (hash_table != NULL)
     free (hash_table);
   if (som_dict != NULL)
     free (som_dict);
-  return false;
+  return FALSE;
 }
 
 /* Read in the LST from the archive.  */
 
-static boolean
+static bfd_boolean
 som_slurp_armap (abfd)
      bfd *abfd;
 {
@@ -5697,29 +5724,29 @@ som_slurp_armap (abfd)
 
   /* Special cases.  */
   if (i == 0)
-    return true;
+    return TRUE;
   if (i != 16)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
-    return false;
+    return FALSE;
 
   /* For archives without .o files there is no symbol table.  */
   if (strncmp (nextname, "/               ", 16))
     {
-      bfd_has_map (abfd) = false;
-      return true;
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
     }
 
   /* Read in and sanity check the archive header.  */
   amt = sizeof (struct ar_hdr);
   if (bfd_bread ((PTR) &ar_header, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   if (strncmp (ar_header.ar_fmag, ARFMAG, 2))
     {
       bfd_set_error (bfd_error_malformed_archive);
-      return false;
+      return FALSE;
     }
 
   /* How big is the archive symbol table entry?  */
@@ -5728,7 +5755,7 @@ som_slurp_armap (abfd)
   if (errno != 0)
     {
       bfd_set_error (bfd_error_malformed_archive);
-      return false;
+      return FALSE;
     }
 
   /* Save off the file offset of the first real user data.  */
@@ -5738,23 +5765,23 @@ som_slurp_armap (abfd)
      in just a minute.  */
   amt = sizeof (struct lst_header);
   if (bfd_bread ((PTR) &lst_header, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Sanity check.  */
   if (lst_header.a_magic != LIBMAGIC)
     {
       bfd_set_error (bfd_error_malformed_archive);
-      return false;
+      return FALSE;
     }
 
   /* Count the number of symbols in the library symbol table.  */
   if (! som_bfd_count_ar_symbols (abfd, &lst_header, &ardata->symdef_count))
-    return false;
+    return FALSE;
 
   /* Get back to the start of the library symbol table.  */
   if (bfd_seek (abfd, (ardata->first_file_filepos - parsed_size
 		       + sizeof (struct lst_header)), SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   /* Initializae the cache and allocate space for the library symbols.  */
   ardata->cache = 0;
@@ -5762,20 +5789,20 @@ som_slurp_armap (abfd)
   amt *= sizeof (carsym);
   ardata->symdefs = (carsym *) bfd_alloc (abfd, amt);
   if (!ardata->symdefs)
-    return false;
+    return FALSE;
 
   /* Now fill in the canonical archive symbols.  */
   if (! som_bfd_fill_in_ar_symbols (abfd, &lst_header, &ardata->symdefs))
-    return false;
+    return FALSE;
 
   /* Seek back to the "first" file in the archive.  Note the "first"
      file may be the extended name table.  */
   if (bfd_seek (abfd, ardata->first_file_filepos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   /* Notify the generic archive code that we have a symbol map.  */
-  bfd_has_map (abfd) = true;
-  return true;
+  bfd_has_map (abfd) = TRUE;
+  return TRUE;
 }
 
 /* Begin preparing to write a SOM library symbol table.
@@ -5783,7 +5810,7 @@ som_slurp_armap (abfd)
    As part of the prep work we need to determine the number of symbols
    and the size of the associated string section.  */
 
-static boolean
+static bfd_boolean
 som_bfd_prep_for_ar_write (abfd, num_syms, stringsize)
      bfd *abfd;
      unsigned int *num_syms, *stringsize;
@@ -5812,7 +5839,7 @@ som_bfd_prep_for_ar_write (abfd, num_syms, stringsize)
 	 to it.  It's a little slimey to grab the symbols via obj_som_symtab,
 	 but doing so avoids allocating lots of extra memory.  */
       if (! som_slurp_symbol_table (curr_bfd))
-	return false;
+	return FALSE;
 
       sym = obj_som_symtab (curr_bfd);
       curr_count = bfd_get_symcount (curr_bfd);
@@ -5851,7 +5878,7 @@ som_bfd_prep_for_ar_write (abfd, num_syms, stringsize)
 
       curr_bfd = curr_bfd->next;
     }
-  return true;
+  return TRUE;
 }
 
 /* Hash a symbol name based on the hashing algorithm presented in the
@@ -5874,7 +5901,7 @@ som_bfd_ar_symbol_hash (symbol)
 /* Do the bulk of the work required to write the SOM library
    symbol table.  */
 
-static boolean
+static bfd_boolean
 som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
      bfd *abfd;
      unsigned int nsyms, string_size;
@@ -6111,7 +6138,7 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
     free (lst_syms);
   if (strings != NULL)
     free (strings);
-  return true;
+  return TRUE;
 
  error_return:
   if (hash_table != NULL)
@@ -6125,14 +6152,14 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
   if (strings != NULL)
     free (strings);
 
-  return false;
+  return FALSE;
 }
 
 /* Write out the LST for the archive.
 
    You'll never believe this is really how armaps are handled in SOM...  */
 
-static boolean
+static bfd_boolean
 som_write_armap (abfd, elength, map, orl_count, stridx)
      bfd *abfd;
      unsigned int elength;
@@ -6152,7 +6179,7 @@ som_write_armap (abfd, elength, map, orl_count, stridx)
   if (stat (abfd->filename, &statbuf) != 0)
     {
       bfd_set_error (bfd_error_system_call);
-      return false;
+      return FALSE;
     }
   /* Fudge factor.  */
   bfd_ardata (abfd)->armap_timestamp = statbuf.st_mtime + 60;
@@ -6203,7 +6230,7 @@ som_write_armap (abfd, elength, map, orl_count, stridx)
   /* Count how many symbols we will have on the hash chains and the
      size of the associated string table.  */
   if (! som_bfd_prep_for_ar_write (abfd, &nsyms, &stringsize))
-    return false;
+    return FALSE;
 
   lst_size += sizeof (struct lst_symbol_record) * nsyms;
 
@@ -6241,32 +6268,32 @@ som_write_armap (abfd, elength, map, orl_count, stridx)
   /* Scribble out the ar header.  */
   amt = sizeof (struct ar_hdr);
   if (bfd_bwrite ((PTR) &hdr, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Now scribble out the lst header.  */
   amt = sizeof (struct lst_header);
   if (bfd_bwrite ((PTR) &lst, amt, abfd) != amt)
-    return false;
+    return FALSE;
 
   /* Build and write the armap.  */
   if (!som_bfd_ar_write_symbol_stuff (abfd, nsyms, stringsize, lst, elength))
-    return false;
+    return FALSE;
 
   /* Done.  */
-  return true;
+  return TRUE;
 }
 
 /* Free all information we have cached for this BFD.  We can always
    read it again later if we need it.  */
 
-static boolean
+static bfd_boolean
 som_bfd_free_cached_info (abfd)
      bfd *abfd;
 {
   asection *o;
 
   if (bfd_get_format (abfd) != bfd_object)
-    return true;
+    return TRUE;
 
 #define FREE(x) if (x != NULL) { free (x); x = NULL; }
   /* Free the native string and symbol tables.  */
@@ -6282,14 +6309,14 @@ som_bfd_free_cached_info (abfd)
     }
 #undef FREE
 
-  return true;
+  return TRUE;
 }
 
 /* End of miscellaneous support functions.  */
 
 /* Linker support functions.  */
 
-static boolean
+static bfd_boolean
 som_bfd_link_split_section (abfd, sec)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec;
@@ -6310,7 +6337,7 @@ som_bfd_link_split_section (abfd, sec)
 #define som_update_armap_timestamp	bfd_true
 #define som_bfd_print_private_bfd_data  _bfd_generic_bfd_print_private_bfd_data
 
-#define som_get_lineno                  _bfd_nosymbols_get_lineno
+#define som_get_lineno			_bfd_nosymbols_get_lineno
 #define som_bfd_make_debug_symbol	_bfd_nosymbols_bfd_make_debug_symbol
 #define som_read_minisymbols		_bfd_generic_read_minisymbols
 #define som_minisymbol_to_symbol	_bfd_generic_minisymbol_to_symbol
diff --git a/bfd/som.h b/bfd/som.h
index 94f03ab9f18..12ac66678bb 100644
--- a/bfd/som.h
+++ b/bfd/som.h
@@ -1,6 +1,6 @@
 /* HP PA-RISC SOM object file format:  definitions internal to BFD.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
+   2002 Free Software Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
@@ -225,16 +225,16 @@ struct som_section_data_struct
 #define R_HPPA_END_TRY			R_END_TRY
 
 /* Exported functions, mostly for use by GAS.  */
-boolean bfd_som_set_section_attributes PARAMS ((asection *, int, int,
-						unsigned int, int));
-boolean bfd_som_set_subsection_attributes PARAMS ((asection *, asection *,
-						   int, unsigned int, int));
+bfd_boolean bfd_som_set_section_attributes
+  PARAMS ((asection *, int, int, unsigned int, int));
+bfd_boolean bfd_som_set_subsection_attributes
+  PARAMS ((asection *, asection *, int, unsigned int, int));
 void bfd_som_set_symbol_type PARAMS ((asymbol *, unsigned int));
-boolean bfd_som_attach_aux_hdr PARAMS ((bfd *, int, char *));
+bfd_boolean bfd_som_attach_aux_hdr PARAMS ((bfd *, int, char *));
 int ** hppa_som_gen_reloc_type
   PARAMS ((bfd *, int, int, enum hppa_reloc_field_selector_type_alt,
 	   int, asymbol *));
-boolean bfd_som_attach_compilation_unit
+bfd_boolean bfd_som_attach_compilation_unit
   PARAMS ((bfd *, const char *, const char *, const char *, const char *));
 
 #endif /* _SOM_H */
diff --git a/bfd/sparclinux.c b/bfd/sparclinux.c
index e55a4ffc2b2..4352727a206 100644
--- a/bfd/sparclinux.c
+++ b/bfd/sparclinux.c
@@ -19,12 +19,12 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.  */
 
-#define TARGET_PAGE_SIZE        4096
-#define ZMAGIC_DISK_BLOCK_SIZE 1024
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define TEXT_START_ADDR        0x0
-#define N_SHARED_LIB(x) 0
-#define BYTES_IN_WORD 4
+#define TARGET_PAGE_SIZE	4096
+#define ZMAGIC_DISK_BLOCK_SIZE	1024
+#define SEGMENT_SIZE		TARGET_PAGE_SIZE
+#define TEXT_START_ADDR		0x0
+#define N_SHARED_LIB(x)		0
+#define BYTES_IN_WORD		4
 
 #define MACHTYPE_OK(mtype) ((mtype) == M_SPARC || (mtype) == M_UNKNOWN)
 
@@ -52,10 +52,10 @@ extern const bfd_target MY(vec);
 static void MY_final_link_callback
   PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
 
-static boolean sparclinux_bfd_final_link
+static bfd_boolean sparclinux_bfd_final_link
   PARAMS ((bfd *abfd, struct bfd_link_info *info));
 
-static boolean
+static bfd_boolean
 sparclinux_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -68,9 +68,9 @@ sparclinux_bfd_final_link (abfd, info)
 
 /* Set the machine type correctly.  */
 
-static boolean sparclinux_write_object_contents PARAMS ((bfd *abfd));
+static bfd_boolean sparclinux_write_object_contents PARAMS ((bfd *abfd));
 
-static boolean
+static bfd_boolean
 sparclinux_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -83,7 +83,7 @@ sparclinux_write_object_contents (abfd)
 
   WRITE_HEADERS(abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 #define MY_write_object_contents sparclinux_write_object_contents
@@ -92,7 +92,7 @@ sparclinux_write_object_contents (abfd)
 /* See if a symbol name is a reference to the global offset table.  */
 
 #ifndef GOT_REF_PREFIX
-#define        GOT_REF_PREFIX  "__GOT_"
+#define GOT_REF_PREFIX  "__GOT_"
 #endif
 
 #define IS_GOT_SYM(name) \
@@ -101,7 +101,7 @@ sparclinux_write_object_contents (abfd)
 /* See if a symbol name is a reference to the procedure linkage table.  */
 
 #ifndef PLT_REF_PREFIX
-#define        PLT_REF_PREFIX  "__PLT_"
+#define PLT_REF_PREFIX  "__PLT_"
 #endif
 
 #define IS_PLT_SYM(name) \
@@ -179,16 +179,16 @@ static struct bfd_link_hash_table *linux_link_hash_table_create
   PARAMS ((bfd *));
 static struct fixup *new_fixup
   PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
-          bfd_vma, int));
-static boolean linux_link_create_dynamic_sections
+	  bfd_vma, int));
+static bfd_boolean linux_link_create_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean linux_add_one_symbol
+static bfd_boolean linux_add_one_symbol
   PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-          bfd_vma, const char *, boolean, boolean,
-          struct bfd_link_hash_entry **));
-static boolean linux_tally_symbols
+	  bfd_vma, const char *, bfd_boolean, bfd_boolean,
+	  struct bfd_link_hash_entry **));
+static bfd_boolean linux_tally_symbols
   PARAMS ((struct linux_link_hash_entry *, PTR));
-static boolean linux_finish_dynamic_link
+static bfd_boolean linux_finish_dynamic_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
 /* Routine to create an entry in an Linux link hash table.  */
@@ -205,14 +205,14 @@ linux_link_hash_newfunc (entry, table, string)
      subclass.  */
   if (ret == (struct linux_link_hash_entry *) NULL)
     ret = ((struct linux_link_hash_entry *)
-          bfd_hash_allocate (table, sizeof (struct linux_link_hash_entry)));
+	   bfd_hash_allocate (table, sizeof (struct linux_link_hash_entry)));
   if (ret == NULL)
     return (struct bfd_hash_entry *) ret;
 
   /* Call the allocation method of the superclass.  */
   ret = ((struct linux_link_hash_entry *)
-        NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
-                                      table, string));
+	 NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
+				       table, string));
   if (ret != NULL)
     {
       /* Set local fields; there aren't any.  */
@@ -234,7 +234,7 @@ linux_link_hash_table_create (abfd)
   if (ret == (struct linux_link_hash_table *) NULL)
     return (struct bfd_link_hash_table *) NULL;
   if (! NAME(aout,link_hash_table_init) (&ret->root, abfd,
-                                        linux_link_hash_newfunc))
+					 linux_link_hash_newfunc))
     {
       free (ret);
       return (struct bfd_link_hash_table *) NULL;
@@ -253,14 +253,14 @@ linux_link_hash_table_create (abfd)
 #define linux_link_hash_lookup(table, string, create, copy, follow) \
   ((struct linux_link_hash_entry *) \
    aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
-                         (follow)))
+			  (follow)))
 
 /* Traverse a Linux link hash table.  */
 
-#define linux_link_hash_traverse(table, func, info)                    \
-  (aout_link_hash_traverse                                             \
-   (&(table)->root,                                                    \
-    (boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func), \
+#define linux_link_hash_traverse(table, func, info)		       \
+  (aout_link_hash_traverse					       \
+   (&(table)->root,						       \
+    (bfd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the Linux link hash table from the info structure.  This is
@@ -280,7 +280,7 @@ new_fixup (info, h, value, builtin)
   struct fixup *f;
 
   f = (struct fixup *) bfd_hash_allocate (&info->hash->table,
-                                         sizeof (struct fixup));
+					  sizeof (struct fixup));
   if (f == NULL)
     return f;
   f->next = linux_hash_table (info)->fixup_list;
@@ -300,7 +300,7 @@ new_fixup (info, h, value, builtin)
    know the size of the section, but that's OK - we just need to
    create it for now.  */
 
-static boolean
+static bfd_boolean
 linux_link_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -312,25 +312,25 @@ linux_link_create_dynamic_sections (abfd, info)
   flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
 
   /* We choose to use the name ".linux-dynamic" for the fixup table.
-     Why not? */
+     Why not?  */
   s = bfd_make_section (abfd, ".linux-dynamic");
   if (s == NULL
       || ! bfd_set_section_flags (abfd, s, flags)
       || ! bfd_set_section_alignment (abfd, s, 2))
-    return false;
+    return FALSE;
   s->_raw_size = 0;
   s->contents = 0;
 
-  return true;
+  return TRUE;
 }
 
 /* Function to add a single symbol to the linker hash table.  This is
    a wrapper around _bfd_generic_link_add_one_symbol which handles the
    tweaking needed for dynamic linking support.  */
 
-static boolean
+static bfd_boolean
 linux_add_one_symbol (info, abfd, name, flags, section, value, string,
-                     copy, collect, hashp)
+		      copy, collect, hashp)
      struct bfd_link_info *info;
      bfd *abfd;
      const char *name;
@@ -338,12 +338,12 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
      asection *section;
      bfd_vma value;
      const char *string;
-     boolean copy;
-     boolean collect;
+     bfd_boolean copy;
+     bfd_boolean collect;
      struct bfd_link_hash_entry **hashp;
 {
   struct linux_link_hash_entry *h;
-  boolean insert;
+  bfd_boolean insert;
 
   /* Look up and see if we already have this symbol in the hash table.
      If we do, and the defining entry is from a shared library, we
@@ -353,7 +353,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
      be able to link Linux a.out and ELF objects together, but serious
      confusion is possible.  */
 
-  insert = false;
+  insert = FALSE;
 
   if (! info->relocateable
       && linux_hash_table (info)->dynobj == NULL
@@ -362,60 +362,60 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
       && abfd->xvec == info->hash->creator)
     {
       if (! linux_link_create_dynamic_sections (abfd, info))
-       return false;
+	return FALSE;
       linux_hash_table (info)->dynobj = abfd;
-      insert = true;
+      insert = TRUE;
     }
 
   if (bfd_is_abs_section (section)
       && abfd->xvec == info->hash->creator)
     {
-      h = linux_link_hash_lookup (linux_hash_table (info), name, false,
-                                 false, false);
+      h = linux_link_hash_lookup (linux_hash_table (info), name, FALSE,
+				  FALSE, FALSE);
       if (h != NULL
-         && (h->root.root.type == bfd_link_hash_defined
-             || h->root.root.type == bfd_link_hash_defweak))
-       {
-         struct fixup *f;
+	  && (h->root.root.type == bfd_link_hash_defined
+	      || h->root.root.type == bfd_link_hash_defweak))
+	{
+	  struct fixup *f;
 
-         if (hashp != NULL)
-           *hashp = (struct bfd_link_hash_entry *) h;
+	  if (hashp != NULL)
+	    *hashp = (struct bfd_link_hash_entry *) h;
 
-         f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
-         if (f == NULL)
-           return false;
-         f->jump = IS_PLT_SYM (name);
+	  f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
+	  if (f == NULL)
+	    return FALSE;
+	  f->jump = IS_PLT_SYM (name);
 
-         return true;
-       }
+	  return TRUE;
+	}
     }
 
   /* Do the usual procedure for adding a symbol.  */
   if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
-                                         value, string, copy, collect,
-                                         hashp))
-    return false;
+					  value, string, copy, collect,
+					  hashp))
+    return FALSE;
 
   /* Insert a pointer to our table in the set vector.  The dynamic
-     linker requires this information */
+     linker requires this information.  */
   if (insert)
     {
       asection *s;
 
       /* Here we do our special thing to add the pointer to the
-        dynamic section in the SHARABLE_CONFLICTS set vector.  */
+	 dynamic section in the SHARABLE_CONFLICTS set vector.  */
       s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-                                  ".linux-dynamic");
+				   ".linux-dynamic");
       BFD_ASSERT (s != NULL);
 
       if (! (_bfd_generic_link_add_one_symbol
-            (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
-             BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
-	     false, false, NULL)))
-       return false;
+	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
+	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
+	      FALSE, FALSE, NULL)))
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We will crawl the hash table and come here for every global symbol.
@@ -428,7 +428,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string,
 
    This function is called via linux_link_hash_traverse.  */
 
-static boolean
+static bfd_boolean
 linux_tally_symbols (h, data)
      struct linux_link_hash_entry *h;
      PTR data;
@@ -437,14 +437,14 @@ linux_tally_symbols (h, data)
   struct fixup *f, *f1;
   int is_plt;
   struct linux_link_hash_entry *h1, *h2;
-  boolean exists;
+  bfd_boolean exists;
 
   if (h->root.root.type == bfd_link_hash_warning)
     h = (struct linux_link_hash_entry *) h->root.root.u.i.link;
 
   if (h->root.root.type == bfd_link_hash_undefined
       && strncmp (h->root.root.root.string, NEEDS_SHRLIB,
-                 sizeof NEEDS_SHRLIB - 1) == 0)
+		  sizeof NEEDS_SHRLIB - 1) == 0)
     {
       const char *name;
       char *p;
@@ -453,21 +453,21 @@ linux_tally_symbols (h, data)
       name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
       p = strrchr (name, '_');
       if (p != NULL)
-       alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
+	alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
 
       if (p == NULL || alloc == NULL)
-       (*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
-                              name);
+	(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
+			       name);
       else
-       {
-         strcpy (alloc, name);
-         p = strrchr (alloc, '_');
-         *p++ = '\0';
-         (*_bfd_error_handler)
-           (_("Output file requires shared library `%s.so.%s'\n"),
-            alloc, p);
-         free (alloc);
-       }
+	{
+	  strcpy (alloc, name);
+	  p = strrchr (alloc, '_');
+	  *p++ = '\0';
+	  (*_bfd_error_handler)
+	    (_("Output file requires shared library `%s.so.%s'\n"),
+	     alloc, p);
+	  free (alloc);
+	}
 
       abort ();
     }
@@ -479,75 +479,75 @@ linux_tally_symbols (h, data)
   if (is_plt || IS_GOT_SYM (h->root.root.root.string))
     {
       /* Look up this symbol twice.  Once just as a regular lookup,
-        and then again following all of the indirect links until we
-        reach a real symbol.  */
+	 and then again following all of the indirect links until we
+	 reach a real symbol.  */
       h1 = linux_link_hash_lookup (linux_hash_table (info),
-                                  (h->root.root.root.string
-                                   + sizeof PLT_REF_PREFIX - 1),
-                                  false, false, true);
+				   (h->root.root.root.string
+				    + sizeof PLT_REF_PREFIX - 1),
+				   FALSE, FALSE, TRUE);
       /* h2 does not follow indirect symbols.  */
       h2 = linux_link_hash_lookup (linux_hash_table (info),
-                                  (h->root.root.root.string
-                                   + sizeof PLT_REF_PREFIX - 1),
-                                  false, false, false);
+				   (h->root.root.root.string
+				    + sizeof PLT_REF_PREFIX - 1),
+				   FALSE, FALSE, FALSE);
 
       /* The real symbol must exist but if it is also an ABS symbol,
-        there is no need to have a fixup.  This is because they both
-        came from the same library.  If on the other hand, we had to
-        use an indirect symbol to get to the real symbol, we add the
-        fixup anyway, since there are cases where these symbols come
-        from different shared libraries */
+	 there is no need to have a fixup.  This is because they both
+	 came from the same library.  If on the other hand, we had to
+	 use an indirect symbol to get to the real symbol, we add the
+	 fixup anyway, since there are cases where these symbols come
+	 from different shared libraries */
       if (h1 != NULL
-         && (((h1->root.root.type == bfd_link_hash_defined
-               || h1->root.root.type == bfd_link_hash_defweak)
-              && ! bfd_is_abs_section (h1->root.root.u.def.section))
-             || h2->root.root.type == bfd_link_hash_indirect))
-       {
-         /* See if there is a "builtin" fixup already present
-            involving this symbol.  If so, convert it to a regular
-            fixup.  In the end, this relaxes some of the requirements
-            about the order of performing fixups.  */
-         exists = false;
-         for (f1 = linux_hash_table (info)->fixup_list;
-              f1 != NULL;
-              f1 = f1->next)
-           {
-             if ((f1->h != h && f1->h != h1)
-                 || (! f1->builtin && ! f1->jump))
-               continue;
-             if (f1->h == h1)
-              exists = true;
-             if (! exists
-                 && bfd_is_abs_section (h->root.root.u.def.section))
-               {
-                 f = new_fixup (info, h1, f1->h->root.root.u.def.value, 0);
-                 f->jump = is_plt;
-               }
-             f1->h = h1;
-             f1->jump = is_plt;
-             f1->builtin = 0;
-             exists = true;
-           }
-         if (! exists
-             && bfd_is_abs_section (h->root.root.u.def.section))
-           {
-             f = new_fixup (info, h1, h->root.root.u.def.value, 0);
-             if (f == NULL)
-               {
-                 /* FIXME: No way to return error.  */
-                 abort ();
-               }
-             f->jump = is_plt;
-           }
-       }
+	  && (((h1->root.root.type == bfd_link_hash_defined
+		|| h1->root.root.type == bfd_link_hash_defweak)
+	       && ! bfd_is_abs_section (h1->root.root.u.def.section))
+	      || h2->root.root.type == bfd_link_hash_indirect))
+	{
+	  /* See if there is a "builtin" fixup already present
+	     involving this symbol.  If so, convert it to a regular
+	     fixup.  In the end, this relaxes some of the requirements
+	     about the order of performing fixups.  */
+	  exists = FALSE;
+	  for (f1 = linux_hash_table (info)->fixup_list;
+	       f1 != NULL;
+	       f1 = f1->next)
+	    {
+	      if ((f1->h != h && f1->h != h1)
+		  || (! f1->builtin && ! f1->jump))
+		continue;
+	      if (f1->h == h1)
+		exists = TRUE;
+	      if (! exists
+		  && bfd_is_abs_section (h->root.root.u.def.section))
+		{
+		  f = new_fixup (info, h1, f1->h->root.root.u.def.value, 0);
+		  f->jump = is_plt;
+		}
+	      f1->h = h1;
+	      f1->jump = is_plt;
+	      f1->builtin = 0;
+	      exists = TRUE;
+	    }
+	  if (! exists
+	      && bfd_is_abs_section (h->root.root.u.def.section))
+	    {
+	      f = new_fixup (info, h1, h->root.root.u.def.value, 0);
+	      if (f == NULL)
+		{
+		  /* FIXME: No way to return error.  */
+		  abort ();
+		}
+	      f->jump = is_plt;
+	    }
+	}
 
       /* Quick and dirty way of stripping these symbols from the
-        symtab.  */
+	 symtab.  */
       if (bfd_is_abs_section (h->root.root.u.def.section))
-       h->root.written = true;
+	h->root.written = TRUE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called to set the size of the .linux-dynamic section is.
@@ -556,7 +556,7 @@ linux_tally_symbols (h, data)
    we just scan the hash tables to find out how many additional fixups
    are required.  */
 
-boolean
+bfd_boolean
 bfd_sparclinux_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -565,12 +565,12 @@ bfd_sparclinux_size_dynamic_sections (output_bfd, info)
   asection *s;
 
   if (output_bfd->xvec != &MY(vec))
-    return true;
+    return TRUE;
 
   /* First find the fixups...  */
   linux_link_hash_traverse (linux_hash_table (info),
-                           linux_tally_symbols,
-                           (PTR) info);
+			    linux_tally_symbols,
+			    (PTR) info);
 
   /* If there are builtin fixups, leave room for a marker.  This is
      used by the dynamic linker so that it knows that all that follow
@@ -578,40 +578,40 @@ bfd_sparclinux_size_dynamic_sections (output_bfd, info)
   for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
     {
       if (f->builtin)
-       {
-         ++linux_hash_table (info)->fixup_count;
-         ++linux_hash_table (info)->local_builtins;
-         break;
-       }
+	{
+	  ++linux_hash_table (info)->fixup_count;
+	  ++linux_hash_table (info)->local_builtins;
+	  break;
+	}
     }
 
   if (linux_hash_table (info)->dynobj == NULL)
     {
       if (linux_hash_table (info)->fixup_count > 0)
-      abort ();
-      return true;
+	abort ();
+      return TRUE;
     }
 
   /* Allocate memory for our fixup table.  We will fill it in later.  */
   s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-                              ".linux-dynamic");
+			       ".linux-dynamic");
   if (s != NULL)
     {
       s->_raw_size = linux_hash_table (info)->fixup_count + 1;
       s->_raw_size *= 8;
       s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->_raw_size);
       if (s->contents == NULL)
-       return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We come here once we are ready to actually write the fixup table to
    the output file.  Scan the fixup tables and so forth and generate
    the stuff we need.  */
 
-static boolean
+static bfd_boolean
 linux_finish_dynamic_link (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -625,18 +625,18 @@ linux_finish_dynamic_link (output_bfd, info)
   unsigned int fixups_written;
 
   if (linux_hash_table (info)->dynobj == NULL)
-    return true;
+    return TRUE;
 
   s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-                              ".linux-dynamic");
+			       ".linux-dynamic");
   BFD_ASSERT (s != NULL);
   os = s->output_section;
   fixups_written = 0;
 
 #ifdef LINUX_LINK_DEBUG
   printf ("Fixup table file offset: %x  VMA: %x\n",
-         os->filepos + s->output_offset,
-         os->vma + s->output_offset);
+	  os->filepos + s->output_offset,
+	  os->vma + s->output_offset);
 #endif
 
   fixup_table = s->contents;
@@ -648,16 +648,16 @@ linux_finish_dynamic_link (output_bfd, info)
   for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
     {
       if (f->builtin)
-       continue;
+	continue;
 
       if (f->h->root.root.type != bfd_link_hash_defined
-         && f->h->root.root.type != bfd_link_hash_defweak)
-       {
-         (*_bfd_error_handler)
-           (_("Symbol %s not defined for fixups\n"),
-            f->h->root.root.root.string);
-         continue;
-       }
+	  && f->h->root.root.type != bfd_link_hash_defweak)
+	{
+	  (*_bfd_error_handler)
+	    (_("Symbol %s not defined for fixups\n"),
+	     f->h->root.root.root.string);
+	  continue;
+	}
 
       is = f->h->root.root.u.def.section;
       section_offset = is->output_section->vma + is->output_offset;
@@ -665,25 +665,25 @@ linux_finish_dynamic_link (output_bfd, info)
 
 #ifdef LINUX_LINK_DEBUG
       printf ("Fixup(%d) %s: %x %x\n",f->jump, f->h->root.root.string,
-             new_addr, f->value);
+	      new_addr, f->value);
 #endif
 
       if (f->jump)
-       {
-         /* Relative address */
-         new_addr = new_addr - (f->value + 5);
-	 bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
-         fixup_table += 4;
-         bfd_put_32 (output_bfd, f->value + 1, fixup_table);
-         fixup_table += 4;
-       }
+	{
+	  /* Relative address */
+	  new_addr = new_addr - (f->value + 5);
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value + 1, fixup_table);
+	  fixup_table += 4;
+	}
       else
-       {
-         bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
-         fixup_table += 4;
-         bfd_put_32 (output_bfd, f->value, fixup_table);
-         fixup_table += 4;
-       }
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value, fixup_table);
+	  fixup_table += 4;
+	}
       ++fixups_written;
     }
 
@@ -696,56 +696,56 @@ linux_finish_dynamic_link (output_bfd, info)
       fixup_table += 4;
       ++fixups_written;
       for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-       {
-         if (! f->builtin)
-           continue;
-
-         if (f->h->root.root.type != bfd_link_hash_defined
-             && f->h->root.root.type != bfd_link_hash_defweak)
-           {
-             (*_bfd_error_handler)
-               (_("Symbol %s not defined for fixups\n"),
-                f->h->root.root.root.string);
-             continue;
-           }
-
-         is = f->h->root.root.u.def.section;
-         section_offset = is->output_section->vma + is->output_offset;
-         new_addr = f->h->root.root.u.def.value + section_offset;
+	{
+	  if (! f->builtin)
+	    continue;
+
+	  if (f->h->root.root.type != bfd_link_hash_defined
+	      && f->h->root.root.type != bfd_link_hash_defweak)
+	    {
+	      (*_bfd_error_handler)
+		(_("Symbol %s not defined for fixups\n"),
+		 f->h->root.root.root.string);
+	      continue;
+	    }
+
+	  is = f->h->root.root.u.def.section;
+	  section_offset = is->output_section->vma + is->output_offset;
+	  new_addr = f->h->root.root.u.def.value + section_offset;
 
 #ifdef LINUX_LINK_DEBUG
-         printf ("Fixup(B) %s: %x %x\n", f->h->root.root.string,
-                 new_addr, f->value);
+	  printf ("Fixup(B) %s: %x %x\n", f->h->root.root.string,
+		  new_addr, f->value);
 #endif
 
-         bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
-         fixup_table += 4;
-         bfd_put_32 (output_bfd, f->value, fixup_table);
-         fixup_table += 4;
-         ++fixups_written;
-       }
-  }
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value, fixup_table);
+	  fixup_table += 4;
+	  ++fixups_written;
+	}
+    }
 
   if (linux_hash_table (info)->fixup_count != fixups_written)
     {
       (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
       while (linux_hash_table (info)->fixup_count > fixups_written)
-       {
-         bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
-         fixup_table += 4;
-         bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
-         fixup_table += 4;
-         ++fixups_written;
-       }
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+	  fixup_table += 4;
+	  ++fixups_written;
+	}
     }
 
   h = linux_link_hash_lookup (linux_hash_table (info),
-                             "__BUILTIN_FIXUPS__",
-                             false, false, false);
+			      "__BUILTIN_FIXUPS__",
+			      FALSE, FALSE, FALSE);
 
   if (h != NULL
       && (h->root.root.type == bfd_link_hash_defined
-         || h->root.root.type == bfd_link_hash_defweak))
+	  || h->root.root.type == bfd_link_hash_defweak))
     {
       is = h->root.root.u.def.section;
       section_offset = is->output_section->vma + is->output_offset;
@@ -762,13 +762,12 @@ linux_finish_dynamic_link (output_bfd, info)
 
   if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset),
 		SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
-  if (bfd_bwrite ((PTR) s->contents, s->_raw_size, output_bfd)
-      != s->_raw_size)
-    return false;
+  if (bfd_bwrite ((PTR) s->contents, s->_raw_size, output_bfd) != s->_raw_size)
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 #define MY_bfd_link_hash_table_create linux_link_hash_table_create
diff --git a/bfd/sparclynx.c b/bfd/sparclynx.c
index 4da604f489a..84d9d4a9d0a 100644
--- a/bfd/sparclynx.c
+++ b/bfd/sparclynx.c
@@ -1,6 +1,6 @@
 /* BFD support for Sparc binaries under LynxOS.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000,
-   2001 Free Software Foundation, Inc.
+   2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 void NAME (lynx,set_arch_mach) PARAMS ((bfd *, unsigned long));
 static void choose_reloc_size PARAMS ((bfd *));
-static boolean NAME (aout,sparclynx_write_object_contents) PARAMS ((bfd *));
+static bfd_boolean NAME (aout,sparclynx_write_object_contents) PARAMS ((bfd *));
 
 /* This is needed to reject a NewsOS file, e.g. in
    gdb/testsuite/gdb.t10/crossload.exp. <kingdon@cygnus.com>
@@ -163,7 +163,7 @@ choose_reloc_size (abfd)
   Section contents have already been written.  We write the
   file header, symbols, and relocation.  */
 
-static boolean
+static bfd_boolean
 NAME(aout,sparclynx_write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -204,30 +204,30 @@ NAME(aout,sparclynx_write_object_contents) (abfd)
 
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 #define MY_set_sizes sparclynx_set_sizes
-static boolean sparclynx_set_sizes PARAMS ((bfd *));
+static bfd_boolean sparclynx_set_sizes PARAMS ((bfd *));
 
-static boolean
+static bfd_boolean
 sparclynx_set_sizes (abfd)
      bfd *abfd;
 {
   switch (bfd_get_arch (abfd))
     {
     default:
-      return false;
+      return FALSE;
     case bfd_arch_sparc:
       adata (abfd).page_size = 0x2000;
       adata (abfd).segment_size = 0x2000;
       adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
+      return TRUE;
     case bfd_arch_m68k:
       adata (abfd).page_size = 0x2000;
       adata (abfd).segment_size = 0x20000;
       adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
+      return TRUE;
     }
 }
 
@@ -255,9 +255,9 @@ static const struct aout_backend_data sparclynx_aout_backend =
 
 #ifdef LYNX_CORE
 
-char *  lynx_core_file_failing_command ();
-int     lynx_core_file_failing_signal ();
-boolean lynx_core_file_matches_executable_p ();
+char * lynx_core_file_failing_command ();
+int lynx_core_file_failing_signal ();
+bfd_boolean lynx_core_file_matches_executable_p ();
 const bfd_target * lynx_core_file_p ();
 
 #define	MY_core_file_failing_command lynx_core_file_failing_command
diff --git a/bfd/srec.c b/bfd/srec.c
index 6c29fa16881..f792d971d9f 100644
--- a/bfd/srec.c
+++ b/bfd/srec.c
@@ -114,30 +114,29 @@ static void srec_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
 static void srec_print_symbol
  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
 static void srec_init PARAMS ((void));
-static boolean srec_mkobject PARAMS ((bfd *));
-static int srec_get_byte PARAMS ((bfd *, boolean *));
-static void srec_bad_byte PARAMS ((bfd *, unsigned int, int, boolean));
-static boolean srec_scan PARAMS ((bfd *));
+static bfd_boolean srec_mkobject PARAMS ((bfd *));
+static int srec_get_byte PARAMS ((bfd *, bfd_boolean *));
+static void srec_bad_byte PARAMS ((bfd *, unsigned int, int, bfd_boolean));
+static bfd_boolean srec_scan PARAMS ((bfd *));
 static const bfd_target *srec_object_p PARAMS ((bfd *));
 static const bfd_target *symbolsrec_object_p PARAMS ((bfd *));
-static boolean srec_read_section PARAMS ((bfd *, asection *, bfd_byte *));
-
-static boolean srec_write_record PARAMS ((bfd *, unsigned int, bfd_vma,
-					  const bfd_byte *,
-					  const bfd_byte *));
-static boolean srec_write_header PARAMS ((bfd *));
-static boolean srec_write_symbols PARAMS ((bfd *));
-static boolean srec_new_symbol PARAMS ((bfd *, const char *, bfd_vma));
-static boolean srec_get_section_contents
+static bfd_boolean srec_read_section PARAMS ((bfd *, asection *, bfd_byte *));
+
+static bfd_boolean srec_write_record
+  PARAMS ((bfd *, unsigned int, bfd_vma, const bfd_byte *, const bfd_byte *));
+static bfd_boolean srec_write_header PARAMS ((bfd *));
+static bfd_boolean srec_write_symbols PARAMS ((bfd *));
+static bfd_boolean srec_new_symbol PARAMS ((bfd *, const char *, bfd_vma));
+static bfd_boolean srec_get_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean srec_set_arch_mach
+static bfd_boolean srec_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean srec_set_section_contents
+static bfd_boolean srec_set_section_contents
   PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
-static boolean internal_srec_write_object_contents PARAMS ((bfd *, int));
-static boolean srec_write_object_contents PARAMS ((bfd *));
-static boolean symbolsrec_write_object_contents PARAMS ((bfd *));
-static int srec_sizeof_headers PARAMS ((bfd *, boolean));
+static bfd_boolean internal_srec_write_object_contents PARAMS ((bfd *, int));
+static bfd_boolean srec_write_object_contents PARAMS ((bfd *));
+static bfd_boolean symbolsrec_write_object_contents PARAMS ((bfd *));
+static int srec_sizeof_headers PARAMS ((bfd *, bfd_boolean));
 static long srec_get_symtab_upper_bound PARAMS ((bfd *));
 static long srec_get_symtab PARAMS ((bfd *, asymbol **));
 
@@ -158,11 +157,11 @@ static const char digs[] = "0123456789ABCDEF";
 static void
 srec_init ()
 {
-  static boolean inited = false;
+  static bfd_boolean inited = FALSE;
 
   if (! inited)
     {
-      inited = true;
+      inited = TRUE;
       hex_init ();
     }
 }
@@ -181,7 +180,7 @@ unsigned int Chunk = DEFAULT_CHUNK;
 /* The type of srec output (free or forced to S3).
    This variable can be modified by objcopy's --srec-forceS3
    parameter.  */
-boolean S3Forced = false;
+bfd_boolean S3Forced = FALSE;
 
 /* When writing an S-record file, the S-records can not be output as
    they are seen.  This structure is used to hold them in memory.  */
@@ -220,13 +219,14 @@ typedef struct srec_data_struct
   }
 tdata_type;
 
-static boolean srec_write_section PARAMS ((bfd *, tdata_type *,
-					   srec_data_list_type *));
-static boolean srec_write_terminator PARAMS ((bfd *, tdata_type *));
+static bfd_boolean srec_write_section
+  PARAMS ((bfd *, tdata_type *, srec_data_list_type *));
+static bfd_boolean srec_write_terminator
+  PARAMS ((bfd *, tdata_type *));
 
 /* Set up the S-record tdata information.  */
 
-static boolean
+static bfd_boolean
 srec_mkobject (abfd)
      bfd *abfd;
 {
@@ -238,8 +238,8 @@ srec_mkobject (abfd)
   amt = sizeof (tdata_type);
   tdata = (tdata_type *) bfd_alloc (abfd, amt);
   if (tdata == NULL)
-    return false;
-    
+    return FALSE;
+
   abfd->tdata.srec_data = tdata;
   tdata->type = 1;
   tdata->head = NULL;
@@ -248,7 +248,7 @@ srec_mkobject (abfd)
   tdata->symtail = NULL;
   tdata->csymbols = NULL;
 
-  return true;
+  return TRUE;
 }
 
 /* Read a byte from an S record file.  Set *ERRORPTR if an error
@@ -257,14 +257,14 @@ srec_mkobject (abfd)
 static int
 srec_get_byte (abfd, errorptr)
      bfd *abfd;
-     boolean *errorptr;
+     bfd_boolean *errorptr;
 {
   bfd_byte c;
 
   if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1)
     {
       if (bfd_get_error () != bfd_error_file_truncated)
-	*errorptr = true;
+	*errorptr = TRUE;
       return EOF;
     }
 
@@ -280,7 +280,7 @@ srec_bad_byte (abfd, lineno, c, error)
      bfd *abfd;
      unsigned int lineno;
      int c;
-     boolean error;
+     bfd_boolean error;
 {
   if (c == EOF)
     {
@@ -307,7 +307,7 @@ srec_bad_byte (abfd, lineno, c, error)
 
 /* Add a new symbol found in an S-record file.  */
 
-static boolean
+static bfd_boolean
 srec_new_symbol (abfd, name, val)
      bfd *abfd;
      const char *name;
@@ -318,7 +318,7 @@ srec_new_symbol (abfd, name, val)
 
   n = (struct srec_symbol *) bfd_alloc (abfd, amt);
   if (n == NULL)
-    return false;
+    return FALSE;
 
   n->name = name;
   n->val = val;
@@ -332,19 +332,19 @@ srec_new_symbol (abfd, name, val)
 
   ++abfd->symcount;
 
-  return true;
+  return TRUE;
 }
 
 /* Read the S record file and turn it into sections.  We create a new
    section for each contiguous set of bytes.  */
 
-static boolean
+static bfd_boolean
 srec_scan (abfd)
      bfd *abfd;
 {
   int c;
   unsigned int lineno = 1;
-  boolean error = false;
+  bfd_boolean error = FALSE;
   bfd_byte *buf = NULL;
   size_t bufsize = 0;
   asection *sec = NULL;
@@ -356,7 +356,7 @@ srec_scan (abfd)
   while ((c = srec_get_byte (abfd, &error)) != EOF)
     {
       /* We only build sections from contiguous S-records, so if this
-         is not an S-record, then stop building a section.  */
+	 is not an S-record, then stop building a section.  */
       if (c != 'S' && c != '\r' && c != '\n')
 	sec = NULL;
 
@@ -542,7 +542,7 @@ srec_scan (abfd)
 	      case '0':
 	      case '5':
 		/* Prologue--ignore the file name, but stop building a
-                   section at this point.  */
+		   section at this point.  */
 		sec = NULL;
 		break;
 
@@ -567,7 +567,7 @@ srec_scan (abfd)
 		    && sec->vma + sec->_raw_size == address)
 		  {
 		    /* This data goes at the end of the section we are
-                       currently building.  */
+		       currently building.  */
 		    sec->_raw_size += bytes;
 		  }
 		else
@@ -612,7 +612,7 @@ srec_scan (abfd)
 		if (buf != NULL)
 		  free (buf);
 
-		return true;
+		return TRUE;
 	      }
 	  }
 	  break;
@@ -625,14 +625,14 @@ srec_scan (abfd)
   if (buf != NULL)
     free (buf);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (symbuf != NULL)
     free (symbuf);
   if (buf != NULL)
     free (buf);
-  return false;
+  return FALSE;
 }
 
 /* Check whether an existing file is an S-record file.  */
@@ -709,7 +709,7 @@ symbolsrec_object_p (abfd)
 
 /* Read in the contents of a section in an S-record file.  */
 
-static boolean
+static bfd_boolean
 srec_read_section (abfd, section, contents)
      bfd *abfd;
      asection *section;
@@ -717,7 +717,7 @@ srec_read_section (abfd, section, contents)
 {
   int c;
   bfd_size_type sofar = 0;
-  boolean error = false;
+  bfd_boolean error = FALSE;
   bfd_byte *buf = NULL;
   size_t bufsize = 0;
 
@@ -735,7 +735,7 @@ srec_read_section (abfd, section, contents)
 	continue;
 
       /* This is called after srec_scan has already been called, so we
-         ought to know the exact format.  */
+	 ought to know the exact format.  */
       BFD_ASSERT (c == 'S');
 
       if (bfd_bread (hdr, (bfd_size_type) 3, abfd) != 3)
@@ -766,7 +766,7 @@ srec_read_section (abfd, section, contents)
 	  BFD_ASSERT (sofar == section->_raw_size);
 	  if (buf != NULL)
 	    free (buf);
-	  return true;
+	  return TRUE;
 
 	case '3':
 	  address = HEX (data);
@@ -791,7 +791,7 @@ srec_read_section (abfd, section, contents)
 	      BFD_ASSERT (sofar == section->_raw_size);
 	      if (buf != NULL)
 		free (buf);
-	      return true;
+	      return TRUE;
 	    }
 
 	  /* Don't consider checksum.  */
@@ -816,17 +816,17 @@ srec_read_section (abfd, section, contents)
   if (buf != NULL)
     free (buf);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (buf != NULL)
     free (buf);
-  return false;
+  return FALSE;
 }
 
 /* Get the contents of a section in an S-record file.  */
 
-static boolean
+static bfd_boolean
 srec_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -838,21 +838,21 @@ srec_get_section_contents (abfd, section, location, offset, count)
     {
       section->used_by_bfd = bfd_alloc (abfd, section->_raw_size);
       if (section->used_by_bfd == NULL && section->_raw_size != 0)
-	return false;
+	return FALSE;
 
       if (! srec_read_section (abfd, section, section->used_by_bfd))
-	return false;
+	return FALSE;
     }
 
   memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
 	  (size_t) count);
 
-  return true;
+  return TRUE;
 }
 
 /* Set the architecture.  We accept an unknown architecture here.  */
 
-static boolean
+static bfd_boolean
 srec_set_arch_mach (abfd, arch, mach)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -861,14 +861,14 @@ srec_set_arch_mach (abfd, arch, mach)
   if (arch == bfd_arch_unknown)
     {
       abfd->arch_info = &bfd_default_arch_struct;
-      return true;
+      return TRUE;
     }
   return bfd_default_set_arch_mach (abfd, arch, mach);
 }
 
 /* We have to save up all the Srecords for a splurge before output.  */
 
-static boolean
+static bfd_boolean
 srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
      bfd *abfd;
      sec_ptr section;
@@ -882,7 +882,7 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
   entry = ((srec_data_list_type *)
 	   bfd_alloc (abfd, (bfd_size_type) sizeof (srec_data_list_type)));
   if (entry == NULL)
-    return false;
+    return FALSE;
 
   if (bytes_to_do
       && (section->flags & SEC_ALLOC)
@@ -892,10 +892,10 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
 
       data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do);
       if (data == NULL)
-	return false;
+	return FALSE;
       memcpy ((PTR) data, location, (size_t) bytes_to_do);
 
-      /* Ff S3Forced is true then always select S3 records,
+      /* Ff S3Forced is TRUE then always select S3 records,
 	 regardless of the siez of the addresses.  */
       if (S3Forced)
 	tdata->type = 3;
@@ -912,7 +912,7 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
       entry->size = bytes_to_do;
 
       /* Sort the records by address.  Optimize for the common case of
-         adding a record to the end of the list.  */
+	 adding a record to the end of the list.  */
       if (tdata->tail != NULL
 	  && entry->where >= tdata->tail->where)
 	{
@@ -934,14 +934,14 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
 	    tdata->tail = entry;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /* Write a record of type, of the supplied number of bytes. The
    supplied bytes and length don't have a checksum. That's worked out
    here.  */
 
-static boolean
+static bfd_boolean
 srec_write_record (abfd, type, address, data, end)
      bfd *abfd;
      unsigned int type;
@@ -999,11 +999,11 @@ srec_write_record (abfd, type, address, data, end)
   *dst++ = '\n';
   wrlen = dst - buffer;
   if (bfd_bwrite ((PTR) buffer, wrlen, abfd) != wrlen)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 srec_write_header (abfd)
      bfd *abfd;
 {
@@ -1017,7 +1017,7 @@ srec_write_header (abfd)
 			    abfd->filename, abfd->filename + len);
 }
 
-static boolean
+static bfd_boolean
 srec_write_section (abfd, tdata, list)
      bfd *abfd;
      tdata_type *tdata;
@@ -1052,16 +1052,16 @@ srec_write_section (abfd, tdata, list)
 			       address,
 			       location,
 			       location + octets_this_chunk))
-	return false;
+	return FALSE;
 
       octets_written += octets_this_chunk;
       location += octets_this_chunk;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 srec_write_terminator (abfd, tdata)
      bfd *abfd;
      tdata_type *tdata;
@@ -1070,7 +1070,7 @@ srec_write_terminator (abfd, tdata)
 			    abfd->start_address, NULL, NULL);
 }
 
-static boolean
+static bfd_boolean
 srec_write_symbols (abfd)
      bfd *abfd;
 {
@@ -1086,7 +1086,7 @@ srec_write_symbols (abfd)
       if (bfd_bwrite ("$$ ", (bfd_size_type) 3, abfd) != 3
 	  || bfd_bwrite (abfd->filename, len, abfd) != len
 	  || bfd_bwrite ("\r\n", (bfd_size_type) 2, abfd) != 2)
-	return false;
+	return FALSE;
 
       for (i = 0; i < count; i++)
 	{
@@ -1100,7 +1100,7 @@ srec_write_symbols (abfd)
 	      len = strlen (s->name);
 	      if (bfd_bwrite ("  ", (bfd_size_type) 2, abfd) != 2
 		  || bfd_bwrite (s->name, len, abfd) != len)
-		return false;
+		return FALSE;
 
 	      sprintf_vma (buf + 1, (s->value
 				     + s->section->output_section->lma
@@ -1114,17 +1114,17 @@ srec_write_symbols (abfd)
 	      *--p = ' ';
 	      len += 3;
 	      if (bfd_bwrite (p, len, abfd) != len)
-		return false;
+		return FALSE;
 	    }
 	}
       if (bfd_bwrite ("$$ \r\n", (bfd_size_type) 5, abfd) != 5)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 internal_srec_write_object_contents (abfd, symbols)
      bfd *abfd;
      int symbols;
@@ -1135,11 +1135,11 @@ internal_srec_write_object_contents (abfd, symbols)
   if (symbols)
     {
       if (! srec_write_symbols (abfd))
-	return false;
+	return FALSE;
     }
 
   if (! srec_write_header (abfd))
-    return false;
+    return FALSE;
 
   /* Now wander though all the sections provided and output them.  */
   list = tdata->head;
@@ -1147,20 +1147,20 @@ internal_srec_write_object_contents (abfd, symbols)
   while (list != (srec_data_list_type *) NULL)
     {
       if (! srec_write_section (abfd, tdata, list))
-	return false;
+	return FALSE;
       list = list->next;
     }
   return srec_write_terminator (abfd, tdata);
 }
 
-static boolean
+static bfd_boolean
 srec_write_object_contents (abfd)
      bfd *abfd;
 {
   return internal_srec_write_object_contents (abfd, 0);
 }
 
-static boolean
+static bfd_boolean
 symbolsrec_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -1170,7 +1170,7 @@ symbolsrec_write_object_contents (abfd)
 static int
 srec_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
@@ -1203,7 +1203,7 @@ srec_get_symtab (abfd, alocation)
 
       csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
       if (csymbols == NULL && symcount != 0)
-	return (long) false;
+	return (long) FALSE;
       abfd->tdata.srec_data->csymbols = csymbols;
 
       for (s = abfd->tdata.srec_data->symbols, c = csymbols;
diff --git a/bfd/stabs.c b/bfd/stabs.c
index 0cb37412983..6e6d290d46e 100644
--- a/bfd/stabs.c
+++ b/bfd/stabs.c
@@ -1,5 +1,5 @@
 /* Stabs in sections linking support.
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
 
@@ -168,7 +168,7 @@ stab_link_includes_newfunc (entry, table, string)
 /* This function is called for each input file from the add_symbols
    pass of the linker.  */
 
-boolean
+bfd_boolean
 _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
      bfd *abfd;
      PTR *psinfo;
@@ -176,7 +176,7 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
      asection *stabstrsec;
      PTR *psecinfo;
 {
-  boolean first;
+  bfd_boolean first;
   struct stab_info *sinfo;
   bfd_size_type count, amt;
   struct stab_section_info *secinfo;
@@ -190,21 +190,21 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
       || stabstrsec->_raw_size == 0)
     {
       /* This file does not contain stabs debugging information.  */
-      return true;
+      return TRUE;
     }
 
   if (stabsec->_raw_size % STABSIZE != 0)
     {
       /* Something is wrong with the format of these stab symbols.
-         Don't try to optimize them.  */
-      return true;
+	 Don't try to optimize them.  */
+      return TRUE;
     }
 
   if ((stabstrsec->flags & SEC_RELOC) != 0)
     {
       /* We shouldn't see relocations in the strings, and we aren't
-         prepared to handle them.  */
-      return true;
+	 prepared to handle them.  */
+      return TRUE;
     }
 
   if ((stabsec->output_section != NULL
@@ -213,16 +213,16 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
 	  && bfd_is_abs_section (stabstrsec->output_section)))
     {
       /* At least one of the sections is being discarded from the
-         link, so we should just ignore them.  */
-      return true;
+	 link, so we should just ignore them.  */
+      return TRUE;
     }
 
-  first = false;
+  first = FALSE;
 
   if (*psinfo == NULL)
     {
       /* Initialize the stabs information we need to keep track of.  */
-      first = true;
+      first = TRUE;
       amt = sizeof (struct stab_info);
       *psinfo = (PTR) bfd_alloc (abfd, amt);
       if (*psinfo == NULL)
@@ -232,7 +232,7 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
       if (sinfo->strings == NULL)
 	goto error_return;
       /* Make sure the first byte is zero.  */
-      (void) _bfd_stringtab_add (sinfo->strings, "", true, true);
+      (void) _bfd_stringtab_add (sinfo->strings, "", TRUE, TRUE);
       if (! bfd_hash_table_init_n (&sinfo->includes.root,
 				   stab_link_includes_newfunc,
 				   251))
@@ -299,7 +299,7 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
       if (type == 0)
 	{
 	  /* Special type 0 stabs indicate the offset to the next
-             string table.  We only copy the very first one.  */
+	     string table.  We only copy the very first one.  */
 	  stroff = next_stroff;
 	  next_stroff += bfd_get_32 (abfd, sym + 8);
 	  if (! first)
@@ -308,7 +308,7 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
 	      ++skip;
 	      continue;
 	    }
-	  first = false;
+	  first = FALSE;
 	}
 
       /* Store the string in the hash table, and record the index.  */
@@ -324,7 +324,7 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
 	  goto error_return;
 	}
       string = (char *) stabstrbuf + symstroff;
-      *pstridx = _bfd_stringtab_add (sinfo->strings, string, true, true);
+      *pstridx = _bfd_stringtab_add (sinfo->strings, string, TRUE, TRUE);
 
       /* An N_BINCL symbol indicates the start of the stabs entries
 	 for a header file.  We need to scan ahead to the next N_EINCL
@@ -384,7 +384,7 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
 	  /* If we have already included a header file with the same
 	     value, then replaced this one with an N_EXCL symbol.  */
 	  incl_entry = stab_link_includes_lookup (&sinfo->includes, string,
-						  true, true);
+						  TRUE, TRUE);
 	  if (incl_entry == NULL)
 	    goto error_return;
 
@@ -393,7 +393,7 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
 	      break;
 
 	  /* Record this symbol, so that we can set the value
-             correctly.  */
+	     correctly.  */
 	  amt = sizeof *ne;
 	  ne = (struct stab_excl_list *) bfd_alloc (abfd, amt);
 	  if (ne == NULL)
@@ -502,30 +502,30 @@ _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
       BFD_ASSERT (offset != 0);
     }
 
-  return true;
+  return TRUE;
 
  error_return:
   if (stabbuf != NULL)
     free (stabbuf);
   if (stabstrbuf != NULL)
     free (stabstrbuf);
-  return false;
+  return FALSE;
 }
 
 
 /* This function is called for each input file before the stab
    section is relocated.  It discards stab entries for discarded
-   functions and variables.  The function returns true iff
+   functions and variables.  The function returns TRUE iff
    any entries have been deleted.
 */
 
-boolean
+bfd_boolean
 _bfd_discard_section_stabs (abfd, stabsec, psecinfo,
 			    reloc_symbol_deleted_p, cookie)
      bfd *abfd;
      asection *stabsec;
      PTR psecinfo;
-     boolean (*reloc_symbol_deleted_p) PARAMS ((bfd_vma, PTR));
+     bfd_boolean (*reloc_symbol_deleted_p) PARAMS ((bfd_vma, PTR));
      PTR cookie;
 {
   bfd_size_type count, amt;
@@ -539,29 +539,29 @@ _bfd_discard_section_stabs (abfd, stabsec, psecinfo,
   if (stabsec->_raw_size == 0)
     {
       /* This file does not contain stabs debugging information.  */
-      return false;
+      return FALSE;
     }
 
   if (stabsec->_raw_size % STABSIZE != 0)
     {
       /* Something is wrong with the format of these stab symbols.
-         Don't try to optimize them.  */
-      return false;
+	 Don't try to optimize them.  */
+      return FALSE;
     }
 
   if ((stabsec->output_section != NULL
        && bfd_is_abs_section (stabsec->output_section)))
     {
       /* At least one of the sections is being discarded from the
-         link, so we should just ignore them.  */
-      return false;
+	 link, so we should just ignore them.  */
+      return FALSE;
     }
 
   /* We should have initialized our data in _bfd_link_stab_sections.
      If there was some bizarre error reading the string sections, though,
      we might not have.  Bail rather than asserting.  */
   if (psecinfo == NULL)
-    return false;
+    return FALSE;
 
   count = stabsec->_raw_size / STABSIZE;
   secinfo = (struct stab_section_info *) psecinfo;
@@ -674,18 +674,18 @@ _bfd_discard_section_stabs (abfd, stabsec, psecinfo,
       BFD_ASSERT (offset != 0);
     }
 
-  return (boolean) (skip > 0);
+  return skip > 0;
 
  error_return:
   if (stabbuf != NULL)
     free (stabbuf);
-  return false;
+  return FALSE;
 }
 
 /* Write out the stab section.  This is called with the relocated
    contents.  */
 
-boolean
+bfd_boolean
 _bfd_write_section_stabs (output_bfd, psinfo, stabsec, psecinfo, contents)
      bfd *output_bfd;
      PTR *psinfo;
@@ -736,9 +736,9 @@ _bfd_write_section_stabs (output_bfd, psinfo, stabsec, psecinfo, contents)
 	  if (sym[TYPEOFF] == 0)
 	    {
 	      /* This is the header symbol for the stabs section.  We
-                 don't really need one, since we have merged all the
-                 input stabs sections into one, but we generate one
-                 for the benefit of readers which expect to see one.  */
+		 don't really need one, since we have merged all the
+		 input stabs sections into one, but we generate one
+		 for the benefit of readers which expect to see one.  */
 	      BFD_ASSERT (sym == contents);
 	      bfd_put_32 (output_bfd, _bfd_stringtab_size (sinfo->strings),
 			  tosym + VALOFF);
@@ -760,7 +760,7 @@ _bfd_write_section_stabs (output_bfd, psinfo, stabsec, psecinfo, contents)
 
 /* Write out the .stabstr section.  */
 
-boolean
+bfd_boolean
 _bfd_write_stab_strings (output_bfd, psinfo)
      bfd *output_bfd;
      PTR *psinfo;
@@ -770,12 +770,12 @@ _bfd_write_stab_strings (output_bfd, psinfo)
   sinfo = (struct stab_info *) *psinfo;
 
   if (sinfo == NULL)
-    return true;
+    return TRUE;
 
   if (bfd_is_abs_section (sinfo->stabstr->output_section))
     {
       /* The section was discarded from the link.  */
-      return true;
+      return TRUE;
     }
 
   BFD_ASSERT ((sinfo->stabstr->output_offset
@@ -786,16 +786,16 @@ _bfd_write_stab_strings (output_bfd, psinfo)
 		(file_ptr) (sinfo->stabstr->output_section->filepos
 			    + sinfo->stabstr->output_offset),
 		SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (! _bfd_stringtab_emit (output_bfd, sinfo->strings))
-    return false;
+    return FALSE;
 
   /* We no longer need the stabs information.  */
   _bfd_stringtab_free (sinfo->strings);
   bfd_hash_table_free (&sinfo->includes.root);
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust an address in the .stab section.  Given OFFSET within
diff --git a/bfd/sunos.c b/bfd/sunos.c
index 5fec6f91d7d..4569e8065c6 100644
--- a/bfd/sunos.c
+++ b/bfd/sunos.c
@@ -1,7 +1,6 @@
 /* BFD backend for SunOS binaries.
    Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
-   2002
-   Free Software Foundation, Inc.
+   2002 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -33,9 +32,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Static routines defined in this file.  */
 
-static boolean sunos_read_dynamic_info PARAMS ((bfd *));
+static bfd_boolean sunos_read_dynamic_info PARAMS ((bfd *));
 static long sunos_get_dynamic_symtab_upper_bound PARAMS ((bfd *));
-static boolean sunos_slurp_dynamic_symtab PARAMS ((bfd *));
+static bfd_boolean sunos_slurp_dynamic_symtab PARAMS ((bfd *));
 static long sunos_canonicalize_dynamic_symtab PARAMS ((bfd *, asymbol **));
 static long sunos_get_dynamic_reloc_upper_bound PARAMS ((bfd *));
 static long sunos_canonicalize_dynamic_reloc
@@ -44,32 +43,32 @@ static struct bfd_hash_entry *sunos_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *sunos_link_hash_table_create
   PARAMS ((bfd *));
-static boolean sunos_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *, boolean));
-static boolean sunos_add_dynamic_symbols
+static bfd_boolean sunos_create_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean));
+static bfd_boolean sunos_add_dynamic_symbols
   PARAMS ((bfd *, struct bfd_link_info *, struct external_nlist **,
 	   bfd_size_type *, char **));
-static boolean sunos_add_one_symbol
+static bfd_boolean sunos_add_one_symbol
   PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-	   bfd_vma, const char *, boolean, boolean,
+	   bfd_vma, const char *, bfd_boolean, bfd_boolean,
 	   struct bfd_link_hash_entry **));
-static boolean sunos_scan_relocs
+static bfd_boolean sunos_scan_relocs
   PARAMS ((struct bfd_link_info *, bfd *, asection *, bfd_size_type));
-static boolean sunos_scan_std_relocs
+static bfd_boolean sunos_scan_std_relocs
   PARAMS ((struct bfd_link_info *, bfd *, asection *,
 	   const struct reloc_std_external *, bfd_size_type));
-static boolean sunos_scan_ext_relocs
+static bfd_boolean sunos_scan_ext_relocs
   PARAMS ((struct bfd_link_info *, bfd *, asection *,
 	   const struct reloc_ext_external *, bfd_size_type));
-static boolean sunos_link_dynamic_object
+static bfd_boolean sunos_link_dynamic_object
   PARAMS ((struct bfd_link_info *, bfd *));
-static boolean sunos_write_dynamic_symbol
+static bfd_boolean sunos_write_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct aout_link_hash_entry *));
-static boolean sunos_check_dynamic_reloc
+static bfd_boolean sunos_check_dynamic_reloc
   PARAMS ((struct bfd_link_info *, bfd *, asection *,
-	   struct aout_link_hash_entry *, PTR, bfd_byte *, boolean *,
+	   struct aout_link_hash_entry *, PTR, bfd_byte *, bfd_boolean *,
 	   bfd_vma *));
-static boolean sunos_finish_dynamic_link
+static bfd_boolean sunos_finish_dynamic_link
   PARAMS ((bfd *, struct bfd_link_info *));
 
 #define MY_get_dynamic_symtab_upper_bound sunos_get_dynamic_symtab_upper_bound
@@ -106,7 +105,7 @@ static boolean sunos_finish_dynamic_link
 struct sunos_dynamic_info
 {
   /* Whether we found any dynamic information.  */
-  boolean valid;
+  bfd_boolean valid;
   /* Dynamic information.  */
   struct internal_sun4_dynamic_link dyninfo;
   /* Number of dynamic symbols.  */
@@ -135,9 +134,9 @@ struct sunos_dynamic_info
    structure and uses it to find the dynamic_link structure.  It
    creates and saves a sunos_dynamic_info structure.  If it can't find
    __DYNAMIC, it sets the valid field of the sunos_dynamic_info
-   structure to false to avoid doing this work again.  */
+   structure to FALSE to avoid doing this work again.  */
 
-static boolean
+static bfd_boolean
 sunos_read_dynamic_info (abfd)
      bfd *abfd;
 {
@@ -150,19 +149,19 @@ sunos_read_dynamic_info (abfd)
   bfd_size_type amt;
 
   if (obj_aout_dynamic_info (abfd) != (PTR) NULL)
-    return true;
+    return TRUE;
 
   if ((abfd->flags & DYNAMIC) == 0)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   amt = sizeof (struct sunos_dynamic_info);
   info = (struct sunos_dynamic_info *) bfd_zalloc (abfd, amt);
   if (!info)
-    return false;
-  info->valid = false;
+    return FALSE;
+  info->valid = FALSE;
   info->dynsym = NULL;
   info->dynstr = NULL;
   info->canonical_dynsym = NULL;
@@ -178,15 +177,15 @@ sunos_read_dynamic_info (abfd)
      We could verify this assumption later by looking through the dynamic
      symbols for the __DYNAMIC symbol.  */
   if ((abfd->flags & DYNAMIC) == 0)
-    return true;
+    return TRUE;
   if (! bfd_get_section_contents (abfd, obj_datasec (abfd), (PTR) &dyninfo,
 				  (file_ptr) 0,
 				  (bfd_size_type) sizeof dyninfo))
-    return true;
+    return TRUE;
 
   dynver = GET_WORD (abfd, dyninfo.ld_version);
   if (dynver != 2 && dynver != 3)
-    return true;
+    return TRUE;
 
   dynoff = GET_WORD (abfd, dyninfo.ld);
 
@@ -198,14 +197,14 @@ sunos_read_dynamic_info (abfd)
     dynsec = obj_datasec (abfd);
   dynoff -= bfd_get_section_vma (abfd, dynsec);
   if (dynoff > bfd_section_size (abfd, dynsec))
-    return true;
+    return TRUE;
 
   /* This executable appears to be dynamically linked in a way that we
      can understand.  */
   if (! bfd_get_section_contents (abfd, dynsec, (PTR) &linkinfo,
 				  (file_ptr) dynoff,
 				  (bfd_size_type) sizeof linkinfo))
-    return true;
+    return TRUE;
 
   /* Swap in the dynamic link information.  */
   info->dyninfo.ld_loaded = GET_WORD (abfd, linkinfo.ld_loaded);
@@ -252,9 +251,9 @@ sunos_read_dynamic_info (abfd)
 	      == (unsigned long) (info->dyninfo.ld_hash
 				  - info->dyninfo.ld_rel));
 
-  info->valid = true;
+  info->valid = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* Return the amount of memory required for the dynamic symbols.  */
@@ -280,7 +279,7 @@ sunos_get_dynamic_symtab_upper_bound (abfd)
 
 /* Read the external dynamic symbols.  */
 
-static boolean
+static bfd_boolean
 sunos_slurp_dynamic_symtab (abfd)
      bfd *abfd;
 {
@@ -291,14 +290,14 @@ sunos_slurp_dynamic_symtab (abfd)
   if (obj_aout_dynamic_info (abfd) == NULL)
     {
       if (! sunos_read_dynamic_info (abfd))
-	  return false;
+	  return FALSE;
     }
 
   info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
   if (! info->valid)
     {
       bfd_set_error (bfd_error_no_symbols);
-      return false;
+      return FALSE;
     }
 
   /* Get the dynamic nlist structures.  */
@@ -307,7 +306,7 @@ sunos_slurp_dynamic_symtab (abfd)
       amt = (bfd_size_type) info->dynsym_count * EXTERNAL_NLIST_SIZE;
       info->dynsym = (struct external_nlist *) bfd_alloc (abfd, amt);
       if (info->dynsym == NULL && info->dynsym_count != 0)
-	return false;
+	return FALSE;
       if (bfd_seek (abfd, (file_ptr) info->dyninfo.ld_stab, SEEK_SET) != 0
 	  || bfd_bread ((PTR) info->dynsym, amt, abfd) != amt)
 	{
@@ -316,7 +315,7 @@ sunos_slurp_dynamic_symtab (abfd)
 	      bfd_release (abfd, info->dynsym);
 	      info->dynsym = NULL;
 	    }
-	  return false;
+	  return FALSE;
 	}
     }
 
@@ -326,7 +325,7 @@ sunos_slurp_dynamic_symtab (abfd)
       amt = info->dyninfo.ld_symb_size;
       info->dynstr = (char *) bfd_alloc (abfd, amt);
       if (info->dynstr == NULL && info->dyninfo.ld_symb_size != 0)
-	return false;
+	return FALSE;
       if (bfd_seek (abfd, (file_ptr) info->dyninfo.ld_symbols, SEEK_SET) != 0
 	  || bfd_bread ((PTR) info->dynstr, amt, abfd) != amt)
 	{
@@ -335,11 +334,11 @@ sunos_slurp_dynamic_symtab (abfd)
 	      bfd_release (abfd, info->dynstr);
 	      info->dynstr = NULL;
 	    }
-	  return false;
+	  return FALSE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Read in the dynamic symbols.  */
@@ -413,7 +412,7 @@ sunos_canonicalize_dynamic_symtab (abfd, storage)
       if (! aout_32_translate_symbol_table (abfd, info->canonical_dynsym,
 					    info->dynsym,
 					    (bfd_size_type) info->dynsym_count,
-					    info->dynstr, strsize, true))
+					    info->dynstr, strsize, TRUE))
 	{
 	  if (info->canonical_dynsym != NULL)
 	    {
@@ -651,13 +650,13 @@ struct sunos_link_hash_table
   bfd *dynobj;
 
   /* Whether we have created the dynamic sections.  */
-  boolean dynamic_sections_created;
+  bfd_boolean dynamic_sections_created;
 
   /* Whether we need the dynamic sections.  */
-  boolean dynamic_sections_needed;
+  bfd_boolean dynamic_sections_needed;
 
   /* Whether we need the .got table.  */
-  boolean got_needed;
+  bfd_boolean got_needed;
 
   /* The number of dynamic symbols.  */
   size_t dynsymcount;
@@ -728,9 +727,9 @@ sunos_link_hash_table_create (abfd)
     }
 
   ret->dynobj = NULL;
-  ret->dynamic_sections_created = false;
-  ret->dynamic_sections_needed = false;
-  ret->got_needed = false;
+  ret->dynamic_sections_created = FALSE;
+  ret->dynamic_sections_needed = FALSE;
+  ret->got_needed = FALSE;
   ret->dynsymcount = 0;
   ret->bucketcount = 0;
   ret->needed = NULL;
@@ -751,7 +750,7 @@ sunos_link_hash_table_create (abfd)
 #define sunos_link_hash_traverse(table, func, info)			\
   (aout_link_hash_traverse						\
    (&(table)->root,							\
-    (boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),	\
+    (bfd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the SunOS link hash table from the info structure.  This is
@@ -759,7 +758,7 @@ sunos_link_hash_table_create (abfd)
 
 #define sunos_hash_table(p) ((struct sunos_link_hash_table *) ((p)->hash))
 
-static boolean sunos_scan_dynamic_symbol
+static bfd_boolean sunos_scan_dynamic_symbol
   PARAMS ((struct sunos_link_hash_entry *, PTR));
 
 /* Create the dynamic sections needed if we are linking against a
@@ -769,11 +768,11 @@ static boolean sunos_scan_dynamic_symbol
    place in the output file.  See include/aout/sun4.h for more details
    of the dynamic linking information.  */
 
-static boolean
+static bfd_boolean
 sunos_create_dynamic_sections (abfd, info, needed)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean needed;
+     bfd_boolean needed;
 {
   asection *s;
 
@@ -793,7 +792,7 @@ sunos_create_dynamic_sections (abfd, info, needed)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
 
       /* The .got section holds the global offset table.  The address
 	 is put in the ld_got field.  */
@@ -801,7 +800,7 @@ sunos_create_dynamic_sections (abfd, info, needed)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
 
       /* The .plt section holds the procedure linkage table.  The
 	 address is put in the ld_plt field.  */
@@ -809,7 +808,7 @@ sunos_create_dynamic_sections (abfd, info, needed)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_CODE)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
 
       /* The .dynrel section holds the dynamic relocs.  The address is
 	 put in the ld_rel field.  */
@@ -817,7 +816,7 @@ sunos_create_dynamic_sections (abfd, info, needed)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
 
       /* The .hash section holds the dynamic hash table.  The address
 	 is put in the ld_hash field.  */
@@ -825,7 +824,7 @@ sunos_create_dynamic_sections (abfd, info, needed)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
 
       /* The .dynsym section holds the dynamic symbols.  The address
 	 is put in the ld_stab field.  */
@@ -833,7 +832,7 @@ sunos_create_dynamic_sections (abfd, info, needed)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
 
       /* The .dynstr section holds the dynamic symbol string table.
 	 The address is put in the ld_symbols field.  */
@@ -841,9 +840,9 @@ sunos_create_dynamic_sections (abfd, info, needed)
       if (s == NULL
 	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
 	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
+	return FALSE;
 
-      sunos_hash_table (info)->dynamic_sections_created = true;
+      sunos_hash_table (info)->dynamic_sections_created = TRUE;
     }
 
   if ((needed && ! sunos_hash_table (info)->dynamic_sections_needed)
@@ -857,17 +856,17 @@ sunos_create_dynamic_sections (abfd, info, needed)
       if (s->_raw_size == 0)
 	s->_raw_size = BYTES_IN_WORD;
 
-      sunos_hash_table (info)->dynamic_sections_needed = true;
-      sunos_hash_table (info)->got_needed = true;
+      sunos_hash_table (info)->dynamic_sections_needed = TRUE;
+      sunos_hash_table (info)->got_needed = TRUE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Add dynamic symbols during a link.  This is called by the a.out
    backend linker for each object it encounters.  */
 
-static boolean
+static bfd_boolean
 sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -884,16 +883,14 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
   if (info->hash->creator == abfd->xvec)
     {
       if (! sunos_create_dynamic_sections (abfd, info,
-					   (((abfd->flags & DYNAMIC) != 0
-					     && ! info->relocateable)
-					    ? true
-					    : false)))
-	return false;
+					   ((abfd->flags & DYNAMIC) != 0
+					    && !info->relocateable)))
+	return FALSE;
     }
 
   /* There is nothing else to do for a normal object.  */
   if ((abfd->flags & DYNAMIC) == 0)
-    return true;
+    return TRUE;
 
   dynobj = sunos_hash_table (info)->dynobj;
 
@@ -915,14 +912,14 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
   /* The native linker seems to just ignore dynamic objects when -r is
      used.  */
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   /* There's no hope of using a dynamic object which does not exactly
      match the format of the output file.  */
   if (info->hash->creator != abfd->xvec)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   /* Make sure we have a .need and a .rules sections.  These are only
@@ -942,7 +939,7 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
 				       | SEC_IN_MEMORY
 				       | SEC_READONLY))
 	  || ! bfd_set_section_alignment (dynobj, s, 2))
-	return false;
+	return FALSE;
     }
 
   if (bfd_get_section_by_name (dynobj, ".rules") == NULL)
@@ -959,12 +956,12 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
 				       | SEC_IN_MEMORY
 				       | SEC_READONLY))
 	  || ! bfd_set_section_alignment (dynobj, s, 2))
-	return false;
+	return FALSE;
     }
 
   /* Pick up the dynamic symbols and return them to the caller.  */
   if (! sunos_slurp_dynamic_symtab (abfd))
-    return false;
+    return FALSE;
 
   dinfo = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
   *symsp = dinfo->dynsym;
@@ -986,10 +983,10 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
 
       if (bfd_seek (abfd, (file_ptr) need, SEEK_SET) != 0
 	  || bfd_bread (buf, (bfd_size_type) 16, abfd) != 16)
-	return false;
+	return FALSE;
 
       /* For the format of an ld_need entry, see aout/sun4.h.  We
-         should probably define structs for this manipulation.  */
+	 should probably define structs for this manipulation.  */
 
       name = bfd_get_32 (abfd, buf);
       flags = bfd_get_32 (abfd, buf + 4);
@@ -1000,14 +997,14 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
       alc = sizeof (struct bfd_link_needed_list);
       needed = (struct bfd_link_needed_list *) bfd_alloc (abfd, alc);
       if (needed == NULL)
-	return false;
+	return FALSE;
       needed->by = abfd;
 
       /* We return the name as [-l]name[.maj][.min].  */
       alc = 30;
       namebuf = (char *) bfd_malloc (alc + 1);
       if (namebuf == NULL)
-	return false;
+	return FALSE;
       p = namebuf;
 
       if ((flags & 0x80000000) != 0)
@@ -1018,7 +1015,7 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
       if (bfd_seek (abfd, (file_ptr) name, SEEK_SET) != 0)
 	{
 	  free (namebuf);
-	  return false;
+	  return FALSE;
 	}
 
       do
@@ -1026,7 +1023,7 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
 	  if (bfd_bread (&b, (bfd_size_type) 1, abfd) != 1)
 	    {
 	      free (namebuf);
-	      return false;
+	      return FALSE;
 	    }
 
 	  if ((bfd_size_type) (p - namebuf) >= alc)
@@ -1038,7 +1035,7 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
 	      if (n == NULL)
 		{
 		  free (namebuf);
-		  return false;
+		  return FALSE;
 		}
 	      p = n + (p - namebuf);
 	      namebuf = n;
@@ -1070,7 +1067,7 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
 	      if (n == NULL)
 		{
 		  free (namebuf);
-		  return false;
+		  return FALSE;
 		}
 	      p = n + (p - namebuf);
 	      namebuf = n;
@@ -1084,7 +1081,7 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
       if (namecopy == NULL)
 	{
 	  free (namebuf);
-	  return false;
+	  return FALSE;
 	}
       strcpy (namecopy, namebuf);
       free (namebuf);
@@ -1099,14 +1096,14 @@ sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
       *pp = needed;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Function to add a single symbol to the linker hash table.  This is
    a wrapper around _bfd_generic_link_add_one_symbol which handles the
    tweaking needed for dynamic linking support.  */
 
-static boolean
+static bfd_boolean
 sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
 		      copy, collect, hashp)
      struct bfd_link_info *info;
@@ -1116,8 +1113,8 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
      asection *section;
      bfd_vma value;
      const char *string;
-     boolean copy;
-     boolean collect;
+     bfd_boolean copy;
+     bfd_boolean collect;
      struct bfd_link_hash_entry **hashp;
 {
   struct sunos_link_hash_entry *h;
@@ -1125,13 +1122,13 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
 
   if ((flags & (BSF_INDIRECT | BSF_WARNING | BSF_CONSTRUCTOR)) != 0
       || ! bfd_is_und_section (section))
-    h = sunos_link_hash_lookup (sunos_hash_table (info), name, true, copy,
-				false);
+    h = sunos_link_hash_lookup (sunos_hash_table (info), name, TRUE, copy,
+				FALSE);
   else
     h = ((struct sunos_link_hash_entry *)
-	 bfd_wrapped_link_hash_lookup (abfd, info, name, true, copy, false));
+	 bfd_wrapped_link_hash_lookup (abfd, info, name, TRUE, copy, FALSE));
   if (h == NULL)
-    return false;
+    return FALSE;
 
   if (hashp != NULL)
     *hashp = (struct bfd_link_hash_entry *) h;
@@ -1185,10 +1182,10 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
       && (h->flags & SUNOS_CONSTRUCTOR) != 0)
     {
       /* The existing symbol is a constructor symbol, and this symbol
-         is from a dynamic object.  A constructor symbol is actually a
-         definition, although the type will be bfd_link_hash_undefined
-         at this point.  We want to ignore the definition from the
-         dynamic object.  */
+	 is from a dynamic object.  A constructor symbol is actually a
+	 definition, although the type will be bfd_link_hash_undefined
+	 at this point.  We want to ignore the definition from the
+	 dynamic object.  */
       section = bfd_und_section_ptr;
     }
   else if ((flags & BSF_CONSTRUCTOR) != 0
@@ -1198,8 +1195,8 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
 	   && (h->root.root.u.def.section->owner->flags & DYNAMIC) != 0)
     {
       /* The existing symbol is defined by a dynamic object, and this
-         is a constructor symbol.  As above, we want to force the use
-         of the constructor symbol from the regular object.  */
+	 is a constructor symbol.  As above, we want to force the use
+	 of the constructor symbol from the regular object.  */
       h->root.root.type = bfd_link_hash_new;
     }
 
@@ -1207,7 +1204,7 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
   if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
 					  value, string, copy, collect,
 					  hashp))
-    return false;
+    return FALSE;
 
   if (abfd->xvec == info->hash->creator)
     {
@@ -1244,7 +1241,7 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
 	h->flags |= SUNOS_CONSTRUCTOR;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Return the list of objects needed by BFD.  */
@@ -1263,7 +1260,7 @@ bfd_sunos_get_needed_list (abfd, info)
 /* Record an assignment made to a symbol by a linker script.  We need
    this in case some dynamic object refers to this symbol.  */
 
-boolean
+bfd_boolean
 bfd_sunos_record_link_assignment (output_bfd, info, name)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -1272,15 +1269,15 @@ bfd_sunos_record_link_assignment (output_bfd, info, name)
   struct sunos_link_hash_entry *h;
 
   if (output_bfd->xvec != &MY(vec))
-    return true;
+    return TRUE;
 
   /* This is called after we have examined all the input objects.  If
      the symbol does not exist, it merely means that no object refers
      to it, and we can just ignore it at this point.  */
   h = sunos_link_hash_lookup (sunos_hash_table (info), name,
-			      false, false, false);
+			      FALSE, FALSE, FALSE);
   if (h == NULL)
-    return true;
+    return TRUE;
 
   /* In a shared library, the __DYNAMIC symbol does not appear in the
      dynamic symbol table.  */
@@ -1295,7 +1292,7 @@ bfd_sunos_record_link_assignment (output_bfd, info, name)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Set up the sizes and contents of the dynamic sections created in
@@ -1304,10 +1301,10 @@ bfd_sunos_record_link_assignment (output_bfd, info, name)
    sections before the linker sets the addresses of the various
    sections.  This unfortunately requires reading all the relocs so
    that we can work out which ones need to become dynamic relocs.  If
-   info->keep_memory is true, we keep the relocs in memory; otherwise,
+   info->keep_memory is TRUE, we keep the relocs in memory; otherwise,
    we discard them, and will read them again later.  */
 
-boolean
+bfd_boolean
 bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
 				 srulesptr)
      bfd *output_bfd;
@@ -1330,10 +1327,10 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
   *srulesptr = NULL;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   if (output_bfd->xvec != &MY(vec))
-    return true;
+    return TRUE;
 
   /* Look through all the input BFD's and read their relocs.  It would
      be better if we didn't have to do this, but there is no other way
@@ -1349,7 +1346,7 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
 				   exec_hdr (sub)->a_trsize)
 	      || ! sunos_scan_relocs (info, sub, obj_datasec (sub),
 				      exec_hdr (sub)->a_drsize))
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -1360,11 +1357,11 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
      to build a global offset table, there is nothing to do here.  */
   if (! sunos_hash_table (info)->dynamic_sections_needed
       && ! sunos_hash_table (info)->got_needed)
-    return true;
+    return TRUE;
 
   /* If __GLOBAL_OFFSET_TABLE_ was mentioned, define it.  */
   h = sunos_link_hash_lookup (sunos_hash_table (info),
-			      "__GLOBAL_OFFSET_TABLE_", false, false, false);
+			      "__GLOBAL_OFFSET_TABLE_", FALSE, FALSE, FALSE);
   if (h != NULL && (h->flags & SUNOS_REF_REGULAR) != 0)
     {
       h->flags |= SUNOS_DEF_REGULAR;
@@ -1377,8 +1374,8 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
       h->root.root.u.def.section = bfd_get_section_by_name (dynobj, ".got");
 
       /* If the .got section is more than 0x1000 bytes, we set
-         __GLOBAL_OFFSET_TABLE_ to be 0x1000 bytes into the section,
-         so that 13 bit relocations have a greater chance of working.  */
+	 __GLOBAL_OFFSET_TABLE_ to be 0x1000 bytes into the section,
+	 so that 13 bit relocations have a greater chance of working.  */
       s = bfd_get_section_by_name (dynobj, ".got");
       BFD_ASSERT (s != NULL);
       if (s->_raw_size >= 0x1000)
@@ -1415,7 +1412,7 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
       s->_raw_size = dynsymcount * sizeof (struct external_nlist);
       s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
-	return false;
+	return FALSE;
 
       /* The number of buckets is just the number of symbols divided
 	 by four.  To compute the final size of the hash table, we
@@ -1436,7 +1433,7 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
       hashalloc = (dynsymcount + bucketcount - 1) * HASH_ENTRY_SIZE;
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, hashalloc);
       if (s->contents == NULL && dynsymcount > 0)
-	return false;
+	return FALSE;
       for (i = 0; i < bucketcount; i++)
 	PUT_WORD (output_bfd, (bfd_vma) -1, s->contents + i * HASH_ENTRY_SIZE);
       s->_raw_size = bucketcount * HASH_ENTRY_SIZE;
@@ -1466,7 +1463,7 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
 	  contents = (bfd_byte *) bfd_realloc (s->contents,
 					       s->_raw_size + add);
 	  if (contents == NULL)
-	    return false;
+	    return FALSE;
 	  memset (contents + s->_raw_size, 0, (size_t) add);
 	  s->contents = contents;
 	  s->_raw_size += add;
@@ -1481,7 +1478,7 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
     {
       s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
 
       /* Fill in the first entry in the table.  */
       switch (bfd_get_arch (dynobj))
@@ -1504,7 +1501,7 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
     {
       s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
       if (s->contents == NULL)
-	return false;
+	return FALSE;
     }
   /* We use the reloc_count field to keep track of how many of the
      relocs we have output so far.  */
@@ -1514,17 +1511,17 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
   s = bfd_get_section_by_name (dynobj, ".got");
   s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
   if (s->contents == NULL)
-    return false;
+    return FALSE;
 
   *sneedptr = bfd_get_section_by_name (dynobj, ".need");
   *srulesptr = bfd_get_section_by_name (dynobj, ".rules");
 
-  return true;
+  return TRUE;
 }
 
 /* Scan the relocs for an input section.  */
 
-static boolean
+static bfd_boolean
 sunos_scan_relocs (info, abfd, sec, rel_size)
      struct bfd_link_info *info;
      bfd *abfd;
@@ -1535,7 +1532,7 @@ sunos_scan_relocs (info, abfd, sec, rel_size)
   PTR free_relocs = NULL;
 
   if (rel_size == 0)
-    return true;
+    return TRUE;
 
   if (! info->keep_memory)
     relocs = free_relocs = bfd_malloc (rel_size);
@@ -1555,7 +1552,7 @@ sunos_scan_relocs (info, abfd, sec, rel_size)
 	}
     }
   if (relocs == NULL)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0
       || bfd_bread (relocs, rel_size, abfd) != rel_size)
@@ -1579,12 +1576,12 @@ sunos_scan_relocs (info, abfd, sec, rel_size)
   if (free_relocs != NULL)
     free (free_relocs);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (free_relocs != NULL)
     free (free_relocs);
-  return false;
+  return FALSE;
 }
 
 /* Scan the relocs for an input section using standard relocs.  We
@@ -1597,7 +1594,7 @@ sunos_scan_relocs (info, abfd, sec, rel_size)
    reloc.  FIXME: We should also handle the PIC relocs here by
    building global offset table entries.  */
 
-static boolean
+static bfd_boolean
 sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
      struct bfd_link_info *info;
      bfd *abfd;
@@ -1615,7 +1612,7 @@ sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
   if (bfd_get_arch (abfd) != bfd_arch_m68k)
     {
       bfd_set_error (bfd_error_invalid_target);
-      return false;
+      return FALSE;
     }
 
   dynobj = NULL;
@@ -1677,8 +1674,8 @@ sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
 	{
 	  asection *sgot;
 
-	  if (! sunos_create_dynamic_sections (abfd, info, false))
-	    return false;
+	  if (! sunos_create_dynamic_sections (abfd, info, FALSE))
+	    return FALSE;
 	  dynobj = sunos_hash_table (info)->dynobj;
 	  splt = bfd_get_section_by_name (dynobj, ".plt");
 	  srel = bfd_get_section_by_name (dynobj, ".dynrel");
@@ -1688,7 +1685,7 @@ sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
 	  BFD_ASSERT (sgot != NULL);
 	  if (sgot->_raw_size == 0)
 	    sgot->_raw_size = BYTES_IN_WORD;
-	  sunos_hash_table (info)->got_needed = true;
+	  sunos_hash_table (info)->got_needed = TRUE;
 	}
 
       BFD_ASSERT ((h->flags & SUNOS_REF_REGULAR) != 0);
@@ -1748,7 +1745,7 @@ sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Scan the relocs for an input section using extended relocs.  We
@@ -1757,7 +1754,7 @@ sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
    section, an entry is made in the procedure linkage table.
    Otherwise, we must preserve the reloc as a dynamic reloc.  */
 
-static boolean
+static bfd_boolean
 sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
      struct bfd_link_info *info;
      bfd *abfd;
@@ -1777,7 +1774,7 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
   if (bfd_get_arch (abfd) != bfd_arch_sparc)
     {
       bfd_set_error (bfd_error_invalid_target);
-      return false;
+      return FALSE;
     }
 
   dynobj = NULL;
@@ -1824,15 +1821,15 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
 	}
 
       /* If this is a base relative reloc, we need to make an entry in
-         the .got section.  */
+	 the .got section.  */
       if (r_type == RELOC_BASE10
 	  || r_type == RELOC_BASE13
 	  || r_type == RELOC_BASE22)
 	{
 	  if (dynobj == NULL)
 	    {
-	      if (! sunos_create_dynamic_sections (abfd, info, false))
-		return false;
+	      if (! sunos_create_dynamic_sections (abfd, info, FALSE))
+		return FALSE;
 	      dynobj = sunos_hash_table (info)->dynobj;
 	      splt = bfd_get_section_by_name (dynobj, ".plt");
 	      sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -1842,7 +1839,7 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
 	      /* Make sure we have an initial entry in the .got table.  */
 	      if (sgot->_raw_size == 0)
 		sgot->_raw_size = BYTES_IN_WORD;
-	      sunos_hash_table (info)->got_needed = true;
+	      sunos_hash_table (info)->got_needed = TRUE;
 	    }
 
 	  if (r_extern)
@@ -1868,7 +1865,7 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
 		  adata (abfd).local_got_offsets =
 		    (bfd_vma *) bfd_zalloc (abfd, amt);
 		  if (adata (abfd).local_got_offsets == NULL)
-		    return false;
+		    return FALSE;
 		}
 
 	      if (adata (abfd).local_got_offsets[r_index] != 0)
@@ -1892,18 +1889,18 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
 	}
 
       /* Otherwise, we are only interested in relocs against symbols
-         defined in dynamic objects but not in regular objects.  We
-         only need to consider relocs against external symbols.  */
+	 defined in dynamic objects but not in regular objects.  We
+	 only need to consider relocs against external symbols.  */
       if (! r_extern)
 	{
 	  /* But, if we are creating a shared library, we need to
-             generate an absolute reloc.  */
+	     generate an absolute reloc.  */
 	  if (info->shared)
 	    {
 	      if (dynobj == NULL)
 		{
-		  if (! sunos_create_dynamic_sections (abfd, info, true))
-		    return false;
+		  if (! sunos_create_dynamic_sections (abfd, info, TRUE))
+		    return FALSE;
 		  dynobj = sunos_hash_table (info)->dynobj;
 		  splt = bfd_get_section_by_name (dynobj, ".plt");
 		  sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -1939,8 +1936,8 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
 	  && (h->flags & SUNOS_DEF_REGULAR) == 0)
 	{
 	  /* This symbol is apparently undefined.  Don't do anything
-             here; just let the relocation routine report an undefined
-             symbol.  */
+	     here; just let the relocation routine report an undefined
+	     symbol.  */
 	  continue;
 	}
 
@@ -1949,8 +1946,8 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
 
       if (dynobj == NULL)
 	{
-	  if (! sunos_create_dynamic_sections (abfd, info, false))
-	    return false;
+	  if (! sunos_create_dynamic_sections (abfd, info, FALSE))
+	    return FALSE;
 	  dynobj = sunos_hash_table (info)->dynobj;
 	  splt = bfd_get_section_by_name (dynobj, ".plt");
 	  sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -1960,7 +1957,7 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
 	  /* Make sure we have an initial entry in the .got table.  */
 	  if (sgot->_raw_size == 0)
 	    sgot->_raw_size = BYTES_IN_WORD;
-	  sunos_hash_table (info)->got_needed = true;
+	  sunos_hash_table (info)->got_needed = TRUE;
 	}
 
       BFD_ASSERT (r_type == RELOC_JMP_TBL
@@ -2025,26 +2022,26 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
 	      splt->_raw_size += SPARC_PLT_ENTRY_SIZE;
 
 	      /* We will also need a dynamic reloc entry, unless this
-                 is a JMP_TBL reloc produced by linking PIC compiled
-                 code, and we are not making a shared library.  */
+		 is a JMP_TBL reloc produced by linking PIC compiled
+		 code, and we are not making a shared library.  */
 	      if (info->shared || (h->flags & SUNOS_DEF_REGULAR) == 0)
 		srel->_raw_size += RELOC_EXT_SIZE;
 	    }
 
 	  /* If we are creating a shared library, we need to copy over
-             any reloc other than a jump table reloc.  */
+	     any reloc other than a jump table reloc.  */
 	  if (info->shared && r_type != RELOC_JMP_TBL)
 	    srel->_raw_size += RELOC_EXT_SIZE;
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Build the hash table of dynamic symbols, and to mark as written all
    symbols from dynamic objects which we do not plan to write out.  */
 
-static boolean
+static bfd_boolean
 sunos_scan_dynamic_symbol (h, data)
      struct sunos_link_hash_entry *h;
      PTR data;
@@ -2066,7 +2063,7 @@ sunos_scan_dynamic_symbol (h, data)
   if ((h->flags & SUNOS_DEF_REGULAR) == 0
       && (h->flags & SUNOS_DEF_DYNAMIC) != 0
       && strcmp (h->root.root.root.string, "__DYNAMIC") != 0)
-    h->root.written = true;
+    h->root.written = TRUE;
 
   /* If this symbol is defined by a dynamic object and referenced by a
      regular object, see whether we gave it a reasonable value while
@@ -2125,7 +2122,7 @@ sunos_scan_dynamic_symbol (h, data)
       contents = (bfd_byte *) bfd_realloc (s->contents,
 					   s->_raw_size + len + 1);
       if (contents == NULL)
-	return false;
+	return FALSE;
       s->contents = contents;
 
       h->dynstr_index = s->_raw_size;
@@ -2161,7 +2158,7 @@ sunos_scan_dynamic_symbol (h, data)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Link a dynamic object.  We actually don't have anything to do at
@@ -2169,18 +2166,18 @@ sunos_scan_dynamic_symbol (h, data)
    code from doing anything with the object.  */
 
 /*ARGSUSED*/
-static boolean
+static bfd_boolean
 sunos_link_dynamic_object (info, abfd)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      bfd *abfd ATTRIBUTE_UNUSED;
 {
-  return true;
+  return TRUE;
 }
 
 /* Write out a dynamic symbol.  This is called by the final traversal
    over the symbol table.  */
 
-static boolean
+static bfd_boolean
 sunos_write_dynamic_symbol (output_bfd, info, harg)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2254,7 +2251,7 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
 	}
 
       /* We also need to add a jump table reloc, unless this is the
-         result of a JMP_TBL reloc from PIC compiled code.  */
+	 result of a JMP_TBL reloc from PIC compiled code.  */
       if (info->shared || (h->flags & SUNOS_DEF_REGULAR) == 0)
 	{
 	  BFD_ASSERT (h->dynindx >= 0);
@@ -2320,7 +2317,7 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
      we can have a PLT entry for a nondynamic symbol when linking PIC
      compiled code from a regular object.  */
   if (h->dynindx < 0)
-    return true;
+    return TRUE;
 
   switch (h->root.root.type)
     {
@@ -2328,7 +2325,7 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
     case bfd_link_hash_new:
       abort ();
       /* Avoid variable not initialized warnings.  */
-      return true;
+      return TRUE;
     case bfd_link_hash_undefined:
       type = N_UNDF | N_EXT;
       val = 0;
@@ -2386,7 +2383,7 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
     case bfd_link_hash_warning:
       /* FIXME: Ignore these for now.  The circumstances under which
 	 they should be written out are not clear to me.  */
-      return true;
+      return TRUE;
     }
 
   s = bfd_get_section_by_name (sunos_hash_table (info)->dynobj, ".dynsym");
@@ -2405,7 +2402,7 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
   PUT_WORD (output_bfd, h->dynstr_index, outsym->e_strx);
   PUT_WORD (output_bfd, val, outsym->e_value);
 
-  return true;
+  return TRUE;
 }
 
 /* This is called for each reloc against an external symbol.  If this
@@ -2414,7 +2411,7 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
    reloc.  */
 
 /*ARGSUSED*/
-static boolean
+static bfd_boolean
 sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
 			   contents, skip, relocationp)
      struct bfd_link_info *info;
@@ -2423,19 +2420,19 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
      struct aout_link_hash_entry *harg;
      PTR reloc;
      bfd_byte *contents ATTRIBUTE_UNUSED;
-     boolean *skip;
+     bfd_boolean *skip;
      bfd_vma *relocationp;
 {
   struct sunos_link_hash_entry *h = (struct sunos_link_hash_entry *) harg;
   bfd *dynobj;
-  boolean baserel;
-  boolean jmptbl;
-  boolean pcrel;
+  bfd_boolean baserel;
+  bfd_boolean jmptbl;
+  bfd_boolean pcrel;
   asection *s;
   bfd_byte *p;
   long indx;
 
-  *skip = false;
+  *skip = FALSE;
 
   dynobj = sunos_hash_table (info)->dynobj;
 
@@ -2493,7 +2490,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
 	       || r_type == RELOC_WDISP30
 	       || r_type == RELOC_WDISP22);
       /* We don't consider the PC10 and PC22 types to be PC relative,
-         because they are pcrel_offset.  */
+	 because they are pcrel_offset.  */
     }
 
   if (baserel)
@@ -2562,7 +2559,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
 		  && (h->flags & SUNOS_DEF_REGULAR) == 0))
 	    {
 	      /* We need to create a GLOB_DAT or 32 reloc to tell the
-                 dynamic linker to fill in this entry in the table.  */
+		 dynamic linker to fill in this entry in the table.  */
 
 	      s = bfd_get_section_by_name (dynobj, ".dynrel");
 	      BFD_ASSERT (s != NULL);
@@ -2667,11 +2664,11 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
 		      - sunos_hash_table (info)->got_base);
 
       /* There is nothing else to do for a base relative reloc.  */
-      return true;
+      return TRUE;
     }
 
   if (! sunos_hash_table (info)->dynamic_sections_needed)
-    return true;
+    return TRUE;
   if (! info->shared)
     {
       if (h == NULL
@@ -2680,7 +2677,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
 	  || (h->flags & SUNOS_DEF_REGULAR) != 0
 	  || (h->flags & SUNOS_DEF_DYNAMIC) == 0
 	  || (h->root.root.u.undef.abfd->flags & DYNAMIC) == 0)
-	return true;
+	return TRUE;
     }
   else
     {
@@ -2689,7 +2686,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
 	      || jmptbl
 	      || strcmp (h->root.root.root.string,
 			 "__GLOBAL_OFFSET_TABLE_") == 0))
-	return true;
+	return TRUE;
     }
 
   /* It looks like this is a reloc we are supposed to copy.  */
@@ -2732,7 +2729,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
 	  srel->r_index[0] = (bfd_byte)indx;
 	}
       /* FIXME: We may have to change the addend for a PC relative
-         reloc.  */
+	 reloc.  */
     }
   else
     {
@@ -2771,14 +2768,14 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
   ++s->reloc_count;
 
   if (h != NULL)
-    *skip = true;
+    *skip = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic linking information.  */
 
-static boolean
+static bfd_boolean
 sunos_finish_dynamic_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2790,7 +2787,7 @@ sunos_finish_dynamic_link (abfd, info)
 
   if (! sunos_hash_table (info)->dynamic_sections_needed
       && ! sunos_hash_table (info)->got_needed)
-    return true;
+    return TRUE;
 
   dynobj = sunos_hash_table (info)->dynobj;
 
@@ -2843,7 +2840,7 @@ sunos_finish_dynamic_link (abfd, info)
 					  o->contents,
 					  (file_ptr) o->output_offset,
 					  o->_raw_size))
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -2868,7 +2865,7 @@ sunos_finish_dynamic_link (abfd, info)
       if (! bfd_set_section_contents (abfd, sdyn->output_section, &esd,
 				      (file_ptr) sdyn->output_offset,
 				      (bfd_size_type) sizeof esd))
-	return false;
+	return FALSE;
 
       PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_loaded);
 
@@ -2936,10 +2933,10 @@ sunos_finish_dynamic_link (abfd, info)
       pos += sizeof esd + EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE;
       if (! bfd_set_section_contents (abfd, sdyn->output_section, &esdl,
 				      pos, (bfd_size_type) sizeof esdl))
-	return false;
+	return FALSE;
 
       abfd->flags |= DYNAMIC;
     }
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/syms.c b/bfd/syms.c
index b135726c334..d95589bec03 100644
--- a/bfd/syms.c
+++ b/bfd/syms.c
@@ -346,14 +346,14 @@ FUNCTION
 	bfd_is_local_label
 
 SYNOPSIS
-        boolean bfd_is_local_label(bfd *abfd, asymbol *sym);
+        bfd_boolean bfd_is_local_label(bfd *abfd, asymbol *sym);
 
 DESCRIPTION
-	Return true if the given symbol @var{sym} in the BFD @var{abfd} is
-	a compiler generated local label, else return false.
+	Return TRUE if the given symbol @var{sym} in the BFD @var{abfd} is
+	a compiler generated local label, else return FALSE.
 */
 
-boolean
+bfd_boolean
 bfd_is_local_label (abfd, sym)
      bfd *abfd;
      asymbol *sym;
@@ -362,9 +362,9 @@ bfd_is_local_label (abfd, sym)
      starts with '.' is local.  This would accidentally catch section names
      if we didn't reject them here.  */
   if ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_SECTION_SYM)) != 0)
-    return false;
+    return FALSE;
   if (sym->name == NULL)
-    return false;
+    return FALSE;
   return bfd_is_local_label_name (abfd, sym->name);
 }
 
@@ -373,12 +373,12 @@ FUNCTION
 	bfd_is_local_label_name
 
 SYNOPSIS
-        boolean bfd_is_local_label_name(bfd *abfd, const char *name);
+        bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name);
 
 DESCRIPTION
-	Return true if a symbol with the name @var{name} in the BFD
+	Return TRUE if a symbol with the name @var{name} in the BFD
 	@var{abfd} is a compiler generated local label, else return
-	false.  This just checks whether the name has the form of a
+	FALSE.  This just checks whether the name has the form of a
 	local label.
 
 .#define bfd_is_local_label_name(abfd, name) \
@@ -408,7 +408,7 @@ FUNCTION
 	bfd_set_symtab
 
 SYNOPSIS
-	boolean bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int count);
+	bfd_boolean bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int count);
 
 DESCRIPTION
 	Arrange that when the output BFD @var{abfd} is closed,
@@ -416,7 +416,7 @@ DESCRIPTION
 	will be written.
 */
 
-boolean
+bfd_boolean
 bfd_set_symtab (abfd, location, symcount)
      bfd *abfd;
      asymbol **location;
@@ -425,12 +425,12 @@ bfd_set_symtab (abfd, location, symcount)
   if ((abfd->format != bfd_object) || (bfd_read_p (abfd)))
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   bfd_get_outsymbols (abfd) = location;
   bfd_get_symcount (abfd) = symcount;
-  return true;
+  return TRUE;
 }
 
 /*
@@ -706,14 +706,14 @@ DESCRIPTION
 	Returns zero otherwise.
 
 SYNOPSIS
-	boolean bfd_is_undefined_symclass (int symclass);
+	bfd_boolean bfd_is_undefined_symclass (int symclass);
 */
 
-boolean
+bfd_boolean
 bfd_is_undefined_symclass (symclass)
      int symclass;
 {
-  return (boolean) (symclass == 'U' || symclass == 'w' || symclass == 'v');
+  return symclass == 'U' || symclass == 'w' || symclass == 'v';
 }
 
 /*
@@ -749,12 +749,12 @@ FUNCTION
 	bfd_copy_private_symbol_data
 
 SYNOPSIS
-	boolean bfd_copy_private_symbol_data(bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
+	bfd_boolean bfd_copy_private_symbol_data(bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
 
 DESCRIPTION
 	Copy private symbol information from @var{isym} in the BFD
 	@var{ibfd} to the symbol @var{osym} in the BFD @var{obfd}.
-	Return <<true>> on success, <<false>> on error.  Possible error
+	Return <<TRUE>> on success, <<FALSE>> on error.  Possible error
 	returns are:
 
 	o <<bfd_error_no_memory>> -
@@ -773,7 +773,7 @@ DESCRIPTION
 long
 _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep)
      bfd *abfd;
-     boolean dynamic;
+     bfd_boolean dynamic;
      PTR *minisymsp;
      unsigned int *sizep;
 {
@@ -820,7 +820,7 @@ _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep)
 asymbol *
 _bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean dynamic ATTRIBUTE_UNUSED;
+     bfd_boolean dynamic ATTRIBUTE_UNUSED;
      const PTR minisym;
      asymbol *sym ATTRIBUTE_UNUSED;
 {
@@ -830,7 +830,7 @@ _bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym)
 /* Look through stabs debugging information in .stab and .stabstr
    sections to find the source file and line closest to a desired
    location.  This is used by COFF and ELF targets.  It sets *pfound
-   to true if it finds some information.  The *pinfo field is used to
+   to TRUE if it finds some information.  The *pinfo field is used to
    pass cached information in and out of this routine; this first time
    the routine is called for a BFD, *pinfo should be NULL.  The value
    placed in *pinfo should be saved with the BFD, and passed back each
@@ -902,14 +902,14 @@ struct stab_find_info
   char *filename;
 };
 
-boolean
+bfd_boolean
 _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 				     pfilename, pfnname, pline, pinfo)
      bfd *abfd;
      asymbol **symbols;
      asection *section;
      bfd_vma offset;
-     boolean *pfound;
+     bfd_boolean *pfound;
      const char **pfilename;
      const char **pfnname;
      unsigned int *pline;
@@ -924,9 +924,9 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
   char *file_name;
   char *directory_name;
   int saw_fun;
-  boolean saw_line, saw_func;
+  bfd_boolean saw_line, saw_func;
 
-  *pfound = false;
+  *pfound = FALSE;
   *pfilename = bfd_get_filename (abfd);
   *pfnname = NULL;
   *pline = 0;
@@ -957,7 +957,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
       if (info->stabsec == NULL || info->strsec == NULL)
 	{
 	  /* No stabs debugging information.  */
-	  return true;
+	  return TRUE;
 	}
 
       stabsize = info->stabsec->_raw_size;
@@ -974,7 +974,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 
       info = (struct stab_find_info *) bfd_zalloc (abfd, amt);
       if (info == NULL)
-	return false;
+	return FALSE;
 
       /* FIXME: When using the linker --split-by-file or
 	 --split-by-reloc options, it is possible for the .stab and
@@ -988,7 +988,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 	  /* No stabs debugging information.  Set *pinfo so that we
              can return quickly in the info != NULL case above.  */
 	  *pinfo = (PTR) info;
-	  return true;
+	  return TRUE;
 	}
 
       stabsize = info->stabsec->_raw_size;
@@ -997,13 +997,13 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
       info->stabs = (bfd_byte *) bfd_alloc (abfd, stabsize);
       info->strs = (bfd_byte *) bfd_alloc (abfd, strsize);
       if (info->stabs == NULL || info->strs == NULL)
-	return false;
+	return FALSE;
 
       if (! bfd_get_section_contents (abfd, info->stabsec, info->stabs,
 				      (bfd_vma) 0, stabsize)
 	  || ! bfd_get_section_contents (abfd, info->strsec, info->strs,
 					 (bfd_vma) 0, strsize))
-	return false;
+	return FALSE;
 
       /* If this is a relocateable object file, we have to relocate
 	 the entries in .stab.  This should always be simple 32 bit
@@ -1011,17 +1011,17 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 	 this should be no big deal.  */
       reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec);
       if (reloc_size < 0)
-	return false;
+	return FALSE;
       reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
       if (reloc_vector == NULL && reloc_size != 0)
-	return false;
+	return FALSE;
       reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector,
 					    symbols);
       if (reloc_count < 0)
 	{
 	  if (reloc_vector != NULL)
 	    free (reloc_vector);
-	  return false;
+	  return FALSE;
 	}
       if (reloc_count > 0)
 	{
@@ -1046,7 +1046,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 		  bfd_set_error (bfd_error_invalid_operation);
 		  if (reloc_vector != NULL)
 		    free (reloc_vector);
-		  return false;
+		  return FALSE;
 		}
 
 	      val = bfd_get_32 (abfd, info->stabs + r->address);
@@ -1100,14 +1100,14 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 	++info->indextablesize;
 
       if (info->indextablesize == 0)
-	return true;
+	return TRUE;
       ++info->indextablesize;
 
       amt = info->indextablesize;
       amt *= sizeof (struct indexentry);
       info->indextable = (struct indexentry *) bfd_alloc (abfd, amt);
       if (info->indextable == NULL)
-	return false;
+	return FALSE;
 
       file_name = NULL;
       directory_name = NULL;
@@ -1272,7 +1272,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 	}
 
       if (indexentry == NULL)
-	return true;
+	return TRUE;
 
       stab = indexentry->stab + STABSIZE;
       file_name = indexentry->file_name;
@@ -1281,14 +1281,14 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
   directory_name = indexentry->directory_name;
   str = indexentry->str;
 
-  saw_line = false;
-  saw_func = false;
+  saw_line = FALSE;
+  saw_func = FALSE;
   for (; stab < (indexentry+1)->stab; stab += STABSIZE)
     {
-      boolean done;
+      bfd_boolean done;
       bfd_vma val;
 
-      done = false;
+      done = FALSE;
 
       switch (stab[TYPEOFF])
 	{
@@ -1324,15 +1324,15 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 #endif
 	    }
 	  if (val > offset)
-	    done = true;
-	  saw_line = true;
+	    done = TRUE;
+	  saw_line = TRUE;
 	  break;
 
 	case N_FUN:
 	case N_SO:
 	  if (saw_func || saw_line)
-	    done = true;
-	  saw_func = true;
+	    done = TRUE;
+	  saw_func = TRUE;
 	  break;
 	}
 
@@ -1340,7 +1340,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 	break;
     }
 
-  *pfound = true;
+  *pfound = TRUE;
 
   if (file_name == NULL || IS_ABSOLUTE_PATH (file_name)
       || directory_name == NULL)
@@ -1361,7 +1361,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 	  len = strlen (file_name) + 1;
 	  info->filename = (char *) bfd_malloc ((bfd_size_type) dirlen + len);
 	  if (info->filename == NULL)
-	    return false;
+	    return FALSE;
 	  memcpy (info->filename, directory_name, dirlen);
 	  memcpy (info->filename + dirlen, file_name, len);
 	}
@@ -1384,5 +1384,5 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
       *pfnname = indexentry->function_name;
     }
 
-  return true;
+  return TRUE;
 }
diff --git a/bfd/targets.c b/bfd/targets.c
index 6a68eaa13f0..604368c2014 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -70,7 +70,7 @@ DESCRIPTION
 	<<bfd_check_format>> on the BFD with a suggested format.
 	If <<target_defaulted>> has been set, each possible target
 	type is tried to see if it recognizes the specified format.
-	<<bfd_check_format>> returns <<true>> when the caller guesses right.
+	<<bfd_check_format>> returns <<TRUE>> when the caller guesses right.
 @menu
 @* bfd_target::
 @end menu
@@ -231,10 +231,10 @@ DESCRIPTION
 .  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));
 .
 .  {* Set the format of a file being written.  *}
-.  boolean  (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
+.  bfd_boolean (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
 .
 .  {* Write cached information into a file being written, at <<bfd_close>>.  *}
-.  boolean  (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
+.  bfd_boolean (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
 .
 The general target vector.  These vectors are initialized using the
 BFD_JUMP_TABLE macros.
@@ -251,15 +251,15 @@ the tokens.
 .CONCAT2 (NAME,_get_section_contents_in_window)
 .
 .  {* Called when the BFD is being closed to do any necessary cleanup.  *}
-.  boolean  (*_close_and_cleanup) PARAMS ((bfd *));
+.  bfd_boolean (*_close_and_cleanup) PARAMS ((bfd *));
 .  {* Ask the BFD to free all cached information.  *}
-.  boolean  (*_bfd_free_cached_info) PARAMS ((bfd *));
+.  bfd_boolean (*_bfd_free_cached_info) PARAMS ((bfd *));
 .  {* Called when a new section is created.  *}
-.  boolean  (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
+.  bfd_boolean (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
 .  {* Read the contents of a section.  *}
-.  boolean  (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-.                                                 file_ptr, bfd_size_type));
-.  boolean  (*_bfd_get_section_contents_in_window)
+.  bfd_boolean (*_bfd_get_section_contents)
+.    PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+.  bfd_boolean (*_bfd_get_section_contents_in_window)
 .    PARAMS ((bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type));
 .
 .  {* Entry points to copy private data.  *}
@@ -272,32 +272,32 @@ the tokens.
 .CONCAT2 (NAME,_bfd_print_private_bfd_data) \
 .  {* Called to copy BFD general private data from one object file
 .     to another.  *}
-.  boolean  (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
+.  bfd_boolean (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
 .  {* Called to merge BFD general private data from one object file
 .     to a common output file when linking.  *}
-.  boolean  (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
+.  bfd_boolean (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
 .  {* Called to copy BFD private section data from one object file
 .     to another.  *}
-.  boolean  (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
-.                                                      bfd *, sec_ptr));
+.  bfd_boolean (*_bfd_copy_private_section_data)
+.    PARAMS ((bfd *, sec_ptr, bfd *, sec_ptr));
 .  {* Called to copy BFD private symbol data from one symbol
 .     to another.  *}
-.  boolean  (*_bfd_copy_private_symbol_data) PARAMS ((bfd *, asymbol *,
-.                                                     bfd *, asymbol *));
+.  bfd_boolean (*_bfd_copy_private_symbol_data)
+.    PARAMS ((bfd *, asymbol *, bfd *, asymbol *));
 .  {* Called to set private backend flags.  *}
-.  boolean  (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
+.  bfd_boolean (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
 .
 .  {* Called to print private BFD data.  *}
-.  boolean  (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
+.  bfd_boolean (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
 .
 .  {* Core file entry points.  *}
 .#define BFD_JUMP_TABLE_CORE(NAME) \
 .CONCAT2 (NAME,_core_file_failing_command), \
 .CONCAT2 (NAME,_core_file_failing_signal), \
 .CONCAT2 (NAME,_core_file_matches_executable_p)
-.  char *   (*_core_file_failing_command) PARAMS ((bfd *));
-.  int      (*_core_file_failing_signal) PARAMS ((bfd *));
-.  boolean  (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));
+.  char *      (*_core_file_failing_command) PARAMS ((bfd *));
+.  int         (*_core_file_failing_signal) PARAMS ((bfd *));
+.  bfd_boolean (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));
 .
 .  {* Archive entry points.  *}
 .#define BFD_JUMP_TABLE_ARCHIVE(NAME) \
@@ -311,19 +311,19 @@ the tokens.
 .CONCAT2 (NAME,_get_elt_at_index), \
 .CONCAT2 (NAME,_generic_stat_arch_elt), \
 .CONCAT2 (NAME,_update_armap_timestamp)
-.  boolean  (*_bfd_slurp_armap) PARAMS ((bfd *));
-.  boolean  (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
-.  boolean  (*_bfd_construct_extended_name_table)
+.  bfd_boolean (*_bfd_slurp_armap) PARAMS ((bfd *));
+.  bfd_boolean (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
+.  bfd_boolean (*_bfd_construct_extended_name_table)
 .    PARAMS ((bfd *, char **, bfd_size_type *, const char **));
-.  void     (*_bfd_truncate_arname) PARAMS ((bfd *, const char *, char *));
-.  boolean  (*write_armap)
+.  void        (*_bfd_truncate_arname) PARAMS ((bfd *, const char *, char *));
+.  bfd_boolean (*write_armap)
 .    PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-.  PTR      (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
-.  bfd *    (*openr_next_archived_file) PARAMS ((bfd *, bfd *));
+.  PTR         (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
+.  bfd *       (*openr_next_archived_file) PARAMS ((bfd *, bfd *));
 .#define bfd_get_elt_at_index(b,i) BFD_SEND(b, _bfd_get_elt_at_index, (b,i))
-.  bfd *    (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex));
-.  int      (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
-.  boolean  (*_bfd_update_armap_timestamp) PARAMS ((bfd *));
+.  bfd *       (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex));
+.  int         (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
+.  bfd_boolean (*_bfd_update_armap_timestamp) PARAMS ((bfd *));
 .
 .  {* Entry points used for symbols.  *}
 .#define BFD_JUMP_TABLE_SYMBOLS(NAME) \
@@ -338,59 +338,57 @@ the tokens.
 .CONCAT2 (NAME,_bfd_make_debug_symbol), \
 .CONCAT2 (NAME,_read_minisymbols), \
 .CONCAT2 (NAME,_minisymbol_to_symbol)
-.  long     (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *));
-.  long     (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
+.  long        (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *));
+.  long        (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
 .                                                struct symbol_cache_entry **));
 .  struct symbol_cache_entry *
-.           (*_bfd_make_empty_symbol) PARAMS ((bfd *));
-.  void     (*_bfd_print_symbol) PARAMS ((bfd *, PTR,
-.                                         struct symbol_cache_entry *,
-.                                         bfd_print_symbol_type));
+.              (*_bfd_make_empty_symbol) PARAMS ((bfd *));
+.  void        (*_bfd_print_symbol)
+.    PARAMS ((bfd *, PTR, struct symbol_cache_entry *, bfd_print_symbol_type));
 .#define bfd_print_symbol(b,p,s,e) BFD_SEND(b, _bfd_print_symbol, (b,p,s,e))
-.  void     (*_bfd_get_symbol_info) PARAMS ((bfd *,
-.                                            struct symbol_cache_entry *,
-.                                            symbol_info *));
+.  void        (*_bfd_get_symbol_info)
+.    PARAMS ((bfd *, struct symbol_cache_entry *, symbol_info *));
 .#define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))
-.  boolean  (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));
+.  bfd_boolean (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));
 .
-.  alent *  (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
-.  boolean  (*_bfd_find_nearest_line)
+.  alent *     (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
+.  bfd_boolean (*_bfd_find_nearest_line)
 .    PARAMS ((bfd *, struct sec *, struct symbol_cache_entry **, bfd_vma,
 .             const char **, const char **, unsigned int *));
 . {* Back-door to allow format-aware applications to create debug symbols
 .    while using BFD for everything else.  Currently used by the assembler
 .    when creating COFF files.  *}
-.  asymbol *(*_bfd_make_debug_symbol) PARAMS ((bfd *, void *,
-.                                              unsigned long size));
+.  asymbol *   (*_bfd_make_debug_symbol)
+.    PARAMS ((bfd *, void *, unsigned long size));
 .#define bfd_read_minisymbols(b, d, m, s) \
 .  BFD_SEND (b, _read_minisymbols, (b, d, m, s))
-.  long     (*_read_minisymbols) PARAMS ((bfd *, boolean, PTR *,
-.                                         unsigned int *));
+.  long        (*_read_minisymbols)
+.    PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *));
 .#define bfd_minisymbol_to_symbol(b, d, m, f) \
 .  BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
-.  asymbol *(*_minisymbol_to_symbol) PARAMS ((bfd *, boolean, const PTR,
-.                                             asymbol *));
+.  asymbol *   (*_minisymbol_to_symbol)
+.    PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *));
 .
 .  {* Routines for relocs.  *}
 .#define BFD_JUMP_TABLE_RELOCS(NAME) \
 .CONCAT2 (NAME,_get_reloc_upper_bound), \
 .CONCAT2 (NAME,_canonicalize_reloc), \
 .CONCAT2 (NAME,_bfd_reloc_type_lookup)
-.  long     (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
-.  long     (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
-.                                               struct symbol_cache_entry **));
+.  long        (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
+.  long        (*_bfd_canonicalize_reloc)
+.    PARAMS ((bfd *, sec_ptr, arelent **, struct symbol_cache_entry **));
 .  {* See documentation on reloc types.  *}
 .  reloc_howto_type *
-.           (*reloc_type_lookup) PARAMS ((bfd *, bfd_reloc_code_real_type));
+.              (*reloc_type_lookup) PARAMS ((bfd *, bfd_reloc_code_real_type));
 .
 .  {* Routines used when writing an object file.  *}
 .#define BFD_JUMP_TABLE_WRITE(NAME) \
 .CONCAT2 (NAME,_set_arch_mach), \
 .CONCAT2 (NAME,_set_section_contents)
-.  boolean  (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
-.                                          unsigned long));
-.  boolean  (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-.                                                 file_ptr, bfd_size_type));
+.  bfd_boolean (*_bfd_set_arch_mach)
+.    PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+.  bfd_boolean (*_bfd_set_section_contents)
+.    PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
 .
 .  {* Routines used by the linker.  *}
 .#define BFD_JUMP_TABLE_LINK(NAME) \
@@ -406,42 +404,46 @@ the tokens.
 .CONCAT2 (NAME,_bfd_gc_sections), \
 .CONCAT2 (NAME,_bfd_merge_sections), \
 .CONCAT2 (NAME,_bfd_discard_group)
-.  int      (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
-.  bfd_byte *(*_bfd_get_relocated_section_contents)
+.  int         (*_bfd_sizeof_headers) PARAMS ((bfd *, bfd_boolean));
+.  bfd_byte *  (*_bfd_get_relocated_section_contents)
 .    PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-.             bfd_byte *, boolean, struct symbol_cache_entry **));
+.             bfd_byte *, bfd_boolean, struct symbol_cache_entry **));
 .
-.  boolean  (*_bfd_relax_section)
-.    PARAMS ((bfd *, struct sec *, struct bfd_link_info *, boolean *));
+.  bfd_boolean (*_bfd_relax_section)
+.    PARAMS ((bfd *, struct sec *, struct bfd_link_info *, bfd_boolean *));
 .
 .  {* Create a hash table for the linker.  Different backends store
 .     different information in this table.  *}
-.  struct bfd_link_hash_table *(*_bfd_link_hash_table_create) PARAMS ((bfd *));
+.  struct bfd_link_hash_table *
+.              (*_bfd_link_hash_table_create) PARAMS ((bfd *));
 .
 .  {* Release the memory associated with the linker hash table.  *}
-.  void (*_bfd_link_hash_table_free) PARAMS ((struct bfd_link_hash_table *));
+.  void        (*_bfd_link_hash_table_free)
+.    PARAMS ((struct bfd_link_hash_table *));
 .
 .  {* Add symbols from this object file into the hash table.  *}
-.  boolean  (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
+.  bfd_boolean (*_bfd_link_add_symbols)
+.    PARAMS ((bfd *, struct bfd_link_info *));
 .
 .  {* Indicate that we are only retrieving symbol values from this section.  *}
-.  void     (*_bfd_link_just_syms) PARAMS ((asection *, struct bfd_link_info *));
+.  void        (*_bfd_link_just_syms)
+.    PARAMS ((asection *, struct bfd_link_info *));
 .
 .  {* Do a link based on the link_order structures attached to each
 .     section of the BFD.  *}
-.  boolean  (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
+.  bfd_boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
 .
 .  {* Should this section be split up into smaller pieces during linking.  *}
-.  boolean  (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
+.  bfd_boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
 .
 .  {* Remove sections that are not referenced from the output.  *}
-.  boolean  (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
+.  bfd_boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
 .
 .  {* Attempt to merge SEC_MERGE sections.  *}
-.  boolean  (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
+.  bfd_boolean (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
 .
 .  {* Discard members of a group.  *}
-.  boolean  (*_bfd_discard_group) PARAMS ((bfd *, struct sec *));
+.  bfd_boolean (*_bfd_discard_group) PARAMS ((bfd *, struct sec *));
 .
 .  {* Routines to handle dynamic symbols and relocs.  *}
 .#define BFD_JUMP_TABLE_DYNAMIC(NAME) \
@@ -450,14 +452,14 @@ the tokens.
 .CONCAT2 (NAME,_get_dynamic_reloc_upper_bound), \
 .CONCAT2 (NAME,_canonicalize_dynamic_reloc)
 .  {* Get the amount of memory required to hold the dynamic symbols.  *}
-.  long     (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
+.  long        (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
 .  {* Read in the dynamic symbols.  *}
-.  long     (*_bfd_canonicalize_dynamic_symtab)
+.  long        (*_bfd_canonicalize_dynamic_symtab)
 .    PARAMS ((bfd *, struct symbol_cache_entry **));
 .  {* Get the amount of memory required to hold the dynamic relocs.  *}
-.  long     (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
+.  long        (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
 .  {* Read in the dynamic relocs.  *}
-.  long     (*_bfd_canonicalize_dynamic_reloc)
+.  long        (*_bfd_canonicalize_dynamic_reloc)
 .    PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
 .
 
@@ -1184,7 +1186,7 @@ FUNCTION
 	bfd_set_default_target
 
 SYNOPSIS
-	boolean bfd_set_default_target (const char *name);
+	bfd_boolean bfd_set_default_target (const char *name);
 
 DESCRIPTION
 	Set the default target vector to use when recognizing a BFD.
@@ -1192,7 +1194,7 @@ DESCRIPTION
 	name or a configuration triplet.
 */
 
-boolean
+bfd_boolean
 bfd_set_default_target (name)
      const char *name;
 {
@@ -1200,14 +1202,14 @@ bfd_set_default_target (name)
 
   if (bfd_default_vector[0] != NULL
       && strcmp (name, bfd_default_vector[0]->name) == 0)
-    return true;
+    return TRUE;
 
   target = find_target (name);
   if (target == NULL)
-    return false;
+    return FALSE;
 
   bfd_default_vector[0] = target;
-  return true;
+  return TRUE;
 }
 
 /*
@@ -1245,7 +1247,7 @@ bfd_find_target (target_name, abfd)
   /* This is safe; the vector cannot be null */
   if (targname == NULL || strcmp (targname, "default") == 0)
     {
-      abfd->target_defaulted = true;
+      abfd->target_defaulted = TRUE;
       if (bfd_default_vector[0] != NULL)
 	abfd->xvec = bfd_default_vector[0];
       else
@@ -1253,7 +1255,7 @@ bfd_find_target (target_name, abfd)
       return abfd->xvec;
     }
 
-  abfd->target_defaulted = false;
+  abfd->target_defaulted = FALSE;
 
   target = find_target (targname);
   if (target == NULL)
diff --git a/bfd/tekhex.c b/bfd/tekhex.c
index 19dcb875597..033dce0cc21 100644
--- a/bfd/tekhex.c
+++ b/bfd/tekhex.c
@@ -104,21 +104,21 @@ static void tekhex_print_symbol
  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
 static void tekhex_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
 static asymbol *tekhex_make_empty_symbol PARAMS ((bfd *));
-static int tekhex_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean tekhex_write_object_contents PARAMS ((bfd *));
+static int tekhex_sizeof_headers PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean tekhex_write_object_contents PARAMS ((bfd *));
 static void out PARAMS ((bfd *, int, char *, char *));
 static void writesym PARAMS ((char **, const char *));
 static void writevalue PARAMS ((char **, bfd_vma));
-static boolean tekhex_set_section_contents
+static bfd_boolean tekhex_set_section_contents
  PARAMS ((bfd*, sec_ptr, PTR, file_ptr, bfd_size_type));
-static boolean tekhex_set_arch_mach
+static bfd_boolean tekhex_set_arch_mach
  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean tekhex_get_section_contents
+static bfd_boolean tekhex_get_section_contents
  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
 static void move_section_contents
- PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type, boolean));
+ PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type, bfd_boolean));
 static const bfd_target *tekhex_object_p PARAMS ((bfd *));
-static boolean tekhex_mkobject PARAMS ((bfd *));
+static bfd_boolean tekhex_mkobject PARAMS ((bfd *));
 static long tekhex_get_symtab_upper_bound PARAMS ((bfd *));
 static long tekhex_get_symtab PARAMS ((bfd *, asymbol **));
 static void pass_over PARAMS ((bfd *, void (*) (bfd*, int, char *)));
@@ -239,12 +239,12 @@ static void
 tekhex_init ()
 {
   unsigned int i;
-  static boolean inited = false;
+  static bfd_boolean inited = FALSE;
   int val;
 
   if (! inited)
     {
-      inited = true;
+      inited = TRUE;
       hex_init ();
       val = 0;
       for (i = 0; i < 10; i++)
@@ -480,7 +480,7 @@ pass_over (abfd, func)
      void (*func) PARAMS ((bfd *, int, char *));
 {
   unsigned int chars_on_line;
-  boolean eof = false;
+  bfd_boolean eof = FALSE;
 
   /* To the front of the file */
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
@@ -492,10 +492,10 @@ pass_over (abfd, func)
       char type;
 
       /* Find first '%' */
-      eof = (boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
+      eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
       while (*src != '%' && !eof)
 	{
-	  eof = (boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
+	  eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
 	}
       if (eof)
 	break;
@@ -547,7 +547,7 @@ tekhex_get_symtab_upper_bound (abfd)
 
 }
 
-static boolean
+static bfd_boolean
 tekhex_mkobject (abfd)
      bfd *abfd;
 {
@@ -555,17 +555,17 @@ tekhex_mkobject (abfd)
 
   tdata = (tdata_type *) bfd_alloc (abfd, (bfd_size_type) sizeof (tdata_type));
   if (!tdata)
-    return false;
+    return FALSE;
   abfd->tdata.tekhex_data = tdata;
   tdata->type = 1;
   tdata->head = (tekhex_data_list_type *) NULL;
   tdata->symbols = (struct tekhex_symbol_struct *) NULL;
   tdata->data = (struct data_struct *) NULL;
-  return true;
+  return TRUE;
 }
 
 /*
-  Return true if the file looks like it's in TekHex format. Just look
+  Return TRUE if the file looks like it's in TekHex format. Just look
   for a percent sign and some hex digits */
 
 static const bfd_target *
@@ -596,7 +596,7 @@ move_section_contents (abfd, section, locationp, offset, count, get)
      PTR locationp;
      file_ptr offset;
      bfd_size_type count;
-     boolean get;
+     bfd_boolean get;
 {
   bfd_vma addr;
   char *location = (char *) locationp;
@@ -639,7 +639,7 @@ move_section_contents (abfd, section, locationp, offset, count, get)
 
 }
 
-static boolean
+static bfd_boolean
 tekhex_get_section_contents (abfd, section, locationp, offset, count)
      bfd *abfd;
      asection *section;
@@ -649,14 +649,14 @@ tekhex_get_section_contents (abfd, section, locationp, offset, count)
 {
   if (section->flags & (SEC_LOAD | SEC_ALLOC))
     {
-      move_section_contents (abfd, section, locationp, offset, count, true);
-      return true;
+      move_section_contents (abfd, section, locationp, offset, count, TRUE);
+      return TRUE;
     }
   else
-    return false;
+    return FALSE;
 }
 
-static boolean
+static bfd_boolean
 tekhex_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
      enum bfd_architecture arch;
@@ -668,7 +668,7 @@ tekhex_set_arch_mach (abfd, arch, machine)
 /* we have to save up all the Tekhexords for a splurge before output,
     */
 
-static boolean
+static bfd_boolean
 tekhex_set_section_contents (abfd, section, locationp, offset, bytes_to_do)
      bfd *abfd;
      sec_ptr section;
@@ -698,11 +698,11 @@ tekhex_set_section_contents (abfd, section, locationp, offset, bytes_to_do)
   if (section->flags & (SEC_LOAD | SEC_ALLOC))
     {
       move_section_contents (abfd, section, locationp, offset, bytes_to_do,
-			     false);
-      return true;
+			     FALSE);
+      return TRUE;
     }
   else
-    return false;
+    return FALSE;
 
 }
 
@@ -804,7 +804,7 @@ out (abfd, type, start, end)
     abort ();
 }
 
-static boolean
+static bfd_boolean
 tekhex_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -907,7 +907,7 @@ tekhex_write_object_contents (abfd)
 		case 'C':
 		case 'U':
 		  bfd_set_error (bfd_error_wrong_format);
-		  return false;
+		  return FALSE;
 		}
 
 	      writesym (&dst, sym->name);
@@ -920,13 +920,13 @@ tekhex_write_object_contents (abfd)
   /* And the terminator */
   if (bfd_bwrite ("%0781010\n", (bfd_size_type) 9, abfd) != 9)
     abort ();
-  return true;
+  return TRUE;
 }
 
 static int
 tekhex_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 
 {
   return 0;
diff --git a/bfd/ticoff.h b/bfd/ticoff.h
index 3b3fef02f1b..81c53b57d00 100644
--- a/bfd/ticoff.h
+++ b/bfd/ticoff.h
@@ -19,7 +19,7 @@
 #undef  F_LSYMS
 #define	F_LSYMS		F_LSYMS_TICOFF
 
-static boolean
+static bfd_boolean
 ticoff0_bad_format_hook (abfd, filehdr)
      bfd *abfd;
      PTR filehdr;
@@ -27,12 +27,12 @@ ticoff0_bad_format_hook (abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   if (COFF0_BADMAG (*internal_f))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 ticoff1_bad_format_hook (abfd, filehdr)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR filehdr;
@@ -40,21 +40,21 @@ ticoff1_bad_format_hook (abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   if (COFF1_BADMAG (*internal_f))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Replace the stock _bfd_coff_is_local_label_name
    to recognize TI COFF local labels.  */
-static boolean 
+static bfd_boolean 
 ticoff_bfd_is_local_label_name (abfd, name)
   bfd *abfd ATTRIBUTE_UNUSED;
   const char *name;
 {
   if (TICOFF_LOCAL_LABEL_P(name))
-    return true;
-  return false;
+    return TRUE;
+  return FALSE;
 }
 
 #define coff_bfd_is_local_label_name ticoff_bfd_is_local_label_name
@@ -76,14 +76,14 @@ static const bfd_coff_backend_data ticoff0_swap_table =
   coff_SWAP_scnhdr_out,
   FILHSZ_V0, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ_V0, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_LONG_SECTION_NAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
   COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
   coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
@@ -107,14 +107,14 @@ static const bfd_coff_backend_data ticoff1_swap_table =
   coff_SWAP_scnhdr_out,
   FILHSZ, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
 #ifdef COFF_LONG_SECTION_NAMES
-  true,
+  TRUE,
 #else
-  false,
+  FALSE,
 #endif
   COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
   coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
diff --git a/bfd/trad-core.c b/bfd/trad-core.c
index e27cd35e867..958ce11eb4d 100644
--- a/bfd/trad-core.c
+++ b/bfd/trad-core.c
@@ -47,13 +47,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include TRAD_HEADER
 #endif
 
-  struct trad_core_struct
-    {
-      asection *data_section;
-      asection *stack_section;
-      asection *reg_section;
-      struct user u;
-    };
+struct trad_core_struct
+{
+  asection *data_section;
+  asection *stack_section;
+  asection *reg_section;
+  struct user u;
+};
 
 #define core_upage(bfd) (&((bfd)->tdata.trad_core_data->u))
 #define core_datasec(bfd) ((bfd)->tdata.trad_core_data->data_section)
@@ -63,11 +63,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* forward declarations */
 
 const bfd_target *trad_unix_core_file_p PARAMS ((bfd *abfd));
-char *		trad_unix_core_file_failing_command PARAMS ((bfd *abfd));
-int		trad_unix_core_file_failing_signal PARAMS ((bfd *abfd));
-boolean		trad_unix_core_file_matches_executable_p
-			 PARAMS ((bfd *core_bfd, bfd *exec_bfd));
-static void	swap_abort PARAMS ((void));
+char * trad_unix_core_file_failing_command PARAMS ((bfd *abfd));
+int trad_unix_core_file_failing_signal PARAMS ((bfd *abfd));
+bfd_boolean trad_unix_core_file_matches_executable_p
+  PARAMS ((bfd *core_bfd, bfd *exec_bfd));
+static void swap_abort PARAMS ((void));
 
 /* Handle 4.2-style (and perhaps also sysV-style) core dump file.  */
 
@@ -261,12 +261,12 @@ trad_unix_core_file_failing_signal (ignore_abfd)
 }
 
 /* ARGSUSED */
-boolean
+bfd_boolean
 trad_unix_core_file_matches_executable_p  (core_bfd, exec_bfd)
      bfd *core_bfd ATTRIBUTE_UNUSED;
      bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
-  return true;		/* FIXME, We have no way of telling at this point */
+  return TRUE;		/* FIXME, We have no way of telling at this point */
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
diff --git a/bfd/versados.c b/bfd/versados.c
index 684c3dbd2e4..1301c5880a4 100644
--- a/bfd/versados.c
+++ b/bfd/versados.c
@@ -44,18 +44,19 @@
 #include "libbfd.h"
 #include "libiberty.h"
 
-static boolean versados_mkobject PARAMS ((bfd *));
-static boolean versados_scan PARAMS ((bfd *));
+static bfd_boolean versados_mkobject PARAMS ((bfd *));
+static bfd_boolean versados_scan PARAMS ((bfd *));
 static const bfd_target *versados_object_p PARAMS ((bfd *));
-static asymbol *versados_new_symbol PARAMS ((bfd *, int, const char *, bfd_vma, asection *));
+static asymbol *versados_new_symbol
+  PARAMS ((bfd *, int, const char *, bfd_vma, asection *));
 static char *new_symbol_string PARAMS ((bfd *, const char *));
 static const bfd_target *versados_object_p PARAMS ((bfd *));
-static boolean versados_pass_2 PARAMS ((bfd *));
-static boolean versados_get_section_contents
+static bfd_boolean versados_pass_2 PARAMS ((bfd *));
+static bfd_boolean versados_get_section_contents
   PARAMS ((bfd *, asection *, void *, file_ptr, bfd_size_type));
-static boolean versados_set_section_contents
+static bfd_boolean versados_set_section_contents
   PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
-static int versados_sizeof_headers PARAMS ((bfd *, boolean));
+static int versados_sizeof_headers PARAMS ((bfd *, bfd_boolean));
 static long int versados_get_symtab_upper_bound PARAMS ((bfd *));
 static long int versados_get_symtab PARAMS ((bfd *, asymbol **));
 static void versados_get_symbol_info
@@ -172,7 +173,7 @@ static void process_otr PARAMS ((bfd *, struct ext_otr *, int));
 
 /* Set up the tdata information.  */
 
-static boolean
+static bfd_boolean
 versados_mkobject (abfd)
      bfd *abfd;
 {
@@ -181,14 +182,14 @@ versados_mkobject (abfd)
       bfd_size_type amt = sizeof (tdata_type);
       tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, amt);
       if (tdata == NULL)
-	return false;
+	return FALSE;
       abfd->tdata.versados_data = tdata;
       tdata->symbols = NULL;
       VDATA (abfd)->alert = 0x12345678;
     }
 
   bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
-  return true;
+  return TRUE;
 }
 
 /* Report a problem in an S record file.  FIXME: This probably should
@@ -357,19 +358,19 @@ process_esd (abfd, esd, pass)
 
 reloc_howto_type versados_howto_table[] =
 {
-  HOWTO (R_RELWORD, 0, 1, 16, false,
+  HOWTO (R_RELWORD, 0, 1, 16, FALSE,
 	 0, complain_overflow_dont, 0,
-	 "+v16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG, 0, 2, 32, false,
+	 "+v16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG, 0, 2, 32, FALSE,
 	 0, complain_overflow_dont, 0,
-	 "+v32", true, 0xffffffff, 0xffffffff, false),
+	 "+v32", TRUE, 0xffffffff, 0xffffffff, FALSE),
 
-  HOWTO (R_RELWORD_NEG, 0, -1, 16, false,
+  HOWTO (R_RELWORD_NEG, 0, -1, 16, FALSE,
 	 0, complain_overflow_dont, 0,
-	 "-v16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG_NEG, 0, -2, 32, false,
+	 "-v16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG_NEG, 0, -2, 32, FALSE,
 	 0, complain_overflow_dont, 0,
-	 "-v32", true, 0xffffffff, 0xffffffff, false),
+	 "-v32", TRUE, 0xffffffff, 0xffffffff, FALSE),
 };
 
 static int
@@ -489,7 +490,7 @@ process_otr (abfd, otr, pass)
     }
 }
 
-static boolean
+static bfd_boolean
 versados_scan (abfd)
      bfd *abfd;
 {
@@ -510,7 +511,7 @@ versados_scan (abfd)
     {
       union ext_any any;
       if (!get_record (abfd, &any))
-	return true;
+	return TRUE;
       switch (any.header.type)
 	{
 	case VHEADER:
@@ -572,7 +573,7 @@ versados_scan (abfd)
 
   if ((VDATA (abfd)->symbols == NULL && abfd->symcount > 0)
       || (VDATA (abfd)->strings == NULL && VDATA (abfd)->stringlen > 0))
-    return false;
+    return FALSE;
 
   /* Actually fill in the section symbols,
      we stick them at the end of the table */
@@ -653,7 +654,7 @@ versados_object_p (abfd)
   return abfd->xvec;
 }
 
-static boolean
+static bfd_boolean
 versados_pass_2 (abfd)
      bfd *abfd;
 {
@@ -687,7 +688,7 @@ versados_pass_2 (abfd)
     }
 }
 
-static boolean
+static bfd_boolean
 versados_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -696,19 +697,19 @@ versados_get_section_contents (abfd, section, location, offset, count)
      bfd_size_type count;
 {
   if (!versados_pass_2 (abfd))
-    return false;
+    return FALSE;
 
   memcpy (location,
 	  EDATA (abfd, section->target_index).contents + offset,
 	  (size_t) count);
 
-  return true;
+  return TRUE;
 }
 
 #define versados_get_section_contents_in_window \
   _bfd_generic_get_section_contents_in_window
 
-static boolean
+static bfd_boolean
 versados_set_section_contents (abfd, section, location, offset, bytes_to_do)
      bfd *abfd ATTRIBUTE_UNUSED;
      sec_ptr section ATTRIBUTE_UNUSED;
@@ -716,13 +717,13 @@ versados_set_section_contents (abfd, section, location, offset, bytes_to_do)
      file_ptr offset ATTRIBUTE_UNUSED;
      bfd_size_type bytes_to_do ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
 
 static int
 versados_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
diff --git a/bfd/vms-gsd.c b/bfd/vms-gsd.c
index 10fbb2d35c7..7bb7a773599 100644
--- a/bfd/vms-gsd.c
+++ b/bfd/vms-gsd.c
@@ -674,7 +674,9 @@ _bfd_vms_slurp_gsd (abfd, objtype)
 
 	    /* save symbol in vms_symbol_table  */
 
-	    entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV(vms_symbol_table), symbol->name, true, false);
+	    entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV(vms_symbol_table),
+							  symbol->name,
+							  TRUE, FALSE);
 	    if (entry == (vms_symbol_entry *)NULL)
 	      {
 		bfd_set_error (bfd_error_no_memory);
diff --git a/bfd/vms-hdr.c b/bfd/vms-hdr.c
index fbeb42e4eb3..adbecaccba5 100644
--- a/bfd/vms-hdr.c
+++ b/bfd/vms-hdr.c
@@ -1,6 +1,7 @@
 /* vms-hdr.c -- BFD back-end for VMS/VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    HDR record handling functions
    EMH record handling functions
@@ -408,10 +409,10 @@ _bfd_vms_slurp_eom (abfd, objtype)
 	  bfd_set_error (bfd_error_bad_value);
 	  return -1;
 	}
-      PRIV(eom_data).eom_has_transfer = false;
+      PRIV(eom_data).eom_has_transfer = FALSE;
       if (PRIV(rec_size) > 10)
 	{
-	   PRIV(eom_data).eom_has_transfer = true;
+	   PRIV(eom_data).eom_has_transfer = TRUE;
 	   PRIV(eom_data).eom_b_tfrflg = *(vms_rec + 9);
 	   PRIV(eom_data).eom_l_psindx = bfd_getl32 (vms_rec + 12);
 	   PRIV(eom_data).eom_l_tfradr = bfd_getl32 (vms_rec + 16);
diff --git a/bfd/vms-misc.c b/bfd/vms-misc.c
index 3b043b47b76..de76fe5b61e 100644
--- a/bfd/vms-misc.c
+++ b/bfd/vms-misc.c
@@ -355,8 +355,8 @@ _bfd_vms_get_record (abfd)
 
   if (PRIV (file_format) == FF_UNKNOWN)
     {						/* record length repeats ? */
-      if ( (vms_buf[0] == vms_buf[4])
-        && (vms_buf[1] == vms_buf[5]))
+      if (vms_buf[0] == vms_buf[4]
+	  && vms_buf[1] == vms_buf[5])
 	{
 	  PRIV (file_format) = FF_FOREIGN;	/* Y: foreign environment */
 	  test_start = 2;
@@ -608,7 +608,7 @@ add_new_contents (abfd, section)
 /* Save section data & offset to an vms_section structure
    vms_section_table[] holds the vms_section chain  */
 
-boolean
+bfd_boolean
 _bfd_save_vms_section (abfd, section, data, offset, count)
      bfd *abfd;
      sec_ptr section;
@@ -621,16 +621,16 @@ _bfd_save_vms_section (abfd, section, data, offset, count)
   if (section->index >= VMS_SECTION_COUNT)
     {
       bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
+      return FALSE;
     }
   if (count == (bfd_size_type)0)
-    return true;
+    return TRUE;
   sptr = add_new_contents (abfd, section);
   if (sptr == NULL)
-    return false;
+    return FALSE;
   memcpy (sptr->contents + offset, data, (size_t) count);
 
-  return true;
+  return TRUE;
 }
 
 /* Get vms_section pointer to saved contents for section # index  */
@@ -1092,13 +1092,14 @@ _bfd_vms_enter_symbol (abfd, name)
 #endif
 
   entry = (vms_symbol_entry *)
-	  bfd_hash_lookup (PRIV (vms_symbol_table), name, false, false);
+	  bfd_hash_lookup (PRIV (vms_symbol_table), name, FALSE, FALSE);
   if (entry == 0)
     {
 #if VMS_DEBUG
       _bfd_vms_debug (8,  "creating hash entry for %s\n", name);
 #endif
-      entry = (vms_symbol_entry *)bfd_hash_lookup (PRIV (vms_symbol_table), name, true, false);
+      entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV (vms_symbol_table),
+						    name, TRUE, FALSE);
       if (entry != 0)
 	{
 	  asymbol *symbol;
diff --git a/bfd/vms-tir.c b/bfd/vms-tir.c
index 8e9eef41e12..bd748ca3fa7 100644
--- a/bfd/vms-tir.c
+++ b/bfd/vms-tir.c
@@ -41,27 +41,48 @@
 
 #include "vms.h"
 
-static void image_set_ptr PARAMS ((bfd *abfd, int psect, uquad offset));
-static void image_inc_ptr PARAMS ((bfd *abfd, uquad offset));
-static void image_dump PARAMS ((bfd *abfd, unsigned char *ptr, int size, int offset));
-static void image_write_b PARAMS ((bfd *abfd, unsigned int value));
-static void image_write_w PARAMS ((bfd *abfd, unsigned int value));
-static void image_write_l PARAMS ((bfd *abfd, unsigned long value));
-static void image_write_q PARAMS ((bfd *abfd, uquad value));
-static int check_section PARAMS ((bfd *, int));
-static boolean etir_sta PARAMS ((bfd *, int, unsigned char *));
-static boolean etir_sto PARAMS ((bfd *, int, unsigned char *));
-static boolean etir_opr PARAMS ((bfd *, int, unsigned char *));
-static boolean etir_ctl PARAMS ((bfd *, int, unsigned char *));
-static boolean etir_stc PARAMS ((bfd *, int, unsigned char *));
-static asection *new_section PARAMS ((bfd *, int));
-static int alloc_section PARAMS ((bfd *, unsigned int));
-static int etir_cmd PARAMS ((bfd *, int, unsigned char *));
-static int analyze_tir PARAMS ((bfd *, unsigned char *, unsigned int));
-static int analyze_etir PARAMS ((bfd *, unsigned char *, unsigned int));
-static unsigned char * tir_opr PARAMS ((bfd *, unsigned char *));
-static const char * tir_cmd_name PARAMS ((int));
-static const char * cmd_name PARAMS ((int));
+static void image_set_ptr
+  PARAMS ((bfd *abfd, int psect, uquad offset));
+static void image_inc_ptr
+  PARAMS ((bfd *abfd, uquad offset));
+static void image_dump
+  PARAMS ((bfd *abfd, unsigned char *ptr, int size, int offset));
+static void image_write_b
+  PARAMS ((bfd *abfd, unsigned int value));
+static void image_write_w
+  PARAMS ((bfd *abfd, unsigned int value));
+static void image_write_l
+  PARAMS ((bfd *abfd, unsigned long value));
+static void image_write_q
+  PARAMS ((bfd *abfd, uquad value));
+static int check_section
+  PARAMS ((bfd *, int));
+static bfd_boolean etir_sta
+  PARAMS ((bfd *, int, unsigned char *));
+static bfd_boolean etir_sto
+  PARAMS ((bfd *, int, unsigned char *));
+static bfd_boolean etir_opr
+  PARAMS ((bfd *, int, unsigned char *));
+static bfd_boolean etir_ctl
+  PARAMS ((bfd *, int, unsigned char *));
+static bfd_boolean etir_stc
+  PARAMS ((bfd *, int, unsigned char *));
+static asection *new_section
+  PARAMS ((bfd *, int));
+static int alloc_section
+  PARAMS ((bfd *, unsigned int));
+static int etir_cmd
+  PARAMS ((bfd *, int, unsigned char *));
+static int analyze_tir
+  PARAMS ((bfd *, unsigned char *, unsigned int));
+static int analyze_etir
+  PARAMS ((bfd *, unsigned char *, unsigned int));
+static unsigned char * tir_opr
+  PARAMS ((bfd *, unsigned char *));
+static const char * tir_cmd_name
+  PARAMS ((int));
+static const char * cmd_name
+  PARAMS ((int));
 
 
 static int
@@ -282,7 +303,7 @@ cmd_name (cmd)
 
    see table B-8 of the openVMS linker manual.  */
 
-static boolean
+static bfd_boolean
 etir_sta (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
@@ -310,7 +331,7 @@ etir_sta (abfd, cmd, ptr)
 
 	name = _bfd_vms_save_counted_string (ptr);
 	entry = (vms_symbol_entry *)
-	  bfd_hash_lookup (PRIV (vms_symbol_table), name, false, false);
+	  bfd_hash_lookup (PRIV (vms_symbol_table), name, FALSE, FALSE);
 	if (entry == (vms_symbol_entry *) NULL)
 	  {
 #if VMS_DEBUG
@@ -362,7 +383,7 @@ etir_sta (abfd, cmd, ptr)
 	    (*_bfd_error_handler) (_("bad section index in %s"),
 				   cmd_name (cmd));
 	    bfd_set_error (bfd_error_bad_value);
-	    return false;
+	    return FALSE;
 	  }
 	dummy = bfd_getl64 (ptr+4);
 	_bfd_vms_push (abfd, dummy, (int) psect);
@@ -373,18 +394,18 @@ etir_sta (abfd, cmd, ptr)
     case ETIR_S_C_STA_MOD:
     case ETIR_S_C_STA_CKARG:
       (*_bfd_error_handler) (_("unsupported STA cmd %s"), cmd_name (cmd));
-      return false;
+      return FALSE;
       break;
 
     default:
       (*_bfd_error_handler) (_("reserved STA cmd %d"), cmd);
-      return false;
+      return FALSE;
       break;
     }
 #if VMS_DEBUG
   _bfd_vms_debug (5, "etir_sta true\n");
 #endif
-  return true;
+  return TRUE;
 }
 
 /*
@@ -397,7 +418,7 @@ etir_sta (abfd, cmd, ptr)
 
    see table B-9 of the openVMS linker manual.  */
 
-static boolean
+static bfd_boolean
 etir_sto (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
@@ -485,12 +506,12 @@ etir_sto (abfd, cmd, ptr)
 
 	name = _bfd_vms_save_counted_string (ptr);
 	entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV (vms_symbol_table),
-						      name, false, false);
+						      name, FALSE, FALSE);
 	if (entry == (vms_symbol_entry *) NULL)
 	  {
 	    (*_bfd_error_handler) (_("%s: no symbol \"%s\""),
 				   cmd_name (cmd), name);
-	    return false;
+	    return FALSE;
 	  }
 	else
 	  /* FIXME, reloc.  */
@@ -508,12 +529,12 @@ etir_sto (abfd, cmd, ptr)
 
 	name = _bfd_vms_save_counted_string (ptr);
 	entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV (vms_symbol_table),
-						      name, false, false);
+						      name, FALSE, FALSE);
 	if (entry == (vms_symbol_entry *) NULL)
 	  {
 	    (*_bfd_error_handler) (_("%s: no symbol \"%s\""),
 				   cmd_name (cmd), name);
-	    return false;
+	    return FALSE;
 	  }
 	else
 	  image_write_q (abfd, (uquad) (entry->symbol->value));	/* FIXME, reloc */
@@ -561,7 +582,7 @@ etir_sto (abfd, cmd, ptr)
 
 	name = _bfd_vms_save_counted_string (ptr);
 	entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV (vms_symbol_table),
-						      name, false, false);
+						      name, FALSE, FALSE);
 	if (entry == (vms_symbol_entry *) NULL)
 	  {
 #if VMS_DEBUG
@@ -591,7 +612,7 @@ etir_sto (abfd, cmd, ptr)
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Stack operator commands
@@ -601,7 +622,7 @@ etir_sto (abfd, cmd, ptr)
 
    see table B-10 of the openVMS linker manual.  */
 
-static boolean
+static bfd_boolean
 etir_opr (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
@@ -709,14 +730,14 @@ etir_opr (abfd, cmd, ptr)
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Control commands.
 
    See table B-11 of the openVMS linker manual.  */
 
-static boolean
+static bfd_boolean
 etir_ctl (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
@@ -776,14 +797,14 @@ etir_ctl (abfd, cmd, ptr)
       (*_bfd_error_handler) (_("reserved CTL cmd %d"), cmd);
       break;
     }
-  return true;
+  return TRUE;
 }
 
 /* store conditional commands
 
    See table B-12 and B-13 of the openVMS linker manual.  */
 
-static boolean
+static bfd_boolean
 etir_stc (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
@@ -805,9 +826,9 @@ etir_stc (abfd, cmd, ptr)
 
       /* 201 Store-conditional Linkage Pair with Procedure Signature
 	 arg:	lw	linkage index
-	        cs	procedure name
-	        by	signature length
-	        da	signature.  */
+		cs	procedure name
+		by	signature length
+		da	signature.  */
 
     case ETIR_S_C_STC_LP_PSB:
       image_inc_ptr (abfd, (uquad) 16);	/* skip entry,procval */
@@ -815,7 +836,7 @@ etir_stc (abfd, cmd, ptr)
 
       /* 202 Store-conditional Address at global address
 	 arg:	lw	linkage index
-	        cs	global name  */
+		cs	global name.  */
 
     case ETIR_S_C_STC_GBL:
       (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
@@ -823,7 +844,7 @@ etir_stc (abfd, cmd, ptr)
 
       /* 203 Store-conditional Code Address at global address
 	 arg:	lw	linkage index
-	        cs	procedure name  */
+		cs	procedure name.  */
 
     case ETIR_S_C_STC_GCA:
       (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
@@ -831,8 +852,8 @@ etir_stc (abfd, cmd, ptr)
 
       /* 204 Store-conditional Address at psect + offset
 	 arg:	lw	linkage index
-	        lw	psect index
-	        qw	offset  */
+		lw	psect index
+		qw	offset.  */
 
     case ETIR_S_C_STC_PS:
       (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
@@ -899,7 +920,7 @@ etir_stc (abfd, cmd, ptr)
 #endif
       break;
     }
-  return true;
+  return TRUE;
 }
 
 static asection *
@@ -970,12 +991,12 @@ alloc_section (abfd, idx)
 }
 
 /* tir_sta
- 
+
    vax stack commands
-  
+
    Handle sta_xxx commands in tir section
    ptr points to data area in record
-  
+
    See table 7-3 of the VAX/VMS linker manual.  */
 
 static unsigned char *
@@ -992,9 +1013,9 @@ tir_sta (bfd *abfd, unsigned char *ptr)
       /* stack */
     case TIR_S_C_STA_GBL:
       /* stack global
-         arg: cs	symbol name
-        
-         stack 32 bit value of symbol (high bits set to 0).  */
+	 arg: cs	symbol name
+
+	 stack 32 bit value of symbol (high bits set to 0).  */
       {
 	char *name;
 	vms_symbol_entry *entry;
@@ -1012,26 +1033,26 @@ tir_sta (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STA_SB:
       /* stack signed byte
-         arg: by	value
-        
-         stack byte value, sign extend to 32 bit.  */
+	 arg: by	value
+
+	 stack byte value, sign extend to 32 bit.  */
       _bfd_vms_push (abfd, (uquad) *ptr++, -1);
       break;
 
     case TIR_S_C_STA_SW:
       /* stack signed short word
-         arg: sh	value
-        
-         stack 16 bit value, sign extend to 32 bit.  */
+	 arg: sh	value
+
+	 stack 16 bit value, sign extend to 32 bit.  */
       _bfd_vms_push (abfd, (uquad) bfd_getl16 (ptr), -1);
       ptr += 2;
       break;
 
     case TIR_S_C_STA_LW:
       /* stack signed longword
-         arg: lw	value
-        
-         stack 32 bit value.  */
+	 arg: lw	value
+
+	 stack 32 bit value.  */
       _bfd_vms_push (abfd, (uquad) bfd_getl32 (ptr), -1);
       ptr += 4;
       break;
@@ -1039,9 +1060,9 @@ tir_sta (bfd *abfd, unsigned char *ptr)
     case TIR_S_C_STA_PB:
     case TIR_S_C_STA_WPB:
       /* stack psect base plus byte offset (word index)
-         arg: by	section index
-        	(sh	section index)
-        	by	signed byte offset.  */
+	 arg: by	section index
+		(sh	section index)
+		by	signed byte offset.  */
       {
 	unsigned long dummy;
 	unsigned int psect;
@@ -1066,9 +1087,9 @@ tir_sta (bfd *abfd, unsigned char *ptr)
     case TIR_S_C_STA_PW:
     case TIR_S_C_STA_WPW:
       /* stack psect base plus word offset (word index)
-         arg: by	section index
-        	(sh	section index)
-        	sh	signed short offset.  */
+	 arg: by	section index
+		(sh	section index)
+		sh	signed short offset.  */
       {
 	unsigned long dummy;
 	unsigned int psect;
@@ -1093,9 +1114,9 @@ tir_sta (bfd *abfd, unsigned char *ptr)
     case TIR_S_C_STA_PL:
     case TIR_S_C_STA_WPL:
       /* stack psect base plus long offset (word index)
-         arg: by	section index
-        	(sh	section index)
-        	lw	signed longword offset.  */
+	 arg: by	section index
+		(sh	section index)
+		lw	signed longword offset.	 */
       {
 	unsigned long dummy;
 	unsigned int psect;
@@ -1119,41 +1140,41 @@ tir_sta (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STA_UB:
       /* stack unsigned byte
-         arg: by	value
-        
-         stack byte value.  */
+	 arg: by	value
+
+	 stack byte value.  */
       _bfd_vms_push (abfd, (uquad) *ptr++, -1);
       break;
 
     case TIR_S_C_STA_UW:
       /* stack unsigned short word
-         arg: sh	value
-        
-         stack 16 bit value.  */
+	 arg: sh	value
+
+	 stack 16 bit value.  */
       _bfd_vms_push (abfd, (uquad) bfd_getl16 (ptr), -1);
       ptr += 2;
       break;
 
     case TIR_S_C_STA_BFI:
       /* stack byte from image
-         arg: none.  */
+	 arg: none.  */
       /* FALLTHRU  */
     case TIR_S_C_STA_WFI:
       /* stack byte from image
-         arg: none.  */
+	 arg: none.  */
       /* FALLTHRU */
     case TIR_S_C_STA_LFI:
       /* stack byte from image
-         arg: none.  */
+	 arg: none.  */
       (*_bfd_error_handler) (_("stack-from-image not implemented"));
       return NULL;
 
     case TIR_S_C_STA_EPM:
       /* stack entry point mask
-         arg: cs	symbol name
-        
-         stack (unsigned) entry point mask of symbol
-         err if symbol is no entry point.  */
+	 arg: cs	symbol name
+
+	 stack (unsigned) entry point mask of symbol
+	 err if symbol is no entry point.  */
       {
 	char *name;
 	vms_symbol_entry *entry;
@@ -1171,20 +1192,20 @@ tir_sta (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STA_CKARG:
       /* compare procedure argument
-         arg: cs	symbol name
-        	by	argument index
-        	da	argument descriptor
-        
-         compare argument descriptor with symbol argument (ARG$V_PASSMECH)
-         and stack TRUE (args match) or FALSE (args dont match) value.  */
+	 arg: cs	symbol name
+		by	argument index
+		da	argument descriptor
+
+	 compare argument descriptor with symbol argument (ARG$V_PASSMECH)
+	 and stack TRUE (args match) or FALSE (args dont match) value.  */
       (*_bfd_error_handler) (_("PASSMECH not fully implemented"));
       _bfd_vms_push (abfd, (uquad) 1, -1);
       break;
 
     case TIR_S_C_STA_LSY:
       /* stack local symbol value
-         arg:	sh	environment index
-        	cs	symbol name.  */
+	 arg:	sh	environment index
+		cs	symbol name.  */
       {
 	int envidx;
 	char *name;
@@ -1204,9 +1225,9 @@ tir_sta (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STA_LIT:
       /* stack literal
-         arg:	by	literal index
-        
-         stack literal.  */
+	 arg:	by	literal index
+
+	 stack literal.  */
       ptr++;
       _bfd_vms_push (abfd, (uquad) 0, -1);
       (*_bfd_error_handler) (_("stack-literal not fully implemented"));
@@ -1214,11 +1235,11 @@ tir_sta (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STA_LEPM:
       /* stack local symbol entry point mask
-         arg:	sh	environment index
-        	cs	symbol name
-        
-         stack (unsigned) entry point mask of symbol
-         err if symbol is no entry point.  */
+	 arg:	sh	environment index
+		cs	symbol name
+
+	 stack (unsigned) entry point mask of symbol
+	 err if symbol is no entry point.  */
       {
 	int envidx;
 	char *name;
@@ -1277,12 +1298,12 @@ tir_cmd_name (cmd)
 }
 
 /* tir_sto
-  
+
    vax store commands
-  
+
    handle sto_xxx commands in tir section
    ptr points to data area in record
-  
+
    See table 7-4 of the VAX/VMS linker manual.  */
 
 static unsigned char *
@@ -1300,28 +1321,28 @@ tir_sto (bfd *abfd, unsigned char *ptr)
     {
     case TIR_S_C_STO_SB:
       /* store signed byte: pop stack, write byte
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       image_write_b (abfd, dummy & 0xff);	/* FIXME: check top bits */
       break;
 
     case TIR_S_C_STO_SW:
       /* store signed word: pop stack, write word
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       image_write_w (abfd, dummy & 0xffff);	/* FIXME: check top bits */
       break;
 
     case TIR_S_C_STO_LW:
       /* store longword: pop stack, write longword
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       image_write_l (abfd, dummy & 0xffffffff);	/* FIXME: check top bits */
       break;
 
     case TIR_S_C_STO_BD:
       /* store byte displaced: pop stack, sub lc+1, write byte
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       dummy -= ((PRIV (sections)[psect])->vma + 1);
       image_write_b (abfd, dummy & 0xff);/* FIXME: check top bits */
@@ -1329,7 +1350,7 @@ tir_sto (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STO_WD:
       /* store word displaced: pop stack, sub lc+2, write word
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       dummy -= ((PRIV (sections)[psect])->vma + 2);
       image_write_w (abfd, dummy & 0xffff);/* FIXME: check top bits */
@@ -1337,7 +1358,7 @@ tir_sto (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STO_LD:
       /* store long displaced: pop stack, sub lc+4, write long
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       dummy -= ((PRIV (sections)[psect])->vma + 4);
       image_write_l (abfd, dummy & 0xffffffff);/* FIXME: check top bits */
@@ -1345,14 +1366,14 @@ tir_sto (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STO_LI:
       /* store short literal: pop stack, write byte
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       image_write_b (abfd, dummy & 0xff);/* FIXME: check top bits */
       break;
 
     case TIR_S_C_STO_PIDR:
       /* store position independent data reference: pop stack, write longword
-         arg: none.
+	 arg: none.
 	 FIXME: incomplete !  */
       dummy = _bfd_vms_pop (abfd, &psect);
       image_write_l (abfd, dummy & 0xffffffff);
@@ -1360,8 +1381,8 @@ tir_sto (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STO_PICR:
       /* store position independent code reference: pop stack, write longword
-         arg: none.
-         FIXME: incomplete !  */
+	 arg: none.
+	 FIXME: incomplete !  */
       dummy = _bfd_vms_pop (abfd, &psect);
       image_write_b (abfd, 0x9f);
       image_write_l (abfd, dummy & 0xffffffff);
@@ -1369,8 +1390,8 @@ tir_sto (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_STO_RIVB:
       /* store repeated immediate variable bytes
-         1-byte count n field followed by n bytes of data
-         pop stack, write n bytes <stack> times.  */
+	 1-byte count n field followed by n bytes of data
+	 pop stack, write n bytes <stack> times.  */
       size = *ptr++;
       dummy = (unsigned long) _bfd_vms_pop (abfd, NULL);
       while (dummy-- > 0L)
@@ -1430,7 +1451,7 @@ tir_sto (bfd *abfd, unsigned char *ptr)
    all 32 bit signed arithmetic
    all word just like a stack calculator
    arguments are popped from stack, results are pushed on stack
-  
+
    See table 7-5 of the VAX/VMS linker manual.  */
 
 static unsigned char *
@@ -1573,7 +1594,7 @@ tir_opr (abfd, ptr)
 }
 
 /* control commands
-  
+
    See table 7-6 of the VAX/VMS linker manual.  */
 
 static unsigned char *
@@ -1590,7 +1611,7 @@ tir_ctl (bfd *abfd, unsigned char *ptr)
     {
     case TIR_S_C_CTL_SETRB:
       /* Set relocation base: pop stack, set image location counter
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       if (psect >= PRIV (section_count))
 	alloc_section (abfd, psect);
@@ -1599,14 +1620,14 @@ tir_ctl (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_CTL_AUGRB:
       /* Augment relocation base: increment image location counter by offset
-         arg: lw	offset value.  */
+	 arg: lw	offset value.  */
       dummy = bfd_getl32 (ptr);
       image_inc_ptr (abfd, (uquad) dummy);
       break;
 
     case TIR_S_C_CTL_DFLOC:
       /* Define location: pop index, save location counter under index
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, NULL);
       (*_bfd_error_handler) (_("%s: not fully implemented"),
 			     tir_cmd_name (ptr[-1]));
@@ -1614,7 +1635,7 @@ tir_ctl (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_CTL_STLOC:
       /* Set location: pop index, restore location counter from index
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       (*_bfd_error_handler) (_("%s: not fully implemented"),
 			     tir_cmd_name (ptr[-1]));
@@ -1622,7 +1643,7 @@ tir_ctl (bfd *abfd, unsigned char *ptr)
 
     case TIR_S_C_CTL_STKDL:
       /* Stack defined location: pop index, push location counter from index
-         arg: none.  */
+	 arg: none.  */
       dummy = _bfd_vms_pop (abfd, &psect);
       (*_bfd_error_handler) (_("%s: not fully implemented"),
 			     tir_cmd_name (ptr[-1]));
@@ -1648,7 +1669,7 @@ tir_cmd (bfd *abfd, unsigned char *ptr)
   }
   tir_table[] =
   {
-    { 0,                 TIR_S_C_MAXSTACOD, tir_sta },
+    { 0,		 TIR_S_C_MAXSTACOD, tir_sta },
     { TIR_S_C_MINSTOCOD, TIR_S_C_MAXSTOCOD, tir_sto },
     { TIR_S_C_MINOPRCOD, TIR_S_C_MAXOPRCOD, tir_opr },
     { TIR_S_C_MINCTLCOD, TIR_S_C_MAXCTLCOD, tir_ctl },
@@ -1701,7 +1722,7 @@ etir_cmd (abfd, cmd, ptr)
   {
     int mincod;
     int maxcod;
-    boolean (*explain) PARAMS ((bfd *, int, unsigned char *));
+    bfd_boolean (*explain) PARAMS ((bfd *, int, unsigned char *));
   }
   etir_table[] =
   {
@@ -1891,9 +1912,12 @@ _bfd_vms_slurp_lnk (abfd, objtype)
 
    This is still under construction and therefore not documented.  */
 
-static void start_etir_record PARAMS ((bfd *abfd, int index, uquad offset, boolean justoffset));
-static void sto_imm PARAMS ((bfd *abfd, vms_section *sptr, bfd_vma vaddr, int index));
-static void end_etir_record PARAMS ((bfd *abfd));
+static void start_etir_record
+  PARAMS ((bfd *abfd, int index, uquad offset, bfd_boolean justoffset));
+static void sto_imm
+  PARAMS ((bfd *abfd, vms_section *sptr, bfd_vma vaddr, int index));
+static void end_etir_record
+  PARAMS ((bfd *abfd));
 
 static void
 sto_imm (abfd, sptr, vaddr, index)
@@ -1921,7 +1945,7 @@ sto_imm (abfd, sptr, vaddr, index)
       if (_bfd_vms_output_check (abfd, size) < 0)
 	{					/* doesn't fit, split ! */
 	  end_etir_record (abfd);
-	  start_etir_record (abfd, index, vaddr, false);
+	  start_etir_record (abfd, index, vaddr, FALSE);
 	  size = _bfd_vms_output_check (abfd, 0);	/* get max size */
 	  if (size > ssize)			/* more than what's left ? */
 	    size = ssize;
@@ -1950,7 +1974,7 @@ start_etir_record (abfd, index, offset, justoffset)
     bfd *abfd;
     int index;
     uquad offset;
-    boolean justoffset;
+    bfd_boolean justoffset;
 {
   if (!justoffset)
     {
@@ -2055,7 +2079,7 @@ _bfd_vms_write_tir (abfd, objtype)
 	  vaddr = (bfd_vma) (sptr->offset);
 
 	  start_etir_record (abfd, section->index, (uquad) sptr->offset,
-			     false);
+			     FALSE);
 
 	  while (sptr != NULL)	/* one STA_PQ, CTL_SETRB per vms_section */
 	    {
@@ -2111,7 +2135,7 @@ _bfd_vms_write_tir (abfd, objtype)
 					end_etir_record (abfd);
 					start_etir_record (abfd,
 							   section->index,
-							   vaddr, false);
+							   vaddr, FALSE);
 				      }
 				    _bfd_vms_output_begin (abfd,
 							   ETIR_S_C_STO_GBL_LW,
@@ -2128,7 +2152,7 @@ _bfd_vms_write_tir (abfd, objtype)
 					end_etir_record (abfd);
 					start_etir_record (abfd,
 							   section->index,
-							   vaddr, false);
+							   vaddr, FALSE);
 				      }
 				    _bfd_vms_output_begin (abfd,
 							   ETIR_S_C_STA_LW,
@@ -2148,7 +2172,7 @@ _bfd_vms_write_tir (abfd, objtype)
 					end_etir_record (abfd);
 					start_etir_record (abfd,
 							   section->index,
-							   vaddr, false);
+							   vaddr, FALSE);
 				      }
 				    _bfd_vms_output_begin (abfd,
 							   ETIR_S_C_STA_PQ,
@@ -2178,7 +2202,7 @@ _bfd_vms_write_tir (abfd, objtype)
 					end_etir_record (abfd);
 					start_etir_record (abfd,
 							   section->index,
-							   vaddr, false);
+							   vaddr, FALSE);
 				      }
 				    _bfd_vms_output_begin (abfd,
 							   ETIR_S_C_STO_GBL,
@@ -2195,7 +2219,7 @@ _bfd_vms_write_tir (abfd, objtype)
 					end_etir_record (abfd);
 					start_etir_record (abfd,
 							   section->index,
-							   vaddr, false);
+							   vaddr, FALSE);
 				      }
 				    _bfd_vms_output_begin (abfd,
 							   ETIR_S_C_STA_QW,
@@ -2215,7 +2239,7 @@ _bfd_vms_write_tir (abfd, objtype)
 					end_etir_record (abfd);
 					start_etir_record (abfd,
 							   section->index,
-							   vaddr, false);
+							   vaddr, FALSE);
 				      }
 				    _bfd_vms_output_begin (abfd,
 							   ETIR_S_C_STA_PQ,
@@ -2266,7 +2290,7 @@ _bfd_vms_write_tir (abfd, objtype)
 				  {
 				    end_etir_record (abfd);
 				    start_etir_record (abfd, section->index,
-						       vaddr, false);
+						       vaddr, FALSE);
 				  }
 				_bfd_vms_output_begin (abfd,
 						       ETIR_S_C_STC_LP_PSB,
@@ -2291,7 +2315,7 @@ _bfd_vms_write_tir (abfd, objtype)
 				    end_etir_record (abfd);
 				    start_etir_record (abfd,
 						       section->index,
-						       vaddr, false);
+						       vaddr, FALSE);
 				  }
 				_bfd_vms_output_begin (abfd,
 						       ETIR_S_C_STO_CA,
diff --git a/bfd/vms.c b/bfd/vms.c
index 41a9717fcdd..c98e483e637 100644
--- a/bfd/vms.c
+++ b/bfd/vms.c
@@ -26,110 +26,142 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "vms.h"
 
-static boolean vms_initialize PARAMS ((bfd *));
+static bfd_boolean vms_initialize
+  PARAMS ((bfd *));
 static unsigned int priv_section_count;
-static boolean fill_section_ptr PARAMS ((struct bfd_hash_entry *, PTR));
-static boolean vms_fixup_sections PARAMS ((bfd *));
-static boolean copy_symbols PARAMS ((struct bfd_hash_entry *, PTR));
+static bfd_boolean fill_section_ptr
+  PARAMS ((struct bfd_hash_entry *, PTR));
+static bfd_boolean vms_fixup_sections
+  PARAMS ((bfd *));
+static bfd_boolean copy_symbols
+  PARAMS ((struct bfd_hash_entry *, PTR));
 static bfd_reloc_status_type reloc_nil
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static const struct bfd_target *vms_object_p PARAMS ((bfd *abfd));
-static const struct bfd_target *vms_archive_p PARAMS ((bfd *abfd));
-static boolean vms_mkobject PARAMS ((bfd *abfd));
-static boolean vms_write_object_contents PARAMS ((bfd *abfd));
-static boolean vms_close_and_cleanup PARAMS ((bfd *abfd));
-static boolean vms_bfd_free_cached_info PARAMS ((bfd *abfd));
-static boolean vms_new_section_hook PARAMS ((bfd *abfd, asection *section));
-static boolean vms_get_section_contents
+static const struct bfd_target *vms_object_p
+  PARAMS ((bfd *abfd));
+static const struct bfd_target *vms_archive_p
+  PARAMS ((bfd *abfd));
+static bfd_boolean vms_mkobject
+  PARAMS ((bfd *abfd));
+static bfd_boolean vms_write_object_contents
+  PARAMS ((bfd *abfd));
+static bfd_boolean vms_close_and_cleanup
+  PARAMS ((bfd *abfd));
+static bfd_boolean vms_bfd_free_cached_info
+  PARAMS ((bfd *abfd));
+static bfd_boolean vms_new_section_hook
+  PARAMS ((bfd *abfd, asection *section));
+static bfd_boolean vms_get_section_contents
   PARAMS ((bfd *abfd, asection *section, PTR x1, file_ptr x2,
 	   bfd_size_type x3));
-static boolean vms_get_section_contents_in_window
+static bfd_boolean vms_get_section_contents_in_window
   PARAMS ((bfd *abfd, asection *section, bfd_window *w, file_ptr offset,
 	   bfd_size_type count));
-static boolean vms_bfd_copy_private_bfd_data PARAMS ((bfd *src, bfd *dest));
-static boolean vms_bfd_copy_private_section_data
+static bfd_boolean vms_bfd_copy_private_bfd_data
+  PARAMS ((bfd *src, bfd *dest));
+static bfd_boolean vms_bfd_copy_private_section_data
   PARAMS ((bfd *srcbfd, asection *srcsec, bfd *dstbfd, asection *dstsec));
-static boolean vms_bfd_copy_private_symbol_data
+static bfd_boolean vms_bfd_copy_private_symbol_data
   PARAMS ((bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym));
-static boolean vms_bfd_print_private_bfd_data
+static bfd_boolean vms_bfd_print_private_bfd_data
   PARAMS ((bfd *abfd, void *file));
-static char *vms_core_file_failing_command PARAMS ((bfd *abfd));
-static int vms_core_file_failing_signal PARAMS ((bfd *abfd));
-static boolean vms_core_file_matches_executable_p
+static char *vms_core_file_failing_command
+  PARAMS ((bfd *abfd));
+static int vms_core_file_failing_signal
+  PARAMS ((bfd *abfd));
+static bfd_boolean vms_core_file_matches_executable_p
   PARAMS ((bfd *abfd, bfd *bbfd));
-static boolean vms_slurp_armap PARAMS ((bfd *abfd));
-static boolean vms_slurp_extended_name_table PARAMS ((bfd *abfd));
-static boolean vms_construct_extended_name_table
+static bfd_boolean vms_slurp_armap
+  PARAMS ((bfd *abfd));
+static bfd_boolean vms_slurp_extended_name_table
+  PARAMS ((bfd *abfd));
+static bfd_boolean vms_construct_extended_name_table
   PARAMS ((bfd *abfd, char **tabloc, bfd_size_type *tablen,
 	   const char **name));
 static void vms_truncate_arname
   PARAMS ((bfd *abfd, const char *pathname, char *arhdr));
-static boolean vms_write_armap
+static bfd_boolean vms_write_armap
   PARAMS ((bfd *arch, unsigned int elength, struct orl *map,
 	   unsigned int orl_count, int stridx));
-static PTR vms_read_ar_hdr PARAMS ((bfd *abfd));
-static bfd *vms_get_elt_at_index PARAMS ((bfd *abfd, symindex index));
-static bfd *vms_openr_next_archived_file PARAMS ((bfd *arch, bfd *prev));
-static boolean vms_update_armap_timestamp PARAMS ((bfd *abfd));
-static int vms_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
-static long vms_get_symtab_upper_bound PARAMS ((bfd *abfd));
-static long vms_get_symtab PARAMS ((bfd *abfd, asymbol **symbols));
+static PTR vms_read_ar_hdr
+  PARAMS ((bfd *abfd));
+static bfd *vms_get_elt_at_index
+  PARAMS ((bfd *abfd, symindex index));
+static bfd *vms_openr_next_archived_file
+  PARAMS ((bfd *arch, bfd *prev));
+static bfd_boolean vms_update_armap_timestamp
+  PARAMS ((bfd *abfd));
+static int vms_generic_stat_arch_elt
+  PARAMS ((bfd *, struct stat *));
+static long vms_get_symtab_upper_bound
+  PARAMS ((bfd *abfd));
+static long vms_get_symtab
+  PARAMS ((bfd *abfd, asymbol **symbols));
 static void vms_print_symbol
   PARAMS ((bfd *abfd, PTR file, asymbol *symbol, bfd_print_symbol_type how));
 static void vms_get_symbol_info
   PARAMS ((bfd *abfd, asymbol *symbol, symbol_info *ret));
-static boolean vms_bfd_is_local_label_name PARAMS ((bfd *abfd, const char *));
-static alent *vms_get_lineno PARAMS ((bfd *abfd, asymbol *symbol));
-static boolean vms_find_nearest_line
+static bfd_boolean vms_bfd_is_local_label_name
+  PARAMS ((bfd *abfd, const char *));
+static alent *vms_get_lineno
+  PARAMS ((bfd *abfd, asymbol *symbol));
+static bfd_boolean vms_find_nearest_line
   PARAMS ((bfd *abfd, asection *section, asymbol **symbols, bfd_vma offset,
 	   const char **file, const char **func, unsigned int *line));
 static asymbol *vms_bfd_make_debug_symbol
   PARAMS ((bfd *abfd, void *ptr, unsigned long size));
 static long vms_read_minisymbols
-  PARAMS ((bfd *abfd, boolean dynamic, PTR *minisymsp, unsigned int *sizep));
+  PARAMS ((bfd *abfd, bfd_boolean dynamic, PTR *minisymsp,
+	   unsigned int *sizep));
 static asymbol *vms_minisymbol_to_symbol
-  PARAMS ((bfd *abfd, boolean dynamic, const PTR minisym, asymbol *sym));
-static long vms_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect));
+  PARAMS ((bfd *abfd, bfd_boolean dynamic, const PTR minisym, asymbol *sym));
+static long vms_get_reloc_upper_bound
+  PARAMS ((bfd *abfd, asection *sect));
 static long vms_canonicalize_reloc
   PARAMS ((bfd *abfd, asection *srcsec, arelent **location,
 	   asymbol **symbols));
 static const struct reloc_howto_struct *vms_bfd_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static boolean vms_set_arch_mach
+static bfd_boolean vms_set_arch_mach
   PARAMS ((bfd *abfd, enum bfd_architecture arch, unsigned long mach));
-static boolean vms_set_section_contents
+static bfd_boolean vms_set_section_contents
   PARAMS ((bfd *abfd, asection *section, PTR location, file_ptr offset,
 	   bfd_size_type count));
-static int vms_sizeof_headers PARAMS ((bfd *abfd, boolean reloc));
+static int vms_sizeof_headers
+  PARAMS ((bfd *abfd, bfd_boolean reloc));
 static bfd_byte *vms_bfd_get_relocated_section_contents
   PARAMS ((bfd *abfd, struct bfd_link_info *link_info,
 	   struct bfd_link_order *link_order, bfd_byte *data,
-	   boolean relocateable, asymbol **symbols));
-static boolean vms_bfd_relax_section
+	   bfd_boolean relocateable, asymbol **symbols));
+static bfd_boolean vms_bfd_relax_section
   PARAMS ((bfd *abfd, asection *section, struct bfd_link_info *link_info,
-	   boolean *again));
-static boolean vms_bfd_gc_sections
+	   bfd_boolean *again));
+static bfd_boolean vms_bfd_gc_sections
   PARAMS ((bfd *abfd, struct bfd_link_info *link_info));
-static boolean vms_bfd_merge_sections
+static bfd_boolean vms_bfd_merge_sections
   PARAMS ((bfd *abfd, struct bfd_link_info *link_info));
 static struct bfd_link_hash_table *vms_bfd_link_hash_table_create
   PARAMS ((bfd *abfd));
 static void vms_bfd_link_hash_table_free
   PARAMS ((struct bfd_link_hash_table *hash));
-static boolean vms_bfd_link_add_symbols
+static bfd_boolean vms_bfd_link_add_symbols
   PARAMS ((bfd *abfd, struct bfd_link_info *link_info));
-static boolean vms_bfd_final_link
+static bfd_boolean vms_bfd_final_link
   PARAMS ((bfd *abfd, struct bfd_link_info *link_info));
-static boolean vms_bfd_link_split_section
+static bfd_boolean vms_bfd_link_split_section
   PARAMS ((bfd *abfd, asection *section));
-static long vms_get_dynamic_symtab_upper_bound PARAMS ((bfd *abfd));
+static long vms_get_dynamic_symtab_upper_bound
+  PARAMS ((bfd *abfd));
 static long vms_canonicalize_dynamic_symtab
   PARAMS ((bfd *abfd, asymbol **symbols));
-static long vms_get_dynamic_reloc_upper_bound PARAMS ((bfd *abfd));
+static long vms_get_dynamic_reloc_upper_bound
+  PARAMS ((bfd *abfd));
 static long vms_canonicalize_dynamic_reloc
   PARAMS ((bfd *abfd, arelent **arel, asymbol **symbols));
-static boolean vms_bfd_merge_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd));
-static boolean vms_bfd_set_private_flags PARAMS ((bfd *abfd, flagword flags));
+static bfd_boolean vms_bfd_merge_private_bfd_data
+  PARAMS ((bfd *ibfd, bfd *obfd));
+static bfd_boolean vms_bfd_set_private_flags
+  PARAMS ((bfd *abfd, flagword flags));
 
 #define vms_make_empty_symbol _bfd_generic_make_empty_symbol
 #define vms_bfd_link_just_syms _bfd_generic_link_just_syms
@@ -231,7 +263,7 @@ const bfd_target vms_vax_vec =
 
 /* Initialize private data  */
 
-static boolean
+static bfd_boolean
 vms_initialize (abfd)
      bfd *abfd;
 {
@@ -243,7 +275,7 @@ vms_initialize (abfd)
   amt = sizeof (struct vms_private_data_struct);
   abfd->tdata.any = (struct vms_private_data_struct*) bfd_alloc (abfd, amt);
   if (abfd->tdata.any == 0)
-    return false;
+    return FALSE;
 
 #ifdef __ALPHA
   PRIV (is_vax) = 0;
@@ -254,7 +286,7 @@ vms_initialize (abfd)
   PRIV (buf_size) = 0;
   PRIV (rec_length) = 0;
   PRIV (file_format) = FF_UNKNOWN;
-  PRIV (fixup_done) = false;
+  PRIV (fixup_done) = FALSE;
   PRIV (sections) = NULL;
 
   amt = sizeof (struct stack_struct) * STACKSIZE;
@@ -290,14 +322,14 @@ vms_initialize (abfd)
   PRIV (output_size) = 0;
   PRIV (output_alignment) = 1;
 
-  return true;
+  return TRUE;
 
  error_ret2:
   bfd_hash_table_free (PRIV (vms_symbol_table));
  error_ret1:
   bfd_release (abfd, abfd->tdata.any);
   abfd->tdata.any = 0;
-  return false;
+  return FALSE;
 }
 
 /* Fill symbol->section with section ptr
@@ -309,7 +341,7 @@ vms_initialize (abfd)
 
    called from bfd_hash_traverse in vms_fixup_sections  */
 
-static boolean
+static bfd_boolean
 fill_section_ptr (entry, sections)
      struct bfd_hash_entry *entry;
      PTR sections;
@@ -335,7 +367,7 @@ fill_section_ptr (entry, sections)
   if (strcmp (sym->name, sec->name) == 0)
     sym->flags |= BSF_SECTION_SYM;
 
-  return true;
+  return TRUE;
 }
 
 /* Fixup sections
@@ -347,12 +379,12 @@ fill_section_ptr (entry, sections)
    alloc PRIV(sections) according to abfd->section_count
 	copy abfd->sections to PRIV(sections)  */
 
-static boolean
+static bfd_boolean
 vms_fixup_sections (abfd)
      bfd *abfd;
 {
   if (PRIV (fixup_done))
-    return true;
+    return TRUE;
 
   /*
    * traverse symbol table and fill in all section pointers
@@ -363,9 +395,9 @@ vms_fixup_sections (abfd)
   bfd_hash_traverse (PRIV (vms_symbol_table), fill_section_ptr,
 		    (PTR) (PRIV (sections)));
 
-  PRIV (fixup_done) = true;
+  PRIV (fixup_done) = TRUE;
 
-  return true;
+  return TRUE;
 }
 
 /*===========================================================================*/
@@ -540,7 +572,7 @@ vms_archive_p (abfd)
 
 /* Set the format of a file being written.  */
 
-static boolean
+static bfd_boolean
 vms_mkobject (abfd)
      bfd *abfd;
 {
@@ -565,12 +597,12 @@ vms_mkobject (abfd)
     abfd->arch_info = arch;
   }
 
-  return true;
+  return TRUE;
 }
 
 /* Write cached information into a file being written, at bfd_close.  */
 
-static boolean
+static bfd_boolean
 vms_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -583,50 +615,50 @@ vms_write_object_contents (abfd)
       if (PRIV (is_vax))
 	{
 	  if (_bfd_vms_write_hdr (abfd, OBJ_S_C_HDR) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_gsd (abfd, OBJ_S_C_GSD) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_tir (abfd, OBJ_S_C_TIR) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_tbt (abfd, OBJ_S_C_TBT) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_dbg (abfd, OBJ_S_C_DBG) != 0)
-	    return false;
+	    return FALSE;
 	  if (abfd->section_count > 255)
 	    {
 	      if (_bfd_vms_write_eom (abfd, OBJ_S_C_EOMW) != 0)
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
 	      if (_bfd_vms_write_eom (abfd, OBJ_S_C_EOM) != 0)
-		return false;
+		return FALSE;
 	    }
 	}
       else
 	{
 	  if (_bfd_vms_write_hdr (abfd, EOBJ_S_C_EMH) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_gsd (abfd, EOBJ_S_C_EGSD) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_tir (abfd, EOBJ_S_C_ETIR) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_tbt (abfd, EOBJ_S_C_ETBT) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_dbg (abfd, EOBJ_S_C_EDBG) != 0)
-	    return false;
+	    return FALSE;
 	  if (_bfd_vms_write_eom (abfd, EOBJ_S_C_EEOM) != 0)
-	    return false;
+	    return FALSE;
 	}
     }
-  return true;
+  return TRUE;
 }
 
 /*-- 4.1, generic -----------------------------------------------------------*/
 
 /* Called when the BFD is being closed to do any necessary cleanup.  */
 
-static boolean
+static bfd_boolean
 vms_close_and_cleanup (abfd)
      bfd *abfd;
 {
@@ -634,7 +666,7 @@ vms_close_and_cleanup (abfd)
   vms_debug (1, "vms_close_and_cleanup(%p)\n", abfd);
 #endif
   if (abfd == 0)
-    return true;
+    return TRUE;
 
   if (PRIV (vms_buf) != NULL)
     free (PRIV (vms_buf));
@@ -648,23 +680,23 @@ vms_close_and_cleanup (abfd)
   bfd_release (abfd, abfd->tdata.any);
   abfd->tdata.any = NULL;
 
-  return true;
+  return TRUE;
 }
 
 /* Ask the BFD to free all cached information.  */
-static boolean
+static bfd_boolean
 vms_bfd_free_cached_info (abfd)
      bfd *abfd ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_free_cached_info(%p)\n", abfd);
 #endif
-  return true;
+  return TRUE;
 }
 
 /* Called when a new section is created.  */
 
-static boolean
+static bfd_boolean
 vms_new_section_hook (abfd, section)
      bfd *abfd;
      asection *section;
@@ -684,7 +716,7 @@ vms_new_section_hook (abfd, section)
       amt *= sizeof (asection *);
       PRIV (sections) = (asection **) bfd_realloc (PRIV (sections), amt);
       if (PRIV (sections) == 0)
-	return false;
+	return FALSE;
       PRIV (section_count) = section_count;
     }
 #if VMS_DEBUG
@@ -695,14 +727,14 @@ vms_new_section_hook (abfd, section)
   vms_debug (7, "%d: %s\n", section->index, section->name);
 #endif
 
-  return true;
+  return TRUE;
 }
 
 /* Read the contents of a section.
    buf points to a buffer of buf_size bytes to be filled with
    section data (starting at offset into section)  */
 
-static boolean
+static bfd_boolean
 vms_get_section_contents (abfd, section, buf, offset, buf_size)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
@@ -717,14 +749,14 @@ vms_get_section_contents (abfd, section, buf, offset, buf_size)
 
   /* shouldn't be called, since all sections are IN_MEMORY  */
 
-  return false;
+  return FALSE;
 }
 
 /* Read the contents of a section.
    buf points to a buffer of buf_size bytes to be filled with
    section data (starting at offset into section)  */
 
-static boolean
+static bfd_boolean
 vms_get_section_contents_in_window (abfd, section, w, offset, count)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
@@ -739,7 +771,7 @@ vms_get_section_contents_in_window (abfd, section, w, offset, count)
 
   /* shouldn't be called, since all sections are IN_MEMORY  */
 
-  return false;
+  return FALSE;
 }
 
 /*-- Part 4.2, copy private data --------------------------------------------*/
@@ -747,7 +779,7 @@ vms_get_section_contents_in_window (abfd, section, w, offset, count)
 /* Called to copy BFD general private data from one object file
    to another.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_copy_private_bfd_data (src, dest)
      bfd *src ATTRIBUTE_UNUSED;
      bfd *dest ATTRIBUTE_UNUSED;
@@ -755,17 +787,17 @@ vms_bfd_copy_private_bfd_data (src, dest)
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_copy_private_bfd_data(%p, %p)\n", src, dest);
 #endif
-  return true;
+  return TRUE;
 }
 
 /* Merge private BFD information from the BFD @var{ibfd} to the
-   the output file BFD @var{obfd} when linking.  Return <<true>>
-   on success, <<false>> on error.  Possible error returns are:
+   the output file BFD @var{obfd} when linking.  Return <<TRUE>>
+   on success, <<FALSE>> on error.  Possible error returns are:
 
    o <<bfd_error_no_memory>> -
      Not enough memory exists to create private data for @var{obfd}.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_merge_private_bfd_data (ibfd, obfd)
      bfd *ibfd ATTRIBUTE_UNUSED;
      bfd *obfd ATTRIBUTE_UNUSED;
@@ -773,17 +805,17 @@ vms_bfd_merge_private_bfd_data (ibfd, obfd)
 #if VMS_DEBUG
   vms_debug (1,"vms_bfd_merge_private_bfd_data(%p, %p)\n", ibfd, obfd);
 #endif
-  return true;
+  return TRUE;
 }
 
 /* Set private BFD flag information in the BFD @var{abfd}.
-   Return <<true>> on success, <<false>> on error.  Possible error
+   Return <<TRUE>> on success, <<FALSE>> on error.  Possible error
    returns are:
 
    o <<bfd_error_no_memory>> -
      Not enough memory exists to create private data for @var{obfd}.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_set_private_flags (abfd, flags)
      bfd *abfd ATTRIBUTE_UNUSED;
      flagword flags ATTRIBUTE_UNUSED;
@@ -791,13 +823,13 @@ vms_bfd_set_private_flags (abfd, flags)
 #if VMS_DEBUG
   vms_debug (1,"vms_bfd_set_private_flags(%p, %lx)\n", abfd, (long)flags);
 #endif
-  return true;
+  return TRUE;
 }
 
 /* Called to copy BFD private section data from one object file
    to another.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_copy_private_section_data (srcbfd, srcsec, dstbfd, dstsec)
      bfd *srcbfd ATTRIBUTE_UNUSED;
      asection *srcsec ATTRIBUTE_UNUSED;
@@ -808,13 +840,13 @@ vms_bfd_copy_private_section_data (srcbfd, srcsec, dstbfd, dstsec)
   vms_debug (1, "vms_bfd_copy_private_section_data(%p, %s, %p, %s)\n",
 		 srcbfd, srcsec->name, dstbfd, dstsec->name);
 #endif
-  return true;
+  return TRUE;
 }
 
 /* Called to copy BFD private symbol data from one object file
    to another.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_copy_private_symbol_data (ibfd, isym, obfd, osym)
      bfd *ibfd ATTRIBUTE_UNUSED;
      asymbol *isym ATTRIBUTE_UNUSED;
@@ -825,7 +857,7 @@ vms_bfd_copy_private_symbol_data (ibfd, isym, obfd, osym)
   vms_debug (1, "vms_bfd_copy_private_symbol_data(%p, %s, %p, %s)\n",
 		 ibfd, isym->name, obfd, osym->name);
 #endif
-  return true;
+  return TRUE;
 }
 
 /*-- Part 4.3, core file ----------------------------------------------------*/
@@ -856,10 +888,10 @@ vms_core_file_failing_signal (abfd)
   return 0;
 }
 
-/* Return true if the core file attached to core_bfd was generated
-   by a run of the executable file attached to exec_bfd, false otherwise.  */
+/* Return TRUE if the core file attached to core_bfd was generated
+   by a run of the executable file attached to exec_bfd, FALSE otherwise.  */
 
-static boolean
+static bfd_boolean
 vms_core_file_matches_executable_p (abfd, bbfd)
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd *bbfd ATTRIBUTE_UNUSED;
@@ -867,41 +899,41 @@ vms_core_file_matches_executable_p (abfd, bbfd)
 #if VMS_DEBUG
   vms_debug (1, "vms_core_file_matches_executable_p(%p, %p)\n", abfd, bbfd);
 #endif
-  return false;
+  return FALSE;
 }
 
 /*-- Part 4.4, archive ------------------------------------------------------*/
 
 /* ???	do something with an archive map.
-   Return false on error, true otherwise.  */
+   Return FALSE on error, TRUE otherwise.  */
 
-static boolean
+static bfd_boolean
 vms_slurp_armap (abfd)
      bfd *abfd ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   vms_debug (1, "vms_slurp_armap(%p)\n", abfd);
 #endif
-  return false;
+  return FALSE;
 }
 
 /* ???	do something with an extended name table.
-   Return false on error, true otherwise.  */
+   Return FALSE on error, TRUE otherwise.  */
 
-static boolean
+static bfd_boolean
 vms_slurp_extended_name_table (abfd)
      bfd *abfd ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   vms_debug (1, "vms_slurp_extended_name_table(%p)\n", abfd);
 #endif
-  return false;
+  return FALSE;
 }
 
 /* ???	do something with an extended name table.
-   Return false on error, true otherwise.  */
+   Return FALSE on error, TRUE otherwise.  */
 
-static boolean
+static bfd_boolean
 vms_construct_extended_name_table (abfd, tabloc, tablen, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      char **tabloc ATTRIBUTE_UNUSED;
@@ -911,7 +943,7 @@ vms_construct_extended_name_table (abfd, tabloc, tablen, name)
 #if VMS_DEBUG
   vms_debug (1, "vms_construct_extended_name_table(%p)\n", abfd);
 #endif
-  return false;
+  return FALSE;
 }
 
 /* Truncate the name of an archive to match system-dependent restrictions  */
@@ -930,7 +962,7 @@ vms_truncate_arname (abfd, pathname, arhdr)
 
 /* ???	write archive map  */
 
-static boolean
+static bfd_boolean
 vms_write_armap (arch, elength, map, orl_count, stridx)
      bfd *arch ATTRIBUTE_UNUSED;
      unsigned int elength ATTRIBUTE_UNUSED;
@@ -942,7 +974,7 @@ vms_write_armap (arch, elength, map, orl_count, stridx)
   vms_debug (1, "vms_write_armap(%p, %d, %p, %d %d)\n",
 	arch, elength, map, orl_count, stridx);
 #endif
-  return true;
+  return TRUE;
 }
 
 /* Read archive header ???  */
@@ -1004,14 +1036,14 @@ vms_generic_stat_arch_elt (abfd, st)
 
 /* This is a new function in bfd 2.5  */
 
-static boolean
+static bfd_boolean
 vms_update_armap_timestamp (abfd)
      bfd *abfd ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   vms_debug (1, "vms_update_armap_timestamp(%p)\n", abfd);
 #endif
-  return true;
+  return TRUE;
 }
 
 /*-- Part 4.5, symbols --------------------------------------------------------*/
@@ -1036,7 +1068,7 @@ vms_get_symtab_upper_bound (abfd)
    called from bfd_hash_traverse in vms_get_symtab
    init counter to 0 if entry == 0  */
 
-static boolean
+static bfd_boolean
 copy_symbols (entry, arg)
      struct bfd_hash_entry *entry;
      PTR arg;
@@ -1048,7 +1080,7 @@ copy_symbols (entry, arg)
   else			/* fill vector, inc counter */
     PRIV (symcache)[PRIV (symnum)++] = ((vms_symbol_entry *)entry)->symbol;
 
-  return true;
+  return TRUE;
 }
 
 /* Read the symbols from the BFD abfd, and fills in the vector
@@ -1171,10 +1203,10 @@ vms_get_symbol_info (abfd, symbol, ret)
   return;
 }
 
-/* Return true if the given symbol sym in the BFD abfd is
-   a compiler generated local label, else return false.  */
+/* Return TRUE if the given symbol sym in the BFD abfd is
+   a compiler generated local label, else return FALSE.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -1202,7 +1234,7 @@ vms_get_lineno (abfd, symbol)
    return the name of the source file and the line nearest to the wanted
    location.  */
 
-static boolean
+static bfd_boolean
 vms_find_nearest_line (abfd, section, symbols, offset, file, func, line)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
@@ -1216,7 +1248,7 @@ vms_find_nearest_line (abfd, section, symbols, offset, file, func, line)
   vms_debug (1, "vms_find_nearest_line(%p, %s, %p, %ld, <ret>, <ret>, <ret>)\n",
 	      abfd, section->name, symbols, (long int)offset);
 #endif
-  return false;
+  return FALSE;
 }
 
 /* Back-door to allow format-aware applications to create debug symbols
@@ -1242,7 +1274,7 @@ vms_bfd_make_debug_symbol (abfd, ptr, size)
 static long
 vms_read_minisymbols (abfd, dynamic, minisymsp, sizep)
      bfd *abfd;
-     boolean dynamic;
+     bfd_boolean dynamic;
      PTR *minisymsp;
      unsigned int *sizep;
 {
@@ -1259,7 +1291,7 @@ vms_read_minisymbols (abfd, dynamic, minisymsp, sizep)
 static asymbol *
 vms_minisymbol_to_symbol (abfd, dynamic, minisym, sym)
      bfd *abfd;
-     boolean dynamic;
+     bfd_boolean dynamic;
      const PTR minisym;
      asymbol *sym;
 {
@@ -1302,7 +1334,7 @@ vms_canonicalize_reloc (abfd, section, location, symbols)
 #if VMS_DEBUG
   vms_debug (1, "vms_canonicalize_reloc(%p, %s, <ret>, <ret>)\n", abfd, section->name);
 #endif
-  return false;
+  return FALSE;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -1345,30 +1377,30 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 8,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "IGNORE",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
+	 TRUE),			/* pcrel_offset */
 
   /* A 64 bit reference to a symbol.  */
   HOWTO (ALPHA_R_REFQUAD,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "REFQUAD",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 21 bit branch.  The native assembler generates these for
      branches within the text segment, and also fills in the PC
@@ -1377,90 +1409,90 @@ static reloc_howto_type alpha_howto_table[] =
 	 2,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 21,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "BRADDR",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x1fffff,		/* src_mask */
 	 0x1fffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A hint for a jump to a register.  */
   HOWTO (ALPHA_R_HINT,		/* type */
 	 2,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 14,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "HINT",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0x3fff,		/* src_mask */
 	 0x3fff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 16 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL16,	/* type */
 	 0,			/* rightshift */
 	 1,			/* size (0 = byte, 1 = short, 2 = long) */
 	 16,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "SREL16",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffff,		/* src_mask */
 	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* 32 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL32,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "SREL32",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit PC relative offset.  */
   HOWTO (ALPHA_R_SREL64,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 true,			/* pc_relative */
+	 TRUE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "SREL64",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Push a value on the reloc evaluation stack.  */
   HOWTO (ALPHA_R_OP_PUSH,	/* type */
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "OP_PUSH",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Store the value from the stack at the given address.  Store it in
      a bitfield of size r_size starting at bit position r_offset.  */
@@ -1468,15 +1500,15 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "OP_STORE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Subtract the reloc address from the value on the top of the
      relocation stack.  */
@@ -1484,15 +1516,15 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "OP_PSUB",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Shift the value on the top of the relocation stack right by the
      given value.  */
@@ -1500,60 +1532,60 @@ static reloc_howto_type alpha_howto_table[] =
 	 0,			/* rightshift */
 	 0,			/* size (0 = byte, 1 = short, 2 = long) */
 	 0,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "OP_PRSHIFT",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* Hack. Linkage is done by linker.  */
   HOWTO (ALPHA_R_LINKAGE,	/* type */
 	 0,			/* rightshift */
 	 8,			/* size (0 = byte, 1 = short, 2 = long) */
 	 256,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_dont, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "LINKAGE",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0,			/* src_mask */
 	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 32 bit reference to a symbol.  */
   HOWTO (ALPHA_R_REFLONG,	/* type */
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
 	 32,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_bitfield, /* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "REFLONG",		/* name */
-	 true,			/* partial_inplace */
+	 TRUE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
   /* A 64 bit reference to a procedure, written as 32 bit value.  */
   HOWTO (ALPHA_R_CODEADDR,	/* type */
 	 0,			/* rightshift */
 	 4,			/* size (0 = byte, 1 = short, 2 = long) */
 	 64,			/* bitsize */
-	 false,			/* pc_relative */
+	 FALSE,			/* pc_relative */
 	 0,			/* bitpos */
 	 complain_overflow_signed,/* complain_on_overflow */
 	 reloc_nil,		/* special_function */
 	 "CODEADDR",		/* name */
-	 false,			/* partial_inplace */
+	 FALSE,			/* partial_inplace */
 	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
+	 FALSE),		/* pcrel_offset */
 
 };
 
@@ -1600,7 +1632,7 @@ vms_bfd_reloc_type_lookup (abfd, code)
    Find the correct pointer to a structure and insert it into the arch_info
    pointer.  */
 
-static boolean
+static bfd_boolean
 vms_set_arch_mach (abfd, arch, mach)
      bfd *abfd;
      enum bfd_architecture arch ATTRIBUTE_UNUSED;
@@ -1611,19 +1643,19 @@ vms_set_arch_mach (abfd, arch, mach)
 #endif
   abfd->arch_info = bfd_scan_arch("alpha");
 
-  return true;
+  return TRUE;
 }
 
 /* Sets the contents of the section section in BFD abfd to the data starting
    in memory at data. The data is written to the output section starting at
    offset offset for count bytes.
 
-   Normally true is returned, else false. Possible error returns are:
+   Normally TRUE is returned, else FALSE. Possible error returns are:
    o bfd_error_no_contents - The output section does not have the
 	SEC_HAS_CONTENTS attribute, so nothing can be written to it.
    o and some more too  */
 
-static boolean
+static bfd_boolean
 vms_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
@@ -1646,7 +1678,7 @@ vms_set_section_contents (abfd, section, location, offset, count)
 static int
 vms_sizeof_headers (abfd, reloc)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean reloc ATTRIBUTE_UNUSED;
+     bfd_boolean reloc ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   vms_debug (1, "vms_sizeof_headers(%p, %s)\n", abfd, (reloc)?"True":"False");
@@ -1664,7 +1696,7 @@ vms_bfd_get_relocated_section_contents (abfd, link_info, link_order, data,
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
      struct bfd_link_order *link_order ATTRIBUTE_UNUSED;
      bfd_byte *data ATTRIBUTE_UNUSED;
-     boolean relocateable ATTRIBUTE_UNUSED;
+     bfd_boolean relocateable ATTRIBUTE_UNUSED;
      asymbol **symbols ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
@@ -1676,21 +1708,21 @@ vms_bfd_get_relocated_section_contents (abfd, link_info, link_order, data,
 
 /* ???  */
 
-static boolean
+static bfd_boolean
 vms_bfd_relax_section (abfd, section, link_info, again)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
-     boolean *again ATTRIBUTE_UNUSED;
+     bfd_boolean *again ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_relax_section(%p, %s, %p, <ret>)\n",
 					abfd, section->name, link_info);
 #endif
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 vms_bfd_gc_sections (abfd, link_info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
@@ -1698,10 +1730,10 @@ vms_bfd_gc_sections (abfd, link_info)
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_gc_sections(%p, %p)\n", abfd, link_info);
 #endif
-  return true;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 vms_bfd_merge_sections (abfd, link_info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
@@ -1709,7 +1741,7 @@ vms_bfd_merge_sections (abfd, link_info)
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_merge_sections(%p, %p)\n", abfd, link_info);
 #endif
-  return true;
+  return TRUE;
 }
 
 /* Create a hash table for the linker.  Different backends store
@@ -1738,7 +1770,7 @@ vms_bfd_link_hash_table_free (hash)
 
 /* Add symbols from this object file into the hash table.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_link_add_symbols (abfd, link_info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
@@ -1746,13 +1778,13 @@ vms_bfd_link_add_symbols (abfd, link_info)
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_link_add_symbols(%p, %p)\n", abfd, link_info);
 #endif
-  return false;
+  return FALSE;
 }
 
 /* Do a link based on the link_order structures attached to each
    section of the BFD.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_final_link (abfd, link_info)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
@@ -1760,12 +1792,12 @@ vms_bfd_final_link (abfd, link_info)
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_final_link(%p, %p)\n", abfd, link_info);
 #endif
-  return true;
+  return TRUE;
 }
 
 /* Should this section be split up into smaller pieces during linking.  */
 
-static boolean
+static bfd_boolean
 vms_bfd_link_split_section (abfd, section)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *section ATTRIBUTE_UNUSED;
@@ -1773,7 +1805,7 @@ vms_bfd_link_split_section (abfd, section)
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_link_split_section(%p, %s)\n", abfd, section->name);
 #endif
-  return false;
+  return FALSE;
 }
 
 /*-- Part 4.9, dynamic symbols and relocations ------------------------------*/
@@ -1790,7 +1822,7 @@ vms_get_dynamic_symtab_upper_bound (abfd)
   return 0;
 }
 
-static boolean
+static bfd_boolean
 vms_bfd_print_private_bfd_data (abfd, file)
     bfd *abfd ATTRIBUTE_UNUSED;
     void *file ATTRIBUTE_UNUSED;
diff --git a/bfd/vms.h b/bfd/vms.h
index 5963a8c3b54..137dc62e3dc 100644
--- a/bfd/vms.h
+++ b/bfd/vms.h
@@ -1,6 +1,6 @@
 #undef vms
 /* vms.h -- Header file for VMS (Alpha and Vax) support.
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    Written by Klaus K"ampf (kkaempf@rmi.de)
@@ -505,7 +505,7 @@ typedef struct _vms_section {
   struct _vms_section *next;
 } vms_section;
 
-extern boolean _bfd_save_vms_section
+extern bfd_boolean _bfd_save_vms_section
   PARAMS ((bfd *abfd, asection *section, PTR data, file_ptr offset,
 	   bfd_size_type count));
 extern vms_section *_bfd_get_vms_section PARAMS ((bfd *abfd, int index));
@@ -536,7 +536,7 @@ struct hdr_struc {
 struct eom_struc {
   long eom_l_total_lps;
   unsigned char eom_b_comcod;
-  boolean eom_has_transfer;
+  bfd_boolean eom_has_transfer;
   unsigned char eom_b_tfrflg;
   long eom_l_psindx;
   long eom_l_tfradr;
@@ -569,7 +569,7 @@ struct location_struct {
 
 struct vms_private_data_struct {
   int is_vax;
-  boolean fixup_done;			/* Flag to indicate if all
+  bfd_boolean fixup_done;		/* Flag to indicate if all
 					   section pointers and PRIV(sections)
 					   are set up correctly  */
   unsigned char *vms_buf;		/* buffer to record  */
@@ -648,7 +648,7 @@ extern char *_bfd_vms_save_counted_string PARAMS ((unsigned char *ptr));
 extern void _bfd_vms_push PARAMS ((bfd *abfd, uquad val, int psect));
 extern uquad _bfd_vms_pop PARAMS ((bfd *abfd, int *psect));
 
-extern boolean _bfd_save_vms_section
+extern bfd_boolean _bfd_save_vms_section
   PARAMS ((bfd *abfd, asection *section, PTR data, file_ptr offset,
 	   bfd_size_type count));
 extern void _bfd_vms_output_begin
diff --git a/bfd/xcoff-target.h b/bfd/xcoff-target.h
index 413511b96e7..7bf3de72fa4 100644
--- a/bfd/xcoff-target.h
+++ b/bfd/xcoff-target.h
@@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef CORE_FILE_P
 #define CORE_FILE_P rs6000coff_core_p
 extern const bfd_target * rs6000coff_core_p ();
-extern boolean rs6000coff_core_file_matches_executable_p ();
+extern bfd_boolean rs6000coff_core_file_matches_executable_p ();
 
 #undef	coff_core_file_matches_executable_p
 #define coff_core_file_matches_executable_p  \
@@ -78,8 +78,8 @@ extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd));
 #define CORE_FILE_P lynx_core_file_p
 extern const bfd_target *lynx_core_file_p PARAMS ((bfd *abfd));
 
-extern boolean lynx_core_file_matches_executable_p PARAMS ((bfd *core_bfd,
-							    bfd *exec_bfd));
+extern bfd_boolean lynx_core_file_matches_executable_p
+  PARAMS ((bfd *core_bfd, bfd *exec_bfd));
 #undef	coff_core_file_matches_executable_p
 #define coff_core_file_matches_executable_p lynx_core_file_matches_executable_p
 
@@ -106,7 +106,7 @@ extern int lynx_core_file_failing_signal PARAMS ((bfd *abfd));
 
 #define _bfd_xcoff_slurp_extended_name_table bfd_false
 #define _bfd_xcoff_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
+  ((bfd_boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
    bfd_false)
 #define _bfd_xcoff_truncate_arname bfd_dont_truncate_arname
 
@@ -118,22 +118,22 @@ extern int lynx_core_file_failing_signal PARAMS ((bfd *abfd));
 
 #define _bfd_xcoff_update_armap_timestamp bfd_true
 
-extern boolean _bfd_xcoff_mkobject PARAMS ((bfd *));
-extern boolean _bfd_xcoff_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-extern boolean _bfd_xcoff_is_local_label_name PARAMS ((bfd *, const char *));
+extern bfd_boolean _bfd_xcoff_mkobject PARAMS ((bfd *));
+extern bfd_boolean _bfd_xcoff_copy_private_bfd_data PARAMS ((bfd *, bfd *));
+extern bfd_boolean _bfd_xcoff_is_local_label_name PARAMS ((bfd *, const char *));
 extern void _bfd_xcoff_rtype2howto
   PARAMS ((arelent *, struct internal_reloc *));
 extern reloc_howto_type *_bfd_xcoff_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-extern boolean _bfd_xcoff_slurp_armap PARAMS ((bfd *));
+extern bfd_boolean _bfd_xcoff_slurp_armap PARAMS ((bfd *));
 extern const bfd_target *_bfd_xcoff_archive_p PARAMS ((bfd *));
 extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *));
 extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *));
 extern int _bfd_xcoff_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
-extern boolean _bfd_xcoff_write_armap
+extern bfd_boolean _bfd_xcoff_write_armap
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *));
-extern int _bfd_xcoff_sizeof_headers PARAMS ((bfd *, boolean));
+extern bfd_boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *));
+extern int _bfd_xcoff_sizeof_headers PARAMS ((bfd *, bfd_boolean));
 extern void _bfd_xcoff_swap_sym_in PARAMS ((bfd *, PTR, PTR));
 extern unsigned int _bfd_xcoff_swap_sym_out PARAMS ((bfd *, PTR, PTR));
 extern void _bfd_xcoff_swap_aux_in PARAMS ((bfd *, PTR, int, int, int, int, PTR));
diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
index e4e4755cddb..0505c86c999 100644
--- a/bfd/xcofflink.c
+++ b/bfd/xcofflink.c
@@ -115,34 +115,35 @@ struct xcoff_final_link_info
 
 static struct bfd_hash_entry *xcoff_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean xcoff_get_section_contents PARAMS ((bfd *, asection *));
+static bfd_boolean xcoff_get_section_contents PARAMS ((bfd *, asection *));
 static struct internal_reloc *xcoff_read_internal_relocs
-  PARAMS ((bfd *, asection *, boolean, bfd_byte *, boolean,
+  PARAMS ((bfd *, asection *, bfd_boolean, bfd_byte *, bfd_boolean,
 	   struct internal_reloc *));
-static boolean xcoff_link_add_object_symbols
+static bfd_boolean xcoff_link_add_object_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean xcoff_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean xcoff_link_check_dynamic_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
+static bfd_boolean xcoff_link_check_archive_element
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean xcoff_link_check_ar_symbols
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean xcoff_link_check_dynamic_ar_symbols
+  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *));
 static bfd_size_type xcoff_find_reloc
   PARAMS ((struct internal_reloc *, bfd_size_type, bfd_vma));
-static boolean xcoff_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_link_add_dynamic_symbols
+static bfd_boolean xcoff_link_add_symbols
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_mark_symbol
+static bfd_boolean xcoff_link_add_dynamic_symbols
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean xcoff_mark_symbol
   PARAMS ((struct bfd_link_info *, struct xcoff_link_hash_entry *));
-static boolean xcoff_mark PARAMS ((struct bfd_link_info *, asection *));
+static bfd_boolean xcoff_mark PARAMS ((struct bfd_link_info *, asection *));
 static void xcoff_sweep PARAMS ((struct bfd_link_info *));
-static boolean xcoff_build_ldsyms
+static bfd_boolean xcoff_build_ldsyms
   PARAMS ((struct xcoff_link_hash_entry *, PTR));
-static boolean xcoff_link_input_bfd
+static bfd_boolean xcoff_link_input_bfd
   PARAMS ((struct xcoff_final_link_info *, bfd *));
-static boolean xcoff_write_global_symbol
+static bfd_boolean xcoff_write_global_symbol
   PARAMS ((struct xcoff_link_hash_entry *, PTR));
-static boolean xcoff_reloc_link_order
+static bfd_boolean xcoff_reloc_link_order
   PARAMS ((bfd *, struct xcoff_final_link_info *, asection *,
 	   struct bfd_link_order *));
 static int xcoff_sort_relocs PARAMS ((const PTR, const PTR));
@@ -154,7 +155,7 @@ static int xcoff_sort_relocs PARAMS ((const PTR, const PTR));
 
 /* Read the contents of a section.  */
 
-static boolean
+static bfd_boolean
 xcoff_get_section_contents (abfd, sec)
      bfd *abfd;
      asection *sec;
@@ -165,7 +166,7 @@ xcoff_get_section_contents (abfd, sec)
       bfd_size_type amt = sizeof (struct coff_section_tdata);
       sec->used_by_bfd = bfd_zalloc (abfd, amt);
       if (sec->used_by_bfd == NULL)
-	return false;
+	return FALSE;
     }
 
   if (coff_section_data (abfd, sec)->contents == NULL)
@@ -173,15 +174,15 @@ xcoff_get_section_contents (abfd, sec)
       coff_section_data (abfd, sec)->contents = ((bfd_byte *)
 						 bfd_malloc (sec->_raw_size));
       if (coff_section_data (abfd, sec)->contents == NULL)
-	return false;
+	return FALSE;
 
       if (! bfd_get_section_contents (abfd, sec,
 				      coff_section_data (abfd, sec)->contents,
 				      (file_ptr) 0, sec->_raw_size))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Get the size required to hold the dynamic symbols.  */
@@ -247,7 +248,7 @@ _bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms)
     return -1;
   contents = coff_section_data (abfd, lsec)->contents;
 
-  coff_section_data (abfd, lsec)->keep_contents = true;
+  coff_section_data (abfd, lsec)->keep_contents = TRUE;
 
   bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
 
@@ -295,7 +296,7 @@ _bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms)
 	symbuf->symbol.flags |= BSF_GLOBAL;
 
       /* FIXME: We have no way to record the other information stored
-         with the loader symbol.  */
+	 with the loader symbol.  */
 
       *psyms = (asymbol *) symbuf;
     }
@@ -421,8 +422,8 @@ _bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms)
       relbuf->addend = 0;
 
       /* Most dynamic relocs have the same type.  FIXME: This is only
-         correct if ldrel.l_rtype == 0.  In other cases, we should use
-         a different howto.  */
+	 correct if ldrel.l_rtype == 0.  In other cases, we should use
+	 a different howto.  */
       relbuf->howto = bfd_xcoff_dynamic_reloc_howto(abfd);
 
       /* FIXME: We have no way to record the l_rsecnm field.  */
@@ -501,14 +502,14 @@ _bfd_xcoff_bfd_link_hash_table_create (abfd)
   ret->descriptor_section = NULL;
   ret->imports = NULL;
   ret->file_align = 0;
-  ret->textro = false;
-  ret->gc = false;
+  ret->textro = FALSE;
+  ret->gc = FALSE;
   memset (ret->special_sections, 0, sizeof ret->special_sections);
 
   /* The linker will always generate a full a.out header.  We need to
      record that fact now, before the sizeof_headers routine could be
      called.  */
-  xcoff_data (abfd)->full_aouthdr = true;
+  xcoff_data (abfd)->full_aouthdr = TRUE;
 
   return &ret->root;
 }
@@ -535,9 +536,9 @@ xcoff_read_internal_relocs (abfd, sec, cache, external_relocs,
 			    require_internal, internal_relocs)
      bfd *abfd;
      asection *sec;
-     boolean cache;
+     bfd_boolean cache;
      bfd_byte *external_relocs;
-     boolean require_internal;
+     bfd_boolean require_internal;
      struct internal_reloc *internal_relocs;
 {
 
@@ -555,8 +556,8 @@ xcoff_read_internal_relocs (abfd, sec, cache, external_relocs,
 	  && cache
 	  && enclosing->reloc_count > 0)
 	{
-	  if (_bfd_coff_read_internal_relocs (abfd, enclosing, true,
-					      external_relocs, false,
+	  if (_bfd_coff_read_internal_relocs (abfd, enclosing, TRUE,
+					      external_relocs, FALSE,
 					      (struct internal_reloc *) NULL)
 	      == NULL)
 	    return NULL;
@@ -587,7 +588,7 @@ xcoff_read_internal_relocs (abfd, sec, cache, external_relocs,
 /* Given an XCOFF BFD, add symbols to the global hash table as
    appropriate.  */
 
-boolean
+bfd_boolean
 _bfd_xcoff_bfd_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -600,21 +601,21 @@ _bfd_xcoff_bfd_link_add_symbols (abfd, info)
 
     case bfd_archive:
       /* If the archive has a map, do the usual search.  We then need
-         to check the archive for dynamic objects, because they may not 
-	 appear in the archive map even though they should, perhaps, be 
-	 included.  If the archive has no map, we just consider each object 
-	 file in turn, since that apparently is what the AIX native linker 
+	 to check the archive for dynamic objects, because they may not
+	 appear in the archive map even though they should, perhaps, be
+	 included.  If the archive has no map, we just consider each object
+	 file in turn, since that apparently is what the AIX native linker
 	 does.  */
       if (bfd_has_map (abfd))
 	{
 	  if (! (_bfd_generic_link_add_archive_symbols
 		 (abfd, info, xcoff_link_check_archive_element)))
-	    return false;
+	    return FALSE;
 	}
 
       {
 	bfd *member;
-	
+
 	member = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
 	while (member != NULL)
 	  {
@@ -622,11 +623,11 @@ _bfd_xcoff_bfd_link_add_symbols (abfd, info)
 		&& (info->hash->creator == member->xvec)
 		&& (! bfd_has_map (abfd) || (member->flags & DYNAMIC) != 0))
 	      {
-		boolean needed;
-		
-		if (! xcoff_link_check_archive_element (member, info, 
+		bfd_boolean needed;
+
+		if (! xcoff_link_check_archive_element (member, info,
 							&needed))
-		  return false;
+		  return FALSE;
 		if (needed)
 		  member->archive_pass = -1;
 	      }
@@ -634,32 +635,32 @@ _bfd_xcoff_bfd_link_add_symbols (abfd, info)
 	  }
       }
 
-      return true;
+      return TRUE;
 
     default:
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 }
 
 /* Add symbols from an XCOFF object file.  */
 
-static boolean
+static bfd_boolean
 xcoff_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 (! xcoff_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
@@ -667,48 +668,48 @@ xcoff_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
 xcoff_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 (! xcoff_link_check_ar_symbols (abfd, info, pneeded))
-    return false;
+    return FALSE;
 
   if (*pneeded)
     {
       if (! xcoff_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
 xcoff_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;
 
   if ((abfd->flags & DYNAMIC) != 0
       && ! info->static_link
@@ -731,13 +732,13 @@ xcoff_link_check_ar_symbols (abfd, info, pneeded)
 	  struct bfd_link_hash_entry *h;
 
 	  /* This symbol is externally visible, and is defined by this
-             object file.  */
+	     object file.  */
 
 	  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);
 
 	  /* We are only interested in symbols that are currently
 	     undefined.  If a symbol is currently known to be common,
@@ -751,9 +752,9 @@ xcoff_link_check_ar_symbols (abfd, info, pneeded)
 		      & XCOFF_DEF_DYNAMIC) == 0))
 	    {
 	      if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-		return false;
-	      *pneeded = true;
-	      return true;
+		return FALSE;
+	      *pneeded = TRUE;
+	      return TRUE;
 	    }
 	}
 
@@ -761,18 +762,18 @@ xcoff_link_check_ar_symbols (abfd, info, pneeded)
     }
 
   /* We do not need this object file.  */
-  return true;
+  return TRUE;
 }
 
 /* Look through the loader symbols to see if this dynamic object
    should be included in the link.  The native linker uses the loader
    symbols, not the normal symbol table, so we do too.  */
 
-static boolean
+static bfd_boolean
 xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
      bfd *abfd;
      struct bfd_link_info *info;
-     boolean *pneeded;
+     bfd_boolean *pneeded;
 {
   asection *lsec;
   bfd_byte *contents;
@@ -780,17 +781,17 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
   const char *strings;
   bfd_byte *elsym, *elsymend;
 
-  *pneeded = false;
+  *pneeded = FALSE;
 
   lsec = bfd_get_section_by_name (abfd, ".loader");
   if (lsec == NULL)
     {
       /* There are no symbols, so don't try to include it.  */
-      return true;
+      return TRUE;
     }
 
   if (! xcoff_get_section_contents (abfd, lsec))
-    return false;
+    return FALSE;
   contents = coff_section_data (abfd, lsec)->contents;
 
   bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
@@ -822,20 +823,20 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
 	  name = nambuf;
 	}
 
-      h = bfd_link_hash_lookup (info->hash, name, false, false, true);
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
 
       /* We are only interested in symbols that are currently
-         undefined.  At this point we know that we are using an XCOFF
-         hash table.  */
+	 undefined.  At this point we know that we are using an XCOFF
+	 hash table.  */
       if (h != NULL
 	  && h->type == bfd_link_hash_undefined
 	  && (((struct xcoff_link_hash_entry *) h)->flags
 	      & XCOFF_DEF_DYNAMIC) == 0)
 	{
 	  if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-	    return false;
-	  *pneeded = true;
-	  return true;
+	    return FALSE;
+	  *pneeded = TRUE;
+	  return TRUE;
 	}
     }
 
@@ -847,7 +848,7 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
       coff_section_data (abfd, lsec)->contents = NULL;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Returns the index of reloc in RELOCS with the least address greater
@@ -905,11 +906,11 @@ xcoff_find_reloc (relocs, count, address)
 
    Takes care of creating the .loader, .gl, .ds, .debug and sections.  */
 
-static boolean
+static bfd_boolean
 xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
 {
 
-  boolean return_value = false;
+  bfd_boolean return_value = FALSE;
 
   if (info->hash->creator == abfd->xvec)
     {
@@ -998,7 +999,7 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
 	}
     }
 
-  return_value = true;
+  return_value = TRUE;
 
  end_return:
 
@@ -1023,21 +1024,21 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
    relocation entries carefully, since the only way to tell which
    csect they belong to is to examine the address.  */
 
-static boolean
+static bfd_boolean
 xcoff_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   unsigned int n_tmask;
   unsigned int n_btshft;
-  boolean default_copy;
+  bfd_boolean default_copy;
   bfd_size_type symcount;
   struct xcoff_link_hash_entry **sym_hash;
   asection **csect_cache;
   bfd_size_type linesz;
   asection *o;
   asection *last_real;
-  boolean keep_syms;
+  bfd_boolean keep_syms;
   asection *csect;
   unsigned int csect_index;
   asection *first_csect;
@@ -1058,16 +1059,16 @@ xcoff_link_add_symbols (abfd, info)
       && ! info->static_link)
     {
       if (! xcoff_link_add_dynamic_symbols (abfd, info))
-	return false;
+	return FALSE;
     }
 
   /* create the loader, toc, gl, ds and debug sections, if needed */
-  if (false == xcoff_link_create_extra_sections(abfd, info))
+  if (! xcoff_link_create_extra_sections (abfd, info))
     goto error_return;
 
   if ((abfd->flags & DYNAMIC) != 0
       && ! info->static_link)
-    return true;
+    return TRUE;
 
   n_tmask = coff_data (abfd)->local_n_tmask;
   n_btshft = coff_data (abfd)->local_n_btshft;
@@ -1077,9 +1078,9 @@ xcoff_link_add_symbols (abfd, info)
 #define N_BTSHFT n_btshft
 
   if (info->keep_memory)
-    default_copy = false;
+    default_copy = FALSE;
   else
-    default_copy = true;
+    default_copy = TRUE;
 
   symcount = obj_raw_syment_count (abfd);
 
@@ -1122,8 +1123,8 @@ xcoff_link_add_symbols (abfd, info)
 	{
 
 	  reloc_info[o->target_index].relocs =
-	    xcoff_read_internal_relocs (abfd, o, true, (bfd_byte *) NULL,
-					false, (struct internal_reloc *) NULL);
+	    xcoff_read_internal_relocs (abfd, o, TRUE, (bfd_byte *) NULL,
+					FALSE, (struct internal_reloc *) NULL);
 	  amt = o->reloc_count;
 	  amt *= sizeof (asection *);
 	  reloc_info[o->target_index].csects = (asection **) bfd_zmalloc (amt);
@@ -1150,7 +1151,7 @@ xcoff_link_add_symbols (abfd, info)
     }
 
   /* Don't let the linker relocation routines discard the symbols.  */
-  obj_coff_keep_syms (abfd) = true;
+  obj_coff_keep_syms (abfd) = TRUE;
 
   csect = NULL;
   csect_index = 0;
@@ -1214,11 +1215,11 @@ xcoff_link_add_symbols (abfd, info)
 	goto error_return;
 
       /* If this symbol has line number information attached to it,
-         and we're not stripping it, count the number of entries and
-         add them to the count for this csect.  In the final link pass
-         we are going to attach line number information by symbol,
-         rather than by section, in order to more easily handle
-         garbage collection.  */
+	 and we're not stripping it, count the number of entries and
+	 add them to the count for this csect.  In the final link pass
+	 we are going to attach line number information by symbol,
+	 rather than by section, in order to more easily handle
+	 garbage collection.  */
       if ((info->strip == strip_none || info->strip == strip_some)
 	  && sym.n_numaux > 1
 	  && csect != NULL
@@ -1336,7 +1337,7 @@ xcoff_link_add_symbols (abfd, info)
 	    }
 
 	  /* An XMC_XO external reference is actually a reference to
-             an absolute location.  */
+	     an absolute location.  */
 	  if (aux.x_csect.x_smclas != XMC_XO)
 	    section = bfd_und_section_ptr;
 	  else
@@ -1430,7 +1431,7 @@ xcoff_link_add_symbols (abfd, info)
 		    {
 		      const char *relname;
 		      char relbuf[SYMNMLEN + 1];
-		      boolean copy;
+		      bfd_boolean copy;
 		      struct xcoff_link_hash_entry *h;
 
 		      /* At this point we know that the TOC entry is
@@ -1453,8 +1454,8 @@ xcoff_link_add_symbols (abfd, info)
 				  || relsym._n._n_n._n_zeroes != 0
 				  || relsym._n._n_n._n_offset == 0);
 			  h = xcoff_link_hash_lookup (xcoff_hash_table (info),
-						      relname, true, copy,
-						      false);
+						      relname, TRUE, copy,
+						      FALSE);
 			  if (h == NULL)
 			    goto error_return;
 
@@ -1606,19 +1607,19 @@ xcoff_link_add_symbols (abfd, info)
 	     follow its appropriate XTY_SD symbol.  The .set pseudo op can
 	     cause the XTY_LD to not follow the XTY_SD symbol. */
 	  {
-	    boolean bad;
+	    bfd_boolean bad;
 
-	    bad = false;
+	    bad = FALSE;
 	    if (aux.x_csect.x_scnlen.l < 0
 		|| (aux.x_csect.x_scnlen.l
 		    >= esym - (bfd_byte *) obj_coff_external_syms (abfd)))
-	      bad = true;
+	      bad = TRUE;
 	    if (! bad)
 	      {
 		section = xcoff_data (abfd)->csects[aux.x_csect.x_scnlen.l];
 		if (section == NULL
 		    || (section->flags & SEC_HAS_CONTENTS) == 0)
-		  bad = true;
+		  bad = TRUE;
 	      }
 	    if (bad)
 	      {
@@ -1635,11 +1636,11 @@ xcoff_link_add_symbols (abfd, info)
 
 	case XTY_CM:
 	  /* This is an unitialized csect.  We could base the name on
-             the storage mapping class, but we don't bother except for
-             an XMC_TD symbol.  If this csect is externally visible,
-             it is a common symbol.  We put XMC_TD symbols in sections
-             named .tocbss, and rely on the linker script to put that
-             in the TOC area.  */
+	     the storage mapping class, but we don't bother except for
+	     an XMC_TD symbol.  If this csect is externally visible,
+	     it is a common symbol.  We put XMC_TD symbols in sections
+	     named .tocbss, and rely on the linker script to put that
+	     in the TOC area.  */
 
 	  if (csect != NULL)
 	    {
@@ -1730,20 +1731,20 @@ xcoff_link_add_symbols (abfd, info)
 	}
 
       /* Now we have enough information to add the symbol to the
-         linker hash table.  */
+	 linker hash table.  */
 
       if (sym.n_sclass == C_EXT)
 	{
-	  boolean copy;
+	  bfd_boolean copy;
 
 	  BFD_ASSERT (section != NULL);
 
 	  /* We must copy the name into memory if we got it from the
-             syment itself, rather than the string table.  */
+	     syment itself, rather than the string table.  */
 	  copy = default_copy;
 	  if (sym._n._n_n._n_zeroes != 0
 	      || sym._n._n_n._n_offset == 0)
-	    copy = true;
+	    copy = TRUE;
 
 	  /* The AIX linker appears to only detect multiple symbol
 	     definitions when there is a reference to the symbol.  If
@@ -1775,7 +1776,7 @@ xcoff_link_add_symbols (abfd, info)
 	      if (! bfd_is_und_section (section))
 		{
 		  *sym_hash = xcoff_link_hash_lookup (xcoff_hash_table (info),
-						      name, true, copy, false);
+						      name, TRUE, copy, FALSE);
 		}
 	      else
 		{
@@ -1783,8 +1784,8 @@ xcoff_link_add_symbols (abfd, info)
 		     merging symbols.  */
 		  *sym_hash = ((struct xcoff_link_hash_entry *)
 			       bfd_wrapped_link_hash_lookup (abfd, info, name,
-							     true, true, 
-							     false));
+							     TRUE, TRUE,
+							     FALSE));
 		}
 	      if (*sym_hash == NULL)
 		goto error_return;
@@ -1801,11 +1802,11 @@ xcoff_link_add_symbols (abfd, info)
 			      & DYNAMIC) == 0))
 		    {
 		      /* The new symbol is from a shared library, and
-                         either the existing symbol is not global
-                         linkage code or this symbol is global linkage
-                         code.  If the existing symbol is global
-                         linkage code and the new symbol is not, then
-                         we want to use the new symbol.  */
+			 either the existing symbol is not global
+			 linkage code or this symbol is global linkage
+			 code.  If the existing symbol is global
+			 linkage code and the new symbol is not, then
+			 we want to use the new symbol.  */
 		      section = bfd_und_section_ptr;
 		      value = 0;
 		    }
@@ -1813,7 +1814,7 @@ xcoff_link_add_symbols (abfd, info)
 			    & DYNAMIC) != 0)
 		    {
 		      /* The existing symbol is from a shared library.
-                         Replace it.  */
+			 Replace it.  */
 		      (*sym_hash)->root.type = bfd_link_hash_undefined;
 		      (*sym_hash)->root.u.undef.abfd =
 			(*sym_hash)->root.u.def.section->owner;
@@ -1821,8 +1822,8 @@ xcoff_link_add_symbols (abfd, info)
 		  else if (abfd->my_archive != NULL)
 		    {
 		      /* This is a redefinition in an object contained
-                         in an archive.  Just ignore it.  See the
-                         comment above.  */
+			 in an archive.  Just ignore it.  See the
+			 comment above.  */
 		      section = bfd_und_section_ptr;
 		      value = 0;
 		    }
@@ -1830,15 +1831,15 @@ xcoff_link_add_symbols (abfd, info)
 			   || info->hash->undefs_tail == &(*sym_hash)->root)
 		    {
 		      /* This symbol has been referenced.  In this
-                         case, we just continue and permit the
-                         multiple definition error.  See the comment
-                         above about the behaviour of the AIX linker.  */
+			 case, we just continue and permit the
+			 multiple definition error.  See the comment
+			 above about the behaviour of the AIX linker.  */
 		    }
 		  else if ((*sym_hash)->smclas == aux.x_csect.x_smclas)
 		    {
 		      /* The symbols are both csects of the same
-                         class.  There is at least a chance that this
-                         is a semi-legitimate redefinition.  */
+			 class.  There is at least a chance that this
+			 is a semi-legitimate redefinition.  */
 		      section = bfd_und_section_ptr;
 		      value = 0;
 		      (*sym_hash)->flags |= XCOFF_MULTIPLY_DEFINED;
@@ -1883,7 +1884,7 @@ xcoff_link_add_symbols (abfd, info)
 	  last_real->next = NULL;
 	  if (! (_bfd_generic_link_add_one_symbol
 		 (info, abfd, name, flags, section, value,
-		  (const char *) NULL, copy, true,
+		  (const char *) NULL, copy, TRUE,
 		  (struct bfd_link_hash_entry **) sym_hash)))
 	    goto error_return;
 	  last_real->next = first_csect;
@@ -1974,14 +1975,14 @@ xcoff_link_add_symbols (abfd, info)
 		  h = obj_xcoff_sym_hashes (abfd)[rel->r_symndx];
 		  h->flags |= XCOFF_CALLED;
 		  /* If the symbol name starts with a period, it is
-                     the code of a function.  If the symbol is
-                     currently undefined, then add an undefined symbol
-                     for the function descriptor.  This should do no
-                     harm, because any regular object that defines the
-                     function should also define the function
-                     descriptor.  It helps, because it means that we
-                     will identify the function descriptor with a
-                     dynamic object if a dynamic object defines it.  */
+		     the code of a function.  If the symbol is
+		     currently undefined, then add an undefined symbol
+		     for the function descriptor.  This should do no
+		     harm, because any regular object that defines the
+		     function should also define the function
+		     descriptor.  It helps, because it means that we
+		     will identify the function descriptor with a
+		     dynamic object if a dynamic object defines it.  */
 		  if (h->root.root.string[0] == '.'
 		      && h->descriptor == NULL)
 		    {
@@ -1990,7 +1991,7 @@ xcoff_link_add_symbols (abfd, info)
 
 		      hds = xcoff_link_hash_lookup (xcoff_hash_table (info),
 						    h->root.root.string + 1,
-						    true, false, true);
+						    TRUE, FALSE, TRUE);
 		      if (hds == NULL)
 			goto error_return;
 		      if (hds->root.type == bfd_link_hash_new)
@@ -1999,8 +2000,8 @@ xcoff_link_add_symbols (abfd, info)
 			  if (! (_bfd_generic_link_add_one_symbol
 				 (info, abfd, hds->root.root.string,
 				  (flagword) 0, bfd_und_section_ptr,
-				  (bfd_vma) 0, (const char *) NULL, false,
-				  true, &bh)))
+				  (bfd_vma) 0, (const char *) NULL, FALSE,
+				  TRUE, &bh)))
 			    goto error_return;
 			  hds = (struct xcoff_link_hash_entry *) bh;
 			}
@@ -2033,7 +2034,7 @@ xcoff_link_add_symbols (abfd, info)
 	}
 
       /* Free up the line numbers.  FIXME: We could cache these
-         somewhere for the final link, to avoid reading them again.  */
+	 somewhere for the final link, to avoid reading them again.  */
       if (reloc_info[o->target_index].linenos != NULL)
 	{
 	  free (reloc_info[o->target_index].linenos);
@@ -2045,7 +2046,7 @@ xcoff_link_add_symbols (abfd, info)
 
   obj_coff_keep_syms (abfd) = keep_syms;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (reloc_info != NULL)
@@ -2060,7 +2061,7 @@ xcoff_link_add_symbols (abfd, info)
       free (reloc_info);
     }
   obj_coff_keep_syms (abfd) = keep_syms;
-  return false;
+  return FALSE;
 }
 
 #undef N_TMASK
@@ -2069,7 +2070,7 @@ xcoff_link_add_symbols (abfd, info)
 /* This function is used to add symbols from a dynamic object to the
    global symbol table.  */
 
-static boolean
+static bfd_boolean
 xcoff_link_add_dynamic_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2094,7 +2095,7 @@ xcoff_link_add_dynamic_symbols (abfd, info)
 	(_("%s: XCOFF shared object when not producing XCOFF output"),
 	 bfd_get_filename (abfd));
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   /* The symbols we use from a dynamic object are not the symbols in
@@ -2115,12 +2116,12 @@ xcoff_link_add_dynamic_symbols (abfd, info)
 	(_("%s: dynamic object with no .loader section"),
 	 bfd_get_filename (abfd));
       bfd_set_error (bfd_error_no_symbols);
-      return false;
+      return FALSE;
     }
 
 
   if (! xcoff_get_section_contents (abfd, lsec))
-    return false;
+    return FALSE;
   contents = coff_section_data (abfd, lsec)->contents;
 
   /* Remove the sections from this object, so that they do not get
@@ -2162,10 +2163,10 @@ xcoff_link_add_dynamic_symbols (abfd, info)
 	 table.  However, we verified above that we are using an XCOFF
 	 hash table.  */
 
-      h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, true,
-				  true, true);
+      h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, TRUE,
+				  TRUE, TRUE);
       if (h == NULL)
-	return false;
+	return FALSE;
 
       h->flags |= XCOFF_DEF_DYNAMIC;
 
@@ -2191,9 +2192,9 @@ xcoff_link_add_dynamic_symbols (abfd, info)
 	h->smclas = ldsym.l_smclas;
 
       /* Unless this is an XMC_XO symbol, we don't bother to actually
-         define it, since we don't have a section to put it in anyhow.
-         Instead, the relocation routines handle the DEF_DYNAMIC flag
-         correctly.  */
+	 define it, since we don't have a section to put it in anyhow.
+	 Instead, the relocation routines handle the DEF_DYNAMIC flag
+	 correctly.  */
 
       if (h->smclas == XMC_XO
 	  && (h->root.type == bfd_link_hash_undefined
@@ -2221,21 +2222,21 @@ xcoff_link_add_dynamic_symbols (abfd, info)
 
 	      dsnm = bfd_malloc ((bfd_size_type) strlen (name) + 2);
 	      if (dsnm == NULL)
-		return false;
+		return FALSE;
 	      dsnm[0] = '.';
 	      strcpy (dsnm + 1, name);
 	      hds = xcoff_link_hash_lookup (xcoff_hash_table (info), dsnm,
-					    true, true, true);
+					    TRUE, TRUE, TRUE);
 	      free (dsnm);
 	      if (hds == NULL)
-		return false;
+		return FALSE;
 
 	      if (hds->root.type == bfd_link_hash_new)
 		{
 		  hds->root.type = bfd_link_hash_undefined;
 		  hds->root.u.undef.abfd = abfd;
 		  /* We do not want to add this to the undefined
-                     symbol list.  */
+		     symbol list.  */
 		}
 
 	      hds->descriptor = h;
@@ -2272,7 +2273,7 @@ xcoff_link_add_dynamic_symbols (abfd, info)
   n = ((struct xcoff_import_file *)
        bfd_alloc (abfd, (bfd_size_type) sizeof (struct xcoff_import_file)));
   if (n == NULL)
-    return false;
+    return FALSE;
   n->next = NULL;
 
   /* For some reason, the path entry in the import file list for a
@@ -2305,7 +2306,7 @@ xcoff_link_add_dynamic_symbols (abfd, info)
 
   xcoff_data (abfd)->import_file_id = c;
 
-  return true;
+  return TRUE;
 }
 
 /* Routines that are called after all the input files have been
@@ -2314,14 +2315,14 @@ xcoff_link_add_dynamic_symbols (abfd, info)
 /* Mark a symbol as not being garbage, including the section in which
    it is defined.  */
 
-static INLINE boolean
+static INLINE bfd_boolean
 xcoff_mark_symbol (info, h)
      struct bfd_link_info *info;
      struct xcoff_link_hash_entry *h;
 {
 
   if ((h->flags & XCOFF_MARK) != 0)
-    return true;
+    return TRUE;
 
   h->flags |= XCOFF_MARK;
   if (h->root.type == bfd_link_hash_defined
@@ -2334,7 +2335,7 @@ xcoff_mark_symbol (info, h)
 	  && (hsec->flags & SEC_MARK) == 0)
 	{
 	  if (! xcoff_mark (info, hsec))
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -2342,10 +2343,10 @@ xcoff_mark_symbol (info, h)
       && (h->toc_section->flags & SEC_MARK) == 0)
     {
       if (! xcoff_mark (info, h->toc_section))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The mark phase of garbage collection.  For a given section, mark
@@ -2354,14 +2355,14 @@ xcoff_mark_symbol (info, h)
    the number of relocs which need to be copied into the .loader
    section.  */
 
-static boolean
+static bfd_boolean
 xcoff_mark (info, sec)
      struct bfd_link_info *info;
      asection *sec;
 {
   if (bfd_is_abs_section (sec)
       || (sec->flags & SEC_MARK) != 0)
-    return true;
+    return TRUE;
 
   sec->flags |= SEC_MARK;
 
@@ -2387,7 +2388,7 @@ xcoff_mark (info, sec)
 	      && (h->flags & XCOFF_MARK) == 0)
 	    {
 	      if (! xcoff_mark_symbol (info, h))
-		return false;
+		return FALSE;
 	    }
 	}
 
@@ -2396,11 +2397,11 @@ xcoff_mark (info, sec)
       if ((sec->flags & SEC_RELOC) != 0
 	  && sec->reloc_count > 0)
 	{
-	  rel = xcoff_read_internal_relocs (sec->owner, sec, true,
-					    (bfd_byte *) NULL, false,
+	  rel = xcoff_read_internal_relocs (sec->owner, sec, TRUE,
+					    (bfd_byte *) NULL, FALSE,
 					    (struct internal_reloc *) NULL);
 	  if (rel == NULL)
-	    return false;
+	    return FALSE;
 	  relend = rel + sec->reloc_count;
 	  for (; rel < relend; rel++)
 	    {
@@ -2416,7 +2417,7 @@ xcoff_mark (info, sec)
 		  && (h->flags & XCOFF_MARK) == 0)
 		{
 		  if (! xcoff_mark_symbol (info, h))
-		    return false;
+		    return FALSE;
 		}
 
 	      rsec = xcoff_data (sec->owner)->csects[rel->r_symndx];
@@ -2424,11 +2425,11 @@ xcoff_mark (info, sec)
 		  && (rsec->flags & SEC_MARK) == 0)
 		{
 		  if (! xcoff_mark (info, rsec))
-		    return false;
+		    return FALSE;
 		}
 
 	      /* See if this reloc needs to be copied into the .loader
-                 section.  */
+		 section.  */
 	      switch (rel->r_type)
 		{
 		default:
@@ -2477,7 +2478,7 @@ xcoff_mark (info, sec)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* The sweep phase of garbage collection.  Remove all garbage
@@ -2498,8 +2499,8 @@ xcoff_sweep (info)
 	  if ((o->flags & SEC_MARK) == 0)
 	    {
 	      /* Keep all sections from non-XCOFF input files.  Keep
-                 special sections.  Keep .debug sections for the
-                 moment.  */
+		 special sections.  Keep .debug sections for the
+		 moment.  */
 	      if (sub->xvec != info->hash->creator
 		  || o == xcoff_hash_table (info)->debug_section
 		  || o == xcoff_hash_table (info)->loader_section
@@ -2522,7 +2523,7 @@ xcoff_sweep (info)
 /* Record the number of elements in a set.  This is used to output the
    correct csect length.  */
 
-boolean
+bfd_boolean
 bfd_xcoff_link_record_set (output_bfd, info, harg, size)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2534,7 +2535,7 @@ bfd_xcoff_link_record_set (output_bfd, info, harg, size)
   bfd_size_type amt;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
   /* This will hardly ever be called.  I don't want to burn four bytes
      per global symbol, so instead the size is kept on a linked list
@@ -2543,7 +2544,7 @@ bfd_xcoff_link_record_set (output_bfd, info, harg, size)
   amt = sizeof (struct xcoff_link_size_list);
   n = (struct xcoff_link_size_list *) bfd_alloc (output_bfd, amt);
   if (n == NULL)
-    return false;
+    return FALSE;
   n->next = xcoff_hash_table (info)->size_list;
   n->h = h;
   n->size = size;
@@ -2551,12 +2552,12 @@ bfd_xcoff_link_record_set (output_bfd, info, harg, size)
 
   h->flags |= XCOFF_HAS_SIZE;
 
-  return true;
+  return TRUE;
 }
 
 /* Import a symbol.  */
 
-boolean
+bfd_boolean
 bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
 			 impmember, syscall_flag)
      bfd *output_bfd;
@@ -2571,7 +2572,7 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
   struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
   /* A symbol name which starts with a period is the code for a
      function.  If the symbol is undefined, then add an undefined
@@ -2587,9 +2588,9 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
 	{
 	  hds = xcoff_link_hash_lookup (xcoff_hash_table (info),
 					h->root.root.string + 1,
-					true, false, true);
+					TRUE, FALSE, TRUE);
 	  if (hds == NULL)
-	    return false;
+	    return FALSE;
 	  if (hds->root.type == bfd_link_hash_new)
 	    {
 	      hds->root.type = bfd_link_hash_undefined;
@@ -2603,8 +2604,8 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
 	}
 
       /* Now, if the descriptor is undefined, import the descriptor
-         rather than the symbol we were told to import.  FIXME: Is
-         this correct in all cases?  */
+	 rather than the symbol we were told to import.  FIXME: Is
+	 this correct in all cases?  */
       if (hds->root.type == bfd_link_hash_undefined)
 	h = hds;
     }
@@ -2621,7 +2622,7 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
 		 (info, h->root.root.string, h->root.u.def.section->owner,
 		  h->root.u.def.section, h->root.u.def.value,
 		  output_bfd, bfd_abs_section_ptr, val)))
-	    return false;
+	    return FALSE;
 	}
 
       h->root.type = bfd_link_hash_defined;
@@ -2641,7 +2642,7 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
       struct xcoff_import_file **pp;
 
       /* We start c at 1 because the first entry in the import list is
-         reserved for the library search path.  */
+	 reserved for the library search path.  */
       for (pp = &xcoff_hash_table (info)->imports, c = 1;
 	   *pp != NULL;
 	   pp = &(*pp)->next, ++c)
@@ -2659,7 +2660,7 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
 
 	  n = (struct xcoff_import_file *) bfd_alloc (output_bfd, amt);
 	  if (n == NULL)
-	    return false;
+	    return FALSE;
 	  n->next = NULL;
 	  n->path = imppath;
 	  n->file = impfile;
@@ -2670,12 +2671,12 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
       h->ldindx = c;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Export a symbol.  */
 
-boolean
+bfd_boolean
 bfd_xcoff_export_symbol (output_bfd, info, harg)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2684,7 +2685,7 @@ bfd_xcoff_export_symbol (output_bfd, info, harg)
   struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
   h->flags |= XCOFF_EXPORT;
 
@@ -2702,11 +2703,11 @@ bfd_xcoff_export_symbol (output_bfd, info, harg)
 
       fnname = (char *) bfd_malloc (amt);
       if (fnname == NULL)
-	return false;
+	return FALSE;
       fnname[0] = '.';
       strcpy (fnname + 1, h->root.root.string);
       hfn = xcoff_link_hash_lookup (xcoff_hash_table (info),
-				    fnname, false, false, true);
+				    fnname, FALSE, FALSE, TRUE);
       free (fnname);
       if (hfn != NULL
 	  && hfn->smclas == XMC_PR
@@ -2721,7 +2722,7 @@ bfd_xcoff_export_symbol (output_bfd, info, harg)
 
   /* Make sure we don't garbage collect this symbol.  */
   if (! xcoff_mark_symbol (info, h))
-    return false;
+    return FALSE;
 
   /* If this is a function descriptor, make sure we don't garbage
      collect the associated function code.  We normally don't have to
@@ -2731,17 +2732,17 @@ bfd_xcoff_export_symbol (output_bfd, info, harg)
   if ((h->flags & XCOFF_DESCRIPTOR) != 0)
     {
       if (! xcoff_mark_symbol (info, h->descriptor))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Count a reloc against a symbol.  This is called for relocs
    generated by the linker script, typically for global constructors
    and destructors.  */
 
-boolean
+bfd_boolean
 bfd_xcoff_link_count_reloc (output_bfd, info, name)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2750,16 +2751,16 @@ bfd_xcoff_link_count_reloc (output_bfd, info, name)
   struct xcoff_link_hash_entry *h;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
   h = ((struct xcoff_link_hash_entry *)
-       bfd_wrapped_link_hash_lookup (output_bfd, info, name, false, false,
-				     false));
+       bfd_wrapped_link_hash_lookup (output_bfd, info, name, FALSE, FALSE,
+				     FALSE));
   if (h == NULL)
     {
       (*_bfd_error_handler) (_("%s: no such symbol"), name);
       bfd_set_error (bfd_error_no_symbols);
-      return false;
+      return FALSE;
     }
 
   h->flags |= XCOFF_REF_REGULAR | XCOFF_LDREL;
@@ -2767,15 +2768,15 @@ bfd_xcoff_link_count_reloc (output_bfd, info, name)
 
   /* Mark the symbol to avoid garbage collection.  */
   if (! xcoff_mark_symbol (info, h))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called for each symbol to which the linker script
    assigns a value.  */
 
-boolean
+bfd_boolean
 bfd_xcoff_record_link_assignment (output_bfd, info, name)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -2784,16 +2785,16 @@ bfd_xcoff_record_link_assignment (output_bfd, info, name)
   struct xcoff_link_hash_entry *h;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
-  h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, true, true,
-			      false);
+  h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, TRUE, TRUE,
+			      FALSE);
   if (h == NULL)
-    return false;
+    return FALSE;
 
   h->flags |= XCOFF_DEF_REGULAR;
 
-  return true;
+  return TRUE;
 }
 
 /* Build the .loader section.  This is called by the XCOFF linker
@@ -2813,7 +2814,7 @@ bfd_xcoff_record_link_assignment (output_bfd, info, name)
    option).  SPECIAL_SECTIONS is set by this routine to csects with
    magic names like _end.  */
 
-boolean
+bfd_boolean
 bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
 				 file_align, maxstack, maxdata, gc,
 				 modtype, textro, export_defineds,
@@ -2825,12 +2826,12 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
      unsigned long file_align;
      unsigned long maxstack;
      unsigned long maxdata;
-     boolean gc;
+     bfd_boolean gc;
      int modtype;
-     boolean textro;
-     boolean export_defineds;
+     bfd_boolean textro;
+     bfd_boolean export_defineds;
      asection **special_sections;
-     boolean rtld;
+     bfd_boolean rtld;
 {
   struct xcoff_link_hash_entry *hentry;
   asection *lsec;
@@ -2851,10 +2852,10 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
     {
       for (i = 0; i < XCOFF_NUMBER_OF_SPECIAL_SECTIONS; i++)
 	special_sections[i] = NULL;
-      return true;
+      return TRUE;
     }
 
-  ldinfo.failed = false;
+  ldinfo.failed = FALSE;
   ldinfo.output_bfd = output_bfd;
   ldinfo.info = info;
   ldinfo.export_defineds = export_defineds;
@@ -2874,56 +2875,55 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
   if (entry != NULL)
     {
       hentry = xcoff_link_hash_lookup (xcoff_hash_table (info), entry,
-				       false, false, true);
+				       FALSE, FALSE, TRUE);
       if (hentry != NULL)
 	hentry->flags |= XCOFF_ENTRY;
     }
 
   /* __rtinit */
-  if (info->init_function || info->fini_function || rtld) 
+  if (info->init_function || info->fini_function || rtld)
     {
       struct xcoff_link_hash_entry *hsym;
       struct internal_ldsym *ldsym;
-      
+
       hsym = xcoff_link_hash_lookup (xcoff_hash_table (info),
-				     "__rtinit", false, false, true);
+				     "__rtinit", FALSE, FALSE, TRUE);
       if (hsym == NULL)
 	{
 	  (*_bfd_error_handler)
 	    (_("error: undefined symbol __rtinit"));
-	  return false;
+	  return FALSE;
 	}
-      
+
       xcoff_mark_symbol (info, hsym);
       hsym->flags |= (XCOFF_DEF_REGULAR | XCOFF_RTINIT);
 
       /* __rtinit initalized */
       amt = sizeof (struct internal_ldsym);
       ldsym = (struct internal_ldsym *) bfd_malloc (amt);
-      
-      ldsym->l_value = 0;                  /* will be filled in later */
-      ldsym->l_scnum = 2;                  /* data section */
-      ldsym->l_smtype = XTY_SD;            /* csect section definition */
-      ldsym->l_smclas = 5;                 /* .rw */
-      ldsym->l_ifile = 0;                  /* special system loader symbol */
-      ldsym->l_parm = 0;                   /* NA */
-      
+
+      ldsym->l_value = 0;		/* will be filled in later */
+      ldsym->l_scnum = 2;		/* data section */
+      ldsym->l_smtype = XTY_SD;		/* csect section definition */
+      ldsym->l_smclas = 5;		/* .rw */
+      ldsym->l_ifile = 0;		/* special system loader symbol */
+      ldsym->l_parm = 0;		/* NA */
+
       /* Force __rtinit to be the first symbol in the loader symbol table
 	 See xcoff_build_ldsyms
-	 
+
 	 The first 3 symbol table indices are reserved to indicate the data,
 	 text and bss sections.  */
       BFD_ASSERT (0 == ldinfo.ldsym_count);
-      
+
       hsym->ldindx = 3;
       ldinfo.ldsym_count = 1;
       hsym->ldsym = ldsym;
-      
-      if (false == bfd_xcoff_put_ldsymbol_name (ldinfo.output_bfd, &ldinfo,
-						hsym->ldsym,
-						hsym->root.root.string))
-	return false;
-      
+
+      if (! bfd_xcoff_put_ldsymbol_name (ldinfo.output_bfd, &ldinfo,
+					 hsym->ldsym, hsym->root.root.string))
+	return FALSE;
+
       /* This symbol is written out by xcoff_write_global_symbol
 	 Set stuff up so xcoff_write_global_symbol logic works.  */
       hsym->flags |= XCOFF_DEF_REGULAR | XCOFF_MARK;
@@ -2938,11 +2938,11 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
       || (hentry->root.type != bfd_link_hash_defined
 	  && hentry->root.type != bfd_link_hash_defweak))
     {
-      gc = false;
-      xcoff_hash_table (info)->gc = false;
+      gc = FALSE;
+      xcoff_hash_table (info)->gc = FALSE;
 
       /* We still need to call xcoff_mark, in order to set ldrel_count
-         correctly.  */
+	 correctly.  */
       for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
 	{
 	  asection *o;
@@ -2962,7 +2962,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
       if (! xcoff_mark (info, hentry->root.u.def.section))
 	goto error_return;
       xcoff_sweep (info);
-      xcoff_hash_table (info)->gc = true;
+      xcoff_hash_table (info)->gc = TRUE;
     }
 
   /* Return special sections to the caller.  */
@@ -2982,7 +2982,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
   if (info->input_bfds == NULL)
     {
       /* I'm not sure what to do in this bizarre case.  */
-      return true;
+      return TRUE;
     }
 
   xcoff_link_hash_traverse (xcoff_hash_table (info), xcoff_build_ldsyms,
@@ -3158,7 +3158,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
       csectpp = xcoff_data (sub)->csects;
 
       /* Dynamic object do not have csectpp's.  */
-      if (NULL != csectpp) 
+      if (NULL != csectpp)
 	{
 	  symesz = bfd_coff_symesz (sub);
 	  esym = (bfd_byte *) obj_coff_external_syms (sub);
@@ -3183,7 +3183,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
 		  bfd_size_type indx;
 
 		  name = (char *) debug_contents + sym._n._n_n._n_offset;
-		  indx = _bfd_stringtab_add (debug_strtab, name, true, true);
+		  indx = _bfd_stringtab_add (debug_strtab, name, TRUE, TRUE);
 		  if (indx == (bfd_size_type) -1)
 		    goto error_return;
 		  *debug_index = indx;
@@ -3213,29 +3213,29 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
     xcoff_hash_table (info)->debug_section->_raw_size =
       _bfd_stringtab_size (debug_strtab);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (ldinfo.strings != NULL)
     free (ldinfo.strings);
   if (debug_contents != NULL)
     free (debug_contents);
-  return false;
+  return FALSE;
 }
 
-boolean 
+bfd_boolean
 bfd_xcoff_link_generate_rtinit (abfd, init, fini, rtld)
      bfd *abfd;
      const char *init;
      const char *fini;
-     boolean rtld;
+     bfd_boolean rtld;
 {
   struct bfd_in_memory *bim;
-  
+
   bim = ((struct bfd_in_memory *)
 	 bfd_malloc ((bfd_size_type) sizeof (struct bfd_in_memory)));
   if (bim == NULL)
-    return false;
+    return FALSE;
 
   bim->size = 0;
   bim->buffer = 0;
@@ -3247,21 +3247,21 @@ bfd_xcoff_link_generate_rtinit (abfd, init, fini, rtld)
   abfd->direction = write_direction;
   abfd->where = 0;
 
-  if (false == bfd_xcoff_generate_rtinit (abfd, init, fini, rtld)) 
-    return false;
+  if (! bfd_xcoff_generate_rtinit (abfd, init, fini, rtld))
+    return FALSE;
 
   /* need to reset to unknown or it will not be read back in correctly */
   abfd->format = bfd_unknown;
   abfd->direction = read_direction;
   abfd->where = 0;
 
-  return true;
+  return TRUE;
 }
 
 
 /* Add a symbol to the .loader symbols, if necessary.  */
 
-static boolean
+static bfd_boolean
 xcoff_build_ldsyms (h, p)
      struct xcoff_link_hash_entry *h;
      PTR p;
@@ -3274,7 +3274,7 @@ xcoff_build_ldsyms (h, p)
 
   /* __rtinit, this symbol has special handling. */
   if (h->flags & XCOFF_RTINIT)
-      return true;
+      return TRUE;
 
   /* If this is a final link, and the symbol was defined as a common
      symbol in a regular object file, and there was no definition in
@@ -3296,7 +3296,7 @@ xcoff_build_ldsyms (h, p)
       && (h->flags & XCOFF_DEF_REGULAR) != 0
       && h->root.root.string[0] != '.')
     {
-      boolean export;
+      bfd_boolean export;
 
       /* We don't export a symbol which is being defined by an object
 	 included from an archive which contains a shared object.  The
@@ -3312,7 +3312,7 @@ xcoff_build_ldsyms (h, p)
 	 them.  This is confusing, but I haven't been able to think of
 	 a different approach.  Note that the symbols can, of course,
 	 be exported explicitly.  */
-      export = true;
+      export = TRUE;
       if ((h->root.type == bfd_link_hash_defined
 	   || h->root.type == bfd_link_hash_defweak)
 	  && h->root.u.def.section->owner != NULL
@@ -3326,7 +3326,7 @@ xcoff_build_ldsyms (h, p)
 	    {
 	      if ((member->flags & DYNAMIC) != 0)
 		{
-		  export = false;
+		  export = FALSE;
 		  break;
 		}
 	      member = bfd_openr_next_archived_file (arbfd, member);
@@ -3375,7 +3375,7 @@ xcoff_build_ldsyms (h, p)
       sec->_raw_size += bfd_xcoff_glink_code_size(ldinfo->output_bfd);
 
       /* The global linkage code requires a TOC entry for the
-         descriptor.  */
+	 descriptor.  */
       hds = h->descriptor;
       BFD_ASSERT ((hds->root.type == bfd_link_hash_undefined
 		   || hds->root.type == bfd_link_hash_undefweak)
@@ -3393,7 +3393,7 @@ xcoff_build_ldsyms (h, p)
 	  else if (bfd_xcoff_is_xcoff32 (ldinfo->output_bfd))
 	    byte_size = 4;
 	  else
-	    return false;
+	    return FALSE;
 
 	  hds->toc_section = xcoff_hash_table (ldinfo->info)->toc_section;
 	  hds->u.toc_offset = hds->toc_section->_raw_size;
@@ -3425,10 +3425,10 @@ xcoff_build_ldsyms (h, p)
 	  asection *sec;
 
 	  /* This is an undefined function descriptor associated with
-             a defined entry point.  We can build up a function
-             descriptor ourselves.  Believe it or not, the AIX linker
-             actually does this, and there are cases where we need to
-             do it as well.  */
+	     a defined entry point.  We can build up a function
+	     descriptor ourselves.  Believe it or not, the AIX linker
+	     actually does this, and there are cases where we need to
+	     do it as well.  */
 	  sec = xcoff_hash_table (ldinfo->info)->descriptor_section;
 	  h->root.type = bfd_link_hash_defined;
 	  h->root.u.def.section = sec;
@@ -3455,7 +3455,7 @@ xcoff_build_ldsyms (h, p)
 	    (_("warning: attempt to export undefined symbol `%s'"),
 	     h->root.root.string);
 	  h->ldsym = NULL;
-	  return true;
+	  return TRUE;
 	}
     }
 
@@ -3484,7 +3484,7 @@ xcoff_build_ldsyms (h, p)
       && (h->flags & XCOFF_EXPORT) == 0)
     {
       h->ldsym = NULL;
-      return true;
+      return TRUE;
     }
 
   /* We don't need to add this symbol if we did garbage collection and
@@ -3493,13 +3493,13 @@ xcoff_build_ldsyms (h, p)
       && (h->flags & XCOFF_MARK) == 0)
     {
       h->ldsym = NULL;
-      return true;
+      return TRUE;
     }
 
   /* We may have already processed this symbol due to the recursive
      call above.  */
   if ((h->flags & XCOFF_BUILT_LDSYM) != 0)
-    return true;
+    return TRUE;
 
   /* We need to add this symbol to the .loader symbols.  */
 
@@ -3508,8 +3508,8 @@ xcoff_build_ldsyms (h, p)
   h->ldsym = (struct internal_ldsym *) bfd_zalloc (ldinfo->output_bfd, amt);
   if (h->ldsym == NULL)
     {
-      ldinfo->failed = true;
-      return false;
+      ldinfo->failed = TRUE;
+      return FALSE;
     }
 
   if ((h->flags & XCOFF_IMPORT) != 0)
@@ -3521,21 +3521,20 @@ xcoff_build_ldsyms (h, p)
 
   ++ldinfo->ldsym_count;
 
-  if (false == bfd_xcoff_put_ldsymbol_name (ldinfo->output_bfd, ldinfo,
-					    h->ldsym,
-					    h->root.root.string))
+  if (! bfd_xcoff_put_ldsymbol_name (ldinfo->output_bfd, ldinfo,
+				     h->ldsym, h->root.root.string))
     {
-      return false;
+      return FALSE;
     }
 
   h->flags |= XCOFF_BUILT_LDSYM;
 
-  return true;
+  return TRUE;
 }
 
 /* Do the final link step.  */
 
-boolean
+bfd_boolean
 _bfd_xcoff_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3611,7 +3610,7 @@ _bfd_xcoff_bfd_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)
@@ -3651,49 +3650,49 @@ _bfd_xcoff_bfd_final_link (abfd, info)
       file_align = xcoff_hash_table (info)->file_align;
       if (file_align != 0)
 	{
-	  boolean saw_contents;
+	  bfd_boolean saw_contents;
 	  int indx;
 	  asection **op;
 	  file_ptr sofar;
-	  
+
 	  /* Insert .pad sections before every section which has
-             contents and is loaded, if it is preceded by some other
-             section which has contents and is loaded.  */
-	  saw_contents = true;
+	     contents and is loaded, if it is preceded by some other
+	     section which has contents and is loaded.  */
+	  saw_contents = TRUE;
 	  for (op = &abfd->sections; *op != NULL; op = &(*op)->next)
 	    {
 	      if (strcmp ((*op)->name, ".pad") == 0)
-		saw_contents = false;
+		saw_contents = FALSE;
 	      else if (((*op)->flags & SEC_HAS_CONTENTS) != 0
 		       && ((*op)->flags & SEC_LOAD) != 0)
 		{
 		  if (! saw_contents)
-		    saw_contents = true;
+		    saw_contents = TRUE;
 		  else
 		    {
 		      asection *n, **st;
-		      
+
 		      /* Create a pad section and place it before the section
-			 that needs padding.  This requires unlinking and 
+			 that needs padding.  This requires unlinking and
 			 relinking the bfd's section list.  */
-		      
+
 		      st = abfd->section_tail;
 		      n = bfd_make_section_anyway (abfd, ".pad");
 		      n->flags = SEC_HAS_CONTENTS;
-		      n->alignment_power = 0; 
+		      n->alignment_power = 0;
 
 		      BFD_ASSERT (*st == n);
 		      bfd_section_list_remove (abfd, st);
 		      bfd_section_list_insert (abfd, op, n);
 
 		      op = &n->next;
-		      saw_contents = false;
+		      saw_contents = FALSE;
 		    }
 		}
 	    }
-	  
+
 	  /* Reset the section indices after inserting the new
-             sections.  */
+	     sections.  */
 	  indx = 0;
 	  for (o = abfd->sections; o != NULL; o = o->next)
 	    {
@@ -3703,9 +3702,9 @@ _bfd_xcoff_bfd_final_link (abfd, info)
 	  BFD_ASSERT ((unsigned int) indx == abfd->section_count);
 
 	  /* Work out appropriate sizes for the .pad sections to force
-             each section to land on a page boundary.  This bit of
-             code knows what compute_section_file_positions is going
-             to do.  */
+	     each section to land on a page boundary.  This bit of
+	     code knows what compute_section_file_positions is going
+	     to do.  */
 	  sofar = bfd_coff_filhsz (abfd);
 	  sofar += bfd_coff_aoutsz (abfd);
 	  sofar += abfd->section_count * bfd_coff_scnhsz (abfd);
@@ -3775,8 +3774,8 @@ _bfd_xcoff_bfd_final_link (abfd, info)
       else
 	{
 	  /* A stripped file has no relocs.  However, we still
-             allocate the buffers, so that later code doesn't have to
-             worry about whether we are stripping or not.  */
+	     allocate the buffers, so that later code doesn't have to
+	     worry about whether we are stripping or not.  */
 	  if (info->strip == strip_all)
 	    o->rel_filepos = 0;
 	  else
@@ -3787,13 +3786,13 @@ _bfd_xcoff_bfd_final_link (abfd, info)
 	    }
 
 	  /* We don't know the indices of global symbols until we have
-             written out all the local symbols.  For each section in
-             the output file, we keep an array of pointers to hash
-             table entries.  Each entry in the array corresponds to a
-             reloc.  When we find a reloc against a global symbol, we
-             set the corresponding entry in this array so that we can
-             fix up the symbol index after we have written out all the
-             local symbols.
+	     written out all the local symbols.  For each section in
+	     the output file, we keep an array of pointers to hash
+	     table entries.  Each entry in the array corresponds to a
+	     reloc.  When we find a reloc against a global symbol, we
+	     set the corresponding entry in this array so that we can
+	     fix up the symbol index after we have written out all the
+	     local symbols.
 
 	     Because of this problem, we also keep the relocs in
 	     memory until the end of the link.  This wastes memory.
@@ -3850,7 +3849,7 @@ _bfd_xcoff_bfd_final_link (abfd, info)
     {
       bfd_size_type 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;
@@ -3903,7 +3902,7 @@ _bfd_xcoff_bfd_final_link (abfd, info)
 		{
 		  if (! xcoff_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
@@ -4142,7 +4141,7 @@ _bfd_xcoff_bfd_final_link (abfd, info)
      not try to write out the symbols.  */
   bfd_get_symcount (abfd) = 0;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (finfo.strtab != NULL)
@@ -4176,13 +4175,13 @@ _bfd_xcoff_bfd_final_link (abfd, info)
     free (finfo.external_relocs);
   if (external_relocs != NULL)
     free (external_relocs);
-  return false;
+  return FALSE;
 }
 
 /* Link an input file into the linker output file.  This function
    handles all the sections and relocations of the input file at once.  */
 
-static boolean
+static bfd_boolean
 xcoff_link_input_bfd (finfo, input_bfd)
      struct xcoff_final_link_info *finfo;
      bfd *input_bfd;
@@ -4192,7 +4191,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
   bfd_size_type syment_base;
   unsigned int n_tmask;
   unsigned int n_btshft;
-  boolean copy, hash;
+  bfd_boolean copy, hash;
   bfd_size_type isymesz;
   bfd_size_type osymesz;
   bfd_size_type linesz;
@@ -4207,13 +4206,13 @@ xcoff_link_input_bfd (finfo, input_bfd)
   bfd_byte *outsym;
   unsigned int incls;
   asection *oline;
-  boolean keep_syms;
+  bfd_boolean keep_syms;
   asection *o;
 
   /* We can just skip DYNAMIC files, unless this is a static link.  */
   if ((input_bfd->flags & DYNAMIC) != 0
       && ! finfo->info->static_link)
-    return true;
+    return TRUE;
 
   /* Move all the symbols to the output file.  */
 
@@ -4232,15 +4231,15 @@ xcoff_link_input_bfd (finfo, input_bfd)
 #define N_TMASK n_tmask
 #define N_BTSHFT n_btshft
 
-  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;
@@ -4260,14 +4259,14 @@ xcoff_link_input_bfd (finfo, input_bfd)
       struct internal_syment isym;
       union internal_auxent aux;
       int smtyp = 0;
-      boolean skip;
-      boolean require;
+      bfd_boolean skip;
+      bfd_boolean require;
       int add;
 
       bfd_coff_swap_sym_in (input_bfd, (PTR) esym, (PTR) isymp);
 
       /* If this is a C_EXT or C_HIDEXT symbol, we need the csect
-         information.  */
+	 information.  */
       if (isymp->n_sclass == C_EXT || isymp->n_sclass == C_HIDEXT)
 	{
 	  BFD_ASSERT (isymp->n_numaux > 0);
@@ -4287,9 +4286,9 @@ xcoff_link_input_bfd (finfo, input_bfd)
       isym = *isymp;
 
       /* If this symbol is in the .loader section, swap out the
-         .loader symbol information.  If this is an external symbol
-         reference to a defined symbol, though, then wait until we get
-         to the definition.  */
+	 .loader symbol information.  If this is an external symbol
+	 reference to a defined symbol, though, then wait until we get
+	 to the definition.  */
       if (isym.n_sclass == C_EXT
 	  && *sym_hash != NULL
 	  && (*sym_hash)->ldsym != NULL
@@ -4379,26 +4378,26 @@ xcoff_link_input_bfd (finfo, input_bfd)
 
       *indexp = -1;
 
-      skip = false;
-      require = false;
+      skip = FALSE;
+      require = FALSE;
       add = 1 + isym.n_numaux;
 
       /* If we are skipping this csect, we want to skip this symbol.  */
       if (*csectpp == NULL)
-	skip = true;
+	skip = TRUE;
 
       /* If we garbage collected this csect, we want to skip this
-         symbol.  */
+	 symbol.  */
       if (! skip
 	  && xcoff_hash_table (finfo->info)->gc
 	  && ((*csectpp)->flags & SEC_MARK) == 0
 	  && *csectpp != bfd_abs_section_ptr)
-	skip = true;
+	skip = TRUE;
 
       /* An XCOFF linker always skips C_STAT symbols.  */
       if (! skip
 	  && isymp->n_sclass == C_STAT)
-	skip = true;
+	skip = TRUE;
 
       /* We skip all but the first TOC anchor.  */
       if (! skip
@@ -4406,7 +4405,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	  && aux.x_csect.x_smclas == XMC_TC0)
 	{
 	  if (finfo->toc_symindx != -1)
-	    skip = true;
+	    skip = TRUE;
 	  else
 	    {
 	      bfd_vma tocval, tocend;
@@ -4418,11 +4417,11 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			- (*csectpp)->vma);
 
 	      /* We want to find out if tocval is a good value to use
-                 as the TOC anchor--that is, whether we can access all
-                 of the TOC using a 16 bit offset from tocval.  This
-                 test assumes that the TOC comes at the end of the
-                 output section, as it does in the default linker
-                 script.  */
+		 as the TOC anchor--that is, whether we can access all
+		 of the TOC using a 16 bit offset from tocval.  This
+		 test assumes that the TOC comes at the end of the
+		 output section, as it does in the default linker
+		 script.  */
 	      tocend = ((*csectpp)->output_section->vma
 			+ (*csectpp)->output_section->_raw_size);
 	      for (inp = finfo->info->input_bfds;
@@ -4449,7 +4448,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 		    (_("TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"),
 		     (unsigned long) (tocend - tocval));
 		  bfd_set_error (bfd_error_file_too_big);
-		  return false;
+		  return FALSE;
 		}
 
 	      if (tocval + 0x8000 < tocend)
@@ -4465,7 +4464,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	      xcoff_data (finfo->output_bfd)->toc = tocval;
 	      xcoff_data (finfo->output_bfd)->sntoc =
 		(*csectpp)->output_section->target_index;
-	      require = true;
+	      require = TRUE;
 
 	    }
 	}
@@ -4473,17 +4472,17 @@ xcoff_link_input_bfd (finfo, input_bfd)
       /* If we are stripping all symbols, we want to skip this one.  */
       if (! skip
 	  && finfo->info->strip == strip_all)
-	skip = true;
+	skip = TRUE;
 
       /* We can skip resolved external references.  */
       if (! skip
 	  && isym.n_sclass == C_EXT
 	  && smtyp == XTY_ER
 	  && (*sym_hash)->root.type != bfd_link_hash_undefined)
-	skip = true;
+	skip = TRUE;
 
       /* We can skip common symbols if they got defined somewhere
-         else.  */
+	 else.  */
       if (! skip
 	  && isym.n_sclass == C_EXT
 	  && smtyp == XTY_CM
@@ -4491,7 +4490,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	      || (*sym_hash)->root.u.c.p->section != *csectpp)
 	  && ((*sym_hash)->root.type != bfd_link_hash_defined
 	      || (*sym_hash)->root.u.def.section != *csectpp))
-	skip = true;
+	skip = TRUE;
 
       /* Skip local symbols if we are discarding them.  */
       if (! skip
@@ -4499,14 +4498,14 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	  && isym.n_sclass != C_EXT
 	  && (isym.n_sclass != C_HIDEXT
 	      || smtyp != XTY_SD))
-	skip = true;
+	skip = TRUE;
 
       /* If we stripping debugging symbols, and this is a debugging
-         symbol, then skip it.  */
+	 symbol, then skip it.  */
       if (! skip
 	  && finfo->info->strip == strip_debugger
 	  && isym.n_scnum == N_DEBUG)
-	skip = true;
+	skip = TRUE;
 
       /* If some symbols are stripped based on the name, work out the
 	 name and decide whether to skip this symbol.  We don't handle
@@ -4524,24 +4523,24 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	  name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
 
 	  if (name == NULL)
-	    return false;
+	    return FALSE;
 
 	  if ((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))
 	      || (finfo->info->discard == discard_l
 		  && (isym.n_sclass != C_EXT
 		      && (isym.n_sclass != C_HIDEXT
 			  || smtyp != XTY_SD))
 		  && bfd_is_local_label_name (input_bfd, name)))
-	    skip = true;
+	    skip = TRUE;
 	}
 
       /* We can not skip the first TOC anchor.  */
       if (skip
 	  && require
 	  && finfo->info->strip != strip_all)
-	skip = false;
+	skip = FALSE;
 
       /* We now know whether we are to skip this symbol or not.  */
       if (! skip)
@@ -4565,10 +4564,10 @@ xcoff_link_input_bfd (finfo, input_bfd)
 							 (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;
 		}
 	    }
@@ -4622,7 +4621,7 @@ xcoff_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;
 		    }
 		}
 
@@ -4631,8 +4630,8 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	    }
 
 	  /* The value of a C_BINCL or C_EINCL symbol is a file offset
-             into the line numbers.  We update the symbol values when
-             we handle the line numbers.  */
+	     into the line numbers.  We update the symbol values when
+	     we handle the line numbers.  */
 	  if (isym.n_sclass == C_BINCL
 	      || isym.n_sclass == C_EINCL)
 	    {
@@ -4659,8 +4658,8 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	    }
 
 	  /* If this is a symbol in the TOC which we may have merged
-             (class XMC_TC), remember the symbol index of the TOC
-             symbol.  */
+	     (class XMC_TC), remember the symbol index of the TOC
+	     symbol.  */
 	  if (isym.n_sclass == C_HIDEXT
 	      && aux.x_csect.x_smclas == XMC_TC
 	      && *sym_hash != NULL)
@@ -4715,7 +4714,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	      bfd_vma indx;
 
 	      /* The value of a C_BSTAT symbol is the symbol table
-                 index of the containing csect.  */
+		 index of the containing csect.  */
 	      bfd_coff_swap_sym_in (output_bfd, (PTR) outsym, (PTR) &isym);
 	      indx = isym.n_value;
 	      if (indx < obj_raw_syment_count (input_bfd))
@@ -4760,13 +4759,13 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			{
 			  strings = _bfd_coff_read_string_table (input_bfd);
 			  if (strings == NULL)
-			    return false;
+			    return FALSE;
 			}
 		      filename = strings + aux.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;
 		      aux.x_file.x_n.x_offset = STRING_SIZE_SIZE + indx;
 		    }
 		}
@@ -4776,10 +4775,10 @@ xcoff_link_input_bfd (finfo, input_bfd)
 		{
 
 		  /* We don't support type checking.  I don't know if
-                     anybody does.  */
+		     anybody does.  */
 		  aux.x_csect.x_parmhash = 0;
 		  /* I don't think anybody uses these fields, but we'd
-                     better clobber them just in case.  */
+		     better clobber them just in case.  */
 		  aux.x_csect.x_stab = 0;
 		  aux.x_csect.x_snstab = 0;
 
@@ -4818,9 +4817,9 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			  && indx < obj_raw_syment_count (input_bfd))
 			{
 			  /* We look forward through the symbol for
-                             the index of the next symbol we are going
-                             to include.  I don't know if this is
-                             entirely right.  */
+			     the index of the next symbol we are going
+			     to include.  I don't know if this is
+			     entirely right.  */
 			  while (finfo->sym_indices[indx] < 0
 				 && indx < obj_raw_syment_count (input_bfd))
 			    ++indx;
@@ -4877,7 +4876,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			  if (bfd_seek (input_bfd, pos, SEEK_SET) != 0
 			      || (bfd_bread (finfo->linenos, amt, input_bfd)
 				  != amt))
-			    return false;
+			    return FALSE;
 			  oline = enclosing;
 			}
 
@@ -4937,7 +4936,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			      || (bfd_bwrite (finfo->linenos + linoff,
 					     linesz * count, output_bfd)
 				  != linesz * count))
-			    return false;
+			    return FALSE;
 
 			  o->output_section->lineno_count += count;
 
@@ -4949,8 +4948,8 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			      int iiadd;
 
 			      /* Update any C_BINCL or C_EINCL symbols
-                                 that refer to a line number in the
-                                 range we just output.  */
+				 that refer to a line number in the
+				 range we just output.  */
 			      iisp = finfo->internal_syms;
 			      iispend = (iisp
 					 + obj_raw_syment_count (input_bfd));
@@ -5028,7 +5027,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
       bfd_size_type 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)
@@ -5039,7 +5038,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 
   /* Don't let the linker relocation routines discard the symbols.  */
   keep_syms = obj_coff_keep_syms (input_bfd);
-  obj_coff_keep_syms (input_bfd) = true;
+  obj_coff_keep_syms (input_bfd) = TRUE;
 
   /* Relocate the contents of each section.  */
   for (o = input_bfd->sections; o != NULL; o = o->next)
@@ -5066,7 +5065,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
       else {
 	if (! bfd_get_section_contents (input_bfd, o, finfo->contents,
 					(file_ptr) 0, o->_raw_size))
-	  return false;
+	  return FALSE;
 	contents = finfo->contents;
       }
 
@@ -5083,12 +5082,12 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	  /* Read in the relocs.  */
 	  target_index = o->output_section->target_index;
 	  internal_relocs = (xcoff_read_internal_relocs
-			     (input_bfd, o, false, finfo->external_relocs,
-			      true,
+			     (input_bfd, o, FALSE, finfo->external_relocs,
+			      TRUE,
 			      (finfo->section_info[target_index].relocs
 			       + o->output_section->reloc_count)));
 	  if (internal_relocs == NULL)
-	    return false;
+	    return FALSE;
 
 	  /* Call processor specific code to relocate the section
 	     contents.  */
@@ -5098,7 +5097,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 					   internal_relocs,
 					   finfo->internal_syms,
 					   xcoff_data (input_bfd)->csects))
-	    return false;
+	    return FALSE;
 
 	  offset = o->output_section->vma + o->output_offset - o->vma;
 	  irel = internal_relocs;
@@ -5109,7 +5108,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 	    {
 	      struct xcoff_link_hash_entry *h = NULL;
 	      struct internal_ldrel ldrel;
-	      boolean quiet;
+	      bfd_boolean quiet;
 
 	      *rel_hash = NULL;
 
@@ -5153,7 +5152,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			  n = ((struct xcoff_toc_rel_hash *)
 			       bfd_alloc (finfo->output_bfd, amt));
 			  if (n == NULL)
-			    return false;
+			    return FALSE;
 			  si = finfo->section_info + target_index;
 			  n->next = si->toc_rel_hashes;
 			  n->h = h;
@@ -5233,17 +5232,17 @@ xcoff_link_input_bfd (finfo, input_bfd)
 				  (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;
 			}
 		    }
 		}
 
-	      quiet = false;
+	      quiet = FALSE;
 	      switch (irel->r_type)
 		{
 		default:
@@ -5290,7 +5289,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			     bfd_archive_filename (input_bfd),
 			     sec->name);
 			  bfd_set_error (bfd_error_nonrepresentable_section);
-			  return false;
+			  return FALSE;
 			}
 		    }
 		  else
@@ -5303,7 +5302,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			     callback for this relocation, in
 			     _bfd_ppc_xcoff_relocate_section.  Don't
 			     issue any more warnings.  */
-			  quiet = true;
+			  quiet = TRUE;
 			}
 		      if (h->ldindx < 0 && ! quiet)
 			{
@@ -5312,7 +5311,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			     bfd_archive_filename (input_bfd),
 			     h->root.root.string);
 			  bfd_set_error (bfd_error_bad_value);
-			  return false;
+			  return FALSE;
 			}
 		      ldrel.l_symndx = h->ldindx;
 		    }
@@ -5328,7 +5327,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			 bfd_get_section_name (finfo->output_bfd,
 					       o->output_section));
 		      bfd_set_error (bfd_error_invalid_operation);
-		      return false;
+		      return FALSE;
 		    }
 		  bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel,
 					    finfo->ldrel);
@@ -5356,7 +5355,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 				      (o->_cooked_size != 0
 				       ? o->_cooked_size
 				       : o->_raw_size)))
-	return false;
+	return FALSE;
     }
 
   obj_coff_keep_syms (input_bfd) = keep_syms;
@@ -5364,10 +5363,10 @@ xcoff_link_input_bfd (finfo, input_bfd)
   if (! finfo->info->keep_memory)
     {
       if (! _bfd_coff_free_symbols (input_bfd))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 #undef N_TMASK
@@ -5376,7 +5375,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 /* Write out a non-XCOFF global symbol.  */
 
 
-static boolean
+static bfd_boolean
 xcoff_write_global_symbol (h, inf)
      struct xcoff_link_hash_entry *h;
      PTR inf;
@@ -5386,7 +5385,7 @@ xcoff_write_global_symbol (h, inf)
   bfd_byte *outsym;
   struct internal_syment isym;
   union internal_auxent aux;
-  boolean result;
+  bfd_boolean result;
   file_ptr pos;
   bfd_size_type amt;
 
@@ -5397,13 +5396,13 @@ xcoff_write_global_symbol (h, inf)
     {
       h = (struct xcoff_link_hash_entry *) h->root.u.i.link;
       if (h->root.type == bfd_link_hash_new)
-	return true;
+	return TRUE;
     }
 
   /* If this symbol was garbage collected, just skip it.  */
   if (xcoff_hash_table (finfo->info)->gc
       && (h->flags & XCOFF_MARK) == 0)
-    return true;
+    return TRUE;
 
   /* If we need a .loader section entry, write it out.  */
   if (h->ldsym != NULL)
@@ -5625,7 +5624,7 @@ xcoff_write_global_symbol (h, inf)
 	}
       else
 	{
-	  return false;
+	  return FALSE;
 	}
       irel->r_type = R_POS;
       finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
@@ -5645,10 +5644,8 @@ xcoff_write_global_symbol (h, inf)
 
 	  result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab,
 					      &irsym, h->root.root.string);
-	  if (false == result)
-	    {
-	      return false;
-	    }
+	  if (!result)
+	    return FALSE;
 
 	  irsym.n_value = irel->r_vaddr;
 	  irsym.n_scnum = osec->target_index;
@@ -5674,7 +5671,7 @@ xcoff_write_global_symbol (h, inf)
 	      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;
 	      obj_raw_syment_count (output_bfd) +=
 		(outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd);
 
@@ -5721,7 +5718,7 @@ xcoff_write_global_symbol (h, inf)
 	}
       else
 	{
-	  return false;
+	  return FALSE;
 	}
 
       sec = h->root.u.def.section;
@@ -5759,7 +5756,7 @@ xcoff_write_global_symbol (h, inf)
 	     bfd_get_filename (output_bfd),
 	     esec->output_section->name);
 	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return false;
+	  return FALSE;
 	}
       ldrel.l_rtype = (reloc_size << 8) | R_POS;
       ldrel.l_rsecnm = oindx;
@@ -5821,7 +5818,7 @@ xcoff_write_global_symbol (h, inf)
 	     bfd_get_filename (output_bfd),
 	     tsec->output_section->name);
 	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return false;
+	  return FALSE;
 	}
       ldrel.l_rtype = (reloc_size << 8) | R_POS;
       ldrel.l_rsecnm = oindx;
@@ -5832,24 +5829,24 @@ xcoff_write_global_symbol (h, inf)
   if (h->indx >= 0 || finfo->info->strip == strip_all)
     {
       BFD_ASSERT (outsym == finfo->outsyms);
-      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) == NULL)))
+				  FALSE, FALSE) == NULL)))
     {
       BFD_ASSERT (outsym == finfo->outsyms);
-      return true;
+      return TRUE;
     }
 
   if (h->indx != -2
       && (h->flags & (XCOFF_REF_REGULAR | XCOFF_DEF_REGULAR)) == 0)
     {
       BFD_ASSERT (outsym == finfo->outsyms);
-      return true;
+      return TRUE;
     }
 
   memset (&aux, 0, sizeof aux);
@@ -5858,10 +5855,8 @@ xcoff_write_global_symbol (h, inf)
 
   result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab, &isym,
 				      h->root.root.string);
-  if (false == result)
-    {
-      return false;
-    }
+  if (!result)
+    return FALSE;
 
   if (h->root.type == bfd_link_hash_undefined
       || h->root.type == bfd_link_hash_undefweak)
@@ -5957,16 +5952,16 @@ xcoff_write_global_symbol (h, inf)
   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;
   obj_raw_syment_count (output_bfd) +=
     (outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd);
 
-  return true;
+  return TRUE;
 }
 
 /* Handle a link order which is supposed to generate a reloc.  */
 
-static boolean
+static bfd_boolean
 xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
      bfd *output_bfd;
      struct xcoff_final_link_info *finfo;
@@ -5985,9 +5980,9 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
   if (link_order->type == bfd_section_reloc_link_order)
     {
       /* We need to somehow locate a symbol in the right section.  The
-         symbol must either have a value of zero, or we must adjust
-         the addend by the value of the symbol.  FIXME: Write this
-         when we need it.  The old linker couldn't handle this anyhow.  */
+	 symbol must either have a value of zero, or we must adjust
+	 the addend by the value of the symbol.  FIXME: Write this
+	 when we need it.  The old linker couldn't handle this anyhow.  */
       abort ();
     }
 
@@ -5995,20 +5990,20 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
   if (howto == NULL)
     {
       bfd_set_error (bfd_error_bad_value);
-      return false;
+      return FALSE;
     }
 
   h = ((struct xcoff_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 (! ((*finfo->info->callbacks->unattached_reloc)
 	     (finfo->info, link_order->u.reloc.p->u.name, (bfd *) NULL,
 	      (asection *) NULL, (bfd_vma) 0)))
-	return false;
-      return true;
+	return FALSE;
+      return TRUE;
     }
 
   if (h->root.type == bfd_link_hash_common)
@@ -6039,12 +6034,12 @@ xcoff_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;
 
       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, addend, buf);
       switch (rstat)
@@ -6061,7 +6056,7 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
 		  (bfd_vma) 0)))
 	    {
 	      free (buf);
-	      return false;
+	      return FALSE;
 	    }
 	  break;
 	}
@@ -6069,7 +6064,7 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
 				     (file_ptr) link_order->offset, size);
       free (buf);
       if (! ok)
-	return false;
+	return FALSE;
     }
 
   /* Store the reloc information in the right place.  It will get
@@ -6124,7 +6119,7 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
 	    (_("%s: loader reloc in unrecognized section `%s'"),
 	     bfd_get_filename (output_bfd), secname);
 	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return false;
+	  return FALSE;
 	}
     }
   else
@@ -6136,7 +6131,7 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
 	     bfd_get_filename (output_bfd),
 	     h->root.root.string);
 	  bfd_set_error (bfd_error_bad_value);
-	  return false;
+	  return FALSE;
 	}
       ldrel.l_symndx = h->ldindx;
     }
@@ -6146,7 +6141,7 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
   bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
   finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
 
-  return true;
+  return TRUE;
 }
 
 /* Sort relocs by VMA.  This is called via qsort.  */
diff --git a/bfd/xsym.c b/bfd/xsym.c
index e6b3c4b11d5..65475742f13 100644
--- a/bfd/xsym.c
+++ b/bfd/xsym.c
@@ -92,11 +92,11 @@ compute_offset (first_page, page_size, entry_size, index)
   return (page_number * page_size) + page_offset;
 }
 
-boolean
+bfd_boolean
 bfd_sym_mkobject (abfd)
      bfd *abfd ATTRIBUTE_UNUSED;
 {
-  return (boolean) true;
+  return 1;
 }
 
 void
@@ -109,7 +109,7 @@ bfd_sym_print_symbol (abfd, afile, symbol, how)
   return;
 }
 
-boolean
+bfd_boolean
 bfd_sym_valid (abfd)
      bfd *abfd;
 {
@@ -242,7 +242,7 @@ bfd_sym_read_header (abfd, header, version)
       return bfd_sym_read_header_v32 (abfd, header);
     case BFD_SYM_VERSION_3_1:
     default:
-      return false;
+      return FALSE;
     }
 }
 
@@ -2423,7 +2423,7 @@ bfd_sym_get_symtab (abfd, sym)
 int
 bfd_sym_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
 }
diff --git a/bfd/xsym.h b/bfd/xsym.h
index a381c5538d3..8108e71fa83 100644
--- a/bfd/xsym.h
+++ b/bfd/xsym.h
@@ -545,157 +545,157 @@ struct bfd_sym_data_struct
 };
 typedef struct bfd_sym_data_struct bfd_sym_data_struct;
 
-extern boolean               bfd_sym_mkobject
+extern bfd_boolean bfd_sym_mkobject
   PARAMS ((bfd *));
-extern void                  bfd_sym_print_symbol
+extern void bfd_sym_print_symbol
   PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-extern boolean               bfd_sym_valid
+extern bfd_boolean bfd_sym_valid
   PARAMS ((bfd *));
-extern unsigned char *       bfd_sym_read_name_table
+extern unsigned char * bfd_sym_read_name_table
   PARAMS ((bfd *, bfd_sym_header_block *));
-extern void                  bfd_sym_parse_file_reference_v32
+extern void bfd_sym_parse_file_reference_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_file_reference *));
-extern void                  bfd_sym_parse_disk_table_v32
+extern void bfd_sym_parse_disk_table_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_table_info *));
-extern void                  bfd_sym_parse_header_v32
+extern void bfd_sym_parse_header_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_header_block *));
-extern int                   bfd_sym_read_header_v32
+extern int bfd_sym_read_header_v32
   PARAMS ((bfd *, bfd_sym_header_block *));
-extern int                   bfd_sym_read_header_v34
+extern int bfd_sym_read_header_v34
   PARAMS ((bfd *, bfd_sym_header_block *));
-extern int                   bfd_sym_read_header
+extern int bfd_sym_read_header
   PARAMS ((bfd *, bfd_sym_header_block *, bfd_sym_version));
-extern int                   bfd_sym_read_version
+extern int bfd_sym_read_version
   PARAMS ((bfd *, bfd_sym_version *));
-extern void                  bfd_sym_display_table_summary
+extern void bfd_sym_display_table_summary
   PARAMS ((FILE *, bfd_sym_table_info *, const char *));
-extern void                  bfd_sym_display_header
+extern void bfd_sym_display_header
   PARAMS ((FILE *, bfd_sym_header_block *));
-extern void                  bfd_sym_parse_resources_table_entry_v32
+extern void bfd_sym_parse_resources_table_entry_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_resources_table_entry *));
-extern void                  bfd_sym_parse_modules_table_entry_v33
+extern void bfd_sym_parse_modules_table_entry_v33
   PARAMS ((unsigned char *, size_t, bfd_sym_modules_table_entry *));
-extern void                  bfd_sym_parse_file_references_table_entry_v32
+extern void bfd_sym_parse_file_references_table_entry_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_file_references_table_entry *));
-extern void                  bfd_sym_parse_contained_modules_table_entry_v32
+extern void bfd_sym_parse_contained_modules_table_entry_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_contained_modules_table_entry *));
-extern void                  bfd_sym_parse_contained_variables_table_entry_v32
+extern void bfd_sym_parse_contained_variables_table_entry_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_contained_variables_table_entry *));
-extern void                  bfd_sym_parse_contained_statements_table_entry_v32
+extern void bfd_sym_parse_contained_statements_table_entry_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_contained_statements_table_entry *));
-extern void                  bfd_sym_parse_contained_labels_table_entry_v32
+extern void bfd_sym_parse_contained_labels_table_entry_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_contained_labels_table_entry *));
-extern void                  bfd_sym_parse_type_table_entry_v32
+extern void bfd_sym_parse_type_table_entry_v32
   PARAMS ((unsigned char *, size_t, bfd_sym_type_table_entry *));
-extern int                   bfd_sym_fetch_resources_table_entry
+extern int bfd_sym_fetch_resources_table_entry
   PARAMS ((bfd *, bfd_sym_resources_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_modules_table_entry
+extern int bfd_sym_fetch_modules_table_entry
   PARAMS ((bfd *, bfd_sym_modules_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_file_references_table_entry
+extern int bfd_sym_fetch_file_references_table_entry
   PARAMS ((bfd *, bfd_sym_file_references_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_contained_modules_table_entry
+extern int bfd_sym_fetch_contained_modules_table_entry
   PARAMS ((bfd *, bfd_sym_contained_modules_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_contained_variables_table_entry
+extern int bfd_sym_fetch_contained_variables_table_entry
   PARAMS ((bfd *, bfd_sym_contained_variables_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_contained_statements_table_entry
+extern int bfd_sym_fetch_contained_statements_table_entry
   PARAMS ((bfd *, bfd_sym_contained_statements_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_contained_labels_table_entry
+extern int bfd_sym_fetch_contained_labels_table_entry
   PARAMS ((bfd *, bfd_sym_contained_labels_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_contained_types_table_entry
+extern int bfd_sym_fetch_contained_types_table_entry
   PARAMS ((bfd *, bfd_sym_contained_types_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_file_references_index_table_entry
+extern int bfd_sym_fetch_file_references_index_table_entry
   PARAMS ((bfd *, bfd_sym_file_references_index_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_constant_pool_entry
+extern int bfd_sym_fetch_constant_pool_entry
   PARAMS ((bfd *, bfd_sym_constant_pool_entry *, unsigned long));
-extern int                   bfd_sym_fetch_type_table_entry
+extern int bfd_sym_fetch_type_table_entry
   PARAMS ((bfd *, bfd_sym_type_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_type_information_table_entry
+extern int bfd_sym_fetch_type_information_table_entry
   PARAMS ((bfd *, bfd_sym_type_information_table_entry *, unsigned long));
-extern int                   bfd_sym_fetch_type_table_information
+extern int bfd_sym_fetch_type_table_information
   PARAMS ((bfd *, bfd_sym_type_information_table_entry *, unsigned long));
 extern const unsigned char * bfd_sym_symbol_name
   PARAMS ((bfd *, unsigned long));
 extern const unsigned char * bfd_sym_module_name
   PARAMS ((bfd *, unsigned long));
-extern const char *          bfd_sym_unparse_storage_kind
+extern const char * bfd_sym_unparse_storage_kind
   PARAMS ((enum bfd_sym_storage_kind));
-extern const char *          bfd_sym_unparse_storage_class
+extern const char * bfd_sym_unparse_storage_class
   PARAMS ((enum bfd_sym_storage_class));
-extern const char *          bfd_sym_unparse_module_kind
+extern const char * bfd_sym_unparse_module_kind
   PARAMS ((enum bfd_sym_module_kind));
-extern const char *          bfd_sym_unparse_symbol_scope
+extern const char * bfd_sym_unparse_symbol_scope
   PARAMS ((enum bfd_sym_symbol_scope));
-extern void                  bfd_sym_print_file_reference
+extern void bfd_sym_print_file_reference
   PARAMS ((bfd *, FILE *, bfd_sym_file_reference *));
-extern void                  bfd_sym_print_resources_table_entry
+extern void bfd_sym_print_resources_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_resources_table_entry *));
-extern void                  bfd_sym_print_modules_table_entry
+extern void bfd_sym_print_modules_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_modules_table_entry *));
-extern void                  bfd_sym_print_file_references_table_entry
+extern void bfd_sym_print_file_references_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_file_references_table_entry *));
-extern void                  bfd_sym_print_contained_modules_table_entry
+extern void bfd_sym_print_contained_modules_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_contained_modules_table_entry *));
-extern void                  bfd_sym_print_contained_variables_table_entry
+extern void bfd_sym_print_contained_variables_table_entry
   PARAMS ((bfd *, FILE *f, bfd_sym_contained_variables_table_entry *));
-extern void                  bfd_sym_print_contained_statements_table_entry
+extern void bfd_sym_print_contained_statements_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_contained_statements_table_entry *));
-extern void                  bfd_sym_print_contained_labels_table_entry
+extern void bfd_sym_print_contained_labels_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_contained_labels_table_entry *));
-extern void                  bfd_sym_print_contained_types_table_entry
+extern void bfd_sym_print_contained_types_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_contained_types_table_entry *));
-extern const char *          bfd_sym_type_operator_name
+extern const char * bfd_sym_type_operator_name
   PARAMS ((unsigned char));
-extern const char *          bfd_sym_type_basic_name
+extern const char * bfd_sym_type_basic_name
   PARAMS ((unsigned char));
-extern int                   bfd_sym_fetch_long
+extern int bfd_sym_fetch_long
   PARAMS ((unsigned char *, unsigned long, unsigned long, unsigned long *, long *));
-extern void                  bfd_sym_print_type_information
+extern void bfd_sym_print_type_information
   PARAMS ((bfd *, FILE *, unsigned char *, unsigned long, unsigned long, unsigned long *));
-extern void                  bfd_sym_print_type_information_table_entry
+extern void bfd_sym_print_type_information_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_type_information_table_entry *));
-extern void                  bfd_sym_print_file_references_index_table_entry
+extern void bfd_sym_print_file_references_index_table_entry
   PARAMS ((bfd *, FILE *, bfd_sym_file_references_index_table_entry *));
-extern void                  bfd_sym_print_constant_pool_entry
+extern void bfd_sym_print_constant_pool_entry
   PARAMS ((bfd *, FILE *, bfd_sym_constant_pool_entry *));
-extern unsigned char *       bfd_sym_display_name_table_entry
+extern unsigned char * bfd_sym_display_name_table_entry
   PARAMS ((bfd *, FILE *, unsigned char *));
-extern void                  bfd_sym_display_name_table
+extern void bfd_sym_display_name_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_resources_table
+extern void bfd_sym_display_resources_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_modules_table
+extern void bfd_sym_display_modules_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_file_references_table
+extern void bfd_sym_display_file_references_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_contained_modules_table
+extern void bfd_sym_display_contained_modules_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_contained_variables_table
+extern void bfd_sym_display_contained_variables_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_contained_statements_table
+extern void bfd_sym_display_contained_statements_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_contained_labels_table
+extern void bfd_sym_display_contained_labels_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_contained_types_table
+extern void bfd_sym_display_contained_types_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_file_references_index_table
+extern void bfd_sym_display_file_references_index_table
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_constant_pool
+extern void bfd_sym_display_constant_pool
   PARAMS ((bfd *, FILE *));
-extern void                  bfd_sym_display_type_information_table
+extern void bfd_sym_display_type_information_table
   PARAMS ((bfd *, FILE *));
-extern int                   bfd_sym_scan
+extern int bfd_sym_scan
   PARAMS ((bfd *, bfd_sym_version, bfd_sym_data_struct *));
-extern const bfd_target *    bfd_sym_object_p
+extern const bfd_target * bfd_sym_object_p
   PARAMS ((bfd *));
-extern asymbol *             bfd_sym_make_empty_symbol
+extern asymbol * bfd_sym_make_empty_symbol
   PARAMS ((bfd *));
-extern void                  bfd_sym_get_symbol_info
+extern void bfd_sym_get_symbol_info
   PARAMS ((bfd *, asymbol *, symbol_info *));
-extern long                  bfd_sym_get_symtab_upper_bound
+extern long bfd_sym_get_symtab_upper_bound
   PARAMS ((bfd *));
-extern long                  bfd_sym_get_symtab
+extern long bfd_sym_get_symtab
   PARAMS ((bfd *, asymbol **));
-extern int                   bfd_sym_sizeof_headers
-  PARAMS ((bfd *, boolean));
+extern int bfd_sym_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
 
 #endif /* __xSYM_H__ */