summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.compiler43
1 files changed, 22 insertions, 21 deletions
diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index 69eb777e8..11df35415 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -17,19 +17,20 @@ choice
prompt "GCC version"
depends on ADK_BUILD_COMPILER_GCC
default ADK_TOOLCHAIN_GCC_ARC if ADK_TARGET_ARCH_ARC
-default ADK_TOOLCHAIN_GCC_4_2_4 if ADK_TARGET_ARCH_METAG
-default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_GCC_4_9_4 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
-default ADK_TOOLCHAIN_GCC_4_9_4 if ADK_TARGET_SYSTEM_KINETIS_K70
-default ADK_TOOLCHAIN_GCC_5_3_OR1K if ADK_TARGET_ARCH_OR1K
-default ADK_TOOLCHAIN_GCC_6_1_0 if ADK_TARGET_ARCH_XTENSA
-default ADK_TOOLCHAIN_GCC_6_1_0 if ADK_TARGET_ARCH_BFIN
-default ADK_TOOLCHAIN_GCC_6_1_0 if ADK_TARGET_ARCH_C6X
-default ADK_TOOLCHAIN_GCC_6_1_0 if ADK_TARGET_ARCH_CR16
-default ADK_TOOLCHAIN_GCC_6_1_0 if ADK_TARGET_ARCH_H8300
-default ADK_TOOLCHAIN_GCC_6_1_0 if ADK_TARGET_ARCH_FRV
-default ADK_TOOLCHAIN_GCC_6_1_0 if ADK_TARGET_CPU_MIPS_MIPS32R6 || ADK_TARGET_CPU_MIPS64_MIPS64R6
-default ADK_TOOLCHAIN_GCC_5_4_0
+default ADK_TOOLCHAIN_GCC_OR1K if ADK_TARGET_ARCH_OR1K
+default ADK_TOOLCHAIN_GCC_4_2 if ADK_TARGET_ARCH_METAG
+default ADK_TOOLCHAIN_GCC_4_4 if ADK_TARGET_ARCH_AVR32
+default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
+default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_SYSTEM_KINETIS_K70
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_XTENSA
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_BFIN
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_C6X
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_CR16
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_H8300
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_FRV
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_M32R
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_CPU_MIPS_MIPS32R6 || ADK_TARGET_CPU_MIPS64_MIPS64R6
+default ADK_TOOLCHAIN_GCC_5
config ADK_TOOLCHAIN_GCC_GIT
bool "git"
@@ -40,8 +41,8 @@ config ADK_TOOLCHAIN_GCC_GIT
depends on !ADK_TARGET_ARCH_OR1K
select ADK_DISABLE_HONOUR_CFLAGS
-config ADK_TOOLCHAIN_GCC_6_1_0
- bool "6.1.0"
+config ADK_TOOLCHAIN_GCC_6
+ bool "6.2.0"
depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_METAG
@@ -49,7 +50,7 @@ config ADK_TOOLCHAIN_GCC_6_1_0
depends on !ADK_TARGET_ARCH_OR1K
select ADK_DISABLE_HONOUR_CFLAGS
-config ADK_TOOLCHAIN_GCC_5_4_0
+config ADK_TOOLCHAIN_GCC_5
bool "5.4.0"
depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_AVR32
@@ -67,7 +68,7 @@ config ADK_TOOLCHAIN_GCC_5_4_0
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-config ADK_TOOLCHAIN_GCC_4_9_4
+config ADK_TOOLCHAIN_GCC_4_9
bool "4.9.4"
depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_AVR32
@@ -81,8 +82,8 @@ config ADK_TOOLCHAIN_GCC_4_9_4
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-config ADK_TOOLCHAIN_GCC_5_3_OR1K
- bool "5.3-or1k"
+config ADK_TOOLCHAIN_GCC_OR1K
+ bool "or1k"
select ADK_DISABLE_HONOUR_CFLAGS
depends on ADK_TARGET_ARCH_OR1K
@@ -91,11 +92,11 @@ config ADK_TOOLCHAIN_GCC_ARC
depends on ADK_TARGET_ARCH_ARC
select ADK_DISABLE_HONOUR_CFLAGS
-config ADK_TOOLCHAIN_GCC_4_4_7
+config ADK_TOOLCHAIN_GCC_4_4
bool "4.4.7"
depends on ADK_TARGET_ARCH_AVR32
-config ADK_TOOLCHAIN_GCC_4_2_4
+config ADK_TOOLCHAIN_GCC_4_2
bool "4.2.4"
depends on ADK_TARGET_ARCH_METAG
select ADK_DISABLE_HONOUR_CFLAGS