diff options
| author | jules <jules@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-08 23:36:25 +0000 |
|---|---|---|
| committer | jules <jules@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-08 23:36:25 +0000 |
| commit | 684a59e64f6fedda4e48a68778192ba6af7756f5 (patch) | |
| tree | 761d1400be7e8269069f54d3dde8b528ad755151 /gcc/java | |
| parent | b21df10d930c684e85111f70ede950b208b706e2 (diff) | |
| download | gcc-684a59e64f6fedda4e48a68778192ba6af7756f5.tar.gz | |
* Revert patch from 2005-03-08 for causing bootstrap failure on
ppc-darwin.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96138 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/decl.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a969ade6b0b..698878de596 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 ea7a9b4209a..b7aa61650d3 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) |