X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9a319f4c479163ac7114c72c1e8c25697cb65e5e..c2f8669f74b182557d89aa77601b0fa383fc5f8b:/toolchain/Config.in?ds=sidebyside

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 3ff080136..75450327f 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,19 +1,96 @@
 #
-config NATIVE_TOOLCHAIN
+
+menuconfig EXTERNAL_TOOLCHAIN
 	bool
-	prompt "Use host's toolchain" if DEVEL && BROKEN
-	default n
+	prompt "Use external toolchain"  if DEVEL
 	help
-		If enabled, OpenWrt will compile using your existing toolchain instead of compiling one
+	  If enabled, OpenWrt will compile using an existing toolchain instead of compiling one
+
+	config NATIVE_TOOLCHAIN
+		bool
+		prompt "Use host's toolchain"  if DEVEL
+		depends EXTERNAL_TOOLCHAIN
+		select NO_STRIP
+		help
+		  If enabled, OpenWrt will compile using the native toolchain for your host instead of compiling one
+
+	config TARGET_NAME
+		string
+		prompt "Target name"  if DEVEL
+		depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "arm-unknown-linux-gnu"      if arm
+		default "armeb-unknown-linux-gnu"    if armeb
+		default "i486-unknown-linux-gnu"     if i386
+		default "mips-unknown-linux-gnu"     if mips
+		default "mipsel-unknown-linux-gnu"   if mipsel
+		default "powerpc-unknown-linux-gnu"  if powerpc
+		default "x86_64-unknown-linux-gnu"   if x86_64
+
+	config TOOLCHAIN_PREFIX
+		string
+		prompt "Toolchain prefix"  if DEVEL
+		depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "arm-unknown-linux-gnu-"      if arm
+		default "armeb-unknown-linux-gnu-"    if armeb
+		default "i486-unknown-linux-gnu-"     if i386
+		default "mips-unknown-linux-gnu-"     if mips
+		default "mipsel-unknown-linux-gnu-"   if mipsel
+		default "powerpc-unknown-linux-gnu-"  if powerpc
+		default "x86_64-unknown-linux-gnu-"   if x86_64
+
+	config TOOLCHAIN_ROOT
+		string
+		prompt "Toolchain root"  if DEVEL
+		depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "/opt/cross/arm-unknown-linux-gnu"      if arm
+		default "/opt/cross/armeb-unknown-linux-gnu"    if armeb
+		default "/opt/cross/i486-unknown-linux-gnu"     if i386
+		default "/opt/cross/mips-unknown-linux-gnu"     if mips
+		default "/opt/cross/mipsel-unknown-linux-gnu"   if mipsel
+		default "/opt/cross/powerpc-unknown-linux-gnu"  if powerpc
+		default "/opt/cross/x86_64-unknown-linux-gnu"   if x86_64
+
+	config TOOLCHAIN_BIN_PATH
+		string
+		prompt "Toolchain program path"  if DEVEL
+		depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "./usr/bin ./bin"
+		help
+		  Specify additional directories searched for toolchain binaries (override PATH)
+		  Use ./DIR for directories relative to the root above
+
+	config TOOLCHAIN_INC_PATH
+		string
+		prompt "Toolchain include path"  if DEVEL
+		depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "./usr/include ./include"
+		help
+		  Specify additional directories searched for header files (override CPPFLAGS)
+		  Use ./DIR for directories relative to the root above
+
+	config TOOLCHAIN_LIB_PATH
+		string
+		prompt "Toolchain library path"  if DEVEL
+		depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "./usr/lib ./lib"
+		help
+		  Specify additional directories searched for libraries (override LDFLAGS)
+		  Use ./DIR for directories relative to the root above
+
+config NEED_TOOLCHAIN
+	bool
+	depends DEVEL
+	default y if !EXTERNAL_TOOLCHAIN
 
 menuconfig TOOLCHAINOPTS
