commit 19f392bc2a93d9e64d063b884cd6eca547c8dad0

Author: Ulrich Weigand <ulrich.weigand@de.ibm.com>

Date:   Tue Sep 6 17:27:55 2016 +0200

    Unify init_type and arch_type interface and helpers

    This adds a number of helper routines for creating objfile-owned types;

    these correspond 1:1 to the already existing helper routines for creating

    gdbarch-owned types, and are intended to be used instead of init_type.

    A shared fragment of init_float_type and arch_float_type is extracted into

    a separate subroutine verify_subroutine.

    The commit also brings the interface of init_type in line with the one for

    arch_type.  In particular, this means removing the FLAGS argument; callers

    now set the required flags directly.  (Since most callers use the new

    helper routines, very few callers actually need to set any additional

    flags directly any more.)

    Note that this means all the TYPE_FLAGS_... defined are no longer needed

    anywhere; they will be removed by a follow-on commit.

    All users of init_type are changed to use on of the new helpers where

    possible.  No functional change intended.

    gdb/ChangeLog:

            * gdbtypes.h (init_type): Remove FLAGS argument.  Move OBJFILE

            argument to first position.

            (init_integer_type): New prototype.

            (init_character_type): Likewise.

            (init_boolean_type): Likewise.

            (init_float_type): Likewise.

            (init_decfloat_type): Likewise.

            (init_complex_type): Likewise.

            (init_pointer_type): Likewise.

            * gdbtypes.c (verify_floatflormat): New function.

            (init_type): Remove FLAGS argument and processing.  Move OBJFILE

            argument to first position.

            (init_integer_type): New function.

            (init_character_type): Likewise.

            (init_boolean_type): Likewise.

            (init_float_type): Likewise.

            (init_decfloat_type): Likewise.

            (init_complex_type): Likewise.

            (init_pointer_type): Likewise.

            (arch_float_type): Use verify_floatflormat.

            (objfile_type): Use init_..._type helpers instead of calling

            init_type directly.

            * dwarf2read.c (fixup_go_packaging): Update to changed init_type

            prototype.

            (read_namespace_type): Likewise.

            (read_module_type): Likewise.

            (read_typedef): Likewise.

            (read_unspecified_type): Likewise.

            (build_error_marker_type): Likewise.

            (read_base_type): Use init_..._type helpers.

            * mdebugread.c (basic_type): Use init_..._type helpers.

            (parse_type): Update to changed init_type prototype.

            (cross_ref): Likewise.

            * stabsread.c (rs6000_builtin_type): Use init_..._type helpers.

            (read_sun_builtin_type): Likewise.

            (read_sun_floating_type): Likewise.

            (read_range_type): Likewise.  Also update to changed init_type

            prototype.

    Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>

### a/gdb/ChangeLog

### b/gdb/ChangeLog

## -1,5 +1,46 @@

 2016-09-05  Ulrich Weigand  <uweigand@de.ibm.com>

+	* gdbtypes.h (init_type): Remove FLAGS argument.  Move OBJFILE

+	argument to first position.

+	(init_integer_type): New prototype.

+	(init_character_type): Likewise.

+	(init_boolean_type): Likewise.

+	(init_float_type): Likewise.

+	(init_decfloat_type): Likewise.

+	(init_complex_type): Likewise.

+	(init_pointer_type): Likewise.

+	* gdbtypes.c (verify_floatflormat): New function.

+	(init_type): Remove FLAGS argument and processing.  Move OBJFILE

+	argument to first position.

+	(init_integer_type): New function.

+	(init_character_type): Likewise.

+	(init_boolean_type): Likewise.

+	(init_float_type): Likewise.

+	(init_decfloat_type): Likewise.

+	(init_complex_type): Likewise.

+	(init_pointer_type): Likewise.

+	(arch_float_type): Use verify_floatflormat.

+	(objfile_type): Use init_..._type helpers instead of calling

+	init_type directly.

