From 513fdd50ee6b44cbcc031a432935099c78bdbd5d Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 25 Jul 2018 18:21:14 +0000
Subject: [PATCH] Install base gdb in /usr/libexec for 32-bit arm by default.

kgdb in ports now supports 32-bit arm kernels.  sparc64 is now the only
remaining architecture which ships base gdb in /usr/bin.

Relnotes:	yes
---
 share/man/man5/src.conf.5 | 6 +++---
 share/mk/src.opts.mk      | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 873d8c84da12..6c09c3daa9fd 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd July 21, 2018
+.Dd July 25, 2018
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -741,7 +741,7 @@ into
 .Pa /usr/bin .
 .Pp
 This is a default setting on
-arm/arm, arm/armv6, arm/armv7 and sparc64/sparc64.
+sparc64/sparc64.
 .It Va WITH_GDB_LIBEXEC
 Set to install
 .Xr gdb 1
@@ -754,7 +754,7 @@ to be used as a fallback for
 if a newer version is not installed.
 .Pp
 This is a default setting on
-amd64/amd64, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64 and riscv/riscv64sf.
+amd64/amd64, arm/arm, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64 and riscv/riscv64sf.
 .It Va WITHOUT_GNUCXX
 Do not build the GNU C++ stack (g++, libstdc++).
 This is the default on platforms where clang is the system compiler.
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index f978308925ec..b846d1e31b27 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -321,9 +321,8 @@ __DEFAULT_NO_OPTIONS+=LLDB
 BROKEN_OPTIONS+=LLDB
 .endif
 # GDB in base is generally less functional than GDB in ports.  Ports GDB
-# does not yet contain kernel support for arm, and sparc64 kernel support
-# has not been tested.
-.if ${__T:Marm*} != "" || ${__T} == "sparc64"
+# sparc64 kernel support has not been tested.
+.if ${__T} == "sparc64"
 __DEFAULT_NO_OPTIONS+=GDB_LIBEXEC
 .else
 __DEFAULT_YES_OPTIONS+=GDB_LIBEXEC