diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2007-09-27 18:06:10 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2007-09-27 18:06:10 +0000 |
| commit | 5c13b77cb041e4f56b71448b6ce94b7c98a29812 (patch) | |
| tree | a7ab8a8d110e1a9b8ec7564b5e9a1de1f944f7d5 /libstdc++-v3 | |
| parent | b2a00c8984668b802b3331db38cd7f530f886842 (diff) | |
| download | gcc-5c13b77cb041e4f56b71448b6ce94b7c98a29812.tar.gz | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_hooks.cc | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f491bda9daf..88f7d858f54 100644 --- 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 6ea82f3d908..632e2625c42 100644 --- 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. |