testsuite_hooks.cc (set_memory_limits): Adjust x86_64 virtual memory setting for...

2007-09-27  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/util/testsuite_hooks.cc (set_memory_limits): Adjust
	x86_64 virtual memory setting for libgomp.

From-SVN: r128842

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f491bda9dafdc40aec6ebd2b9f20e00dffd0c79c..88f7d858f54aa9c5edc45f61e42645e493632b1b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-27  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * testsuite/util/testsuite_hooks.cc (set_memory_limits): Adjust
+       x86_64 virtual memory setting for libgomp.
+       
 2007-09-26  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/bits/stl_algo.h: Add return type information to comments.

diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.cc b/libstdc++-v3/testsuite/util/testsuite_hooks.cc
index 6ea82f3d90886d9cef09483c8e57c0529ae42630..632e2625c422dc205d6c35a2df27a30460ac98c1 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_hooks.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_hooks.cc
@@ -92,17 +92,17 @@ namespace __gnu_test
     setrlimit(RLIMIT_VMEM, &r);
 #endif
 
-    // Virtual memory.
-    // On x86_64-linux, the default is -z max-page-size=0x200000
-    // which means up to 2MB of address space are accounted for
-    // PROT_NONE mappings between text and data segments of
-    // each shared library.  There are 4 shared libs involved
-    // in addition to the dynamic linker.  Use at least 16MB address space
-    // limit.
+    // Virtual memory.  On x86_64-linux, the default is -z
+    // max-page-size=0x200000 which means up to 2MB of address space
+    // are accounted for PROT_NONE mappings between text and data
+    // segments of each shared library.  There are 4 shared libs
+    // involved in addition to the dynamic linker, maybe 5 if libgomp
+    // is being used as well.  Use at least 20MB address space limit.
 #if defined(__x86_64__) && defined(__linux__)
-    if (limit < 16777216)
-      limit = 16777216;
+    if (limit < 20971520)
+      limit = 20971520;
 #endif
+
     // On HP-UX 11.23, a trivial C++ program that sets RLIMIT_AS to
     // anything less than 128MB cannot "malloc" even 1K of memory.
     // Therefore, we skip RLIMIT_AS on HP-UX.