From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: libc-alpha@sourceware.org
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>, commit-hurd@gnu.org
Subject: [hurd,commited] mach: Fix accessing mach_i386.h
Date: Tue, 23 May 2023 09:47:08 +0200 [thread overview]
Message-ID: <20230523074708.4049898-1-samuel.thibault@ens-lyon.org> (raw)
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
reply other threads:[~2023-05-23 7:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230523074708.4049898-1-samuel.thibault@ens-lyon.org \
--to=samuel.thibault@ens-lyon.org \
--cc=commit-hurd@gnu.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).