From owner-svn-src-head@freebsd.org  Tue Apr 18 16:27:49 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46E4ED43784;
 Tue, 18 Apr 2017 16:27:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 19149B26;
 Tue, 18 Apr 2017 16:27:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3IGRmgH082878;
 Tue, 18 Apr 2017 16:27:48 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3IGRmNN082877;
 Tue, 18 Apr 2017 16:27:48 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201704181627.v3IGRmNN082877@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 18 Apr 2017 16:27:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317094 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Apr 2017 16:27:49 -0000

Author: jhb
Date: Tue Apr 18 16:27:48 2017
New Revision: 317094
URL: https://svnweb.freebsd.org/changeset/base/317094

Log:
  Disable in-tree GDB by default on x86, mips, and powerpc.
  
  GDB in ports contains all of the functionality as GDB in base
  (including kgdb) for these platforms along with additional
  functionality.  In-tree GDB remains enabled on ARM and sparc64.
  GDB in ports does not currently support kernel debugging on arm,
  and ports GDB for sparc64 has not been tested (though it does
  include sparc64 support).
  
  Reviewed by:	bdrewery, emaste, imp
  Relnotes:	yes
  Sponsored by:	DARPA / AFRL
  Differential Revision:	https://reviews.freebsd.org/D10399

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Tue Apr 18 16:17:38 2017	(r317093)
+++ head/share/mk/src.opts.mk	Tue Apr 18 16:27:48 2017	(r317094)
@@ -41,7 +41,7 @@ __<src.opts.mk>__:
 # that haven't been converted over.
 #
 
-# These options are used by src the builds
+# These options are used by the src builds
 
 __DEFAULT_YES_OPTIONS = \
     ACCT \
@@ -96,7 +96,6 @@ __DEFAULT_YES_OPTIONS = \
     FTP \
     GAMES \
     GCOV \
-    GDB \
     GNU \
     GNU_DIFF \
     GNU_GREP \
@@ -263,6 +262,14 @@ __DEFAULT_NO_OPTIONS+=LLDB
 .if ${__T} == "arm" || ${__T} == "armeb"
 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"
+__DEFAULT_YES_OPTIONS+=GDB
+.else
+__DEFAULT_NO_OPTIONS+=GDB
+.endif
 # Only doing soft float API stuff on armv6
 .if ${__T} != "armv6"
 BROKEN_OPTIONS+=LIBSOFT