From 7d455976fb819146a50a8fa0483730b16231171f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Dec 2015 21:14:26 +0100 Subject: bfin/tile: fix toolchain building --- target/config/Config.in.binfmt | 8 ++++---- target/config/Config.in.gcc | 2 ++ target/config/Config.in.libc | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index 0c0281b1c..bd64cb59a 100644 --- a/target/config/Config.in.binfmt +++ b/target/config/Config.in.binfmt @@ -17,16 +17,16 @@ config ADK_TARGET_BINFMT_ELF bool "ELF" depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_WITH_MMU -config ADK_TARGET_BINFMT_FDPIC - bool "FDPIC" - depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV - config ADK_TARGET_BINFMT_FLAT bool "FLAT" select ADK_TARGET_UCLINUX if ADK_TARGET_ARCH_BFIN depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_WITHOUT_MMU \ || ADK_TARGET_ARCH_H8300 || ADK_TARGET_ARCH_LM32 || ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV +config ADK_TARGET_BINFMT_FDPIC + bool "FDPIC" + depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV + config ADK_TARGET_BINFMT_DSBT bool "DSBT" depends on ADK_TARGET_ARCH_C6X diff --git a/target/config/Config.in.gcc b/target/config/Config.in.gcc index a8e6440f5..bf7bcb779 100644 --- a/target/config/Config.in.gcc +++ b/target/config/Config.in.gcc @@ -9,6 +9,7 @@ default ADK_TOOLCHAIN_GCC_4_8_5 if ADK_TARGET_ARCH_C6X default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC default ADK_TOOLCHAIN_GCC_4_9_OR1K_UCLIBC_NG if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_UCLIBC_NG default ADK_TOOLCHAIN_GCC_5_2_OR1K_MUSL if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_MUSL +default ADK_TOOLCHAIN_GCC_5_2_0 if ADK_TARGET_ARCH_TILE default ADK_TOOLCHAIN_GCC_4_9_3 config ADK_TOOLCHAIN_GCC_GIT @@ -38,6 +39,7 @@ config ADK_TOOLCHAIN_GCC_4_9_3 depends on !ADK_TARGET_ARCH_H8300 depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_OR1K + depends on !ADK_TARGET_ARCH_TILE config ADK_TOOLCHAIN_GCC_4_8_5 bool "4.8.5" diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 5a712e567..63bd73b5a 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -55,14 +55,17 @@ prompt "C library version" config ADK_TARGET_LIB_UCLIBC_NG_1_0_9 bool "1.0.9" depends on ADK_TARGET_LIB_UCLIBC_NG + depends on !ADK_TARGET_ARCH_BFIN config ADK_TARGET_LIB_UCLIBC_NG_1_0_8 bool "1.0.8" depends on ADK_TARGET_LIB_UCLIBC_NG + depends on !ADK_TARGET_ARCH_BFIN config ADK_TARGET_LIB_UCLIBC_NG_1_0_7 bool "1.0.7" depends on ADK_TARGET_LIB_UCLIBC_NG + depends on !ADK_TARGET_ARCH_BFIN config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" -- cgit v1.2.3