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

comparisons of bfd_boolean vars with TRUE/FALSE.  Formatting.

1 files changed, 199 insertions, 198 deletions

diff --git a/binutils/debug.c b/binutils/debug.c
index 3ce609b..1cd1d3d 100644
--- a/binutils/debug.c
+++ b/binutils/debug.c
@@ -111,7 +111,7 @@ struct debug_type
       struct debug_indirect_type *kindirect;
       /* DEBUG_KIND_INT.  */
       /* Whether the integer is unsigned.  */
-      boolean kint;
+      bfd_boolean kint;
       /* DEBUG_KIND_STRUCT, DEBUG_KIND_UNION, DEBUG_KIND_CLASS,
          DEBUG_KIND_UNION_CLASS.  */
       struct debug_class_type *kclass;
@@ -194,7 +194,7 @@ struct debug_function_type
   /* NULL terminated array of argument types.  */
   debug_type *arg_types;
   /* Whether the function takes a variable number of arguments.  */
-  boolean varargs;
+  bfd_boolean varargs;
 };
 
 /* Information kept for a range.  */
@@ -222,7 +222,7 @@ struct debug_array_type
   /* Upper bound.  */
   bfd_signed_vma upper;
   /* Whether this array is really a string.  */
-  boolean stringp;
+  bfd_boolean stringp;
 };
 
 /* Information kept for a set.  */
@@ -232,7 +232,7 @@ struct debug_set_type
   /* Base type.  */
   debug_type type;
   /* Whether this set is really a bitstring.  */
-  boolean bitstringp;
+  bfd_boolean bitstringp;
 };
 
 /* Information kept for an offset type (a based pointer).  */
@@ -256,7 +256,7 @@ struct debug_method_type
   /* A NULL terminated array of argument types.  */
   debug_type *arg_types;
   /* Whether the method takes a variable number of arguments.  */
-  boolean varargs;
+  bfd_boolean varargs;
 };
 
 /* Information kept for a named type.  */
@@ -280,7 +280,7 @@ struct debug_field
   /* Visibility of the field.  */
   enum debug_visibility visibility;
   /* Whether this is a static member.  */
-  boolean static_member;
+  bfd_boolean static_member;
   union
     {
       /* If static_member is false.  */
@@ -308,7 +308,7 @@ struct debug_baseclass
   /* Bit position of the base class in the object.  */
   unsigned int bitpos;
   /* Whether the base class is virtual.  */
-  boolean virtual;
+  bfd_boolean virtual;
   /* Visibility of the base class.  */
   enum debug_visibility visibility;
 };
@@ -335,9 +335,9 @@ struct debug_method_variant
   /* The visibility of the function.  */
   enum debug_visibility visibility;
   /* Whether the function is const.  */
-  boolean constp;
+  bfd_boolean constp;
   /* Whether the function is volatile.  */
-  boolean volatilep;
+  bfd_boolean volatilep;
   /* The offset to the function in the virtual function table.  */
   bfd_vma voffset;
   /* If voffset is VOFFSET_STATIC_METHOD, this is a static method.  */
@@ -554,7 +554,8 @@ struct debug_type_real_list
 
 /* Local functions.  */
 
-static void debug_error PARAMS ((const char *));
+static void debug_error
+  PARAMS ((const char *));
 static struct debug_name *debug_add_to_namespace
   PARAMS ((struct debug_handle *, struct debug_namespace **, const char *,
 	   enum debug_object_kind, enum debug_object_linkage));
@@ -565,29 +566,29 @@ static struct debug_type *debug_make_type
   PARAMS ((struct debug_handle *, enum debug_type_kind, unsigned int));
 static struct debug_type *debug_get_real_type
   PARAMS ((PTR, debug_type, struct debug_type_real_list *));
-static boolean debug_write_name
+static bfd_boolean debug_write_name
   PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
 	   struct debug_name *));
-static boolean debug_write_type
+static bfd_boolean debug_write_type
   PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
 	   struct debug_type *, struct debug_name *));
-static boolean debug_write_class_type
+static bfd_boolean debug_write_class_type
   PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
 	   struct debug_type *, const char *));
-static boolean debug_write_function
+static bfd_boolean debug_write_function
   PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
 	   const char *, enum debug_object_linkage, struct debug_function *));
-static boolean debug_write_block
+static bfd_boolean debug_write_block
   PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
 	   struct debug_block *));
-static boolean debug_write_linenos
+static bfd_boolean debug_write_linenos
   PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
 	   bfd_vma));
-static boolean debug_set_class_id
+static bfd_boolean debug_set_class_id
   PARAMS ((struct debug_handle *, const char *, struct debug_type *));
-static boolean debug_type_samep
+static bfd_boolean debug_type_samep
   PARAMS ((struct debug_handle *, struct debug_type *, struct debug_type *));
-static boolean debug_class_type_samep
+static bfd_boolean debug_class_type_samep
   PARAMS ((struct debug_handle *, struct debug_type *, struct debug_type *));
 
 /* Issue an error message.  */
@@ -677,7 +678,7 @@ debug_init ()
 /* Set the source filename.  This implicitly starts a new compilation
    unit.  */
 
-boolean
+bfd_boolean
 debug_set_filename (handle, name)
      PTR handle;
      const char *name;
@@ -714,13 +715,13 @@ debug_set_filename (handle, name)
   info->current_block = NULL;
   info->current_lineno = NULL;
 
-  return true;
+  return TRUE;
 }
 
 /* Change source files to the given file name.  This is used for
    include files in a single compilation unit.  */
 
-boolean
+bfd_boolean
 debug_start_source (handle, name)
      PTR handle;
      const char *name;
