From 6775ccc5a199d574ad70b5f79ec58cce97a07c6f Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@smile.fr>
Date: Thu, 9 Jan 2025 00:05:21 +0100
Subject: [PATCH] arch/nios2: drop architecture

The nios2 architecture was deprecated in gcc-14 and has been removed
in the upcoming gcc-15 [1][2].

This commit removes nios2 from the architecture entry.

[1] https://sourceware.org/pipermail/binutils/2024-April/133675.html
[2] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=e876acab6cdd84bb2b32c98fc69fb0ba29c81153

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 Config.in            |  2 --
 Config.in.legacy     |  7 +++++++
 DEVELOPERS           |  1 -
 arch/Config.in       | 14 --------------
 arch/Config.in.nios2 | 14 --------------
 5 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 arch/Config.in.nios2

diff --git a/Config.in b/Config.in
index 28d34c8721..c0c1a6079d 100644
--- a/Config.in
+++ b/Config.in
@@ -808,8 +808,6 @@ config BR2_PIC_PIE_ARCH_SUPPORTS
 	default y
 	# Microblaze glibc toolchains don't work with PIC/PIE enabled
 	depends on !BR2_microblaze
-	# Nios2 toolchains produce non working binaries with -fPIC
-	depends on !BR2_nios2
 
 config BR2_PIC_PIE
 	bool "Build code with PIC/PIE"
diff --git a/Config.in.legacy b/Config.in.legacy
index 54c251be1f..e091fd8c0a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2025.02"
 
+config BR2_nios2
+	bool "nios2 architecture removed"
+	select BR2_LEGACY
+	help
+	  The nios2 architecture was removed, by lack of toolchain
+	  support.
+
 config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE
 	bool "Bootlin nios2 glibc bleeding-edge toolchain removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 9cc27025f8..2d8ae8289b 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -950,7 +950,6 @@ F:	package/tcf-agent/
 N:	Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 F:	board/ci20/
 F:	configs/ci20_defconfig
-F:	arch/Config.in.nios2
 F:	package/fio/
 F:	package/iptraf-ng/
 F:	package/jimtcl/
diff --git a/arch/Config.in b/arch/Config.in
index 6254cb6467..6b54c65df9 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -143,16 +143,6 @@ config BR2_mips64el
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
-config BR2_nios2
-	bool "Nios II"
-	depends on BR2_BROKEN
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-	select BR2_USE_MMU
-	help
-	  Nios II is a soft core processor from Altera Corporation.
-	  http://www.altera.com/
-	  http://en.wikipedia.org/wiki/Nios_II
-
 config BR2_or1k
 	bool "OpenRISC"
 	select BR2_USE_MMU
@@ -395,10 +385,6 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el
 source "arch/Config.in.mips"
 endif
 
-if BR2_nios2
-source "arch/Config.in.nios2"
-endif
-
 if BR2_or1k
 source "arch/Config.in.or1k"
 endif
diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2
deleted file mode 100644
index a5d7e66d40..0000000000
--- a/arch/Config.in.nios2
+++ /dev/null
@@ -1,14 +0,0 @@
-config BR2_ARCH
-	default "nios2"
-
-config BR2_NORMALIZED_ARCH
-	default "nios2"
-
-config BR2_ENDIAN
-	default "LITTLE"
-
-config BR2_READELF_ARCH_NAME
-	default "Altera Nios II"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-