[glibc] [hurd] Fix i686 build breakage caused by 4fedebc91108

[glibc] [hurd] Fix i686 build breakage caused by 4fedebc91108

[Samuel Thibault]

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)