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

	object to override a kept COMDAT group from a plugin object.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index dbfe8f636db37e67044116a0fe9a31b7afef9320..85482bb20e7c052cd706e64bbe7bd313af55dfbd 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -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

diff --git a/gold/layout.cc b/gold/layout.cc
index 2097b6de7df2fc2668a1bf90bfcfd12003262b77..a4f17e535574b487eadf2559bbc5b6e1f2585f0b 100644 (file)
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -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)