[glibc] 01/01: hurd: Fix exposing lll_* symbols
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.26
in repository glibc.
commit e3ec718c81b26db48ecbcc4dde4b9e4ff06ea353
Author: Samuel Thibault
Date: Mon Sep 25 07:40:49 2017 +
hurd: Fix exposing lll_* symbols
- patches/hurd-i386/tg-gsync-libc.diff: Update.
- patches/hurd-i386/tg-libpthread-gsync-mutex.diff: Update.
---
debian/changelog | 2 +
debian/patches/hurd-i386/tg-gsync-libc.diff| 85 --
.../hurd-i386/tg-libpthread-gsync-mutex.diff | 6 +-
3 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4995eb4..f10492c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,8 @@ glibc (2.26-0experimental0) UNRELEASED; urgency=medium
- patches/hurd-i386/git-socket-limit.diff: New patch.
- patches/hurd-i386/tg-thread-linkspace.diff: New patch.
- patches/hurd-i386/git-clock_gettime_gettimeofday.diff: New patch.
+- patches/hurd-i386/tg-gsync-libc.diff: Update.
+- patches/hurd-i386/tg-libpthread-gsync-mutex.diff: Update.
- testsuite-xfail-debian.mk: Update.
- testsuite-xfail-debian.mk: Remove now-removed XPG3 entries.
diff --git a/debian/patches/hurd-i386/tg-gsync-libc.diff
b/debian/patches/hurd-i386/tg-gsync-libc.diff
index 6b22a7f..2d73d5e 100644
--- a/debian/patches/hurd-i386/tg-gsync-libc.diff
+++ b/debian/patches/hurd-i386/tg-gsync-libc.diff
@@ -67,25 +67,24 @@ Index: glibc-2.26/hurd/Versions
===
--- glibc-2.26.orig/hurd/Versions
+++ glibc-2.26/hurd/Versions
-@@ -161,4 +161,13 @@ libc {
+@@ -161,4 +161,12 @@ libc {
cthread_keycreate; cthread_getspecific; cthread_setspecific;
__libc_getspecific;
}
+
+ GLIBC_PRIVATE {
+# Used by other libs.
-+lll_xwait; lll_timed_wait; lll_timed_xwait;
+__lll_abstimed_wait; __lll_abstimed_xwait;
-+__lll_abstimed_lock; lll_robust_lock;
-+__lll_robust_abstimed_lock; lll_robust_trylock;
-+lll_set_wake; lll_robust_unlock; lll_requeue;
++__lll_abstimed_lock; __lll_robust_lock;
++__lll_robust_abstimed_lock; __lll_robust_trylock;
++__lll_robust_unlock;
+ }
}
Index: glibc-2.26/hurd/hurdlock.c
===
--- /dev/null
+++ glibc-2.26/hurd/hurdlock.c
-@@ -0,0 +1,247 @@
+@@ -0,0 +1,216 @@
+/* Copyright (C) 1999-2017 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -108,25 +107,6 @@ Index: glibc-2.26/hurd/hurdlock.c
+#include
+#include
+
-+int lll_xwait (void *ptr, int lo, int hi, int flags)
-+{
-+ return (__gsync_wait (__mach_task_self (),
-+(vm_offset_t)ptr, lo, hi, 0, flags | GSYNC_QUAD));
-+}
-+
-+int lll_timed_wait (void *ptr, int val, int mlsec, int flags)
-+{
-+ return (__gsync_wait (__mach_task_self (),
-+(vm_offset_t)ptr, val, 0, mlsec, flags | GSYNC_TIMED));
-+}
-+
-+int lll_timed_xwait (void *ptr, int lo,
-+ int hi, int mlsec, int flags)
-+{
-+ return (__gsync_wait (__mach_task_self (), (vm_offset_t)ptr,
-+lo, hi, mlsec, flags | GSYNC_TIMED | GSYNC_QUAD));
-+}
-+
+/* Convert an absolute timeout in nanoseconds to a relative
+ * timeout in milliseconds. */
+static inline int __attribute__ ((gnu_inline))
@@ -184,18 +164,6 @@ Index: glibc-2.26/hurd/hurdlock.c
+}
+}
+
-+void lll_set_wake (void *ptr, int val, int flags)
-+{
-+ __gsync_wake (__mach_task_self (),
-+(vm_offset_t)ptr, val, flags | GSYNC_MUTATE);
-+}
-+
-+void lll_requeue (void *src, void *dst, int wake_one, int flags)
-+{
-+ __gsync_requeue (__mach_task_self (), (vm_offset_t)src,
-+(vm_offset_t)dst, (boolean_t)wake_one, flags);
-+}
-+
+/* Robust locks. */
+
+extern int __getpid (void) __attribute__ ((const));
@@ -217,7 +185,7 @@ Index: glibc-2.26/hurd/hurdlock.c
+ * maximum blocking time is determined by this constant. */
+#define MAX_WAIT_TIME 1500
+
-+int lll_robust_lock (void *ptr, int flags)
++int __lll_robust_lock (void *ptr, int flags)
+{
+ int *iptr = (int *)ptr;
+ int id = __getpid ();
@@ -300,7 +268,7 @@ Index: glibc-2.26/hurd/hurdlock.c
+}
+}
+
-+int lll_robust_trylock (void *ptr)
++int __lll_robust_trylock (void *ptr)
+{
+ int *iptr = (int *)ptr;
+ int id = __getpid ();
@@ -318,7 +286,7 @@ Index: glibc-2.26/hurd/hurdlock.c
+ return (EBUSY);
+}
+
-+void lll_robust_unlock (void *ptr, int flags)
++void __lll_robust_unlock (void *ptr, int flags)
+{
+ unsigned int val = atomic_load_relaxed((unsigned int *)ptr);
+ while (1)
@@ -337,7 +305,7 @@ Index: glibc-2.26/hurd/hurdlock.h
===
--- /dev/null
+++ glibc-2.26/hurd/hurdlock.h
-@@ -0,0 +1,117 @@
+@@ -0,0 +1,124 @@
+/* Copyright (C) 1999-2017 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -370,16 +338,19 @@ Index:
[glibc] branch glibc-2.26 updated (bdfd1a3 -> e3ec718)
This is an automated email from the git hooks/post-receive script. sthibault pushed a change to branch glibc-2.26 in repository glibc. from bdfd1a3 Fix symbol exposition new e3ec718 hurd: Fix exposing lll_* symbols The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 + debian/patches/hurd-i386/tg-gsync-libc.diff| 85 -- .../hurd-i386/tg-libpthread-gsync-mutex.diff | 6 +- 3 files changed, 35 insertions(+), 58 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
[glibc] 02/02: hurd: Remove patch submitted-resolv.diff
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.26
in repository glibc.
commit 183bad663e0b29b5f6951fe657ea25fb68ecbec9
Author: Samuel Thibault
Date: Tue Sep 26 00:11:13 2017 +
hurd: Remove patch submitted-resolv.diff
It is actually a bug in the TCP/IP stack, whose fix will fix these tests.
---
debian/changelog | 1 -
debian/patches/hurd-i386/submitted-resolv.diff | 37 --
debian/patches/series | 1 -
debian/testsuite-xfail-debian.mk | 5
4 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f10492c..c5a809a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,7 +76,6 @@ glibc (2.26-0experimental0) UNRELEASED; urgency=medium
- patches/hurd-i386/cvs-truncate64.diff: Remove unused merged patch.
- patches/hurd-i386/git-tst-udp-timeout.diff: New patch.
- patches/hurd-i386/git-tst-udp-nonblocking.diff: New patch.
-- patches/hurd-i386/submitted-resolv.diff: New patch.
- patches/hurd-i386/unsubmitted-exp-hidden-jump.diff: New patch.
- patches/hurd-i386/git-hidden-def.diff: New patch.
- patches/hurd-i386/git-hidden-def.diff-2: New patch.
diff --git a/debian/patches/hurd-i386/submitted-resolv.diff
b/debian/patches/hurd-i386/submitted-resolv.diff
deleted file mode 100644
index 901e386..000
--- a/debian/patches/hurd-i386/submitted-resolv.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-server_thread_udp_process_one already takes care of calling sendto()
-instead of xsendto to be able to ignore the case where the client has
-closed the socket. Depending on the TCP/IP stack behavior, this error
-could be notified later through recvfrom(), so we need to ignore it
-there too.
-
-* support/resolv_test.c (server_thread_udp_process_one): Call recvfrom
-instead of xrecvfrom, and ignore ECONNREFUSED errors.
-
-https://sourceware.org/ml/libc-alpha/2017-09/msg00420.html
-
-diff --git a/support/resolv_test.c b/support/resolv_test.c
-index 1625dcf43a..c3325b89b1 100644
a/support/resolv_test.c
-+++ b/support/resolv_test.c
-@@ -600,7 +600,7 @@ server_thread_udp_process_one (struct resolv_test *obj,
int server_index)
- unsigned char query[512];
- struct sockaddr_storage peer;
- socklen_t peerlen = sizeof (peer);
-- size_t length = xrecvfrom (obj->servers[server_index].socket_udp,
-+ ssize_t length = recvfrom (obj->servers[server_index].socket_udp,
- query, sizeof (query), 0,
- (struct sockaddr *) &peer, &peerlen);
- /* Check for termination. */
-@@ -613,6 +613,12 @@ server_thread_udp_process_one (struct resolv_test *obj,
int server_index)
- return false;
- }
-
-+ if (length < 0)
-+{
-+ /* The other end had closed the socket, and we are notified only now. */
-+ TEST_VERIFY_EXIT (errno == ECONNREFUSED);
-+ return true;
-+}
-
- struct query_info qinfo;
- parse_query (&qinfo, query, length);
diff --git a/debian/patches/series b/debian/patches/series
index 725815c..e31b276 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -155,7 +155,6 @@ hurd-i386/git-clone.diff
hurd-i386/git-gethostname.diff
hurd-i386/git-tst-udp-timeout.diff
hurd-i386/git-tst-udp-nonblocking.diff
-hurd-i386/submitted-resolv.diff
hurd-i386/unsubmitted-exp-hidden-jump.diff
hurd-i386/git-hidden-def.diff
hurd-i386/git-hidden-def-2.diff
diff --git a/debian/testsuite-xfail-debian.mk b/debian/testsuite-xfail-debian.mk
index b2172b7..81e45a5 100644
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@ -645,6 +645,11 @@ test-xfail-XPG42/sys/socket.h/linknamespace = yes
test-xfail-XPG42/sys/wait.h/linknamespace = yes
test-xfail-XPG42/unistd.h/linknamespace = yes
test-xfail-XPG42/wordexp.h/linknamespace = yes
+
+# will be fixed in hurd >= 20170926
+test-xfail-tst-bug18665-tcp = yes
+test-xfail-tst-resolv-basic = yes
+test-xfail-tst-resolv-search = yes
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
[glibc] 01/02: hurd: update libpthread to fix symbol exposition
This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch glibc-2.26 in repository glibc. commit b78cd5b57c5c761b03c3f6907f0ee838d116946e Author: Samuel Thibault Date: Mon Sep 25 22:18:13 2017 + hurd: update libpthread to fix symbol exposition --- debian/patches/hurd-i386/cvs-libpthread.diff | 61 +- .../hurd-i386/tg-libpthread-gsync-mutex.diff | 1342 ++-- 2 files changed, 979 insertions(+), 424 deletions(-) diff --git a/debian/patches/hurd-i386/cvs-libpthread.diff b/debian/patches/hurd-i386/cvs-libpthread.diff index dd677f5..6e27b31 100644 --- a/debian/patches/hurd-i386/cvs-libpthread.diff +++ b/debian/patches/hurd-i386/cvs-libpthread.diff @@ -1,7 +1,7 @@ -git diff empty --patch-with-stat --src-prefix=glibc/libpthread/ --dst-prefix=glibc/libpthread/ f881f17267506f3ced17259a066a4d95bffb57f0 +git diff empty --patch-with-stat --src-prefix=glibc/libpthread/ --dst-prefix=glibc/libpthread/ 596061769ee34741a42eb375b1a2e06fffb4c5a3 from git.savannah.gnu.org:/srv/git/hurd/libpthread.git/ thus by construction only libpthread/ files, thus hurd-only -Date: Sun Sep 24 23:09:59 2017 +0200 +Date: Mon Sep 25 21:47:12 2017 +0200 ChangeLog | 6 + Makeconfig| 20 + @@ -11,6 +11,7 @@ Date: Sun Sep 24 23:09:59 2017 +0200 configure | 2 + configure.in | 4 + forward.c | 281 + + sysdeps/pthread/pthread.h | 22 + include/pthread/pthread.h | 835 ++ include/pthread/pthreadtypes.h| 125 libc_pthread_init.c | 35 ++ @@ -122,8 +123,8 @@ Date: Sun Sep 24 23:09:59 2017 +0200 sysdeps/generic/pt-rwlock-destroy.c | 29 + sysdeps/generic/pt-rwlock-init.c | 45 ++ sysdeps/generic/pt-rwlock-rdlock.c| 33 + - sysdeps/generic/pt-rwlock-timedrdlock.c | 120 - sysdeps/generic/pt-rwlock-timedwrlock.c | 103 + sysdeps/generic/pt-rwlock-timedrdlock.c | 121 + sysdeps/generic/pt-rwlock-timedwrlock.c | 104 sysdeps/generic/pt-rwlock-tryrdlock.c | 56 ++ sysdeps/generic/pt-rwlock-trywrlock.c | 46 ++ sysdeps/generic/pt-rwlock-unlock.c| 99 +++ @@ -154,12 +155,13 @@ Date: Sun Sep 24 23:09:59 2017 +0200 sysdeps/hurd/pt-init-specific.c | 30 + sysdeps/hurd/pt-key-create.c | 110 sysdeps/hurd/pt-key-delete.c | 64 ++ - sysdeps/hurd/pt-key.h | 76 +++ + sysdeps/hurd/pt-key.h | 77 +++ sysdeps/hurd/pt-kill.c| 52 ++ sysdeps/hurd/pt-setspecific.c | 48 ++ sysdeps/i386/bits/memory.h| 40 ++ sysdeps/i386/bits/pt-atomic.h | 66 ++ sysdeps/i386/bits/pthreadtypes-arch.h | 21 + + sysdeps/pthread/bits/thread-shared-types.h| 24 + sysdeps/i386/machine-sp.h | 30 + sysdeps/i386/pt-machdep.h | 29 + sysdeps/mach/bits/spin-lock-inline.h | 90 +++ @@ -205,14 +207,12 @@ Date: Sun Sep 24 23:09:59 2017 +0200 sysdeps/pthread/bits/rwlock.h | 46 ++ sysdeps/pthread/bits/semaphore.h | 44 ++ sysdeps/pthread/bits/thread-attr.h| 47 ++ - sysdeps/pthread/bits/thread-shared-types.h| 24 + sysdeps/pthread/bits/thread-specific.h| 25 + sysdeps/pthread/flockfile.c | 32 + sysdeps/pthread/ftrylockfile.c| 35 ++ sysdeps/pthread/funlockfile.c | 33 + sysdeps/pthread/libc-lockP.h | 158 + sysdeps/pthread/pthread-functions.h | 141 + - sysdeps/pthread/pthread.h | 22 + sysdeps/pthread/semaphore.h | 81 +++ tests/.cvsignore | 1 + tests/Makefile| 40 ++ @@ -235,7 +235,7 @@ Date: Sun Sep 24 23:09:59 2017 +0200 tests/test-8.c| 60 ++ tests/test-9.c| 88 +++ tests/test-__pthread_destroy_specific-skip.c | 83 +++ - 232 files changed, 13233 insertions(+) + 232 files changed, 13236 insertions(+) diff --git glibc/libpthread/ChangeLog glibc/libpthread/ChangeLog new file mode 100644 @@ -8088,7 +8088,7 @@ index 000..c9ff9b2 +strong_alias (_pthread_rwlock_init, pthread_rwlock_init); diff --git glibc/libpthread/sysdeps/generic/pt-rwlock-rdlock.c glibc/libpthread/sysdeps/generic/pt-rwlock-rdlock.c new file mode 100644 -index 000..6eca601 +index 000..708e3e1 --- /dev/null +++ glibc/libpthread/sysdeps/generic/pt-rwlock-rdlock.c @@ -0,0 +1,33 @@ @@ -8124,13 +8124,13 @@ index 000..6
[glibc] branch glibc-2.26 updated (e3ec718 -> 183bad6)
This is an automated email from the git hooks/post-receive script. sthibault pushed a change to branch glibc-2.26 in repository glibc. from e3ec718 hurd: Fix exposing lll_* symbols new b78cd5b hurd: update libpthread to fix symbol exposition new 183bad6 hurd: Remove patch submitted-resolv.diff The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog |1 - debian/patches/hurd-i386/cvs-libpthread.diff | 61 +- debian/patches/hurd-i386/submitted-resolv.diff | 37 - .../hurd-i386/tg-libpthread-gsync-mutex.diff | 1342 ++-- debian/patches/series |1 - debian/testsuite-xfail-debian.mk |5 + 6 files changed, 984 insertions(+), 463 deletions(-) delete mode 100644 debian/patches/hurd-i386/submitted-resolv.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
