diff options
| -rw-r--r-- | gold/ChangeLog | 8 | ||||
| -rw-r--r-- | gold/aarch64.cc | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 49853f5..1245da5 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,4 +1,12 @@ 2017-11-30 Peter Smith <peter.smith@linaro.org> + Cary Coutant <ccoutant@gmail.com> + + PR gold/20765 + * aarch64.cc (Erratum_stub::invalidate_erratum_stub): Use erratum_insn_ + instead of relobj_ to invalidate the stub. + (Erratum_stub::is_invalidated_erratum_stub): Likewise. + +2017-11-30 Peter Smith <peter.smith@linaro.org> PR gold/22233 * aarch64.cc (AArch64_relobj::fix_errata_and_relocate_erratum_stubs): diff --git a/gold/aarch64.cc b/gold/aarch64.cc index 02fabb7..04da01d 100644 --- a/gold/aarch64.cc +++ b/gold/aarch64.cc @@ -1052,13 +1052,13 @@ public: void invalidate_erratum_stub() { - gold_assert(this->relobj_ != NULL); - this->relobj_ = NULL; + gold_assert(this->erratum_insn_ != invalid_insn); + this->erratum_insn_ = invalid_insn; } bool is_invalidated_erratum_stub() - { return this->relobj_ == NULL; } + { return this->erratum_insn_ == invalid_insn; } protected: virtual void |