From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id AB0663858C39 for ; Fri, 17 Feb 2023 10:21:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AB0663858C39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pSxsI-0007xO-1x; Fri, 17 Feb 2023 05:21:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=In-Reply-To:MIME-Version:References:Subject:To:From: Date; bh=X4mPG3UWRakDdmm8LBSDi94whfbfneErysVmnvAjO78=; b=BMqdH85P7Kle//Xh4ZS/ uaG28FSg9DpVNv/umeoHw1TDj5q4OeTJZI5fh/DsPwfgFIhTIqBgFdgmWhvAGmGGUjaxNOknU8xF8 Do9OsDMpSMI2sBIPgeNypGKmOCGMVUF4nq/EUzOtCkHrnh12sAsp0TV4ZGPySlgqFTteoGt6oyGHV Kb0EC0s8igkezFt2sHI/8wFUSkj5qpmVLFfw7leDvwiFLvyVgFDeBbrm2KU3/jRLbnO5GpVMtEUlV MtK+806FXx9lGYkOmv7t4tcvKlvcObikCs606Aov6US19ebXqA9l0Xzr6Hi/UALozwz+FZlu6X3La hxJV7hIIc/0RBg==; Received: from nat-inria-interne-52-gw-01-bso.bordeaux.inria.fr ([194.199.1.52] helo=begin) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pSxsG-0002Vk-TY; Fri, 17 Feb 2023 05:21:53 -0500 Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1pSxsD-006Ico-1m; Fri, 17 Feb 2023 11:21:49 +0100 Date: Fri, 17 Feb 2023 11:21:49 +0100 From: Samuel Thibault To: Flavio Cruz Cc: bug-hurd@gnu.org, libc-alpha@sourceware.org Subject: Re: [PATCH glibc] Fix hurd i686 build breakage caused by 4fedebc9110809b5965e42f659d3477f4c89def8 Message-ID: <20230217102149.fpo4tk7c2tv6c7hj@begin> Mail-Followup-To: Flavio Cruz , bug-hurd@gnu.org, libc-alpha@sourceware.org References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Applied, thanks! Flavio Cruz via Libc-alpha, le ven. 17 févr. 2023 01:16:09 -0500, a ecrit: > We already use the mach/machine include pattern in some other places so > seems fine to make it consistent here too. > --- > 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 > > #include > -#include > -#include > +#include > +#include > #include > #include > > 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 > +# 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 73b886b9c9..88343e4bbd 100644 > --- a/sysdeps/mach/hurd/x86/ioperm.c > +++ b/sysdeps/mach/hurd/x86/ioperm.c > @@ -18,7 +18,7 @@ > > #include > #include > -#include > +#include > > int > ioperm (unsigned long int from, unsigned long int num, int turn_on) > -- > 2.39.1 > -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.