re PR target/20228 ([4.1 Regressions] Cannot link two valid C++ TU together)

	* config/elfos.h: Revert my patch from 2005-02-25 since it broke
	building libjava and caused PR regression/20228.

From-SVN: r95684

gcc/ChangeLog

+2005-02-28  Julian Brown  <julian@codesourcery.com>
+
+	* config/elfos.h: Revert my patch from 2005-02-25 since it broke
+	building libjava and caused PR regression/20228.
+
 2005-02-28  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR bootstrap/17383

gcc/config/elfos.h

@@ -212,15 +212,7 @@ Boston, MA 02111-1307, USA.  */
   fprintf ((FILE), "%s\n", ASM_SECTION_START_OP)
 #endif
 
-/* 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)
+#define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1)
 
 /* Switch into a generic section.  */
 #define TARGET_ASM_NAMED_SECTION  default_elf_asm_named_section