diff -u binutils-2.28.90.20170718/debian/changelog binutils-2.28.90.20170718/debian/changelog
--- binutils-2.28.90.20170718/debian/changelog
+++ binutils-2.28.90.20170718/debian/changelog
@@ -1,3 +1,9 @@
+binutils (2.28.90.20170718-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Hack out a change to readelf that breaks diffoscope. 
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 24 Jul 2017 13:54:21 +1200
+
 binutils (2.28.90.20170718-0ubuntu1) artful; urgency=medium
 
   * Snapshot, taken from the 2.29 branch (20170718).
diff -u binutils-2.28.90.20170718/debian/patches/series binutils-2.28.90.20170718/debian/patches/series
--- binutils-2.28.90.20170718/debian/patches/series
+++ binutils-2.28.90.20170718/debian/patches/series
@@ -16,6 +16,7 @@
 157_ar_scripts_with_tilde.patch
 #158_ld_system_root.patch
 161_gold_dummy_zoption.diff
+165_readelf_bool_handling.diff
 
 # only applied for GFDL builds
 164_ld_doc_remove_xref.diff
only in patch2:
unchanged:
--- binutils-2.28.90.20170718.orig/debian/patches/165_readelf_bool_handling.diff
+++ binutils-2.28.90.20170718/debian/patches/165_readelf_bool_handling.diff
@@ -0,0 +1,4382 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 165_readelf_bool_handling.diff.dpatch by  <Michael Hudson-Doyle <michael.hudson@ubuntu.com>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
+@@ -198,27 +198,27 @@
+ static Elf_Internal_Phdr * program_headers;
+ static Elf_Internal_Dyn *  dynamic_section;
+ static elf_section_list * symtab_shndx_list;
+-static bfd_boolean show_name = FALSE;
+-static bfd_boolean do_dynamic = FALSE;
+-static bfd_boolean do_syms = FALSE;
+-static bfd_boolean do_dyn_syms = FALSE;
+-static bfd_boolean do_reloc = FALSE;
+-static bfd_boolean do_sections = FALSE;
+-static bfd_boolean do_section_groups = FALSE;
+-static bfd_boolean do_section_details = FALSE;
+-static bfd_boolean do_segments = FALSE;
+-static bfd_boolean do_unwind = FALSE;
+-static bfd_boolean do_using_dynamic = FALSE;
+-static bfd_boolean do_header = FALSE;
+-static bfd_boolean do_dump = FALSE;
+-static bfd_boolean do_version = FALSE;
+-static bfd_boolean do_histogram = FALSE;
+-static bfd_boolean do_debugging = FALSE;
+-static bfd_boolean do_arch = FALSE;
+-static bfd_boolean do_notes = FALSE;
+-static bfd_boolean do_archive_index = FALSE;
+-static bfd_boolean is_32bit_elf = FALSE;
+-static bfd_boolean decompress_dumps = FALSE;
++static int show_name;
++static int do_dynamic;
++static int do_syms;
++static int do_dyn_syms;
++static int do_reloc;
++static int do_sections;
++static int do_section_groups;
++static int do_section_details;
++static int do_segments;
++static int do_unwind;
++static int do_using_dynamic;
++static int do_header;
++static int do_dump;
++static int do_version;
++static int do_histogram;
++static int do_debugging;
++static int do_arch;
++static int do_notes;
++static int do_archive_index;
++static int is_32bit_elf;
++static int decompress_dumps;
+ 
+ struct group_list
+ {
+@@ -290,9 +290,11 @@
+   symbol_public
+ };
+ 
+-static const char * get_symbol_version_string
+-  (FILE *, bfd_boolean, const char *, unsigned long, unsigned,
+-   Elf_Internal_Sym *, enum versioned_symbol_info *, unsigned short *);
++static const char *get_symbol_version_string
++  (FILE *file, int is_dynsym, const char *strtab,
++   unsigned long int strtab_size, unsigned int si,
++   Elf_Internal_Sym *psym, enum versioned_symbol_info *sym_info,
++   unsigned short *vna_other);
+ 
+ #define UNKNOWN -1
+ 
+@@ -416,19 +418,19 @@
+   return mvar;
+ }
+ 
+-/* Print a VMA value in the MODE specified.
+-   Returns the number of characters displayed.  */
++/* Print a VMA value.  */
+ 
+-static unsigned int
++static int
+ print_vma (bfd_vma vma, print_mode mode)
+ {
+-  unsigned int nc = 0;
++  int nc = 0;
+ 
+   switch (mode)
+     {
+     case FULL_HEX:
+       nc = printf ("0x");
+       /* Fall through.  */
++
+     case LONG_HEX:
+ #ifdef BFD64
+       if (is_32bit_elf)
+@@ -441,9 +443,11 @@
+       if (vma <= 99999)
+ 	return printf ("%5" BFD_VMA_FMT "d", vma);
+       /* Fall through.  */
++
+     case PREFIX_HEX:
+       nc = printf ("0x");
+       /* Fall through.  */
++
+     case HEX:
+       return nc + printf ("%" BFD_VMA_FMT "x", vma);
+ 
+@@ -452,11 +456,8 @@
+ 
+     case UNSIGNED:
+       return printf ("%" BFD_VMA_FMT "u", vma);
+-
+-    default:
+-      /* FIXME: Report unrecognised mode ?  */
+-      return 0;
+     }
++  return 0;
+ }
+ 
+ /* Display a symbol on stdout.  Handles the display of control characters and
+@@ -470,14 +471,14 @@
+    Returns the number of emitted characters.  */
+ 
+ static unsigned int
+-print_symbol (signed int width, const char *symbol)
++print_symbol (int width, const char *symbol)
+ {
+   bfd_boolean extra_padding = FALSE;
+-  signed int num_printed = 0;
++  int num_printed = 0;
+ #ifdef HAVE_MBSTATE_T
+   mbstate_t state;
+ #endif
+-  unsigned int width_remaining;
++  int width_remaining;
+ 
+   if (width < 0)
+     {
+@@ -689,22 +690,22 @@
+   return find_section (name);
+ }
+ 
+-/* Read an unsigned LEB128 encoded value from DATA.
+-   Set *LENGTH_RETURN to the number of bytes read.  */
++/* Read an unsigned LEB128 encoded value from p.  Set *PLEN to the number of
++   bytes read.  */
+ 
+ static inline unsigned long
+-read_uleb128 (unsigned char * data,
+-	      unsigned int * length_return,
++read_uleb128 (unsigned char *data,
++	      unsigned int *length_return,
+ 	      const unsigned char * const end)
+ {
+   return read_leb128 (data, length_return, FALSE, end);
+ }
+ 
+-/* Return TRUE if the current file is for IA-64 machine and OpenVMS ABI.
++/* Return true if the current file is for IA-64 machine and OpenVMS ABI.
+    This OS has so many departures from the ELF standard that we test it at
+    many places.  */
+ 
+-static inline bfd_boolean
++static inline int
+ is_ia64_vms (void)
+ {
+   return elf_header.e_machine == EM_IA_64
+@@ -713,7 +714,7 @@
+ 
+ /* Guess the relocation size commonly used by the specific machines.  */
+ 
+-static bfd_boolean
++static int
+ guess_is_rela (unsigned int e_machine)
+ {
+   switch (e_machine)
+@@ -836,13 +837,7 @@
+     }
+ }
+ 
+-/* Load RELA type relocations from FILE at REL_OFFSET extending for REL_SIZE bytes.
+-   Returns TRUE upon success, FALSE otherwise.  If successful then a
+-   pointer to a malloc'ed buffer containing the relocs is placed in *RELASP,
+-   and the number of relocs loaded is placed in *NRELASP.  It is the caller's
+-   responsibility to free the allocated buffer.  */
+-
+-static bfd_boolean
++static int
+ slurp_rela_relocs (FILE * file,
+ 		   unsigned long rel_offset,
+ 		   unsigned long rel_size,
+@@ -860,7 +855,7 @@
+       erelas = (Elf32_External_Rela *) get_data (NULL, file, rel_offset, 1,
+                                                  rel_size, _("32-bit relocation data"));
+       if (!erelas)
+-	return FALSE;
++	return 0;
+ 
+       nrelas = rel_size / sizeof (Elf32_External_Rela);
+ 
+@@ -871,7 +866,7 @@
+ 	{
+ 	  free (erelas);
+ 	  error (_("out of memory parsing relocs\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       for (i = 0; i < nrelas; i++)
+@@ -890,7 +885,7 @@
+       erelas = (Elf64_External_Rela *) get_data (NULL, file, rel_offset, 1,
+                                                  rel_size, _("64-bit relocation data"));
+       if (!erelas)
+-	return FALSE;
++	return 0;
+ 
+       nrelas = rel_size / sizeof (Elf64_External_Rela);
+ 
+@@ -901,7 +896,7 @@
+ 	{
+ 	  free (erelas);
+ 	  error (_("out of memory parsing relocs\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       for (i = 0; i < nrelas; i++)
+@@ -935,19 +930,12 @@
+ 
+       free (erelas);
+     }
+-
+   *relasp = relas;
+   *nrelasp = nrelas;
+-  return TRUE;
++  return 1;
+ }
+ 
+-/* Load REL type relocations from FILE at REL_OFFSET extending for REL_SIZE bytes.
+-   Returns TRUE upon success, FALSE otherwise.  If successful then a
+-   pointer to a malloc'ed buffer containing the relocs is placed in *RELSP,
+-   and the number of relocs loaded is placed in *NRELSP.  It is the caller's
+-   responsibility to free the allocated buffer.  */
+-
+-static bfd_boolean
++static int
+ slurp_rel_relocs (FILE * file,
+ 		  unsigned long rel_offset,
+ 		  unsigned long rel_size,
+@@ -965,7 +953,7 @@
+       erels = (Elf32_External_Rel *) get_data (NULL, file, rel_offset, 1,
+                                                rel_size, _("32-bit relocation data"));
+       if (!erels)
+-	return FALSE;
++	return 0;
+ 
+       nrels = rel_size / sizeof (Elf32_External_Rel);
+ 
+@@ -975,7 +963,7 @@
+ 	{
+ 	  free (erels);
+ 	  error (_("out of memory parsing relocs\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       for (i = 0; i < nrels; i++)
+@@ -994,7 +982,7 @@
+       erels = (Elf64_External_Rel *) get_data (NULL, file, rel_offset, 1,
+                                                rel_size, _("64-bit relocation data"));
+       if (!erels)
+-	return FALSE;
++	return 0;
+ 
+       nrels = rel_size / sizeof (Elf64_External_Rel);
+ 
+@@ -1004,7 +992,7 @@
+ 	{
+ 	  free (erels);
+ 	  error (_("out of memory parsing relocs\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       for (i = 0; i < nrels; i++)
+@@ -1038,10 +1026,9 @@
+ 
+       free (erels);
+     }
+-
+   *relsp = rels;
+   *nrelsp = nrels;
+-  return TRUE;
++  return 1;
+ }
+ 
+ /* Returns the reloc type extracted from the reloc info field.  */
+@@ -1088,7 +1075,7 @@
+ /* Display the contents of the relocation data found at the specified
+    offset.  */
+ 
+-static bfd_boolean
++static void
+ dump_relocations (FILE * file,
+ 		  unsigned long rel_offset,
+ 		  unsigned long rel_size,
+@@ -1097,11 +1084,10 @@
+ 		  char * strtab,
+ 		  unsigned long strtablen,
+ 		  int is_rela,
+-		  bfd_boolean is_dynsym)
++		  int is_dynsym)
+ {
+-  unsigned long i;
++  unsigned int i;
+   Elf_Internal_Rela * rels;
+-  bfd_boolean res = TRUE;
+ 
+   if (is_rela == UNKNOWN)
+     is_rela = guess_is_rela (elf_header.e_machine);
+@@ -1109,12 +1095,12 @@
+   if (is_rela)
+     {
+       if (!slurp_rela_relocs (file, rel_offset, rel_size, &rels, &rel_size))
+-	return FALSE;
++	return;
+     }
+   else
+     {
+       if (!slurp_rel_relocs (file, rel_offset, rel_size, &rels, &rel_size))
+-	return FALSE;
++	return;
+     }
+ 
+   if (is_32bit_elf)
+@@ -1538,7 +1524,6 @@
+ 	    case LITUSE_ALPHA_JSRDIRECT: rtype = "JSRDIRECT"; break;
+ 	    default: rtype = NULL;
+ 	    }
+-
+ 	  if (rtype)
+ 	    printf (" (%s)", rtype);
+ 	  else
+@@ -1546,16 +1531,12 @@
+ 	      putchar (' ');
+ 	      printf (_("<unknown addend: %lx>"),
+ 		      (unsigned long) rels[i].r_addend);
+-	      res = FALSE;
+ 	    }
+ 	}
+       else if (symtab_index)
+ 	{
+ 	  if (symtab == NULL || symtab_index >= nsyms)
+-	    {
+-	      error (_(" bad symbol index: %08lx in reloc"), (unsigned long) symtab_index);
+-	      res = FALSE;
+-	    }
++	    printf (_(" bad symbol index: %08lx"), (unsigned long) symtab_index);
+ 	  else
+ 	    {
+ 	      Elf_Internal_Sym * psym;
+@@ -1656,10 +1637,7 @@
+ 	      else if (strtab == NULL)
+ 		printf (_("<string table index: %3ld>"), psym->st_name);
+ 	      else if (psym->st_name >= strtablen)
+-		{
+-		  error (_("<corrupt string table index: %3ld>"), psym->st_name);
+-		  res = FALSE;
+-		}
++		printf (_("<corrupt string table index: %3ld>"), psym->st_name);
+ 	      else
+ 		{
+ 		  print_symbol (22, strtab + psym->st_name);
+@@ -1727,8 +1705,6 @@
+     }
+ 
+   free (rels);
+-
+-  return res;
+ }
+ 
+ static const char *
+@@ -1933,7 +1909,8 @@
+   switch (type)
+     {
+     case DT_ALPHA_PLTRO: return "ALPHA_PLTRO";
+-    default: return NULL;
++    default:
++      return NULL;
+     }
+ }
+ 
+@@ -1948,7 +1925,8 @@
+     case DT_SCORE_GOTSYM:       return "SCORE_GOTSYM";
+     case DT_SCORE_UNREFEXTNO:   return "SCORE_UNREFEXTNO";
+     case DT_SCORE_HIPAGENO:     return "SCORE_HIPAGENO";
+-    default:                    return NULL;
++    default:
++      return NULL;
+     }
+ }
+ 
+@@ -1963,7 +1941,8 @@
+     case DT_C6000_DSBT_SIZE:   return "C6000_DSBT_SIZE";
+     case DT_C6000_PREEMPTMAP:  return "C6000_PREEMPTMAP";
+     case DT_C6000_DSBT_INDEX:  return "C6000_DSBT_INDEX";
+-    default:                   return NULL;
++    default:
++      return NULL;
+     }
+ }
+ 
+@@ -1973,7 +1952,8 @@
+   switch (type)
+     {
+     case DT_NIOS2_GP: return "NIOS2_GP";
+-    default:          return NULL;
++    default:
++      return NULL;
+     }
+ }
+ 
+@@ -2187,11 +2167,11 @@
+ 
+   switch (e_type)
+     {
+-    case ET_NONE: return _("NONE (None)");
+-    case ET_REL:  return _("REL (Relocatable file)");
+-    case ET_EXEC: return _("EXEC (Executable file)");
+-    case ET_DYN:  return _("DYN (Shared object file)");
+-    case ET_CORE: return _("CORE (Core file)");
++    case ET_NONE:	return _("NONE (None)");
++    case ET_REL:	return _("REL (Relocatable file)");
++    case ET_EXEC:	return _("EXEC (Executable file)");
++    case ET_DYN:	return _("DYN (Shared object file)");
++    case ET_CORE:	return _("CORE (Core file)");
+ 
+     default:
+       if ((e_type >= ET_LOPROC) && (e_type <= ET_HIPROC))
+@@ -2521,7 +2501,7 @@
+ decode_ARM_machine_flags (unsigned e_flags, char buf[])
+ {
+   unsigned eabi;
+-  bfd_boolean unknown = FALSE;
++  int unknown = 0;
+ 
+   eabi = EF_ARM_EABI_VERSION (e_flags);
+   e_flags &= ~ EF_ARM_EABIMASK;
+@@ -2539,7 +2519,7 @@
+     default:
+       strcat (buf, ", <unrecognized EABI>");
+       if (e_flags)
+-	unknown = TRUE;
++	unknown = 1;
+       break;
+ 
+     case EF_ARM_EABI_VER1:
+@@ -2559,7 +2539,7 @@
+ 	      break;
+ 
+ 	    default:
+-	      unknown = TRUE;
++	      unknown = 1;
+ 	      break;
+ 	    }
+ 	}
+@@ -2590,7 +2570,7 @@
+ 	      break;
+ 
+ 	    default:
+-	      unknown = TRUE;
++	      unknown = 1;
+ 	      break;
+ 	    }
+ 	}
+@@ -2621,9 +2601,10 @@
+ 	      break;
+ 
+ 	    default:
+-	      unknown = TRUE;
++	      unknown = 1;
+ 	      break;
+ 	    }
++      break;
+ 	}
+       break;
+ 
+@@ -2656,7 +2637,7 @@
+ 	      break;
+ 
+ 	    default:
+-	      unknown = TRUE;
++	      unknown = 1;
+ 	      break;
+ 	    }
+ 	}
+@@ -2715,7 +2696,7 @@
+ 	      break;
+ 
+ 	    default:
+-	      unknown = TRUE;
++	      unknown = 1;
+ 	      break;
+ 	    }
+ 	}
+@@ -2803,8 +2784,8 @@
+   unsigned arch;
+   unsigned config;
+   unsigned version;
+-  bfd_boolean has_fpu = FALSE;
+-  unsigned int r = 0;
++  int has_fpu = 0;
++  int r = 0;
+ 
+   static const char *ABI_STRINGS[] =
+   {
+@@ -2940,19 +2921,19 @@
+ 
+   if (config & E_NDS32_HAS_FPU_INST)
+     {
+-      has_fpu = TRUE;
++      has_fpu = 1;
+       r += snprintf (buf + r, size -r, ", FPU_SP");
+     }
+ 
+   if (config & E_NDS32_HAS_FPU_DP_INST)
+     {
+-      has_fpu = TRUE;
++      has_fpu = 1;
+       r += snprintf (buf + r, size -r, ", FPU_DP");
+     }
+ 
+   if (config & E_NDS32_HAS_FPU_MAC_INST)
+     {
+-      has_fpu = TRUE;
++      has_fpu = 1;
+       r += snprintf (buf + r, size -r, ", FPU_MAC");
+     }
+ 
+@@ -3711,9 +3692,13 @@
+ {
+   switch (type)
+     {
+-    case PT_AARCH64_ARCHEXT:  return "AARCH64_ARCHEXT";
+-    default:                  return NULL;
++    case PT_AARCH64_ARCHEXT:
++      return "AARCH64_ARCHEXT";
++    default:
++      break;
+     }
++
++  return NULL;
+ }
+ 
+ static const char *
+@@ -3721,9 +3706,13 @@
+ {
+   switch (type)
+     {
+-    case PT_ARM_EXIDX: return "EXIDX";
+-    default:           return NULL;
++    case PT_ARM_EXIDX:
++      return "EXIDX";
++    default:
++      break;
+     }
++
++  return NULL;
+ }
+ 
+ static const char *
+@@ -3741,12 +3730,19 @@
+ {
+   switch (type)
+     {
+-    case PT_MIPS_REGINFO:   return "REGINFO";
+-    case PT_MIPS_RTPROC:    return "RTPROC";
+-    case PT_MIPS_OPTIONS:   return "OPTIONS";
+-    case PT_MIPS_ABIFLAGS:  return "ABIFLAGS";
+-    default:                return NULL;
++    case PT_MIPS_REGINFO:
++      return "REGINFO";
++    case PT_MIPS_RTPROC:
++      return "RTPROC";
++    case PT_MIPS_OPTIONS:
++      return "OPTIONS";
++    case PT_MIPS_ABIFLAGS:
++      return "ABIFLAGS";
++    default:
++      break;
+     }
++
++  return NULL;
+ }
+ 
+ static const char *
+@@ -3773,8 +3769,11 @@
+     case PT_PARISC_ARCHEXT:	return "PARISC_ARCHEXT";
+     case PT_PARISC_UNWIND:	return "PARISC_UNWIND";
+     case PT_PARISC_WEAKORDER:	return "PARISC_WEAKORDER";
+-    default:                    return NULL;
++    default:
++      break;
+     }
++
++  return NULL;
+ }
+ 
+ static const char *
+@@ -3788,8 +3787,11 @@
+     case PT_IA_64_HP_OPT_ANOT:	return "HP_OPT_ANNOT";
+     case PT_IA_64_HP_HSL_ANOT:	return "HP_HSL_ANNOT";
+     case PT_IA_64_HP_STACK:	return "HP_STACK";
+-    default:                    return NULL;
++    default:
++      break;
+     }
++
++  return NULL;
+ }
+ 
+ static const char *
+@@ -3797,9 +3799,12 @@
+ {
+   switch (type)
+     {
+-    case PT_C6000_PHATTR:  return "C6000_PHATTR";
+-    default:               return NULL;
++    case PT_C6000_PHATTR:	return "C6000_PHATTR";
++    default:
++      break;
+     }
++
++  return NULL;
+ }
+ 
+ static const char *
+@@ -3815,7 +3820,7 @@
+     case 0x6ffffffc: return "PT_SUNWDTRACE";
+     case 0x6ffffffd: return "PT_SUNWCAP";
+     case 0x6fffffff: return "PT_HISUNW";
+-    default:         return NULL;
++    default: return NULL;
+     }
+ }
+ 
+@@ -3834,7 +3839,9 @@
+     case PT_SHLIB:	return "SHLIB";
+     case PT_PHDR:	return "PHDR";
+     case PT_TLS:	return "TLS";
+-    case PT_GNU_EH_FRAME: return "GNU_EH_FRAME";
++
++    case PT_GNU_EH_FRAME:
++			return "GNU_EH_FRAME";
+     case PT_GNU_STACK:	return "GNU_STACK";
+     case PT_GNU_RELRO:  return "GNU_RELRO";
+ 
+@@ -3990,8 +3997,10 @@
+     case SHT_PARISC_SYMEXTN:	return "PARISC_SYMEXTN";
+     case SHT_PARISC_STUBS:	return "PARISC_STUBS";
+     case SHT_PARISC_DLKM:	return "PARISC_DLKM";
+-    default:             	return NULL;
++    default:
++      break;
+     }
++  return NULL;
+ }
+ 
+ static const char *
+@@ -4025,8 +4034,10 @@
+   switch (sh_type)
+     {
+     case SHT_X86_64_UNWIND:	return "X86_64_UNWIND";
+-    default:			return NULL;
++    default:
++      break;
+     }
++  return NULL;
+ }
+ 
+ static const char *
+@@ -4034,9 +4045,12 @@
+ {
+   switch (sh_type)
+     {
+-    case SHT_AARCH64_ATTRIBUTES: return "AARCH64_ATTRIBUTES";
+-    default:			 return NULL;
++    case SHT_AARCH64_ATTRIBUTES:
++      return "AARCH64_ATTRIBUTES";
++    default:
++      break;
+     }
++  return NULL;
+ }
+ 
+ static const char *
+@@ -4049,8 +4063,10 @@
+     case SHT_ARM_ATTRIBUTES:      return "ARM_ATTRIBUTES";
+     case SHT_ARM_DEBUGOVERLAY:    return "ARM_DEBUGOVERLAY";
+     case SHT_ARM_OVERLAYSECTION:  return "ARM_OVERLAYSECTION";
+-    default:			  return NULL;
++    default:
++      break;
+     }
++  return NULL;
+ }
+ 
+ static const char *
+@@ -4058,16 +4074,26 @@
+ {
+   switch (sh_type)
+     {
+-    case SHT_C6000_UNWIND:      return "C6000_UNWIND";
+-    case SHT_C6000_PREEMPTMAP:  return "C6000_PREEMPTMAP";
+-    case SHT_C6000_ATTRIBUTES:  return "C6000_ATTRIBUTES";
+-    case SHT_TI_ICODE:          return "TI_ICODE";
+-    case SHT_TI_XREF:           return "TI_XREF";
+-    case SHT_TI_HANDLER:        return "TI_HANDLER";
+-    case SHT_TI_INITINFO:       return "TI_INITINFO";
+-    case SHT_TI_PHATTRS:        return "TI_PHATTRS";
+-    default:                    return NULL;
++    case SHT_C6000_UNWIND:
++      return "C6000_UNWIND";
++    case SHT_C6000_PREEMPTMAP:
++      return "C6000_PREEMPTMAP";
++    case SHT_C6000_ATTRIBUTES:
++      return "C6000_ATTRIBUTES";
++    case SHT_TI_ICODE:
++      return "TI_ICODE";
++    case SHT_TI_XREF:
++      return "TI_XREF";
++    case SHT_TI_HANDLER:
++      return "TI_HANDLER";
++    case SHT_TI_INITINFO:
++      return "TI_INITINFO";
++    case SHT_TI_PHATTRS:
++      return "TI_PHATTRS";
++    default:
++      break;
+     }
++  return NULL;
+ }
+ 
+ static const char *
+@@ -4075,10 +4101,10 @@
+ {
+   switch (sh_type)
+     {
+-    case SHT_MSP430_SEC_FLAGS:    return "MSP430_SEC_FLAGS";
+-    case SHT_MSP430_SYM_ALIASES:  return "MSP430_SYM_ALIASES";
+-    case SHT_MSP430_ATTRIBUTES:   return "MSP430_ATTRIBUTES";
+-    default:                      return NULL;
++    case SHT_MSP430_SEC_FLAGS:   return "MSP430_SEC_FLAGS";
++    case SHT_MSP430_SYM_ALIASES: return "MSP430_SYM_ALIASES";
++    case SHT_MSP430_ATTRIBUTES:  return "MSP430_ATTRIBUTES";
++    default: return NULL;
+     }
+ }
+ 
+@@ -4087,12 +4113,12 @@
+ {
+   switch (sh_type)
+     {
+-    case SHT_V850_SCOMMON:  return "V850 Small Common";
+-    case SHT_V850_TCOMMON:  return "V850 Tiny Common";
+-    case SHT_V850_ZCOMMON:  return "V850 Zero Common";
+-    case SHT_RENESAS_IOP:   return "RENESAS IOP";
+-    case SHT_RENESAS_INFO:  return "RENESAS INFO";
+-    default:                return NULL;
++    case SHT_V850_SCOMMON: return "V850 Small Common";
++    case SHT_V850_TCOMMON: return "V850 Tiny Common";
++    case SHT_V850_ZCOMMON: return "V850 Zero Common";
++    case SHT_RENESAS_IOP:  return "RENESAS IOP";
++    case SHT_RENESAS_INFO: return "RENESAS INFO";
++    default: return NULL;
+     }
+ }
+ 
+@@ -4449,67 +4475,67 @@
+ 	  break;
+ 
+ 	case 'a':
+-	  do_syms = TRUE;
+-	  do_reloc = TRUE;
+-	  do_unwind = TRUE;
+-	  do_dynamic = TRUE;
+-	  do_header = TRUE;
+-	  do_sections = TRUE;
+-	  do_section_groups = TRUE;
+-	  do_segments = TRUE;
+-	  do_version = TRUE;
+-	  do_histogram = TRUE;
+-	  do_arch = TRUE;
+-	  do_notes = TRUE;
++	  do_syms++;
++	  do_reloc++;
++	  do_unwind++;
++	  do_dynamic++;
++	  do_header++;
++	  do_sections++;
++	  do_section_groups++;
++	  do_segments++;
++	  do_version++;
++	  do_histogram++;
++	  do_arch++;
++	  do_notes++;
+ 	  break;
+ 	case 'g':
+-	  do_section_groups = TRUE;
++	  do_section_groups++;
+ 	  break;
+ 	case 't':
+ 	case 'N':
+-	  do_sections = TRUE;
+-	  do_section_details = TRUE;
++	  do_sections++;
++	  do_section_details++;
+ 	  break;
+ 	case 'e':
+-	  do_header = TRUE;
+-	  do_sections = TRUE;
+-	  do_segments = TRUE;
++	  do_header++;
++	  do_sections++;
++	  do_segments++;
+ 	  break;
+ 	case 'A':
+-	  do_arch = TRUE;
++	  do_arch++;
+ 	  break;
+ 	case 'D':
+-	  do_using_dynamic = TRUE;
++	  do_using_dynamic++;
+ 	  break;
+ 	case 'r':
+-	  do_reloc = TRUE;
++	  do_reloc++;
+ 	  break;
+ 	case 'u':
+-	  do_unwind = TRUE;
++	  do_unwind++;
+ 	  break;
+ 	case 'h':
+-	  do_header = TRUE;
++	  do_header++;
+ 	  break;
+ 	case 'l':
+-	  do_segments = TRUE;
++	  do_segments++;
+ 	  break;
+ 	case 's':
+-	  do_syms = TRUE;
++	  do_syms++;
+ 	  break;
+ 	case 'S':
+-	  do_sections = TRUE;
++	  do_sections++;
+ 	  break;
+ 	case 'd':
+-	  do_dynamic = TRUE;
++	  do_dynamic++;
+ 	  break;
+ 	case 'I':
+-	  do_histogram = TRUE;
++	  do_histogram++;
+ 	  break;
+ 	case 'n':
+-	  do_notes = TRUE;
++	  do_notes++;
+ 	  break;
+ 	case 'c':
+-	  do_archive_index = TRUE;
++	  do_archive_index++;
+ 	  break;
+ 	case 'x':
+ 	  request_dump (HEX_DUMP);
+@@ -4521,28 +4547,28 @@
+ 	  request_dump (RELOC_DUMP);
+ 	  break;
+ 	case 'z':
+-	  decompress_dumps = TRUE;
++	  decompress_dumps++;
+ 	  break;
+ 	case 'w':
+-	  do_dump = TRUE;
++	  do_dump++;
+ 	  if (optarg == 0)
+ 	    {
+-	      do_debugging = TRUE;
++	      do_debugging = 1;
+ 	      dwarf_select_sections_all ();
+ 	    }
+ 	  else
+ 	    {
+-	      do_debugging = FALSE;
++	      do_debugging = 0;
+ 	      dwarf_select_sections_by_letters (optarg);
+ 	    }
+ 	  break;
+ 	case OPTION_DEBUG_DUMP:
+-	  do_dump = TRUE;
++	  do_dump++;
+ 	  if (optarg == 0)
+-	    do_debugging = TRUE;
++	    do_debugging = 1;
+ 	  else
+ 	    {
+-	      do_debugging = FALSE;
++	      do_debugging = 0;
+ 	      dwarf_select_sections_by_names (optarg);
+ 	    }
+ 	  break;
+@@ -4561,10 +4587,10 @@
+ 	  }
+ 	  break;
+ 	case OPTION_DWARF_CHECK:
+-	  dwarf_check = TRUE;
++	  dwarf_check = 1;
+ 	  break;
+ 	case OPTION_DYN_SYMS:
+-	  do_dyn_syms = TRUE;
++	  do_dyn_syms++;
+ 	  break;
+ #ifdef SUPPORT_DISASSEMBLY
+ 	case 'i':
+@@ -4575,10 +4601,10 @@
+ 	  print_version (program_name);
+ 	  break;
+ 	case 'V':
+-	  do_version = TRUE;
++	  do_version++;
+ 	  break;
+ 	case 'W':
+-	  do_wide = TRUE;
++	  do_wide++;
+ 	  break;
+ 	default:
+ 	  /* xgettext:c-format */
+@@ -4631,7 +4657,7 @@
+ 
+ /* Decode the data held in 'elf_header'.  */
+ 
+-static bfd_boolean
++static int
+ process_file_header (void)
+ {
+   if (   elf_header.e_ident[EI_MAG0] != ELFMAG0
+@@ -4641,14 +4667,14 @@
+     {
+       error
+ 	(_("Not an ELF file - it has the wrong magic bytes at the start\n"));
+-      return FALSE;
++      return 0;
+     }
+ 
+   init_dwarf_regnames (elf_header.e_machine);
+ 
+   if (do_header)
+     {
+-      unsigned i;
++      int i;
+ 
+       printf (_("ELF Header:\n"));
+       printf (_("  Magic:   "));
+@@ -4732,7 +4758,7 @@
+       section_headers = NULL;
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ static bfd_boolean
+@@ -4823,16 +4849,16 @@
+   return TRUE;
+ }
+ 
+-/* Returns TRUE if the program headers were read into `program_headers'.  */
++/* Returns 1 if the program headers were read into `program_headers'.  */
+ 
+-static bfd_boolean
++static int
+ get_program_headers (FILE * file)
+ {
+   Elf_Internal_Phdr * phdrs;
+ 
+   /* Check cache of prior read.  */
+   if (program_headers != NULL)
+-    return TRUE;
++    return 1;
+ 
+   /* Be kind to memory checkers by looking for
+      e_phnum values which we know must be invalid.  */
+@@ -4851,7 +4877,7 @@
+     {
+       error (_("Out of memory reading %u program headers\n"),
+ 	     elf_header.e_phnum);
+-      return FALSE;
++      return 0;
+     }
+ 
+   if (is_32bit_elf
+@@ -4859,16 +4885,16 @@
+       : get_64bit_program_headers (file, phdrs))
+     {
+       program_headers = phdrs;
+-      return TRUE;
++      return 1;
+     }
+ 
+   free (phdrs);
+-  return FALSE;
++  return 0;
+ }
+ 
+-/* Returns TRUE if the program headers were loaded.  */
++/* Returns 1 if the program headers were loaded.  */
+ 
+-static bfd_boolean
++static int
+ process_program_headers (FILE * file)
+ {
+   Elf_Internal_Phdr * segment;
+@@ -4879,14 +4905,11 @@
+     {
+       /* PR binutils/12467.  */
+       if (elf_header.e_phoff != 0)
+-	{
+-	  warn (_("possibly corrupt ELF header - it has a non-zero program"
+-		  " header offset, but no program headers\n"));
+-	  return FALSE;
+-	}
++	warn (_("possibly corrupt ELF header - it has a non-zero program"
++		" header offset, but no program headers\n"));
+       else if (do_segments)
+ 	printf (_("\nThere are no program headers in this file.\n"));
+-      return TRUE;
++      return 0;
+     }
+ 
+   if (do_segments && !do_header)
+@@ -4901,7 +4924,7 @@
+     }
+ 
+   if (! get_program_headers (file))
+-    return TRUE;
++    return 1;
+ 
+   if (do_segments)
+     {
+@@ -5149,7 +5172,7 @@
+ 	}
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ 
+@@ -5543,16 +5566,16 @@
+ {
+   static char buff[1024];
+   char * p = buff;
+-  unsigned int field_size = is_32bit_elf ? 8 : 16;
+-  signed int sindex;
+-  unsigned int size = sizeof (buff) - (field_size + 4 + 1);
++  int field_size = is_32bit_elf ? 8 : 16;
++  int sindex;
++  int size = sizeof (buff) - (field_size + 4 + 1);
+   bfd_vma os_flags = 0;
+   bfd_vma proc_flags = 0;
+   bfd_vma unknown_flags = 0;
+   static const struct
+     {
+       const char * str;
+-      unsigned int len;
++      int len;
+     }
+   flags [] =
+     {
+@@ -5839,7 +5862,7 @@
+     }
+ }
+ 
+-static bfd_boolean
++static int
+ process_section_headers (FILE * file)
+ {
+   Elf_Internal_Shdr * section;
+@@ -5851,15 +5874,12 @@
+     {
+       /* PR binutils/12467.  */
+       if (elf_header.e_shoff != 0)
+-	{
+-	  warn (_("possibly corrupt ELF file header - it has a non-zero"
+-		  " section header offset, but no section headers\n"));
+-	  return FALSE;
+-	}
++	warn (_("possibly corrupt ELF file header - it has a non-zero"
++		" section header offset, but no section headers\n"));
+       else if (do_sections)
+ 	printf (_("\nThere are no sections in this file.\n"));
+ 
+-      return TRUE;
++      return 1;
+     }
+ 
+   if (do_sections && !do_header)
+@@ -5869,13 +5889,10 @@
+   if (is_32bit_elf)
+     {
+       if (! get_32bit_section_headers (file, FALSE))
+-	return FALSE;
+-    }
+-  else
+-    {
+-      if (! get_64bit_section_headers (file, FALSE))
+-	return FALSE;
++	return 0;
+     }
++  else if (! get_64bit_section_headers (file, FALSE))
++    return 0;
+ 
+   /* Read in the string table, so that we have names to display.  */
+   if (elf_header.e_shstrndx != SHN_UNDEF
+@@ -6080,7 +6097,7 @@
+     }
+ 
+   if (! do_sections)
+-    return TRUE;
++    return 1;
+ 
+   if (elf_header.e_shnum > 1)
+     printf (_("\nSection Headers:\n"));
+@@ -6463,7 +6480,7 @@
+       printf ("p (processor specific)\n");
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ static const char *
+@@ -6498,7 +6515,7 @@
+   return buff;
+ }
+ 
+-static bfd_boolean
++static int
+ process_section_groups (FILE * file)
+ {
+   Elf_Internal_Shdr * section;
+@@ -6513,21 +6530,21 @@
+ 
+   /* Don't process section groups unless needed.  */
+   if (!do_unwind && !do_section_groups)
+-    return TRUE;
++    return 1;
+ 
+   if (elf_header.e_shnum == 0)
+     {
+       if (do_section_groups)
+ 	printf (_("\nThere are no sections to group in this file.\n"));
+ 
+-      return TRUE;
++      return 1;
+     }
+ 
+   if (section_headers == NULL)
+     {
+       error (_("Section headers are not available!\n"));
+       /* PR 13622: This can happen with a corrupt ELF header.  */
+-      return FALSE;
++      return 0;
+     }
+ 
+   section_headers_groups = (struct group **) calloc (elf_header.e_shnum,
+@@ -6537,7 +6554,7 @@
+     {
+       error (_("Out of memory reading %u section group headers\n"),
+ 	     elf_header.e_shnum);
+-      return FALSE;
++      return 0;
+     }
+ 
+   /* Scan the sections for the group section.  */
+@@ -6553,7 +6570,7 @@
+       if (do_section_groups)
+ 	printf (_("\nThere are no section groups in this file.\n"));
+ 
+-      return TRUE;
++      return 1;
+     }
+ 
+   section_groups = (struct group *) calloc (group_count, sizeof (struct group));
+@@ -6562,7 +6579,7 @@
+     {
+       error (_("Out of memory reading %lu groups\n"),
+ 	     (unsigned long) group_count);
+-      return FALSE;
++      return 0;
+     }
+ 
+   symtab_sec = NULL;
+@@ -6730,14 +6747,14 @@
+ 		  else
+ 		    {
+ 		      /* Intel C/C++ compiler may put section 0 in a
+-			 section group.  We just warn it the first time
++			 section group. We just warn it the first time
+ 			 and ignore it afterwards.  */
+-		      static bfd_boolean warned = FALSE;
++		      static int warned = 0;
+ 		      if (!warned)
+ 			{
+ 			  error (_("section 0 in group section [%5u]\n"),
+ 				 section_headers_groups [entry]->group_index);
+-			  warned = TRUE;
++			  warned++;
+ 			}
+ 		    }
+ 		}
+@@ -6767,7 +6784,7 @@
+     free (symtab);
+   if (strtab)
+     free (strtab);
+-  return TRUE;
++  return 1;
+ }
+ 
+ /* Data used to display dynamic fixups.  */
+@@ -6792,27 +6809,25 @@
+ /* Display IA-64 OpenVMS dynamic fixups (used to dynamically link a shared
+    library).  */
+ 
+-static bfd_boolean
+-dump_ia64_vms_dynamic_fixups (FILE * file,
+-			      struct ia64_vms_dynfixup * fixup,
+-                              const char * strtab,
+-			      unsigned int strtab_sz)
++static void
++dump_ia64_vms_dynamic_fixups (FILE *file, struct ia64_vms_dynfixup *fixup,
++                              const char *strtab, unsigned int strtab_sz)
+ {
+-  Elf64_External_VMS_IMAGE_FIXUP * imfs;
++  Elf64_External_VMS_IMAGE_FIXUP *imfs;
+   long i;
+-  const char * lib_name;
++  const char *lib_name;
+ 
+   imfs = get_data (NULL, file, dynamic_addr + fixup->fixup_rela_off,
+ 		   1, fixup->fixup_rela_cnt * sizeof (*imfs),
+ 		   _("dynamic section image fixups"));
+   if (!imfs)
+-    return FALSE;
++    return;
+ 
+   if (fixup->needed < strtab_sz)
+     lib_name = strtab + fixup->needed;
+   else
+     {
+-      warn (_("corrupt library name index of 0x%lx found in dynamic entry"),
++      warn ("corrupt library name index of 0x%lx found in dynamic entry",
+             (unsigned long) fixup->needed);
+       lib_name = "???";
+     }
+@@ -6839,12 +6854,11 @@
+     }
+ 
+   free (imfs);
+-  return TRUE;
+ }
+ 
+ /* Display IA-64 OpenVMS dynamic relocations (used to relocate an image).  */
+ 
+-static bfd_boolean
++static void
+ dump_ia64_vms_dynamic_relocs (FILE *file, struct ia64_vms_dynimgrela *imgrela)
+ {
+   Elf64_External_VMS_IMAGE_RELA *imrs;
+@@ -6854,7 +6868,7 @@
+ 		   1, imgrela->img_rela_cnt * sizeof (*imrs),
+ 		   _("dynamic section image relocations"));
+   if (!imrs)
+-    return FALSE;
++    return;
+ 
+   printf (_("\nImage relocs\n"));
+   printf
+@@ -6881,21 +6895,20 @@
+     }
+ 
+   free (imrs);
+-  return TRUE;
+ }
+ 
+ /* Display IA-64 OpenVMS dynamic relocations and fixups.  */
+ 
+-static bfd_boolean
++static int
+ process_ia64_vms_dynamic_relocs (FILE *file)
+ {
+   struct ia64_vms_dynfixup fixup;
+   struct ia64_vms_dynimgrela imgrela;
+   Elf_Internal_Dyn *entry;
++  int res = 0;
+   bfd_vma strtab_off = 0;
+   bfd_vma strtab_sz = 0;
+   char *strtab = NULL;
+-  bfd_boolean res = TRUE;
+ 
+   memset (&fixup, 0, sizeof (fixup));
+   memset (&imgrela, 0, sizeof (imgrela));
+@@ -6931,16 +6944,17 @@
+           break;
+         case DT_IA_64_VMS_FIXUP_RELA_OFF:
+           fixup.fixup_rela_off = entry->d_un.d_val;
+-          if (! dump_ia64_vms_dynamic_fixups (file, &fixup, strtab, strtab_sz))
+-	    res = FALSE;
++          res++;
++          dump_ia64_vms_dynamic_fixups (file, &fixup, strtab, strtab_sz);
+           break;
++
+         case DT_IA_64_VMS_IMG_RELA_CNT:
+ 	  imgrela.img_rela_cnt = entry->d_un.d_val;
+           break;
+         case DT_IA_64_VMS_IMG_RELA_OFF:
+ 	  imgrela.img_rela_off = entry->d_un.d_val;
+-          if (! dump_ia64_vms_dynamic_relocs (file, &imgrela))
+-	    res = FALSE;
++          res++;
++          dump_ia64_vms_dynamic_relocs (file, &imgrela);
+           break;
+ 
+         default:
+@@ -6960,33 +6974,33 @@
+   int reloc;
+   int size;
+   int rela;
+-}
+-  dynamic_relocations [] =
++} dynamic_relocations [] =
+ {
+-  { "REL", DT_REL, DT_RELSZ, FALSE },
+-  { "RELA", DT_RELA, DT_RELASZ, TRUE },
+-  { "PLT", DT_JMPREL, DT_PLTRELSZ, UNKNOWN }
++    { "REL", DT_REL, DT_RELSZ, FALSE },
++    { "RELA", DT_RELA, DT_RELASZ, TRUE },
++    { "PLT", DT_JMPREL, DT_PLTRELSZ, UNKNOWN }
+ };
+ 
+ /* Process the reloc section.  */
+ 
+-static bfd_boolean
++static int
+ process_relocs (FILE * file)
+ {
+   unsigned long rel_size;
+   unsigned long rel_offset;
+ 
++
+   if (!do_reloc)
+-    return TRUE;
++    return 1;
+ 
+   if (do_using_dynamic)
+     {
+-      int          is_rela;
++      int is_rela;
+       const char * name;
+-      bfd_boolean  has_dynamic_reloc;
++      int has_dynamic_reloc;
+       unsigned int i;
+ 
+-      has_dynamic_reloc = FALSE;
++      has_dynamic_reloc = 0;
+ 
+       for (i = 0; i < ARRAY_SIZE (dynamic_relocations); i++)
+ 	{
+@@ -6995,8 +7009,7 @@
+ 	  rel_size = dynamic_info [dynamic_relocations [i].size];
+ 	  rel_offset = dynamic_info [dynamic_relocations [i].reloc];
+ 
+-	  if (rel_size)
+-	    has_dynamic_reloc = TRUE;
++	  has_dynamic_reloc |= rel_size;
+ 
+ 	  if (is_rela == UNKNOWN)
+ 	    {
+@@ -7023,13 +7036,12 @@
+ 				rel_size,
+ 				dynamic_symbols, num_dynamic_syms,
+ 				dynamic_strings, dynamic_strings_length,
+-				is_rela, TRUE /* is_dynamic */);
++				is_rela, 1);
+ 	    }
+ 	}
+ 
+       if (is_ia64_vms ())
+-        if (process_ia64_vms_dynamic_relocs (file))
+-	  has_dynamic_reloc = TRUE;
++        has_dynamic_reloc |= process_ia64_vms_dynamic_relocs (file);
+ 
+       if (! has_dynamic_reloc)
+ 	printf (_("\nThere are no dynamic relocations in this file.\n"));
+@@ -7038,7 +7050,7 @@
+     {
+       Elf_Internal_Shdr * section;
+       unsigned long i;
+-      bfd_boolean found = FALSE;
++      int found = 0;
+ 
+       for (i = 0, section = section_headers;
+ 	   i < elf_header.e_shnum;
+@@ -7108,10 +7120,9 @@
+ 		}
+ 	      else
+ 		dump_relocations (file, rel_offset, rel_size,
+-				  NULL, 0, NULL, 0, is_rela,
+-				  FALSE /* is_dynamic */);
++				  NULL, 0, NULL, 0, is_rela, 0);
+ 
+-	      found = TRUE;
++	      found = 1;
+ 	    }
+ 	}
+ 
+@@ -7119,7 +7130,7 @@
+ 	printf (_("\nThere are no relocations in this file.\n"));
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ /* An absolute address consists of a section and an offset.  If the
+@@ -7197,7 +7208,7 @@
+   *offset = addr.offset;
+ }
+ 
+-static /* signed */ int
++static int
+ symcmp (const void *p, const void *q)
+ {
+   Elf_Internal_Sym *sp = (Elf_Internal_Sym *) p;
+@@ -7219,27 +7230,26 @@
+ 
+ struct ia64_unw_aux_info
+ {
+-  struct ia64_unw_table_entry * table;		/* Unwind table.  */
+-  unsigned long                 table_len;	/* Length of unwind table.  */
+-  unsigned char *               info;		/* Unwind info.  */
+-  unsigned long                 info_size;	/* Size of unwind info.  */
+-  bfd_vma                       info_addr;	/* Starting address of unwind info.  */
+-  bfd_vma                       seg_base;	/* Starting address of segment.  */
+-  Elf_Internal_Sym *            symtab;		/* The symbol table.  */
+-  unsigned long                 nsyms;		/* Number of symbols.  */
+-  Elf_Internal_Sym *            funtab;		/* Sorted table of STT_FUNC symbols.  */
+-  unsigned long                 nfuns;		/* Number of entries in funtab.  */
+-  char *                        strtab;		/* The string table.  */
+-  unsigned long                 strtab_size;	/* Size of string table.  */
++  struct ia64_unw_table_entry *table;	/* Unwind table.  */
++  unsigned long table_len;		/* Length of unwind table.  */
++  unsigned char * info;			/* Unwind info.  */
++  unsigned long info_size;		/* Size of unwind info.  */
++  bfd_vma info_addr;			/* Starting address of unwind info.  */
++  bfd_vma seg_base;			/* Starting address of segment.  */
++  Elf_Internal_Sym * symtab;		/* The symbol table.  */
++  unsigned long nsyms;			/* Number of symbols.  */
++  Elf_Internal_Sym * funtab;		/* Sorted table of STT_FUNC symbols.  */
++  unsigned long nfuns;			/* Number of entries in funtab.  */
++  char * strtab;			/* The string table.  */
++  unsigned long strtab_size;		/* Size of string table.  */
+ };
+ 
+-static bfd_boolean
++static void
+ dump_ia64_unwind (struct ia64_unw_aux_info * aux)
+ {
+   struct ia64_unw_table_entry * tp;
+   unsigned long j, nfuns;
+   int in_body;
+-  bfd_boolean res = TRUE;
+ 
+   aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym));
+   for (nfuns = 0, j = 0; j < aux->nsyms; j++)
+@@ -7286,7 +7296,6 @@
+ 	{
+ 	  warn (_("Invalid offset %lx in table entry %ld\n"),
+ 		(long) tp->info.offset, (long) (tp - aux->table));
+-	  res = FALSE;
+ 	  continue;
+ 	}
+ 
+@@ -7316,8 +7325,6 @@
+     }
+ 
+   free (aux->funtab);
+-
+-  return res;
+ }
+ 
+ static bfd_boolean
+@@ -7459,7 +7466,7 @@
+   return TRUE;
+ }
+ 
+-static bfd_boolean
++static void
+ ia64_process_unwind (FILE * file)
+ {
+   Elf_Internal_Shdr * sec;
+@@ -7467,7 +7474,6 @@
+   Elf_Internal_Shdr * strsec;
+   unsigned long i, unwcount = 0, unwstart = 0;
+   struct ia64_unw_aux_info aux;
+-  bfd_boolean res = TRUE;
+ 
+   memset (& aux, 0, sizeof (aux));
+ 
+@@ -7483,7 +7489,6 @@
+ 	    {
+ 	      error (_("Multiple auxillary string tables encountered\n"));
+ 	      free (aux.strtab);
+-	      res = FALSE;
+ 	    }
+ 	  aux.strtab = (char *) get_data (NULL, file, strsec->sh_offset,
+                                           1, strsec->sh_size,
+@@ -7612,66 +7617,63 @@
+     free (aux.symtab);
+   if (aux.strtab)
+     free ((char *) aux.strtab);
+-
+-  return res;
+ }
+ 
+ struct hppa_unw_table_entry
+-{
+-  struct absaddr start;
+-  struct absaddr end;
+-  unsigned int Cannot_unwind:1;			/* 0 */
+-  unsigned int Millicode:1;			/* 1 */
+-  unsigned int Millicode_save_sr0:1;		/* 2 */
+-  unsigned int Region_description:2;		/* 3..4 */
+-  unsigned int reserved1:1;			/* 5 */
+-  unsigned int Entry_SR:1;			/* 6 */
+-  unsigned int Entry_FR:4;     /* Number saved     7..10 */
+-  unsigned int Entry_GR:5;     /* Number saved     11..15 */
+-  unsigned int Args_stored:1;			/* 16 */
+-  unsigned int Variable_Frame:1;		/* 17 */
+-  unsigned int Separate_Package_Body:1;		/* 18 */
+-  unsigned int Frame_Extension_Millicode:1;	/* 19 */
+-  unsigned int Stack_Overflow_Check:1;		/* 20 */
+-  unsigned int Two_Instruction_SP_Increment:1;	/* 21 */
+-  unsigned int Ada_Region:1;			/* 22 */
+-  unsigned int cxx_info:1;			/* 23 */
+-  unsigned int cxx_try_catch:1;			/* 24 */
+-  unsigned int sched_entry_seq:1;		/* 25 */
+-  unsigned int reserved2:1;			/* 26 */
+-  unsigned int Save_SP:1;			/* 27 */
+-  unsigned int Save_RP:1;			/* 28 */
+-  unsigned int Save_MRP_in_frame:1;		/* 29 */
+-  unsigned int extn_ptr_defined:1;		/* 30 */
+-  unsigned int Cleanup_defined:1;		/* 31 */
+-
+-  unsigned int MPE_XL_interrupt_marker:1;	/* 0 */
+-  unsigned int HP_UX_interrupt_marker:1;	/* 1 */
+-  unsigned int Large_frame:1;			/* 2 */
+-  unsigned int Pseudo_SP_Set:1;			/* 3 */
+-  unsigned int reserved4:1;			/* 4 */
+-  unsigned int Total_frame_size:27;		/* 5..31 */
+-};
++  {
++    struct absaddr start;
++    struct absaddr end;
++    unsigned int Cannot_unwind:1;		/* 0 */
++    unsigned int Millicode:1;			/* 1 */
++    unsigned int Millicode_save_sr0:1;		/* 2 */
++    unsigned int Region_description:2;		/* 3..4 */
++    unsigned int reserved1:1;			/* 5 */
++    unsigned int Entry_SR:1;			/* 6 */
++    unsigned int Entry_FR:4;     /* number saved */	/* 7..10 */
++    unsigned int Entry_GR:5;     /* number saved */	/* 11..15 */
++    unsigned int Args_stored:1;			/* 16 */
++    unsigned int Variable_Frame:1;		/* 17 */
++    unsigned int Separate_Package_Body:1;	/* 18 */
++    unsigned int Frame_Extension_Millicode:1;	/* 19 */
++    unsigned int Stack_Overflow_Check:1;	/* 20 */
++    unsigned int Two_Instruction_SP_Increment:1;/* 21 */
++    unsigned int Ada_Region:1;			/* 22 */
++    unsigned int cxx_info:1;			/* 23 */
++    unsigned int cxx_try_catch:1;		/* 24 */
++    unsigned int sched_entry_seq:1;		/* 25 */
++    unsigned int reserved2:1;			/* 26 */
++    unsigned int Save_SP:1;			/* 27 */
++    unsigned int Save_RP:1;			/* 28 */
++    unsigned int Save_MRP_in_frame:1;		/* 29 */
++    unsigned int extn_ptr_defined:1;		/* 30 */
++    unsigned int Cleanup_defined:1;		/* 31 */
++
++    unsigned int MPE_XL_interrupt_marker:1;	/* 0 */
++    unsigned int HP_UX_interrupt_marker:1;	/* 1 */
++    unsigned int Large_frame:1;			/* 2 */
++    unsigned int Pseudo_SP_Set:1;		/* 3 */
++    unsigned int reserved4:1;			/* 4 */
++    unsigned int Total_frame_size:27;		/* 5..31 */
++  };
+ 
+ struct hppa_unw_aux_info
+ {
+-  struct hppa_unw_table_entry *  table;		/* Unwind table.  */
+-  unsigned long                  table_len;	/* Length of unwind table.  */
+-  bfd_vma                        seg_base;	/* Starting address of segment.  */
+-  Elf_Internal_Sym *             symtab;	/* The symbol table.  */
+-  unsigned long                  nsyms;		/* Number of symbols.  */
+-  Elf_Internal_Sym *             funtab;	/* Sorted table of STT_FUNC symbols.  */
+-  unsigned long                  nfuns;		/* Number of entries in funtab.  */
+-  char *                         strtab;	/* The string table.  */
+-  unsigned long                  strtab_size;	/* Size of string table.  */
++  struct hppa_unw_table_entry * table;	/* Unwind table.  */
++  unsigned long table_len;		/* Length of unwind table.  */
++  bfd_vma seg_base;			/* Starting address of segment.  */
++  Elf_Internal_Sym * symtab;		/* The symbol table.  */
++  unsigned long nsyms;			/* Number of symbols.  */
++  Elf_Internal_Sym * funtab;		/* Sorted table of STT_FUNC symbols.  */
++  unsigned long nfuns;			/* Number of entries in funtab.  */
++  char * strtab;			/* The string table.  */
++  unsigned long strtab_size;		/* Size of string table.  */
+ };
+ 
+-static bfd_boolean
++static void
+ dump_hppa_unwind (struct hppa_unw_aux_info * aux)
+ {
+   struct hppa_unw_table_entry * tp;
+   unsigned long j, nfuns;
+-  bfd_boolean res = TRUE;
+ 
+   aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym));
+   for (nfuns = 0, j = 0; j < aux->nsyms; j++)
+@@ -7741,11 +7743,9 @@
+   printf ("\n");
+ 
+   free (aux->funtab);
+-
+-  return res;
+ }
+ 
+-static bfd_boolean
++static int
+ slurp_hppa_unwind_table (FILE * file,
+ 			 struct hppa_unw_aux_info * aux,
+ 			 Elf_Internal_Shdr * sec)
+@@ -7763,10 +7763,11 @@
+ 
+   /* First, find the starting address of the segment that includes
+      this section.  */
++
+   if (elf_header.e_phnum)
+     {
+       if (! get_program_headers (file))
+-	return FALSE;
++	return 0;
+ 
+       for (seg = program_headers;
+ 	   seg < program_headers + elf_header.e_phnum;
+@@ -7790,7 +7791,7 @@
+   table = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, size,
+                                       _("unwind table"));
+   if (!table)
+-    return FALSE;
++    return 0;
+ 
+   unw_ent_size = 16;
+   nentries = size / unw_ent_size;
+@@ -7860,7 +7861,7 @@
+ 
+       if (!slurp_rela_relocs (file, relsec->sh_offset, relsec->sh_size,
+ 			      & rela, & nrelas))
+-	return FALSE;
++	return 0;
+ 
+       for (rp = rela; rp < rela + nrelas; ++rp)
+ 	{
+@@ -7896,10 +7897,10 @@
+ 
+   aux->table_len = nentries;
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+-static bfd_boolean
++static void
+ hppa_process_unwind (FILE * file)
+ {
+   struct hppa_unw_aux_info aux;
+@@ -7907,10 +7908,9 @@
+   Elf_Internal_Shdr * strsec;
+   Elf_Internal_Shdr * sec;
+   unsigned long i;
+-  bfd_boolean res = TRUE;
+ 
+   if (string_table == NULL)
+-    return FALSE;
++    return;
+ 
+   memset (& aux, 0, sizeof (aux));
+ 
+@@ -7926,7 +7926,6 @@
+ 	    {
+ 	      error (_("Multiple auxillary string tables encountered\n"));
+ 	      free (aux.strtab);
+-	      res = FALSE;
+ 	    }
+ 	  aux.strtab = (char *) get_data (NULL, file, strsec->sh_offset,
+                                           1, strsec->sh_size,
+@@ -7949,14 +7948,9 @@
+ 		  (unsigned long) sec->sh_offset,
+ 		  (unsigned long) (sec->sh_size / (2 * eh_addr_size + 8)));
+ 
+-          if (! slurp_hppa_unwind_table (file, &aux, sec))
+-	    res = FALSE;
+-	
++          slurp_hppa_unwind_table (file, &aux, sec);
+ 	  if (aux.table_len > 0)
+-	    {
+-	      if (! dump_hppa_unwind (&aux))
+-		res = FALSE;
+-	    }
++	    dump_hppa_unwind (&aux);
+ 
+ 	  if (aux.table)
+ 	    free ((char *) aux.table);
+@@ -7968,8 +7962,6 @@
+     free (aux.symtab);
+   if (aux.strtab)
+     free ((char *) aux.strtab);
+-
+-  return res;
+ }
+ 
+ struct arm_section
+@@ -8280,7 +8272,7 @@
+       data_offset += 4;						\
+       if (! get_unwind_section_word (aux, data_arm_sec, data_sec,	\
+ 				     data_offset, & word, & addr, NULL))	\
+-	return FALSE;						\
++	return;							\
+       remaining = 4;						\
+       more_words--;						\
+     }								\
+@@ -8296,11 +8288,11 @@
+   else					\
+     {					\
+       printf (_("[Truncated opcode]\n"));	\
+-      return FALSE;			\
++      return;				\
+     }					\
+   printf ("0x%02x ", OP)
+ 
+-static bfd_boolean
++static void
+ decode_arm_unwind_bytecode (struct arm_unw_aux_info *  aux,
+ 			    unsigned int               word,
+ 			    unsigned int               remaining,
+@@ -8310,7 +8302,6 @@
+ 			    struct arm_section *       data_arm_sec)
+ {
+   struct absaddr addr;
+-  bfd_boolean res = TRUE;
+ 
+   /* Decode the unwinding instructions.  */
+   while (1)
+@@ -8346,7 +8337,7 @@
+ 	  else
+ 	    {
+ 	      unsigned int mask = ((op & 0x0f) << 8) | op2;
+-	      bfd_boolean first = TRUE;
++	      int first = 1;
+ 	      int i;
+ 
+ 	      printf ("pop {");
+@@ -8354,7 +8345,7 @@
+ 		if (mask & (1 << i))
+ 		  {
+ 		    if (first)
+-		      first = FALSE;
++		      first = 0;
+ 		    else
+ 		      printf (", ");
+ 		    printf ("r%d", 4 + i);
+@@ -8372,14 +8363,14 @@
+       else if ((op & 0xf0) == 0xa0)
+ 	{
+ 	  int end = 4 + (op & 0x07);
+-	  bfd_boolean first = TRUE;
++	  int first = 1;
+ 	  int i;
+ 
+ 	  printf ("     pop {");
+ 	  for (i = 4; i <= end; i++)
+ 	    {
+ 	      if (first)
+-		first = FALSE;
++		first = 0;
+ 	      else
+ 		printf (", ");
+ 	      printf ("r%d", i);
+@@ -8402,7 +8393,7 @@
+ 	  else
+ 	    {
+ 	      unsigned int mask = op2 & 0x0f;
+-	      bfd_boolean first = TRUE;
++	      int first = 1;
+ 	      int i;
+ 
+ 	      printf ("pop {");
+@@ -8410,7 +8401,7 @@
+ 		if (mask & (1 << i))
+ 		  {
+ 		    if (first)
+-		      first = FALSE;
++		      first = 0;
+ 		    else
+ 		      printf (", ");
+ 		    printf ("r%d", i);
+@@ -8431,10 +8422,7 @@
+ 		break;
+ 	    }
+ 	  if (i == sizeof (buf))
+-	    {
+-	      error (_("corrupt change to vsp"));
+-	      res = FALSE;
+-	    }
++	    printf (_("corrupt change to vsp"));
+ 	  else
+ 	    {
+ 	      offset = read_uleb128 (buf, &len, buf + i + 1);
+@@ -8495,7 +8483,7 @@
+ 	  else
+ 	    {
+ 	      unsigned int mask = op2 & 0x0f;
+-	      bfd_boolean first = TRUE;
++	      int first = 1;
+ 	      int i;
+ 
+ 	      printf ("pop {");
+@@ -8503,7 +8491,7 @@
+ 		if (mask & (1 << i))
+ 		  {
+ 		    if (first)
+-		      first = FALSE;
++		      first = 0;
+ 		    else
+ 		      printf (", ");
+ 		    printf ("wCGR%d", i);
+@@ -8512,18 +8500,12 @@
+ 	    }
+ 	}
+       else
+-	{
+-	  printf (_("     [unsupported opcode]"));
+-	  res = FALSE;
+-	}
+-
++	printf (_("     [unsupported opcode]"));
+       printf ("\n");
+     }
+-
+-  return res;
+ }
+ 
+-static bfd_boolean
++static void
+ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *  aux,
+ 			      unsigned int               word,
+ 			      unsigned int               remaining,
+@@ -8578,8 +8560,8 @@
+ 	  const char *name;
+ 	  struct
+ 	  {
+-	    unsigned int offset;
+-	    unsigned int reg;
++	      unsigned int offset;
++	      unsigned int reg;
+ 	  } regpos[16];
+ 
+ 	  /* Scan entire instruction first so that GET_OP output is not
+@@ -8644,8 +8626,9 @@
+ 	  /* PR 17531: file: id:000001,src:001906+004739,op:splice,rep:2.  */
+ 	  if (i == sizeof (buf))
+ 	    {
++	      printf ("<corrupt sp adjust>\n");
+ 	      warn (_("Corrupt stack pointer adjustment detected\n"));
+-	      return FALSE;
++	      return;
+ 	    }
+ 
+ 	  offset = read_uleb128 (buf, &len, buf + i + 1);
+@@ -8666,8 +8649,6 @@
+ 	}
+       putchar ('\n');
+     }
+-
+-  return TRUE;
+ }
+ 
+ static bfd_vma
+@@ -8685,7 +8666,7 @@
+   return offset + where;
+ }
+ 
+-static bfd_boolean
++static void
+ decode_arm_unwind (struct arm_unw_aux_info *  aux,
+ 		   unsigned int               word,
+ 		   unsigned int               remaining,
+@@ -8697,7 +8678,6 @@
+   unsigned int more_words = 0;
+   struct absaddr addr;
+   bfd_vma sym_name = (bfd_vma) -1;
+-  bfd_boolean res = FALSE;
+ 
+   if (remaining == 0)
+     {
+@@ -8708,7 +8688,7 @@
+ 	 the personality routine.  */
+       if (! get_unwind_section_word (aux, data_arm_sec, data_sec, data_offset,
+ 				     & word, & addr, & sym_name))
+-	return FALSE;
++	return;
+ 
+       remaining = 4;
+     }
+@@ -8753,7 +8733,7 @@
+ 	  if (!remaining)
+ 	    {
+ 	      printf (_("  [Truncated data]\n"));
+-	      return FALSE;
++	      return;
+ 	    }
+ 	  more_words = word >> 24;
+ 	  word <<= 8;
+@@ -8761,7 +8741,7 @@
+ 	  per_index = -1;
+ 	}
+       else
+-	return TRUE;
++	return;
+     }
+   else
+     {
+@@ -8775,10 +8755,7 @@
+ 
+       if (elf_header.e_machine == EM_ARM
+ 	  && (word & 0x70000000))
+-	{
+-	  warn (_("Corrupt ARM compact model table entry: %x \n"), word);
+-	  res = FALSE;
+-	}
++	warn (_("Corrupt ARM compact model table entry: %x \n"), word);
+ 
+       per_index = (word >> 24) & 0x7f;
+       printf (_("  Compact model index: %d\n"), per_index);
+@@ -8801,24 +8778,21 @@
+     case EM_ARM:
+       if (per_index < 3)
+ 	{
+-	  if (! decode_arm_unwind_bytecode (aux, word, remaining, more_words,
+-					    data_offset, data_sec, data_arm_sec))
+-	    res = FALSE;
++	  decode_arm_unwind_bytecode (aux, word, remaining, more_words,
++				      data_offset, data_sec, data_arm_sec);
+ 	}
+       else
+ 	{
+ 	  warn (_("Unknown ARM compact model index encountered\n"));
+ 	  printf (_("  [reserved]\n"));
+-	  res = FALSE;
+ 	}
+       break;
+ 
+     case EM_TI_C6000:
+       if (per_index < 3)
+ 	{
+-	  if (! decode_tic6x_unwind_bytecode (aux, word, remaining, more_words,
+-					      data_offset, data_sec, data_arm_sec))
+-	    res = FALSE;
++	  decode_tic6x_unwind_bytecode (aux, word, remaining, more_words,
++					data_offset, data_sec, data_arm_sec);
+ 	}
+       else if (per_index < 5)
+ 	{
+@@ -8841,21 +8815,17 @@
+     default:
+       error (_("Unsupported architecture type %d encountered when decoding unwind table\n"),
+ 	     elf_header.e_machine);
+-      res = FALSE;
+     }
+ 
+   /* Decode the descriptors.  Not implemented.  */
+-
+-  return res;
+ }
+ 
+-static bfd_boolean
++static void
+ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec)
+ {
+   struct arm_section exidx_arm_sec, extab_arm_sec;
+   unsigned int i, exidx_len;
+   unsigned long j, nfuns;
+-  bfd_boolean res = TRUE;
+ 
+   memset (&exidx_arm_sec, 0, sizeof (exidx_arm_sec));
+   memset (&extab_arm_sec, 0, sizeof (extab_arm_sec));
+@@ -8884,17 +8854,14 @@
+ 	  free (aux->funtab);
+ 	  arm_free_section (& exidx_arm_sec);
+ 	  arm_free_section (& extab_arm_sec);
+-	  return FALSE;
++	  return;
+ 	}
+ 
+       /* ARM EHABI, Section 5:
+ 	 An index table entry consists of 2 words.
+          The first word contains a prel31 offset to the start of a function, with bit 31 clear.  */
+       if (exidx_fn & 0x80000000)
+-	{
+-	  warn (_("corrupt index table entry: %x\n"), exidx_fn);
+-	  res = FALSE;
+-	}
++	warn (_("corrupt index table entry: %x\n"), exidx_fn);
+ 
+       fn = arm_expand_prel31 (exidx_fn, exidx_sec->sh_addr + 8 * i);
+ 
+@@ -8935,7 +8902,6 @@
+ 		  warn (_("Unwind entry contains corrupt offset (0x%lx) into section %s\n"),
+ 			(unsigned long) table_offset,
+ 			printable_section_name (table_sec));
+-		  res = FALSE;
+ 		  continue;
+ 		}
+ 	    }
+@@ -8945,18 +8911,14 @@
+ 	      if (table_sec != NULL)
+ 		table_offset = table - table_sec->sh_addr;
+ 	    }
+-
+ 	  if (table_sec == NULL)
+ 	    {
+ 	      warn (_("Could not locate .ARM.extab section containing 0x%lx.\n"),
+ 		    (unsigned long) table);
+-	      res = FALSE;
+ 	      continue;
+ 	    }
+-
+-	  if (! decode_arm_unwind (aux, 0, 0, table_offset, table_sec,
+-				   &extab_arm_sec))
+-	    res = FALSE;
++	  decode_arm_unwind (aux, 0, 0, table_offset, table_sec,
++			     &extab_arm_sec);
+ 	}
+     }
+ 
+@@ -8965,13 +8927,11 @@
+   free (aux->funtab);
+   arm_free_section (&exidx_arm_sec);
+   arm_free_section (&extab_arm_sec);
+-
+-  return res;
+ }
+ 
+ /* Used for both ARM and C6X unwinding tables.  */
+ 
+-static bfd_boolean
++static void
+ arm_process_unwind (FILE *file)
+ {
+   struct arm_unw_aux_info aux;
+@@ -8980,7 +8940,6 @@
+   Elf_Internal_Shdr *sec;
+   unsigned long i;
+   unsigned int sec_type;
+-  bfd_boolean res = TRUE;
+ 
+   switch (elf_header.e_machine)
+     {
+@@ -8995,11 +8954,11 @@
+     default:
+       error (_("Unsupported architecture type %d encountered when processing unwind table\n"),
+ 	     elf_header.e_machine);
+-      return FALSE;
++      return;
+     }
+ 
+   if (string_table == NULL)
+-    return FALSE;
++    return;
+ 
+   memset (& aux, 0, sizeof (aux));
+   aux.file = file;
+@@ -9017,7 +8976,6 @@
+ 	    {
+ 	      error (_("Multiple string tables found in file.\n"));
+ 	      free (aux.strtab);
+-	      res = FALSE;
+ 	    }
+ 	  aux.strtab = get_data (NULL, file, strsec->sh_offset,
+ 				 1, strsec->sh_size, _("string table"));
+@@ -9039,8 +8997,7 @@
+ 		    (unsigned long) sec->sh_offset,
+ 		    (unsigned long) (sec->sh_size / (2 * eh_addr_size)));
+ 
+-	    if (! dump_arm_unwind (&aux, sec))
+-	      res = FALSE;
++	    dump_arm_unwind (&aux, sec);
+ 	  }
+       }
+ 
+@@ -9048,37 +9005,37 @@
+     free (aux.symtab);
+   if (aux.strtab)
+     free ((char *) aux.strtab);
+-
+-  return res;
+ }
+ 
+-static bfd_boolean
++static void
+ process_unwind (FILE * file)
+ {
+   struct unwind_handler
+   {
+-    unsigned int machtype;
+-    bfd_boolean (* handler)(FILE *);
++    int machtype;
++    void (* handler)(FILE *);
+   } handlers[] =
+   {
+     { EM_ARM, arm_process_unwind },
+     { EM_IA_64, ia64_process_unwind },
+     { EM_PARISC, hppa_process_unwind },
+     { EM_TI_C6000, arm_process_unwind },
+-    { 0, NULL }
++    { 0, 0 }
+   };
+   int i;
+ 
+   if (!do_unwind)
+-    return TRUE;
++    return;
+ 
+   for (i = 0; handlers[i].handler != NULL; i++)
+     if (elf_header.e_machine == handlers[i].machtype)
+-      return handlers[i].handler (file);
++      {
++	handlers[i].handler (file);
++	return;
++      }
+ 
+   printf (_("\nThe decoding of unwind sections for machine type %s is not currently supported.\n"),
+ 	  get_machine_name (elf_header.e_machine));
+-  return TRUE;
+ }
+ 
+ static void
+@@ -9100,13 +9057,13 @@
+ 	    "RLD_ORDER_SAFE"
+ 	  };
+ 	  unsigned int cnt;
+-	  bfd_boolean first = TRUE;
++	  int first = 1;
+ 
+ 	  for (cnt = 0; cnt < ARRAY_SIZE (opts); ++cnt)
+ 	    if (entry->d_un.d_val & (1 << cnt))
+ 	      {
+ 		printf ("%s%s", first ? "" : " ", opts[cnt]);
+-		first = FALSE;
++		first = 0;
+ 	      }
+ 	}
+       break;
+@@ -9195,7 +9152,7 @@
+ 	  { DT_HP_GROUP, "HP_GROUP" },
+ 	  { DT_HP_PROTECT_LINKAGE_TABLE, "HP_PROTECT_LINKAGE_TABLE" }
+ 	};
+-	bfd_boolean first = TRUE;
++	int first = 1;
+ 	size_t cnt;
+ 	bfd_vma val = entry->d_un.d_val;
+ 
+@@ -9205,7 +9162,7 @@
+ 	      if (! first)
+ 		putchar (' ');
+ 	      fputs (flags[cnt].str, stdout);
+-	      first = FALSE;
++	      first = 0;
+ 	      val ^= flags[cnt].bit;
+ 	    }
+ 
+@@ -9307,7 +9264,7 @@
+   putchar ('\n');
+ }
+ 
+-static bfd_boolean
++static int
+ get_32bit_dynamic_section (FILE * file)
+ {
+   Elf32_External_Dyn * edyn;
+@@ -9317,7 +9274,7 @@
+   edyn = (Elf32_External_Dyn *) get_data (NULL, file, dynamic_addr, 1,
+                                           dynamic_size, _("dynamic section"));
+   if (!edyn)
+-    return FALSE;
++    return 0;
+ 
+   /* SGI's ELF has more than one section in the DYNAMIC segment, and we
+      might not have the luxury of section headers.  Look for the DT_NULL
+@@ -9338,7 +9295,7 @@
+       error (_("Out of memory allocating space for %lu dynamic entries\n"),
+ 	     (unsigned long) dynamic_nent);
+       free (edyn);
+-      return FALSE;
++      return 0;
+     }
+ 
+   for (ext = edyn, entry = dynamic_section;
+@@ -9351,10 +9308,10 @@
+ 
+   free (edyn);
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+-static bfd_boolean
++static int
+ get_64bit_dynamic_section (FILE * file)
+ {
+   Elf64_External_Dyn * edyn;
+@@ -9365,7 +9322,7 @@
+   edyn = (Elf64_External_Dyn *) get_data (NULL, file, dynamic_addr, 1,
+                                           dynamic_size, _("dynamic section"));
+   if (!edyn)
+-    return FALSE;
++    return 0;
+ 
+   /* SGI's ELF has more than one section in the DYNAMIC segment, and we
+      might not have the luxury of section headers.  Look for the DT_NULL
+@@ -9387,7 +9344,7 @@
+       error (_("Out of memory allocating space for %lu dynamic entries\n"),
+ 	     (unsigned long) dynamic_nent);
+       free (edyn);
+-      return FALSE;
++      return 0;
+     }
+ 
+   /* Convert from external to internal formats.  */
+@@ -9401,13 +9358,13 @@
+ 
+   free (edyn);
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ static void
+ print_dynamic_flags (bfd_vma flags)
+ {
+-  bfd_boolean first = TRUE;
++  int first = 1;
+ 
+   while (flags)
+     {
+@@ -9417,7 +9374,7 @@
+       flags &= ~ flag;
+ 
+       if (first)
+-	first = FALSE;
++	first = 0;
+       else
+ 	putc (' ', stdout);
+ 
+@@ -9436,7 +9393,7 @@
+ 
+ /* Parse and display the contents of the dynamic section.  */
+ 
+-static bfd_boolean
++static int
+ process_dynamic_section (FILE * file)
+ {
+   Elf_Internal_Dyn * entry;
+@@ -9446,19 +9403,16 @@
+       if (do_dynamic)
+ 	printf (_("\nThere is no dynamic section in this file.\n"));
+ 
+-      return TRUE;
++      return 1;
+     }
+ 
+   if (is_32bit_elf)
+     {
+       if (! get_32bit_dynamic_section (file))
+-	return FALSE;
+-    }
+-  else
+-    {
+-      if (! get_64bit_dynamic_section (file))
+-	return FALSE;
++	return 0;
+     }
++  else if (! get_64bit_dynamic_section (file))
++    return 0;
+ 
+   /* Find the appropriate symbol table.  */
+   if (dynamic_symbols == NULL)
+@@ -9594,14 +9548,14 @@
+               get_data (NULL, file, dynamic_syminfo_offset, 1, syminsz,
+                         _("symbol information"));
+ 	  if (!extsyminfo)
+-	    return FALSE;
++	    return 0;
+ 
+ 	  dynamic_syminfo = (Elf_Internal_Syminfo *) malloc (syminsz);
+ 	  if (dynamic_syminfo == NULL)
+ 	    {
+ 	      error (_("Out of memory allocating %lu byte for dynamic symbol info\n"),
+ 		     (unsigned long) syminsz);
+-	      return FALSE;
++	      return 0;
+ 	    }
+ 
+ 	  dynamic_syminfo_nent = syminsz / sizeof (Elf_External_Syminfo);
+@@ -9635,7 +9589,9 @@
+ 	  print_vma (entry->d_tag, FULL_HEX);
+ 	  dtype = get_dynamic_type (entry->d_tag);
+ 	  printf (" (%s)%*s", dtype,
+-		  ((is_32bit_elf ? 27 : 19) - (int) strlen (dtype)), " ");
++		  ((is_32bit_elf ? 27 : 19)
++		   - (int) strlen (dtype)),
++		  " ");
+ 	}
+ 
+       switch (entry->d_tag)
+@@ -10089,7 +10045,7 @@
+ 	}
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ static char *
+@@ -10134,15 +10090,15 @@
+ 
+ /* Display the contents of the version sections.  */
+ 
+-static bfd_boolean
++static int
+ process_version_sections (FILE * file)
+ {
+   Elf_Internal_Shdr * section;
+   unsigned i;
+-  bfd_boolean found = FALSE;
++  int found = 0;
+ 
+   if (! do_version)
+-    return TRUE;
++    return 1;
+ 
+   for (i = 0, section = section_headers;
+        i < elf_header.e_shnum;
+@@ -10158,7 +10114,7 @@
+ 	    unsigned int end;
+ 	    char * endbuf;
+ 
+-	    found = TRUE;
++	    found = 1;
+ 
+ 	    printf (_("\nVersion definition section '%s' contains %u entries:\n"),
+ 		    printable_section_name (section),
+@@ -10282,7 +10238,7 @@
+ 	    unsigned int cnt;
+ 	    char * endbuf;
+ 
+-	    found = TRUE;
++	    found = 1;
+ 
+ 	    printf (_("\nVersion needs section '%s' contains %u entries:\n"),
+ 		    printable_section_name (section), section->sh_info);
+@@ -10417,7 +10373,7 @@
+ 	    if (link_section->sh_link >= elf_header.e_shnum)
+ 	      break;
+ 
+-	    found = TRUE;
++	    found = 1;
+ 
+ 	    symbols = GET_ELF_SYMBOLS (file, link_section, & num_syms);
+ 	    if (symbols == NULL)
+@@ -10638,7 +10594,7 @@
+   if (! found)
+     printf (_("\nNo version information found in this file.\n"));
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ static const char *
+@@ -10757,13 +10713,20 @@
+ {
+   switch (other)
+     {
+-    case STO_OPTIONAL:      return "OPTIONAL";
+-    case STO_MIPS_PLT:      return "MIPS PLT";
+-    case STO_MIPS_PIC:      return "MIPS PIC";
+-    case STO_MICROMIPS:     return "MICROMIPS";
+-    case STO_MICROMIPS | STO_MIPS_PIC:      return "MICROMIPS, MIPS PIC";
+-    case STO_MIPS16:        return "MIPS16";
+-    default:	            return NULL;
++    case STO_OPTIONAL:
++      return "OPTIONAL";
++    case STO_MIPS_PLT:
++      return "MIPS PLT";
++    case STO_MIPS_PIC:
++      return "MIPS PIC";
++    case STO_MICROMIPS:
++      return "MICROMIPS";
++    case STO_MICROMIPS | STO_MIPS_PIC:
++      return "MICROMIPS, MIPS PIC";
++    case STO_MIPS16:
++      return "MIPS16";
++    default:
++      return NULL;
+     }
+ }
+ 
+@@ -11196,7 +11159,7 @@
+ }
+ 
+ /* Dump the symbol table.  */
+-static bfd_boolean
++static int
+ process_symbol_table (FILE * file)
+ {
+   Elf_Internal_Shdr * section;
+@@ -11211,7 +11174,7 @@
+   bfd_size_type ngnuchains = 0;
+ 
+   if (!do_syms && !do_dyn_syms && !do_histogram)
+-    return TRUE;
++    return 1;
+ 
+   if (dynamic_info[DT_HASH]
+       && (do_histogram
+@@ -11261,7 +11224,7 @@
+       if (buckets == NULL || chains == NULL)
+ 	{
+ 	  if (do_using_dynamic)
+-	    return FALSE;
++	    return 0;
+ 	  free (buckets);
+ 	  free (chains);
+ 	  buckets = NULL;
+@@ -11324,7 +11287,7 @@
+ 	if (gnubuckets[i] != 0)
+ 	  {
+ 	    if (gnubuckets[i] < gnusymidx)
+-	      return FALSE;
++	      return 0;
+ 
+ 	    if (maxchain == 0xffffffff || gnubuckets[i] > maxchain)
+ 	      maxchain = gnubuckets[i];
+@@ -11379,7 +11342,7 @@
+ 	  gnubuckets = NULL;
+ 	  ngnubuckets = 0;
+ 	  if (do_using_dynamic)
+-	    return FALSE;
++	    return 0;
+ 	}
+     }
+ 
+@@ -11576,7 +11539,7 @@
+       if (lengths == NULL)
+ 	{
+ 	  error (_("Out of memory allocating space for histogram buckets\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       printf (_(" Length  Number     %% of total  Coverage\n"));
+@@ -11606,7 +11569,7 @@
+ 	{
+ 	  free (lengths);
+ 	  error (_("Out of memory allocating space for histogram counts\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       for (hn = 0; hn < nbuckets; ++hn)
+@@ -11652,7 +11615,7 @@
+       if (lengths == NULL)
+ 	{
+ 	  error (_("Out of memory allocating space for gnu histogram buckets\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       printf (_(" Length  Number     %% of total  Coverage\n"));
+@@ -11678,7 +11641,7 @@
+ 	{
+ 	  free (lengths);
+ 	  error (_("Out of memory allocating space for gnu histogram counts\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       for (hn = 0; hn < ngnubuckets; ++hn)
+@@ -11704,10 +11667,10 @@
+       free (gnuchains);
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+-static bfd_boolean
++static int
+ process_syminfo (FILE * file ATTRIBUTE_UNUSED)
+ {
+   unsigned int i;
+@@ -11715,11 +11678,11 @@
+   if (dynamic_syminfo == NULL
+       || !do_dynamic)
+     /* No syminfo, this is ok.  */
+-    return TRUE;
++    return 1;
+ 
+   /* There better should be a dynamic symbol section.  */
+   if (dynamic_symbols == NULL || dynamic_strings == NULL)
+-    return FALSE;
++    return 0;
+ 
+   if (dynamic_addr)
+     printf (_("\nDynamic info segment at offset 0x%lx contains %d entries:\n"),
+@@ -11772,7 +11735,7 @@
+       puts ("");
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ #define IN_RANGE(START,END,ADDR,OFF)		\
+@@ -12531,16 +12494,13 @@
+ }
+ 
+ /* Apply relocations to a section.
+-   Returns TRUE upon success, FALSE otherwise.
+-   If RELOCS_RETURN is non-NULL then it is set to point to the loaded relocs.
+-   It is then the caller's responsibility to free them.  NUM_RELOCS_RETURN
+-   will be set to the number of relocs loaded.
+-
+    Note: So far support has been added only for those relocations
+-   which can be found in debug sections. FIXME: Add support for
+-   more relocations ?  */
++   which can be found in debug sections.
++   If RELOCS_RETURN is non-NULL then returns in it a pointer to the
++   loaded relocs.  It is then the caller's responsibility to free them.
++   FIXME: Add support for more relocations ?  */
+ 
+-static bfd_boolean
++static void
+ apply_relocations (void *                     file,
+ 		   const Elf_Internal_Shdr *  section,
+ 		   unsigned char *            start,
+@@ -12550,7 +12510,6 @@
+ {
+   Elf_Internal_Shdr * relsec;
+   unsigned char * end = start + size;
+-  bfd_boolean res = TRUE;
+ 
+   if (relocs_return != NULL)
+     {
+@@ -12559,8 +12518,7 @@
+     }
+ 
+   if (elf_header.e_type != ET_REL)
+-    /* No relocs to apply.  */
+-    return TRUE;
++    return;
+ 
+   /* Find the reloc section associated with the section.  */
+   for (relsec = section_headers;
+@@ -12589,13 +12547,13 @@
+ 	{
+ 	  if (!slurp_rela_relocs ((FILE *) file, relsec->sh_offset,
+                                   relsec->sh_size, & relocs, & num_relocs))
+-	    return FALSE;
++	    return;
+ 	}
+       else
+ 	{
+ 	  if (!slurp_rel_relocs ((FILE *) file, relsec->sh_offset,
+                                  relsec->sh_size, & relocs, & num_relocs))
+-	    return FALSE;
++	    return;
+ 	}
+ 
+       /* SH uses RELA but uses in place value instead of the addend field.  */
+@@ -12605,7 +12563,7 @@
+       symsec = section_headers + relsec->sh_link;
+       if (symsec->sh_type != SHT_SYMTAB
+ 	  && symsec->sh_type != SHT_DYNSYM)
+-	return FALSE;
++	return;
+       symtab = GET_ELF_SYMBOLS ((FILE *) file, symsec, & num_syms);
+ 
+       for (rp = relocs; rp < relocs + num_relocs; ++rp)
+@@ -12639,7 +12597,6 @@
+ 		warn (_("unable to apply unsupported reloc type %d to section %s\n"),
+ 		      reloc_type, printable_section_name (section));
+ 	      prev_reloc = reloc_type;
+-	      res = FALSE;
+ 	      continue;
+ 	    }
+ 
+@@ -12649,7 +12606,6 @@
+ 	      warn (_("skipping invalid relocation offset 0x%lx in section %s\n"),
+ 		    (unsigned long) rp->r_offset,
+ 		    printable_section_name (section));
+-	      res = FALSE;
+ 	      continue;
+ 	    }
+ 
+@@ -12658,7 +12614,6 @@
+ 	    {
+ 	      warn (_("skipping invalid relocation symbol index 0x%lx in section %s\n"),
+ 		    sym_index, printable_section_name (section));
+-	      res = FALSE;
+ 	      continue;
+ 	    }
+ 	  sym = symtab + sym_index;
+@@ -12684,7 +12639,6 @@
+ 		    get_symbol_type (ELF_ST_TYPE (sym->st_info)),
+ 		    (long int)(rp - relocs),
+ 		    printable_section_name (relsec));
+-	      res = FALSE;
+ 	      continue;
+ 	    }
+ 
+@@ -12732,19 +12686,17 @@
+ 
+       break;
+     }
+-
+-  return res;
+ }
+ 
+ #ifdef SUPPORT_DISASSEMBLY
+-static bfd_boolean
++static int
+ disassemble_section (Elf_Internal_Shdr * section, FILE * file)
+ {
+   printf (_("\nAssembly dump of section %s\n"), printable_section_name (section));
+ 
+   /* FIXME: XXX -- to be done --- XXX */
+ 
+-  return TRUE;
++  return 1;
+ }
+ #endif
+ 
+@@ -12823,7 +12775,7 @@
+   return FALSE;
+ }
+ 
+-static bfd_boolean
++static void
+ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file)
+ {
+   Elf_Internal_Shdr *  relsec;
+@@ -12837,7 +12789,7 @@
+   real_start = start = (unsigned char *) get_section_contents (section,
+ 							       file);
+   if (start == NULL)
+-    return FALSE;
++    return;
+   num_bytes = section->sh_size;
+ 
+   printf (_("\nString dump of section '%s':\n"), printable_section_name (section));
+@@ -12858,13 +12810,13 @@
+ 	    {
+ 	      warn (_("section '%s' has unsupported compress type: %d\n"),
+ 		    printable_section_name (section), chdr.ch_type);
+-	      return FALSE;
++	      return;
+ 	    }
+ 	  else if (chdr.ch_addralign != section->sh_addralign)
+ 	    {
+ 	      warn (_("compressed section '%s' is corrupted\n"),
+ 		    printable_section_name (section));
+-	      return FALSE;
++	      return;
+ 	    }
+ 	  uncompressed_size = chdr.ch_size;
+ 	  start += compression_header_size;
+@@ -12896,7 +12848,7 @@
+ 	    {
+ 	      error (_("Unable to decompress section %s\n"),
+ 		     printable_section_name (section));
+-	      return FALSE;
++	      return;
+ 	    }
+ 	}
+       else
+@@ -12965,10 +12917,9 @@
+   free (real_start);
+ 
+   putchar ('\n');
+-  return TRUE;
+ }
+ 
+-static bfd_boolean
++static void
+ dump_section_as_bytes (Elf_Internal_Shdr * section,
+ 		       FILE * file,
+ 		       bfd_boolean relocate)
+@@ -12983,8 +12934,7 @@
+ 
+   real_start = start = (unsigned char *) get_section_contents (section, file);
+   if (start == NULL)
+-    return FALSE;
+-
++    return;
+   section_size = section->sh_size;
+ 
+   printf (_("\nHex dump of section '%s':\n"), printable_section_name (section));
+@@ -13004,13 +12954,13 @@
+ 	    {
+ 	      warn (_("section '%s' has unsupported compress type: %d\n"),
+ 		    printable_section_name (section), chdr.ch_type);
+-	      return FALSE;
++	      return;
+ 	    }
+ 	  else if (chdr.ch_addralign != section->sh_addralign)
+ 	    {
+ 	      warn (_("compressed section '%s' is corrupted\n"),
+ 		    printable_section_name (section));
+-	      return FALSE;
++	      return;
+ 	    }
+ 	  uncompressed_size = chdr.ch_size;
+ 	  start += compression_header_size;
+@@ -13045,7 +12995,7 @@
+ 	      error (_("Unable to decompress section %s\n"),
+ 		     printable_section_name (section));
+ 	      /* FIXME: Print the section anyway ?  */
+-	      return FALSE;
++	      return;
+ 	    }
+ 	}
+       else
+@@ -13054,8 +13004,7 @@
+ 
+   if (relocate)
+     {
+-      if (! apply_relocations (file, section, start, section_size, NULL, NULL))
+-	return FALSE;
++      apply_relocations (file, section, start, section_size, NULL, NULL);
+     }
+   else
+     {
+@@ -13124,10 +13073,9 @@
+   free (real_start);
+ 
+   putchar ('\n');
+-  return TRUE;
+ }
+ 
+-static bfd_boolean
++static int
+ load_specific_debug_section (enum dwarf_section_display_enum debug,
+ 			     const Elf_Internal_Shdr * sec, void * file)
+ {
+@@ -13136,7 +13084,7 @@
+ 
+   /* If it is already loaded, do nothing.  */
+   if (section->start != NULL)
+-    return TRUE;
++    return 1;
+ 
+   snprintf (buf, sizeof (buf), _("%s section data"), section->name);
+   section->address = sec->sh_addr;
+@@ -13163,7 +13111,7 @@
+ 	    {
+ 	      warn (_("compressed section %s is too small to contain a compression header"),
+ 		    section->name);
+-	      return FALSE;
++	      return 0;
+ 	    }
+ 
+ 	  compression_header_size = get_compression_header (&chdr, start, size);
+@@ -13172,13 +13120,13 @@
+ 	    {
+ 	      warn (_("section '%s' has unsupported compress type: %d\n"),
+ 		    section->name, chdr.ch_type);
+-	      return FALSE;
++	      return 0;
+ 	    }
+ 	  else if (chdr.ch_addralign != sec->sh_addralign)
+ 	    {
+ 	      warn (_("compressed section '%s' is corrupted\n"),
+ 		    section->name);
+-	      return FALSE;
++	      return 0;
+ 	    }
+ 	  uncompressed_size = chdr.ch_size;
+ 	  start += compression_header_size;
+@@ -13215,7 +13163,7 @@
+ 	    {
+ 	      error (_("Unable to decompress section %s\n"),
+ 		     printable_section_name (sec));
+-	      return FALSE;
++	      return 0;
+ 	    }
+ 	}
+ 
+@@ -13223,28 +13171,25 @@
+     }
+ 
+   if (section->start == NULL)
+-    return FALSE;
++    return 0;
+ 
+   if (debug_displays [debug].relocate)
+-    {
+-      if (! apply_relocations ((FILE *) file, sec, section->start, section->size,
+-			       & section->reloc_info, & section->num_relocs))
+-	return FALSE;
+-    }
++    apply_relocations ((FILE *) file, sec, section->start, section->size,
++		       & section->reloc_info, & section->num_relocs);
+   else
+     {
+       section->reloc_info = NULL;
+       section->num_relocs = 0;
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ /* If this is not NULL, load_debug_section will only look for sections
+    within the list of sections given here.  */
+-static unsigned int * section_subset = NULL;
++unsigned int *section_subset = NULL;
+ 
+-bfd_boolean
++int
+ load_debug_section (enum dwarf_section_display_enum debug, void * file)
+ {
+   struct dwarf_section * section = &debug_displays [debug].section;
+@@ -13261,7 +13206,7 @@
+ 	section->name = section->compressed_name;
+     }
+   if (sec == NULL)
+-    return FALSE;
++    return 0;
+ 
+   /* If we're loading from a subset of sections, and we've loaded
+      a section matching this name before, it's likely that it's a
+@@ -13286,20 +13231,20 @@
+   section->size = 0;
+ }
+ 
+-static bfd_boolean
++static int
+ display_debug_section (int shndx, Elf_Internal_Shdr * section, FILE * file)
+ {
+   char * name = SECTION_NAME (section);
+   const char * print_name = printable_section_name (section);
+   bfd_size_type length;
+-  bfd_boolean result = TRUE;
++  int result = 1;
+   int i;
+ 
+   length = section->sh_size;
+   if (length == 0)
+     {
+       printf (_("\nSection '%s' has no debugging data.\n"), print_name);
+-      return TRUE;
++      return 0;
+     }
+   if (section->sh_type == SHT_NOBITS)
+     {
+@@ -13309,7 +13254,7 @@
+ 	 stripped with the --only-keep-debug command line option.  */
+       printf (_("section '%s' has the NOBITS type - its contents are unreliable.\n"),
+ 	      print_name);
+-      return FALSE;
++      return 0;
+     }
+ 
+   if (const_strneq (name, ".gnu.linkonce.wi."))
+@@ -13354,7 +13299,7 @@
+   if (i == max)
+     {
+       printf (_("Unrecognized debug section: %s\n"), print_name);
+-      result = FALSE;
++      result = 0;
+     }
+ 
+   return result;
+@@ -13371,13 +13316,13 @@
+   for (cur = dump_sects_byname; cur; cur = cur->next)
+     {
+       unsigned int i;
+-      bfd_boolean any = FALSE;
++      int any;
+ 
+-      for (i = 0; i < elf_header.e_shnum; i++)
++      for (i = 0, any = 0; i < elf_header.e_shnum; i++)
+ 	if (streq (SECTION_NAME (section_headers + i), cur->name))
+ 	  {
+ 	    request_dump_bynumber (i, cur->type);
+-	    any = TRUE;
++	    any = 1;
+ 	  }
+ 
+       if (!any)
+@@ -13386,15 +13331,14 @@
+     }
+ }
+ 
+-static bfd_boolean
++static void
+ process_section_contents (FILE * file)
+ {
+   Elf_Internal_Shdr * section;
+   unsigned int i;
+-  bfd_boolean res = TRUE;
+ 
+   if (! do_dump)
+-    return TRUE;
++    return;
+ 
+   initialise_dumps_byname ();
+ 
+@@ -13407,28 +13351,16 @@
+ 	disassemble_section (section, file);
+ #endif
+       if (dump_sects[i] & HEX_DUMP)
+-	{
+-	  if (! dump_section_as_bytes (section, file, FALSE))
+-	    res = FALSE;
+-	}
++	dump_section_as_bytes (section, file, FALSE);
+ 
+       if (dump_sects[i] & RELOC_DUMP)
+-	{
+-	  if (! dump_section_as_bytes (section, file, TRUE))
+-	    res = FALSE;
+-	}
++	dump_section_as_bytes (section, file, TRUE);
+ 
+       if (dump_sects[i] & STRING_DUMP)
+-	{
+-	  if (! dump_section_as_strings (section, file))
+-	    res = FALSE;
+-	}
++	dump_section_as_strings (section, file);
+ 
+       if (dump_sects[i] & DEBUG_DUMP)
+-	{
+-	  if (! display_debug_section (i, section, file))
+-	    res = FALSE;
+-	}
++	display_debug_section (i, section, file);
+     }
+ 
+   /* Check to see if the user requested a
+@@ -13436,14 +13368,9 @@
+   while (i < num_dump_sects)
+     {
+       if (dump_sects[i])
+-	{
+-	  warn (_("Section %d was not dumped because it does not exist!\n"), i);
+-	  res = FALSE;
+-	}
++	warn (_("Section %d was not dumped because it does not exist!\n"), i);
+       i++;
+     }
+-
+-  return res;
+ }
+ 
+ static void
+@@ -13451,16 +13378,15 @@
+ {
+   if (mask)
+     {
+-      bfd_boolean first = TRUE;
+-
++      int first = 1;
+       if (mask & OEX_FPU_INEX)
+-	fputs ("INEX", stdout), first = FALSE;
++	fputs ("INEX", stdout), first = 0;
+       if (mask & OEX_FPU_UFLO)
+-	printf ("%sUFLO", first ? "" : "|"), first = FALSE;
++	printf ("%sUFLO", first ? "" : "|"), first = 0;
+       if (mask & OEX_FPU_OFLO)
+-	printf ("%sOFLO", first ? "" : "|"), first = FALSE;
++	printf ("%sOFLO", first ? "" : "|"), first = 0;
+       if (mask & OEX_FPU_DIV0)
+-	printf ("%sDIV0", first ? "" : "|"), first = FALSE;
++	printf ("%sDIV0", first ? "" : "|"), first = 0;
+       if (mask & OEX_FPU_INVAL)
+ 	printf ("%sINVAL", first ? "" : "|");
+     }
+@@ -14196,40 +14122,40 @@
+ {
+   if (mask)
+     {
+-      bfd_boolean first = TRUE;
++      int first = 1;
+ 
+       if (mask & ELF_SPARC_HWCAP_MUL32)
+-	fputs ("mul32", stdout), first = FALSE;
++	fputs ("mul32", stdout), first = 0;
+       if (mask & ELF_SPARC_HWCAP_DIV32)
+-	printf ("%sdiv32", first ? "" : "|"), first = FALSE;
++	printf ("%sdiv32", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_FSMULD)
+-	printf ("%sfsmuld", first ? "" : "|"), first = FALSE;
++	printf ("%sfsmuld", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_V8PLUS)
+-	printf ("%sv8plus", first ? "" : "|"), first = FALSE;
++	printf ("%sv8plus", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_POPC)
+-	printf ("%spopc", first ? "" : "|"), first = FALSE;
++	printf ("%spopc", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_VIS)
+-	printf ("%svis", first ? "" : "|"), first = FALSE;
++	printf ("%svis", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_VIS2)
+-	printf ("%svis2", first ? "" : "|"), first = FALSE;
++	printf ("%svis2", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_ASI_BLK_INIT)
+-	printf ("%sASIBlkInit", first ? "" : "|"), first = FALSE;
++	printf ("%sASIBlkInit", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_FMAF)
+-	printf ("%sfmaf", first ? "" : "|"), first = FALSE;
++	printf ("%sfmaf", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_VIS3)
+-	printf ("%svis3", first ? "" : "|"), first = FALSE;
++	printf ("%svis3", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_HPC)
+-	printf ("%shpc", first ? "" : "|"), first = FALSE;
++	printf ("%shpc", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_RANDOM)
+-	printf ("%srandom", first ? "" : "|"), first = FALSE;
++	printf ("%srandom", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_TRANS)
+-	printf ("%strans", first ? "" : "|"), first = FALSE;
++	printf ("%strans", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_FJFMAU)
+-	printf ("%sfjfmau", first ? "" : "|"), first = FALSE;
++	printf ("%sfjfmau", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_IMA)
+-	printf ("%sima", first ? "" : "|"), first = FALSE;
++	printf ("%sima", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP_ASI_CACHE_SPARING)
+-	printf ("%scspare", first ? "" : "|"), first = FALSE;
++	printf ("%scspare", first ? "" : "|"), first = 0;
+     }
+   else
+     fputc ('0', stdout);
+@@ -14241,30 +14167,30 @@
+ {
+   if (mask)
+     {
+-      bfd_boolean first = TRUE;
++      int first = 1;
+ 
+       if (mask & ELF_SPARC_HWCAP2_FJATHPLUS)
+-	fputs ("fjathplus", stdout), first = FALSE;
++	fputs ("fjathplus", stdout), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_VIS3B)
+-	printf ("%svis3b", first ? "" : "|"), first = FALSE;
++	printf ("%svis3b", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_ADP)
+-	printf ("%sadp", first ? "" : "|"), first = FALSE;
++	printf ("%sadp", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_SPARC5)
+-	printf ("%ssparc5", first ? "" : "|"), first = FALSE;
++	printf ("%ssparc5", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_MWAIT)
+-	printf ("%smwait", first ? "" : "|"), first = FALSE;
++	printf ("%smwait", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_XMPMUL)
+-	printf ("%sxmpmul", first ? "" : "|"), first = FALSE;
++	printf ("%sxmpmul", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_XMONT)
+-	printf ("%sxmont2", first ? "" : "|"), first = FALSE;
++	printf ("%sxmont2", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_NSEC)
+-	printf ("%snsec", first ? "" : "|"), first = FALSE;
++	printf ("%snsec", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_FJATHHPC)
+-	printf ("%sfjathhpc", first ? "" : "|"), first = FALSE;
++	printf ("%sfjathhpc", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_FJDES)
+-	printf ("%sfjdes", first ? "" : "|"), first = FALSE;
++	printf ("%sfjdes", first ? "" : "|"), first = 0;
+       if (mask & ELF_SPARC_HWCAP2_FJAES)
+-	printf ("%sfjaes", first ? "" : "|"), first = FALSE;
++	printf ("%sfjaes", first ? "" : "|"), first = 0;
+     }
+   else
+     fputc ('0', stdout);
+@@ -14300,7 +14226,7 @@
+ }
+ 
+ static void
+-print_mips_fp_abi_value (unsigned int val)
++print_mips_fp_abi_value (int val)
+ {
+   switch (val)
+     {
+@@ -14345,7 +14271,7 @@
+   if (tag == Tag_GNU_MIPS_ABI_FP)
+     {
+       unsigned int len;
+-      unsigned int val;
++      int val;
+ 
+       val = read_uleb128 (p, &len, end);
+       p += len;
+@@ -14359,7 +14285,7 @@
+   if (tag == Tag_GNU_MIPS_ABI_MSA)
+     {
+       unsigned int len;
+-      unsigned int val;
++      int val;
+ 
+       val = read_uleb128 (p, &len, end);
+       p += len;
+@@ -14762,7 +14688,7 @@
+   return p;
+ }
+ 
+-static bfd_boolean
++static int
+ process_attributes (FILE * file,
+ 		    const char * public_name,
+ 		    unsigned int proc_type,
+@@ -14771,7 +14697,6 @@
+ {
+   Elf_Internal_Shdr * sect;
+   unsigned i;
+-  bfd_boolean res = TRUE;
+ 
+   /* Find the section header so that we get the size.  */
+   for (i = 0, sect = section_headers;
+@@ -14787,19 +14712,13 @@
+       contents = (unsigned char *) get_data (NULL, file, sect->sh_offset, 1,
+                                              sect->sh_size, _("attributes"));
+       if (contents == NULL)
+-	{
+-	  res = FALSE;
+-	  continue;
+-	}
++	continue;
+ 
+       p = contents;
+       /* The first character is the version of the attributes.
+ 	 Currently only version 1, (aka 'A') is recognised here.  */
+       if (*p != 'A')
+-	{
+-	  printf (_("Unknown attributes version '%c'(%d) - expecting 'A'\n"), *p, *p);
+-	  res = FALSE;
+-	}
++	printf (_("Unknown attributes version '%c'(%d) - expecting 'A'\n"), *p, *p);
+       else
+ 	{
+ 	  bfd_vma section_len;
+@@ -14817,7 +14736,6 @@
+ 	      if (section_len <= 4)
+ 		{
+ 		  error (_("Tag section ends prematurely\n"));
+-		  res = FALSE;
+ 		  break;
+ 		}
+ 	      attr_len = byte_get (p, 4);
+@@ -14828,13 +14746,11 @@
+ 		  error (_("Bad attribute length (%u > %u)\n"),
+ 			  (unsigned) attr_len, (unsigned) section_len);
+ 		  attr_len = section_len;
+-		  res = FALSE;
+ 		}
+ 	      /* PR 17531: file: 001-101425-0.004  */
+ 	      else if (attr_len < 5)
+ 		{
+ 		  error (_("Attribute length of %u is too small\n"), (unsigned) attr_len);
+-		  res = FALSE;
+ 		  break;
+ 		}
+ 
+@@ -14845,7 +14761,6 @@
+ 	      if (namelen == 0 || namelen >= attr_len)
+ 		{
+ 		  error (_("Corrupt attribute section name\n"));
+-		  res = FALSE;
+ 		  break;
+ 		}
+ 
+@@ -14877,7 +14792,6 @@
+ 		  if (attr_len < 6)
+ 		    {
+ 		      error (_("Unused bytes at end of section\n"));
+-		      res = FALSE;
+ 		      section_len = 0;
+ 		      break;
+ 		    }
+@@ -14888,7 +14802,6 @@
+ 		    {
+ 		      error (_("Bad subsection length (%u > %u)\n"),
+ 			      (unsigned) size, (unsigned) attr_len);
+-		      res = FALSE;
+ 		      size = attr_len;
+ 		    }
+ 		  /* PR binutils/17531: Safe handling of corrupt files.  */
+@@ -14896,7 +14809,6 @@
+ 		    {
+ 		      error (_("Bad subsection length (%u < 6)\n"),
+ 			      (unsigned) size);
+-		      res = FALSE;
+ 		      section_len = 0;
+ 		      break;
+ 		    }
+@@ -14964,8 +14876,7 @@
+ 
+       free (contents);
+     }
+-
+-  return res;
++  return 1;
+ }
+ 
+ /* DATA points to the contents of a MIPS GOT that starts at VMA PLTGOT.
+@@ -15141,7 +15052,7 @@
+     }
+ }
+ 
+-static signed int
++static int
+ get_mips_reg_size (int reg_size)
+ {
+   return (reg_size == AFL_REG_NONE) ? 0
+@@ -15151,7 +15062,7 @@
+ 	 : -1;
+ }
+ 
+-static bfd_boolean
++static int
+ process_mips_specific (FILE * file)
+ {
+   Elf_Internal_Dyn * entry;
+@@ -15169,11 +15080,9 @@
+   bfd_vma local_gotno = 0;
+   bfd_vma gotsym = 0;
+   bfd_vma symtabno = 0;
+-  bfd_boolean res = TRUE;
+ 
+-  if (! process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL,
+-			    display_mips_gnu_attribute))
+-    res = FALSE;
++  process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL,
++		      display_mips_gnu_attribute);
+ 
+   sect = find_section (".MIPS.abiflags");
+ 
+@@ -15183,10 +15092,7 @@
+       Elf_Internal_ABIFlags_v0 abiflags_in;
+ 
+       if (sizeof (Elf_External_ABIFlags_v0) != sect->sh_size)
+-	{
+-	  error (_("Corrupt MIPS ABI Flags section.\n"));
+-	  res = FALSE;
+-	}
++	fputs ("\nCorrupt ABI Flags section.\n", stdout);
+       else
+ 	{
+ 	  abiflags_ext = get_data (NULL, file, sect->sh_offset, 1,
+@@ -15316,7 +15222,7 @@
+ 	  if (data)
+ 	    free (data);
+ 	}
+-      return res;
++      return 0;
+     }
+ 
+   for (entry = dynamic_section;
+@@ -15451,8 +15357,6 @@
+ 
+ 	  free (elib);
+ 	}
+-      else
+-	res = FALSE;
+     }
+ 
+   if (options_offset != 0)
+@@ -15470,7 +15374,7 @@
+       if (sect == NULL)
+ 	{
+ 	  error (_("No MIPS_OPTIONS header found\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       eopt = (Elf_External_Options *) get_data (NULL, file, options_offset, 1,
+@@ -15482,7 +15386,7 @@
+ 	  if (iopt == NULL)
+ 	    {
+ 	      error (_("Out of memory allocating space for MIPS options\n"));
+-	      return FALSE;
++	      return 0;
+ 	    }
+ 
+ 	  offset = cnt = 0;
+@@ -15504,7 +15408,7 @@
+ 		  || offset + option->size > sect->sh_size)
+ 		{
+ 		  error (_("Invalid size (%u) for MIPS option\n"), option->size);
+-		  return FALSE;
++		  return 0;
+ 		}
+ 	      offset += option->size;
+ 
+@@ -15670,8 +15574,6 @@
+ 
+ 	  free (eopt);
+ 	}
+-      else
+-	res = FALSE;
+     }
+ 
+   if (conflicts_offset != 0 && conflictsno != 0)
+@@ -15682,7 +15584,7 @@
+       if (dynamic_symbols == NULL)
+ 	{
+ 	  error (_("conflict list found without a dynamic symbol table\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       /* PR 21345 - print a slightly more helpful error message
+@@ -15691,7 +15593,7 @@
+ 	{
+ 	  error (_("Overlarge number of conflicts detected: %lx\n"),
+ 		 (long) conflictsno);
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       iconf = (Elf32_Conflict *) cmalloc (conflictsno, sizeof (* iconf));
+@@ -15709,7 +15611,7 @@
+               get_data (NULL, file, conflicts_offset, conflictsno,
+                         sizeof (* econf32), _("conflict"));
+ 	  if (!econf32)
+-	    return FALSE;
++	    return 0;
+ 
+ 	  for (cnt = 0; cnt < conflictsno; ++cnt)
+ 	    iconf[cnt] = BYTE_GET (econf32[cnt]);
+@@ -15724,7 +15626,7 @@
+               get_data (NULL, file, conflicts_offset, conflictsno,
+                         sizeof (* econf64), _("conflict"));
+ 	  if (!econf64)
+-	    return FALSE;
++	    return 0;
+ 
+ 	  for (cnt = 0; cnt < conflictsno; ++cnt)
+ 	    iconf[cnt] = BYTE_GET (econf64[cnt]);
+@@ -15777,7 +15679,7 @@
+ 	{
+ 	  error (_("The GOT symbol offset (%lu) is greater than the symbol table size (%lu)\n"),
+ 		 (unsigned long) gotsym, (unsigned long) symtabno);
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       global_end = local_end + (symtabno - gotsym) * addr_size;
+@@ -15785,7 +15687,7 @@
+       if (global_end < local_end)
+ 	{
+ 	  error (_("Too many GOT symbols: %lu\n"), (unsigned long) symtabno);
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       offset = offset_from_vma (file, pltgot, global_end - pltgot);
+@@ -15908,12 +15810,12 @@
+       if (pltrel == DT_RELA)
+ 	{
+ 	  if (!slurp_rela_relocs (file, rel_offset, pltrelsz, &rels, &count))
+-	    return FALSE;
++	    return 0;
+ 	}
+       else
+ 	{
+ 	  if (!slurp_rel_relocs (file, rel_offset, pltrelsz, &rels, &count))
+-	    return FALSE;
++	    return 0;
+ 	}
+ 
+       ent = mips_pltgot;
+@@ -15924,7 +15826,7 @@
+       data = (unsigned char *) get_data (NULL, file, offset, end - mips_pltgot,
+                                          1, _("Procedure Linkage Table data"));
+       if (data == NULL)
+-	return FALSE;
++	return 0;
+ 
+       printf ("\nPLT GOT:\n\n");
+       printf (_(" Reserved entries:\n"));
+@@ -15973,10 +15875,10 @@
+       free (rels);
+     }
+ 
+-  return res;
++  return 1;
+ }
+ 
+-static bfd_boolean
++static int
+ process_nds32_specific (FILE * file)
+ {
+   Elf_Internal_Shdr *sect = NULL;
+@@ -15990,9 +15892,6 @@
+       flag = get_data (NULL, file, sect->sh_offset, 1,
+ 		       sect->sh_size, _("NDS32 elf flags section"));
+ 
+-      if (! flag)
+-	return FALSE;
+-
+       switch ((*flag) & 0x3)
+ 	{
+ 	case 0:
+@@ -16013,7 +15912,7 @@
+   return TRUE;
+ }
+ 
+-static bfd_boolean
++static int
+ process_gnu_liblist (FILE * file)
+ {
+   Elf_Internal_Shdr * section;
+@@ -16023,10 +15922,9 @@
+   size_t strtab_size;
+   size_t cnt;
+   unsigned i;
+-  bfd_boolean res = TRUE;
+ 
+   if (! do_arch)
+-    return TRUE;
++    return 0;
+ 
+   for (i = 0, section = section_headers;
+        i < elf_header.e_shnum;
+@@ -16043,12 +15941,9 @@
+                         _("liblist section data"));
+ 
+ 	  if (elib == NULL)
+-	    {
+-	      res = FALSE;
+-	      break;
+-	    }
+-
++	    break;
+ 	  string_sec = section_headers + section->sh_link;
++
+ 	  strtab = (char *) get_data (NULL, file, string_sec->sh_offset, 1,
+                                       string_sec->sh_size,
+                                       _("liblist string table"));
+@@ -16057,7 +15952,6 @@
+ 	    {
+ 	      free (elib);
+ 	      free (strtab);
+-	      res = FALSE;
+ 	      break;
+ 	    }
+ 	  strtab_size = string_sec->sh_size;
+@@ -16104,7 +15998,7 @@
+ 	}
+     }
+ 
+-  return res;
++  return 1;
+ }
+ 
+ static const char *
+@@ -16209,7 +16103,7 @@
+   return buff;
+ }
+ 
+-static bfd_boolean
++static int
+ print_core_note (Elf_Internal_Note *pnote)
+ {
+   unsigned int addr_size = is_32bit_elf ? 4 : 8;
+@@ -16217,21 +16111,21 @@
+   unsigned char *descdata, *filenames, *descend;
+ 
+   if (pnote->type != NT_FILE)
+-    return TRUE;
++    return 1;
+ 
+ #ifndef BFD64
+   if (!is_32bit_elf)
+     {
+       printf (_("    Cannot decode 64-bit note in 32-bit build\n"));
+       /* Still "successful".  */
+-      return TRUE;
++      return 1;
+     }
+ #endif
+ 
+   if (pnote->descsz < 2 * addr_size)
+     {
+-      error (_("    Malformed note - too short for header\n"));
+-      return FALSE;
++      printf (_("    Malformed note - too short for header\n"));
++      return 0;
+     }
+ 
+   descdata = (unsigned char *) pnote->descdata;
+@@ -16239,8 +16133,8 @@
+ 
+   if (descdata[pnote->descsz - 1] != '\0')
+     {
+-      error (_("    Malformed note - does not end with \\0\n"));
+-      return FALSE;
++      printf (_("    Malformed note - does not end with \\0\n"));
++      return 0;
+     }
+ 
+   count = byte_get (descdata, addr_size);
+@@ -16251,8 +16145,8 @@
+ 
+   if (pnote->descsz < 2 * addr_size + count * 3 * addr_size)
+     {
+-      error (_("    Malformed note - too short for supplied file count\n"));
+-      return FALSE;
++      printf (_("    Malformed note - too short for supplied file count\n"));
++      return 0;
+     }
+ 
+   printf (_("    Page size: "));
+@@ -16270,8 +16164,8 @@
+ 
+       if (filenames == descend)
+ 	{
+-	  error (_("    Malformed note - filenames end too early\n"));
+-	  return FALSE;
++	  printf (_("    Malformed note - filenames end too early\n"));
++	  return 0;
+ 	}
+ 
+       start = byte_get (descdata, addr_size);
+@@ -16292,7 +16186,7 @@
+       filenames += 1 + strlen ((char *) filenames);
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ static const char *
+@@ -16523,7 +16417,7 @@
+   printf ("\n");
+ }
+ 
+-static bfd_boolean
++static int
+ print_gnu_note (Elf_Internal_Note *pnote)
+ {
+   /* NB/ Keep this switch statement in sync with get_gnu_elf_note_type ().  */
+@@ -16613,8 +16507,8 @@
+ 	printf (_("      Hardware Capabilities: "));
+ 	if (pnote->descsz < 8)
+ 	  {
+-	    error (_("<corrupt GNU_HWCAP>\n"));
+-	    return FALSE;
++	    printf (_("<corrupt GNU_HWCAP>\n"));
++	    break;
+ 	  }
+ 	num_entries = byte_get ((unsigned char *) pnote->descdata, 4);
+ 	mask = byte_get ((unsigned char *) pnote->descdata + 4, 4);
+@@ -16642,7 +16536,7 @@
+       break;
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ static const char *
+@@ -16664,20 +16558,19 @@
+     }
+ }
+ 
+-static bfd_boolean
++static int
+ print_v850_note (Elf_Internal_Note * pnote)
+ {
+   unsigned int val;
+ 
+   if (pnote->descsz != 4)
+-    return FALSE;
+-
++    return 0;
+   val = byte_get ((unsigned char *) pnote->descdata, pnote->descsz);
+ 
+   if (val == 0)
+     {
+       printf (_("not set\n"));
+-      return TRUE;
++      return 1;
+     }
+ 
+   switch (pnote->type)
+@@ -16685,24 +16578,24 @@
+     case V850_NOTE_ALIGNMENT:
+       switch (val)
+ 	{
+-	case EF_RH850_DATA_ALIGN4: printf (_("4-byte\n")); return TRUE;
+-	case EF_RH850_DATA_ALIGN8: printf (_("8-byte\n")); return TRUE;
++	case EF_RH850_DATA_ALIGN4: printf (_("4-byte\n")); return 1;
++	case EF_RH850_DATA_ALIGN8: printf (_("8-byte\n")); return 1;
+ 	}
+       break;
+ 
+     case V850_NOTE_DATA_SIZE:
+       switch (val)
+ 	{
+-	case EF_RH850_DOUBLE32: printf (_("4-bytes\n")); return TRUE;
+-	case EF_RH850_DOUBLE64: printf (_("8-bytes\n")); return TRUE;
++	case EF_RH850_DOUBLE32: printf (_("4-bytes\n")); return 1;
++	case EF_RH850_DOUBLE64: printf (_("8-bytes\n")); return 1;
+ 	}
+       break;
+ 
+     case V850_NOTE_FPU_INFO:
+       switch (val)
+ 	{
+-	case EF_RH850_FPU20: printf (_("FPU-2.0\n")); return TRUE;
+-	case EF_RH850_FPU30: printf (_("FPU-3.0\n")); return TRUE;
++	case EF_RH850_FPU20: printf (_("FPU-2.0\n")); return 1;
++	case EF_RH850_FPU30: printf (_("FPU-3.0\n")); return 1;
+ 	}
+       break;
+ 
+@@ -16712,7 +16605,7 @@
+       if (val == EF_RH850_SIMD)
+ 	{
+ 	  printf (_("yes\n"));
+-	  return TRUE;
++	  return 1;
+ 	}
+       break;
+ 
+@@ -16722,10 +16615,10 @@
+     }
+ 
+   printf (_("unknown value: %x\n"), val);
+-  return FALSE;
++  return 0;
+ }
+ 
+-static bfd_boolean
++static int
+ process_netbsd_elf_note (Elf_Internal_Note * pnote)
+ {
+   unsigned int version;
+@@ -16743,18 +16636,20 @@
+ 	printf ("  NetBSD\t\t0x%08lx\tIDENT %u (%u.%u.%u)\n", pnote->descsz,
+ 	        version, version / 100000000, (version / 1000000) % 100,
+ 		(version / 100) % 100);
+-      return TRUE;
++      return 1;
+ 
+     case NT_NETBSD_MARCH:
+       printf ("  NetBSD\t0x%08lx\tMARCH <%s>\n", pnote->descsz,
+ 	      pnote->descdata);
+-      return TRUE;
++      return 1;
+ 
+     default:
+-      printf ("  NetBSD\t0x%08lx\tUnknown note type: (0x%08lx)\n", pnote->descsz,
+-	      pnote->type);
+-      return FALSE;
++      break;
+     }
++
++  printf ("  NetBSD\t0x%08lx\tUnknown note type: (0x%08lx)\n", pnote->descsz,
++	  pnote->type);
++  return 1;
+ }
+ 
+ static const char *
+@@ -16866,7 +16761,7 @@
+   return buff;
+ }
+ 
+-static bfd_boolean
++static int
+ print_stapsdt_note (Elf_Internal_Note *pnote)
+ {
+   int addr_size = is_32bit_elf ? 4 : 8;
+@@ -16944,7 +16839,7 @@
+     }
+ }
+ 
+-static bfd_boolean
++static int
+ print_ia64_vms_note (Elf_Internal_Note * pnote)
+ {
+   switch (pnote->type)
+@@ -17010,9 +16905,9 @@
+       printf (_("    Linker id: %s\n"), pnote->descdata);
+       break;
+     default:
+-      return FALSE;
++      break;
+     }
+-  return TRUE;
++  return 1;
+ }
+ 
+ /* Print the name of the symbol associated with a build attribute
+@@ -17416,7 +17311,7 @@
+ 
+    If the value of namesz is zero, there is no name present.  */
+ 
+-static bfd_boolean
++static int
+ process_note (Elf_Internal_Note *  pnote,
+ 	      FILE *               file)
+ {
+@@ -17500,10 +17395,10 @@
+   if (do_wide)
+     printf ("\n");
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+-static bfd_boolean
++static int
+ process_notes_at (FILE *              file,
+ 		  Elf_Internal_Shdr * section,
+ 		  bfd_vma             offset,
+@@ -17512,25 +17407,22 @@
+   Elf_External_Note * pnotes;
+   Elf_External_Note * external;
+   char * end;
+-  bfd_boolean res = TRUE;
++  int res = 1;
+ 
+   if (length <= 0)
+-    return FALSE;
++    return 0;
+ 
+   if (section)
+     {
+       pnotes = (Elf_External_Note *) get_section_contents (section, file);
+       if (pnotes)
+-	{
+-	  if (! apply_relocations (file, section, (unsigned char *) pnotes, length, NULL, NULL))
+-	    return FALSE;
+-	}
++	apply_relocations (file, section, (unsigned char *) pnotes, length, NULL, NULL);
+     }
+   else
+     pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length,
+ 					     _("notes"));
+   if (pnotes == NULL)
+-    return FALSE;
++    return 0;
+ 
+   external = pnotes;
+ 
+@@ -17629,7 +17521,7 @@
+ 	  if (temp == NULL)
+ 	    {
+ 	      error (_("Out of memory allocating space for inote name\n"));
+-	      res = FALSE;
++	      res = 0;
+ 	      break;
+ 	    }
+ 
+@@ -17655,12 +17547,12 @@
+   return res;
+ }
+ 
+-static bfd_boolean
++static int
+ process_corefile_note_segments (FILE * file)
+ {
+   Elf_Internal_Phdr * segment;
+   unsigned int i;
+-  bfd_boolean res = TRUE;
++  int res = 1;
+ 
+   if (! get_program_headers (file))
+     return TRUE;
+@@ -17670,30 +17562,29 @@
+        i++, segment++)
+     {
+       if (segment->p_type == PT_NOTE)
+-	if (! process_notes_at (file, NULL,
+-				(bfd_vma) segment->p_offset,
+-				(bfd_vma) segment->p_filesz))
+-	  res = FALSE;
++	res &= process_notes_at (file, NULL,
++				 (bfd_vma) segment->p_offset,
++				 (bfd_vma) segment->p_filesz);
+     }
+ 
+   return res;
+ }
+ 
+-static bfd_boolean
++static int
+ process_v850_notes (FILE * file, bfd_vma offset, bfd_vma length)
+ {
+   Elf_External_Note * pnotes;
+   Elf_External_Note * external;
+   char * end;
+-  bfd_boolean res = TRUE;
++  int res = 1;
+ 
+   if (length <= 0)
+-    return FALSE;
++    return 0;
+ 
+   pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length,
+                                            _("v850 notes"));
+   if (pnotes == NULL)
+-    return FALSE;
++    return 0;
+ 
+   external = pnotes;
+   end = (char*) pnotes + length;
+@@ -17749,7 +17640,7 @@
+ 
+       if (! print_v850_note (& inote))
+ 	{
+-	  res = FALSE;
++	  res = 0;
+ 	  printf ("<corrupt sizes: namesz: %lx, descsz: %lx>\n",
+ 		  inote.namesz, inote.descsz);
+ 	}
+@@ -17760,13 +17651,13 @@
+   return res;
+ }
+ 
+-static bfd_boolean
++static int
+ process_note_sections (FILE * file)
+ {
+   Elf_Internal_Shdr * section;
+   unsigned long i;
+-  unsigned int n = 0;
+-  bfd_boolean res = TRUE;
++  int n = 0;
++  int res = 1;
+ 
+   for (i = 0, section = section_headers;
+        i < elf_header.e_shnum && section != NULL;
+@@ -17774,10 +17665,9 @@
+     {
+       if (section->sh_type == SHT_NOTE)
+ 	{
+-	  if (! process_notes_at (file, section,
+-				  (bfd_vma) section->sh_offset,
+-				  (bfd_vma) section->sh_size))
+-	    res = FALSE;
++	  res &= process_notes_at (file, section,
++				   (bfd_vma) section->sh_offset,
++				   (bfd_vma) section->sh_size);
+ 	  n++;
+ 	}
+ 
+@@ -17786,10 +17676,9 @@
+ 	   || elf_header.e_machine == EM_CYGNUS_V850)
+ 	  && section->sh_type == SHT_RENESAS_INFO)
+ 	{
+-	  if (! process_v850_notes (file,
+-				    (bfd_vma) section->sh_offset,
+-				    (bfd_vma) section->sh_size))
+-	    res = FALSE;
++	  res &= process_v850_notes (file,
++				     (bfd_vma) section->sh_offset,
++				     (bfd_vma) section->sh_size);
+ 	  n++;
+ 	}
+     }
+@@ -17801,12 +17690,12 @@
+   return res;
+ }
+ 
+-static bfd_boolean
++static int
+ process_notes (FILE * file)
+ {
+   /* If we have not been asked to display the notes then do nothing.  */
+   if (! do_notes)
+-    return TRUE;
++    return 1;
+ 
+   if (elf_header.e_type != ET_CORE)
+     return process_note_sections (file);
+@@ -17816,7 +17705,7 @@
+     return process_corefile_note_segments (file);
+ 
+   printf (_("No note segments present in the core file.\n"));
+-  return TRUE;
++  return 1;
+ }
+ 
+ static unsigned char *
+@@ -17842,11 +17731,11 @@
+   return display_tag_value (tag, start, end);
+ }
+ 
+-static bfd_boolean
++static int
+ process_arch_specific (FILE * file)
+ {
+   if (! do_arch)
+-    return TRUE;
++    return 1;
+ 
+   switch (elf_header.e_machine)
+     {
+@@ -17901,12 +17790,12 @@
+     }
+ }
+ 
+-static bfd_boolean
++static int
+ get_file_header (FILE * file)
+ {
+   /* Read in the identity array.  */
+   if (fread (elf_header.e_ident, EI_NIDENT, 1, file) != 1)
+-    return FALSE;
++    return 0;
+ 
+   /* Determine how to read the rest of the header.  */
+   switch (elf_header.e_ident[EI_DATA])
+@@ -17932,7 +17821,7 @@
+       Elf32_External_Ehdr ehdr32;
+ 
+       if (fread (ehdr32.e_type, sizeof (ehdr32) - EI_NIDENT, 1, file) != 1)
+-	return FALSE;
++	return 0;
+ 
+       elf_header.e_type      = BYTE_GET (ehdr32.e_type);
+       elf_header.e_machine   = BYTE_GET (ehdr32.e_machine);
+@@ -17960,11 +17849,11 @@
+ 	{
+ 	  error (_("This instance of readelf has been built without support for a\n\
+ 64 bit data type and so it cannot read 64 bit ELF files.\n"));
+-	  return FALSE;
++	  return 0;
+ 	}
+ 
+       if (fread (ehdr64.e_type, sizeof (ehdr64) - EI_NIDENT, 1, file) != 1)
+-	return FALSE;
++	return 0;
+ 
+       elf_header.e_type      = BYTE_GET (ehdr64.e_type);
+       elf_header.e_machine   = BYTE_GET (ehdr64.e_machine);
+@@ -17991,24 +17880,22 @@
+ 	get_64bit_section_headers (file, TRUE);
+     }
+ 
+-  return TRUE;
++  return 1;
+ }
+ 
+ /* Process one ELF object file according to the command line options.
+    This file may actually be stored in an archive.  The file is
+-   positioned at the start of the ELF object.  Returns TRUE if no
+-   problems were encountered, FALSE otherwise.  */
++   positioned at the start of the ELF object.  */
+ 
+-static bfd_boolean
++static int
+ process_object (char * file_name, FILE * file)
+ {
+   unsigned int i;
+-  bfd_boolean res = TRUE;
+ 
+   if (! get_file_header (file))
+     {
+       error (_("%s: Failed to read file header\n"), file_name);
+-      return FALSE;
++      return 1;
+     }
+ 
+   /* Initialise per file variables.  */
+@@ -18042,52 +17929,44 @@
+     }
+ 
+   if (! process_file_header ())
+-    return FALSE;
++    return 1;
+ 
+   if (! process_section_headers (file))
+     {
+-      /* Without loaded section headers we cannot process lots of things.  */
+-      do_unwind = do_version = do_dump = do_arch = FALSE;
++      /* Without loaded section headers we cannot process lots of
++	 things.  */
++      do_unwind = do_version = do_dump = do_arch = 0;
+ 
+       if (! do_using_dynamic)
+-	do_syms = do_dyn_syms = do_reloc = FALSE;
++	do_syms = do_dyn_syms = do_reloc = 0;
+     }
+ 
+   if (! process_section_groups (file))
+-    /* Without loaded section groups we cannot process unwind.  */
+-    do_unwind = FALSE;
++    {
++      /* Without loaded section groups we cannot process unwind.  */
++      do_unwind = 0;
++    }
+ 
+   if (process_program_headers (file))
+     process_dynamic_section (file);
+-  else
+-    res = FALSE;
+ 
+-  if (! process_relocs (file))
+-    res = FALSE;
++  process_relocs (file);
+ 
+-  if (! process_unwind (file))
+-    res = FALSE;
++  process_unwind (file);
+ 
+-  if (! process_symbol_table (file))
+-    res = FALSE;
++  process_symbol_table (file);
+ 
+-  if (! process_syminfo (file))
+-    res = FALSE;
++  process_syminfo (file);
+ 
+-  if (! process_version_sections (file))
+-    res = FALSE;
++  process_version_sections (file);
+ 
+-  if (! process_section_contents (file))
+-    res = FALSE;
++  process_section_contents (file);
+ 
+-  if (! process_notes (file))
+-    res = FALSE;
++  process_notes (file);
+ 
+-  if (! process_gnu_liblist (file))
+-    res = FALSE;
++  process_gnu_liblist (file);
+ 
+-  if (! process_arch_specific (file))
+-    res = FALSE;
++  process_arch_specific (file);
+ 
+   if (program_headers)
+     {
+@@ -18160,22 +18039,21 @@
+ 
+   free_debug_memory ();
+ 
+-  return res;
++  return 0;
+ }
+ 
+ /* Process an ELF archive.
+-   On entry the file is positioned just after the ARMAG string.
+-   Returns TRUE upon success, FALSE otherwise.  */
++   On entry the file is positioned just after the ARMAG string.  */
+ 
+-static bfd_boolean
++static int
+ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive)
+ {
+   struct archive_info arch;
+   struct archive_info nested_arch;
+   size_t got;
+-  bfd_boolean ret = TRUE;
++  int ret;
+ 
+-  show_name = TRUE;
++  show_name = 1;
+ 
+   /* The ARCH structure is used to hold information about this archive.  */
+   arch.file_name = NULL;
+@@ -18195,7 +18073,7 @@
+ 
+   if (setup_archive (&arch, file_name, file, is_thin_archive, do_archive_index) != 0)
+     {
+-      ret = FALSE;
++      ret = 1;
+       goto out;
+     }
+ 
+@@ -18238,7 +18116,6 @@
+ 		{
+ 		  error (_("%s: end of the symbol table reached before the end of the index\n"),
+ 			 file_name);
+-		  ret = FALSE;
+ 		  break;
+ 		}
+ 	      /* PR 17531: file: 0b6630b2.  */
+@@ -18252,16 +18129,13 @@
+ 	    l += l & 1;
+ 
+ 	  if (l < arch.sym_size)
+-	    {
+-	      error (_("%s: %ld bytes remain in the symbol table, but without corresponding entries in the index table\n"),
+-		     file_name, arch.sym_size - l);
+-	      ret = FALSE;
+-	    }
++	    error (_("%s: %ld bytes remain in the symbol table, but without corresponding entries in the index table\n"),
++		   file_name, arch.sym_size - l);
+ 
+ 	  if (fseek (file, current_pos, SEEK_SET) != 0)
+ 	    {
+ 	      error (_("%s: failed to seek back to start of object files in the archive\n"), file_name);
+-	      ret = FALSE;
++	      ret = 1;
+ 	      goto out;
+ 	    }
+ 	}
+@@ -18271,11 +18145,13 @@
+ 	  && !do_histogram && !do_debugging && !do_arch && !do_notes
+ 	  && !do_section_groups && !do_dyn_syms)
+ 	{
+-	  ret = TRUE; /* Archive index only.  */
++	  ret = 0; /* Archive index only.  */
+ 	  goto out;
+ 	}
+     }
+ 
++  ret = 0;
++
+   while (1)
+     {
+       char * name;
+@@ -18286,7 +18162,7 @@
+       if (fseek (file, arch.next_arhdr_offset, SEEK_SET) != 0)
+         {
+           error (_("%s: failed to seek to next archive header\n"), file_name);
+-          return FALSE;
++          return 1;
+         }
+       got = fread (&arch.arhdr, 1, sizeof arch.arhdr, file);
+       if (got != sizeof arch.arhdr)
+@@ -18294,13 +18170,13 @@
+           if (got == 0)
+ 	    break;
+           error (_("%s: failed to read archive header\n"), file_name);
+-          ret = FALSE;
++          ret = 1;
+           break;
+         }
+       if (memcmp (arch.arhdr.ar_fmag, ARFMAG, 2) != 0)
+         {
+           error (_("%s: did not find a valid archive header\n"), arch.file_name);
+-          ret = FALSE;
++          ret = 1;
+           break;
+         }
+ 
+@@ -18314,7 +18190,7 @@
+       if (name == NULL)
+ 	{
+ 	  error (_("%s: bad archive file name\n"), file_name);
+-	  ret = FALSE;
++	  ret = 1;
+ 	  break;
+ 	}
+       namelen = strlen (name);
+@@ -18323,7 +18199,7 @@
+       if (qualified_name == NULL)
+ 	{
+ 	  error (_("%s: bad archive file name\n"), file_name);
+-	  ret = FALSE;
++	  ret = 1;
+ 	  break;
+ 	}
+ 
+@@ -18332,10 +18208,9 @@
+           /* This is a proxy for an external member of a thin archive.  */
+           FILE * member_file;
+           char * member_file_name = adjust_relative_path (file_name, name, namelen);
+-
+           if (member_file_name == NULL)
+             {
+-              ret = FALSE;
++              ret = 1;
+               break;
+             }
+ 
+@@ -18344,14 +18219,13 @@
+             {
+               error (_("Input file '%s' is not readable.\n"), member_file_name);
+               free (member_file_name);
+-              ret = FALSE;
++              ret = 1;
+               break;
+             }
+ 
+           archive_file_offset = arch.nested_member_origin;
+ 
+-          if (! process_object (qualified_name, member_file))
+-	    ret = FALSE;
++          ret |= process_object (qualified_name, member_file);
+ 
+           fclose (member_file);
+           free (member_file_name);
+@@ -18363,7 +18237,7 @@
+ 	    {
+ 	      error (_("%s: contains corrupt thin archive: %s\n"),
+ 		     file_name, name);
+-	      ret = FALSE;
++	      ret = 1;
+ 	      break;
+ 	    }
+ 
+@@ -18375,20 +18249,18 @@
+           if (fseek (nested_arch.file, archive_file_offset, SEEK_SET) != 0)
+             {
+               error (_("%s: failed to seek to archive member.\n"), nested_arch.file_name);
+-              ret = FALSE;
++              ret = 1;
+               break;
+             }
+ 
+-          if (! process_object (qualified_name, nested_arch.file))
+-	    ret = FALSE;
++          ret |= process_object (qualified_name, nested_arch.file);
+         }
+       else
+         {
+           archive_file_offset = arch.next_arhdr_offset;
+           arch.next_arhdr_offset += archive_file_size;
+ 
+-          if (! process_object (qualified_name, file))
+-	    ret = FALSE;
++          ret |= process_object (qualified_name, file);
+         }
+ 
+       if (dump_sects != NULL)
+@@ -18410,13 +18282,13 @@
+   return ret;
+ }
+ 
+-static bfd_boolean
++static int
+ process_file (char * file_name)
+ {
+   FILE * file;
+   struct stat statbuf;
+   char armag[SARMAG];
+-  bfd_boolean ret = TRUE;
++  int ret;
+ 
+   if (stat (file_name, &statbuf) < 0)
+     {
+@@ -18425,41 +18297,35 @@
+       else
+ 	error (_("Could not locate '%s'.  System error message: %s\n"),
+ 	       file_name, strerror (errno));
+-      return FALSE;
++      return 1;
+     }
+ 
+   if (! S_ISREG (statbuf.st_mode))
+     {
+       error (_("'%s' is not an ordinary file\n"), file_name);
+-      return FALSE;
++      return 1;
+     }
+ 
+   file = fopen (file_name, "rb");
+   if (file == NULL)
+     {
+       error (_("Input file '%s' is not readable.\n"), file_name);
+-      return FALSE;
++      return 1;
+     }
+ 
+   if (fread (armag, SARMAG, 1, file) != 1)
+     {
+       error (_("%s: Failed to read file's magic number\n"), file_name);
+       fclose (file);
+-      return FALSE;
++      return 1;
+     }
+ 
+   current_file_size = (bfd_size_type) statbuf.st_size;
+ 
+   if (memcmp (armag, ARMAG, SARMAG) == 0)
+-    {
+-      if (! process_archive (file_name, file, FALSE))
+-	ret = FALSE;
+-    }
++    ret = process_archive (file_name, file, FALSE);
+   else if (memcmp (armag, ARMAGT, SARMAG) == 0)
+-    {
+-      if ( ! process_archive (file_name, file, TRUE))
+-	ret = FALSE;
+-    }
++    ret = process_archive (file_name, file, TRUE);
+   else
+     {
+       if (do_archive_index)
+@@ -18468,14 +18334,12 @@
+ 
+       rewind (file);
+       archive_file_size = archive_file_offset = 0;
+-
+-      if (! process_object (file_name, file))
+-	ret = FALSE;
++      ret = process_object (file_name, file);
+     }
+ 
+   fclose (file);
+-  current_file_size = 0;
+ 
++  current_file_size = 0;
+   return ret;
+ }
+ 
+@@ -18532,22 +18396,21 @@
+     }
+ 
+   if (optind < (argc - 1))
+-    show_name = TRUE;
++    show_name = 1;
+   else if (optind >= argc)
+     {
+       warn (_("Nothing to do.\n"));
+       usage (stderr);
+     }
+ 
+-  err = FALSE;
++  err = 0;
+   while (optind < argc)
+-    if (! process_file (argv[optind++]))
+-      err = TRUE;
++    err |= process_file (argv[optind++]);
+ 
+   if (dump_sects != NULL)
+     free (dump_sects);
+   if (cmdline_dump_sects != NULL)
+     free (cmdline_dump_sects);
+ 
+-  return err ? EXIT_FAILURE : EXIT_SUCCESS;
++  return err;
+ }