am 7e049ba4: am 28b8557d: am 92f3cc50: Merge "x86_64: Rename 64-bit linker to linker64"

* commit '7e049ba47039477a16895450e76c4561bf2350f5': x86_64: Rename 64-bit linker to linker64
2013-10-09 17:01:46 -07:00
parent d4a52318ce 7e049ba470
commit 6d332afbd9
1 changed files with 4 additions and 0 deletions
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1844,7 +1844,11 @@ static Elf_Addr __linker_init_post_relocation(KernelArgumentBlock& args, Elf_Add
     */
    {
        static soinfo linker_soinfo;
+#ifdef __LP64__
+        strlcpy(linker_soinfo.name, "/system/bin/linker64", sizeof(linker_soinfo.name));
+#else
        strlcpy(linker_soinfo.name, "/system/bin/linker", sizeof(linker_soinfo.name));
+#endif
        linker_soinfo.flags = 0;
        linker_soinfo.base = linker_base;