From 1a57f9f75c5752d990a2749b000ec4ceace94b54 Mon Sep 17 00:00:00 2001 From: Pavel Chupin Date: Wed, 6 Feb 2013 19:21:46 +0400 Subject: [PATCH] x86_64: Rename 64-bit linker to linker64 That's for having both on the same system. Change-Id: Ic2bc2c015e6486e8b6a7576f7b28d2d027534368 Signed-off-by: Pavel Chupin --- linker/linker.cpp | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 linker/linker.cpp diff --git a/linker/linker.cpp b/linker/linker.cpp old mode 100644 new mode 100755 index cabbb99f1..d08bf75d6 --- 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;