From: Elliott Hughes <enh@google.com>
Date: Mon, 30 Jun 2014 21:55:34 +0000 (+0000)
Subject: Merge "Reinstate the x86 dynamic linker warning for text relocations."
X-Git-Url: https://git.ti.com/gitweb?p=android-sdk%2Fplatform-bionic.git;a=commitdiff_plain;h=260846f374f88ba6686bff8ab33c17c487c7a8f7;hp=eac2bbf0fce2da710bb086414ad1054568747a42

Merge "Reinstate the x86 dynamic linker warning for text relocations."
---

diff --git a/linker/linker.cpp b/linker/linker.cpp
index b99c59a1..45889485 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -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));