Browse Source

use newer kernel for toolchain building, fix some problems with ppc and m68k toolchains

Waldemar Brodkorb 10 years ago
parent
commit
229b3477b7

+ 1 - 1
Config.in

@@ -97,7 +97,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.11.10"
+	prompt "3.12.6"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 

+ 1 - 1
mk/build.mk

@@ -544,7 +544,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
 # build all target architecture and libc combinations (toolchain only)
 bulktoolchain:
-	for libc in uclibc eglibc glibc;do \
+	for libc in uclibc eglibc glibc musl;do \
 		while read arch; do \
 		    mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \
 		    ( \

+ 2 - 2
mk/kernel-ver.mk

@@ -1,8 +1,8 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.11.10
+KERNEL_VERSION:=	3.12.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
+KERNEL_MD5SUM:=		ab2fcc368e20d804e77970196154fb9e
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_12_6),y)
 KERNEL_VERSION:=	3.12.6

+ 1 - 0
target/arm/sys-available/toolchain-arm

@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	select ADK_TOOLCHAIN
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  ARM toolchain (little endian).
 

+ 1 - 0
target/arm/sys-available/toolchain-armeb

@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB
 	select ADK_TOOLCHAIN
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  ARM toolchain (big endian).
 

+ 1 - 0
target/m68k/sys-available/toolchain-m68k

@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K
 	select ADK_m68k
 	select ADK_toolchain_m68k
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a m68k toolchain.
 

+ 1 - 0
target/microblaze/sys-available/toolchain-microblaze

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE
 	select ADK_big
 	select ADK_toolchain_microblaze
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Microblaze toolchain.
 

+ 1 - 0
target/microblaze/sys-available/toolchain-microblazeel

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZEEL
 	select ADK_little
 	select ADK_toolchain_microblazeel
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Microblaze toolchain.
 

+ 1 - 0
target/mips/sys-available/toolchain-mips

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
 	select ADK_big
 	select ADK_toolchain_mips
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  MIPS toolchain.
 

+ 1 - 0
target/mips/sys-available/toolchain-mipsel

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL
 	select ADK_little
 	select ADK_toolchain_mipsel
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  MIPS toolchain.
 

+ 1 - 0
target/ppc/sys-available/toolchain-ppc

@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC
 	select ADK_ppc
 	select ADK_toolchain_ppc
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a ppc toolchain.
 

+ 1 - 0
target/ppc64/sys-available/toolchain-ppc64

@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
 	select ADK_ppc64
 	select ADK_toolchain_ppc64
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a ppc64 toolchain.
 

+ 1 - 0
target/sh/sys-available/toolchain-sh

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH
 	select ADK_toolchain_sh
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a superh toolchain (sh4).
 

+ 1 - 0
target/sparc/sys-available/toolchain-sparc

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC
 	select ADK_toolchain_sparc
 	select ADK_CPU_SPARC_V8
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a sparc toolchain.
 

+ 1 - 0
target/sparc64/sys-available/toolchain-sparc64

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
 	select ADK_toolchain_sparc64
 	select ADK_CPU_SPARC_V9
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a sparc64 toolchain.
 

+ 1 - 0
target/x86/sys-available/toolchain-i686

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86
 	select ADK_toolchain_x86
 	select ADK_CPU_I686
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a x86 toolchain (i686 optimized).
 

+ 1 - 0
target/x86_64/sys-available/toolchain-x86_64

@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
 	select ADK_x86_64
 	select ADK_toolchain_x86_64
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a x86_64 toolchain.
 

+ 11 - 0
toolchain/gcc/Makefile

@@ -26,6 +26,7 @@ GCC_CONFOPTS=		--prefix=$(STAGING_HOST_DIR) \
 			--disable-cloog-version-check \
 			--without-ppl \
 			--without-cloog \
+			--without-isl \
 			--disable-nls
 
 ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y)
@@ -61,13 +62,21 @@ GCC_CONFOPTS+=		--disable-lto
 endif
 
 ifeq ($(ARCH),m68k)
+ifeq ($(ADK_TARGET_LIBC),uclibc)
 GCC_CONFOPTS+=		--disable-tls
 else
 GCC_CONFOPTS+=		--enable-tls
 endif
+else
+GCC_CONFOPTS+=		--enable-tls
+endif
 
 ifeq ($(ARCH),powerpc)
+ifeq ($(ADK_TARGET_LIBC),uclibc)
+GCC_CONFOPTS+=		--disable-target-optspace --with-long-double-128 --enable-secureplt
+else
 GCC_CONFOPTS+=		--disable-target-optspace --with-long-double-64 --enable-secureplt
+endif
 else
 GCC_CONFOPTS+=		--enable-target-optspace
 endif
@@ -196,6 +205,8 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	@-test -d $(STAGING_TARGET_DIR)/lib64 && \
 		cd $(STAGING_TARGET_DIR)/lib64 && \
 		ln -sf libstdc++.so.6.0.17 libstdc++.so
+	# cleanup unneeded docs
+	rm -rf $(STAGING_HOST_DIR)/share
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk