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

am fe4233e5: am ebcc7207: Merge "Cleanup: updated comments"

Browse Source 
* commit 'fe4233e589bbc035fae49f891b9db7e31bc8b12b':
  Cleanup: updated comments
This commit is contained in:
Dmitriy Ivanov 2014-05-12 18:59:52 +00:00 committed by Android Git Automerger
commit 92ab50103a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
linker/linker.cpp
View File

@ -1031,10 +1031,6 @@ static int soinfo_relocate(soinfo* si, ElfW(Rela)* rela, unsigned count, soinfo*
* Section 4.7.1.10 "Dynamic relocations" * Section 4.7.1.10 "Dynamic relocations"
* R_AARCH64_COPY may only appear in executable objects where e_type is * R_AARCH64_COPY may only appear in executable objects where e_type is
* set to ET_EXEC. * set to ET_EXEC.
*
* FLAG_EXE is set for both ET_DYN and ET_EXEC executables.
* We should explicitly disallow ET_DYN executables from having
* R_AARCH64_COPY relocations.
*/ */
DL_ERR("%s R_AARCH64_COPY relocations are not supported", si->name); DL_ERR("%s R_AARCH64_COPY relocations are not supported", si->name);
return -1; return -1;
@ -1216,14 +1212,13 @@ static int soinfo_relocate(soinfo* si, ElfW(Rel)* rel, unsigned count, soinfo* n
break; break;
case R_ARM_COPY: case R_ARM_COPY:
/* /*
* ET_EXEC is not supported so this should not happen.
*
* http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044d/IHI0044D_aaelf.pdf * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044d/IHI0044D_aaelf.pdf
* *
* Section 4.7.1.10 "Dynamic relocations" * Section 4.7.1.10 "Dynamic relocations"
* R_ARM_COPY may only appear in executable objects where e_type is * R_ARM_COPY may only appear in executable objects where e_type is
* set to ET_EXEC. * set to ET_EXEC.
*
* We explicitly disallow ET_DYN executables from having
* R_ARM_COPY relocations.
*/ */
DL_ERR("%s R_ARM_COPY relocations are not supported", si->name); DL_ERR("%s R_ARM_COPY relocations are not supported", si->name);
return -1; return -1;