@@ -734,7 +735,7 @@ debug_start_source (handle, name)
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_start_source: no debug_set_filename call"));
-      return false;
+      return FALSE;
     }
 
   for (f = info->current_unit->files; f != NULL; f = f->next)
@@ -744,7 +745,7 @@ debug_start_source (handle, name)
 	  && strcmp (f->filename, name) == 0)
 	{
 	  info->current_file = f;
-	  return true;
+	  return TRUE;
 	}
     }
 
@@ -761,7 +762,7 @@ debug_start_source (handle, name)
 
   info->current_file = f;
 
-  return true;
+  return TRUE;
 }
 
 /* Record a function definition.  This implicitly starts a function
@@ -772,12 +773,12 @@ debug_start_source (handle, name)
    debug_record_parameter.  FIXME: There is no way to specify nested
    functions.  */
 
-boolean
+bfd_boolean
 debug_record_function (handle, name, return_type, global, addr)
      PTR handle;
      const char *name;
      debug_type return_type;
-     boolean global;
+     bfd_boolean global;
      bfd_vma addr;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -788,12 +789,12 @@ debug_record_function (handle, name, return_type, global, addr)
   if (name == NULL)
     name = "";
   if (return_type == NULL)
-    return false;
+    return FALSE;
 
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_record_function: no debug_set_filename call"));
-      return false;
+      return FALSE;
     }
 
   f = (struct debug_function *) xmalloc (sizeof *f);
@@ -822,16 +823,16 @@ debug_record_function (handle, name, return_type, global, addr)
 			       ? DEBUG_LINKAGE_GLOBAL
 			       : DEBUG_LINKAGE_STATIC));
   if (n == NULL)
-    return false;
+    return FALSE;
 
   n->u.function = f;
 
-  return true;
+  return TRUE;
 }
 
 /* Record a parameter for the current function.  */
 
-boolean
+bfd_boolean
 debug_record_parameter (handle, name, type, kind, val)
      PTR handle;
      const char *name;
@@ -843,13 +844,13 @@ debug_record_parameter (handle, name, type, kind, val)
   struct debug_parameter *p, **pp;
 
   if (name == NULL || type == NULL)
-    return false;
+    return FALSE;
 
   if (info->current_unit == NULL
       || info->current_function == NULL)
     {
       debug_error (_("debug_record_parameter: no current function"));
-      return false;
+      return FALSE;
     }
 
   p = (struct debug_parameter *) xmalloc (sizeof *p);
@@ -866,12 +867,12 @@ debug_record_parameter (handle, name, type, kind, val)
     ;
   *pp = p;
 
-  return true;
+  return TRUE;
 }
 
 /* End a function.  FIXME: This should handle function nesting.  */
 
-boolean
+bfd_boolean
 debug_end_function (handle, addr)
      PTR handle;
      bfd_vma addr;
@@ -883,13 +884,13 @@ debug_end_function (handle, addr)
       || info->current_function == NULL)
     {
       debug_error (_("debug_end_function: no current function"));
-      return false;
+      return FALSE;
     }
 
   if (info->current_block->parent != NULL)
     {
       debug_error (_("debug_end_function: some blocks were not closed"));
-      return false;
+      return FALSE;
     }
 
   info->current_block->end = addr;
@@ -897,7 +898,7 @@ debug_end_function (handle, addr)
   info->current_function = NULL;
   info->current_block = NULL;
 
-  return true;
+  return TRUE;
 }
 
 /* Start a block in a function.  All local information will be
@@ -905,7 +906,7 @@ debug_end_function (handle, addr)
    debug_start_block and debug_end_block may be nested.  The bfd_vma
    argument is the address at which this block starts.  */
 
-boolean
+bfd_boolean
 debug_start_block (handle, addr)
      PTR handle;
      bfd_vma addr;
@@ -919,7 +920,7 @@ debug_start_block (handle, addr)
       || info->current_block == NULL)
     {
       debug_error (_("debug_start_block: no current block"));
-      return false;
+      return FALSE;
     }
 
   b = (struct debug_block *) xmalloc (sizeof *b);
@@ -938,14 +939,14 @@ debug_start_block (handle, addr)
 
   info->current_block = b;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish a block in a function.  This matches the call to
    debug_start_block.  The argument is the address at which this block
    ends.  */
 
-boolean
+bfd_boolean
 debug_end_block (handle, addr)
      PTR handle;
      bfd_vma addr;
@@ -957,27 +958,27 @@ debug_end_block (handle, addr)
       || info->current_block == NULL)
     {
       debug_error (_("debug_end_block: no current block"));
-      return false;
+      return FALSE;
     }
 
   parent = info->current_block->parent;
   if (parent == NULL)
     {
       debug_error (_("debug_end_block: attempt to close top level block"));
-      return false;
+      return FALSE;
     }
 
   info->current_block->end = addr;
 
   info->current_block = parent;
 
-  return true;
+  return TRUE;
 }
 
 /* Associate a line number in the current source file and function
    with a given address.  */
 
-boolean
+bfd_boolean
 debug_record_line (handle, lineno, addr)
      PTR handle;
      unsigned long lineno;
@@ -990,7 +991,7 @@ debug_record_line (handle, lineno, addr)
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_record_line: no current unit"));
-      return false;
+      return FALSE;
     }
 
   l = info->current_lineno;
@@ -1002,7 +1003,7 @@ debug_record_line (handle, lineno, addr)
 	    {
 	      l->linenos[i] = lineno;
 	      l->addrs[i] = addr;
-	      return true;
+	      return TRUE;
 	    }
 	}
     }
@@ -1031,37 +1032,37 @@ debug_record_line (handle, lineno, addr)
 
   info->current_lineno = l;
 
-  return true;
+  return TRUE;
 }
 
 /* Start a named common block.  This is a block of variables that may
    move in memory.  */
 
