* [hurd,commited] mach: Fix accessing mach_i386.h
@ 2023-05-23 7:47 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2023-05-23 7:47 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault, commit-hurd
Fixes: 196358ae26aa ("mach: Fix installing mach_i386.h")
---
sysdeps/mach/hurd/i386/htl/pt-machdep.c | 2 +-
sysdeps/mach/hurd/i386/tls.h | 2 +-
sysdeps/mach/hurd/x86/ioperm.c | 6 +++++-
sysdeps/mach/hurd/x86_64/htl/pt-machdep.c | 2 +-
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 f4c8f93c2f..d38b52aecf 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 ba283008a8..6f461e91cd 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 88343e4bbd..5008ae04f1 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 69094d3b02..64ee7a76e2 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>
--
2.39.2
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-23 7:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-23 7:47 [hurd,commited] mach: Fix accessing mach_i386.h Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).