am 0bdbc499: am 260846f3: Merge "Reinstate the x86 dynamic linker warning for text relocations."

* commit '0bdbc499baf361e1b04ba97baf60e0ccdbddeb04':
  Reinstate the x86 dynamic linker warning for text relocations.
This commit is contained in:
Elliott Hughes 2014-06-30 22:08:04 +00:00 committed by Android Git Automerger
commit 27cc284e02

View File

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