-boolean
+bfd_boolean
 debug_start_common_block (handle, name)
      PTR handle ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
 {
   /* FIXME */
   debug_error (_("debug_start_common_block: not implemented"));
-  return false;
+  return FALSE;
 }
 
 /* End a named common block.  */
 
-boolean
+bfd_boolean
 debug_end_common_block (handle, name)
      PTR handle ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
 {
   /* FIXME */
   debug_error (_("debug_end_common_block: not implemented"));
-  return false;
+  return FALSE;
 }
 
 /* Record a named integer constant.  */
 
-boolean
+bfd_boolean
 debug_record_int_const (handle, name, val)
      PTR handle;
      const char *name;
@@ -1071,21 +1072,21 @@ debug_record_int_const (handle, name, val)
   struct debug_name *n;
 
   if (name == NULL)
-    return false;
+    return FALSE;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_INT_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return false;
+    return FALSE;
 
   n->u.int_constant = val;
 
-  return true;
+  return TRUE;
 }
 
 /* Record a named floating point constant.  */
 
-boolean
+bfd_boolean
 debug_record_float_const (handle, name, val)
      PTR handle;
      const char *name;
@@ -1095,21 +1096,21 @@ debug_record_float_const (handle, name, val)
   struct debug_name *n;
 
   if (name == NULL)
-    return false;
+    return FALSE;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_FLOAT_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return false;
+    return FALSE;
 
   n->u.float_constant = val;
 
-  return true;
+  return TRUE;
 }
 
 /* Record a typed constant with an integral value.  */
 
-boolean
+bfd_boolean
 debug_record_typed_const (handle, name, type, val)
      PTR handle;
      const char *name;
@@ -1121,12 +1122,12 @@ debug_record_typed_const (handle, name, type, val)
   struct debug_typed_constant *tc;
 
   if (name == NULL || type == NULL)
-    return false;
+    return FALSE;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_TYPED_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return false;
+    return FALSE;
 
   tc = (struct debug_typed_constant *) xmalloc (sizeof *tc);
   memset (tc, 0, sizeof *tc);
@@ -1136,12 +1137,12 @@ debug_record_typed_const (handle, name, type, val)
 
   n->u.typed_constant = tc;
 
-  return true;
+  return TRUE;
 }
 
 /* Record a label.  */
 
-boolean
+bfd_boolean
 debug_record_label (handle, name, type, addr)
      PTR handle ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
@@ -1150,12 +1151,12 @@ debug_record_label (handle, name, type, addr)
 {
   /* FIXME.  */
   debug_error (_("debug_record_label: not implemented"));
-  return false;
+  return FALSE;
 }
 
 /* Record a variable.  */
 
-boolean
+bfd_boolean
 debug_record_variable (handle, name, type, kind, val)
      PTR handle;
      const char *name;
@@ -1170,13 +1171,13 @@ debug_record_variable (handle, name, type, kind, val)
   struct debug_variable *v;
 
   if (name == NULL || type == NULL)
-    return false;
+    return FALSE;
 
   if (info->current_unit == NULL
       || info->current_file == NULL)
     {
       debug_error (_("debug_record_variable: no current file"));
-      return false;
+      return FALSE;
     }
 
   if (kind == DEBUG_GLOBAL || kind == DEBUG_STATIC)
@@ -1192,7 +1193,7 @@ debug_record_variable (handle, name, type, kind, val)
       if (info->current_block == NULL)
 	{
 	  debug_error (_("debug_record_variable: no current block"));
-	  return false;
+	  return FALSE;
 	}
       nsp = &info->current_block->locals;
       linkage = DEBUG_LINKAGE_AUTOMATIC;
@@ -1200,7 +1201,7 @@ debug_record_variable (handle, name, type, kind, val)
 
   n = debug_add_to_namespace (info, nsp, name, DEBUG_OBJECT_VARIABLE, linkage);
   if (n == NULL)
-    return false;
+    return FALSE;
 
   v = (struct debug_variable *) xmalloc (sizeof *v);
   memset (v, 0, sizeof *v);
@@ -1211,7 +1212,7 @@ debug_record_variable (handle, name, type, kind, val)
 
   n->u.variable = v;
 
-  return true;
+  return TRUE;
 }
 
 /* Make a type with a given kind and size.  */
@@ -1279,7 +1280,7 @@ debug_type
 debug_make_int_type (handle, size, unsignedp)
      PTR handle;
      unsigned int size;
-     boolean unsignedp;
+     bfd_boolean unsignedp;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type *t;
@@ -1338,7 +1339,7 @@ debug_make_complex_type (handle, size)
 debug_type
 debug_make_struct_type (handle, structp, size, fields)
      PTR handle;
