diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-03-04 09:54:56 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2015-03-30 11:31:46 -0700 |
| commit | 29bc0005408451ccd5a490b226d59b9794fa0f6e (patch) | |
| tree | a60e66e7bb74ca138abc6bac35f43b0510d2d7bb /binutils-2.25/gold | |
| parent | 73d1c068846c1b31ce357329f2cf73bdb36ae646 (diff) | |
| download | toolchain_binutils-29bc0005408451ccd5a490b226d59b9794fa0f6e.tar.gz toolchain_binutils-29bc0005408451ccd5a490b226d59b9794fa0f6e.tar.bz2 toolchain_binutils-29bc0005408451ccd5a490b226d59b9794fa0f6e.zip | |
Backport to fix race condition calling select_as_default_target()
2015-03-03 Cary Coutant <ccoutant@google.com>
gold/
* parameters.cc (Parameters::set_target_once): Call
Target::select_as_default_target just once from here...
(set_parameters_target): ...instead of from here.
Change-Id: Ic4b1503b1bb453b9812188e0a98482bc489d9197
Diffstat (limited to 'binutils-2.25/gold')
| -rw-r--r-- | binutils-2.25/gold/parameters.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/binutils-2.25/gold/parameters.cc b/binutils-2.25/gold/parameters.cc index dbda690d..8eab000c 100644 --- a/binutils-2.25/gold/parameters.cc +++ b/binutils-2.25/gold/parameters.cc @@ -125,6 +125,7 @@ Parameters::set_target_once(Target* target) { gold_assert(this->target_ == NULL); this->target_ = target; + target->select_as_default_target(); if (this->options_valid()) { this->check_target_endianness(); @@ -297,7 +298,6 @@ void set_parameters_target(Target* target) { static_parameters.set_target(target); - target->select_as_default_target(); } void |