+	* dwarf2read.c (fixup_go_packaging): Update to changed init_type

+	prototype.

+	(read_namespace_type): Likewise.

+	(read_module_type): Likewise.

+	(read_typedef): Likewise.

+	(read_unspecified_type): Likewise.

+	(build_error_marker_type): Likewise.

+	(read_base_type): Use init_..._type helpers.

+	* mdebugread.c (basic_type): Use init_..._type helpers.

+	(parse_type): Update to changed init_type prototype.

+	(cross_ref): Likewise.

+	* stabsread.c (rs6000_builtin_type): Use init_..._type helpers.

+	(read_sun_builtin_type): Likewise.

+	(read_sun_floating_type): Likewise.

+	(read_range_type): Likewise.  Also update to changed init_type

+	prototype.

+

+2016-09-05  Ulrich Weigand  <uweigand@de.ibm.com>

+

 	* gdbtypes.h (arch_decfloat_type): New prototype.

 	(arch_pointer_type): Likewise.

 	* gdbtypes.c (arch_decfloat_type): New function.

Index: gdb-7.6.1/gdb/dwarf2read.c

===================================================================

--- gdb-7.6.1.orig/gdb/dwarf2read.c	2017-03-11 21:42:28.099262777 +0100

+++ gdb-7.6.1/gdb/dwarf2read.c	2017-03-11 21:45:39.098565504 +0100

@@ -6901,8 +6901,8 @@

       const char *saved_package_name = obstack_copy0 (&objfile->objfile_obstack,

 						      package_name,

 						      strlen (package_name));

-      struct type *type = init_type (TYPE_CODE_MODULE, 0, 0,

-				     saved_package_name, objfile);

+      struct type *type = init_type (objfile, TYPE_CODE_MODULE, 0,

+				     saved_package_name);

       struct symbol *sym;

       TYPE_TAG_NAME (type) = TYPE_NAME (type);

@@ -12266,9 +12266,7 @@

 			    previous_prefix, name, 0, cu);

   /* Create the type.  */

-  type = init_type (TYPE_CODE_NAMESPACE, 0, 0, NULL,

-		    objfile);

-  TYPE_NAME (type) = name;

+  type = init_type (objfile, TYPE_CODE_NAMESPACE, 0, name);

   TYPE_TAG_NAME (type) = TYPE_NAME (type);

   return set_die_type (die, type, cu);

@@ -12331,7 +12329,7 @@

     complaint (&symfile_complaints,

 	       _("DW_TAG_module has no name, offset 0x%x"),

                die->offset.sect_off);

-  type = init_type (TYPE_CODE_MODULE, 0, 0, module_name, objfile);

+  type = init_type (objfile, TYPE_CODE_MODULE, 0, module_name);

   /* determine_prefix uses TYPE_TAG_NAME.  */

   TYPE_TAG_NAME (type) = TYPE_NAME (type);

@@ -12884,9 +12882,8 @@

   struct type *this_type, *target_type;

   name = dwarf2_full_name (NULL, die, cu);

-  this_type = init_type (TYPE_CODE_TYPEDEF, 0,

-			 TYPE_FLAG_TARGET_STUB, NULL, objfile);

-  TYPE_NAME (this_type) = name;

+  this_type = init_type (objfile, TYPE_CODE_TYPEDEF, 0, name);

+  TYPE_TARGET_STUB (this_type) = 1;

   set_die_type (die, this_type, cu);

   target_type = die_type (die, cu);

   if (target_type != this_type)

@@ -12913,11 +12910,8 @@

   struct objfile *objfile = cu->objfile;

   struct type *type;

   struct attribute *attr;

-  int encoding = 0, size = 0;

+  int encoding = 0, bits = 0;

   const char *name;

-  enum type_code code = TYPE_CODE_INT;

-  int type_flags = 0;

-  struct type *target_type = NULL;

   attr = dwarf2_attr (die, DW_AT_encoding, cu);

   if (attr)

