re PR bootstrap/47215 (Failed to bootstrap)

2011-01-21  Kai Tietz  <kai.tietz@onevision.com>

        PR bootstrap/47215
        * decl.c (java_init_decl_processing): Remove
        va_list_type_node related type initializations.

2011-01-21  Kai Tietz  <kai.tietz@onevision.com>

	PR bootstrap/47215
	* config/i386/i386.c (ix86_local_alignment): Handle
	case for va_list_type_node is nil.
	(ix86_canonical_va_list_type): Likewise.

From-SVN: r169080

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de7d1b0b876fac18d3e634570167d7df42dc1702..dffe700995cc0f30e8059cccf82211a67ba5a916 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-21  Kai Tietz  <kai.tietz@onevision.com>
+
+       PR bootstrap/47215
+       * config/i386/i386.c (ix86_local_alignment): Handle
+       case for va_list_type_node is nil.
+       (ix86_canonical_va_list_type): Likewise.
+
 2011-01-21  Alan Modra  <amodra@gmail.com>
 
        * config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Add

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index f5843dea9e4f00a93c815732bcba7d14bcee29c9..1484deab9d007672ad510c0ebc49f181935f003e 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -22931,8 +22931,9 @@ ix86_local_alignment (tree exp, enum machine_mode mode,
       && TARGET_SSE)
     {
       if (AGGREGATE_TYPE_P (type)
-          && (TYPE_MAIN_VARIANT (type)
-              != TYPE_MAIN_VARIANT (va_list_type_node))
+          && (va_list_type_node == NULL_TREE
+              || (TYPE_MAIN_VARIANT (type)
+                  != TYPE_MAIN_VARIANT (va_list_type_node)))
           && TYPE_SIZE (type)
           && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
           && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 16
@@ -33682,7 +33683,7 @@ ix86_canonical_va_list_type (tree type)
   else if (POINTER_TYPE_P (type) && TREE_CODE (TREE_TYPE (type)) == ARRAY_TYPE)
     type = TREE_TYPE (type);
 
-  if (TARGET_64BIT)
+  if (TARGET_64BIT && va_list_type_node != NULL_TREE)
     {
       wtype = va_list_type_node;
          gcc_assert (wtype != NULL_TREE);

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 77281e98804d34b3b7be100dadddb8b098b34508..28e89649c09ac82fd0d5354299f4348964b96079 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-21  Kai Tietz  <kai.tietz@onevision.com>
+
+       PR bootstrap/47215
+       * decl.c (java_init_decl_processing): Remove
+       va_list_type_node related type initializations.
+
 2011-01-11  Kai Tietz  <kai.tietz@onevision.com>
 
        PR bootstrap/47215

diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index d575a42233419ebb7210fac03f6d86b62d5286c8..a17b826696b165ec094b1804788d8ef1c0b31ba8 100644 (file)
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -1153,21 +1153,6 @@ java_init_decl_processing (void)
   soft_lrem_node
     = add_builtin_function ("_Jv_remJ", t,
                            0, NOT_BUILT_IN, NULL, NULL_TREE);
-  /* Initialize va_list_type_node.  */
-  unsigned_type_node = make_unsigned_type (INT_TYPE_SIZE);
-  long_integer_type_node = make_signed_type (LONG_TYPE_SIZE);
-
-  t = targetm.build_builtin_va_list ();
-
-  /* Many back-ends define record types without setting TYPE_NAME.
-     If we copied the record type here, we'd keep the original
-     record type without a name.  This breaks name mangling.  So,
-     don't copy record types and let c_common_nodes_and_builtins()
-     declare the type to be __builtin_va_list.  */
-  if (TREE_CODE (t) != RECORD_TYPE)
-    t = build_variant_type_copy (t);
-
-  va_list_type_node = t;
 
   initialize_builtins ();