diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-01-02 01:01:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-01-02 01:01:03 +0000 |
| commit | 70503d5738266c3eaf6c1b735b100dcb31adb5a8 (patch) | |
| tree | fc09f763ca7c509ddc7a441619c68077a2f22dc7 /eclass/toolchain-funcs.eclass | |
| parent | Add a patch from Ryan Hill <dirtyepic@gentoo.org> to allow building with gcc ... (diff) | |
| download | gentoo-2-70503d5738266c3eaf6c1b735b100dcb31adb5a8.tar.gz gentoo-2-70503d5738266c3eaf6c1b735b100dcb31adb5a8.tar.bz2 gentoo-2-70503d5738266c3eaf6c1b735b100dcb31adb5a8.zip | |
handle linux-2.6.24+ where {i386,x86_64}=>{x86}
Diffstat (limited to 'eclass/toolchain-funcs.eclass')
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index aaf82c9dbef2..46b338ee8c26 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.74 2007/08/17 10:14:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.75 2008/01/02 01:01:03 vapier Exp $ # @ECLASS: toolchain-funcs.eclass # @MAINTAINER: @@ -170,7 +170,15 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } bfin*) ninj blackfin bfin;; cris*) echo cris;; hppa*) ninj parisc hppa;; - i?86*) ninj i386 x86;; + i?86*) + # Starting with linux-2.6.24, the 'x86_64' and 'i386' + # trees have been unified into 'x86'. + if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -lt $(KV_to_int 2.6.24) ]] ; then + echo i386 + else + echo x86 + fi + ;; ia64*) echo ia64;; m68*) echo m68k;; mips*) echo mips;; @@ -205,7 +213,15 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } || echo sparc ;; vax*) echo vax;; - x86_64*) ninj x86_64 amd64;; + x86_64*) + # Starting with linux-2.6.24, the 'x86_64' and 'i386' + # trees have been unified into 'x86'. + if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.24) ]] ; then + echo x86 + else + ninj x86_64 amd64 + fi + ;; # since our usage of tc-arch is largely concerned with # normalizing inputs for testing ${CTARGET}, let's filter |