From patchwork Fri Feb 17 06:16:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Cruz X-Patchwork-Id: 1744068 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=v46fjGEK; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PJ1mG3Xf0z23yJ for ; Fri, 17 Feb 2023 17:16:30 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 304F0385B523 for ; Fri, 17 Feb 2023 06:16:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 304F0385B523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676614588; bh=kN0eDtt0E12kzVP+IV7A5DTX3iMjphc/LhE8CwvWG9M=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=v46fjGEKWQxMU9aWbkdvDtVxtaqfD9uKcmuQwEhj3cZlPKAKhL72e73K4uxPUIHZ7 lwuYjuQEIMSXOX1DZBH++f72uTuSJSa7y94r3Rf5woMi/l1tkoWp85Ip8/gnr9ZPis sXoJTgHX22Hhz6tspdN+EyMJKFgTKQpCk6tM8blE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by sourceware.org (Postfix) with ESMTPS id A8D3A385B51A for ; Fri, 17 Feb 2023 06:16:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A8D3A385B51A Received: by mail-il1-x12b.google.com with SMTP id u8so1640652ilq.13 for ; Thu, 16 Feb 2023 22:16:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kN0eDtt0E12kzVP+IV7A5DTX3iMjphc/LhE8CwvWG9M=; b=OzAWAj0YKoSmG0bZsg3aFDjrTXgkdg/iP5pRqjV3aE+D4ee+YW2dFX6lm3yDamkBbq vmtcXNPnzRM1+stGLusNxXEdNzeoXb8orKSp9QxkEKTbYPa8uHLb0mMuZPktk7N9FF3f +HWuicYSpo+XhqEqt7KtR8xzf8lTKCdBB53Y/Z8be2wqyEClruAU0HrfAsr8k6ZvywAt Tgw9QxhcMeZrkm8ntaVf8mFSwentkiVGzWHDBpGqam0rDVFGCIISt2AQlkXf0nQSCk23 g0H1liy7t8xwrjjvMN1epf5RhVLT+iRqO0va5k7bFYOg1+GTChlny9dRGg2Ye9S0gwCI 9Gaw== X-Gm-Message-State: AO0yUKXwAvSyh2hDVEAvDqch82Gb+oE50cEkETGpR2+EZ9nsUtWdaiqj S7Djdu2UW51uGB32JxPY53NGdPbFMQ== X-Google-Smtp-Source: AK7set/UE6q4ntGu+YT8XATT1LpnrdoR4Dx2QLp/5OBX4EDfEIs/qaXuz4Z/LIFO4xJDK93uLZfuIA== X-Received: by 2002:a92:b30a:0:b0:315:3ac3:9cbd with SMTP id p10-20020a92b30a000000b003153ac39cbdmr5645984ilh.12.1676614571663; Thu, 16 Feb 2023 22:16:11 -0800 (PST) Received: from jupiter.tail36e24.ts.net (dynamic-acs-24-154-253-225.zoominternet.net. [24.154.253.225]) by smtp.gmail.com with ESMTPSA id e1-20020a02a501000000b003c4907302a1sm1219860jam.107.2023.02.16.22.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 22:16:11 -0800 (PST) Date: Fri, 17 Feb 2023 01:16:09 -0500 To: bug-hurd@gnu.org, libc-alpha@sourceware.org Subject: [PATCH glibc] Fix hurd i686 build breakage caused by 4fedebc9110809b5965e42f659d3477f4c89def8 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Flavio Cruz via Libc-alpha From: Flavio Cruz Reply-To: Flavio Cruz Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" 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)