make libgcc static for busybox, make librt separate package, remove dependency to libtirpc, disable inetd, add preliminary multilib support (not working right now),enable 32/64 bit kernel support for x86_64

1 files changed, 109 insertions, 1 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index 8d4a7957f..32a254900 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -31,7 +31,10 @@ endchoice
 
 choice
 prompt "Target Kernel"
-depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG || ADK_TARGET_SYSTEM_QEMU_MIPS64
+depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG \
+	|| ADK_TARGET_SYSTEM_QEMU_MIPS64 \
+	|| ADK_LINUX_X86_64
+
 config ADK_TARGET_KERNEL64
 	boolean "64 Bit Kernel"
 
@@ -40,6 +43,15 @@ config ADK_TARGET_KERNEL32
 
 endchoice
 
+config ADK_32
+	boolean
+
+config ADK_64
+	boolean
+
+config ADK_x32
+	boolean
+
 config ADK_o32
 	boolean
 
@@ -73,6 +85,99 @@ config ADK_TARGET_ABI_N64
 
 endchoice
 
+choice
+prompt "Target ABI"
+depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64
+
+config ADK_TARGET_ABI_64
+	boolean "64 Bit ABI"
+	select ADK_64
+
+config ADK_TARGET_ABI_X32
+	boolean "x32 ABI (new)"
+	select ADK_x32
+
+config ADK_TARGET_ABI_32
+	boolean "32 Bit ABI"
+	select ADK_32
+
+endchoice
+
+# multilib support
+config ADK_TARGET_LIBC_PATH
+	string
+	default "lib32" if ADK_n32
+	default "lib64" if ADK_n64 \
+				|| ADK_64 || ADK_LINUX_SPARC64 \
+				|| ADK_LINUX_PPC64 \
+				|| ADK_LINUX_X86_64
+	default "libx32" if ADK_x32
+	default "lib"
+
+
+menu "Target multilib support"
+depends on ADK_TARGET_KERNEL64 && \
+	ADK_LINUX_X86_64 || \
+	ADK_LINUX_MIPS
+
+config ADK_TARGET_WITH_MULTILIB 
+	boolean "multilib support"
+
+config ADK_TARGET_MULTILIB_X86_64
+	boolean "64 bit libraries"
+	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
+	default y
+	
+config ADK_TARGET_MULTILIB_X86_32
+	boolean "32 bit libraries"
+	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
+
+config ADK_TARGET_MULTILIB_X86_X32
+	boolean "x32 bit libraries"
+	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
+
+choice
+prompt "Default Library (compile all applications with this library)"
+config ADK_TARGET_MULTILIB_X86_64_DEF
+	boolean "64 Bit libraries as default"
+	depends on ADK_TARGET_MULTILIB_X86_64
+
+config ADK_TARGET_MULTILIB_X86_32_DEF
+	boolean "32 Bit libraries as default"
+	depends on ADK_TARGET_MULTILIB_X86_32
+
+config ADK_TARGET_MULTILIB_X86_X32_DEF
+	boolean "x32 Bit libraries as default"
+	depends on ADK_TARGET_MULTILIB_X86_X32
+
+endchoice
+endmenu
+
+config ADK_MULTILIB_TARGET
+	string
+	default "m32" if ADK_TARGET_MULTILIB_X86_32 \
+			&& !ADK_TARGET_MULTILIB_X86_64 \
+			&& !ADK_TARGET_MULTILIB_X86_X32
+	default "m64" if !ADK_TARGET_MULTILIB_X86_32 \
+			&& ADK_TARGET_MULTILIB_X86_64 \
+			&& !ADK_TARGET_MULTILIB_X86_X32
+	default "x32" if !ADK_TARGET_MULTILIB_X86_32 \
+			&& !ADK_TARGET_MULTILIB_X86_64 \
+			&& ADK_TARGET_MULTILIB_X86_X32
+	default "m32,m64" if ADK_TARGET_MULTILIB_X86_32 \
+		 	&& ADK_TARGET_MULTILIB_X86_64 \
+			&& !ADK_TARGET_MULTILIB_X86_X32
+	default "mx32,m64" if !ADK_TARGET_MULTILIB_X86_32 \
+		 	&& ADK_TARGET_MULTILIB_X86_64 \
+			&& ADK_TARGET_MULTILIB_X86_X32
+	default "m32,mx32" if ADK_TARGET_MULTILIB_X86_32 \
+		 	&& !ADK_TARGET_MULTILIB_X86_64 \
+			&& ADK_TARGET_MULTILIB_X86_X32
+	default "m64,m32,mx32" if ADK_TARGET_MULTILIB_X86_32 \
+		 	&& ADK_TARGET_MULTILIB_X86_64 \
+			&& ADK_TARGET_MULTILIB_X86_X32
+	
+
 # submodel support
 #
 choice
@@ -375,6 +480,9 @@ config ADK_TARGET_ABI_CFLAGS
 	default "-mabi=32" if ADK_TARGET_ABI_O32
 	default "-mabi=n32 -Wl,-m -Wl,elf32ltsmipn32" if ADK_TARGET_ABI_N32
 	default "-mabi=64 -Wl,-m -Wl,elf64ltsmip" if ADK_TARGET_ABI_N64
+	default "-m32" if ADK_TARGET_ABI_32
+	default "-mx32" if ADK_TARGET_ABI_X32
+	default "-m64" if ADK_TARGET_ABI_64
 
 config ADK_TARGET_KERNEL_LDFLAGS
 	string