From fe7dff17591e17755b643f8f3cfadea49f83e16b Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 15 Dec 2020 18:12:03 +0000
Subject: [PATCH] Remove additional GDB leftovers missed in r368667

---
 Makefile.inc1        | 3 +--
 gnu/lib/Makefile     | 2 +-
 share/mk/src.opts.mk | 6 ------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1d19b9681ce2..6ca69da0f0bc 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -761,7 +761,7 @@ TMAKE=		\
 XMAKE=		${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \
-		MK_GDB=no MK_TESTS=no
+		MK_TESTS=no
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -2729,7 +2729,6 @@ NXBMAKEARGS+= \
 	MK_CLANG_FULL=no \
 	MK_CTF=no \
 	MK_DEBUG_FILES=no \
-	MK_GDB=no \
 	MK_HTML=no \
 	MK_LLDB=no \
 	MK_MAN=no \
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index e4f793e13aad..b31838503ded 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -6,7 +6,7 @@ SUBDIR=
 SUBDIR.${MK_DIALOG}+=	libdialog
 SUBDIR.${MK_TESTS}+=	tests
 
-.if ${MK_GNU_GREP} != "no" || ${MK_GDB} != "no"
+.if ${MK_GNU_GREP} != "no"
 SUBDIR+=		libregex
 .endif
 
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index f3a59db0409e..ef8a71a6ebb9 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -206,7 +206,6 @@ __DEFAULT_NO_OPTIONS = \
     CLANG_FORMAT \
     DTRACE_TESTS \
     EXPERIMENTAL \
-    GDB \
     GNU_GREP \
     HESIOD \
     LIBSOFT \
@@ -289,10 +288,6 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
 
 .include <bsd.compiler.mk>
 
-# In-tree gdb is an older versions without modern architecture support.
-.if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
-BROKEN_OPTIONS+=GDB
-.endif
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED
 .endif
@@ -481,7 +476,6 @@ MK_LLD_BOOTSTRAP:= no
 
 .if ${MK_TOOLCHAIN} == "no"
 MK_CLANG:=	no
-MK_GDB:=	no
 MK_INCLUDES:=	no
 MK_LLD:=	no
 MK_LLDB:=	no