@@ -12927,7 +12921,7 @@

   attr = dwarf2_attr (die, DW_AT_byte_size, cu);

   if (attr)

     {

-      size = DW_UNSND (attr);

+      bits = DW_UNSND (attr) * TARGET_CHAR_BIT;

     }

   name = dwarf2_name (die, cu);

   if (!name)

@@ -12940,61 +12934,63 @@

     {

       case DW_ATE_address:

 	/* Turn DW_ATE_address into a void * pointer.  */

-	code = TYPE_CODE_PTR;

-	type_flags |= TYPE_FLAG_UNSIGNED;

-	target_type = init_type (TYPE_CODE_VOID, 1, 0, NULL, objfile);

+	type = init_type (objfile, TYPE_CODE_VOID, 1, NULL);

+	type = init_pointer_type (objfile, bits, name, type);

 	break;

       case DW_ATE_boolean:

-	code = TYPE_CODE_BOOL;

-	type_flags |= TYPE_FLAG_UNSIGNED;

+	type = init_boolean_type (objfile, bits, 1, name);

 	break;

       case DW_ATE_complex_float:

-	code = TYPE_CODE_COMPLEX;

-	target_type = init_type (TYPE_CODE_FLT, size / 2, 0, NULL, objfile);

+	type = init_float_type (objfile, bits / 2, NULL, NULL);

+	type = init_complex_type (objfile, name, type);

 	break;

       case DW_ATE_decimal_float:

-	code = TYPE_CODE_DECFLOAT;

+	type = init_decfloat_type (objfile, bits, name);

 	break;

       case DW_ATE_float:

-	code = TYPE_CODE_FLT;

+	type = init_float_type (objfile, bits, name, NULL);

 	break;

       case DW_ATE_signed:

+	type = init_integer_type (objfile, bits, 0, name);

 	break;

       case DW_ATE_unsigned:

-	type_flags |= TYPE_FLAG_UNSIGNED;

 	if (cu->language == language_fortran

 	    && name

 	    && strncmp (name, "character(", sizeof ("character(") - 1) == 0)

-	  code = TYPE_CODE_CHAR;

+	  type = init_character_type (objfile, bits, 1, name);

+	else

+	  type = init_integer_type (objfile, bits, 1, name);

 	break;

       case DW_ATE_signed_char:

 	if (cu->language == language_ada || cu->language == language_m2

 	    || cu->language == language_pascal

 	    || cu->language == language_fortran)

-	  code = TYPE_CODE_CHAR;

+	  type = init_character_type (objfile, bits, 0, name);

+	else

+	  type = init_integer_type (objfile, bits, 0, name);

 	break;

       case DW_ATE_unsigned_char:

 	if (cu->language == language_ada || cu->language == language_m2

 	    || cu->language == language_pascal

 	    || cu->language == language_fortran)

-	  code = TYPE_CODE_CHAR;

-	type_flags |= TYPE_FLAG_UNSIGNED;

+	  type = init_character_type (objfile, bits, 1, name);

+	else

+	  type = init_integer_type (objfile, bits, 1, name);

 	break;

       case DW_ATE_UTF:

 	/* We just treat this as an integer and then recognize the

 	   type by name elsewhere.  */

+	type = init_integer_type (objfile, bits, 0, name);

 	break;

       default:

 	complaint (&symfile_complaints, _("unsupported DW_AT_encoding: '%s'"),

 		   dwarf_type_encoding_name (encoding));

+	type = init_type (objfile, TYPE_CODE_ERROR,

+			  bits / TARGET_CHAR_BIT, name);

 	break;

     }

-  type = init_type (code, size, type_flags, NULL, objfile);

-  TYPE_NAME (type) = name;

-  TYPE_TARGET_TYPE (type) = target_type;

-

   if (name && strcmp (name, "char") == 0)

     TYPE_NOSIGN (type) = 1;

@@ -13287,7 +13283,7 @@

   /* For now, we only support the C meaning of an unspecified type: void.  */

