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

	ppc-darwin.

From-SVN: r96138

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a969ade6b0b16b15709cebf3cd8d196f77235d9c..698878de596d34ec178c6fb08a36883879b76f91 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -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.

diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index ea7a9b4209a68dcb13c71604136baa5f188d2987..b7aa61650d3548a5d06c847ce0f0aed302f9992d 100644 (file)
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -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)