| 1 |
vapier 10/10/28 04:16:27 |
| 2 |
|
| 3 |
Modified: toolchain-funcs.eclass |
| 4 |
Log: |
| 5 |
tc-arch: re-indent the ppc code and check the $type before KV_to_int to avoid useless calculations |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.103 eclass/toolchain-funcs.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.103&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.103&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?r1=1.102&r2=1.103 |
| 13 |
|
| 14 |
Index: toolchain-funcs.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v |
| 17 |
retrieving revision 1.102 |
| 18 |
retrieving revision 1.103 |
| 19 |
diff -u -r1.102 -r1.103 |
| 20 |
--- toolchain-funcs.eclass 11 Sep 2010 17:12:20 -0000 1.102 |
| 21 |
+++ toolchain-funcs.eclass 28 Oct 2010 04:16:27 -0000 1.103 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.102 2010/09/11 17:12:20 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.103 2010/10/28 04:16:27 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: toolchain-funcs.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -277,25 +277,25 @@ |
| 31 |
nios2*) echo nios2;; |
| 32 |
nios*) echo nios;; |
| 33 |
powerpc*) |
| 34 |
- # Starting with linux-2.6.15, the 'ppc' and 'ppc64' trees |
| 35 |
- # have been unified into simply 'powerpc', but until 2.6.16, |
| 36 |
- # ppc32 is still using ARCH="ppc" as default |
| 37 |
- if [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.16) ]] && [[ ${type} == "kern" ]] ; then |
| 38 |
- echo powerpc |
| 39 |
- elif [[ $(KV_to_int ${KV}) -eq $(KV_to_int 2.6.15) ]] && [[ ${type} == "kern" ]] ; then |
| 40 |
- if [[ ${host} == powerpc64* ]] || [[ ${PROFILE_ARCH} == "ppc64" ]] ; then |
| 41 |
- echo powerpc |
| 42 |
- else |
| 43 |
- echo ppc |
| 44 |
- fi |
| 45 |
- elif [[ ${host} == powerpc64* ]] ; then |
| 46 |
- echo ppc64 |
| 47 |
- elif [[ ${PROFILE_ARCH} == "ppc64" ]] ; then |
| 48 |
- ninj ppc64 ppc |
| 49 |
- else |
| 50 |
- echo ppc |
| 51 |
- fi |
| 52 |
- ;; |
| 53 |
+ # Starting with linux-2.6.15, the 'ppc' and 'ppc64' trees |
| 54 |
+ # have been unified into simply 'powerpc', but until 2.6.16, |
| 55 |
+ # ppc32 is still using ARCH="ppc" as default |
| 56 |
+ if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.16) ]] ; then |
| 57 |
+ echo powerpc |
| 58 |
+ elif [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -eq $(KV_to_int 2.6.15) ]] ; then |
| 59 |
+ if [[ ${host} == powerpc64* ]] || [[ ${PROFILE_ARCH} == "ppc64" ]] ; then |
| 60 |
+ echo powerpc |
| 61 |
+ else |
| 62 |
+ echo ppc |
| 63 |
+ fi |
| 64 |
+ elif [[ ${host} == powerpc64* ]] ; then |
| 65 |
+ echo ppc64 |
| 66 |
+ elif [[ ${PROFILE_ARCH} == "ppc64" ]] ; then |
| 67 |
+ ninj ppc64 ppc |
| 68 |
+ else |
| 69 |
+ echo ppc |
| 70 |
+ fi |
| 71 |
+ ;; |
| 72 |
s390*) echo s390;; |
| 73 |
sh64*) ninj sh64 sh;; |
| 74 |
sh*) echo sh;; |
Archives