summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-02-08 01:10:47 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-02-08 01:10:47 +0100
commitdf1abe05e4d97e1e0caae35a107f4b1a71ea9dff (patch)
tree2b8c3e2066d909f0c19e3aa734d42b7f5241a76f /target
parent0a2e8b36cfd478d408a7953ab61b342f146d736f (diff)
parentdc0358868e10aa5c08a720fc303b8f022c22e059 (diff)
git pushMerge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.gcc13
1 files changed, 3 insertions, 10 deletions
diff --git a/target/config/Config.in.gcc b/target/config/Config.in.gcc
index efeb3b1de..75e31bf47 100644
--- a/target/config/Config.in.gcc
+++ b/target/config/Config.in.gcc
@@ -8,9 +8,7 @@ default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32
default ADK_TOOLCHAIN_GCC_4_8_5 if ADK_TARGET_ARCH_C6X
default ADK_TOOLCHAIN_GCC_4_9_3 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
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_OR1K_MUSL if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_NEWLIB
+default ADK_TOOLCHAIN_GCC_5_2_OR1K if ADK_TARGET_ARCH_OR1K
default ADK_TOOLCHAIN_GCC_GIT if ADK_TARGET_WITHOUT_MMU && ADK_TARGET_ARCH_XTENSA
default ADK_TOOLCHAIN_GCC_5_3_0
@@ -58,13 +56,8 @@ config ADK_TOOLCHAIN_GCC_4_8_5
depends on !ADK_TARGET_ARCH_METAG
depends on !ADK_TARGET_ARCH_OR1K
-config ADK_TOOLCHAIN_GCC_4_9_OR1K_UCLIBC
- bool "4.9-or1k-uclibc"
- select ADK_DISABLE_HONOUR_CFLAGS
- depends on ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_UCLIBC_NG
-
-config ADK_TOOLCHAIN_GCC_5_2_OR1K_MUSL
- bool "5.2-or1k-musl"
+config ADK_TOOLCHAIN_GCC_5_2_OR1K
+ bool "5.2-or1k"
select ADK_DISABLE_HONOUR_CFLAGS
depends on ADK_TARGET_ARCH_OR1K