aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/mips/mips.c14
2 files changed, 10 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9e103cf..6b6a161 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2003-10-30 Richard Henderson <rth@redhat.com>
+ * config/mips/mips.c (mips_build_builtin_va_list): Use runtime
+ test for irix6 rather than preprocessor test.
+
+2003-10-30 Richard Henderson <rth@redhat.com>
+
* cppcharset.c (one_utf8_to_utf16): Initialize 's' to silence warning.
2003-10-30 Ulrich Weigand <uweigand@de.ibm.com>
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index d85a83d..73873bf 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -4030,16 +4030,12 @@ mips_build_builtin_va_list (void)
layout_type (record);
return record;
}
+ else if (TARGET_IRIX && !TARGET_IRIX5)
+ /* On IRIX 6, this type is 'char *'. */
+ return build_pointer_type (char_type_node);
else
- {
-#if defined(TARGET_IRIX) && !TARGET_IRIX5
- /* On IRIX 6, this type is 'char *'. */
- return build_pointer_type (char_type_node);
-#else
- /* Otherwise, we use 'void *'. */
- return ptr_type_node;
-#endif
- }
+ /* Otherwise, we use 'void *'. */
+ return ptr_type_node;
}
/* Implement va_start. */