From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 714AC138334 for ; Wed, 25 Jul 2018 05:04:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5704E087B; Wed, 25 Jul 2018 05:03:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60540E07E0 for ; Wed, 25 Jul 2018 05:03:53 +0000 (UTC) Received: from pomiot (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 833C8340688; Wed, 25 Jul 2018 05:03:50 +0000 (UTC) Message-ID: <1532495026.891.0.camel@gentoo.org> Subject: Re: [gentoo-dev] [arm17] [PATCH] toolchain-funcs.eclass: Update tc-is-softfloat for new ARM triplets From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: James Le Cuirot Date: Wed, 25 Jul 2018 07:03:46 +0200 In-Reply-To: <20180724230928.30078-1-chewi@gentoo.org> References: <20180724230928.30078-1-chewi@gentoo.org> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-ICHwlsyKHmyYSNAltjzt" X-Mailer: Evolution 3.24.6 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 X-Archives-Salt: 1608da07-73f6-4428-aa64-a38cd3215205 X-Archives-Hash: 32e96ebe5a7866fc7306d8069ed83396 --=-ICHwlsyKHmyYSNAltjzt Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable W dniu =C5=9Bro, 25.07.2018 o godzinie 00=E2=88=B609=E2=80=89+0100, u=C5=BC= ytkownik James Le Cuirot napisa=C5=82: > The triplet will change from armv7a-hardfloat-linux-gnueabi to > armv7a-unknown-linux-gnueabihf or similar. The function already > treated the latter as hardfloat but ambiguous triplets such as > arm-unknown-linux-gnueabi will change from hardfloat to softfloat in > line with most everyone else. However, we will now check existing > toolchains to avoid breaking existing systems, if possible. > --- > eclass/toolchain-funcs.eclass | 39 ++++++++++++++++++++++++++++------- > 1 file changed, 32 insertions(+), 7 deletions(-) >=20 > diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclas= s > index cea8949b45d7..f484fffc2664 100644 > --- a/eclass/toolchain-funcs.eclass > +++ b/eclass/toolchain-funcs.eclass > @@ -204,13 +204,38 @@ tc-is-softfloat() { > bfin*|h8300*) > echo "only" ;; > *) > - if [[ ${CTARGET//_/-} =3D=3D *-softfloat-* ]] ; then > - echo "yes" > - elif [[ ${CTARGET//_/-} =3D=3D *-softfp-* ]] ; then > - echo "softfp" > - else > - echo "no" > - fi > + case ${CTARGET//_/-} in > + *-softfloat-*) > + echo "yes" ;; > + *-softfp-*) > + echo "softfp" ;; > + arm*) > + # arm-unknown-linux-gnueabi is ambiguous. We used to > + # treat it as hardfloat but we now treat it as > + # softfloat like most everyone else. However, we > + # check existing toolchains to avoid breaking > + # existing systems, if possible. > + if type -P ${CTARGET}-cpp >/dev/null; then > + if ${CTARGET}-cpp -E - <<< __ARM_PCS_VFP 2>/dev/null | grep -q __A= RM_PCS_VFP; then > + # Confusingly __SOFTFP__ is defined only > + # when -mfloat-abi is soft, not softfp. > + if ${CTARGET}-cpp -E - <<< __SOFTFP__ 2>/dev/null | grep -q __SOF= TFP__; then > + echo "softfp" Either the comment is confusing or you did it the other way around. > + else > + echo "yes" > + fi > + else > + echo "no" > + fi > + elif [[ ${CTARGET} =3D=3D *-hardfloat-* || ${CTARGET} =3D=3D *hf ]]= ; then > + echo "no" > + else > + echo "yes" > + fi > + ;; > + *) > + echo "no" ;; > + esac > ;; > esac > } --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-ICHwlsyKHmyYSNAltjzt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEbbsHzE8NrQbqCv5BsHoa6u+0Rk4FAltYBLJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDZE QkIwN0NDNEYwREFEMDZFQTBBRkU0MUIwN0ExQUVBRUZCNDQ2NEUACgkQsHoa6u+0 Rk6erQ//RV4huHWqxeR1tcbyEMFyTKeUXXCX6Ik/Kng7bXqCCOHAdOB8lP1IhYkp Nm9GqYtndXoY/KIeb2R6n6VXYjTW2KKLTtgepZrQrS5459jJCIP5lNLGMb2oAkkR /KN3h6zT3aX5HQE1AukYwWFm0XiYwEl0MoevWQqgfhKULUHrzcGPQOxb4w7iDGQZ BxynklkTkIG/Kj8/BPsUMbR+lp543A7yDQzXQSszJ6f18CV48tQlNkvDNLLDzMJh pkm0p9pS0XoVAXdb4QVuKfAe9VYol9eYXc2pEWyBNQPtvA+2Iy2DlrbSMKOGBjmC tIylSvt25OAdgIz4oY5jyz5Lam3MdH+GNpHmDwgXblcacY6ZZOgXworCCgbbP9yH aYxbQiHQXCLv58iJtDOW3A0ww8h/f0Q7A7yhZ5iqbzXpXZ/6ijc6LxrCNtEdAhEP Tqab7KC0Ce4cT8azgy2gURKaYcBy8+/JrLAOUrHd7IuDzeFY2FkLcGdKS4JR1lrs tr66zlnrchv489NG6xaay14vcyNsCrvMsm8OziTyuCuUO/AxOYihZef4YhxkJR2s s0oW1ybcuEyU3SpvfYXQCGJhgjiKwdWtWWvT3g43uVB01L3q6mrgDOErxK55sLWf oGzEE6m0ryCzRUzJHM+vSIZZczXNy2Kl4kjyy+OAypFS9WBlyMo= =HUZB -----END PGP SIGNATURE----- --=-ICHwlsyKHmyYSNAltjzt--