am 58481547: Merge "resolved conflicts for merge of bd321c11 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp

* commit '5848154714fbe84de46af33ee9a57c7588094167':
  Run constructors before resolving ifunc functions
This commit is contained in:
Dmitriy Ivanov 2014-10-02 16:56:38 +00:00 committed by Android Git Automerger
commit 327bf8ad36

View File

@ -1673,6 +1673,8 @@ void soinfo::CallConstructors() {
// DT_INIT should be called before DT_INIT_ARRAY if both are present. // DT_INIT should be called before DT_INIT_ARRAY if both are present.
CallFunction("DT_INIT", init_func); CallFunction("DT_INIT", init_func);
CallArray("DT_INIT_ARRAY", init_array, init_array_count, false); CallArray("DT_INIT_ARRAY", init_array, init_array_count, false);
resolve_ifunc_symbols();
} }
void soinfo::CallDestructors() { void soinfo::CallDestructors() {