* [Buildroot] [PATCH] toolchain-external: add support for musl toolchain on ARM EABIhf
@ 2015-10-09 9:14 Thomas Petazzoni
2015-12-20 22:10 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Petazzoni @ 2015-10-09 9:14 UTC (permalink / raw)
To: buildroot
Since a few releases, the pre-built musl external toolchain has added
an ARM EABIhf variant, built for ARMv5T. This commit allows this
additional external toolchain to be used.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/toolchain-external/Config.in | 10 +++++++---
toolchain/toolchain-external/toolchain-external.mk | 4 +++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 1bf97b8..a6ac2c9 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -820,7 +820,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64
config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS
bool "Musl 1.1.6 toolchain (experimental)"
- depends on (BR2_arm && BR2_ARM_EABI) || (BR2_armeb && BR2_ARM_EABI) || \
+ depends on (BR2_arm && BR2_ARM_EABI) || \
+ (BR2_arm && BR2_ARM_EABIHF && !BR2_ARM_CPU_ARMV4) || \
+ (BR2_armeb && BR2_ARM_EABI) || \
(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"
@@ -834,7 +836,8 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS
musl-cross project. It uses gcc 4.9.2, binutils 2.25 and
musl 1.1.6. It does not have a cross debugger included.
- The ARM toolchain is built for ARMv4t, soft-float.
+ The ARM soft-float toolchain is built for ARMv4t, while the
+ ARM hard-float toolchain is built for ARMv5t.
The x86 toolchain is built for i486.
http://musl.codu.org/
@@ -940,7 +943,8 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1 && BR2_BINFMT_FDPIC
default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1 && BR2_BINFMT_FLAT
default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1 && BR2_BINFMT_FDPIC
- default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm
+ default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABI
+ default "arm-linux-musleabihf" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABIHF
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_microblazebe
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 3fb165c..29ec24d 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -376,8 +376,10 @@ TOOLCHAIN_EXTERNAL_SOURCE = aarch64-2014.05-30-aarch64-linux-gnu-i686-pc-linux-g
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS),y)
TOOLCHAIN_EXTERNAL_VERSION = 1.1.6
TOOLCHAIN_EXTERNAL_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_VERSION)
-ifeq ($(BR2_arm),y)
+ifeq ($(BR2_arm)$(BR2_ARM_EABI),yy)
TOOLCHAIN_EXTERNAL_SOURCE = crossx86-arm-linux-musleabi-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz
+else ifeq ($(BR2_arm)$(BR2_ARM_EABIHF),yy)
+TOOLCHAIN_EXTERNAL_SOURCE = crossx86-arm-linux-musleabihf-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz
else ifeq ($(BR2_armeb),y)
TOOLCHAIN_EXTERNAL_SOURCE = crossx86-armeb-linux-musleabi-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz
else ifeq ($(BR2_i386),y)
--
2.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] toolchain-external: add support for musl toolchain on ARM EABIhf
2015-10-09 9:14 [Buildroot] [PATCH] toolchain-external: add support for musl toolchain on ARM EABIhf Thomas Petazzoni
@ 2015-12-20 22:10 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2015-12-20 22:10 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 9 Oct 2015 11:14:48 +0200, Thomas Petazzoni wrote:
> Since a few releases, the pre-built musl external toolchain has added
> an ARM EABIhf variant, built for ARMv5T. This commit allows this
> additional external toolchain to be used.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> toolchain/toolchain-external/Config.in | 10 +++++++---
> toolchain/toolchain-external/toolchain-external.mk | 4 +++-
> 2 files changed, 10 insertions(+), 4 deletions(-)
I've applied this patch, despite the lack of review, since it was quite
a trivial patch.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-20 22:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-09 9:14 [Buildroot] [PATCH] toolchain-external: add support for musl toolchain on ARM EABIhf Thomas Petazzoni
2015-12-20 22:10 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.