[hurd,commited] hurd: fix build

[hurd,commited] hurd: fix build

[Samuel Thibault]

	* signal/sigaddset.c: Include <sigsetopts.h>.
	* signal/sigdelset.c: Likewise.
---
 ChangeLog          | 2 ++
 signal/sigaddset.c | 1 +
 signal/sigdelset.c | 1 +
 3 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index eb51a31bc7..0748cdafe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,8 @@
 	* sysdeps/mach/hurd/i386/exc2signal.c (_hurd_exception2signal): Add
 	hidden def.
 	* mach/spin-lock.c (__mutex_unlock): Add hidden def.
+	* signal/sigaddset.c: Include <sigsetopts.h>.
+	* signal/sigdelset.c: Likewise.
 
 2018-04-03  Wilco Dijkstra  <wdijkstr@arm.com>
 
diff --git a/signal/sigaddset.c b/signal/sigaddset.c
index 7238df4738..cfb3373b13 100644
--- a/signal/sigaddset.c
+++ b/signal/sigaddset.c
@@ -17,6 +17,7 @@
 
 #include <errno.h>
 #include <signal.h>
+#include <sigsetops.h>
 #include <internal-signals.h>
 
 /* Add SIGNO to SET.  */
diff --git a/signal/sigdelset.c b/signal/sigdelset.c
index 011978cf33..52f2ce6a36 100644
--- a/signal/sigdelset.c
+++ b/signal/sigdelset.c
@@ -17,6 +17,7 @@
 
 #include <errno.h>
 #include <signal.h>
+#include <sigsetops.h>
 #include <internal-signals.h>
 
 /* Add SIGNO to SET.  */
-- 
2.16.2

[hurd,commited] hurd: Fix build

[Samuel Thibault]

