aboutsummaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/ChangeLog6
-rw-r--r--gcc/objc/objc-act.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 35fed82..472d4aa 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-07 Iain Sandoe <iains@gcc.gnu.org>
+
+ PR objc++/23716
+ * objc-act.c (build_module_initializer_routine): Make the argument
+ to objc_start_function NULL_TREE when compiling ObjC++.
+
2010-02-18 Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk>
Mike Stump <mikestump@comcast.net>
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 10cc9bc..7e3a2d8 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -2391,11 +2391,17 @@ build_module_initializer_routine (void)
objc_push_parm (build_decl (input_location,
PARM_DECL, NULL_TREE, void_type_node));
+#ifdef OBJCPLUS
+ objc_start_function (get_identifier (TAG_GNUINIT),
+ build_function_type (void_type_node,
+ OBJC_VOID_AT_END),
+ NULL_TREE, NULL_TREE);
+#else
objc_start_function (get_identifier (TAG_GNUINIT),
build_function_type (void_type_node,
OBJC_VOID_AT_END),
NULL_TREE, objc_get_parm_info (0));
-
+#endif
body = c_begin_compound_stmt (true);
add_stmt (build_function_call
(input_location,