diff --git a/linker/linker.cpp b/linker/linker.cpp
index e202aaf83f2ed8e1973e3c903fb8ae1c022796fa..45889485f982a895af9195b59181b9dd3b0d6609 100644 (file)
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
}
// ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now.
#if defined(__LP64__)
- // TODO: uncomment this after bug b/7465467 is fixed.
- // return -1;
+ return -1;
#endif
}
@@ -1930,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));