* config/elfos.h: Revert my patch from 2005-02-25 since it broke

	building libjava and caused PR regression/20228.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 84ad3af..b5d1314 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index 6e41bb2..9eed0d1 100644 (file)
--- a/gcc/config/elfos.h
+++ b/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