commit | 4ff967f3301087ea6ccaa17cfb1f04a034448a68 | [log] [tgz] |
---|---|---|
author | Torne (Richard Coles) <torne@google.com> | Tue Apr 22 11:01:22 2014 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 22 11:01:22 2014 +0000 |
tree | 57d8b462b6aba361e2d8692f96d8e2407acb1368 | |
parent | b1bfa7956c56c28b8c914e6606df191e094e7b42 [diff] | |
parent | 0dcf06f976670b5d05286b184d150f61b71c1184 [diff] |
Merge "Fix arm64/x86 build."
diff --git a/linker/linker.cpp b/linker/linker.cpp index a1e65e4..4d8563e 100755 --- a/linker/linker.cpp +++ b/linker/linker.cpp
@@ -1946,7 +1946,7 @@ si->flags = 0; si->load_bias = get_elf_exec_load_bias(ehdr_vdso); - soinfo_link_image(si); + soinfo_link_image(si, NULL); #endif }