X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=b5258ddce9892efd68d4b77ec4b9ea42dcc16b82;hb=8afb23270d23db6a033ba8fb77e1cf1a1d925a7c;hp=7ceb7942eb84c5e40402df26852615fd2bb86e01;hpb=2050e6db84ba6d178300838956bfcfde9e974d36;p=openwrt-10.03%2F.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 7ceb7942e..b5258ddce 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,33 +1,45 @@
 #
+config NATIVE_TOOLCHAIN
+	bool
+	prompt "Use host's toolchain" if DEVEL && BROKEN
+	default n
+	help
+		If enabled, OpenWrt will compile using your existing toolchain instead of compiling one
 
-menu "Toolchain Options"
-
+menuconfig TOOLCHAINOPTS
+	bool "Toolchain Options" if DEVEL
+	depends !NATIVE_TOOLCHAIN
 
-source "toolchain/uClibc/Config.in"
 source "toolchain/binutils/Config.in"
 source "toolchain/gcc/Config.in"
-source "toolchain/ccache/Config.in"
 
+config GDB
+	bool
+	prompt "Build gdb" if TOOLCHAINOPTS
+	default n
+	help
+		Enable if you want to build the gdb
 
-comment "Common Toolchain Options"
-
-config BR2_ENABLE_MULTILIB
-	bool "Enable multilib support?"
+config ENABLE_MULTILIB
+	bool
+	prompt "Enable multilib support?" if TOOLCHAINOPTS
 	default n
 	help
 	    If you want multilib enabled, enable this...
 
-config BR2_LARGEFILE
-	bool "Enable large file (files > 2 GB) support?"
-	depends on !BR2_cris
+config LARGEFILE
+	bool
+	prompt "Enable large file (files > 2 GB) support?" if TOOLCHAINOPTS
+	depends on !cris
 	default y
 	help
 	    Enable large file (files > 2 GB) support
 
-config BR2_SOFT_FLOAT
-	bool "Use software floating point by default"
+config SOFT_FLOAT
+	bool
+	prompt "Use software floating point by default" if TOOLCHAINOPTS
 	default n
-	depends on BR2_arm || BR2_mips || BR2_powerpc
+	depends on arm || mips || powerpc
 	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
@@ -36,21 +48,14 @@ config BR2_SOFT_FLOAT
 
 	  Most people will answer N.
 
-config BR2_TARGET_OPTIMIZATION
-	string "Target Optimizations"
-	default "-Os -pipe -mips2"
+config TARGET_OPTIMIZATION
+	string
+	prompt "Target Optimizations" if TOOLCHAINOPTS
+	default "-Os -pipe -march=i486 -funit-at-a-time" if i386
+	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"
 	help
 	  Optimizations to use when building for the target host.
 
-# Might be worth experimenting with for gcc 3.4.x.
-#GCC_WITH_CPU:=
-#GCC_WITH_ARCH:=
-#GCC_WITH_TUNE:=
-
-#GCC_WITH_CPU:=--with-cpu=
-#GCC_WITH_ARCH:=--with-arch=
-#GCC_WITH_TUNE:=--with-tune=
-
-
-endmenu
-
+source "toolchain/gcc/Config.version"