OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ian Lance Taylor 2011-06-17 13:31:33 +00:00
parent 10b4f10252
commit 534b4e5f33
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gold/ChangeLog
View File

@ -1,3 +1,9 @@
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.
2011-06-17 Ian Lance Taylor <iant@google.com>
PR gold/12880

18
gold/resolve.cc
View File

@ -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>* to,
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>* to,
// 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)