aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/decl.c7
2 files changed, 5 insertions, 7 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ae97ad0..371488a 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 168d30d..197c391 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)