5 files changed, 22 insertions, 6 deletions
diff --git a/config/debug/duma.in b/config/debug/duma.in
index 9947ca2..f9e727b 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -1,7 +1,7 @@
 # D.U.M.A. - Detect Unintended Memory Access - Memory checker
 
-## depends on ! BACKEND
 ## depends on ! BARE_METAL
+## depends on ! LIBC_bionic
 
 ## help D.U.M.A. - Detect Unintended Memory Access
 ## help A memory bound checker, with additional features.
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 8684c05..f199d59 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -4,7 +4,8 @@ config GDB_NATIVE
     bool
     prompt "Native gdb"
     depends on ! BARE_METAL
-    depends on ! BACKEND
+    depends on ! LIBC_bionic
+    depends on CC_LANG_CXX || !GDB_8_0_or_later
     select EXPAT_TARGET
     select NCURSES_TARGET
     help
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index fc5822d..fab6b81 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -1,8 +1,7 @@
 # ltrace
 
-## depends on ! BACKEND
-##
 ## select LIBELF_TARGET
+## depends on ! LIBC_bionic
 ##
 ## help ltrace is a program that simply runs the specified command until it exits.
 ## help It intercepts and records the dynamic library calls which are called by
diff --git a/config/debug/strace.in b/config/debug/strace.in
index 4cf6980..e77702b 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -1,6 +1,6 @@
 # strace
 
-## depends on ! BACKEND
+## depends on ! LIBC_bionic
 
 choice
     bool