From patchwork Wed Oct 9 17:14:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 1995019 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=aZrr9zU7; dkim-atps=neutral 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=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XP00Z71rSz1xsv for ; Thu, 10 Oct 2024 04:16:14 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3518938650DD for ; Wed, 9 Oct 2024 17:16:13 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 1FE75385DDD7 for ; Wed, 9 Oct 2024 17:15:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1FE75385DDD7 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1FE75385DDD7 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728494156; cv=none; b=xs9x38TaLiB7VChWcEtJcdKenWyoDLicqn59GSbDPoNpywGxnn/dSlOT8FCg4HEKoYtHKy3hl5i7VJxMJgoXfoduV79fPScV/43Vo3losLm5s+qneGjqz0hJIL9L6UIsQJEGded8E9GUdVSIN/j+5Mt/+ok6zkrME/SknBAfcEY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728494156; c=relaxed/simple; bh=vq6Z01OOq3Vwd48PiMabQ5eHyP1pMqf+mTP9CC0g5zM=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=ebXHPVf8Ua6Onn2a95XsxGH503LeaSOmEGCoTG36QYIokMvrC7ZaK+Scro5cRJ2cif7nmmzl67qK3kyUauF6P68DGOVST9VZ5FPcGJZPiSxF2Aa/V/IfJSBD2omYEAlJODr1tULBRUu/7CQZC/sX6XOJsu/D3ALcILm8UcjA7ws= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728494153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=jThiAlNY5dZf+taKcpCPvRHCrmMG6P41JSnZ6SOohuA=; b=aZrr9zU70ZX9vLuWdi55Ew22+f6cC495Up+vdeE07wWanJHYbagd8pI67tYvs60Oxas5Nu V+bhVqy2JykjYBmGbDAvncfnawgeXBcSUcuZxJjXGNaIw5nVS7NpmOpxnFHwIq2i2Lj3sJ 0iajVyNquVGWpHHkPXqJoM8RDS8dzPU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-v_xWOWumMeGTTSCcsEYfJw-1; Wed, 09 Oct 2024 13:15:52 -0400 X-MC-Unique: v_xWOWumMeGTTSCcsEYfJw-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42cb940cd67so99765e9.0 for ; Wed, 09 Oct 2024 10:15:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728494151; x=1729098951; h=mime-version:message-id:subject:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=jThiAlNY5dZf+taKcpCPvRHCrmMG6P41JSnZ6SOohuA=; b=nqWT0ja7v8wn75cz863X7kJsOvrhtm2lvUaYkdNOia1CO7mjwp7MEh5S+u5IYAvvUT +H6a6+rcx0g1RpFgrhcIlA20JpQWs6W7KkYOvG9WWi7y9HhxtiNWmgNTRIY3fdjsrn7D iBh2a9+ghQdTsZr3QiSiPNR8ZHbLy5xy5HzMnthwrDOzP84kluxdaZF3+rLxsYuLg+m/ UJOe/Z0jqXbmq7hQeAUBN+bu1vcFtY02mzB+k+Ln2cdWHeJCyYXUPM3PLvYhX9ln5Dqo JnCHpopOauHR640efLyJYOKlCT56W3fqxislA46mG9rVgLsHUG3kobsxh0Ax385aoj2z /fNg== X-Gm-Message-State: AOJu0Yz6v8AjUsyqYbzmexl3Eb+yHgzl+C67lMINo3satKDs3My3nxTl AUB+PmnczGnY0ltlMhykBpD4MFaOptg8PprB5PqF0cGm1ZhQoKqf2Fs+mw4AIAAeEeP1RcUPA60 vnI5BLzKBe+VG7QqwdiWBZxYWzXtn8EJ9hkcOnGOnTpr8dXd4+m9I0p0UcTHSQazMlKdd5vQJEM nMjLvDKOEDZ9c8/vKj/uCBcyqVSv/2c5zdBNrDHqhPBw== X-Received: by 2002:a05:600c:1d27:b0:42a:a6b8:f09f with SMTP id 5b1f17b1804b1-430d70b3d02mr34722905e9.23.1728494151223; Wed, 09 Oct 2024 10:15:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmb4HBRx3eQuoHcHo/KOx5gzfixw6Awq/RYFqqIW/KnMO6C6m4aMKlSz5q4wVO0HQ1OOkTvA== X-Received: by 2002:a05:600c:1d27:b0:42a:a6b8:f09f with SMTP id 5b1f17b1804b1-430d70b3d02mr34722625e9.23.1728494150794; Wed, 09 Oct 2024 10:15:50 -0700 (PDT) Received: from digraph.polyomino.org.uk (digraph.polyomino.org.uk. [2001:8b0:bf73:93f7::51bb:e332]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-430ccf31adesm26248085e9.1.2024.10.09.10.15.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2024 10:15:50 -0700 (PDT) Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.97) (envelope-from ) id 1syaH4-00000004xj2-1r8z for libc-alpha@sourceware.org; Wed, 09 Oct 2024 17:14:58 +0000 Date: Wed, 9 Oct 2024 17:14:58 +0000 (UTC) From: Joseph Myers To: libc-alpha@sourceware.org Subject: Fix header guard in sysdeps/mach/hurd/x86_64/vm_param.h Message-ID: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org GCC mainline produces a -Wheader-guard error building for x86_64-gnu. Fix what seems to be incorrect macro naming in the #ifndef conditional. Tested with build-many-glibc.py for x86_64-gnu (GCC mainline). diff --git a/sysdeps/mach/hurd/x86_64/vm_param.h b/sysdeps/mach/hurd/x86_64/vm_param.h index 460445f49e..a6e63a3a1a 100644 --- a/sysdeps/mach/hurd/x86_64/vm_param.h +++ b/sysdeps/mach/hurd/x86_64/vm_param.h @@ -15,7 +15,7 @@ License along with the GNU C Library; if not, see . */ -#ifndef _X86_86_VM_PARAM_H +#ifndef _X86_64_VM_PARAM_H #define _X86_64_VM_PARAM_H /* Arbitrary start of the brk. This is after usual binary and library mappings. */