Make one redirect mandatory for ppc64-linux.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7167

diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index 9cf3f990d57fc3d4a72299c2d4dddecf63a2fb75..c2252c465558a6a8ee5f3b1130d1e072046f4ac3 100644 (file)
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -870,8 +870,10 @@ void VG_(redir_initialise) ( void )
    /* If we're using memcheck, use these intercepts right from
       the start, otherwise ld.so makes a lot of noise. */
    if (0==VG_(strcmp)("Memcheck", VG_(details).name)) {
-      const HChar* croakage = "Possible fix: install glibc's debuginfo "
-                              "package on this machine.";
+
+      static HChar* croakage = "Possible fix: install glibc's debuginfo "
+                               "package on this machine.";
+
       /* this is mandatory - can't sanely continue without it */
       add_hardwired_spec(
          "ld.so.1", "strlen",
@@ -897,16 +899,21 @@ void VG_(redir_initialise) ( void )
       the start, otherwise ld.so makes a lot of noise. */
    if (0==VG_(strcmp)("Memcheck", VG_(details).name)) {
 
+      static HChar* croakage = "Possible fix: install glibc's debuginfo "
+                               "package on this machine.";
+
+      /* this is mandatory - can't sanely continue without it */
       add_hardwired_spec(
          "ld64.so.1", "strlen",
          (Addr)VG_(fnptr_to_fnentry)( &VG_(ppc64_linux_REDIR_FOR_strlen) ),
-         NULL
+         croakage
       );
 
       add_hardwired_spec(
          "ld64.so.1", "index",
          (Addr)VG_(fnptr_to_fnentry)( &VG_(ppc64_linux_REDIR_FOR_strchr) ),
-         NULL
+         NULL /* not mandatory - so why bother at all? */
+         /* glibc-2.5 (FC6, ppc64) seems fine without it */
       );
 
    }