X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=35dbba152ccb5712ba6178d59f8d2586ff7afb52;hb=546b5ed544503182a9b3e981bc11feebd6042b21;hp=32dc33e277ee7ef80217318e6cb73216d627d381;hpb=2a9a890be378dd3822b41cf97007f60be3f52c70;p=openwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 32dc33e277..35dbba152c 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,8 +10,38 @@ 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"
+source "toolchain/uClibc/Config.in"
 
 config GDB
 	bool
@@ -20,26 +50,25 @@ config GDB
 	help
 		Enable if you want to build the gdb
 
-config ENABLE_MULTILIB
+config LARGEFILE
 	bool
-	prompt "Enable multilib support?" if TOOLCHAINOPTS
-	default n
+	prompt "Enable large file (files > 2 GB) support?" if TOOLCHAINOPTS
+	default y
 	help
-	    If you want multilib enabled, enable this...
+		Enable large file (files > 2 GB) support
 
-config LARGEFILE
+config SHADOW_PASSWORDS
 	bool
-	prompt "Enable large file (files > 2 GB) support?" if TOOLCHAINOPTS
-	depends on !cris
+	prompt "Enable shadow password support?" if TOOLCHAINOPTS
 	default y
 	help
-	    Enable large file (files > 2 GB) support
+		Enable shadow password support.
 
 config SOFT_FLOAT
 	bool
 	prompt "Use software floating point by default" if TOOLCHAINOPTS
-	default n
-	depends on arm || mips || powerpc
+	default y
+	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
@@ -51,12 +80,16 @@ config SOFT_FLOAT
 config TARGET_OPTIMIZATION
 	string
 	prompt "Target Optimizations" if TOOLCHAINOPTS
-	default "-Os -pipe -march=i486 -funit-at-a-time" if i386
+	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 -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 -mcpu=xscale -funit-at-a-time" if armeb
-	default "-Os -pipe -funit-at-a-time -mcpu=405" if LINUX_2_6_MAGICBOX
+	default "-Os -pipe -march=armv5te -mtune=xscale -funit-at-a-time" if TARGET_ixp4xx || TARGET_iop32x || TARGET_pxa || TARGET_orion
+	default "-Os -pipe -march=armv4t -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.
 
 source "toolchain/gcc/Config.version"
+source "toolchain/uClibc/Config.version"