-     boolean structp;
+     bfd_boolean structp;
      bfd_vma size;
      debug_field *fields;
 {
@@ -1373,13 +1374,13 @@ debug_type
 debug_make_object_type (handle, structp, size, fields, baseclasses,
 			methods, vptrbase, ownvptr)
      PTR handle;
-     boolean structp;
+     bfd_boolean structp;
      bfd_vma size;
      debug_field *fields;
      debug_baseclass *baseclasses;
      debug_method *methods;
      debug_type vptrbase;
-     boolean ownvptr;
+     bfd_boolean ownvptr;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type *t;
@@ -1470,7 +1471,7 @@ debug_make_function_type (handle, type, arg_types, varargs)
      PTR handle;
      debug_type type;
      debug_type *arg_types;
-     boolean varargs;
+     bfd_boolean varargs;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type *t;
@@ -1563,7 +1564,7 @@ debug_make_array_type (handle, element_type, range_type, lower, upper,
      debug_type range_type;
      bfd_signed_vma lower;
      bfd_signed_vma upper;
-     boolean stringp;
+     bfd_boolean stringp;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type *t;
@@ -1598,7 +1599,7 @@ debug_type
 debug_make_set_type (handle, type, bitstringp)
      PTR handle;
      debug_type type;
-     boolean bitstringp;
+     bfd_boolean bitstringp;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type *t;
@@ -1665,7 +1666,7 @@ debug_make_method_type (handle, return_type, domain_type, arg_types, varargs)
      debug_type return_type;
      debug_type domain_type;
      debug_type *arg_types;
-     boolean varargs;
+     bfd_boolean varargs;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type *t;
@@ -1782,7 +1783,7 @@ debug_make_baseclass (handle, type, bitpos, virtual, visibility)
      PTR handle ATTRIBUTE_UNUSED;
      debug_type type;
      bfd_vma bitpos;
-     boolean virtual;
+     bfd_boolean virtual;
      enum debug_visibility visibility;
 {
   struct debug_baseclass *b;
@@ -1820,7 +1821,7 @@ debug_make_field (handle, name, type, bitpos, bitsize, visibility)
 
   f->name = name;
   f->type = type;
-  f->static_member = false;
+  f->static_member = FALSE;
   f->u.f.bitpos = bitpos;
   f->u.f.bitsize = bitsize;
   f->visibility = visibility;
@@ -1849,7 +1850,7 @@ debug_make_static_member (handle, name, type, physname, visibility)
 
   f->name = name;
   f->type = type;
-  f->static_member = true;
+  f->static_member = TRUE;
   f->u.s.physname = physname;
   f->visibility = visibility;
 
@@ -1892,8 +1893,8 @@ debug_make_method_variant (handle, physname, type, visibility, constp,
      const char *physname;
      debug_type type;
      enum debug_visibility visibility;
-     boolean constp;
-     boolean volatilep;
+     bfd_boolean constp;
+     bfd_boolean volatilep;
      bfd_vma voffset;
      debug_type context;
 {
@@ -1924,8 +1925,8 @@ debug_make_static_method_variant (handle, physname, type, visibility,
      const char *physname;
      debug_type type;
      enum debug_visibility visibility;
-     boolean constp;
-     boolean volatilep;
+     bfd_boolean constp;
+     bfd_boolean volatilep;
 {
   struct debug_method_variant *m;
 
@@ -2049,7 +2050,7 @@ debug_tag_type (handle, name, type)
 
 /* Record the size of a given type.  */
 
-boolean
+bfd_boolean
 debug_record_type_size (handle, type, size)
      PTR handle ATTRIBUTE_UNUSED;
      debug_type type;
@@ -2061,7 +2062,7 @@ debug_record_type_size (handle, type, size)
 
   type->size = size;
 
-  return true;
+  return TRUE;
 }
 
 /* Find a named type.  */
@@ -2307,7 +2308,7 @@ const debug_type *
 debug_get_parameter_types (handle, type, pvarargs)
      PTR handle;
      debug_type type;
-     boolean *pvarargs;
+     bfd_boolean *pvarargs;
 {
   if (type == NULL)
     return NULL;
@@ -2457,7 +2458,7 @@ debug_get_field_physname (handle, field)
 /* Write out the debugging information.  This is given a handle to
    debugging information, and a set of function pointers to call.  */
 
-boolean
+bfd_boolean
 debug_write (handle, fns, fhandle)
      PTR handle;
      const struct debug_write_fns *fns;
@@ -2484,25 +2485,25 @@ debug_write (handle, fns, fhandle)
   for (u = info->units; u != NULL; u = u->next)
     {
       struct debug_file *f;
-      boolean first_file;
+      bfd_boolean first_file;
 
       info->current_write_lineno = u->linenos;
       info->current_write_lineno_index = 0;
 
       if (! (*fns->start_compilation_unit) (fhandle, u->files->filename))
-	return false;
+	return FALSE;
 
-      first_file = true;
+      first_file = TRUE;
       for (f = u->files; f != NULL; f = f->next)
 	{
 	  struct debug_name *n;
 
 	  if (first_file)
-	    first_file = false;
+	    first_file = FALSE;
 	  else
 	    {
 	      if (! (*fns->start_source) (fhandle, f->filename))
-		return false;
+		return FALSE;
 	    }
 
 	  if (f->globals != NULL)
@@ -2510,7 +2511,7 @@ debug_write (handle, fns, fhandle)
 	      for (n = f->globals->list; n != NULL; n = n->next)
 		{
 		  if (! debug_write_name (info, fns, fhandle, n))
-		    return false;
+		    return FALSE;
 		}
 	    }
 	}
@@ -2518,15 +2519,15 @@ debug_write (handle, fns, fhandle)
       /* Output any line number information which hasn't already been
          handled.  */
       if (! debug_write_linenos (info, fns, fhandle, (bfd_vma) -1))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out an element in a namespace.  */
 
-static boolean
+static bfd_boolean
 debug_write_name (info, fns, fhandle, n)
      struct debug_handle *info;
      const struct debug_write_fns *fns;
@@ -2538,16 +2539,16 @@ debug_write_name (info, fns, fhandle, n)
     case DEBUG_OBJECT_TYPE:
       if (! debug_write_type (info, fns, fhandle, n->u.type, n)
 	  || ! (*fns->typdef) (fhandle, n->name))
-	return false;
-      return true;
+	return FALSE;
+      return TRUE;
     case DEBUG_OBJECT_TAG:
       if (! debug_write_type (info, fns, fhandle, n->u.tag, n))
-	return false;
+	return FALSE;
       return (*fns->tag) (fhandle, n->name);
     case DEBUG_OBJECT_VARIABLE:
       if (! debug_write_type (info, fns, fhandle, n->u.variable->type,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->variable) (fhandle, n->name, n->u.variable->kind,
 			       n->u.variable->val);
     case DEBUG_OBJECT_FUNCTION:
@@ -2560,12 +2561,12 @@ debug_write_name (info, fns, fhandle, n)
     case DEBUG_OBJECT_TYPED_CONSTANT:
       if (! debug_write_type (info, fns, fhandle, n->u.typed_constant->type,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->typed_constant) (fhandle, n->name,
 				     n->u.typed_constant->val);
     default:
       abort ();
-      return false;
+      return FALSE;
     }
   /*NOTREACHED*/
 }
@@ -2576,7 +2577,7 @@ debug_write_name (info, fns, fhandle, n)
    then the name argument is a tag from a DEBUG_KIND_TAGGED type which
    points to this one.  */
 
-static boolean
+static bfd_boolean
 debug_write_type (info, fns, fhandle, type, name)
      struct debug_handle *info;
      const struct debug_write_fns *fns;
@@ -2619,7 +2620,7 @@ debug_write_type (info, fns, fhandle, type, name)
 		  if (! debug_set_class_id (info,
 					    type->u.knamed->name->name,
 					    real))
-		    return false;
+		    return FALSE;
 		}
 	      id = real->u.kclass->id;
 	    }
@@ -2648,7 +2649,7 @@ debug_write_type (info, fns, fhandle, type, name)
     {
     case DEBUG_KIND_ILLEGAL:
       debug_error (_("debug_write_type: illegal type encountered"));
-      return false;
+      return FALSE;
     case DEBUG_KIND_INDIRECT:
       if (*type->u.kindirect->slot == DEBUG_TYPE_NULL)
 	return (*fns->empty_type) (fhandle);
@@ -2671,7 +2672,7 @@ debug_write_type (info, fns, fhandle, type, name)
 	  if (type->u.kclass->id <= info->base_id)
 	    {
 	      if (! debug_set_class_id (info, tag, type))
-		return false;
+		return FALSE;
 	    }
 
 	  if (info->mark == type->u.kclass->mark)
@@ -2692,7 +2693,7 @@ debug_write_type (info, fns, fhandle, type, name)
 					: 0),
 				       type->kind == DEBUG_KIND_STRUCT,
 				       type->size))
-	return false;
+	return FALSE;
       if (type->u.kclass != NULL
 	  && type->u.kclass->fields != NULL)
 	{
@@ -2705,7 +2706,7 @@ debug_write_type (info, fns, fhandle, type, name)
 				      (struct debug_name *) NULL)
 		  || ! (*fns->struct_field) (fhandle, f->name, f->u.f.bitpos,
 					     f->u.f.bitsize, f->visibility))
-		return false;
+		return FALSE;
 	    }
 	}
       return (*fns->end_struct_type) (fhandle);
