decl.c (finish_method): Revert patch from 2005-04-13 for breaking indirect dispatch...

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

From-SVN: r98408

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ae97ad0b20407580231547838b146acfeacbcb11..371488a509af2ed1175d33c63968820e211acaac 100644 (file)
--- 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 168d30dba2a673d86147b4479fa59711a26d42ca..197c391e27c071a753b1214eb845bffb759b82ce 100644 (file)
--- 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)