generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 92f3cc50: Merge "x86_64: Rename 64-bit linker to linker64"

Browse Source 
* commit '92f3cc50c8d884d1eb3496ebfba7d3916fc711e8':
  x86_64: Rename 64-bit linker to linker64
This commit is contained in:
Elliott Hughes
2013-10-09 16:54:16 -07:00
committed by Android Git Automerger
parent b35ebe3d70 92f3cc50c8
commit 28b8557d4c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linker/linker.cpp Normal file → Executable file
View File

@@ -1844,7 +1844,11 @@ static Elf_Addr __linker_init_post_relocation(KernelArgumentBlock& args, Elf_Add
*/ */
{ {
static soinfo linker_soinfo; 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)); strlcpy(linker_soinfo.name, "/system/bin/linker", sizeof(linker_soinfo.name));
#endif
linker_soinfo.flags = 0; linker_soinfo.flags = 0;
linker_soinfo.base = linker_base; linker_soinfo.base = linker_base;