| 1 |
bluebird 08/06/22 13:57:43 |
| 2 |
|
| 3 |
Modified: multilib.eclass toolchain.eclass |
| 4 |
Log: |
| 5 |
add support for 32bit userland with multilib on sparc |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.67 eclass/multilib.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.67&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.67&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.66&r2=1.67 |
| 13 |
|
| 14 |
Index: multilib.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v |
| 17 |
retrieving revision 1.66 |
| 18 |
retrieving revision 1.67 |
| 19 |
diff -u -r1.66 -r1.67 |
| 20 |
--- multilib.eclass 1 Jun 2008 01:38:09 -0000 1.66 |
| 21 |
+++ multilib.eclass 22 Jun 2008 13:57:42 -0000 1.67 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.66 2008/06/01 01:38:09 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.67 2008/06/22 13:57:42 bluebird Exp $ |
| 27 |
|
| 28 |
# @ECLASS: multilib.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -621,8 +621,8 @@ |
| 31 |
export MULTILIB_ABIS="s390x s390" |
| 32 |
export DEFAULT_ABI="s390x" |
| 33 |
;; |
| 34 |
- sparc64*) |
| 35 |
- export CFLAGS_sparc32=${CFLAGS_sparc32--m32} |
| 36 |
+ sparc*) |
| 37 |
+ export CFLAGS_sparc32=${CFLAGS_sparc32} |
| 38 |
export CHOST_sparc32=${CTARGET/sparc64/sparc} |
| 39 |
export CTARGET_sparc32=${CHOST_sparc32} |
| 40 |
export CDEFINE_sparc32="!__arch64__" |
| 41 |
@@ -634,8 +634,8 @@ |
| 42 |
export CDEFINE_sparc64="__arch64__" |
| 43 |
export LIBDIR_sparc64="lib64" |
| 44 |
|
| 45 |
- export MULTILIB_ABIS="sparc64 sparc32" |
| 46 |
- export DEFAULT_ABI="sparc64" |
| 47 |
+ export MULTILIB_ABIS="${MULTILIB_ABIS-sparc64 sparc32}" |
| 48 |
+ export DEFAULT_ABI="${DEFAULT_ABI-sparc64}" |
| 49 |
;; |
| 50 |
*) |
| 51 |
export MULTILIB_ABIS="default" |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.357 eclass/toolchain.eclass |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.357&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.357&content-type=text/plain |
| 59 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.356&r2=1.357 |
| 60 |
|
| 61 |
Index: toolchain.eclass |
| 62 |
=================================================================== |
| 63 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
| 64 |
retrieving revision 1.356 |
| 65 |
retrieving revision 1.357 |
| 66 |
diff -u -r1.356 -r1.357 |
| 67 |
--- toolchain.eclass 9 Jun 2008 02:33:06 -0000 1.356 |
| 68 |
+++ toolchain.eclass 22 Jun 2008 13:57:42 -0000 1.357 |
| 69 |
@@ -1,6 +1,6 @@ |
| 70 |
# Copyright 1999-2008 Gentoo Foundation |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.356 2008/06/09 02:33:06 vapier Exp $ |
| 73 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.357 2008/06/22 13:57:42 bluebird Exp $ |
| 74 |
# |
| 75 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 76 |
|
| 77 |
@@ -1317,6 +1317,14 @@ |
| 78 |
fi |
| 79 |
[[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} --disable-libunwind-exceptions" |
| 80 |
|
| 81 |
+ # create a sparc*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch) |
| 82 |
+ if [[ ${CTARGET} == sparc*linux* ]] \ |
| 83 |
+ && is_multilib \ |
| 84 |
+ && [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] |
| 85 |
+ then |
| 86 |
+ confgcc="${confgcc} --enable-targets=all" |
| 87 |
+ fi |
| 88 |
+ |
| 89 |
tc_version_is_at_least 4.3 && set -- "$@" \ |
| 90 |
--with-bugurl=http://bugs.gentoo.org/ \ |
| 91 |
--with-pkgversion="${BRANDING_GCC_PKGVERSION}" |
| 92 |
@@ -2337,7 +2345,7 @@ |
| 93 |
is_multilib() { |
| 94 |
[[ ${GCCMAJOR} < 3 ]] && return 1 |
| 95 |
case ${CTARGET} in |
| 96 |
- mips64*|powerpc64*|s390x*|sparc64*|x86_64*) |
| 97 |
+ mips64*|powerpc64*|s390x*|sparc*|x86_64*) |
| 98 |
has_multilib_profile || use multilib ;; |
| 99 |
*) false ;; |
| 100 |
esac |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
-- |
| 105 |
gentoo-commits@l.g.o mailing list |
Archives