diff options
-rw-r--r-- | Config.in | 2 | ||||
-rw-r--r-- | mk/build.mk | 2 | ||||
-rw-r--r-- | mk/kernel-ver.mk | 4 | ||||
-rw-r--r-- | target/arm/sys-available/toolchain-arm | 1 | ||||
-rw-r--r-- | target/arm/sys-available/toolchain-armeb | 1 | ||||
-rw-r--r-- | target/m68k/sys-available/toolchain-m68k | 1 | ||||
-rw-r--r-- | target/microblaze/sys-available/toolchain-microblaze | 1 | ||||
-rw-r--r-- | target/microblaze/sys-available/toolchain-microblazeel | 1 | ||||
-rw-r--r-- | target/mips/sys-available/toolchain-mips | 1 | ||||
-rw-r--r-- | target/mips/sys-available/toolchain-mipsel | 1 | ||||
-rw-r--r-- | target/ppc/sys-available/toolchain-ppc | 1 | ||||
-rw-r--r-- | target/ppc64/sys-available/toolchain-ppc64 | 1 | ||||
-rw-r--r-- | target/sh/sys-available/toolchain-sh | 1 | ||||
-rw-r--r-- | target/sparc/sys-available/toolchain-sparc | 1 | ||||
-rw-r--r-- | target/sparc64/sys-available/toolchain-sparc64 | 1 | ||||
-rw-r--r-- | target/x86/sys-available/toolchain-i686 | 1 | ||||
-rw-r--r-- | target/x86_64/sys-available/toolchain-x86_64 | 1 | ||||
-rw-r--r-- | toolchain/gcc/Makefile | 11 |
18 files changed, 29 insertions, 4 deletions
@@ -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 diff --git a/mk/build.mk b/mk/build.mk index 77b70a3f8..07fcbc793 100644 --- a/mk/build.mk +++ b/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; \ ( \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index ae4a99069..34c639a62 100644 --- a/mk/kernel-ver.mk +++ b/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 diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index ade935950..956acab7a 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/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). diff --git a/target/arm/sys-available/toolchain-armeb b/target/arm/sys-available/toolchain-armeb index 8a99ca78a..4756e0db2 100644 --- a/target/arm/sys-available/toolchain-armeb +++ b/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). diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/sys-available/toolchain-m68k index 4cfe403a7..0bc27683b 100644 --- a/target/m68k/sys-available/toolchain-m68k +++ b/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. diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/sys-available/toolchain-microblaze index 3e1c34436..6fb76c5f5 100644 --- a/target/microblaze/sys-available/toolchain-microblaze +++ b/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. diff --git a/target/microblaze/sys-available/toolchain-microblazeel b/target/microblaze/sys-available/toolchain-microblazeel index eb66d103f..8992e5550 100644 --- a/target/microblaze/sys-available/toolchain-microblazeel +++ b/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. diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips index 783d71fa0..9e93cfdcd 100644 --- a/target/mips/sys-available/toolchain-mips +++ b/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. diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel index 7eb9a743f..4c197b808 100644 --- a/target/mips/sys-available/toolchain-mipsel +++ b/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. diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc index 0faea45e5..340834f16 100644 --- a/target/ppc/sys-available/toolchain-ppc +++ b/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. diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64 index 3574e863c..5a38c89f0 100644 --- a/target/ppc64/sys-available/toolchain-ppc64 +++ b/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. diff --git a/target/sh/sys-available/toolchain-sh b/target/sh/sys-available/toolchain-sh index 33fdfa446..8fb17a472 100644 --- a/target/sh/sys-available/toolchain-sh +++ b/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). diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc index 5d1a6c044..e668592e2 100644 --- a/target/sparc/sys-available/toolchain-sparc +++ b/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. diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64 index 060cc62dd..15eaca575 100644 --- a/target/sparc64/sys-available/toolchain-sparc64 +++ b/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. diff --git a/target/x86/sys-available/toolchain-i686 b/target/x86/sys-available/toolchain-i686 index e4c02a0e5..bec515fca 100644 --- a/target/x86/sys-available/toolchain-i686 +++ b/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). diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64 index 0c175da69..fd1025270 100644 --- a/target/x86_64/sys-available/toolchain-x86_64 +++ b/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. diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index fb027c8c3..c547591a0 100644 --- a/toolchain/gcc/Makefile +++ b/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 |