Merge branch 'next'

[coffee/buildroot.git] / package / gcc / Config.in.host

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 7ef6ff21defab229dec5878628c75057a0e8b505..6f6e582489e66e236b5767ec49e18f29e2723e86 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_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el))
                select BR2_GCC_NEEDS_MPC
                select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
 
@@ -46,6 +48,10 @@ 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_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el))
+               # musl mips64 unsupported
+               depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
                select BR2_GCC_NEEDS_MPC
                select BR2_GCC_SUPPORTS_GRAPHITE
                select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@@ -66,6 +72,10 @@ choice
                depends on !BR2_cortex_a17
                # Unsupported for MIPS R6
                depends on !BR2_mips_32r6 && !BR2_mips_64r6
+               # musl ppc64 unsupported
+               depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el))
+               # musl mips64 unsupported
+               depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
                # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
                select BR2_GCC_NEEDS_MPC
                select BR2_GCC_SUPPORTS_GRAPHITE
@@ -75,6 +85,10 @@ choice
                bool "gcc 5.x"
                # Broken or unsupported architectures
                depends on !BR2_arc && !BR2_bfin
+               # musl ppc64 unsupported
+               depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el))
+               # musl mips64 unsupported
+               depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
                select BR2_GCC_NEEDS_MPC
                select BR2_GCC_SUPPORTS_GRAPHITE
                select BR2_TOOLCHAIN_GCC_AT_LEAST_5
@@ -140,14 +154,6 @@ config BR2_TOOLCHAIN_BUILDROOT_FORTRAN
          Fortran language and you want Fortran libraries to be
          installed on your target system.
 
-config BR2_GCC_ENABLE_TLS
-       bool "Enable compiler tls support" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
-       default y
-       depends on BR2_PTHREADS_NATIVE || BR2_TOOLCHAIN_BUILDROOT_GLIBC
-       help
-         Enable the compiler to generate code for accessing
-         thread local storage variables
-
 config BR2_GCC_ENABLE_LTO
        bool "Enable compiler link-time-optimization support"
        select BR2_BINUTILS_ENABLE_LTO