From: Julian Brown <julian@codesourcery.com>
Date: Wed, 13 Apr 2005 15:24:03 +0000 (+0000)
Subject: elfos.h (MAKE_DECL_ONE_ONLY): Redefined to stop DECL_WEAK from being used for symbols... 
X-Git-Tag: misc/cutover-cvs2svn~4109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e22a7bcf2604c5e0b29200530eaa090e787a249b;p=thirdparty%2Fgcc.git

elfos.h (MAKE_DECL_ONE_ONLY): Redefined to stop DECL_WEAK from being used for symbols with vague linkage when...

	* gcc/config/elfos.h (MAKE_DECL_ONE_ONLY): Redefined to stop DECL_WEAK
	from being used for symbols with vague linkage when
	HAVE_GAS_COMDAT_GROUP is true.
	* gcc/java/decl.c (finish_method): Give methods once-only linkage.

From-SVN: r98089
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4da851e1853d..1a5f5f85d904 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-13  Julian Brown  <julian@codesourcery.com>
+
+	* config/elfos.h (MAKE_DECL_ONE_ONLY): Redefined to stop DECL_WEAK from
+	being used for symbols with vague linkage when HAVE_GAS_COMDAT_GROUP
+	is true. 
+
 2005-04-13  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* basic-block.h, tree-ssa-uncprop.c, varasm.c,
diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index 9eed0d13fe39..6e41bb269368 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -212,7 +212,15 @@ Boston, MA 02111-1307, USA.  */
   fprintf ((FILE), "%s\n", ASM_SECTION_START_OP)
 #endif
 
-#define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1)
+/* Don't use weak for entities with vague linkage when HAVE_GAS_COMDAT_GROUP
+   is true.  */
+#define MAKE_DECL_ONE_ONLY(DECL)			\
+  do							\
+    {							\
+      if (!HAVE_GAS_COMDAT_GROUP)			\
+	DECL_WEAK(DECL) = 1;				\
+    }							\
+  while (0)
 
 /* Switch into a generic section.  */
 #define TARGET_ASM_NAMED_SECTION  default_elf_asm_named_section
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1044784186b3..a0d1037dd2f1 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-13  Julian Brown  <julian@codesourcery.com>
+
+	* decl.c (finish_method): Give methods once-only linkage.
+
 2005-04-11  Richard Sandiford  <rsandifo@redhat.com>
 
 	* lang.opt: Refer to the GCC internals documentation instead of c.opt.
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 197c391e27c0..168d30dba2a6 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -2057,6 +2057,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) && ! METHOD_FINAL (fndecl))
+    make_decl_one_only (fndecl);
+
   /* Prepend class initialization for static methods reachable from
      other classes.  */
   if (METHOD_STATIC (fndecl)