Gentoo Archives: gentoo-commits

From: Jason Donenfeld <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/crossdev:master commit in: /
Date: Thu, 27 Sep 2018 23:44:08
Message-Id: 1538091446.d30e5756540a0590ae9dd81fdc1bbf75accf9ded.zx2c4@gentoo
1 commit: d30e5756540a0590ae9dd81fdc1bbf75accf9ded
2 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 27 23:37:26 2018 +0000
4 Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 27 23:37:26 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=d30e5756
7
8 crossdev: mips64 is sometimes called mipsisa64
9
10 This is the case for tuples like `mipsisa64r6-pc-linux-gnu`, which are
11 required for making a working mips64r6 compiler.
12
13 Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
14
15 crossdev | 12 ++++++------
16 1 file changed, 6 insertions(+), 6 deletions(-)
17
18 diff --git a/crossdev b/crossdev
19 index b8027a3..997b0a1 100755
20 --- a/crossdev
21 +++ b/crossdev
22 @@ -280,13 +280,13 @@ parse_target() {
23 LPKG="newlib";;
24 ppu*) TARCH=ppc64;;
25
26 - mips64*-gnuabin32)
27 + mips64*-gnuabin32|mipsisa64*-gnuabin32)
28 [[ ${MULTILIB_ABIS} == "default" ]] && MULTILIB_ABIS="n32";;
29 - mips64*-gnuabi64|\
30 - mips64*-gnuabin64)
31 + mips64*-gnuabi64|mipsisa64*-gnuabi64|\
32 + mips64*-gnuabin64|mipsisa64*-gnuabin64)
33 [[ ${MULTILIB_ABIS} == "default" ]] && MULTILIB_ABIS="n64";;
34 - mips64*-gnuabi32|\
35 - mips64*-gnuabio32)
36 + mips64*-gnuabi32|mipsisa64*-gnuabi32|\
37 + mips64*-gnuabio32|mipsisa64*-gnuabio32)
38 [[ ${MULTILIB_ABIS} == "default" ]] && MULTILIB_ABIS="o32";;
39 ee*) TARCH=mips;
40 KPKG="[none]"
41 @@ -351,7 +351,7 @@ parse_target() {
42 # glibc targets
43 *-gnu*)
44 case ${CTARGET} in
45 - mips64*)
46 + mips64*|mipsisa64*)
47 # has some support code, fails to build
48 ;;
49 x86_64*|i?86*|arm*|aarch64*|powerpc*)