From 9148ab01d166fe2ffb39292ba630074ad45cd3ce Mon Sep 17 00:00:00 2001 From: Julian Brown Date: Tue, 8 Mar 2005 15:42:57 +0000 Subject: [PATCH] * decl.c (finish_method): Give methods once-only linkage. From-SVN: r96106 --- gcc/java/ChangeLog | 4 ++++ gcc/java/decl.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 298bd725b85..78fab7f668b 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2005-03-08 Julian Brown + + * decl.c (finish_method): Give methods once-only linkage. + 2005-03-07 Bryce McKinlay * verify-glue.c (vfy_is_assignable_from): Perform static check using diff --git a/gcc/java/decl.c b/gcc/java/decl.c index b7aa61650d3..ea7a9b4209a 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -2036,6 +2036,13 @@ 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) -- 2.30.2