-  type = init_type (TYPE_CODE_VOID, 0, 0, NULL, cu->objfile);

+  type = init_type (cu->objfile, TYPE_CODE_VOID, 0, NULL);

   TYPE_NAME (type) = dwarf2_name (die, cu);

   return set_die_type (die, type, cu);

@@ -16913,7 +16909,7 @@

 			     message, strlen (message));

       xfree (message);

-      this_type = init_type (TYPE_CODE_ERROR, 0, 0, saved, objfile);

+      this_type = init_type (objfile, TYPE_CODE_ERROR, 0, saved);

     }

   return this_type;

Index: gdb-7.6.1/gdb/gdbtypes.c

===================================================================

--- gdb-7.6.1.orig/gdb/gdbtypes.c	2017-03-11 21:45:27.194484312 +0100

+++ gdb-7.6.1/gdb/gdbtypes.c	2017-03-11 21:48:13.551598067 +0100

@@ -2107,6 +2107,41 @@

     }

 }

+// RH

+#define FLOATFORMAT_CHAR_BIT 8 // doublest.c

+static size_t

+floatformat_totalsize_bytes (const struct floatformat *fmt)

+{

+  return ((fmt->totalsize + FLOATFORMAT_CHAR_BIT - 1)

+          / FLOATFORMAT_CHAR_BIT);

+}

+

+/* Helper function to verify floating-point format and size.

+   BIT is the type size in bits; if BIT equals -1, the size is

+   determined by the floatformat.  Returns size to be used.  */

+

+static int

+verify_floatformat (int bit, const struct floatformat **floatformats)

+{

+  if (bit == -1)

+    {

+      gdb_assert (floatformats != NULL);

+      gdb_assert (floatformats[0] != NULL && floatformats[1] != NULL);

+      bit = floatformats[0]->totalsize;

+    }

+  gdb_assert (bit >= 0);

+

+  if (floatformats != NULL)

+    {

+      size_t len = bit / TARGET_CHAR_BIT;

+

+      gdb_assert (len >= floatformat_totalsize_bytes (floatformats[0]));

+      gdb_assert (len >= floatformat_totalsize_bytes (floatformats[1]));

+    }

+

+  return bit;

+}

+

 /* Helper function to initialize the standard scalar types.

    If NAME is non-NULL, then it is used to initialize the type name.

@@ -2114,8 +2149,8 @@

    least as long as OBJFILE.  */

 struct type *

-init_type (enum type_code code, LONGEST length, int flags,

-	   const char *name, struct objfile *objfile)

+init_type (struct objfile *objfile, enum type_code code, LONGEST length,

+	   const char *name)

 {

   struct type *type;

@@ -2123,32 +2158,6 @@

   set_type_code (type, code);

   TYPE_LENGTH (type) = length;

-  gdb_assert (!(flags & (TYPE_FLAG_MIN - 1)));

-  if (flags & TYPE_FLAG_UNSIGNED)

-    TYPE_UNSIGNED (type) = 1;

-  if (flags & TYPE_FLAG_NOSIGN)

-    TYPE_NOSIGN (type) = 1;

-  if (flags & TYPE_FLAG_STUB)

-    TYPE_STUB (type) = 1;

-  if (flags & TYPE_FLAG_TARGET_STUB)

-    TYPE_TARGET_STUB (type) = 1;

-  if (flags & TYPE_FLAG_STATIC)

-    TYPE_STATIC (type) = 1;

-  if (flags & TYPE_FLAG_PROTOTYPED)

-    TYPE_PROTOTYPED (type) = 1;

-  if (flags & TYPE_FLAG_INCOMPLETE)

-    TYPE_INCOMPLETE (type) = 1;

-  if (flags & TYPE_FLAG_VARARGS)

-    TYPE_VARARGS (type) = 1;

-  if (flags & TYPE_FLAG_VECTOR)

-    TYPE_VECTOR (type) = 1;

-  if (flags & TYPE_FLAG_STUB_SUPPORTED)

-    TYPE_STUB_SUPPORTED (type) = 1;

-  if (flags & TYPE_FLAG_FIXED_INSTANCE)

-    TYPE_FIXED_INSTANCE (type) = 1;

-  if (flags & TYPE_FLAG_GNU_IFUNC)

-    TYPE_GNU_IFUNC (type) = 1;

-

   TYPE_NAME (type) = name;

   /* C++ fancies.  */

@@ -2158,6 +2167,121 @@

   return type;

 }