-	bool "Toolchain Options" if DEVEL
-	depends !NATIVE_TOOLCHAIN
+	bool "Toolchain Options"  if DEVEL
+	depends NEED_TOOLCHAIN
 
 menuconfig EXTRA_TARGET_ARCH
 	bool
 	prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
-	default y	if TARGET_ps3
+	depends !sparc
+	default y	if powerpc64
 	default n
 	help
 	  Some builds may require a 'biarch' toolchain. This option
@@ -23,7 +100,7 @@ menuconfig EXTRA_TARGET_ARCH
 
 	config EXTRA_TARGET_ARCH_NAME
 		string
-		default "powerpc64"	if TARGET_ps3
+		default "powerpc64"	if powerpc64
 		prompt "Extra architecture name" if EXTRA_TARGET_ARCH
 		help
 		  Specify the cpu name (eg powerpc64 or x86_64) of the
@@ -31,7 +108,7 @@ menuconfig EXTRA_TARGET_ARCH
 
 	config EXTRA_TARGET_ARCH_OPTS
 		string
-		default "-m64"		if TARGET_ps3
+		default "-m64"		if powerpc64
 		prompt "Extra architecture compiler options" if EXTRA_TARGET_ARCH
 		help
 		  If you're specifying an addition target architecture,
@@ -42,14 +119,24 @@ menuconfig EXTRA_TARGET_ARCH
 		  both powerpc and powerpc64 binaries, you'll need to
 		  specify -m64 here.
 
+comment "Binary tools"
+	depends TOOLCHAINOPTS
+
 source "toolchain/binutils/Config.in"
+
+comment "Compiler"
+	depends TOOLCHAINOPTS
+
 source "toolchain/gcc/Config.in"
 
+comment "C Library"
+	depends TOOLCHAINOPTS
+
 choice
-	prompt "LIBC implementation" if TOOLCHAINOPTS
+	prompt "C Library implementation" if TOOLCHAINOPTS
 	default USE_UCLIBC
 	help
-	  Select the LIBC implementation.
+	  Select the C library implementation.
 
 	config USE_EGLIBC
 		bool "Use eglibc"
@@ -68,6 +155,9 @@ source "toolchain/eglibc/Config.in"
 source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
 
+comment "Debuggers"
+	depends TOOLCHAINOPTS
+
 config GDB
 	bool
 	prompt "Build gdb" if TOOLCHAINOPTS
@@ -75,39 +165,13 @@ config GDB
 	help
 		Enable if you want to build the gdb
 
-config LARGEFILE
+config INSIGHT
 	bool
-	prompt "Enable large file (files > 2 GB) support?" if TOOLCHAINOPTS
-	default y
-	help
-		Enable large file (files > 2 GB) support
-
-config SHADOW_PASSWORDS
-	bool
-	prompt "Enable shadow password support?" if TOOLCHAINOPTS
-	default y
-	help
-		Enable shadow password support.
-
-config SOFT_FLOAT
-	bool
-	prompt "Use software floating point by default" if TOOLCHAINOPTS
-	default y
-	depends on (arm || armeb || powerpc || mipsel || mips) && !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
-	  functions, then everything will need to be compiled with soft floating
-	  point support (-msoft-float).
-
-	  Most people will answer N.
-
-config TARGET_OPTIMIZATION
-	string
-	prompt "Target Optimizations" if TOOLCHAINOPTS
-	default DEFAULT_TARGET_OPTIMIZATION
+	prompt "Build insight-gdb" if TOOLCHAINOPTS
+	select GDB
+	default n
 	help
-	  Optimizations to use when building for the target host.
+		Enable if you want to build insight-gdb
 
 config USE_UCLIBC
 	bool
@@ -133,8 +197,7 @@ config LIBC_VERSION
 
 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
-
+	default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && (arm || armeb)
+	default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !(arm || armeb)
+	default "uclibcgnueabi"   if USE_UCLIBC && (arm || armeb)
+	default "uclibc"          if USE_UCLIBC && !(arm || armeb)