aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-23 09:36:22 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-23 09:46:47 +0200
commitec9a66cd01a73c185bb42cdc032f88b472598feb (patch)
treefa923ba2628e1c3f96a37ab8342f483e8d9bad27
parent1d2971b525396e9935f3d90616a1668ceca425e5 (diff)
downloadglibc-ec9a66cd01a73c185bb42cdc032f88b472598feb.zip
glibc-ec9a66cd01a73c185bb42cdc032f88b472598feb.tar.gz
glibc-ec9a66cd01a73c185bb42cdc032f88b472598feb.tar.bz2
mach: Fix accessing mach_i386.h
Fixes: 196358ae26aa ("mach: Fix installing mach_i386.h")
-rw-r--r--sysdeps/mach/hurd/i386/htl/pt-machdep.c2
-rw-r--r--sysdeps/mach/hurd/i386/tls.h2
-rw-r--r--sysdeps/mach/hurd/x86/ioperm.c6
-rw-r--r--sysdeps/mach/hurd/x86_64/htl/pt-machdep.c2
4 files changed, 8 insertions, 4 deletions
diff --git a/sysdeps/mach/hurd/i386/htl/pt-machdep.c b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
index f4c8f93..d38b52a 100644
--- a/sysdeps/mach/hurd/i386/htl/pt-machdep.c
+++ b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
@@ -20,7 +20,7 @@
#include <mach.h>
#include <mach/machine/thread_status.h>
-#include <mach/machine/mach_i386.h>
+#include <mach/i386/mach_i386.h>
#include <mach/mig_errors.h>
#include <mach/thread_status.h>
diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h
index ba28300..6f461e9 100644
--- a/sysdeps/mach/hurd/i386/tls.h
+++ b/sysdeps/mach/hurd/i386/tls.h
@@ -89,7 +89,7 @@ _Static_assert (offsetof (tcbhead_t, __private_ss) == 0x30,
/* Use i386-specific RPCs to arrange that %gs segment register prefix
addresses the TCB in each thread. */
-# include <mach/machine/mach_i386.h>
+# include <mach/i386/mach_i386.h>
# ifndef HAVE_I386_SET_GDT
# define __i386_set_gdt(thr, sel, desc) ((void) (thr), (void) (sel), (void) (desc), MIG_BAD_ID)
diff --git a/sysdeps/mach/hurd/x86/ioperm.c b/sysdeps/mach/hurd/x86/ioperm.c
index 88343e4..5008ae0 100644
--- a/sysdeps/mach/hurd/x86/ioperm.c
+++ b/sysdeps/mach/hurd/x86/ioperm.c
@@ -18,7 +18,11 @@
#include <sys/io.h>
#include <hurd.h>
-#include <mach/machine/mach_i386.h>
+#ifdef __x86_64__
+#include <mach/x86_64/mach_i386.h>
+#else
+#include <mach/i386/mach_i386.h>
+#endif
int
ioperm (unsigned long int from, unsigned long int num, int turn_on)
diff --git a/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c b/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
index 69094d3..64ee7a7 100644
--- a/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
+++ b/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
@@ -21,7 +21,7 @@
#include <mach.h>
#include <mach/machine/thread_status.h>
-#include <mach/machine/mach_i386.h>
+#include <mach/x86_64/mach_i386.h>
#include <mach/mig_errors.h>
#include <mach/thread_status.h>