diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/toolchain-buildroot/Config.in | 3 | ||||
| -rw-r--r-- | toolchain/toolchain-external/Config.in | 4 | ||||
| -rw-r--r-- | toolchain/toolchain-external/toolchain-external.mk | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 0a96e757b4..e27a4a9960 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -67,6 +67,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_microblaze depends on BR2_USE_MMU depends on !BR2_PREFER_STATIC_LIB + depends on !BR2_powerpc_SPE select BR2_TOOLCHAIN_USES_GLIBC # our glibc.mk enables RPC support select BR2_TOOLCHAIN_HAS_NATIVE_RPC @@ -81,7 +82,7 @@ comment "(e)glibc only available with shared lib support" config BR2_TOOLCHAIN_BUILDROOT_MUSL bool "musl (experimental)" - depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_microblaze || \ + depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazebe || \ BR2_mips || BR2_mipsel || BR2_powerpc || BR2_x86_64 select BR2_TOOLCHAIN_USES_MUSL help diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 857f26dad1..f4a5ccf653 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -871,7 +871,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_12 config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS bool "Musl toolchain" depends on (BR2_arm && BR2_ARM_EABI) || (BR2_armeb && BR2_ARM_EABI) || \ - (BR2_i386 && !BR2_x86_i386) || BR2_microblaze || BR2_mips || \ + (BR2_i386 && !BR2_x86_i386) || BR2_microblazebe || BR2_mips || \ BR2_mipsel || (BR2_powerpc && BR2_powerpc_CLASSIC) || BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" select BR2_TOOLCHAIN_EXTERNAL_MUSL @@ -977,7 +977,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm default "armeb-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_armeb default "i486-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_i386 - default "microblaze-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_microblaze + default "microblaze-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_microblazebe default "mips-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mips && !BR2_SOFT_FLOAT) default "mips-sf-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mips && BR2_SOFT_FLOAT) default "mipsel-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mipsel && !BR2_SOFT_FLOAT) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 3f88188f7f..c73cc4ae4d 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -286,6 +286,7 @@ TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_LINARO_ARMHF else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2014_02),y) TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/14.02/components/toolchain/binaries/ TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2014.02_linux.tar.xz +TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_LINARO_ARMHF_SYMLINK else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB),y) TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/14.02/components/toolchain/binaries/ TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-armeb-linux-gnueabihf-4.8-2014.02_linux.tar.xz @@ -377,7 +378,7 @@ else ifeq ($(BR2_armeb),y) TOOLCHAIN_EXTERNAL_SOURCE = crossx86-armeb-linux-musleabi-1.0.0.tar.xz else ifeq ($(BR2_i386),y) TOOLCHAIN_EXTERNAL_SOURCE = crossx86-i486-linux-musl-1.0.0.tar.xz -else ifeq ($(BR2_microblaze),y) +else ifeq ($(BR2_microblazebe),y) TOOLCHAIN_EXTERNAL_SOURCE = crossx86-microblaze-linux-musl-1.0.0.tar.xz else ifeq ($(BR2_mips),y) ifeq ($(BR2_SOFT_FLOAT),y) |