@@ -2721,13 +2722,13 @@ debug_write_type (info, fns, fhandle, type, name)
     case DEBUG_KIND_POINTER:
       if (! debug_write_type (info, fns, fhandle, type->u.kpointer,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->pointer_type) (fhandle);
     case DEBUG_KIND_FUNCTION:
       if (! debug_write_type (info, fns, fhandle,
 			      type->u.kfunction->return_type,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       if (type->u.kfunction->arg_types == NULL)
 	is = -1;
       else
@@ -2736,19 +2737,19 @@ debug_write_type (info, fns, fhandle, type, name)
 	    if (! debug_write_type (info, fns, fhandle,
 				    type->u.kfunction->arg_types[is],
 				    (struct debug_name *) NULL))
-	      return false;
+	      return FALSE;
 	}
       return (*fns->function_type) (fhandle, is,
 				    type->u.kfunction->varargs);
     case DEBUG_KIND_REFERENCE:
       if (! debug_write_type (info, fns, fhandle, type->u.kreference,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->reference_type) (fhandle);
     case DEBUG_KIND_RANGE:
       if (! debug_write_type (info, fns, fhandle, type->u.krange->type,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->range_type) (fhandle, type->u.krange->lower,
 				 type->u.krange->upper);
     case DEBUG_KIND_ARRAY:
@@ -2757,14 +2758,14 @@ debug_write_type (info, fns, fhandle, type, name)
 	  || ! debug_write_type (info, fns, fhandle,
 				 type->u.karray->range_type,
 				 (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->array_type) (fhandle, type->u.karray->lower,
 				 type->u.karray->upper,
 				 type->u.karray->stringp);
     case DEBUG_KIND_SET:
       if (! debug_write_type (info, fns, fhandle, type->u.kset->type,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->set_type) (fhandle, type->u.kset->bitstringp);
     case DEBUG_KIND_OFFSET:
       if (! debug_write_type (info, fns, fhandle, type->u.koffset->base_type,
@@ -2772,13 +2773,13 @@ debug_write_type (info, fns, fhandle, type, name)
 	  || ! debug_write_type (info, fns, fhandle,
 				 type->u.koffset->target_type,
 				 (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->offset_type) (fhandle);
     case DEBUG_KIND_METHOD:
       if (! debug_write_type (info, fns, fhandle,
 			      type->u.kmethod->return_type,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       if (type->u.kmethod->arg_types == NULL)
 	is = -1;
       else
@@ -2787,14 +2788,14 @@ debug_write_type (info, fns, fhandle, type, name)
 	    if (! debug_write_type (info, fns, fhandle,
 				    type->u.kmethod->arg_types[is],
 				    (struct debug_name *) NULL))
-	      return false;
+	      return FALSE;
 	}
       if (type->u.kmethod->domain_type != NULL)
 	{
 	  if (! debug_write_type (info, fns, fhandle,
 				  type->u.kmethod->domain_type,
 				  (struct debug_name *) NULL))
-	    return false;
+	    return FALSE;
 	}
       return (*fns->method_type) (fhandle,
 				  type->u.kmethod->domain_type != NULL,
@@ -2803,12 +2804,12 @@ debug_write_type (info, fns, fhandle, type, name)
     case DEBUG_KIND_CONST:
       if (! debug_write_type (info, fns, fhandle, type->u.kconst,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->const_type) (fhandle);
     case DEBUG_KIND_VOLATILE:
       if (! debug_write_type (info, fns, fhandle, type->u.kvolatile,
 			      (struct debug_name *) NULL))
-	return false;
+	return FALSE;
       return (*fns->volatile_type) (fhandle);
     case DEBUG_KIND_NAMED:
       return debug_write_type (info, fns, fhandle, type->u.knamed->type,
@@ -2818,13 +2819,13 @@ debug_write_type (info, fns, fhandle, type, name)
 			       type->u.knamed->name);
     default:
       abort ();
-      return false;
+      return FALSE;
     }
 }
 
 /* Write out a class type.  */
 
-static boolean
+static bfd_boolean
 debug_write_class_type (info, fns, fhandle, type, tag)
      struct debug_handle *info;
      const struct debug_write_fns *fns;
@@ -2846,7 +2847,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
       if (type->u.kclass->id <= info->base_id)
 	{
 	  if (! debug_set_class_id (info, tag, type))
-	    return false;
+	    return FALSE;
 	}
 
       if (info->mark == type->u.kclass->mark)
@@ -2866,7 +2867,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 	{
 	  if (! debug_write_type (info, fns, fhandle, vptrbase,
 				  (struct debug_name *) NULL))
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -2875,7 +2876,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 				  type->size,
 				  vptrbase != NULL,
 				  vptrbase == type))
-    return false;
+    return FALSE;
 
   if (type->u.kclass != NULL)
     {
@@ -2888,19 +2889,19 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 	      f = type->u.kclass->fields[i];
 	      if (! debug_write_type (info, fns, fhandle, f->type,
 				      (struct debug_name *) NULL))
-		return false;
+		return FALSE;
 	      if (f->static_member)
 		{
 		  if (! (*fns->class_static_member) (fhandle, f->name,
 						     f->u.s.physname,
 						     f->visibility))
-		    return false;
+		    return FALSE;
 		}
 	      else
 		{
 		  if (! (*fns->struct_field) (fhandle, f->name, f->u.f.bitpos,
 					      f->u.f.bitsize, f->visibility))
-		    return false;
+		    return FALSE;
 		}
 	    }
 	}
@@ -2914,10 +2915,10 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 	      b = type->u.kclass->baseclasses[i];
 	      if (! debug_write_type (info, fns, fhandle, b->type,
 				      (struct debug_name *) NULL))
-		return false;
+		return FALSE;
 	      if (! (*fns->class_baseclass) (fhandle, b->bitpos, b->virtual,
 					     b->visibility))
-		return false;
+		return FALSE;
 	    }
 	}
 
@@ -2930,7 +2931,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 
 	      m = type->u.kclass->methods[i];
 	      if (! (*fns->class_start_method) (fhandle, m->name))
-		return false;
+		return FALSE;
 	      for (j = 0; m->variants[j] != NULL; j++)
 		{
 		  struct debug_method_variant *v;
@@ -2940,11 +2941,11 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 		    {
 		      if (! debug_write_type (info, fns, fhandle, v->context,
 					      (struct debug_name *) NULL))
-			return false;
+			return FALSE;
 		    }
 		  if (! debug_write_type (info, fns, fhandle, v->type,
 					  (struct debug_name *) NULL))
-		    return false;
+		    return FALSE;
 		  if (v->voffset != VOFFSET_STATIC_METHOD)
 		    {
 		      if (! (*fns->class_method_variant) (fhandle, v->physname,
@@ -2953,7 +2954,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 							  v->volatilep,
 							  v->voffset,
 							  v->context != NULL))
-			return false;
+			return FALSE;
 		    }
 		  else
 		    {
@@ -2962,11 +2963,11 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 								 v->visibility,
 								 v->constp,
 								 v->volatilep))
-			return false;
+			return FALSE;
 		    }
 		}
 	      if (! (*fns->class_end_method) (fhandle))
-		return false;
+		return FALSE;
 	    }
 	}
     }
@@ -2976,7 +2977,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 
 /* Write out information for a function.  */
 
-static boolean
+static bfd_boolean
 debug_write_function (info, fns, fhandle, name, linkage, function)
      struct debug_handle *info;
      const struct debug_write_fns *fns;
@@ -2989,28 +2990,28 @@ debug_write_function (info, fns, fhandle, name, linkage, function)
   struct debug_block *b;
 
   if (! debug_write_linenos (info, fns, fhandle, function->blocks->start))
-    return false;
+    return FALSE;
 
   if (! debug_write_type (info, fns, fhandle, function->return_type,
 			  (struct debug_name *) NULL))
-    return false;
+    return FALSE;
 
   if (! (*fns->start_function) (fhandle, name,
 				linkage == DEBUG_LINKAGE_GLOBAL))
-    return false;
+    return FALSE;
 
   for (p = function->parameters; p != NULL; p = p->next)
     {
       if (! debug_write_type (info, fns, fhandle, p->type,
 			      (struct debug_name *) NULL)
 	  || ! (*fns->function_parameter) (fhandle, p->name, p->kind, p->val))
-	return false;
+	return FALSE;
     }
 
   for (b = function->blocks; b != NULL; b = b->next)
     {
       if (! debug_write_block (info, fns, fhandle, b))
-	return false;
+	return FALSE;
     }
 
   return (*fns->end_function) (fhandle);
@@ -3018,7 +3019,7 @@ debug_write_function (info, fns, fhandle, name, linkage, function)
 
 /* Write out information for a block.  */
 
-static boolean
+static bfd_boolean
 debug_write_block (info, fns, fhandle, block)
      struct debug_handle *info;
      const struct debug_write_fns *fns;
@@ -3029,14 +3030,14 @@ debug_write_block (info, fns, fhandle, block)
   struct debug_block *b;
 
   if (! debug_write_linenos (info, fns, fhandle, block->start))
-    return false;
+    return FALSE;
 
   /* I can't see any point to writing out a block with no local
      variables, so we don't bother, except for the top level block.  */
   if (block->locals != NULL || block->parent == NULL)
     {
       if (! (*fns->start_block) (fhandle, block->start))
-	return false;
+	return FALSE;
     }
 
   if (block->locals != NULL)
@@ -3044,31 +3045,31 @@ debug_write_block (info, fns, fhandle, block)
       for (n = block->locals->list; n != NULL; n = n->next)
 	{
 	  if (! debug_write_name (info, fns, fhandle, n))
-	    return false;
+	    return FALSE;
 	}
     }
 
   for (b = block->children; b != NULL; b = b->next)
     {
       if (! debug_write_block (info, fns, fhandle, b))
-	return false;
+	return FALSE;
     }
 
   if (! debug_write_linenos (info, fns, fhandle, block->end))