+

+/* Allocate a TYPE_CODE_INT type structure associated with OBJFILE.

+   BIT is the type size in bits.  If UNSIGNED_P is non-zero, set

+   the type's TYPE_UNSIGNED flag.  NAME is the type name.  */

+

+struct type *

+init_integer_type (struct objfile *objfile,

+		   int bit, int unsigned_p, const char *name)

+{

+  struct type *t;

+

+  t = init_type (objfile, TYPE_CODE_INT, bit / TARGET_CHAR_BIT, name);

+  if (unsigned_p)

+    TYPE_UNSIGNED (t) = 1;

+

+  return t;

+}

+

+/* Allocate a TYPE_CODE_CHAR type structure associated with OBJFILE.

+   BIT is the type size in bits.  If UNSIGNED_P is non-zero, set

+   the type's TYPE_UNSIGNED flag.  NAME is the type name.  */

+

+struct type *

+init_character_type (struct objfile *objfile,

+		     int bit, int unsigned_p, const char *name)

+{

+  struct type *t;

+

+  t = init_type (objfile, TYPE_CODE_CHAR, bit / TARGET_CHAR_BIT, name);

+  if (unsigned_p)

+    TYPE_UNSIGNED (t) = 1;

+

+  return t;

+}

+

+/* Allocate a TYPE_CODE_BOOL type structure associated with OBJFILE.

+   BIT is the type size in bits.  If UNSIGNED_P is non-zero, set

+   the type's TYPE_UNSIGNED flag.  NAME is the type name.  */

+

+struct type *

+init_boolean_type (struct objfile *objfile,

+		   int bit, int unsigned_p, const char *name)

+{

+  struct type *t;

+

+  t = init_type (objfile, TYPE_CODE_BOOL, bit / TARGET_CHAR_BIT, name);

+  if (unsigned_p)

+    TYPE_UNSIGNED (t) = 1;

+

+  return t;

+}

+

+/* Allocate a TYPE_CODE_FLT type structure associated with OBJFILE.

+   BIT is the type size in bits; if BIT equals -1, the size is

+   determined by the floatformat.  NAME is the type name.  Set the

+   TYPE_FLOATFORMAT from FLOATFORMATS.  */

+

+struct type *

+init_float_type (struct objfile *objfile,

+		 int bit, const char *name,

+		 const struct floatformat **floatformats)

+{

+  struct type *t;

+

+  bit = verify_floatformat (bit, floatformats);

+  t = init_type (objfile, TYPE_CODE_FLT, bit / TARGET_CHAR_BIT, name);

+  TYPE_FLOATFORMAT (t) = floatformats;

+

+  return t;

+}

+

+/* Allocate a TYPE_CODE_DECFLOAT type structure associated with OBJFILE.

+   BIT is the type size in bits.  NAME is the type name.  */

+

+struct type *

+init_decfloat_type (struct objfile *objfile, int bit, const char *name)

+{

+  struct type *t;

+

+  t = init_type (objfile, TYPE_CODE_DECFLOAT, bit / TARGET_CHAR_BIT, name);

+  return t;

+}

+

+/* Allocate a TYPE_CODE_COMPLEX type structure associated with OBJFILE.

+   NAME is the type name.  TARGET_TYPE is the component float type.  */

+

+struct type *

+init_complex_type (struct objfile *objfile,

+		   const char *name, struct type *target_type)

