[hurd,commited 2/3] hurd: Include <sigsetops.h> from hurd/hurd/signal.h

[hurd,commited 2/3] hurd: Include <sigsetops.h> from hurd/hurd/signal.h

[Samuel Thibault]

* hurd/hurd/signal.h [__USE_EXTERN_INLINES][_LIBC][IS_IN(libc) ||
IS_IN(libpthread)]: Include <sigsetops.h>.
---
 ChangeLog          | 2 ++
 hurd/hurd/signal.h | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 59fc5f950d..9a9c1fdd38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,8 @@
 	_POSIX_NO_TRUNC): Define to 0.
 	* sysdeps/pthread/allocalim.h [!defined PTHREAD_STACK_MIN]: Do not
 	check size against PTHREAD_STACK_MIN.
+	* hurd/hurd/signal.h [__USE_EXTERN_INLINES][_LIBC][IS_IN(libc) ||
+	IS_IN(libpthread)]: Include <sigsetops.h>.
 
 2008-12-18  Thomas Schwinge  <tschwinge@gnu.org>
 
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index 1d9c7d8cd7..5ee95acd09 100644
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -42,6 +42,11 @@
 #include <spin-lock.h>
 #include <hurd/threadvar.h>	/* We cache sigstate in a threadvar.  */
 struct hurd_signal_preemptor;	/* <hurd/sigpreempt.h> */
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc) || IS_IN (libpthread)
+#    include <sigsetops.h>
+#  endif
+#endif
 
 
 /* Full details of a signal.  */
-- 
2.15.1

[hurd,commited 3/3] hurd: Build stubs for new gnumach.defs

[Samuel Thibault]

* mach/Makefile (user-interfaces): Add mach/gnumach.
* sysdeps/mach/configure.ac (mach_interface_list): Add gnumach.
* sysdeps/mach/configure (mach_interface_list): Regenerate.
---
 ChangeLog                 | 3 +++
 mach/Makefile             | 2 +-
 sysdeps/mach/configure    | 2 +-
 sysdeps/mach/configure.ac | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a9c1fdd38..babe572b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,6 +96,9 @@
 	check size against PTHREAD_STACK_MIN.
 	* hurd/hurd/signal.h [__USE_EXTERN_INLINES][_LIBC][IS_IN(libc) ||
 	IS_IN(libpthread)]: Include <sigsetops.h>.
+	* mach/Makefile (user-interfaces): Add mach/gnumach.
+	* sysdeps/mach/configure.ac (mach_interface_list): Add gnumach.
+	* sysdeps/mach/configure (mach_interface_list): Regenerate.
 
 2008-12-18  Thomas Schwinge  <tschwinge@gnu.org>
 
diff --git a/mach/Makefile b/mach/Makefile
index 50047c2fd8..0ef6e1696d 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -116,7 +116,7 @@ ifndef mach-shortcuts
 # $(mach-shortcuts) will be set, and that will change how
 # mach_interface.defs is processed: it will get the -D flags below.
 user-interfaces := $(filter-out $(mach-interface-list:%=mach/%) \
-				mach/mach_port mach/mach_host mach/mach4 \
+				mach/mach_port mach/mach_host mach/mach4 mach/gnumach \
 				device/device_request,\
 				$(user-interfaces))
 endif
diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure
index 632a9c9fa4..c6ea9be20b 100644
--- a/sysdeps/mach/configure
+++ b/sysdeps/mach/configure
@@ -282,7 +282,7 @@ if test $libc_cv_mach_task_creation_time = no; then
 fi
 
 mach_interface_list=
-for ifc in mach mach4 \
+for ifc in mach mach4 gnumach \
 	   clock clock_priv host_priv host_security ledger lock_set \
 	   processor processor_set task task_notify thread_act vm_map \
 	   memory_object memory_object_default default_pager \
diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac
index 3033fec946..cadecae884 100644
--- a/sysdeps/mach/configure.ac
+++ b/sysdeps/mach/configure.ac
@@ -59,7 +59,7 @@ dnl but we don't do a check for that here because in a bare
 dnl environment the compile against those headers will fail.
 dnl
 mach_interface_list=
