[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas K. Hüttel]

commit:     2233039b76561d014626c535123b8392177638bf
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 14 15:25:01 2025 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 14 18:49:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2233039b

toolchain{,-funcs}.eclass: Ensure hf/sf detection works for t64 CHOSTs

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

 eclass/toolchain-funcs.eclass | 2 +-
 eclass/toolchain.eclass       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 1f3f958badee..fa2820035cb7 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -292,7 +292,7 @@ tc-tuple-is-softfloat() {
                        echo "yes" ;;
                *-softfp-*)
                        echo "softfp" ;;
-               arm*-hardfloat-*|arm*eabihf)
+               arm*-hardfloat-*|arm*eabihf*)
                        echo "no" ;;
                # bare-metal targets have their defaults. bug #666896
                *-newlib|*-elf|*-eabi)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index bcbdd1305cfa..274789559d5e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1596,7 +1596,7 @@ toolchain_src_configure() {
                        # If they've explicitly opt-ed in, do hardfloat,
                        # otherwise let the gcc default kick in.
                        case ${CTARGET//_/-} in
-                               *-hardfloat-*|*eabihf)
+                               *-hardfloat-*|*eabihf*)
                                        confgcc+=( --with-float=hard )
                                ;;
                        esac