[glibc] 01/01: Reorganize hurd patches, no code change
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 cf4ce83f32084935492614ce71ac4d04a390b3c4
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Sep 7 11:46:28 2017 +0200
Reorganize hurd patches, no code change
Split separate out upstream commits, fix .diff suffix, remove obsolete files
---
debian/changelog | 14 +-
.../patches/hurd-i386/cvs-libpthread-sigstate.diff | 57 -------
debian/patches/hurd-i386/cvs-send-recv-posix.diff | 50 ------
debian/patches/hurd-i386/cvs-truncate64.diff | 97 ------------
.../{git-bits_socket.h => git-bits_socket.h.diff} | 0
debian/patches/hurd-i386/git-preadwritev2-2.diff | 35 ++++
...t-preadwritev2.diff => git-preadwritev2-3.diff} | 98 ------------
debian/patches/hurd-i386/git-preadwritev2.diff | 176 ---------------------
debian/patches/hurd-i386/git-rtld-sbrk-2.diff | 21 +++
debian/patches/hurd-i386/git-rtld-sbrk.diff | 21 ---
debian/patches/hurd-i386/git-sigsetops-2.h.diff | 38 +++++
debian/patches/hurd-i386/git-sigsetops-3.h.diff | 33 ++++
debian/patches/hurd-i386/git-sigsetops.h.diff | 18 +++
debian/patches/hurd-i386/git-sigsetopts.h | 89 -----------
...{tg2.26-sigsetops.h => tg2.26-sigsetops.h.diff} | 0
debian/patches/series | 11 +-
16 files changed, 164 insertions(+), 594 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a6f0552..1ee96f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,12 +50,17 @@ glibc (2.26-0experimental0) UNRELEASED; urgency=medium
- patches/hurd-i386/tg-socket_flags.diff: rebased.
- patches/hurd-i386/tg2.25-tls.diff: rebased.
- patches/hurd-i386/tg2.26-sched_param.diff: New patch.
- - patches/hurd-i386/git-sigsetopts.h: New patch.
- - patches/hurd-i386/tg2.26-sigsetops.h: New patch.
- - patches/hurd-i386/git-bits_socket.h: New patch.
+ - patches/hurd-i386/git-sigsetops.h.diff: New patch.
+ - patches/hurd-i386/git-sigsetops-2.h.diff: New patch.
+ - patches/hurd-i386/git-sigsetops-3.h.diff: New patch.
+ - patches/hurd-i386/tg2.26-sigsetops.h.diff: New patch.
+ - patches/hurd-i386/git-bits_socket.h.diff: New patch.
- patches/hurd-i386/git-preadwritev2.diff: New patch.
+ - patches/hurd-i386/git-preadwritev2-2.diff: New patch.
+ - patches/hurd-i386/git-preadwritev2-3.diff: New patch.
- patches/hurd-i386/git-rtld-access.diff: New patch.
- patches/hurd-i386/git-rtld-sbrk.diff: New patch.
+ - patches/hurd-i386/git-rtld-sbrk-2.diff: New patch.
- patches/hurd-i386/git-divdi.diff: New patch.
- patches/hurd-i386/git-feraiseexcept.diff: New patch.
- patches/hurd-i386/cvs-libpthread.diff: Update.
@@ -65,6 +70,9 @@ glibc (2.26-0experimental0) UNRELEASED; urgency=medium
- patches/hurd-i386/git-rtld-strtoul_internal.diff: New patch.
- patches/hurd-i386/git-clone.diff: New patch.
- patches/hurd-i386/git-gethostname.diff: New patch.
+ - patches/hurd-i386/cvs-libpthread-sigstate.diff: Remove unused merged patch.
+ - patches/hurd-i386/cvs-send-recv-posix.diff: Remove unused merged patch.
+ - patches/hurd-i386/cvs-truncate64.diff: Remove unused merged patch.
- testsuite-xfail-debian.mk: Update with new tests failing on hurd-i386.
-- Adam Conrad <adconrad@0c3.net> Sat, 02 Sep 2017 12:15:10 -0600
diff --git a/debian/patches/hurd-i386/cvs-libpthread-sigstate.diff b/debian/patches/hurd-i386/cvs-libpthread-sigstate.diff
deleted file mode 100644
index 426555d..0000000
--- a/debian/patches/hurd-i386/cvs-libpthread-sigstate.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-commit 6106225fdc09f013ec4f7b1d7ec82780061c8a14
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Jan 3 04:20:02 2016 +0100
-
- Do not block unmaskable signals
-
- * sysdeps/mach/hurd/pt-sigstate.c (__pthread_sigstate): Always remove
- _SIG_CANT_MASK from blocked signals, like sigprocmask does.
-
---- a/libpthread/sysdeps/mach/hurd/pt-sigstate.c
-+++ b/libpthread/sysdeps/mach/hurd/pt-sigstate.c
-@@ -43,24 +43,27 @@ __pthread_sigstate (struct __pthread *thread, int how,
- *oset = ss->blocked;
-
- if (set)
-- switch (how)
-- {
-- case SIG_BLOCK:
-- ss->blocked |= *set;
-- break;
--
-- case SIG_SETMASK:
-- ss->blocked = *set;
-- break;
--
-- case SIG_UNBLOCK:
-- ss->blocked &= ~*set;
-- break;
--
-- default:
-- err = EINVAL;
-- break;
-- }
-+ {
-+ switch (how)
-+ {
-+ case SIG_BLOCK:
-+ ss->blocked |= *set;
-+ break;
-+
-+ case SIG_SETMASK:
-+ ss->blocked = *set;
-+ break;
-+
-+ case SIG_UNBLOCK:
-+ ss->blocked &= ~*set;
-+ break;
-+
-+ default:
-+ err = EINVAL;
-+ break;
-+ }
-+ ss->blocked &= ~_SIG_CANT_MASK;
-+ }
-
- if (! err && clear_pending)
- __sigemptyset (&ss->pending);
diff --git a/debian/patches/hurd-i386/cvs-send-recv-posix.diff b/debian/patches/hurd-i386/cvs-send-recv-posix.diff
deleted file mode 100644
index b204b8a..0000000
--- a/debian/patches/hurd-i386/cvs-send-recv-posix.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 9d067269f5c3ecc5913e7e424a4778608d784731
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Mon Mar 13 20:41:12 2017 +0100
-
- hurd: Make send/recv more posixish
-
- Thanks David Michael for the suggestion.
-
- * sysdeps/mach/hurd/send.c (__send): Convert hurdish error code into
- posix error code.
- * sysdeps/mach/hurd/recv.c (__recv): Likewise.
-
-diff --git a/sysdeps/mach/hurd/recv.c b/sysdeps/mach/hurd/recv.c
-index 78a67d0cd8..133f49dfaa 100644
---- a/sysdeps/mach/hurd/recv.c
-+++ b/sysdeps/mach/hurd/recv.c
-@@ -37,12 +37,16 @@ __recv (int fd, void *buf, size_t n, int flags)
- char *cdata = NULL;
- mach_msg_type_number_t clen = 0;
-
-- if (err = HURD_DPORT_USE (fd, __socket_recv (port, &addrport,
-+ err = HURD_DPORT_USE (fd, __socket_recv (port, &addrport,
- flags, &bufp, &nread,
- &ports, &nports,
- &cdata, &clen,
- &flags,
-- n)))
-+ n));
-+ if (err == MIG_BAD_ID || err == EOPNOTSUPP)
-+ /* The file did not grok the socket protocol. */
-+ err = ENOTSOCK;
-+ if (err)
- return __hurd_sockfail (fd, flags, err);
-
- __mach_port_deallocate (__mach_task_self (), addrport);
-diff --git a/sysdeps/mach/hurd/send.c b/sysdeps/mach/hurd/send.c
-index 8eb97e99ee..98ffcbf562 100644
---- a/sysdeps/mach/hurd/send.c
-+++ b/sysdeps/mach/hurd/send.c
-@@ -33,6 +33,10 @@ __send (int fd, const void *buf, size_t n, int flags)
- NULL, MACH_MSG_TYPE_COPY_SEND, 0,
- NULL, 0, &wrote));
-
-+ if (err == MIG_BAD_ID || err == EOPNOTSUPP)
-+ /* The file did not grok the socket protocol. */
-+ err = ENOTSOCK;
-+
- return err ? __hurd_sockfail (fd, flags, err) : wrote;
- }
- libc_hidden_def (__send)
diff --git a/debian/patches/hurd-i386/cvs-truncate64.diff b/debian/patches/hurd-i386/cvs-truncate64.diff
deleted file mode 100644
index 2c0ad17..0000000
--- a/debian/patches/hurd-i386/cvs-truncate64.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-commit 21d58b2a43cab26838ba57bcea52d5cef132f925
-Author: Justus Winter <justus@gnupg.org>
-Date: Fri Mar 3 21:27:27 2017 +0100
-
- hurd: Provide truncate64 and ftruncate64.
-
- * sysdeps/mach/hurd/ftruncate64.c: New file.
- * sysdeps/mach/hurd/truncate64.c: Likewise.
-
-diff --git a/sysdeps/mach/hurd/ftruncate64.c b/sysdeps/mach/hurd/ftruncate64.c
-new file mode 100644
-index 0000000000..53c4f64afc
---- /dev/null
-+++ b/sysdeps/mach/hurd/ftruncate64.c
-@@ -0,0 +1,34 @@
-+/* Copyright (C) 1991-2017 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <http://www.gnu.org/licenses/>. */
-+
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <hurd.h>
-+#include <hurd/fd.h>
-+
-+/* Truncate the file referenced by FD to LENGTH bytes. */
-+int
-+__ftruncate64 (int fd, off64_t length)
-+{
-+ error_t err;
-+ if (err = HURD_DPORT_USE (fd, __file_set_size (port, length)))
-+ return __hurd_dfail (fd, err);
-+ return 0;
-+}
-+
-+weak_alias (__ftruncate64, ftruncate64)
-diff --git a/sysdeps/mach/hurd/truncate64.c b/sysdeps/mach/hurd/truncate64.c
-new file mode 100644
-index 0000000000..a2e2ed2190
---- /dev/null
-+++ b/sysdeps/mach/hurd/truncate64.c
-@@ -0,0 +1,42 @@
-+/* Copyright (C) 1991-2017 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <http://www.gnu.org/licenses/>. */
-+
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <hurd.h>
-+
-+/* Truncate FILE_NAME to LENGTH bytes. */
-+int
-+__truncate64 (const char *file_name, off64_t length)
-+{
-+ error_t err;
-+ file_t file = __file_name_lookup (file_name, O_WRITE, 0);
-+
-+ if (file == MACH_PORT_NULL)
-+ return -1;
-+
-+ err = __file_set_size (file, length);
-+ __mach_port_deallocate (__mach_task_self (), file);
-+
-+ if (err)
-+ return __hurd_fail (err);
-+ return 0;
-+}
-+
-+weak_alias (__truncate64, truncate64)
diff --git a/debian/patches/hurd-i386/git-bits_socket.h b/debian/patches/hurd-i386/git-bits_socket.h.diff
similarity index 100%
rename from debian/patches/hurd-i386/git-bits_socket.h
rename to debian/patches/hurd-i386/git-bits_socket.h.diff
diff --git a/debian/patches/hurd-i386/git-preadwritev2-2.diff b/debian/patches/hurd-i386/git-preadwritev2-2.diff
new file mode 100644
index 0000000..51bbe9c
--- /dev/null
+++ b/debian/patches/hurd-i386/git-preadwritev2-2.diff
@@ -0,0 +1,35 @@
+commit ed95bf5638748068ef05ccbaa0a008b50ebecb42
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 3 03:00:32 2017 +0200
+
+ hurd: Fix p{read,write}v64v2.c build
+
+ * sysdeps/posix/preadv64v2.c: Use off64_t instead of off_t.
+ * sysdeps/posix/pwritev64v2.c: Use off64_t instead of off_t.
+
+diff --git a/sysdeps/posix/preadv64v2.c b/sysdeps/posix/preadv64v2.c
+index ab71f027d4..263f9b77c4 100644
+--- a/sysdeps/posix/preadv64v2.c
++++ b/sysdeps/posix/preadv64v2.c
+@@ -20,7 +20,7 @@
+ #include <sys/uio.h>
+
+ ssize_t
+-preadv64v2 (int fd, const struct iovec *vector, int count, off_t offset,
++preadv64v2 (int fd, const struct iovec *vector, int count, off64_t offset,
+ int flags)
+ {
+ if (flags != 0)
+diff --git a/sysdeps/posix/pwritev64v2.c b/sysdeps/posix/pwritev64v2.c
+index bf62d74190..f340c8a46d 100644
+--- a/sysdeps/posix/pwritev64v2.c
++++ b/sysdeps/posix/pwritev64v2.c
+@@ -21,7 +21,7 @@
+
+ /* Since we define no flags for pwritev2 just route to pwritev. */
+ ssize_t
+-pwritev64v2 (int fd, const struct iovec *vector, int count, off_t offset,
++pwritev64v2 (int fd, const struct iovec *vector, int count, off64_t offset,
+ int flags)
+ {
+ if (flags != 0)
diff --git a/debian/patches/hurd-i386/git-preadwritev2.diff b/debian/patches/hurd-i386/git-preadwritev2-3.diff
similarity index 55%
copy from debian/patches/hurd-i386/git-preadwritev2.diff
copy to debian/patches/hurd-i386/git-preadwritev2-3.diff
index a8e18e4..6b1257e 100644
--- a/debian/patches/hurd-i386/git-preadwritev2.diff
+++ b/debian/patches/hurd-i386/git-preadwritev2-3.diff
@@ -1,101 +1,3 @@
-commit dd2b31dec0c0e792bec0486d72c8a049eea4bee1
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Sep 3 02:45:06 2017 +0200
-
- hurd: Fix p{read,write}{,v64}v2.c build
-
- * sysdeps/posix/preadv2.c: Use off_t instead of OFF_T.
- * sysdeps/posix/preadv64v2.c: Use off_t instead of OFF_T.
- * sysdeps/posix/pwritev2.c: Use off_t instead of OFF_T.
- * sysdeps/posix/pwritev64v2.c: Use off_t instead of OFF_T.
-
-diff --git a/sysdeps/posix/preadv2.c b/sysdeps/posix/preadv2.c
-index d27f7028ed..b79b7b1bc3 100644
---- a/sysdeps/posix/preadv2.c
-+++ b/sysdeps/posix/preadv2.c
-@@ -23,7 +23,7 @@
-
- /* Since we define no flags for preadv2 just route to preadv. */
- ssize_t
--preadv2 (int fd, const struct iovec *vector, int count, OFF_T offset,
-+preadv2 (int fd, const struct iovec *vector, int count, off_t offset,
- int flags)
- {
- if (flags != 0)
-diff --git a/sysdeps/posix/preadv64v2.c b/sysdeps/posix/preadv64v2.c
-index ce7cb40bf2..ab71f027d4 100644
---- a/sysdeps/posix/preadv64v2.c
-+++ b/sysdeps/posix/preadv64v2.c
-@@ -20,7 +20,7 @@
- #include <sys/uio.h>
-
- ssize_t
--preadv64v2 (int fd, const struct iovec *vector, int count, OFF_T offset,
-+preadv64v2 (int fd, const struct iovec *vector, int count, off_t offset,
- int flags)
- {
- if (flags != 0)
-diff --git a/sysdeps/posix/pwritev2.c b/sysdeps/posix/pwritev2.c
-index 7ec8cbc407..d746059d42 100644
---- a/sysdeps/posix/pwritev2.c
-+++ b/sysdeps/posix/pwritev2.c
-@@ -23,7 +23,7 @@
-
- /* Since we define no flags for pwritev2 just route to pwritev. */
- ssize_t
--pwritev2 (int fd, const struct iovec *vector, int count, OFF_T offset,
-+pwritev2 (int fd, const struct iovec *vector, int count, off_t offset,
- int flags)
- {
- if (flags != 0)
-diff --git a/sysdeps/posix/pwritev64v2.c b/sysdeps/posix/pwritev64v2.c
-index be98aeed9d..bf62d74190 100644
---- a/sysdeps/posix/pwritev64v2.c
-+++ b/sysdeps/posix/pwritev64v2.c
-@@ -21,7 +21,7 @@
-
- /* Since we define no flags for pwritev2 just route to pwritev. */
- ssize_t
--pwritev64v2 (int fd, const struct iovec *vector, int count, OFF_T offset,
-+pwritev64v2 (int fd, const struct iovec *vector, int count, off_t offset,
- int flags)
- {
- if (flags != 0)
-commit ed95bf5638748068ef05ccbaa0a008b50ebecb42
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Sep 3 03:00:32 2017 +0200
-
- hurd: Fix p{read,write}v64v2.c build
-
- * sysdeps/posix/preadv64v2.c: Use off64_t instead of off_t.
- * sysdeps/posix/pwritev64v2.c: Use off64_t instead of off_t.
-
-diff --git a/sysdeps/posix/preadv64v2.c b/sysdeps/posix/preadv64v2.c
-index ab71f027d4..263f9b77c4 100644
---- a/sysdeps/posix/preadv64v2.c
-+++ b/sysdeps/posix/preadv64v2.c
-@@ -20,7 +20,7 @@
- #include <sys/uio.h>
-
- ssize_t
--preadv64v2 (int fd, const struct iovec *vector, int count, off_t offset,
-+preadv64v2 (int fd, const struct iovec *vector, int count, off64_t offset,
- int flags)
- {
- if (flags != 0)
-diff --git a/sysdeps/posix/pwritev64v2.c b/sysdeps/posix/pwritev64v2.c
-index bf62d74190..f340c8a46d 100644
---- a/sysdeps/posix/pwritev64v2.c
-+++ b/sysdeps/posix/pwritev64v2.c
-@@ -21,7 +21,7 @@
-
- /* Since we define no flags for pwritev2 just route to pwritev. */
- ssize_t
--pwritev64v2 (int fd, const struct iovec *vector, int count, off_t offset,
-+pwritev64v2 (int fd, const struct iovec *vector, int count, off64_t offset,
- int flags)
- {
- if (flags != 0)
commit 2263ca7ce8a824f53debcc724bd21cd7099e1161
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Sep 3 03:03:40 2017 +0200
diff --git a/debian/patches/hurd-i386/git-preadwritev2.diff b/debian/patches/hurd-i386/git-preadwritev2.diff
index a8e18e4..e25c738 100644
--- a/debian/patches/hurd-i386/git-preadwritev2.diff
+++ b/debian/patches/hurd-i386/git-preadwritev2.diff
@@ -61,179 +61,3 @@ index be98aeed9d..bf62d74190 100644
int flags)
{
if (flags != 0)
-commit ed95bf5638748068ef05ccbaa0a008b50ebecb42
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Sep 3 03:00:32 2017 +0200
-
- hurd: Fix p{read,write}v64v2.c build
-
- * sysdeps/posix/preadv64v2.c: Use off64_t instead of off_t.
- * sysdeps/posix/pwritev64v2.c: Use off64_t instead of off_t.
-
-diff --git a/sysdeps/posix/preadv64v2.c b/sysdeps/posix/preadv64v2.c
-index ab71f027d4..263f9b77c4 100644
---- a/sysdeps/posix/preadv64v2.c
-+++ b/sysdeps/posix/preadv64v2.c
-@@ -20,7 +20,7 @@
- #include <sys/uio.h>
-
- ssize_t
--preadv64v2 (int fd, const struct iovec *vector, int count, off_t offset,
-+preadv64v2 (int fd, const struct iovec *vector, int count, off64_t offset,
- int flags)
- {
- if (flags != 0)
-diff --git a/sysdeps/posix/pwritev64v2.c b/sysdeps/posix/pwritev64v2.c
-index bf62d74190..f340c8a46d 100644
---- a/sysdeps/posix/pwritev64v2.c
-+++ b/sysdeps/posix/pwritev64v2.c
-@@ -21,7 +21,7 @@
-
- /* Since we define no flags for pwritev2 just route to pwritev. */
- ssize_t
--pwritev64v2 (int fd, const struct iovec *vector, int count, off_t offset,
-+pwritev64v2 (int fd, const struct iovec *vector, int count, off64_t offset,
- int flags)
- {
- if (flags != 0)
-commit 2263ca7ce8a824f53debcc724bd21cd7099e1161
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Sep 3 03:03:40 2017 +0200
-
- hurd: Fix p{read,write}{,v64}v2.c build
-
- * misc/preadv2.c: Include <errno.h>.
- * misc/preadv64v2.c: Include <errno.h>.
- * misc/pwritev2.c: Include <errno.h>.
- * misc/pwritev64v2.c: Include <errno.h>.
- * sysdeps/posix/preadv2.c: Include <errno.h>.
- * sysdeps/posix/preadv64v2.c: Include <errno.h>.
- Fix <unistd.h> inclusion.
- * sysdeps/posix/pwritev2.c: Include <errno.h>.
- * sysdeps/posix/pwritev64v2.c: Include <errno.h>.
-
-diff --git a/misc/preadv2.c b/misc/preadv2.c
-index a62dcaa699..fe379401ee 100644
---- a/misc/preadv2.c
-+++ b/misc/preadv2.c
-@@ -16,6 +16,7 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-+#include <errno.h>
- #include <sys/uio.h>
-
- /* Same as preadv but with an additional flags argument. */
-diff --git a/misc/preadv64v2.c b/misc/preadv64v2.c
-index a802c2f1ab..e0f05a506a 100644
---- a/misc/preadv64v2.c
-+++ b/misc/preadv64v2.c
-@@ -16,6 +16,7 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-+#include <errno.h>
- #include <sys/uio.h>
-
- /* Same as preadv64 but with an addional flag argument. */
-diff --git a/misc/pwritev2.c b/misc/pwritev2.c
-index b9e07272da..ead84471fc 100644
---- a/misc/pwritev2.c
-+++ b/misc/pwritev2.c
-@@ -16,6 +16,7 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-+#include <errno.h>
- #include <sys/uio.h>
-
- /* Same as pwritev but with an additional flags argument. */
-diff --git a/misc/pwritev64v2.c b/misc/pwritev64v2.c
-index 1f874f054c..c72689cc70 100644
---- a/misc/pwritev64v2.c
-+++ b/misc/pwritev64v2.c
-@@ -16,6 +16,7 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-+#include <errno.h>
- #include <sys/uio.h>
-
- /* Same as preadv64 but with an addional flag argument. */
-diff --git a/sysdeps/posix/preadv2.c b/sysdeps/posix/preadv2.c
-index b79b7b1bc3..cd96677ade 100644
---- a/sysdeps/posix/preadv2.c
-+++ b/sysdeps/posix/preadv2.c
-@@ -16,6 +16,7 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-+#include <errno.h>
- #include <unistd.h>
- #include <sys/uio.h>
-
-diff --git a/sysdeps/posix/preadv64v2.c b/sysdeps/posix/preadv64v2.c
-index 263f9b77c4..649bde4c5a 100644
---- a/sysdeps/posix/preadv64v2.c
-+++ b/sysdeps/posix/preadv64v2.c
-@@ -16,7 +16,8 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
--#include <unistd.>
-+#include <errno.h>
-+#include <unistd.h>
- #include <sys/uio.h>
-
- ssize_t
-diff --git a/sysdeps/posix/pwritev2.c b/sysdeps/posix/pwritev2.c
-index d746059d42..601f6b1b10 100644
---- a/sysdeps/posix/pwritev2.c
-+++ b/sysdeps/posix/pwritev2.c
-@@ -16,6 +16,7 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-+#include <errno.h>
- #include <unistd.h>
- #include <sys/uio.h>
-
-diff --git a/sysdeps/posix/pwritev64v2.c b/sysdeps/posix/pwritev64v2.c
-index f340c8a46d..9f05f97b40 100644
---- a/sysdeps/posix/pwritev64v2.c
-+++ b/sysdeps/posix/pwritev64v2.c
-@@ -16,6 +16,7 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-+#include <errno.h>
- #include <unistd.h>
- #include <sys/uio.h>
-
-diff --git a/misc/tst-preadvwritev2-common.c b/misc/tst-preadvwritev2-common.c
-index 8abedc14d0..913d683e33 100644
---- a/misc/tst-preadvwritev2-common.c
-+++ b/misc/tst-preadvwritev2-common.c
-@@ -22,9 +22,21 @@
- static void
- do_test_with_invalid_flags (void)
- {
-+#ifndef RWF_HIPRI
-+# define RWF_HIPRI 0
-+#endif
-+#ifndef RWF_DSYNC
-+# define RWF_DSYNC 0
-+#endif
-+#ifndef RWF_SYNC
-+# define RWF_SYNC 0
-+#endif
-+#ifndef RWF_NOWAIT
-+# define RWF_NOWAIT 0
-+#endif
- #define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT)
- /* Set the next bit from the mask of all supported flags. */
-- int invalid_flag = __builtin_clz (RWF_SUPPORTED);
-+ int invalid_flag = RWF_SUPPORTED != 0 ? __builtin_clz (RWF_SUPPORTED) : 2;
- invalid_flag = 0x1 << ((sizeof (int) * CHAR_BIT) - invalid_flag);
-
- char buf[32];
diff --git a/debian/patches/hurd-i386/git-rtld-sbrk-2.diff b/debian/patches/hurd-i386/git-rtld-sbrk-2.diff
new file mode 100644
index 0000000..a46f68b
--- /dev/null
+++ b/debian/patches/hurd-i386/git-rtld-sbrk-2.diff
@@ -0,0 +1,21 @@
+commit 77e7ba3201365565a21b42979b8d44be9936f254
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 3 14:19:21 2017 +0200
+
+ hurd: fix overriding rtld's __sbrk with the real implementation
+
+ * sysdeps/mach/hurd/dl-sysdep.c (__sbrk): Add weak_function
+ qualifier.
+
+diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
+index dec00f35f0..fd2f3d52cb 100644
+--- a/sysdeps/mach/hurd/dl-sysdep.c
++++ b/sysdeps/mach/hurd/dl-sysdep.c
+@@ -594,6 +594,7 @@ __getcwd (char *buf, size_t size)
+ /* This is used by dl-tunables.c to strdup strings. We can just make this a
+ mere allocation. */
+ void *
++weak_function
+ __sbrk (intptr_t increment)
+ {
+ vm_address_t addr;
diff --git a/debian/patches/hurd-i386/git-rtld-sbrk.diff b/debian/patches/hurd-i386/git-rtld-sbrk.diff
index 3dd8ac9..6b61567 100644
--- a/debian/patches/hurd-i386/git-rtld-sbrk.diff
+++ b/debian/patches/hurd-i386/git-rtld-sbrk.diff
@@ -27,24 +27,3 @@ index 2bfa64f02a..dec00f35f0 100644
void weak_function attribute_hidden
_exit (int status)
{
-commit 77e7ba3201365565a21b42979b8d44be9936f254
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Sep 3 14:19:21 2017 +0200
-
- hurd: fix overriding rtld's __sbrk with the real implementation
-
- * sysdeps/mach/hurd/dl-sysdep.c (__sbrk): Add weak_function
- qualifier.
-
-diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
-index dec00f35f0..fd2f3d52cb 100644
---- a/sysdeps/mach/hurd/dl-sysdep.c
-+++ b/sysdeps/mach/hurd/dl-sysdep.c
-@@ -594,6 +594,7 @@ __getcwd (char *buf, size_t size)
- /* This is used by dl-tunables.c to strdup strings. We can just make this a
- mere allocation. */
- void *
-+weak_function
- __sbrk (intptr_t increment)
- {
- vm_address_t addr;
diff --git a/debian/patches/hurd-i386/git-sigsetops-2.h.diff b/debian/patches/hurd-i386/git-sigsetops-2.h.diff
new file mode 100644
index 0000000..8cdc32a
--- /dev/null
+++ b/debian/patches/hurd-i386/git-sigsetops-2.h.diff
@@ -0,0 +1,38 @@
+commit 06cf9d31d7caa408b35f194cdbdc17462eb935c2
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 3 01:45:19 2017 +0200
+
+ hurd: Fix sigsetops.h macros
+
+ * sysdeps/generic/sigsetops.h: Remove spurious #endif.
+ (__sigismember, __sigaddset, __sigdelset): Fix referencing set
+ parameter.
+
+diff --git a/sysdeps/generic/sigsetops.h b/sysdeps/generic/sigsetops.h
+index ea2c5b5767..6d1c004b04 100644
+--- a/sysdeps/generic/sigsetops.h
++++ b/sysdeps/generic/sigsetops.h
+@@ -56,20 +56,20 @@
+ # define __sigismember(set, sig) \
+ (__extension__ ({ \
+ __sigset_t __mask = __sigmask (sig); \
+- (set) & __mask ? 1 : 0; \
++ *(set) & __mask ? 1 : 0; \
+ }))
+
+ # define __sigaddset(set, sig) \
+ (__extension__ ({ \
+ __sigset_t __mask = __sigmask (sig); \
+- (set) |= __mask; \
++ *(set) |= __mask; \
+ (void)0; \
+ }))
+
+ # define __sigdelset(set, sig) \
+ (__extension__ ({ \
+ __sigset_t __mask = __sigmask (sig); \
+- (set) &= ~__mask; \
++ *(set) &= ~__mask; \
+ (void)0; \
+ }))
+
diff --git a/debian/patches/hurd-i386/git-sigsetops-3.h.diff b/debian/patches/hurd-i386/git-sigsetops-3.h.diff
new file mode 100644
index 0000000..826abb3
--- /dev/null
+++ b/debian/patches/hurd-i386/git-sigsetops-3.h.diff
@@ -0,0 +1,33 @@
+commit 127e7773b437bd5866a4424cc9b338bac6beb08b
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 3 04:36:29 2017 +0200
+
+ hurd: Fix libc link
+
+ * sysdeps/posix/pause.c: Include <sigsetops.h>.
+ * sysdeps/posix/system.c: Include <sigsetops.h>.
+
+diff --git a/sysdeps/posix/pause.c b/sysdeps/posix/pause.c
+index 53e143d98f..7c17f49ffb 100644
+--- a/sysdeps/posix/pause.c
++++ b/sysdeps/posix/pause.c
+@@ -19,6 +19,7 @@
+ #include <signal.h>
+ #include <unistd.h>
+ #include <sysdep-cancel.h>
++#include <sigsetops.h>
+
+ /* Suspend the process until a signal arrives.
+ This always returns -1 and sets errno to EINTR. */
+diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
+index d49cc3f01c..56195b529f 100644
+--- a/sysdeps/posix/system.c
++++ b/sysdeps/posix/system.c
+@@ -24,6 +24,7 @@
+ #include <sys/wait.h>
+ #include <libc-lock.h>
+ #include <sysdep-cancel.h>
++#include <sigsetops.h>
+
+
+ #define SHELL_PATH "/bin/sh" /* Path of the shell. */
diff --git a/debian/patches/hurd-i386/git-sigsetops.h.diff b/debian/patches/hurd-i386/git-sigsetops.h.diff
new file mode 100644
index 0000000..d1072f0
--- /dev/null
+++ b/debian/patches/hurd-i386/git-sigsetops.h.diff
@@ -0,0 +1,18 @@
+commit b794e16bcc9426e9e05ec465c6c8bab2902a50ed
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 3 01:08:49 2017 +0200
+
+ sysdeps/generic/sigsetops.h: Remove spurious #endif
+
+diff --git a/sysdeps/generic/sigsetops.h b/sysdeps/generic/sigsetops.h
+index e8e5553981..ea2c5b5767 100644
+--- a/sysdeps/generic/sigsetops.h
++++ b/sysdeps/generic/sigsetops.h
+@@ -50,7 +50,6 @@
+ *(dest) = *(left) | *(right); \
+ (void)0; \
+ }))
+-#endif
+
+ /* These macros needn't check for a bogus signal number;
+ checking is done in the non-__ versions. */
diff --git a/debian/patches/hurd-i386/git-sigsetopts.h b/debian/patches/hurd-i386/git-sigsetopts.h
deleted file mode 100644
index dd5db99..0000000
--- a/debian/patches/hurd-i386/git-sigsetopts.h
+++ /dev/null
@@ -1,89 +0,0 @@
-commit b794e16bcc9426e9e05ec465c6c8bab2902a50ed
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Sep 3 01:08:49 2017 +0200
-
- sysdeps/generic/sigsetops.h: Remove spurious #endif
-
-diff --git a/sysdeps/generic/sigsetops.h b/sysdeps/generic/sigsetops.h
-index e8e5553981..ea2c5b5767 100644
---- a/sysdeps/generic/sigsetops.h
-+++ b/sysdeps/generic/sigsetops.h
-@@ -50,7 +50,6 @@
- *(dest) = *(left) | *(right); \
- (void)0; \
- }))
--#endif
-
- /* These macros needn't check for a bogus signal number;
- checking is done in the non-__ versions. */
-commit 06cf9d31d7caa408b35f194cdbdc17462eb935c2
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Sep 3 01:45:19 2017 +0200
-
- hurd: Fix sigsetops.h macros
-
- * sysdeps/generic/sigsetops.h: Remove spurious #endif.
- (__sigismember, __sigaddset, __sigdelset): Fix referencing set
- parameter.
-
-diff --git a/sysdeps/generic/sigsetops.h b/sysdeps/generic/sigsetops.h
-index ea2c5b5767..6d1c004b04 100644
---- a/sysdeps/generic/sigsetops.h
-+++ b/sysdeps/generic/sigsetops.h
-@@ -56,20 +56,20 @@
- # define __sigismember(set, sig) \
- (__extension__ ({ \
- __sigset_t __mask = __sigmask (sig); \
-- (set) & __mask ? 1 : 0; \
-+ *(set) & __mask ? 1 : 0; \
- }))
-
- # define __sigaddset(set, sig) \
- (__extension__ ({ \
- __sigset_t __mask = __sigmask (sig); \
-- (set) |= __mask; \
-+ *(set) |= __mask; \
- (void)0; \
- }))
-
- # define __sigdelset(set, sig) \
- (__extension__ ({ \
- __sigset_t __mask = __sigmask (sig); \
-- (set) &= ~__mask; \
-+ *(set) &= ~__mask; \
- (void)0; \
- }))
-
-commit 127e7773b437bd5866a4424cc9b338bac6beb08b
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun Sep 3 04:36:29 2017 +0200
-
- hurd: Fix libc link
-
- * sysdeps/posix/pause.c: Include <sigsetops.h>.
- * sysdeps/posix/system.c: Include <sigsetops.h>.
-
-diff --git a/sysdeps/posix/pause.c b/sysdeps/posix/pause.c
-index 53e143d98f..7c17f49ffb 100644
---- a/sysdeps/posix/pause.c
-+++ b/sysdeps/posix/pause.c
-@@ -19,6 +19,7 @@
- #include <signal.h>
- #include <unistd.h>
- #include <sysdep-cancel.h>
-+#include <sigsetops.h>
-
- /* Suspend the process until a signal arrives.
- This always returns -1 and sets errno to EINTR. */
-diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
-index d49cc3f01c..56195b529f 100644
---- a/sysdeps/posix/system.c
-+++ b/sysdeps/posix/system.c
-@@ -24,6 +24,7 @@
- #include <sys/wait.h>
- #include <libc-lock.h>
- #include <sysdep-cancel.h>
-+#include <sigsetops.h>
-
-
- #define SHELL_PATH "/bin/sh" /* Path of the shell. */
diff --git a/debian/patches/hurd-i386/tg2.26-sigsetops.h b/debian/patches/hurd-i386/tg2.26-sigsetops.h.diff
similarity index 100%
rename from debian/patches/hurd-i386/tg2.26-sigsetops.h
rename to debian/patches/hurd-i386/tg2.26-sigsetops.h.diff
diff --git a/debian/patches/series b/debian/patches/series
index 9f43ff4..31280e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -134,12 +134,17 @@ hurd-i386/local-nocheck-installed-headers.diff
hurd-i386/git-bits-sysmacros.h.diff
hurd-i386/git-stack_chk_fail_local.diff
hurd-i386/git-stack-protect-static.diff
-hurd-i386/git-sigsetopts.h
-hurd-i386/tg2.26-sigsetops.h
-hurd-i386/git-bits_socket.h
+hurd-i386/git-sigsetops.h.diff
+hurd-i386/git-sigsetops-2.h.diff
+hurd-i386/git-sigsetops-3.h.diff
+hurd-i386/tg2.26-sigsetops.h.diff
+hurd-i386/git-bits_socket.h.diff
hurd-i386/git-preadwritev2.diff
+hurd-i386/git-preadwritev2-2.diff
+hurd-i386/git-preadwritev2-3.diff
hurd-i386/git-rtld-access.diff
hurd-i386/git-rtld-sbrk.diff
+hurd-i386/git-rtld-sbrk-2.diff
hurd-i386/git-divdi.diff
hurd-i386/git-feraiseexcept.diff
hurd-i386/git-libpthread-2.26.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: