* Revert patch from 2005-03-08 for causing bootstrap failure on

ppc-darwin.

From-SVN: r96138
This commit is contained in:
Julian Brown 2005-03-08 23:36:25 +00:00 committed by Julian Brown
parent 1fbbc05518
commit 2a6464a6d3
2 changed files with 5 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2005-03-08 Julian Brown <julian@codesourcery.com>
* Revert patch from 2005-03-08 for causing bootstrap failure on
ppc-darwin.
2005-03-08 Julian Brown <julian@codesourcery.com>
* decl.c (finish_method): Give methods once-only linkage.

View File

@ -2036,13 +2036,6 @@ finish_method (tree fndecl)
build2 (TRY_FINALLY_EXPR, void_type_node, *tp, exit));
}
/* Ensure non-abstract non-static non-private members are defined only once
when linking. This is an issue when using CNI to interface with C++ object
files. */
if (! METHOD_STATIC (fndecl) && ! METHOD_PRIVATE (fndecl)
&& ! METHOD_ABSTRACT (fndecl))
make_decl_one_only (fndecl);
/* Prepend class initialization for static methods reachable from
other classes. */
if (METHOD_STATIC (fndecl) && ! METHOD_PRIVATE (fndecl)