Commit: 1e4d2a179d04d08bf113706939dd502c46301261 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revision: 1e4d2a179d04d08bf113706939dd502c46301261 (tree)
• Zeit: 2018-01-13 04:12:55
• Autor: Eric Christopher <echristo@gmai...>
• Commiter: Eric Christopher

Log Message

2018-01-12 Eric Christopher <[e-mail]>

Apply from master:
2018-01-12 Sterling Augustine <[e-mail]>

• • • • cref.cc (Cref_inputs::Cref_table_compare::operator): Add
        conditionals and calls to is_forwarder.
        

Ändern Zusammenfassung

• modified: gold/ChangeLog
• modified: gold/cref.cc

Diff

--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,11 @@
[phone]  Eric Christopher  <[e-mail]>
+
+	Apply from master:
+	2018-01-12 Sterling Augustine <[e-mail]>
+
+	* cref.cc (Cref_inputs::Cref_table_compare::operator): Add
+	conditionals and calls to is_forwarder.
+
 2017-11-21  Ian Lance Taylor  <[e-mail]>
 
 	Apply from master:

--- a/gold/cref.cc
+++ b/gold/cref.cc
@@ -236,9 +236,13 @@ Cref_inputs::Cref_table_compare::operator()(const Symbol* s1,
     }
 
   // We should never have two different symbols with the same name and
-  // version.
+  // version, where one doesn't forward to the other.
   if (s1 == s2)
     return false;
+  if (s1->is_forwarder() && !s2->is_forwarder())
+    return true;
+  if (!s1->is_forwarder() && s2->is_forwarder())
+    return false;
   gold_unreachable();
 }