When being an 'inner valgrind' on 64-bit platforms, ensure the stack

is allocated below the magic 32G mark as it would be normally.

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

diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index 35ef5117373a0529b2e4f08669c020d5b213cf71..588770f0bcd6f0ac5c2ac78a89ebae9efae9bf1a 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -1545,7 +1545,10 @@ Addr VG_(am_startup) ( Addr sp_at_startup )
 #  if VG_WORDSIZE == 8
      aspacem_maxAddr = (Addr)0x800000000 - 1; // 32G
 #    ifdef ENABLE_INNER
-     aspacem_maxAddr = VG_PGROUNDDN( sp_at_startup ) - 1;
+     { Addr cse = VG_PGROUNDDN( sp_at_startup ) - 1;
+       if (aspacem_maxAddr > cse)
+          aspacem_maxAddr = cse;
+     }
 #    endif
 #  else
      aspacem_maxAddr = VG_PGROUNDDN( sp_at_startup ) - 1;