| 1 |
commit: f13d3a1eddd7c045dea5cc95e170f2f21c0a2c0e |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 25 21:34:07 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 1 17:32:25 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13d3a1e |
| 7 |
|
| 8 |
sys-libs/glibc: Drop SPARC CHOST mangling |
| 9 |
|
| 10 |
Somehow glibc-2.29 is also affected, even though it used to work. See |
| 11 |
commit 7daa03609079 for the changes to later versions. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-libs/glibc/glibc-2.29-r7.ebuild | 62 ++++--------------------------------- |
| 16 |
1 file changed, 6 insertions(+), 56 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/glibc/glibc-2.29-r7.ebuild b/sys-libs/glibc/glibc-2.29-r7.ebuild |
| 19 |
index b883c878e01..1ffe9800d1d 100644 |
| 20 |
--- a/sys-libs/glibc/glibc-2.29-r7.ebuild |
| 21 |
+++ b/sys-libs/glibc/glibc-2.29-r7.ebuild |
| 22 |
@@ -281,77 +281,27 @@ setup_target_flags() { |
| 23 |
filter-flags "-fcall-used-g7" |
| 24 |
append-flags "-fcall-used-g6" |
| 25 |
|
| 26 |
- # If the CHOST is the basic one (e.g. not sparcv9-xxx already), |
| 27 |
- # try to pick a better one so glibc can use cpu-specific .S files. |
| 28 |
- # We key off the CFLAGS to get a good value. Also need to handle |
| 29 |
- # version skew. |
| 30 |
- # We can't force users to set their CHOST to their exact machine |
| 31 |
- # as many of these are not recognized by config.sub/gcc and such :(. |
| 32 |
- # Note: If the mcpu values don't scale, we might try probing CPP defines. |
| 33 |
- # Note: Should we factor in -Wa,-AvXXX flags too ? Or -mvis/etc... ? |
| 34 |
- |
| 35 |
local cpu |
| 36 |
case ${CTARGET} in |
| 37 |
sparc64-*) |
| 38 |
+ cpu="sparc64" |
| 39 |
case $(get-flag mcpu) in |
| 40 |
- niagara[234]) |
| 41 |
- if ver_test -ge 2.8 ; then |
| 42 |
- cpu="sparc64v2" |
| 43 |
- elif ver_test -ge 2.4 ; then |
| 44 |
- cpu="sparc64v" |
| 45 |
- elif ver_test -ge 2.2.3 ; then |
| 46 |
- cpu="sparc64b" |
| 47 |
- fi |
| 48 |
- ;; |
| 49 |
- niagara) |
| 50 |
- if ver_test -ge 2.4 ; then |
| 51 |
- cpu="sparc64v" |
| 52 |
- elif ver_test -ge 2.2.3 ; then |
| 53 |
- cpu="sparc64b" |
| 54 |
- fi |
| 55 |
- ;; |
| 56 |
- ultrasparc3) |
| 57 |
- cpu="sparc64b" |
| 58 |
- ;; |
| 59 |
- *) |
| 60 |
+ v9) |
| 61 |
# We need to force at least v9a because the base build doesn't |
| 62 |
# work with just v9. |
| 63 |
# https://sourceware.org/bugzilla/show_bug.cgi?id=19477 |
| 64 |
- [[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a" |
| 65 |
+ append-flags "-Wa,-xarch=v9a" |
| 66 |
;; |
| 67 |
esac |
| 68 |
;; |
| 69 |
sparc-*) |
| 70 |
case $(get-flag mcpu) in |
| 71 |
- niagara[234]) |
| 72 |
- if ver_test -ge 2.8 ; then |
| 73 |
- cpu="sparcv9v2" |
| 74 |
- elif ver_test -ge 2.4 ; then |
| 75 |
- cpu="sparcv9v" |
| 76 |
- elif ver_test -ge 2.2.3 ; then |
| 77 |
- cpu="sparcv9b" |
| 78 |
- else |
| 79 |
- cpu="sparcv9" |
| 80 |
- fi |
| 81 |
- ;; |
| 82 |
- niagara) |
| 83 |
- if ver_test -ge 2.4 ; then |
| 84 |
- cpu="sparcv9v" |
| 85 |
- elif ver_test -ge 2.2.3 ; then |
| 86 |
- cpu="sparcv9b" |
| 87 |
- else |
| 88 |
- cpu="sparcv9" |
| 89 |
- fi |
| 90 |
- ;; |
| 91 |
- ultrasparc3) |
| 92 |
- cpu="sparcv9b" |
| 93 |
- ;; |
| 94 |
- v9|ultrasparc) |
| 95 |
- cpu="sparcv9" |
| 96 |
- ;; |
| 97 |
v8|supersparc|hypersparc|leon|leon3) |
| 98 |
cpu="sparcv8" |
| 99 |
;; |
| 100 |
+ *) |
| 101 |
+ cpu="sparcv9" |
| 102 |
+ ;; |
| 103 |
esac |
| 104 |
;; |
| 105 |
esac |
Archives