+{

+  struct type *t;

+

+  t = init_type (objfile, TYPE_CODE_COMPLEX,

+		 2 * TYPE_LENGTH (target_type), name);

+  TYPE_TARGET_TYPE (t) = target_type;

+  return t;

+}

+

+/* Allocate a TYPE_CODE_PTR type structure associated with OBJFILE.

+   BIT is the pointer type size in bits.  NAME is the type name.

+   TARGET_TYPE is the pointer target type.  Always sets the pointer type's

+   TYPE_UNSIGNED flag.  */

+

+struct type *

+init_pointer_type (struct objfile *objfile,

+		   int bit, const char *name, struct type *target_type)

+{

+  struct type *t;

+

+  t = init_type (objfile, TYPE_CODE_PTR, bit / TARGET_CHAR_BIT, name);

+  TYPE_TARGET_TYPE (t) = target_type;

+  TYPE_UNSIGNED (t) = 1;

+  return t;

+}

+

 /* Queries on types.  */

@@ -4010,14 +4134,7 @@

 {

   struct type *t;

-  if (bit == -1)

-    {

-      gdb_assert (floatformats != NULL);

-      gdb_assert (floatformats[0] != NULL && floatformats[1] != NULL);

-      bit = floatformats[0]->totalsize;

-    }

-  gdb_assert (bit >= 0);

-

+  bit = verify_floatformat (bit, floatformats);

   t = arch_type (gdbarch, TYPE_CODE_FLT, bit / TARGET_CHAR_BIT, name);

   TYPE_FLOATFORMAT (t) = floatformats;

   return t;

@@ -4350,109 +4467,80 @@

   /* Basic types.  */

   objfile_type->builtin_void

-    = init_type (TYPE_CODE_VOID, 1,

-		 0,

-		 "void", objfile);

-

+    = init_type (objfile, TYPE_CODE_VOID, 1, "void");

   objfile_type->builtin_char

-    = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,

-		 (TYPE_FLAG_NOSIGN

-		  | (gdbarch_char_signed (gdbarch) ? 0 : TYPE_FLAG_UNSIGNED)),

-		 "char", objfile);

+    = init_integer_type (objfile, TARGET_CHAR_BIT,

+			 !gdbarch_char_signed (gdbarch), "char");

   objfile_type->builtin_signed_char

-    = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,

-		 0,

-		 "signed char", objfile);

+    = init_integer_type (objfile, TARGET_CHAR_BIT,

+			 0, "signed char");

   objfile_type->builtin_unsigned_char

-    = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,

-		 TYPE_FLAG_UNSIGNED,

-		 "unsigned char", objfile);

+    = init_integer_type (objfile, TARGET_CHAR_BIT,

+			 1, "unsigned char");

   objfile_type->builtin_short

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_short_bit (gdbarch) / TARGET_CHAR_BIT,

-		 0, "short", objfile);

+    = init_integer_type (objfile, gdbarch_short_bit (gdbarch),

+			 0, "short");

   objfile_type->builtin_unsigned_short

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_short_bit (gdbarch) / TARGET_CHAR_BIT,

-		 TYPE_FLAG_UNSIGNED, "unsigned short", objfile);

+    = init_integer_type (objfile, gdbarch_short_bit (gdbarch),

+			 1, "unsigned short");

   objfile_type->builtin_int

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT,

-		 0, "int", objfile);

+    = init_integer_type (objfile, gdbarch_int_bit (gdbarch),

+			 0, "int");

   objfile_type->builtin_unsigned_int

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT,

-		 TYPE_FLAG_UNSIGNED, "unsigned int", objfile);

+    = init_integer_type (objfile, gdbarch_int_bit (gdbarch),

+			 1, "unsigned int");

   objfile_type->builtin_long

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT,

-		 0, "long", objfile);

+    = init_integer_type (objfile, gdbarch_long_bit (gdbarch),

+			 0, "long");

   objfile_type->builtin_unsigned_long

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT,

-		 TYPE_FLAG_UNSIGNED, "unsigned long", objfile);

