commit: f13d3a1eddd7c045dea5cc95e170f2f21c0a2c0e Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Mar 25 21:34:07 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Apr 1 17:32:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13d3a1e
sys-libs/glibc: Drop SPARC CHOST mangling
Somehow glibc-2.29 is also affected, even though it used to work. See
commit 7daa03609079 for the changes to later versions.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-libs/glibc/glibc-2.29-r7.ebuild | 62 ++++---------------------------------
1 file changed, 6 insertions(+), 56 deletions(-)
diff --git a/sys-libs/glibc/glibc-2.29-r7.ebuild
b/sys-libs/glibc/glibc-2.29-r7.ebuild
index b883c878e01..1ffe9800d1d 100644
--- a/sys-libs/glibc/glibc-2.29-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r7.ebuild
@@ -281,77 +281,27 @@ setup_target_flags() {
filter-flags "-fcall-used-g7"
append-flags "-fcall-used-g6"
- # If the CHOST is the basic one (e.g. not sparcv9-xxx
already),
- # try to pick a better one so glibc can use
cpu-specific .S files.
- # We key off the CFLAGS to get a good value. Also need
to handle
- # version skew.
- # We can't force users to set their CHOST to their
exact machine
- # as many of these are not recognized by config.sub/gcc
and such :(.
- # Note: If the mcpu values don't scale, we might try
probing CPP defines.
- # Note: Should we factor in -Wa,-AvXXX flags too ? Or
-mvis/etc... ?
-
local cpu
case ${CTARGET} in
sparc64-*)
+ cpu="sparc64"
case $(get-flag mcpu) in
- niagara[234])
- if ver_test -ge 2.8 ; then
- cpu="sparc64v2"
- elif ver_test -ge 2.4 ; then
- cpu="sparc64v"
- elif ver_test -ge 2.2.3 ; then
- cpu="sparc64b"
- fi
- ;;
- niagara)
- if ver_test -ge 2.4 ; then
- cpu="sparc64v"
- elif ver_test -ge 2.2.3 ; then
- cpu="sparc64b"
- fi
- ;;
- ultrasparc3)
- cpu="sparc64b"
- ;;
- *)
+ v9)
# We need to force at least v9a because
the base build doesn't
# work with just v9.
#
https://sourceware.org/bugzilla/show_bug.cgi?id=19477
- [[ -z ${cpu} ]] && append-flags
"-Wa,-xarch=v9a"
+ append-flags "-Wa,-xarch=v9a"
;;
esac
;;
sparc-*)
case $(get-flag mcpu) in
- niagara[234])
- if ver_test -ge 2.8 ; then
- cpu="sparcv9v2"
- elif ver_test -ge 2.4 ; then
- cpu="sparcv9v"
- elif ver_test -ge 2.2.3 ; then
- cpu="sparcv9b"
- else
- cpu="sparcv9"
- fi
- ;;
- niagara)
- if ver_test -ge 2.4 ; then
- cpu="sparcv9v"
- elif ver_test -ge 2.2.3 ; then
- cpu="sparcv9b"
- else
- cpu="sparcv9"
- fi
- ;;
- ultrasparc3)
- cpu="sparcv9b"
- ;;
- v9|ultrasparc)
- cpu="sparcv9"
- ;;
v8|supersparc|hypersparc|leon|leon3)
cpu="sparcv8"
;;
+ *)
+ cpu="sparcv9"
+ ;;
esac
;;
esac
