From 920b9c8d7018b1c4c7bebc6d517df78e7915f71b Mon Sep 17 00:00:00 2001 From: Julian Brown Date: Mon, 28 Feb 2005 14:14:47 +0000 Subject: [PATCH] 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 | 5 +++++ gcc/config/elfos.h | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 84ad3af50a8..b5d13144c91 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-02-28 Julian Brown + + * 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 PR bootstrap/17383 diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h index 6e41bb26936..9eed0d13fe3 100644 --- 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 -- 2.30.2