-    return false;
+    return FALSE;
 
   if (block->locals != NULL || block->parent == NULL)
     {
       if (! (*fns->end_block) (fhandle, block->end))
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write out line number information up to ADDRESS.  */
 
-static boolean
+static bfd_boolean
 debug_write_linenos (info, fns, fhandle, address)
      struct debug_handle *info;
      const struct debug_write_fns *fns;
@@ -3088,12 +3089,12 @@ debug_write_linenos (info, fns, fhandle, address)
 	    break;
 
 	  if (l->addrs[info->current_write_lineno_index] >= address)
-	    return true;
+	    return TRUE;
 
 	  if (! (*fns->lineno) (fhandle, l->file->filename,
 				l->linenos[info->current_write_lineno_index],
 				l->addrs[info->current_write_lineno_index]))
-	    return false;
+	    return FALSE;
 
 	  ++info->current_write_lineno_index;
 	}
@@ -3102,7 +3103,7 @@ debug_write_linenos (info, fns, fhandle, address)
       info->current_write_lineno_index = 0;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Get the ID number for a class.  If during the same call to
@@ -3110,7 +3111,7 @@ debug_write_linenos (info, fns, fhandle, address)
    name, we use the same ID.  This type of things happens because the
    same struct will be defined by multiple compilation units.  */
 