7e23b3c2c008 ("Update code to handle the new ABI for sending inlined
port rights.") was missing a cast.

Fixes 7e23b3c2c008e0b9b5da055e675d40cc27bb10ef
---
 hurd/intr-msg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c
index d52e90449e..9912f4f1f3 100644
--- a/hurd/intr-msg.c
+++ b/hurd/intr-msg.c
@@ -241,7 +241,7 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
 	      const vm_size_t length = ((number * size) + 7) >> 3;
 	      if (ty->msgtl_header.msgt_inline)
 		{
-		  clean_inlined_ports (data);
+		  clean_inlined_ports ((mach_port_name_inlined_t *) data);
 		  /* Move to the next argument.  */
 		  ty = (void *) PTR_ALIGN_UP (data + length, __alignof__ (uintptr_t));
 		}
-- 
2.42.0

[hurd,commited] hurd: Fix build

[Samuel Thibault]

* sysdeps/mach/hurd/i386/sigreturn.c (__sigreturn2): Spin-lock '&ss->lock',
not 'ss'.
---
 sysdeps/mach/hurd/i386/sigreturn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdeps/mach/hurd/i386/sigreturn.c b/sysdeps/mach/hurd/i386/sigreturn.c
index c9eaf96f7d..111ca33b54 100644
--- a/sysdeps/mach/hurd/i386/sigreturn.c
+++ b/sysdeps/mach/hurd/i386/sigreturn.c
@@ -30,7 +30,7 @@ static void
 __sigreturn2 (int *usp)
 {
   struct hurd_sigstate *ss = _hurd_self_sigstate ();
-  __spin_unlock (ss);
+  __spin_unlock (&ss->lock);
 
   sp = usp;
 #define A(line) asm volatile (#line)
-- 
2.23.0.rc1

[hurd,commited] hurd: Fix build

[Samuel Thibault]

	* sysdeps/gnu/errlist.c (EIEIO): Fix comment marker.
---
 sysdeps/gnu/errlist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index ccb9986f57..77577bf3e1 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -974,7 +974,7 @@ TRANS You did @strong{what}? */
 #endif
 #ifdef EIEIO
 /*
-TRANS Go home and have a glass of warm, dairy-fresh milk. */
+TRANS Go home and have a glass of warm, dairy-fresh milk.
 TRANS @c Okay.  Since you are dying to know, I'll tell you.
 TRANS @c This is a joke, obviously.  There is a children's song which begins,
 TRANS @c "Old McDonald had a farm, e-i-e-i-o."  Every time I see the (real)
@@ -987,7 +987,7 @@ TRANS @c
 TRANS @c "bought the farm" means "died".  -jtobey
 TRANS @c
 TRANS @c Translators, please do not translate this litteraly, translate it into
-TRANS @c an idiomatic funny way of saying that the computer died.
+TRANS @c an idiomatic funny way of saying that the computer died. */
     [ERR_REMAP (EIEIO)] = N_("Computer bought the farm"),
 # if EIEIO > ERR_MAX
 # undef ERR_MAX
-- 
2.19.1

[hurd,commited] hurd: fix build

[Samuel Thibault]

* sysdeps/mach/hurd/i386/init-first.c: Compare d->phdr with 0 instead of
NULL.
---
 sysdeps/mach/hurd/i386/init-first.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
index 226de02a99..e272e329ad 100644
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -107,7 +107,7 @@ init1 (int argc, char *arg0, ...)
   /* If we are the bootstrap task started by the kernel,
      then after the environment pointers there is no Hurd
      data block; the argument strings start there.  */
-  if ((void *) d == argv[0] || d->phdr == NULL)
+  if ((void *) d == argv[0] || d->phdr == 0)
     {
 #ifndef SHARED
       /* With a new enough linker (binutils-2.23 or better),
-- 
2.16.2

[hurd,commited] hurd: fix build

[Samuel Thibault]

	* sysdeps/mach/hurd/dl-sysdep.c (_dl_random): New variable.
---
 ChangeLog                     | 4 ++++
 sysdeps/mach/hurd/dl-sysdep.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index fae6ff31e4..b4e1f34818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-21  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* sysdeps/mach/hurd/dl-sysdep.c (_dl_random): New variable.
+
 2018-02-20  Rical Jasan  <ricaljasan@pacific.net>
 
 	* manual/creature.texi (_ISOC99_SOURCE): Update the dated
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index ef96df054e..71d62e233a 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -64,6 +64,8 @@ rtld_hidden_data_def(__libc_stack_end)
 hp_timing_t _dl_cpuclock_offset;
 #endif
 
+/* TODO: Initialize.  */
+void *_dl_random attribute_relro = NULL;
 
 struct hurd_startup_data *_dl_hurd_data;
 
-- 
2.16.1

[hurd,commited] hurd: Fix build

[Samuel Thibault]

	* stdlib/test-atexit-race-common.c [!defined PTHREAD_STACK_MIN]: Do
	not check against PTHREAD_STACK_MIN.
---
 ChangeLog                        | 5 +++++
 stdlib/test-atexit-race-common.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index add5128cb7..b8184b658d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-04  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* stdlib/test-atexit-race-common.c [!defined PTHREAD_STACK_MIN]: Do
+	not check against PTHREAD_STACK_MIN.
+
 2018-02-02  Sean McKean  <smckean83@gmail.com>
 
 	[BZ #22735]
diff --git a/stdlib/test-atexit-race-common.c b/stdlib/test-atexit-race-common.c
index 8adf1330bf..63bde390b4 100644
--- a/stdlib/test-atexit-race-common.c
+++ b/stdlib/test-atexit-race-common.c
@@ -39,7 +39,10 @@
 const size_t kNumThreads = 1024;
 const size_t kNumHandlers = 1024;
 const size_t kStacksize =
-	0x20000 < PTHREAD_STACK_MIN ? PTHREAD_STACK_MIN : 0x20000;
+#ifdef PTHREAD_STACK_MIN
+	0x20000 < PTHREAD_STACK_MIN ? PTHREAD_STACK_MIN :
+#endif
+		0x20000;
 
 static void *
 threadfunc (void *unused)
-- 
2.15.1