From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hall.aurel32.net (hall.aurel32.net [IPv6:2001:bc8:30d7:100::1]) by sourceware.org (Postfix) with ESMTPS id 99F0B3858D1E for ; Wed, 17 May 2023 20:15:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 99F0B3858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=aurel32.net Authentication-Results: sourceware.org; spf=none smtp.mailfrom=aurel32.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=aurel32.net ; s=202004.hall; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Subject:Cc:To:From:Content-Type:From:Reply-To:Subject:Content-ID: Content-Description:In-Reply-To:References:X-Debbugs-Cc; bh=MzwWSkdprYXVOo2Pds0J4V4zBPZQORZQwXK94hdQTvI=; b=gihCxcMhC9bg7TAb17LDdvHsR5 q7Iqia71D6Cjul+1XbtPYhWKa3pnWkRiryomgCIAa9aywYIUUKi49pOYmoGJrLM5GI5cWA2tciIX8 LuXXBkxwwzRFdtWEG9c+GL1wXH/auC74VusSS5/KdQq6juBdA+KAHgy3OKVyQHkyJCbHwfySF5LMS unL6Vd8Vw4ZSJ/BRzCSfFr5AsS5pKLQL6fs+QUjHcHqIhx88/bwRqyBttqUC52yrtP3x2y7qsCYPP MEY1W2zJCFga/j4cVyzc3vKeGHHOOB2FiiH4gXqndpJACdqKA5+BcWQjDx9+NFroY6YuWeHh+0Xox Tkow1N1g==; Received: from [2a01:e34:ec5d:a741:8a4c:7c4e:dc4c:1787] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pzNYD-00D5iQ-4j; Wed, 17 May 2023 22:15:09 +0200 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.96) (envelope-from ) id 1pzNYC-00CqhA-0G; Wed, 17 May 2023 22:15:08 +0200 From: Aurelien Jarno To: libc-stable@sourceware.org Cc: Joseph Myers Subject: [COMMITTED 2.37] Ignore MAP_VARIABLE in tst-mman-consts.py Date: Wed, 17 May 2023 22:15:03 +0200 Message-Id: <20230517201503.3062458-1-aurelien@aurel32.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: From: Joseph Myers Linux 6.2 removed the hppa compatibility MAP_VARIABLE define. That means that, whether or not we remove it in glibc, it needs to be ignored in tst-mman-consts.py (since this macro comparison infrastructure expects that new kernel header versions only add new macros, not remove old ones). Tested with build-many-glibcs.py for hppa-linux-gnu (Linux 6.2 headers). (cherry picked from commit 01e09ab0574758e0afff4333511866278ce7c84f) --- sysdeps/unix/sysv/linux/tst-mman-consts.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py index 0bba893064..92b78a877c 100644 --- a/sysdeps/unix/sysv/linux/tst-mman-consts.py +++ b/sysdeps/unix/sysv/linux/tst-mman-consts.py @@ -47,9 +47,12 @@ def main(): # MAP_ANON alias for MAP_ANONYMOUS. MAP_RENAME, MAP_AUTOGROW, # MAP_LOCAL and MAP_AUTORSRV are in the kernel header for # MIPS, marked as "not used by linux"; SPARC has MAP_INHERIT - # in the kernel header, but does not use it. + # in the kernel header, but does not use it. The kernel + # header for HPPA removed a define of MAP_VARIABLE to 0 in + # Linux 6.2. 'MAP_HUGE_[0-9].*|MAP_UNINITIALIZED|MAP_FAILED|MAP_ANON' - '|MAP_RENAME|MAP_AUTOGROW|MAP_LOCAL|MAP_AUTORSRV|MAP_INHERIT', + '|MAP_RENAME|MAP_AUTOGROW|MAP_LOCAL|MAP_AUTORSRV|MAP_INHERIT' + '|MAP_VARIABLE', linux_version_glibc > linux_version_headers, linux_version_headers > linux_version_glibc)) -- 2.39.2