summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/gdb/Config.in6
-rw-r--r--package/gdb/gdb.mk7
2 files changed, 7 insertions, 6 deletions
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index 0c6966ab35..809e02d076 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -2,10 +2,6 @@ comment "gdb/gdbserver needs a toolchain w/ threads, threads debug"
depends on !BR2_nios2 && !BR2_bfin
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-comment "gdb/gdbserver needs a toolchain w/ C++"
- depends on BR2_arc
- depends on !BR2_INSTALL_LIBSTDCPP
-
config BR2_PACKAGE_GDB
bool "gdb"
# When the external toolchain gdbserver is copied to the
@@ -15,8 +11,6 @@ config BR2_PACKAGE_GDB
(!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
depends on !BR2_nios2 && !BR2_bfin
- # Since ARC gdb moved to 7.12 toolchain requires C++ support to build gdb.
- depends on !BR2_arc || BR2_INSTALL_LIBSTDCPP
help
GDB, the GNU Project debugger, allows you to see what is
going on `inside' another program while it executes -- or
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index ccf9e4968d..ea27d0c6eb 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -100,6 +100,13 @@ GDB_CONF_OPTS = \
--disable-werror \
--enable-static
+# When gdb is built as C++ application for ARC it segfaults at runtime
+# So we pass --disable-build-with-cxx config option to force gdb not to
+# be built as C++ app.
+ifeq ($(BR2_arc),y)
+GDB_CONF_OPTS += --disable-build-with-cxx
+endif
+
ifeq ($(BR2_PACKAGE_GDB_TUI),y)
GDB_CONF_OPTS += --enable-tui
else
OpenPOWER on IntegriCloud