summaryrefslogtreecommitdiff
path: root/config/debug
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-06-05 05:27:02 (GMT)
committerAlexey Neyman <stilor@att.net>2017-06-05 06:23:09 (GMT)
commit72a5a1d6de43503579cb77daacdf17a77a315c03 (patch)
tree2bb8787faf30ba6ea4838f5e8c5d1a4ba5850948 /config/debug
parentef1ff2600db572b05f812c638a950f5be31aa6c9 (diff)
Add GDB 8.0 ...
... which now requires C++. Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'config/debug')
-rw-r--r--config/debug/gdb.in18
-rw-r--r--config/debug/gdb.in.native1
2 files changed, 18 insertions, 1 deletions
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index c8652ca..b1d101b 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -12,7 +12,7 @@ config GDB_CUSTOM
bool
prompt "Custom gdb"
depends on EXPERIMENTAL
- select GDB_7_12_or_later
+ select GDB_8_0_or_later
help
The choosen gdb version shall be not downloaded. Instead use
a custom location to get the source.
@@ -67,6 +67,11 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config GDB_V_8_0
+ bool
+ prompt "8.0"
+ select GDB_8_0_or_later
+
config GDB_V_7_12_1
bool
prompt "7.12.1"
@@ -249,6 +254,10 @@ endchoice
endif # ! GDB_CUSTOM
+config GDB_8_0_or_later
+ bool
+ select GDB_7_12_or_later
+
config GDB_7_12_or_later
bool
select GDB_7_2_or_later
@@ -272,12 +281,19 @@ config GDB_HAS_PYTHON
config GDB_INSTALL_GDBINIT
bool
+# GDB 8.0 now requires C++ for build. GDB 7.12 offered a configure
+# switch to fall back to C.
+config GDB_TARGET_DISABLE_CXX_BUILD
+ def_bool y
+ depends on GDB_7_12_or_later && !GDB_8_0_or_later
+
if ! GDB_CUSTOM
config GDB_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "8.0" if GDB_V_8_0
default "7.12.1" if GDB_V_7_12_1
default "7.11.1" if GDB_V_7_11_1
default "7.10.1" if GDB_V_7_10_1
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index faee8c3..f199d59 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 ! LIBC_bionic
+ depends on CC_LANG_CXX || !GDB_8_0_or_later
select EXPAT_TARGET
select NCURSES_TARGET
help