From ff160decec5a2d44ead2e8bfdc6c4765b6afc04e Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Thu, 6 May 2021 11:57:27 +0200
Subject: [PATCH] gdb: fix build errors with gcc 10

Fixes #4139
---
 repos/ports/src/noux-pkg/gdb/target.inc | 3 ++-
 tool/tool_chain                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/repos/ports/src/noux-pkg/gdb/target.inc b/repos/ports/src/noux-pkg/gdb/target.inc
index 2623219e37..25fb8e5983 100644
--- a/repos/ports/src/noux-pkg/gdb/target.inc
+++ b/repos/ports/src/noux-pkg/gdb/target.inc
@@ -1,7 +1,8 @@
 PKG_DIR = $(call select_from_ports,gdb)/src/noux-pkg/gdb
 
 CONFIGURE_ARGS += --program-prefix=$(PROGRAM_PREFIX) \
-                  --target=$(GDB_TARGET)
+                  --target=$(GDB_TARGET) \
+                  --disable-sim
 
 # the configure script calls the linker with "-lexpat", which fails
 CONFIGURE_ARGS += --without-expat
diff --git a/tool/tool_chain b/tool/tool_chain
index 038147e7d6..35307356ac 100755
--- a/tool/tool_chain
+++ b/tool/tool_chain
@@ -270,7 +270,7 @@ BINUTILS_CONFIG += $(BINUTILS_CONFIG_$(PLATFORM))
 #
 # GDB configure arguments
 #
-GDB_CONFIG += $(COMMON_CONFIG) --disable-werror
+GDB_CONFIG += $(COMMON_CONFIG) --disable-werror --disable-sim
 
 GCC_CONFIG += $(COMMON_CONFIG) \
               --enable-languages=$(LANGUAGES),go \