objc-act.c (synth_module_prologue): Call build_function_type_list instead of build_fu...

	* objc-act.c (synth_module_prologue): Call build_function_type_list
	instead of build_function_type.
	* objc-next-runtime-abi-02.c (next_runtime_02_initialize):
	Likewise.

From-SVN: r172844

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index f21a2137292f28b0a6d16df04e3605b58b279b8b..0732a8b752359fb749509e4a50a74d169c884f51 100644 (file)
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-21  Nathan Froyd  <froydnj@codesourcery.com>
+
+       * objc-act.c (synth_module_prologue): Call build_function_type_list
+       instead of build_function_type.
+       * objc-next-runtime-abi-02.c (next_runtime_02_initialize):
+       Likewise.
+
 2011-04-15  Nicola Pero  <nicola.pero@meta-innovation.com>
 
        * objc-act.c (ivar_of_class): New.

diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index b48f1795046caf36c9149c17e4508bfe79035bc0..0b6b7931b27837b2b40d906dda205a11d9a2b70c 100644 (file)
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -2995,8 +2995,8 @@ synth_module_prologue (void)
   build_fast_enumeration_state_template ();
   
   /* void objc_enumeration_mutation (id) */
-  type = build_function_type (void_type_node,
-                             tree_cons (NULL_TREE, objc_object_type, NULL_TREE));
+  type = build_function_type_list (void_type_node,
+                                  objc_object_type, NULL_TREE);
   objc_enumeration_mutation_decl 
     = add_builtin_function (TAG_ENUMERATION_MUTATION, type, 0, NOT_BUILT_IN, 
                            NULL, NULL_TREE);

diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index 4ce0159691fe611142b84a2694859b0a604c18b1..f3cf359d19f7099258374ce7ca0e0e51f5c3d4dd 100644 (file)
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -492,9 +492,8 @@ static void next_runtime_02_initialize (void)
   build_v2_ehtype_template ();
 
   /* void * objc_begin_catch (void *) */
-  type = build_function_type (ptr_type_node,
-                             tree_cons (NULL_TREE, ptr_type_node,
-                             OBJC_VOID_AT_END));
+  type = build_function_type_list (ptr_type_node,
+                                  ptr_type_node, NULL_TREE);
 
   objc2_begin_catch_decl = add_builtin_function ("objc_begin_catch",
                                                 type, 0, NOT_BUILT_IN,
@@ -502,14 +501,13 @@ static void next_runtime_02_initialize (void)
   TREE_NOTHROW (objc2_begin_catch_decl) = 0;
 
   /* void objc_end_catch () */
-  type = build_function_type (void_type_node, OBJC_VOID_AT_END);
+  type = build_function_type_list (void_type_node, NULL_TREE);
   objc2_end_catch_decl = add_builtin_function ("objc_end_catch",
                                                type, 0, NOT_BUILT_IN,
                                                NULL, NULL_TREE);
   TREE_NOTHROW (objc2_end_catch_decl) = 0;
 
   /* void objc_exception_rethrow (void) */
-  type = build_function_type (void_type_node, OBJC_VOID_AT_END);
   objc_rethrow_exception_decl = 
                        add_builtin_function ("objc_exception_rethrow",
                                              type, 0, NOT_BUILT_IN,