X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/aa7be8c16488bbdd079d402a6f15f81bc575c2f7..09b96811e8ca8ad48fc6604f55690978158d0596:/toolchain/Config.in?ds=inline

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 192818f94..3cd2ed254 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,6 +10,35 @@ 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"
@@ -39,7 +68,7 @@ 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
@@ -54,8 +83,10 @@ 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 -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 -march=armv5te -mtune=xscale -funit-at-a-time" if armeb || arm
+	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.