-static boolean
+static bfd_boolean
 debug_set_class_id (info, tag, type)
      struct debug_handle *info;
      const char *tag;
@@ -3127,7 +3128,7 @@ debug_set_class_id (info, tag, type)
   c = type->u.kclass;
 
   if (c->id > info->base_id)
-    return true;
+    return TRUE;
 
   for (l = info->id_list; l != NULL; l = l->next)
     {
@@ -3150,7 +3151,7 @@ debug_set_class_id (info, tag, type)
       if (debug_type_samep (info, l->type, type))
 	{
 	  c->id = l->type->u.kclass->id;
-	  return true;
+	  return TRUE;
 	}
     }
 
@@ -3168,13 +3169,13 @@ debug_set_class_id (info, tag, type)
   l->next = info->id_list;
   info->id_list = l;
 
-  return true;
+  return TRUE;
 }
 
 /* See if two types are the same.  At this point, we don't care about
    tags and the like.  */
 
-static boolean
+static bfd_boolean
 debug_type_samep (info, t1, t2)
      struct debug_handle *info;
      struct debug_type *t1;
@@ -3182,28 +3183,28 @@ debug_type_samep (info, t1, t2)
 {
   struct debug_type_compare_list *l;
   struct debug_type_compare_list top;
-  boolean ret;
+  bfd_boolean ret;
 
   if (t1 == NULL)
     return t2 == NULL;
   if (t2 == NULL)
-    return false;
+    return FALSE;
 
   while (t1->kind == DEBUG_KIND_INDIRECT)
     {
       t1 = *t1->u.kindirect->slot;
       if (t1 == NULL)
-	return false;
+	return FALSE;
     }
   while (t2->kind == DEBUG_KIND_INDIRECT)
     {
       t2 = *t2->u.kindirect->slot;
       if (t2 == NULL)
-	return false;
+	return FALSE;
     }
 
   if (t1 == t2)
-    return true;
+    return TRUE;
 
   /* As a special case, permit a typedef to match a tag, since C++
      debugging output will sometimes add a typedef where C debugging
@@ -3217,7 +3218,7 @@ debug_type_samep (info, t1, t2)
 
   if (t1->kind != t2->kind
       || t1->size != t2->size)
-    return false;
+    return FALSE;
 
   /* Get rid of the trivial cases first.  */
   switch (t1->kind)
@@ -3228,7 +3229,7 @@ debug_type_samep (info, t1, t2)
     case DEBUG_KIND_FLOAT:
     case DEBUG_KIND_COMPLEX:
     case DEBUG_KIND_BOOL:
-      return true;
+      return TRUE;
     case DEBUG_KIND_INT:
       return t1->u.kint == t2->u.kint;
     }
@@ -3240,7 +3241,7 @@ debug_type_samep (info, t1, t2)
   for (l = info->compare_list; l != NULL; l = l->next)
     {
       if (l->t1 == t1 && l->t2 == t2)
-	return true;
+	return TRUE;
     }
 
   top.t1 = t1;
