From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21F401580FD for ; Sun, 22 Dec 2024 06:28:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6700FE0821; Sun, 22 Dec 2024 06:28:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7D34E0821 for ; Sun, 22 Dec 2024 06:28:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CF5333C1EB for ; Sun, 22 Dec 2024 06:28:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19F64AF5 for ; Sun, 22 Dec 2024 06:28:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1734848858.b7e66ce8cfb6bcfbcfd392b364cc49e963aecb4d.sam@gentoo> Subject: [gentoo-commits] proj/toolchain/glibc-patches:master commit in: 9999/ X-VCS-Repository: proj/toolchain/glibc-patches X-VCS-Files: 9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch X-VCS-Directories: 9999/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b7e66ce8cfb6bcfbcfd392b364cc49e963aecb4d X-VCS-Branch: master Date: Sun, 22 Dec 2024 06:28:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3228c7e6-da83-4f8a-a19c-5631bf883e8c X-Archives-Hash: 615dd19a916e44ea0b0bcd4d269df881 commit: b7e66ce8cfb6bcfbcfd392b364cc49e963aecb4d Author: Sam James gentoo org> AuthorDate: Sun Dec 22 06:27:38 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 22 06:27:38 2024 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=b7e66ce8 9999: trivial rebase for 0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch See upstream commit fe925cb04585dd1cfca4094b255b3390bc56f770. Signed-off-by: Sam James gentoo.org> ...0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch b/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch index 9b03cfd..15d4bab 100644 --- a/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch +++ b/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch @@ -1,4 +1,4 @@ -From 6f5c946863eb63605ccf7388eebebc63cc3523d2 Mon Sep 17 00:00:00 2001 +From 848cc4f87354309e6298112270622f1456eed862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 14 Dec 2018 20:43:04 +0100 Subject: [PATCH 3/9] Force -O0 in conform tests to survive $CC changes @@ -22,7 +22,7 @@ Signed-off-by: Andreas K. Hüttel 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/conform/conformtest.py b/conform/conformtest.py -index 124860da01..8b1643a097 100644 +index d38afb06a8..c0df540ee8 100644 --- a/conform/conformtest.py +++ b/conform/conformtest.py @@ -566,7 +566,7 @@ class HeaderTests(object): @@ -38,7 +38,7 @@ index 124860da01..8b1643a097 100644 out_file = os.path.join(self.temp_dir, 'namespace-out') with open(c_file, 'w') as c_file_out: c_file_out.write('#include <%s>\n' % self.header) -- cmd = ('%s %s -E %s -P -Wp,-dN > %s' +- cmd = ('%s %s -E %s -P -Wp,-dD > %s' + # -O0 to negate effect of possible -O passed to $CC + # See https://bugs.gentoo.org/659030#c6 + cmd = ('%s -O0 %s -E %s -P -Wp,-dN > %s' @@ -46,7 +46,7 @@ index 124860da01..8b1643a097 100644 subprocess.check_call(cmd, shell=True) bad_tokens = set() diff --git a/conform/linknamespace.py b/conform/linknamespace.py -index 983bba1bd2..b6fce8a21c 100644 +index 8bc42bee22..2f8842456b 100644 --- a/conform/linknamespace.py +++ b/conform/linknamespace.py @@ -157,7 +157,9 @@ def main(): @@ -60,6 +60,7 @@ index 983bba1bd2..b6fce8a21c 100644 c_syms = glibcconform.list_exported_functions(compiler, args.standard, args.header) with tempfile.TemporaryDirectory() as temp_dir: + -- -2.41.0 +2.47.1