summaryrefslogtreecommitdiff
path: root/config/cc
diff options
context:
space:
mode:
Diffstat (limited to 'config/cc')
-rw-r--r--config/cc/gcc.in9
-rw-r--r--config/cc/gcc.in.22
2 files changed, 6 insertions, 5 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 835b7e2..0b65a42 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -300,13 +300,15 @@ config CC_GCC_V_3_4_6
prompt "3.4.6 (OBSOLETE)"
depends on OBSOLETE
+endchoice
+
config CC_GCC_CUSTOM
bool
prompt "Custom gcc"
depends on EXPERIMENTAL
- select CC_GCC_latest
-
-endchoice
+ help
+ The choosen compiler version shall be not downloaded. Instead use
+ a custom location to get the source.
if CC_GCC_CUSTOM
@@ -616,7 +618,6 @@ config CC_GCC_VERSION
default "4.1.2" if CC_GCC_V_4_1_2
default "4.0.4" if CC_GCC_V_4_0_4
default "3.4.6" if CC_GCC_V_3_4_6
- default "custom" if CC_GCC_CUSTOM
config CC_LANG_JAVA_USE_ECJ
bool
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index fb19938..cbad638 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -165,7 +165,7 @@ config CC_CXA_ATEXIT
bool
prompt "Use __cxa_atexit"
default y
- depends on ! BARE_METAL
+ depends on ! BARE_METAL || LIBC_PROVIDES_CXA_ATEXIT
help
If you get the missing symbol "__cxa_atexit" when building C++ programs,
you might want to try disabling this option.