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

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
This commit is contained in:
Benjamin Kosnik 2007-09-27 18:06:10 +00:00 committed by Benjamin Kosnik
parent b2a00c8984
commit 5c13b77cb0
2 changed files with 14 additions and 9 deletions

View File

@ -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.

View File

@ -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.