From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1481010-garchives=archives.gentoo.org@lists.gentoo.org>
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 A619E15800F
	for <garchives@archives.gentoo.org>; Fri, 27 Jan 2023 06:27:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A50F0E08DD;
	Fri, 27 Jan 2023 06:27:54 +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))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 3F6F2E08D3
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jan 2023 06:27:54 +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 2FE73341073
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jan 2023 06:27:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A7AA97D8
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jan 2023 06:27:51 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1674800790.5d1e75b4126ff6760ce5d2707591cd4ea7505edb.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/binutils/binutils-2.40.ebuild sys-devel/binutils/binutils-9999.ebuild
X-VCS-Directories: sys-devel/binutils/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 5d1e75b4126ff6760ce5d2707591cd4ea7505edb
X-VCS-Branch: master
Date: Fri, 27 Jan 2023 06:27:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d057a519-a474-4b8c-86a2-85b14cb6c55f
X-Archives-Hash: 037f19faeaae84e43ff05cfcea0ccf18

commit:     5d1e75b4126ff6760ce5d2707591cd4ea7505edb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 06:26:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 06:26:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1e75b4

sys-devel/binutils: filter -mindirect-branch w/ CET

Incompatible with CET.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/binutils/binutils-2.40.ebuild | 2 +-
 sys-devel/binutils/binutils-9999.ebuild | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-devel/binutils/binutils-2.40.ebuild b/sys-devel/binutils/binutils-2.40.ebuild
index 95fe27899736..0d5192d3560a 100644
--- a/sys-devel/binutils/binutils-2.40.ebuild
+++ b/sys-devel/binutils/binutils-2.40.ebuild
@@ -171,7 +171,7 @@ src_configure() {
 
 	# Keep things sane
 	strip-flags
-
+	use cet && filter-flags -mindirect-branch -mindirect-branch=*
 	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
 	local x

diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index eae71c276ce7..c8e0d5f94944 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -171,6 +171,8 @@ src_configure() {
 
 	# Keep things sane
 	strip-flags
+	use cet && filter-flags -mindirect-branch -mindirect-branch=*
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
 	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
 	# https://github.com/gentoo/gentoo/pull/28355