summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-05-07 00:49:03 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-05-07 00:49:03 +0200
commitd412b7b8c50c952596f23f8b2df6ba13c2320c64 (patch)
treeae63026407339726bb3abdf0df2b29a7efedaa92
parent819d9e83013299e67fd501289ec6500c4c55ebd1 (diff)
parent695c56a253bde67ea0959ef75c941a51b4df7eb6 (diff)
Merge commit 'refs/top-bases/tschwinge/Roger_Whittaker' into tschwinge/Roger_Whittakerglibc-2.19-hurd+libpthread-20150515
-rw-r--r--mach/Makefile2
-rw-r--r--sysdeps/mach/configure2
-rw-r--r--sysdeps/mach/configure.ac2
3 files changed, 3 insertions, 3 deletions
diff --git a/mach/Makefile b/mach/Makefile
index c804fa30c4..5131e26009 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -111,7 +111,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 61ac7d9684..290a5ffb0b 100644
--- a/sysdeps/mach/configure
+++ b/sysdeps/mach/configure
@@ -277,7 +277,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 thread_act vm_map \
memory_object memory_object_default default_pager \
diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac
index db85f47eae..52d47e0cbe 100644
--- a/sysdeps/mach/configure.ac
+++ b/sysdeps/mach/configure.ac
@@ -54,7 +54,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 thread_act vm_map \
memory_object memory_object_default default_pager \