X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fc35f54386655faec7483c691ca12c00c226a813..74567f6936b558e723840a109e31d855844bd720:/toolchain/Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 1a465f5e5..0f67fc094 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -13,6 +13,7 @@ menuconfig TOOLCHAINOPTS
 menuconfig EXTRA_TARGET_ARCH
 	bool
 	prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
+	default y	if TARGET_ps3
 	default n
 	help
 	  Some builds may require a 'biarch' toolchain. This option
@@ -22,6 +23,7 @@ menuconfig EXTRA_TARGET_ARCH
 
 	config EXTRA_TARGET_ARCH_NAME
 		string
+		default "powerpc64"	if TARGET_ps3
 		prompt "Extra architecture name" if EXTRA_TARGET_ARCH
 		help
 		  Specify the cpu name (eg powerpc64 or x86_64) of the
@@ -29,6 +31,7 @@ menuconfig EXTRA_TARGET_ARCH
 
 	config EXTRA_TARGET_ARCH_OPTS
 		string
+		default "-m64"		if TARGET_ps3
 		prompt "Extra architecture compiler options" if EXTRA_TARGET_ARCH
 		help
 		  If you're specifying an addition target architecture,
@@ -41,6 +44,30 @@ menuconfig EXTRA_TARGET_ARCH
 
 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
+		select NO_STRIP
+	
+	config USE_GLIBC
+		bool "Use glibc"
+		depends !avr32
+		select NO_STRIP
+	
+	config USE_UCLIBC
+		bool "Use uClibc"
+
+endchoice
+
+source "toolchain/eglibc/Config.in"
+source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
 
 config GDB
@@ -80,15 +107,36 @@ config SOFT_FLOAT
 config TARGET_OPTIMIZATION
 	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 -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"
+	default DEFAULT_TARGET_OPTIMIZATION
 	help
 	  Optimizations to use when building for the target host.
 
+config USE_UCLIBC
+	bool
+	default y if !TOOLCHAINOPTS
+
 source "toolchain/gcc/Config.version"
+
+source "toolchain/eglibc/Config.version"
+source "toolchain/glibc/Config.version"
 source "toolchain/uClibc/Config.version"
+
+config LIBC
+	string
+	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
+