diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/compile/compile-c-types.c | 28 |
2 files changed, 28 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2b9e554..55e6405 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-04-27 Alexandre Oliva <aoliva@redhat.com> + + * compile/compile-c-types.c (convert_int, convert_float): + Update for C FE v1. + 2018-04-27 Tom Tromey <tom@tromey.com> PR rust/22545: diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c index 19669a2..212cfe6 100644 --- a/gdb/compile/compile-c-types.c +++ b/gdb/compile/compile-c-types.c @@ -273,9 +273,22 @@ convert_func (struct compile_c_instance *context, struct type *type) static gcc_type convert_int (struct compile_c_instance *context, struct type *type) { - return C_CTX (context)->c_ops->int_type_v0 (C_CTX (context), - TYPE_UNSIGNED (type), - TYPE_LENGTH (type)); + if (C_CTX (context)->c_ops->c_version >= GCC_C_FE_VERSION_1) + { + if (TYPE_NOSIGN (type)) + { + gdb_assert (TYPE_LENGTH (type) == 1); + return C_CTX (context)->c_ops->char_type (C_CTX (context)); + } + return C_CTX (context)->c_ops->int_type (C_CTX (context), + TYPE_UNSIGNED (type), + TYPE_LENGTH (type), + TYPE_NAME (type)); + } + else + return C_CTX (context)->c_ops->int_type_v0 (C_CTX (context), + TYPE_UNSIGNED (type), + TYPE_LENGTH (type)); } /* Convert a floating-point type to its gcc representation. */ @@ -283,8 +296,13 @@ convert_int (struct compile_c_instance *context, struct type *type) static gcc_type convert_float (struct compile_c_instance *context, struct type *type) { - return C_CTX (context)->c_ops->float_type_v0 (C_CTX (context), - TYPE_LENGTH (type)); + if (C_CTX (context)->c_ops->c_version >= GCC_C_FE_VERSION_1) + return C_CTX (context)->c_ops->float_type (C_CTX (context), + TYPE_LENGTH (type), + TYPE_NAME (type)); + else + return C_CTX (context)->c_ops->float_type_v0 (C_CTX (context), + TYPE_LENGTH (type)); } /* Convert the 'void' type to its gcc representation. */ |