X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=df4ad84358aab6a8cd78e8f2d55111d1b5298676;hb=de9bb2b998efe9acdbab173fb391e23bc1688eaf;hp=64e4372b111db7767829403f1c19d20e748de5e8;hpb=91c42459f5ef87731628fe1f57fca3d50ee6ab5e;p=librecmc%2Flibrecmc.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 64e4372b11..df4ad84358 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,9 +10,64 @@ 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 y	if powerpc64
+	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
+		default "powerpc64"	if powerpc64
+		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
+		default "-m64"		if powerpc64
+		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
+	
+	config USE_GLIBC
+		bool "Use glibc"
+		depends !avr32
+	
+	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
@@ -20,43 +75,40 @@ 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 C99_MATH
-	bool
-	prompt "Enable full C99 math support?" if TOOLCHAINOPTS
+	prompt "Build insight-gdb" if TOOLCHAINOPTS
+	select GDB
 	default n
 	help
-		Enable if you need full C99 math in libm
+		Enable if you want to build insight-gdb
 
-config SOFT_FLOAT
+config USE_UCLIBC
 	bool
-	prompt "Use software floating point by default" if TOOLCHAINOPTS
-	default y
-	depends on arm || armeb || 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
-	  functions, then everything will need to be compiled with soft floating
-	  point support (-msoft-float).
+	default y if !TOOLCHAINOPTS
+
+source "toolchain/gcc/Config.version"
 
-	  Most people will answer N.
+source "toolchain/eglibc/Config.version"
+source "toolchain/glibc/Config.version"
+source "toolchain/uClibc/Config.version"
 
-config TARGET_OPTIMIZATION
+config LIBC
 	string
-	prompt "Target Optimizations" if TOOLCHAINOPTS
-	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 -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 || arm
-	default "-Os -pipe -funit-at-a-time"
-	help
-	  Optimizations to use when building for the target host.
+	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
 
-source "toolchain/gcc/Config.version"