From: Eric Christopher <echristo@gmail.com>
Date: Fri, 12 Jan 2018 19:12:55 +0000 (-0800)
Subject: 2018-01-12  Eric Christopher  <echristo@gmail.com>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c19049c30fc4af93b56ed0ef2ef896142e09e855;p=thirdparty%2Fbinutils-gdb.git

2018-01-12  Eric Christopher  <echristo@gmail.com>

	    Apply from master:
	    2018-01-12 Sterling Augustine <saugustine@google.com>

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

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 9e45ad360d9..1403db5029b 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-12  Eric Christopher  <echristo@gmail.com>
+
+	Apply from master:
+	2018-01-12 Sterling Augustine <saugustine@google.com>
+
+	* cref.cc (Cref_inputs::Cref_table_compare::operator): Add
+	conditionals and calls to is_forwarder.
+
 2017-12-01  Cary Coutant  <ccoutant@gmail.com>
 
 	PR gold/22309
diff --git a/gold/cref.cc b/gold/cref.cc
index d3337b9d6b5..ff9e2173342 100644
--- 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();
 }