diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-05-23 09:36:22 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-05-23 09:46:47 +0200 |
| commit | ec9a66cd01a73c185bb42cdc032f88b472598feb (patch) | |
| tree | fa923ba2628e1c3f96a37ab8342f483e8d9bad27 | |
| parent | 1d2971b525396e9935f3d90616a1668ceca425e5 (diff) | |
| download | glibc-ec9a66cd01a73c185bb42cdc032f88b472598feb.tar.gz glibc-ec9a66cd01a73c185bb42cdc032f88b472598feb.tar.xz glibc-ec9a66cd01a73c185bb42cdc032f88b472598feb.zip | |
mach: Fix accessing mach_i386.h
Fixes: 196358ae26aa ("mach: Fix installing mach_i386.h")
| -rw-r--r-- | sysdeps/mach/hurd/i386/htl/pt-machdep.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/tls.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/x86/ioperm.c | 6 | ||||
| -rw-r--r-- | 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> |