From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1J9rys-0005BE-09 for garchives@archives.gentoo.org; Wed, 02 Jan 2008 01:01:14 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id m02117d4029840; Wed, 2 Jan 2008 01:01:07 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id m02116di029835 for ; Wed, 2 Jan 2008 01:01:06 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id AFB10651C7 for ; Wed, 2 Jan 2008 01:01:05 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1J9ryi-0008Nf-Fk for gentoo-commits@lists.gentoo.org; Wed, 02 Jan 2008 01:01:04 +0000 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-funcs.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: toolchain-funcs.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Mike Frysinger Date: Wed, 02 Jan 2008 01:01:04 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: 0c22a141-59a5-4094-bba4-3f3f3fe6a1fc X-Archives-Hash: 158aafcd6b6bd9058d024b15bac75026 vapier 08/01/02 01:01:04 Modified: toolchain-funcs.eclass Log: handle linux-2.6.24+ where {i386,x86_64}=>{x86} Revision Changes Path 1.75 eclass/toolchain-funcs.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.75&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.75&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?r1=1.74&r2=1.75 Index: toolchain-funcs.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- toolchain-funcs.eclass 17 Aug 2007 10:14:13 -0000 1.74 +++ toolchain-funcs.eclass 2 Jan 2008 01:01:03 -0000 1.75 @@ -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 @@ 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 @@ || 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 -- gentoo-commits@gentoo.org mailing list