aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2018-04-27 11:17:02 -0700
committerKeith Seitz <keiths@redhat.com>2018-04-27 12:36:19 -0700
commit476d250ee86c37386b02b0634a59aae13d07a038 (patch)
treeb664b1642d13158c48213d60d097fcbbff2608db /gdb
parent6873858b7e464e114f9a877e216949ad8350b4cf (diff)
downloadgdb-476d250ee86c37386b02b0634a59aae13d07a038.zip
gdb-476d250ee86c37386b02b0634a59aae13d07a038.tar.gz
gdb-476d250ee86c37386b02b0634a59aae13d07a038.tar.bz2
Add libcc1 v1 compatibility to C compile feature
This patch adds v1 compatibiltiy to the C compile feature. The only change in v1 concerns the handling of integer types, which permits GDB to specify the built-in name for the type. As far as I know, the C frontend is still on v0, so this patch is purely precautionary. [By default C++ compile uses the equivalent of the C frontend's int_type and float_type (aka the "v1" versions).] gdb/ChangeLog: * compile/compile-c-types.c (convert_int, convert_float): Update for C FE v1.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/compile/compile-c-types.c28
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. */