-for ifc in mach mach4 \
+for ifc in mach mach4 gnumach \
 	   clock clock_priv host_priv host_security ledger lock_set \
 	   processor processor_set task task_notify thread_act vm_map \
 	   memory_object memory_object_default default_pager \
-- 
2.15.1

[hurd,commited 0/3] hurd: build fixes

[Samuel Thibault]

Samuel Thibault (3):
  hurd: Fix allocalim build
  hurd: Include <sigsetops.h> from hurd/hurd/signal.h
  hurd: Build stubs for new gnumach.defs

 ChangeLog                   | 7 +++++++
 hurd/hurd/signal.h          | 5 +++++
 mach/Makefile               | 2 +-
 sysdeps/mach/configure      | 2 +-
 sysdeps/mach/configure.ac   | 2 +-
 sysdeps/pthread/allocalim.h | 7 +++++--
 6 files changed, 20 insertions(+), 5 deletions(-)

-- 
2.15.1

[hurd,commited 1/3] hurd: Fix allocalim build

[Samuel Thibault]

* sysdeps/pthread/allocalim.h [!defined PTHREAD_STACK_MIN]: Do not
check size against PTHREAD_STACK_MIN.
---
 ChangeLog                   | 2 ++
 sysdeps/pthread/allocalim.h | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3223ff58ea..59fc5f950d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,8 @@
 	_hurd_userlink_link, _hurd_userlink_unlink, _hurd_userlink_clear.
 	* sysdeps/mach/hurd/bits/posix_opt.h (_POSIX_CHOWN_RESTRICTED,
 	_POSIX_NO_TRUNC): Define to 0.
+	* sysdeps/pthread/allocalim.h [!defined PTHREAD_STACK_MIN]: Do not
+	check size against PTHREAD_STACK_MIN.
 
 2008-12-18  Thomas Schwinge  <tschwinge@gnu.org>
 
diff --git a/sysdeps/pthread/allocalim.h b/sysdeps/pthread/allocalim.h
index b265d6f269..fdae0c251f 100644
--- a/sysdeps/pthread/allocalim.h
+++ b/sysdeps/pthread/allocalim.h
@@ -24,6 +24,9 @@ extern __always_inline
 int
 __libc_use_alloca (size_t size)
 {
-  return (__builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1)
-	  || __builtin_expect (__libc_alloca_cutoff (size), 1));
+  return (
+#ifdef PTHREAD_STACK_MIN
+          __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) ||
+#endif
+          __builtin_expect (__libc_alloca_cutoff (size), 1));
 }
-- 
2.15.1

Re: [hurd,commited 2/3] hurd: Include <sigsetops.h> from hurd/hurd/signal.h

[Joseph Myers]

On Sun, 28 Jan 2018, Samuel Thibault wrote:

> diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
> index 1d9c7d8cd7..5ee95acd09 100644
> --- a/hurd/hurd/signal.h
> +++ b/hurd/hurd/signal.h
> @@ -42,6 +42,11 @@
>  #include <spin-lock.h>
>  #include <hurd/threadvar.h>	/* We cache sigstate in a threadvar.  */
>  struct hurd_signal_preemptor;	/* <hurd/sigpreempt.h> */
> +#if defined __USE_EXTERN_INLINES && defined _LIBC
> +#  if IS_IN (libc) || IS_IN (libpthread)
> +#    include <sigsetops.h>
> +#  endif
> +#endif

Again, should be one column of preprocessor indentation per #if level.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [hurd,commited 1/3] hurd: Fix allocalim build

[Joseph Myers]

On Sun, 28 Jan 2018, Samuel Thibault wrote:

> +#ifdef PTHREAD_STACK_MIN
> +          __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) ||

I think the rule of having operators at the start of line, not the end of 
line, applies even in this case (so should have a second line with just 
appropriately-indented ||).

-- 
Joseph S. Myers
joseph@codesourcery.com