From 5ac74d254221fa92b4e55f03a46329599e8f31d1 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 29 Nov 2007 17:21:18 +0100 Subject: [PATCH] re PR target/32130 (linking problems: multiple definition of `__DTOR_END__') PR target/32130 * config/rs6000/eabi-cn.asm (__DTOR_END__): Make it weak. * config/rs6000/sol-cn.asm (__DTOR_END__): Likewise. From-SVN: r130516 --- gcc/ChangeLog | 6 ++++++ gcc/config/rs6000/eabi-cn.asm | 4 ++-- gcc/config/rs6000/sol-cn.asm | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d28219170ff..376994a196a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-11-29 Jakub Jelinek + + PR target/32130 + * config/rs6000/eabi-cn.asm (__DTOR_END__): Make it weak. + * config/rs6000/sol-cn.asm (__DTOR_END__): Likewise. + 2007-11-29 Andris Pavenis * Makefile.in: Use separate vpath lines for each path. diff --git a/gcc/config/rs6000/eabi-cn.asm b/gcc/config/rs6000/eabi-cn.asm index 90a5da75c16..fcfea4d133e 100644 --- a/gcc/config/rs6000/eabi-cn.asm +++ b/gcc/config/rs6000/eabi-cn.asm @@ -1,5 +1,5 @@ /* crtn.s for eabi - Copyright (C) 1996, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2007 Free Software Foundation, Inc. Written By Michael Meissner This file is free software; you can redistribute it and/or modify it @@ -66,7 +66,7 @@ __FIXUP_END__: __CTOR_END__: .section ".dtors","aw" - .globl __DTOR_END__ + .weak __DTOR_END__ .type __DTOR_END__,@object __DTOR_END__: diff --git a/gcc/config/rs6000/sol-cn.asm b/gcc/config/rs6000/sol-cn.asm index 85468345ba2..b9ef4443464 100644 --- a/gcc/config/rs6000/sol-cn.asm +++ b/gcc/config/rs6000/sol-cn.asm @@ -1,6 +1,6 @@ # crtn.s for sysv4 -# Copyright (C) 1996 Free Software Foundation, Inc. +# Copyright (C) 1996, 2007 Free Software Foundation, Inc. # Written By Michael Meissner # # This file is free software; you can redistribute it and/or modify it @@ -54,7 +54,7 @@ __CTOR_END__: # End list of C++ destructors .section ".dtors","aw" - .globl __DTOR_END__ + .weak __DTOR_END__ .type __DTOR_END__,@object __DTOR_END__: