diff options
| author | Eric Christopher <echristo@gmail.com> | 2018-01-12 11:05:58 -0800 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2018-01-12 11:05:58 -0800 |
| commit | b4b07ef1d11452018477d6a4166a0cfe1122d09d (patch) | |
| tree | 63a303fccc00603cdd8356760a4184af2ba8c14a /gold | |
| parent | eea61984abfea2c0acdc7e46ec182a14698b3bf9 (diff) | |
| download | binutils-b4b07ef1d11452018477d6a4166a0cfe1122d09d.zip binutils-b4b07ef1d11452018477d6a4166a0cfe1122d09d.tar.gz binutils-b4b07ef1d11452018477d6a4166a0cfe1122d09d.tar.bz2 | |
Apply:
2018-01-12 Sterling Augustine <saugustine@google.com>
* cref.cc (Cref_inputs::Cref_table_compare::operator): Add
conditionals and calls to is_forwarder.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/cref.cc | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 2b8e7c5..951b54e 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 84a9e46..0777453 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(); } |