From: jules <jules@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 Apr 2005 12:55:24 +0000 (+0000)
Subject: 	* java/decl.c (finish_method): Revert patch from 2005-04-13 for breaking
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5879926c847466eb49b76cbd5226829ab6efc6d5;p=thirdparty%2Fgcc.git

	* java/decl.c (finish_method): Revert patch from 2005-04-13 for breaking
	indirect dispatch with PIC.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98408 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ae97ad0b2040..371488a509af 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19  Julian Brown  <julian@codesourcery.com>
+
+	* decl.c (finish_method): Revert patch from 2005-04-13 for breaking
+	indirect dispatch with PIC.
+
 2005-04-18  Andrew Haley  <aph@redhat.com>
 
 	* java-except.h (struct eh_range.handler): Remove unused field.
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 168d30dba2a6..197c391e27c0 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -2057,13 +2057,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) && ! METHOD_FINAL (fndecl))
-    make_decl_one_only (fndecl);
-
   /* Prepend class initialization for static methods reachable from
      other classes.  */
   if (METHOD_STATIC (fndecl)