This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
gold patch committed: Don't error on same redefinition
- From: Ian Lance Taylor <iant at google dot com>
- To: binutils at sourceware dot org
- Date: Fri, 17 Jun 2011 06:33:38 -0700
- Subject: gold patch committed: Don't error on same redefinition
This patch to gold avoids giving an error if a symbol is redefined with
the same object and value. This fixes the test case in PR 12893, in
which the symbol is defined both with and without a version in an object
file using .symver, and then the symbol with no version is given the
same version again by a version script. Committed to mainline.
Ian
2011-06-17 Ian Lance Taylor <iant@google.com>
PR gold/12893
* resolve.cc (Symbol_table::resolve): Don't give an error if a
symbol is redefined with the exact same object and value.
Index: resolve.cc
===================================================================
RCS file: /cvs/src/src/gold/resolve.cc,v
retrieving revision 1.59
diff -u -p -r1.59 resolve.cc
--- resolve.cc 8 Jun 2011 04:05:25 -0000 1.59
+++ resolve.cc 17 Jun 2011 13:30:14 -0000
@@ -1,6 +1,6 @@
// resolve.cc -- symbol resolution for gold
-// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
@@ -245,6 +245,21 @@ Symbol_table::resolve(Sized_symbol<size>
unsigned int orig_st_shndx,
Object* object, const char* version)
{
+ // It's possible for a symbol to be defined in an object file
+ // using .symver to give it a version, and for there to also be
+ // a linker script giving that symbol the same version. We
+ // don't want to give a multiple-definition error for this
+ // harmless redefinition.
+ bool to_is_ordinary;
+ if (to->source() == Symbol::FROM_OBJECT
+ && to->object() == object
+ && is_ordinary
+ && to->is_defined()
+ && to->shndx(&to_is_ordinary) == st_shndx
+ && to_is_ordinary
+ && to->value() == sym.get_st_value())
+ return;
+
if (parameters->target().has_resolve())
{
Sized_target<size, big_endian>* sized_target;
@@ -306,7 +321,6 @@ Symbol_table::resolve(Sized_symbol<size>
// inline and the other is not. (Note: not all ODR violations can
// be found this way, and not everything this finds is an ODR
// violation. But it's helpful to warn about.)
- bool to_is_ordinary;
if (parameters->options().detect_odr_violations()
&& (sym.get_st_bind() == elfcpp::STB_WEAK
|| to->binding() == elfcpp::STB_WEAK)