From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 37AEF3858D37; Tue, 23 May 2023 07:47:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 37AEF3858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684828020; bh=ZfyCxjpdAATSB1FHYz7POw69+NKfH2OsehxH9wieoGs=; h=From:To:Subject:Date:From; b=kh+1fit8jN/wx4MWQRTXZIfqMt8a9Jc5alQktr+ErSBvQYVzAIwkspYhcP889CTIO aELifkryT5EqrRhZ5wrBljwLZZiggU0NRES74eTDzVwdKl6gbqMsliL6zZ0q8gT2GK LtKJ/AQPjFrbzv4POAjJX9ycCEqjrCqV60CF7Gjg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] mach: Fix accessing mach_i386.h X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 1d2971b525396e9935f3d90616a1668ceca425e5 X-Git-Newrev: ec9a66cd01a73c185bb42cdc032f88b472598feb Message-Id: <20230523074700.37AEF3858D37@sourceware.org> Date: Tue, 23 May 2023 07:47:00 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ec9a66cd01a73c185bb42cdc032f88b472598feb commit ec9a66cd01a73c185bb42cdc032f88b472598feb Author: Samuel Thibault Date: Tue May 23 09:36:22 2023 +0200 mach: Fix accessing mach_i386.h Fixes: 196358ae26aa ("mach: Fix installing mach_i386.h") Diff: --- sysdeps/mach/hurd/i386/htl/pt-machdep.c | 2 +- sysdeps/mach/hurd/i386/tls.h | 2 +- sysdeps/mach/hurd/x86/ioperm.c | 6 +++++- 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 #include -#include +#include #include #include 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 +# include # 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 #include -#include +#ifdef __x86_64__ +#include +#else +#include +#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 #include -#include +#include #include #include