mips.c (mips_build_builtin_va_list): Use runtime test for irix6 rather than preproces...

        * config/mips/mips.c (mips_build_builtin_va_list): Use runtime
        test for irix6 rather than preprocessor test.

From-SVN: r73089

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9e103cf4f8b57516b1ab65f2d149ba52fd656c61..6b6a1618b636920f7bd4443bb5e42be924ff15d1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index d85a83d68f2b4ab692ac68145d6d2fdcc2fefc79..73873bf15b2d9049a4b9541e5148f877878d2152 100644 (file)
--- 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.  */