public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Samuel Thibault <sthibaul@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] [hurd] Fix i686 build breakage caused by 4fedebc91108
Date: Fri, 17 Feb 2023 10:21:45 +0000 (GMT)	[thread overview]
Message-ID: <20230217102145.3C8CC3858C78@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=26c176950909d60ac2a392cf9fce70eabd75f79e

commit 26c176950909d60ac2a392cf9fce70eabd75f79e
Author: Flavio Cruz <flaviocruz@gmail.com>
Date:   Fri Feb 17 01:16:09 2023 -0500

    [hurd] Fix i686 build breakage caused by 4fedebc91108
    
    Message-Id: <Y+8bqZzYTl7WaUm7@jupiter.tail36e24.ts.net>

Diff:
---
 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)

                 reply	other threads:[~2023-02-17 10:21 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=20230217102145.3C8CC3858C78@sourceware.org \
    --to=sthibaul@sourceware.org \
    --cc=glibc-cvs@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).