[glibc] 01/02: hurd-only fixes
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.23
in repository glibc.
commit e9b54702a79c7b5a5839e5c27dad9f59acb84f13
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Mar 17 08:35:26 2016 +0000
hurd-only fixes
* hurd-i386/unsubmitted-libpthread.so.diff: Fix building malloc tests.
* hurd-i386/local-test-skip.diff: Skip test which just overflows memory.
---
debian/changelog | 2 ++
debian/patches/hurd-i386/local-test-skip.diff | 17 ++++++++++++++
.../hurd-i386/unsubmitted-libpthread.so.diff | 27 ++++++++++++++++++++++
debian/patches/series.hurd-i386 | 2 ++
4 files changed, 48 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 399902e..631e086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
* hurd-i386/cvs-openat.diff: Fix __openat prototype.
* hurd-i386/cvs-gai_sigqueue.diff: Fix gai_sigqueue prototype.
* hurd-i386/cvs-aio_sigqueue.diff: Fix aio_sigqueue prototype.
+ * hurd-i386/unsubmitted-libpthread.so.diff: Fix building malloc tests.
+ * hurd-i386/local-test-skip.diff: Skip test which just overflows memory.
-- Aurelien Jarno <aurel32@debian.org> Mon, 14 Mar 2016 00:14:11 +0100
diff --git a/debian/patches/hurd-i386/local-test-skip.diff b/debian/patches/hurd-i386/local-test-skip.diff
new file mode 100644
index 0000000..ee61dc8
--- /dev/null
+++ b/debian/patches/hurd-i386/local-test-skip.diff
@@ -0,0 +1,17 @@
+RLIMIT_AS is not supported yet. Running this test would thus just overflow
+memory.
+
+Index: glibc-2.23/malloc/tst-malloc-thread-fail.c
+===================================================================
+--- glibc-2.23.orig/malloc/tst-malloc-thread-fail.c
++++ glibc-2.23/malloc/tst-malloc-thread-fail.c
+@@ -309,6 +309,9 @@ run_allocation_functions (void)
+ int
+ do_test (void)
+ {
++ puts("RLIMIT_AS not supported, test skipped");
++ return 0;
++
+ /* Limit the number of malloc arenas. We use a very low number so
+ that despute the address space limit configured below, all
+ requested arenas a can be created. */
diff --git a/debian/patches/hurd-i386/unsubmitted-libpthread.so.diff b/debian/patches/hurd-i386/unsubmitted-libpthread.so.diff
new file mode 100644
index 0000000..33bb159
--- /dev/null
+++ b/debian/patches/hurd-i386/unsubmitted-libpthread.so.diff
@@ -0,0 +1,27 @@
+Hardcoded nptl path...
+
+https://sourceware.org/ml/libc-alpha/2016-03/msg00437.html
+
+Index: glibc-2.23/malloc/Makefile
+===================================================================
+--- glibc-2.23.orig/malloc/Makefile
++++ glibc-2.23/malloc/Makefile
+@@ -46,12 +46,12 @@ extra-libs-others = $(extra-libs)
+ libmemusage-routines = memusage
+ libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
+
+-$(objpfx)tst-malloc-backtrace: $(common-objpfx)nptl/libpthread.so \
+- $(common-objpfx)nptl/libpthread_nonshared.a
+-$(objpfx)tst-malloc-thread-exit: $(common-objpfx)nptl/libpthread.so \
+- $(common-objpfx)nptl/libpthread_nonshared.a
+-$(objpfx)tst-malloc-thread-fail: $(common-objpfx)nptl/libpthread.so \
+- $(common-objpfx)nptl/libpthread_nonshared.a
++$(objpfx)tst-malloc-backtrace: $(common-objpfx)libpthread/libpthread.so \
++ $(common-objpfx)libpthread/libpthread.a
++$(objpfx)tst-malloc-thread-exit: $(common-objpfx)libpthread/libpthread.so \
++ $(common-objpfx)libpthread/libpthread.a
++$(objpfx)tst-malloc-thread-fail: $(common-objpfx)libpthread/libpthread.so \
++ $(common-objpfx)libpthread/libpthread.a
+
+ # These should be removed by `make clean'.
+ extra-objs = mcheck-init.o libmcheck.a
diff --git a/debian/patches/series.hurd-i386 b/debian/patches/series.hurd-i386
index 4629e1b..0f04acd 100644
--- a/debian/patches/series.hurd-i386
+++ b/debian/patches/series.hurd-i386
@@ -12,3 +12,5 @@ hurd-i386/tg-pagesize.diff
hurd-i386/local-no-bootstrap-fs-access.diff
hurd-i386/unsubmitted-timer_routines.diff
hurd-i386/local-versions-hack.diff
+hurd-i386/unsubmitted-libpthread.so.diff
+hurd-i386/local-test-skip.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: