X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=ab684bb578783ab5ca6911e2cbd8d8fc42e37698;hb=0e6b5817fc99864e5a10d83db4c977acce70a681;hp=eae12d95b6231cd394e728dc494ac49808afcdfa;hpb=d993d0d4b15451a6412a1d59528790db0ff91f90;p=openwrt-10.03%2F.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index eae12d95b..ab684bb57 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,9 +10,63 @@ menuconfig TOOLCHAINOPTS
 	bool "Toolchain Options" if DEVEL
 	depends !NATIVE_TOOLCHAIN
 
+menuconfig EXTRA_TARGET_ARCH
+	bool
+	prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
+	default n
+	help
+	  Some builds may require a 'biarch' toolchain. This option
+	  allows you to specify an additional target arch.
+
+	  Most people will answer N here.
+
+	config EXTRA_TARGET_ARCH_NAME
+		string
+		prompt "Extra architecture name" if EXTRA_TARGET_ARCH
+		help
+		  Specify the cpu name (eg powerpc64 or x86_64) of the
+		  additional target architecture.
+
+	config EXTRA_TARGET_ARCH_OPTS
+		string
+		prompt "Extra architecture compiler options" if EXTRA_TARGET_ARCH
+		help
+		  If you're specifying an addition target architecture,
+		  you'll probably need to also provide options to make
+		  the compiler use this alternate arch.
+
+		  For example, if you're building a compiler that can build
+		  both powerpc and powerpc64 binaries, you'll need to
+		  specify -m64 here.
+
 source "toolchain/binutils/Config.in"
 source "toolchain/gcc/Config.in"
 
+choice
+	prompt "LIBC implementation" if TOOLCHAINOPTS
+	default USE_UCLIBC
+	help
+	  Select the LIBC implementation.
+
+	config USE_EGLIBC
+		bool "Use eglibc"
+		depends !avr32
+		select NO_STRIP
+	
+	config USE_GLIBC
+		bool "Use glibc"
+		depends !avr32
+		select NO_STRIP
+	
+	config USE_UCLIBC
+		bool "Use uClibc"
+
+endchoice
+
+source "toolchain/eglibc/Config.in"
+source "toolchain/glibc/Config.in"
+source "toolchain/uClibc/Config.in"
+
 config GDB
 	bool
 	prompt "Build gdb" if TOOLCHAINOPTS
@@ -27,18 +81,18 @@ config LARGEFILE
 	help
 		Enable large file (files > 2 GB) support
 
-config C99_MATH
+config SHADOW_PASSWORDS
 	bool
-	prompt "Enable full C99 math support?" if TOOLCHAINOPTS
-	default n
+	prompt "Enable shadow password support?" if TOOLCHAINOPTS
+	default y
 	help
-		Enable if you need full C99 math in libm
+		Enable shadow password support.
 
 config SOFT_FLOAT
 	bool
 	prompt "Use software floating point by default" if TOOLCHAINOPTS
 	default y
-	depends on arm || armeb || powerpc
+	depends on (arm || armeb || powerpc) && !HAS_FPU
 	help
 	  If your target CPU does not have a Floating Point Unit (FPU) or a
 	  kernel FPU emulator, but you still wish to support floating point
@@ -53,10 +107,42 @@ config TARGET_OPTIMIZATION
 	default "-O2 -pipe -march=i686 -funit-at-a-time" if TARGET_x86_mediacenter
 	default "-O2 -pipe -march=i486 -funit-at-a-time" if TARGET_x86
 	default "-Os -pipe -march=i486 -funit-at-a-time" if TARGET_rdc
+	default "-Os -pipe -march=i486 -funit-at-a-time" if TARGET_uml && i386
+	default "-Os -pipe -march=athlon64 -funit-at-a-time" if TARGET_uml && x86_64
+	default "-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time" if TARGET_ar71xx
 	default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if mipsel || mips
-	default "-Os -pipe -mabi=aapcs-linux -march=armv5te -mtune=xscale -funit-at-a-time" if armeb
+	default "-Os -pipe -march=armv5te -mtune=xscale -funit-at-a-time" if TARGET_ixp4xx || TARGET_iop32x || TARGET_pxa || TARGET_orion
+	default "-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time" if TARGET_storm
 	default "-Os -pipe -funit-at-a-time"
 	help
 	  Optimizations to use when building for the target host.
 
+config USE_UCLIBC
+	bool
+	default y if !TOOLCHAINOPTS
+
 source "toolchain/gcc/Config.version"
+
+source "toolchain/eglibc/Config.version"
+source "toolchain/glibc/Config.version"
+source "toolchain/uClibc/Config.version"
+
+config LIBC
+	string
+	default "eglibc"  if USE_EGLIBC
+	default "glibc"   if USE_GLIBC
+	default "uClibc"  if USE_UCLIBC
+
+config LIBC_VERSION
+	string
+	default EGLIBC_VERSION  if USE_EGLIBC
+	default GLIBC_VERSION   if USE_GLIBC
+	default UCLIBC_VERSION  if USE_UCLIBC
+
+config TARGET_SUFFIX
+	string
+	default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && EABI_SUPPORT
+	default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !EABI_SUPPORT
+	default "uclibcgnueabi"   if USE_UCLIBC && EABI_SUPPORT
+	default "uclibc"          if USE_UCLIBC && !EABI_SUPPORT
+