Suppress AT_SYSINFO in the auxiliary vector because it contains a

pointer to the system call routine in the sysinfo page and older
versions of glibc will use it. Fixex bug #115496.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 80343f74137e1e3250b48ffa49c5536c3abde878..ada15bf20b2f50e2c7dc1ae0b4c1aceafed0ba7f 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -513,7 +513,6 @@ Addr setup_client_stack( void*  init_sp,
          case AT_EGID:
          case AT_CLKTCK:
          case AT_FPUCW:
-         case AT_SYSINFO:
             /* All these are pointerless, so we don't need to do
                anything about them. */
             break;
@@ -586,12 +585,13 @@ Addr setup_client_stack( void*  init_sp,
             auxv->u.a_val = 0;
             break;
 
+         case AT_SYSINFO:
 #        if !defined(VGP_ppc32_linux)
          case AT_SYSINFO_EHDR:
+#        endif
             /* Trash this, because we don't reproduce it */
             auxv->a_type = AT_IGNORE;
             break;
-#        endif
 
          default:
             /* stomp out anything we don't know about */