From 32f288e61fee8528931bcd55bf106cf0cfb4e2a1 Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Sun, 5 Jan 2025 17:25:58 +1300
Subject: [PATCH] bpf: Use released binutils/gcc

When the bpf-unknown-none sample was added the target support was not in
a released version of binutils or gcc. The support has been in a few
versions of each of these for a while now. Update the sample to use
released versions instead of potentially unstable versions from
upstream.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 config/arch/bpf.in                        | 4 ++--
 packages/binutils/package.desc            | 2 +-
 samples/bpf-unknown-none/crosstool.config | 7 -------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/config/arch/bpf.in b/config/arch/bpf.in
index 9d0d7373..75cae2af 100644
--- a/config/arch/bpf.in
+++ b/config/arch/bpf.in
@@ -3,7 +3,7 @@
 ## no-package
 ## select ARCH_SUPPORTS_EITHER_ENDIAN
 ## select ARCH_DEFAULT_LE
-## select GCC_VERY_NEW
-## select BINUTILS_VERY_NEW
+## select GCC_REQUIRE_12_or_later
+## select BINUTILS_REQUIRE_2_41_or_later
 ##
 ## help The BPF architecture.
diff --git a/packages/binutils/package.desc b/packages/binutils/package.desc
index 259ce6c7..0b9b1ac1 100644
--- a/packages/binutils/package.desc
+++ b/packages/binutils/package.desc
@@ -2,6 +2,6 @@ repository='git git://sourceware.org/git/binutils-gdb.git'
 mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)'
 relevantpattern='*.*|.'
 origin='GNU'
-milestones='2.26 2.27 2.30 2.39'
+milestones='2.26 2.27 2.30 2.39 2.41'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'
 signature_format='packed/.sig'
diff --git a/samples/bpf-unknown-none/crosstool.config b/samples/bpf-unknown-none/crosstool.config
index 383f75d6..be71b235 100644
--- a/samples/bpf-unknown-none/crosstool.config
+++ b/samples/bpf-unknown-none/crosstool.config
@@ -1,11 +1,4 @@
 CT_CONFIG_VERSION="4"
 CT_ARCH_BPF=y
-CT_MULTILIB=n
-CT_TARGET_VENDOR="unknown"
-CT_TARGET_SYS=none
 CT_TARGET_ALIAS="bpf-unknown"
-CT_GCC_SRC_DEVEL=y
-CT_GCC_DEVEL_BRANCH="master"
-CT_BINUTILS_SRC_DEVEL=y
-CT_BINUTILS_DEVEL_BRANCH="master"
 CT_LIBC_NONE=y