[Lsb-messages] /var/www/bzr/lsb/4.0/libstdcpp-test r168: Backport fix for bug 3317 from devel
Stew Benedict
stewb at linux-foundation.org
Fri Jun 22 13:08:13 UTC 2012
------------------------------------------------------------
revno: 168
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: libstdcpp-test
timestamp: Fri 2012-06-22 09:08:13 -0400
message:
Backport fix for bug 3317 from devel
added:
package/lsb-test-libstdcpp-4.1.0-bug-3317.patch
modified:
package/lsb-test-libstdcpp.spec
-------------- next part --------------
=== added file 'package/lsb-test-libstdcpp-4.1.0-bug-3317.patch'
--- a/package/lsb-test-libstdcpp-4.1.0-bug-3317.patch 1970-01-01 00:00:00 +0000
+++ b/package/lsb-test-libstdcpp-4.1.0-bug-3317.patch 2012-06-22 13:08:13 +0000
@@ -0,0 +1,42 @@
+--- /data/cdimages/chroots/sles11-64bit/opt/lsb/test/libstdcpp_4.1.0/testsuite/testsuite_hooks.cc 2012-05-12 11:11:51.000000000 -0400
++++ testsuite_hooks.cc 2012-06-21 16:23:02.934244453 -0400
+@@ -36,10 +28,12 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #endif
++
+ #include <list>
+ #include <string>
+ #include <stdexcept>
+ #include <clocale>
++#include <cstdlib>
+ #include <locale>
+ #include <cxxabi.h>
+
+@@ -88,17 +82,17 @@
+ 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.
=== modified file 'package/lsb-test-libstdcpp.spec'
--- a/package/lsb-test-libstdcpp.spec 2012-04-19 19:26:21 +0000
+++ b/package/lsb-test-libstdcpp.spec 2012-06-22 13:08:13 +0000
@@ -39,6 +39,7 @@
Patch8: lsb-test-libstdcpp-4.1.0-bug-3182.patch
Patch9: lsb-test-libstdcpp-4.1.0-bug-3287.patch
Patch10: lsb-test-libstdcpp-4.1.0-bug-3449.patch
+Patch11: lsb-test-libstdcpp-4.1.0-bug-3317.patch
Vendor: CodeSourcery LLC
# If we let RPM detect dependencies, it will get the idea that this package
@@ -104,6 +105,11 @@
# bug 3449 - tests failing on new distros, disable
%patch10 -p0 -b .bug-3449
+# bug 3317 - not allocating enough memory on x86_64
+cd testsuite
+%patch11 -p0 -b .bug-3317
+cd -
+
# (sb) with the bump to 4.1.0, our {ppc,ppc64}-linux-gnu/baseline_symbols.txt
# files are out of date, upstream has {powerpc,powerpc64}-linux-gnu, use those
cp config/abi/powerpc-linux-gnu/baseline_symbols.txt config/abi/ppc-linux-gnu
@@ -394,6 +400,9 @@
%doc build_binary_testsuite
%changelog
+* Fri Jun 22 2012 Stew Benedict <stewb at linux-foundation.org>
+- patch to fix alloc failures on x86_64 (P11, bug 3317)
+
* Thu Apr 19 2012 Stew Benedict <stewb at linux-foundation.org>
- disable one subtest of cw-16.cc - upstream change (bug 3449, P10)
More information about the lsb-messages
mailing list