[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass toolchain.eclass

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass toolchain.eclass

[Friedrich Oslage (bluebird)]

bluebird    08/06/22 13:57:43

  Modified:             multilib.eclass toolchain.eclass
  Log:
  add support for 32bit userland with multilib on sparc

Revision  Changes    Path
1.67                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.66&r2=1.67

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- multilib.eclass	1 Jun 2008 01:38:09 -0000	1.66
+++ multilib.eclass	22 Jun 2008 13:57:42 -0000	1.67
@@ -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/multilib.eclass,v 1.66 2008/06/01 01:38:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.67 2008/06/22 13:57:42 bluebird Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -621,8 +621,8 @@
 			export MULTILIB_ABIS="s390x s390"
 			export DEFAULT_ABI="s390x"
 		;;
-		sparc64*)
-			export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
+		sparc*)
+			export CFLAGS_sparc32=${CFLAGS_sparc32}
 			export CHOST_sparc32=${CTARGET/sparc64/sparc}
 			export CTARGET_sparc32=${CHOST_sparc32}
 			export CDEFINE_sparc32="!__arch64__"
@@ -634,8 +634,8 @@
 			export CDEFINE_sparc64="__arch64__"
 			export LIBDIR_sparc64="lib64"
 
-			export MULTILIB_ABIS="sparc64 sparc32"
-			export DEFAULT_ABI="sparc64"
+			export MULTILIB_ABIS="${MULTILIB_ABIS-sparc64 sparc32}"
+			export DEFAULT_ABI="${DEFAULT_ABI-sparc64}"
 		;;
 		*)
 			export MULTILIB_ABIS="default"



1.357                eclass/toolchain.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.357&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.357&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.356&r2=1.357

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- toolchain.eclass	9 Jun 2008 02:33:06 -0000	1.356
+++ toolchain.eclass	22 Jun 2008 13:57:42 -0000	1.357
@@ -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.356 2008/06/09 02:33:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.357 2008/06/22 13:57:42 bluebird Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -1317,6 +1317,14 @@
 	fi
 	[[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} --disable-libunwind-exceptions"
 
+	# create a sparc*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch)
+	if [[ ${CTARGET} == sparc*linux* ]] \
+		&& is_multilib \
+		&& [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]]
+	then
+		confgcc="${confgcc} --enable-targets=all"
+	fi
+
 	tc_version_is_at_least 4.3 && set -- "$@" \
 		--with-bugurl=http://bugs.gentoo.org/ \
 		--with-pkgversion="${BRANDING_GCC_PKGVERSION}"
@@ -2337,7 +2345,7 @@
 is_multilib() {
 	[[ ${GCCMAJOR} < 3 ]] && return 1
 	case ${CTARGET} in
-		mips64*|powerpc64*|s390x*|sparc64*|x86_64*)
+		mips64*|powerpc64*|s390x*|sparc*|x86_64*)
 			has_multilib_profile || use multilib ;;
 		*)	false ;;
 	esac



-- 
gentoo-commits@lists.gentoo.org mailing list