diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/cc/gcc.in | 8 | ||||
| -rw-r--r-- | config/libc/glibc-eglibc.in-common | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index bd8bcb3..5c2d98f 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -53,7 +53,7 @@ config CC_V_4_9_0 config CC_V_linaro_4_8 bool - prompt "linaro-4.8-2014.01" + prompt "linaro-4.8-2014.04" depends on CC_GCC_SHOW_LINARO select CC_GCC_4_8 @@ -79,7 +79,7 @@ config CC_V_4_8_0 config CC_V_linaro_4_7 bool - prompt "linaro-4.7-2014.01" + prompt "linaro-4.7-2014.06" depends on CC_GCC_SHOW_LINARO select CC_GCC_4_7 @@ -500,12 +500,12 @@ config CC_VERSION default "4.9.2" if CC_V_4_9_2 default "4.9.1" if CC_V_4_9_1 default "4.9.0" if CC_V_4_9_0 - default "linaro-4.8-2014.01" if CC_V_linaro_4_8 + default "linaro-4.8-2014.04" if CC_V_linaro_4_8 default "4.8.3" if CC_V_4_8_3 default "4.8.2" if CC_V_4_8_2 default "4.8.1" if CC_V_4_8_1 default "4.8.0" if CC_V_4_8_0 - default "linaro-4.7-2014.01" if CC_V_linaro_4_7 + default "linaro-4.7-2014.06" if CC_V_linaro_4_7 default "4.7.4" if CC_V_4_7_4 default "4.7.3" if CC_V_4_7_3 default "4.7.2" if CC_V_4_7_2 diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common index 6c5d2f0..f199e3a 100644 --- a/config/libc/glibc-eglibc.in-common +++ b/config/libc/glibc-eglibc.in-common @@ -14,6 +14,7 @@ config LIBC_GLIBC_MAY_FORCE_PORTS default y if ARCH_arm default y if ARCH_mips select LIBC_GLIBC_USE_PORTS + depends on !LIBC_GLIBC_2_20_or_later # Force using the BFD linker during the toolchain build config LIBC_glibc_familly @@ -121,6 +122,7 @@ config LIBC_GLIBC_FORCE_UNWIND config LIBC_GLIBC_USE_PORTS bool prompt "Use the ports addon" + depends on !LIBC_GLIBC_2_20_or_later help The ports addon contains some architecture ports that are not available in the official distribution. |