toolchain-buildroot: allow to build ppc64(le) musl toolchains

Latest musl release supports ppc64 architecture (both big endian and
little endian), so this commit adds support for this.

Since musl implements the ELFv2 ABI for both big-endian and
little-endian PowerPC64, we have to force using this ABI on PowerPC64
big endian (normally elfv1 is the default).

Also, only gcc 6.x has the necessary changes to support musl on PowerPC
64, so we restrict the gcc version selection accordingly.

Tested with Qemu for big endian and little endian configurations.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
[Thomas: add comment about the ABI flag in gcc.mk, rework commit log.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 2b54959d0ea3d97464a33fd28ccc11239036c639..4d029315185ded538158bdc8e2ab3f61c3158af1 100644 (file)
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -30,6 +30,8 @@ choice
                depends on !BR2_x86_jaguar && !BR2_x86_steamroller
                # Unsupported for MIPS R6
                depends on !BR2_mips_32r6 && !BR2_mips_64r6
+               # musl ppc64 unsupported
+               depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL
                select BR2_GCC_NEEDS_MPC
                select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
 
@@ -46,6 +48,8 @@ choice
                depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X)
                # Unsupported for MIPS R6
                depends on !BR2_mips_32r6 && !BR2_mips_64r6
+               # musl ppc64 unsupported
+               depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL
                select BR2_GCC_NEEDS_MPC
                select BR2_GCC_SUPPORTS_GRAPHITE
                select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@@ -66,6 +70,8 @@ choice
                depends on !BR2_cortex_a17
                # Unsupported for MIPS R6
                depends on !BR2_mips_32r6 && !BR2_mips_64r6
+               # musl ppc64 unsupported
+               depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL
                # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
                select BR2_GCC_NEEDS_MPC
                select BR2_GCC_SUPPORTS_GRAPHITE
@@ -75,6 +81,8 @@ choice
                bool "gcc 5.x"
                # Broken or unsupported architectures
                depends on !BR2_arc && !BR2_bfin
+               # musl ppc64 unsupported
+               depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL
                select BR2_GCC_NEEDS_MPC
                select BR2_GCC_SUPPORTS_GRAPHITE
                select BR2_TOOLCHAIN_GCC_AT_LEAST_5

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 032015c628073615a173c1e7f1255e6d8e14517b..39c3eebd215aa9638daaa5b463afcbaa79f411bf 100644 (file)
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -231,6 +231,16 @@ HOST_GCC_COMMON_CONF_OPTS += \
        --with-long-double-128
 endif
 
+# PowerPC64 big endian by default uses the elfv1 ABI, and PowerPC 64
+# little endian by default uses the elfv2 ABI. However, musl has
+# decided to use the elfv2 ABI for both, so we force the elfv2 ABI for
+# Power64 big endian when the selected C library is musl.
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_powerpc64),yy)
+HOST_GCC_COMMON_CONF_OPTS += \
+       --with-abi=elfv2 \
+       --without-long-double-128
+endif
+
 HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"'
 ifeq ($(BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS),)
 ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)

diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 0b97bbf6aa7d984748dc77044e4b358cb024c31c..78cac14d14c2c17b0e7be757850c1073248068e4 100644 (file)
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -70,7 +70,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL
        bool "musl"
        depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \
                BR2_microblaze || BR2_mips || BR2_mipsel || BR2_powerpc || \
-               BR2_sh || BR2_x86_64
+               BR2_powerpc64  || BR2_powerpc64le || BR2_sh || BR2_x86_64
        depends on !BR2_powerpc_SPE # not supported, build breaks
        # Unsupported for MIPS R6
        depends on !BR2_mips_32r6 && !BR2_mips_64r6