r3269 - jhalfs/trunk
manuel at linuxfromscratch.org
manuel at linuxfromscratch.org
Sat Dec 9 09:37:43 MST 2006
Author: manuel
Date: 2006-12-09 09:37:42 -0700 (Sat, 09 Dec 2006)
New Revision: 3269
Modified:
jhalfs/trunk/Config.in
Log:
CLFS* config settings clean-up.
Modified: jhalfs/trunk/Config.in
===================================================================
--- jhalfs/trunk/Config.in 2006-12-09 13:17:30 UTC (rev 3268)
+++ jhalfs/trunk/Config.in 2006-12-09 16:37:42 UTC (rev 3269)
@@ -111,32 +111,31 @@
choice
prompt "Library"
- depends (BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3 ) && !ARCH_HPPA
- default DATA_32 if !ARCH_ALPHA
- default DATA_64 if ARCH_ALPHA
+ depends (BOOK_CLFS && !ARCH_ALPHA) || (BOOK_CLFS3 && ARCH_MIPS)
+ default DATA_32
config DATA_32
- bool "32-bit" if !ARCH_ALPHA
+ bool "32-bit"
config DATA_64
- bool "64-bit" if !ARCH_PPC && !ARCH_ARM && !((BOOK_CLFS2 || BOOK_CLFS3) && ARCH_X86) || (BOOK_CLFS3 && ARCH_MIPS)
+ bool "64-bit" if !ARCH_PPC
config DATA_MULTI
- bool "multilib" if !ARCH_ALPHA && !ARCH_ARM && !((BOOK_CLFS2 || BOOK_CLFS3) && ARCH_X86) && !(BOOK_CLFS3 && ARCH_MIPS)
+ bool "multilib" if !(BOOK_CLFS3 && ARCH_MIPS)
endchoice
choice
prompt "Processor type"
- depends (BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3) && ((ARCH_X86 && DATA_32) || ARCH_MIPS || ARCH_HPPA)
+ depends (BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3) && ((ARCH_X86 && !(DATA_64 || DATA_MULTI)) || ARCH_MIPS || ARCH_HPPA)
config PROC_i486
- bool "486 Compatibles" if ARCH_X86 && DATA_32
+ bool "486 Compatibles" if ARCH_X86
config PROC_i586
- bool "Pentium, K6, 586 Compatibles" if ARCH_X86 && DATA_32
+ bool "Pentium, K6, 586 Compatibles" if ARCH_X86
config PROC_i686
- bool "Pentium II, Pentium III, Pentium 4, Athlon, Duron" if ARCH_X86 && DATA_32
+ bool "Pentium II, Pentium III, Pentium 4, Athlon, Duron" if ARCH_X86
config PROC_mipsel
bool "MIPS Little Endian" if ARCH_MIPS
@@ -156,98 +155,70 @@
config TARGET
string
- depends DATA_32 && BOOK_CLFS3
- default "i486-pc-linux-uclibc" if ARCH_X86 && PROC_i486
- default "i586-pc-linux-uclibc" if ARCH_X86 && PROC_i586
- default "i686-pc-linux-uclibc" if ARCH_X86 && PROC_i686
- default "mipsel-unknown-linux-uclibc" if ARCH_MIPS && PROC_mipsel
- default "mips-unknown-linux-uclibc" if ARCH_MIPS && PROC_mips
+ default "i486-pc-linux-gnu" if !BOOK_CLFS3 && PROC_i486
+ default "i586-pc-linux-gnu" if !BOOK_CLFS3 && PROC_i586
+ default "i686-pc-linux-gnu" if !BOOK_CLFS3 && PROC_i686
- config TARGET
- string
- depends DATA_64 && BOOK_CLFS3
- default "mips64el-unknown-linux-uclibc" if ARCH_MIPS && PROC_mipsel
- default "mips64-unknown-linux-uclibc" if ARCH_MIPS && PROC_mips
+ default "i486-pc-linux-uclibc" if BOOK_CLFS3 && PROC_i486
+ default "i586-pc-linux-uclibc" if BOOK_CLFS3 && PROC_i586
+ default "i686-pc-linux-uclibc" if BOOK_CLFS3 && PROC_i686
+ default "x86_64-unknown-linux-gnu" if ARCH_X86 && (DATA_64 || DATA_MULTI)
- config TARGET
- string
- depends DATA_32 && !BOOK_CLFS3
- default "i486-pc-linux-gnu" if ARCH_X86 && PROC_i486
- default "i586-pc-linux-gnu" if ARCH_X86 && PROC_i586
- default "i686-pc-linux-gnu" if ARCH_X86 && PROC_i686
- default "mipsel-unknown-linux-gnu" if ARCH_MIPS && PROC_mipsel
- default "mips-unknown-linux-gnu" if ARCH_MIPS && PROC_mips
- default "powerpc-unknown-linux-gnu" if ARCH_PPC
- default "sparc-unknown-linux-gnu" if ARCH_SPARC
- default "arm-unknown-linux-gnu" if ARCH_ARM
+ default "mipsel-unknown-linux-gnu" if !BOOK_CLFS3 && PROC_mipsel && DATA_32
+ default "mips-unknown-linux-gnu" if !BOOK_CLFS3 && PROC_mips && DATA_32
+ default "mips64el-unknown-linux-gnu" if !BOOK_CLFS3 && PROC_mipsel && (DATA_64 || DATA_MULTI)
+ default "mips64-unknown-linux-gnu" if !BOOK_CLFS3 && PROC_mips && (DATA_64 || DATA_MULTI)
- config TARGET
- string
- depends DATA_64 && !BOOK_CLFS3
- default "x86_64-unknown-linux-gnu" if ARCH_X86
- default "mips64el-unknown-linux-gnu" if ARCH_MIPS && PROC_mipsel
- default "mips64-unknown-linux-gnu" if ARCH_MIPS && PROC_mips
- default "sparc64-unknown-linux-gnu" if ARCH_SPARC
- default "alpha-unknown-linux-gnu" if ARCH_ALPHA
+ default "mipsel-unknown-linux-uclibc" if BOOK_CLFS3 && PROC_mipsel && DATA_32
+ default "mips-unknown-linux-uclibc" if BOOK_CLFS3 && PROC_mips && DATA-32
+ default "mips64el-unknown-linux-uclibc" if BOOK_CLFS3 && PROC_mipsel && DATA_64
+ default "mips64-unknown-linux-uclibc" if BOOK_CLFS3 && PROC_mips && DATA_64
- config TARGET
- string
- depends DATA_MULTI
- default "x86_64-unknown-linux-gnu" if ARCH_X86
- default "mips64el-unknown-linux-gnu" if ARCH_MIPS && PROC_mipsel
- default "mips64-unknown-linux-gnu" if ARCH_MIPS && PROC_mips
- default "sparc64-unknown-linux-gnu" if ARCH_SPARC
- default "powerpc64-unknown-linux-gnu" if ARCH_PPC
+ default "powerpc-unknown-linux-gnu" if ARCH_PPC && DATA_32
+ default "powerpc64-unknown-linux-gnu" if ARCH_PPC && DATA_MULTI
- config TARGET
- string
- depends ARCH_HPPA
- default "hppa-unknown-linux-gnu" if PROC_unknown
- default "hppa1.1-unknown-linux-gnu" if PROC_hppa1
- default "hppa2.0-unknown-linux-gnu" if PROC_hppa2
+ default "sparc-unknown-linux-gnu" if ARCH_SPARC && DATA_32
+ default "sparc64-unknown-linux-gnu" if ARCH_SPARC && (DATA_64 || DATA_MULTI)
+ default "hppa-unknown-linux-gnu" if PROC_unknown
+ default "hppa1.1-unknown-linux-gnu" if PROC_hppa1
+ default "hppa2.0-unknown-linux-gnu" if PROC_hppa2
+ default "arm-unknown-linux-gnu" if ARCH_ARM
+ default "alpha-unknown-linux-gnu" if ARCH_ALPHA
+
config TARGET32
string
depends DATA_MULTI
default "i686-pc-linux-gnu" if ARCH_X86
- default "mipsel-unknown-linux-gnu" if ARCH_MIPS && PROC_mipsel
- default "mips-unknown-linux-gnu" if ARCH_MIPS && PROC_mips
+ default "mipsel-unknown-linux-gnu" if PROC_mipsel
+ default "mips-unknown-linux-gnu" if PROC_mips
default "sparc-unknown-linux-gnu" if ARCH_SPARC
default "powerpc-unknown-linux-gnu" if ARCH_PPC
config ARCH
string
- depends DATA_32 || ARCH_HPPA
- default "x86" if ARCH_X86
- default "ppc" if ARCH_PPC
- default "mips" if ARCH_MIPS
- default "sparc" if ARCH_SPARC
- default "arm" if ARCH_ARM
- default "hppa" if ARCH_HPPA
+ depends BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
+ default "x86" if ARCH_X86 && (DATA_32 || BOOK_CLFS2 || BOOK_CLFS3)
+ default "x86_64" if ARCH_X86 && DATA_MULTI
+ default "x86_64-64" if ARCH_X86 && DATA_64
- config ARCH
- string
- depends DATA_64 && BOOK_CLFS3
- default "mips" if ARCH_MIPS
+ default "mips" if ARCH_MIPS && (DATA_32 || BOOK_CLFS3)
+ default "mips64" if ARCH_MIPS && DATA_MULTI
+ default "mips64-64" if ARCH_MIPS && DATA_64 && BOOK_CLFS
- config ARCH
- string
- depends DATA_64 && !BOOK_CLFS3
- default "x86_64-64" if ARCH_X86
- default "mips64-64" if ARCH_MIPS
- default "sparc64-64" if ARCH_SPARC
- default "alpha" if ARCH_ALPHA
+ default "ppc" if ARCH_PPC && DATA_32
+ default "ppc64" if ARCH_PPC && DATA_MULTI
- config ARCH
- string
- depends DATA_MULTI
- default "x86_64" if ARCH_X86
- default "mips64" if ARCH_MIPS
- default "sparc64" if ARCH_SPARC
- default "ppc64" if ARCH_PPC
+ default "sparc" if ARCH_SPARC && DATA_32
+ default "sparc64" if ARCH_SPARC && DATA_MULTI
+ default "sparc64-64" if ARCH_SPARC && DATA_64
+ default "alpha" if ARCH_ALPHA
+ default "arm" if ARCH_ARM
+ default "hppa" if ARCH_HPPA
+
config MIPS_LEVEL
string
depends BOOK_CLFS3 && ARCH_MIPS
More information about the alfs-log
mailing list