From: Eric Christopher <echristo@gmail.com>
Date: Fri, 12 Jan 2018 19:05:58 +0000 (-0800)
Subject: Apply:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4b07ef1d11452018477d6a4166a0cfe1122d09d;p=binutils-gdb.git

Apply:

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 2b8e7c575c2..951b54e9337 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-12 Sterling Augustine <saugustine@google.com>
+
+	* cref.cc (Cref_inputs::Cref_table_compare::operator): Add
+	conditionals and calls to is_forwarder.
+
 2018-01-03  Alan Modra  <amodra@gmail.com>
 
 	Update year range in copyright notice of all files.
diff --git a/gold/cref.cc b/gold/cref.cc
index 84a9e46c84c..07774535015 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();
 }