From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8zGN-0002PG-AQ for garchives@archives.gentoo.org; Sun, 10 Apr 2011 18:21:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DBAD1C020; Sun, 10 Apr 2011 18:21:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1F5561C020 for ; Sun, 10 Apr 2011 18:21:23 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 534981B401E for ; Sun, 10 Apr 2011 18:21:22 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id E6DCD20054; Sun, 10 Apr 2011 18:21:20 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: toolchain.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20110410182120.E6DCD20054@flycatcher.gentoo.org> Date: Sun, 10 Apr 2011 18:21:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2113849b4ee55c071352e322a87cf6c8 vapier 11/04/10 18:21:20 Modified: toolchain.eclass Log: drop unused GCC_TARGET_NO_MULTILIB logic, and keep all multilib logic f= lowing via is_multilib. change this latter function to only run on top o= f USE=3Dmultilib rather than tracking random CTARGETS as this is much mor= e friendly to cross-compiling (especially now that crossdev takes care of= multilib setup for toolchains). Revision Changes Path 1.458 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.458&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.458&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?r1=3D1.457&r2=3D1.458 Index: toolchain.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.457 retrieving revision 1.458 diff -u -r1.457 -r1.458 --- toolchain.eclass 10 Apr 2011 16:54:17 -0000 1.457 +++ toolchain.eclass 10 Apr 2011 18:21:20 -0000 1.458 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.457 2011/= 04/10 16:54:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.458 2011/= 04/10 18:21:20 vapier Exp $ # # Maintainer: Toolchain Ninjas =20 @@ -91,11 +91,9 @@ if [[ ${ETYPE} =3D=3D "gcc-library" ]] ; then GCC_VAR_TYPE=3D${GCC_VAR_TYPE:-non-versioned} GCC_LIB_COMPAT_ONLY=3D${GCC_LIB_COMPAT_ONLY:-true} - GCC_TARGET_NO_MULTILIB=3D${GCC_TARGET_NO_MULTILIB:-true} else GCC_VAR_TYPE=3D${GCC_VAR_TYPE:-versioned} GCC_LIB_COMPAT_ONLY=3D"false" - GCC_TARGET_NO_MULTILIB=3D${GCC_TARGET_NO_MULTILIB:-false} fi =20 PREFIX=3D${TOOLCHAIN_PREFIX:-/usr} @@ -699,7 +697,7 @@ echo "ROOTPATH=3D\"${BINPATH}\"" >> ${gcc_envd_file} echo "GCC_PATH=3D\"${BINPATH}\"" >> ${gcc_envd_file} =20 - if use multilib && ! has_multilib_profile; then + if is_multilib ; then LDPATH=3D"${LIBPATH}" for path in 32 64 ; do [[ -d ${LIBPATH}/${path} ]] && LDPATH=3D"${LDPATH}:${LIBPATH}/${path}= " @@ -813,7 +811,7 @@ # Setup variables which would normally be in the profile if is_crosscompile ; then multilib_env ${CTARGET} - if ! use multilib ; then + if ! is_multilib ; then MULTILIB_ABIS=3D${DEFAULT_ABI} fi fi @@ -1120,17 +1118,17 @@ } =20 gcc-library-configure() { - # multilib support - [[ ${GCC_TARGET_NO_MULTILIB} =3D=3D "true" ]] \ - && confgcc=3D"${confgcc} --disable-multilib" \ - || confgcc=3D"${confgcc} --enable-multilib" + if is_multilib ; then + confgcc=3D"${confgcc} --enable-multilib" + else + confgcc=3D"${confgcc} --disable-multilib" + fi } =20 gcc-compiler-configure() { - # multilib support if is_multilib ; then confgcc=3D"${confgcc} --enable-multilib" - elif [[ ${CTARGET} =3D=3D *-linux* ]] ; then + else confgcc=3D"${confgcc} --disable-multilib" fi =20 @@ -1290,9 +1288,6 @@ # CBUILD # Enable building for a target that differs from CHOST # -# GCC_TARGET_NO_MULTILIB -# Disable multilib. Useful when building single library targets. -# # GCC_LANG # Enable support for ${GCC_LANG} languages. defaults to just "c" # @@ -2471,13 +2466,7 @@ =20 is_multilib() { [[ ${GCCMAJOR} < 3 ]] && return 1 - case ${CTARGET} in - mips64*|powerpc64*|s390x*|sparc*|x86_64*) - has_multilib_profile || use multilib ;; - *-*-solaris*|*-apple-darwin*|*-mint*) - use multilib ;; - *) false ;; - esac + use multilib } =20 is_cxx() {