From: Flavio Cruz <flaviocruz@gmail.com>
To: bug-hurd@gnu.org, libc-alpha@sourceware.org
Subject: [PATCH glibc] Fix hurd i686 build breakage caused by 4fedebc9110809b5965e42f659d3477f4c89def8
Date: Fri, 17 Feb 2023 01:16:09 -0500 [thread overview]
Message-ID: <Y+8bqZzYTl7WaUm7@jupiter.tail36e24.ts.net> (raw)
We already use the mach/machine include pattern in some other places so
seems fine to make it consistent here too.
---
sysdeps/mach/hurd/i386/htl/pt-machdep.c | 4 ++--
sysdeps/mach/hurd/i386/tls.h | 2 +-
sysdeps/mach/hurd/x86/ioperm.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sysdeps/mach/hurd/i386/htl/pt-machdep.c b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
index de534582be..f4c8f93c2f 100644
--- a/sysdeps/mach/hurd/i386/htl/pt-machdep.c
+++ b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
@@ -19,8 +19,8 @@
#include <errno.h>
#include <mach.h>
-#include <mach/i386/thread_status.h>
-#include <mach/i386/mach_i386.h>
+#include <mach/machine/thread_status.h>
+#include <mach/machine/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 dc43d4c707..590abd47fe 100644
--- a/sysdeps/mach/hurd/i386/tls.h
+++ b/sysdeps/mach/hurd/i386/tls.h
@@ -101,7 +101,7 @@ extern unsigned short __init1_desc;
/* Use i386-specific RPCs to arrange that %gs segment register prefix
addresses the TCB in each thread. */
-# include <mach/i386/mach_i386.h>
+# include <mach/machine/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 73b886b9c9..88343e4bbd 100644
--- a/sysdeps/mach/hurd/x86/ioperm.c
+++ b/sysdeps/mach/hurd/x86/ioperm.c
@@ -18,7 +18,7 @@
#include <sys/io.h>
#include <hurd.h>
-#include <mach/i386/mach_i386.h>
+#include <mach/machine/mach_i386.h>
int
ioperm (unsigned long int from, unsigned long int num, int turn_on)
--
2.39.1
next reply other threads:[~2023-02-17 6:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 6:16 Flavio Cruz [this message]
2023-02-17 10:21 ` Samuel Thibault
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=Y+8bqZzYTl7WaUm7@jupiter.tail36e24.ts.net \
--to=flaviocruz@gmail.com \
--cc=bug-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).