diff options
Diffstat (limited to 'config/cc')
-rw-r--r-- | config/cc/gcc.in | 23 | ||||
-rw-r--r-- | config/cc/gcc.in.2 | 11 |
2 files changed, 25 insertions, 9 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 101f2b2..691355a 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -54,15 +54,15 @@ config CC_GCC_SHOW_LINARO help Linaro is maintaining some advanced/more stable/experimental versions of gcc, especially for the ARM architecture. - + Those versions have not been blessed by the gcc comunity (nor have they been cursed either!), but they look to be pretty much stable, and even more stable than the upstream versions. YMMV... - + If you do not know what this Linaro stuff is, then simply say 'n' here, and rest in peace. OTOH, if you know what you are doing, you will be able to use and enjoy :-) the Linaro versions by saying 'y' here. - + Linaro: http://www.linaro.org/ choice @@ -71,9 +71,9 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW -config CC_GCC_V_6_1_0 +config CC_GCC_V_6_2_0 bool - prompt "6.1.0" + prompt "6.2.0" select CC_GCC_6 config CC_GCC_V_5_4_0 @@ -93,9 +93,9 @@ config CC_GCC_V_linaro_4_9 depends on CC_GCC_SHOW_LINARO select CC_GCC_4_9 -config CC_GCC_V_4_9_3 +config CC_GCC_V_4_9_4 bool - prompt "4.9.3" + prompt "4.9.4" select CC_GCC_4_9 config CC_GCC_V_linaro_4_8 @@ -160,6 +160,7 @@ config CC_GCC_5 select CC_GCC_HAS_LNK_HASH_STYLE select CC_GCC_HAS_LIBQUADMATH select CC_GCC_HAS_LIBSANITIZER + select CC_GCC_HAS_LIBMPX select CC_SUPPORT_GOLANG config CC_GCC_5_or_later @@ -178,6 +179,7 @@ config CC_GCC_6 select CC_GCC_HAS_LNK_HASH_STYLE select CC_GCC_HAS_LIBQUADMATH select CC_GCC_HAS_LIBSANITIZER + select CC_GCC_HAS_LIBMPX select CC_SUPPORT_GOLANG config CC_GCC_6_or_later @@ -276,17 +278,20 @@ config CC_GCC_HAS_LIBQUADMATH config CC_GCC_HAS_LIBSANITIZER bool +config CC_GCC_HAS_LIBMPX + bool + if ! CC_GCC_CUSTOM config CC_GCC_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "6.1.0" if CC_GCC_V_6_1_0 + default "6.2.0" if CC_GCC_V_6_2_0 default "5.4.0" if CC_GCC_V_5_4_0 default "linaro-5.2-2015.11-2" if CC_GCC_V_linaro_5_2 default "linaro-4.9-2015.06" if CC_GCC_V_linaro_4_9 - default "4.9.3" if CC_GCC_V_4_9_3 + default "4.9.4" if CC_GCC_V_4_9_4 default "linaro-4.8-2015.06" if CC_GCC_V_linaro_4_8 default "4.8.5" if CC_GCC_V_4_8_5 diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index c200d22..2c5d45e 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -182,6 +182,17 @@ config CC_GCC_LIBSANITIZER The default is 'N'. Say 'Y' if you need it, and report success/failure. +config CC_GCC_LIBMPX + bool + default y + prompt "Compile libmpx" + depends on CC_GCC_HAS_LIBMPX + depends on ARCH_x86 + # MUSL does not define libc types that GCC requires. Mingw lacks certain headers. + depends on !LIBC_musl && ! LIBC_mingw + help + Enable GCC support for Intel Memory Protection Extensions (MPX). + #----------------------------------------------------------------------------- comment "Misc. obscure options." |