From: jules <jules@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 8 Mar 2005 15:42:57 +0000 (+0000)
Subject: 	* decl.c (finish_method): Give methods once-only linkage.
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=05ac439abdc23f21dd7ceb8160de30879f977d39

	* decl.c (finish_method): Give methods once-only linkage.


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

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  <julian@codesourcery.com>
+
+	* decl.c (finish_method): Give methods once-only linkage.
+
 2005-03-07  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* 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)