|
From: <sv...@va...> - 2011-02-14 11:50:59
|
Author: sewardj
Date: 2011-02-14 11:50:49 +0000 (Mon, 14 Feb 2011)
New Revision: 11558
Log:
Merge from trunk, r11538 (x86-linux: make ld.so:index redir mandatory
for glibc-2.12 and later)
Modified:
branches/VALGRIND_3_6_BRANCH/coregrind/m_redir.c
Modified: branches/VALGRIND_3_6_BRANCH/coregrind/m_redir.c
===================================================================
--- branches/VALGRIND_3_6_BRANCH/coregrind/m_redir.c 2011-02-14 11:48:39 UTC (rev 11557)
+++ branches/VALGRIND_3_6_BRANCH/coregrind/m_redir.c 2011-02-14 11:50:49 UTC (rev 11558)
@@ -891,7 +891,11 @@
"for your Linux distribution to please in future ship a non-",
"stripped ld.so (or whatever the dynamic linker .so is called)",
"that exports the above-named function using the standard",
- "calling conventions for this platform.",
+ "calling conventions for this platform. The package you need",
+ "to install for fix (1) is called",
+ "",
+ " On Debian, Ubuntu: libc6-dbg",
+ " On SuSE, openSuSE, Fedora, RHEL: glibc-debuginfo",
NULL
};
@@ -923,7 +927,16 @@
add_hardwired_spec(
"ld-linux.so.2", "index",
(Addr)&VG_(x86_linux_REDIR_FOR_index),
+# if defined(GLIBC_2_2) || defined(GLIBC_2_3) || defined(GLIBC_2_4) \
+ || defined(GLIBC_2_5) || defined(GLIBC_2_6) || defined(GLIBC_2_7) \
+ || defined(GLIBC_2_8) || defined(GLIBC_2_9) \
+ || defined(GLIBC_2_10) || defined(GLIBC_2_11)
NULL
+# else
+ /* for glibc-2.12 and later, this is mandatory - can't sanely
+ continue without it */
+ complain_about_stripped_glibc_ldso
+# endif
);
}
|