Merge "Don't warn about x86 text relocations. They're too prevalent."

2013-10-23 20:58:37 +00:00 · 2013-10-23 20:58:37 +00:00 · 9098344afe
commit 9098344afe
parent cdac5f73ac 5be2c5998c
1 changed files with 2 additions and 0 deletions
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@ -1688,8 +1688,10 @@ static bool soinfo_link_image(soinfo* si) {
         * phdr_table_protect_segments() after all of them are applied
         * 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 "
                "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));