X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftarget-descriptions.c;h=9cdb5462011f1353abf2579c808e6dda45f86c5d;hb=df4df182b49ab6808495f557d3727b8dfd4b98da;hp=48fc7df996dd503e12d0e3e916f38b19abf1ba79;hpb=69feb676087cb0883eb5feb38558dc3252059312;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 48fc7df996..9cdb546201 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -452,34 +452,34 @@ tdesc_gdb_type (struct gdbarch *gdbarch, struct tdesc_type *tdesc_type)
     {
     /* Predefined types.  */
     case TDESC_TYPE_INT8:
-      return builtin_type_int8;
+      return builtin_type (gdbarch)->builtin_int8;
 
     case TDESC_TYPE_INT16:
-      return builtin_type_int16;
+      return builtin_type (gdbarch)->builtin_int16;
 
     case TDESC_TYPE_INT32:
-      return builtin_type_int32;
+      return builtin_type (gdbarch)->builtin_int32;
 
     case TDESC_TYPE_INT64:
-      return builtin_type_int64;
+      return builtin_type (gdbarch)->builtin_int64;
 
     case TDESC_TYPE_INT128:
-      return builtin_type_int128;
+      return builtin_type (gdbarch)->builtin_int128;
 
     case TDESC_TYPE_UINT8:
-      return builtin_type_uint8;
+      return builtin_type (gdbarch)->builtin_uint8;
 
     case TDESC_TYPE_UINT16:
-      return builtin_type_uint16;
+      return builtin_type (gdbarch)->builtin_uint16;
 
     case TDESC_TYPE_UINT32:
-      return builtin_type_uint32;
+      return builtin_type (gdbarch)->builtin_uint32;
 
     case TDESC_TYPE_UINT64:
-      return builtin_type_uint64;
+      return builtin_type (gdbarch)->builtin_uint64;
 
     case TDESC_TYPE_UINT128:
-      return builtin_type_uint128;
+      return builtin_type (gdbarch)->builtin_uint128;
 
     case TDESC_TYPE_CODE_PTR:
       return builtin_type (gdbarch)->builtin_func_ptr;
@@ -708,7 +708,7 @@ tdesc_register_type (struct gdbarch *gdbarch, int regno)
 
   if (reg == NULL)
     /* Return "int0_t", since "void" has a misleading size of one.  */
-    return builtin_type_int0;
+    return builtin_type (gdbarch)->builtin_int0;
 
   if (arch_reg->type == NULL)
     {