profiles: 23.0 mips: fix botched attempt at softfloat profiles

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

18 files changed, 12 insertions, 27 deletions

diff --git a/profiles/arch/mips/mipsel/o32_sf/eapi b/profiles/arch/mips/mipsel/o32_sf/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mipsel/o32_sf/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mipsel/o32_sf/make.defaults b/profiles/arch/mips/mipsel/o32_sf/make.defaults
deleted file mode 100644
index 361ceb95fb69..000000000000
--- a/profiles/arch/mips/mipsel/o32_sf/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="mipsel-softfloat-linux-gnu"
-CHOST_o32="mipsel-softfloat-linux-gnu"
-
diff --git a/profiles/arch/mips/mipsel/o32_sf/parent b/profiles/arch/mips/mipsel/o32_sf/parent
deleted file mode 100644
index 77e90486b02b..000000000000
--- a/profiles/arch/mips/mipsel/o32_sf/parent
+++ /dev/null
@@ -1 +0,0 @@
-../o32
diff --git a/profiles/arch/mips/o32_sf/eapi b/profiles/arch/mips/o32_sf/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/o32_sf/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/o32_sf/make.defaults b/profiles/arch/mips/o32_sf/make.defaults
deleted file mode 100644
index e0e257d8f843..000000000000
--- a/profiles/arch/mips/o32_sf/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="mips-softfloat-linux-gnu"
-CHOST_o32="mips-softfloat-linux-gnu"
diff --git a/profiles/arch/mips/o32_sf/parent b/profiles/arch/mips/o32_sf/parent
deleted file mode 100644
index 77e90486b02b..000000000000
--- a/profiles/arch/mips/o32_sf/parent
+++ /dev/null
@@ -1 +0,0 @@
-../o32
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32_sf/make.defaults b/profiles/default/linux/mips/23.0/mipsel/o32_sf/make.defaults
index e9cc91c33347..0c4e59c49cdb 100644
--- a/profiles/default/linux/mips/23.0/mipsel/o32_sf/make.defaults
+++ b/profiles/default/linux/mips/23.0/mipsel/o32_sf/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_o32="mipsel-softfloat-linux-gnu"
 CHOST_n32="mips64el-unknown-linux-gnuabin32"
 CHOST_n64="mips64el-unknown-linux-gnuabi64"
 
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32_sf/musl/make.defaults b/profiles/default/linux/mips/23.0/mipsel/o32_sf/musl/make.defaults
index a27d20f7e941..f75ee84c90e4 100644
--- a/profiles/default/linux/mips/23.0/mipsel/o32_sf/musl/make.defaults
+++ b/profiles/default/linux/mips/23.0/mipsel/o32_sf/musl/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="mipsel-unknown-linux-musl"
+CHOST="mipsel-softfloat-linux-musl"
 CHOST_o32="${CHOST}"
 LIBDIR_o32="lib"
 
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32_sf/parent b/profiles/default/linux/mips/23.0/mipsel/o32_sf/parent
index c0c59334a619..f4b62c6e996d 100644
--- a/profiles/default/linux/mips/23.0/mipsel/o32_sf/parent
+++ b/profiles/default/linux/mips/23.0/mipsel/o32_sf/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../arch/mips/mipsel/o32_sf
+../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/23.0/o32_sf/make.defaults b/profiles/default/linux/mips/23.0/o32_sf/make.defaults
index 0a835e38d25b..cce6b6f525ca 100644
--- a/profiles/default/linux/mips/23.0/o32_sf/make.defaults
+++ b/profiles/default/linux/mips/23.0/o32_sf/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST_o32="mips-unknown-linux-gnu"
+CHOST_o32="mips-softfloat-linux-gnu"
 CHOST_n32="mips64-unknown-linux-gnuabin32"
 CHOST_n64="mips64-unknown-linux-gnuabi64"
 
diff --git a/profiles/default/linux/mips/23.0/o32_sf/musl/make.defaults b/profiles/default/linux/mips/23.0/o32_sf/musl/make.defaults
index dd6d00ffcba1..ef9d236f048a 100644
--- a/profiles/default/linux/mips/23.0/o32_sf/musl/make.defaults
+++ b/profiles/default/linux/mips/23.0/o32_sf/musl/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="mips-unknown-linux-musl"
+CHOST="mips-softfloat-linux-musl"
 CHOST_o32="${CHOST}"
 LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/23.0/o32_sf/parent b/profiles/default/linux/mips/23.0/o32_sf/parent
index 9f00e17afa71..347406129648 100644
--- a/profiles/default/linux/mips/23.0/o32_sf/parent
+++ b/profiles/default/linux/mips/23.0/o32_sf/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../arch/mips/o32_sf
+../../../../../arch/mips/o32
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/make.defaults
index e9cc91c33347..0c4e59c49cdb 100644
--- a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/make.defaults
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_o32="mipsel-softfloat-linux-gnu"
 CHOST_n32="mips64el-unknown-linux-gnuabin32"
 CHOST_n64="mips64el-unknown-linux-gnuabi64"
 
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/musl/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/musl/make.defaults
index a27d20f7e941..f75ee84c90e4 100644
--- a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/musl/make.defaults
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/musl/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="mipsel-unknown-linux-musl"
+CHOST="mipsel-softfloat-linux-musl"
 CHOST_o32="${CHOST}"
 LIBDIR_o32="lib"
 
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/parent
index 56ec788c4c74..85db6caf16e5 100644
--- a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/parent
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32_sf/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../arch/mips/mipsel/o32_sf
+../../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/23.0/split-usr/o32_sf/make.defaults b/profiles/default/linux/mips/23.0/split-usr/o32_sf/make.defaults
index 0a835e38d25b..cce6b6f525ca 100644
--- a/profiles/default/linux/mips/23.0/split-usr/o32_sf/make.defaults
+++ b/profiles/default/linux/mips/23.0/split-usr/o32_sf/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST_o32="mips-unknown-linux-gnu"
+CHOST_o32="mips-softfloat-linux-gnu"
 CHOST_n32="mips64-unknown-linux-gnuabin32"
 CHOST_n64="mips64-unknown-linux-gnuabi64"
 
diff --git a/profiles/default/linux/mips/23.0/split-usr/o32_sf/musl/make.defaults b/profiles/default/linux/mips/23.0/split-usr/o32_sf/musl/make.defaults
index dd6d00ffcba1..ef9d236f048a 100644
--- a/profiles/default/linux/mips/23.0/split-usr/o32_sf/musl/make.defaults
+++ b/profiles/default/linux/mips/23.0/split-usr/o32_sf/musl/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="mips-unknown-linux-musl"
+CHOST="mips-softfloat-linux-musl"
 CHOST_o32="${CHOST}"
 LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/23.0/split-usr/o32_sf/parent b/profiles/default/linux/mips/23.0/split-usr/o32_sf/parent
index f1923711b079..6d4edaa24a38 100644
--- a/profiles/default/linux/mips/23.0/split-usr/o32_sf/parent
+++ b/profiles/default/linux/mips/23.0/split-usr/o32_sf/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../arch/mips/o32_sf
+../../../../../../arch/mips/o32