[hurd] Fix i686 build breakage caused by 4fedebc91108

Message-Id: <Y+8bqZzYTl7WaUm7@jupiter.tail36e24.ts.net>

diff --git a/sysdeps/mach/hurd/i386/htl/pt-machdep.c b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
index de534582beb074afc04a133f508a667a1d03f881..f4c8f93c2f40367bfd39b3befad95da43442c41f 100644 (file)
--- 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 dc43d4c7075ea0f7361e51587333404e3cff6903..590abd47fe0b7ebc6d1c7247118f25b9a1db7c0c 100644 (file)
--- 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 73b886b9c92eddcdfd15667df6d741450052d9fb..88343e4bbdce5508c7d2acfc350cd0346cd6d215 100644 (file)
--- 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)