yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* layout.cc (Layout::add_comdat): Allow COMDAT group from a replacement

Browse Source 
object to override a kept COMDAT group from a plugin object.
This commit is contained in:
Cary Coutant 2008-12-10 19:50:14 +00:00
parent a3a219a90a
commit 2756a25828
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gold/ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-10 Cary Coutant <ccoutant@google.com>
* layout.cc (Layout::add_comdat): Allow COMDAT group from a replacement
object to override a kept COMDAT group from a plugin object.
2008-12-09 Ian Lance Taylor <iant@google.com>
PR 7088

9
gold/layout.cc
View File

@ -47,6 +47,7 @@
#include "reloc.h"
#include "descriptors.h"
#include "layout.h"
#include "plugin.h"
namespace gold
{
@ -2959,6 +2960,14 @@ Layout::add_comdat(Relobj* object, unsigned int shndx,
if (ins.first->second.group_)
{
// We've already seen a real section group with this signature.
// If the kept group is from a plugin object, and we're in
// the replacement phase, accept the new one as a replacement.
if (ins.first->second.object_ == NULL
&& parameters->options().plugins()->in_replacement_phase())
{
ins.first->second = kept;
return true;
}
return false;
}
else if (group)