+    = init_integer_type (objfile, gdbarch_long_bit (gdbarch),

+			 1, "unsigned long");

   objfile_type->builtin_long_long

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_long_long_bit (gdbarch) / TARGET_CHAR_BIT,

-		 0, "long long", objfile);

+    = init_integer_type (objfile, gdbarch_long_long_bit (gdbarch),

+			 0, "long long");

   objfile_type->builtin_unsigned_long_long

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_long_long_bit (gdbarch) / TARGET_CHAR_BIT,

-		 TYPE_FLAG_UNSIGNED, "unsigned long long", objfile);

-

+    = init_integer_type (objfile, gdbarch_long_long_bit (gdbarch),

+			 1, "unsigned long long");

   objfile_type->builtin_float

-    = init_type (TYPE_CODE_FLT,

-		 gdbarch_float_bit (gdbarch) / TARGET_CHAR_BIT,

-		 0, "float", objfile);

-  TYPE_FLOATFORMAT (objfile_type->builtin_float)

-    = gdbarch_float_format (gdbarch);

+    = init_float_type (objfile, gdbarch_float_bit (gdbarch),

+		       "float", gdbarch_float_format (gdbarch));

   objfile_type->builtin_double

-    = init_type (TYPE_CODE_FLT,

-		 gdbarch_double_bit (gdbarch) / TARGET_CHAR_BIT,

-		 0, "double", objfile);

-  TYPE_FLOATFORMAT (objfile_type->builtin_double)

-    = gdbarch_double_format (gdbarch);

+    = init_float_type (objfile, gdbarch_double_bit (gdbarch),

+		       "double", gdbarch_double_format (gdbarch));

   objfile_type->builtin_long_double

-    = init_type (TYPE_CODE_FLT,

-		 gdbarch_long_double_bit (gdbarch) / TARGET_CHAR_BIT,

-		 0, "long double", objfile);

-  TYPE_FLOATFORMAT (objfile_type->builtin_long_double)

-    = gdbarch_long_double_format (gdbarch);

+    = init_float_type (objfile, gdbarch_long_double_bit (gdbarch),

+		       "long double", gdbarch_long_double_format (gdbarch));

   /* This type represents a type that was unrecognized in symbol read-in.  */

   objfile_type->builtin_error

-    = init_type (TYPE_CODE_ERROR, 0, 0, "<unknown type>", objfile);

+    = init_type (objfile, TYPE_CODE_ERROR, 0, "<unknown type>");

   /* The following set of types is used for symbols with no

      debug information.  */

   objfile_type->nodebug_text_symbol

-    = init_type (TYPE_CODE_FUNC, 1, 0,

-		 "<text variable, no debug info>", objfile);

+    = init_type (objfile, TYPE_CODE_FUNC, 1,

+		 "<text variable, no debug info>");

   TYPE_TARGET_TYPE (objfile_type->nodebug_text_symbol)

     = objfile_type->builtin_int;

   objfile_type->nodebug_text_gnu_ifunc_symbol

-    = init_type (TYPE_CODE_FUNC, 1, TYPE_FLAG_GNU_IFUNC,

-		 "<text gnu-indirect-function variable, no debug info>",

-		 objfile);

+    = init_type (objfile, TYPE_CODE_FUNC, 1,

+		 "<text gnu-indirect-function variable, no debug info>");

   TYPE_TARGET_TYPE (objfile_type->nodebug_text_gnu_ifunc_symbol)

     = objfile_type->nodebug_text_symbol;

+  TYPE_GNU_IFUNC (objfile_type->nodebug_text_gnu_ifunc_symbol) = 1;

   objfile_type->nodebug_got_plt_symbol

-    = init_type (TYPE_CODE_PTR, gdbarch_addr_bit (gdbarch) / 8, 0,

-		 "<text from jump slot in .got.plt, no debug info>",

-		 objfile);

-  TYPE_TARGET_TYPE (objfile_type->nodebug_got_plt_symbol)

