aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/opencl-lang.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7e95941..3dc3067 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-02 Ulrich Weigand <uweigand@de.ibm.com>
+
+ * opencl-lang.c (STRINGIFY): Rename to OCL_STRING.
+ (BUILD_OCL_VTYPES): Update.
+
2011-02-02 Joel Brobecker <brobecker@adacore.com>
* configure.ac: Work around non-GNU sed limitation when computing
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index bfc863e..169ee6b 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -1116,27 +1116,27 @@ build_opencl_types (struct gdbarch *gdbarch)
= GDBARCH_OBSTACK_ZALLOC (gdbarch, struct builtin_opencl_type);
/* Helper macro to create strings. */
-#define STRINGIFY(S) #S
+#define OCL_STRING(S) #S
/* This macro allocates and assigns the type struct pointers
for the vector types. */
#define BUILD_OCL_VTYPES(TYPE)\
builtin_opencl_type->builtin_##TYPE##2\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 2);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##2) = STRINGIFY(TYPE ## 2);\
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##2) = OCL_STRING(TYPE ## 2);\
builtin_opencl_type->builtin_##TYPE##3\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 3);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##3) = STRINGIFY(TYPE ## 3);\
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##3) = OCL_STRING(TYPE ## 3);\
TYPE_LENGTH (builtin_opencl_type->builtin_##TYPE##3)\
= 4 * TYPE_LENGTH (builtin_opencl_type->builtin_##TYPE);\
builtin_opencl_type->builtin_##TYPE##4\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 4);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##4) = STRINGIFY(TYPE ## 4);\
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##4) = OCL_STRING(TYPE ## 4);\
builtin_opencl_type->builtin_##TYPE##8\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 8);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##8) = STRINGIFY(TYPE ## 8);\
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##8) = OCL_STRING(TYPE ## 8);\
builtin_opencl_type->builtin_##TYPE##16\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 16);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##16) = STRINGIFY(TYPE ## 16)
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##16) = OCL_STRING(TYPE ## 16)
builtin_opencl_type->builtin_char
= arch_integer_type (gdbarch, 8, 0, "char");