@@ -3252,7 +3253,7 @@ debug_type_samep (info, t1, t2)
     {
     default:
       abort ();
-      ret = false;
+      ret = FALSE;
       break;
 
     case DEBUG_KIND_STRUCT:
@@ -3262,10 +3263,10 @@ debug_type_samep (info, t1, t2)
       if (t1->u.kclass == NULL)
 	ret = t2->u.kclass == NULL;
       else if (t2->u.kclass == NULL)
-	ret = false;
+	ret = FALSE;
       else if (t1->u.kclass->id > info->base_id
 	       && t1->u.kclass->id == t2->u.kclass->id)
-	ret = true;
+	ret = TRUE;
       else
 	ret = debug_class_type_samep (info, t1, t2);
       break;
@@ -3274,7 +3275,7 @@ debug_type_samep (info, t1, t2)
       if (t1->u.kenum == NULL)
 	ret = t2->u.kenum == NULL;
       else if (t2->u.kenum == NULL)
-	ret = false;
+	ret = FALSE;
       else
 	{
 	  const char **pn1, **pn2;
@@ -3309,9 +3310,9 @@ debug_type_samep (info, t1, t2)
 				 t2->u.kfunction->return_type)
 	  || ((t1->u.kfunction->arg_types == NULL)
 	      != (t2->u.kfunction->arg_types == NULL)))
-	ret = false;
+	ret = FALSE;
       else if (t1->u.kfunction->arg_types == NULL)
-	ret = true;
+	ret = TRUE;
       else
 	{
 	  struct debug_type **a1, **a2;
@@ -3367,9 +3368,9 @@ debug_type_samep (info, t1, t2)
 				 t2->u.kmethod->domain_type)
 	  || ((t1->u.kmethod->arg_types == NULL)
 	      != (t2->u.kmethod->arg_types == NULL)))
-	ret = false;
+	ret = FALSE;
       else if (t1->u.kmethod->arg_types == NULL)
-	ret = true;
+	ret = TRUE;
       else
 	{
 	  struct debug_type **a1, **a2;
@@ -3411,7 +3412,7 @@ debug_type_samep (info, t1, t2)
 /* See if two classes are the same.  This is a subroutine of
    debug_type_samep.  */
 
-static boolean
+static bfd_boolean
 debug_class_type_samep (info, t1, t2)
      struct debug_handle *info;
      struct debug_type *t1;
@@ -3426,7 +3427,7 @@ debug_class_type_samep (info, t1, t2)
       || (c1->baseclasses == NULL) != (c2->baseclasses == NULL)
       || (c1->methods == NULL) != (c2->methods == NULL)
       || (c1->vptrbase == NULL) != (c2->vptrbase == NULL))
-    return false;
+    return FALSE;
 
   if (c1->fields != NULL)
     {
@@ -3443,17 +3444,17 @@ debug_class_type_samep (info, t1, t2)
 	  if (f1->name[0] != f2->name[0]
 	      || f1->visibility != f2->visibility
 	      || f1->static_member != f2->static_member)
-	    return false;
+	    return FALSE;
 	  if (f1->static_member)
 	    {
 	      if (strcmp (f1->u.s.physname, f2->u.s.physname) != 0)
-		return false;
+		return FALSE;
 	    }
 	  else
 	    {
 	      if (f1->u.f.bitpos != f2->u.f.bitpos
 		  || f1->u.f.bitsize != f2->u.f.bitsize)
-		return false;
+		return FALSE;
 	    }
 	  /* We do the checks which require function calls last.  We
              don't require that the types of fields have the same
@@ -3465,16 +3466,16 @@ debug_class_type_samep (info, t1, t2)
 							  f1->type, NULL),
 				     debug_get_real_type ((PTR) info,
 							  f2->type, NULL)))
-	    return false;
+	    return FALSE;
 	}
       if (*pf1 != NULL || *pf2 != NULL)
-	return false;
+	return FALSE;
     }
 
   if (c1->vptrbase != NULL)
     {
       if (! debug_type_samep (info, c1->vptrbase, c2->vptrbase))
-	return false;
+	return FALSE;
     }
 
   if (c1->baseclasses != NULL)
@@ -3493,10 +3494,10 @@ debug_class_type_samep (info, t1, t2)
 	      || b1->virtual != b2->virtual
 	      || b1->visibility != b2->visibility
 	      || ! debug_type_samep (info, b1->type, b2->type))
-	    return false;
+	    return FALSE;
 	}
       if (*pb1 != NULL || *pb2 != NULL)
-	return false;
+	return FALSE;
     }
 
   if (c1->methods != NULL)
@@ -3514,7 +3515,7 @@ debug_class_type_samep (info, t1, t2)
 	  if (m1->name[0] != m2->name[0]
 	      || strcmp (m1->name, m2->name) != 0
 	      || (m1->variants == NULL) != (m2->variants == NULL))
-	    return false;
+	    return FALSE;
 	  if (m1->variants == NULL)
 	    {
 	      struct debug_method_variant **pv1, **pv2;
@@ -3535,21 +3536,21 @@ debug_class_type_samep (info, t1, t2)
 		      || (v1->context == NULL) != (v2->context == NULL)
 		      || strcmp (v1->physname, v2->physname) != 0
 		      || ! debug_type_samep (info, v1->type, v2->type))
-		    return false;
+		    return FALSE;
 		  if (v1->context != NULL)
 		    {
 		      if (! debug_type_samep (info, v1->context,
 					      v2->context))
-			return false;
+			return FALSE;
 		    }
 		}
 	      if (*pv1 != NULL || *pv2 != NULL)
-		return false;
+		return FALSE;
 	    }
 	}
       if (*pm1 != NULL || *pm2 != NULL)
-	return false;
+	return FALSE;
     }
 
-  return true;
+  return TRUE;
 }