| Message ID | ydd62jnll22.fsf@manam.CeBiTec.Uni-Bielefeld.DE |
|---|---|
| State | New |
| Headers | show |
On 10/17/2011 05:00 PM, Rainer Orth wrote: > As described in the PR, after Benjamin's patch > > 2011-10-10 Benjamin Kosnik<bkoz@redhat.com> > > PR libstdc++/49818 > * config/abi/pre/gnu.ver (CXXABI_1.3.6): Add symbols. > > __cxa_get_exception_ptr is now present in both CXXABI_1.3.1 and > CXXABI_1.3.6, which breaks Solaris bootstrap with Sun ld: > > ld: fatal: libstdc++-symbols.ver-sun: 5210: symbol '__cxa_get_exception_ptr' is already defined in file: libstdc++-symbols.ver-sun: symbol version conflict > > The duplicate serves no purpose I can see, and even with both entries, > __cxa_get_exception_ptr is bound to version CXXABI_1.3.1 only on > x86_64-unknown-linux-gnu, so it seems safe to remove. > > This restores Solaris bootstrap, tested on i386-pc-solaris2.11. > > Ok for mainline? Ok, thanks. Paolo.
Agh. Sorry about this Rainer. Thanks for the patch. -benjamin
# HG changeset patch # Parent fbadbe8d19738b0abbefa6cabc32fa04d969b09f Remove duplicate symbol in gnu.ver (PR bootstrap/50715) diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -1496,7 +1496,6 @@ CXXABI_1.3.6 { __cxa_allocate_dependent_exception; __cxa_free_dependent_exception; - __cxa_get_exception_ptr; __cxa_deleted_virtual; -} CXXABI_1.3.5; \ No newline at end of file +} CXXABI_1.3.5;
As described in the PR, after Benjamin's patch 2011-10-10 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/49818 * config/abi/pre/gnu.ver (CXXABI_1.3.6): Add symbols. __cxa_get_exception_ptr is now present in both CXXABI_1.3.1 and CXXABI_1.3.6, which breaks Solaris bootstrap with Sun ld: ld: fatal: libstdc++-symbols.ver-sun: 5210: symbol '__cxa_get_exception_ptr' is already defined in file: libstdc++-symbols.ver-sun: symbol version conflict The duplicate serves no purpose I can see, and even with both entries, __cxa_get_exception_ptr is bound to version CXXABI_1.3.1 only on x86_64-unknown-linux-gnu, so it seems safe to remove. This restores Solaris bootstrap, tested on i386-pc-solaris2.11. Ok for mainline? Rainer 2011-10-14 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR bootstrap/50715 * config/abi/pre/gnu.ver (CXXABI_1.3.6): Remove duplicate __cxa_get_exception_ptr.