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

am a1b9f0d4: Merge "Revert "Don\'t warn about x86 text relocations. They\'re too prevalent.""

Browse Source 
* commit 'a1b9f0d4436fea551f641ad02d49610fb5eab0f0':
  Revert "Don't warn about x86 text relocations. They're too prevalent."
This commit is contained in:
Elliott Hughes 2013-10-24 16:10:20 -07:00 committed by Android Git Automerger
commit 0c4778d8a2
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linker/linker.cpp
View File

@ -1688,10 +1688,8 @@ static bool soinfo_link_image(soinfo* si) {
* phdr_table_protect_segments() after all of them are applied * phdr_table_protect_segments() after all of them are applied
* and all constructors are run. * and all constructors are run.
*/ */
#if !defined(ANDROID_X86_LINKER) // The platform itself has too many text relocations on x86.
DL_WARN("%s has text relocations. This is wasting memory and prevents " DL_WARN("%s has text relocations. This is wasting memory and prevents "
"security hardening. Please fix.", si->name); "security hardening. Please fix.", si->name);
#endif
if (phdr_table_unprotect_segments(si->phdr, si->phnum, si->load_bias) < 0) { if (phdr_table_unprotect_segments(si->phdr, si->phnum, si->load_bias) < 0) {
DL_ERR("can't unprotect loadable segments for \"%s\": %s", DL_ERR("can't unprotect loadable segments for \"%s\": %s",
si->name, strerror(errno)); si->name, strerror(errno));