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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59ABD158064 for ; Mon, 6 May 2024 05:28:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 956FB2BC013; Mon, 6 May 2024 05:28:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 709992BC013 for ; Mon, 6 May 2024 05:28:43 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B406343115 for ; Mon, 6 May 2024 05:28:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D02A01779 for ; Mon, 6 May 2024 05:28:40 +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: <1714973301.2db1831deae8eadfb7e92d13cb2540c6916b1155.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.39-r5.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2db1831deae8eadfb7e92d13cb2540c6916b1155 X-VCS-Branch: master Date: Mon, 6 May 2024 05:28:40 +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: a96b4d25-9569-438e-b5b9-17edbc68894b X-Archives-Hash: f56360b8070e1dbfbd88f4715e53da2c commit: 2db1831deae8eadfb7e92d13cb2540c6916b1155 Author: Sam James gentoo org> AuthorDate: Mon May 6 05:27:34 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 6 05:28:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db1831d sys-libs/glibc: allow -O3 After 0fdf4ba48ccce5abf567340b0ab8fa8ed8a9bc6e, 5a2cf833f5772d6c37c7adac388dd9af9cc1c4b9, and ded2e0753e9c46debeb2e0d26c5e560d2581d314 upstream, glibc builds fine with -O3 on amd64. Allow that too. Signed-off-by: Sam James gentoo.org> sys-libs/glibc/glibc-2.39-r5.ebuild | 11 ++++++++--- sys-libs/glibc/glibc-9999.ebuild | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys-libs/glibc/glibc-2.39-r5.ebuild b/sys-libs/glibc/glibc-2.39-r5.ebuild index 26b5a207975e..8d816148ab46 100644 --- a/sys-libs/glibc/glibc-2.39-r5.ebuild +++ b/sys-libs/glibc/glibc-2.39-r5.ebuild @@ -447,9 +447,14 @@ setup_flags() { # relating to failed builds, we strip most CFLAGS out to ensure as few # problems as possible. strip-flags - # Lock glibc at -O2; we want to be conservative here. - filter-flags '-O?' - append-flags -O2 + + # Allow -O2 and -O3, but nothing else for now. + # TODO: Test -Os, -Oz. + if ! is-flagq '-O@(2|3)' ; then + # Lock glibc at -O2. We want to be conservative here. + filter-flags '-O?' + append-flags -O2 + fi fi strip-unsupported-flags diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 3a053a9de724..0cbc0a06f45e 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -447,9 +447,14 @@ setup_flags() { # relating to failed builds, we strip most CFLAGS out to ensure as few # problems as possible. strip-flags - # Lock glibc at -O2; we want to be conservative here. - filter-flags '-O?' - append-flags -O2 + + # Allow -O2 and -O3, but nothing else for now. + # TODO: Test -Os, -Oz. + if ! is-flagq '-O@(2|3)' ; then + # Lock glibc at -O2. We want to be conservative here. + filter-flags '-O?' + append-flags -O2 + fi fi strip-unsupported-flags