diff options
| -rw-r--r-- | gcc/objc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/objc/objc-gnu-runtime-abi-01.c | 22 |
2 files changed, 22 insertions, 5 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 926352e..81fff66 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,8 @@ +2011-01-19 Nicola Pero <nicola.pero@meta-innovation.com> + + * objc-gnu-runtime-abi-01.c (objc_generate_v1_gnu_metadata): Do + not generate metadata if there is nothing to put into it. + 2011-02-17 Iain Sandoe <iains@gcc.gnu.org> * config-lang.in (gtfiles): Updated. diff --git a/gcc/objc/objc-gnu-runtime-abi-01.c b/gcc/objc/objc-gnu-runtime-abi-01.c index a13f015..fdf0480 100644 --- a/gcc/objc/objc-gnu-runtime-abi-01.c +++ b/gcc/objc/objc-gnu-runtime-abi-01.c @@ -2105,11 +2105,23 @@ objc_generate_v1_gnu_metadata (void) generate_protocols (); /* Arrange for ObjC data structures to be initialized at run time. */ - generate_objc_symtab_decl (); - /* Make sure that the meta-data are identified as being GNU-runtime. */ - build_module_descriptor (OBJC_VERSION, - build_tree_list (objc_meta, meta_base)); - build_module_initializer_routine (); + /* FIXME: Have some more elegant way to determine if we need to + generate objc_symtab_decl or not, instead of checking these + global symbols. */ + if (imp_list || class_names_chain + || meth_var_names_chain || meth_var_types_chain || sel_ref_chain + || prop_names_attr_chain) + generate_objc_symtab_decl (); + + if (imp_list || class_names_chain || objc_static_instances + || meth_var_names_chain || meth_var_types_chain || sel_ref_chain) + { + /* Make sure that the meta-data are identified as being + GNU-runtime. */ + build_module_descriptor (OBJC_VERSION, + build_tree_list (objc_meta, meta_base)); + build_module_initializer_routine (); + } /* Dump the class references. This forces the appropriate classes to be linked into the executable image, preserving unix archive |