summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/binutils/binutils.in8
-rw-r--r--config/companion_libs/expat.in11
-rw-r--r--config/debug/gdb.in43
-rw-r--r--config/debug/gdb.in.native1
-rw-r--r--config/libc/uClibc.in7
5 files changed, 57 insertions, 13 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 59eb6f8..07d4a90 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -37,7 +37,7 @@ endif # BINUTILS_CUSTOM
if ! BINUTILS_CUSTOM
-config CC_BINUTILS_SHOW_LINARO
+config BINUTILS_SHOW_LINARO
bool
prompt "Show Linaro versions"
help
@@ -79,13 +79,13 @@ config BINUTILS_LINARO_V_2_25
bool
prompt "linaro-2.25.0-2015.01-2"
select BINUTILS_2_25_or_later
- depends on CC_BINUTILS_SHOW_LINARO
+ depends on BINUTILS_SHOW_LINARO
config BINUTILS_LINARO_V_2_24
bool
prompt "linaro-2.24.0-2014.11-2"
select BINUTILS_2_24_or_later
- depends on CC_BINUTILS_SHOW_LINARO
+ depends on BINUTILS_SHOW_LINARO
config BINUTILS_V_2_24
bool
@@ -96,7 +96,7 @@ config BINUTILS_LINARO_V_2_23_2
bool
prompt "linaro-2.23.2-2013.10-4"
select BINUTILS_2_23_2_or_later
- depends on CC_BINUTILS_SHOW_LINARO
+ depends on BINUTILS_SHOW_LINARO
config BINUTILS_V_2_23_2
bool
diff --git a/config/companion_libs/expat.in b/config/companion_libs/expat.in
index 1dff4a7..3f2ebd2 100644
--- a/config/companion_libs/expat.in
+++ b/config/companion_libs/expat.in
@@ -6,9 +6,13 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
-config EXPAT_V_2_1_0
+config EXPAT_V_2_2_0
bool
- prompt "2.1.0"
+ prompt "2.2.0"
+
+config EXPAT_V_2_1_1
+ bool
+ prompt "2.1.1"
endchoice
@@ -16,4 +20,5 @@ config EXPAT_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "2.1.0" if EXPAT_V_2_1_0
+ default "2.2.0" if EXPAT_V_2_2_0
+ default "2.1.1" if EXPAT_V_2_1_1
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index 0b39327..6ef0640 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -6,15 +6,13 @@ source "config/debug/gdb.in.cross"
source "config/debug/gdb.in.native"
source "config/debug/gdb.in.gdbserver"
-if GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
-
comment "gdb version"
config GDB_CUSTOM
bool
prompt "Custom gdb"
depends on EXPERIMENTAL
- select GDB_7_2_or_later
+ select GDB_7_12_or_later
help
The choosen gdb version shall be not downloaded. Instead use
a custom location to get the source.
@@ -48,6 +46,7 @@ if ! GDB_CUSTOM
config DEBUG_GDB_SHOW_LINARO
bool
prompt "Show Linaro versions"
+ depends on OBSOLETE
help
Linaro is maintaining some advanced/more stable/experimental versions
of gdb, especially for the ARM architecture.
@@ -68,6 +67,11 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config GDB_V_7_12
+ bool
+ prompt "7.12"
+ select GDB_7_12_or_later
+
config GDB_V_7_11
bool
prompt "7.11"
@@ -81,60 +85,71 @@ config GDB_V_7_10_1
config GDB_V_7_10
bool
prompt "7.10"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_9_1
bool
prompt "7.9.1"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_9
bool
prompt "7.9"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_linaro_7_8
bool
prompt "linaro-7.8-2014.09"
depends on DEBUG_GDB_SHOW_LINARO
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_8_2
bool
prompt "7.8.2"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_8_1
bool
prompt "7.8.1"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_8
bool
prompt "7.8"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_linaro_7_7_1
bool
prompt "linaro-7.7.1-2014.06"
depends on DEBUG_GDB_SHOW_LINARO
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_7_1
bool
prompt "7.7.1"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_linaro_7_7
bool
prompt "linaro-7.7-2014.05"
depends on DEBUG_GDB_SHOW_LINARO
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_7
bool
prompt "7.7"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_linaro_7_6
@@ -146,79 +161,97 @@ config GDB_V_linaro_7_6
config GDB_V_7_6_1
bool
prompt "7.6.1"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_linaro_7_5
bool
prompt "linaro-7.5-2012.12"
depends on DEBUG_GDB_SHOW_LINARO
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_5_1
bool
prompt "7.5.1"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_linaro_7_4
bool
prompt "linaro-7.4-2012.06"
depends on DEBUG_GDB_SHOW_LINARO
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_4_1
bool
prompt "7.4.1"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_4
bool
prompt "7.4"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_linaro_7_3
bool
prompt "linaro-7.3-2011.12"
depends on DEBUG_GDB_SHOW_LINARO
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_3_1
bool
prompt "7.3.1"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_3a
bool
prompt "7.3a"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_2a
bool
prompt "7.2a"
+ depends on OBSOLETE
select GDB_7_2_or_later
config GDB_V_7_1a
bool
prompt "7.1a"
+ depends on OBSOLETE
select GDB_7_0_or_later
config GDB_V_7_0_1a
bool
prompt "7.0.1a"
+ depends on OBSOLETE
select GDB_7_0_or_later
config GDB_V_7_0a
bool
prompt "7.0a"
+ depends on OBSOLETE
select GDB_7_0_or_later
config GDB_V_6_8a
bool
+ depends on OBSOLETE
prompt "6.8a"
endchoice
endif # ! GDB_CUSTOM
+config GDB_7_12_or_later
+ bool
+ select GDB_7_2_or_later
+
config GDB_7_2_or_later
bool
select GDB_7_0_or_later
@@ -244,6 +277,7 @@ config GDB_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "7.12" if GDB_V_7_12
default "7.11" if GDB_V_7_11
default "7.10.1" if GDB_V_7_10_1
default "7.10" if GDB_V_7_10
@@ -274,6 +308,3 @@ config GDB_VERSION
default "6.8a" if GDB_V_6_8a
endif # ! GDB_CUSTOM
-
-endif # GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
-
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index 915debd..634b13b 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -5,6 +5,7 @@ config GDB_NATIVE
prompt "Native gdb"
depends on ! BARE_METAL
depends on ! BACKEND
+ depends on CC_LANG_CXX || !GDB_7_12_or_later
select EXPAT_TARGET
select NCURSES_TARGET
help
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index c6b8576..43457c5 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -81,9 +81,15 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config LIBC_UCLIBC_NG_V_1_0_21
+ bool
+ prompt "1.0.21"
+ select LIBC_UCLIBC_NG_1_0_15_or_later
+
config LIBC_UCLIBC_NG_V_1_0_20
bool
prompt "1.0.20"
+ depends on OBSOLETE
select LIBC_UCLIBC_NG_1_0_15_or_later
config LIBC_UCLIBC_V_0_9_33_2
@@ -97,6 +103,7 @@ config LIBC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "1.0.21" if LIBC_UCLIBC_NG_V_1_0_21
default "1.0.20" if LIBC_UCLIBC_NG_V_1_0_20
default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2