From: Julian Brown <julian@codesourcery.com>
Date: Tue, 8 Mar 2005 23:36:25 +0000 (+0000)
Subject: * Revert patch from 2005-03-08 for causing bootstrap failure on
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=2a6464a6d3bfbbf214cdade9f84c06e76529d0d0;p=platform%2Fupstream%2Fgcc.git

* 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 a969ade..698878d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,5 +1,10 @@
 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.
 
 2005-03-07  Ranjit Mathew  <rmathew@hotmail.com>
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index ea7a9b4..b7aa616 100644
--- 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)