From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 23 May 2023 07:36:22 +0000 (+0200)
Subject: mach: Fix accessing mach_i386.h
X-Git-Tag: glibc-2.38~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec9a66cd01a73c185bb42cdc032f88b472598feb;p=thirdparty%2Fglibc.git

mach: Fix accessing mach_i386.h

Fixes: 196358ae26aa ("mach: Fix installing mach_i386.h")
---

diff --git a/sysdeps/mach/hurd/i386/htl/pt-machdep.c b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
index f4c8f93c2f4..d38b52aecf9 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 ba283008a87..6f461e91cd7 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 88343e4bbdc..5008ae04f16 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 69094d3b02d..64ee7a76e23 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>