-    = objfile_type->nodebug_text_symbol;

+    = init_pointer_type (objfile, gdbarch_addr_bit (gdbarch),

+			 "<text from jump slot in .got.plt, no debug info>",

+			 objfile_type->nodebug_text_symbol);

   objfile_type->nodebug_data_symbol

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT, 0,

-		 "<data variable, no debug info>", objfile);

+    = init_integer_type (objfile, gdbarch_int_bit (gdbarch), 0,

+			 "<data variable, no debug info>");

   objfile_type->nodebug_unknown_symbol

-    = init_type (TYPE_CODE_INT, 1, 0,

-		 "<variable (not text or data), no debug info>", objfile);

+    = init_integer_type (objfile, TARGET_CHAR_BIT, 0,

+			 "<variable (not text or data), no debug info>");

   objfile_type->nodebug_tls_symbol

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT, 0,

-		 "<thread local variable, no debug info>", objfile);

+    = init_integer_type (objfile, gdbarch_int_bit (gdbarch), 0,

+			 "<thread local variable, no debug info>");

   /* NOTE: on some targets, addresses and pointers are not necessarily

      the same --- for example, on the D10V, pointers are 16 bits long,

@@ -4482,9 +4570,8 @@

      are indeed in the unified virtual address space.  */

   objfile_type->builtin_core_addr

-    = init_type (TYPE_CODE_INT,

-		 gdbarch_addr_bit (gdbarch) / 8,

-		 TYPE_FLAG_UNSIGNED, "__CORE_ADDR", objfile);

+    = init_integer_type (objfile, gdbarch_addr_bit (gdbarch), 1,

+			 "__CORE_ADDR");

   set_objfile_data (objfile, objfile_type_data, objfile_type);

   return objfile_type;

Index: gdb-7.6.1/gdb/gdbtypes.h

===================================================================

--- gdb-7.6.1.orig/gdb/gdbtypes.h	2017-03-11 21:45:27.194484312 +0100

+++ gdb-7.6.1/gdb/gdbtypes.h	2017-03-11 21:45:39.100565518 +0100

@@ -1542,8 +1542,21 @@

 extern struct gdbarch *get_type_arch (const struct type *);

 /* Helper function to construct objfile-owned types.  */

-extern struct type *init_type (enum type_code, LONGEST, int, const char *,

-			       struct objfile *);

+extern struct type *init_type (struct objfile *, enum type_code, LONGEST,

+			       const char *);

+extern struct type *init_integer_type (struct objfile *, int, int,

+				       const char *);

+extern struct type *init_character_type (struct objfile *, int, int,

+					 const char *);

+extern struct type *init_boolean_type (struct objfile *, int, int,

+				       const char *);

+extern struct type *init_float_type (struct objfile *, int, const char *,

+				     const struct floatformat **);

+extern struct type *init_decfloat_type (struct objfile *, int, const char *);

+extern struct type *init_complex_type (struct objfile *, const char *,

+				       struct type *);

+extern struct type *init_pointer_type (struct objfile *, int, const char *,

+				       struct type *);

 /* Helper functions to construct architecture-owned types.  */

 extern struct type *arch_type (struct gdbarch *, enum type_code, LONGEST,

Index: gdb-7.6.1/gdb/mdebugread.c

===================================================================

--- gdb-7.6.1.orig/gdb/mdebugread.c	2017-03-11 21:42:28.099262777 +0100

+++ gdb-7.6.1/gdb/mdebugread.c	2017-03-11 21:45:39.101565525 +0100

@@ -1374,97 +1374,80 @@

       break;

     case btAdr:

-      tp = init_type (TYPE_CODE_PTR, 4, TYPE_FLAG_UNSIGNED,

-		      "adr_32", objfile);

-      TYPE_TARGET_TYPE (tp) = objfile_type (objfile)->builtin_void;

+      tp = init_pointer_type (objfile, 32, "adr_32",