svn commit: r359457 - in head: . gnu/usr.bin/gdb share/mk tools/build/mk tools/build/options

[Ed Maste]

Author: emaste
Date: Mon Mar 30 20:05:09 2020
New Revision: 359457
URL: https://svnweb.freebsd.org/changeset/base/359457

Log:
  drop GDB_LIBEXEC option (now always true)
  
  In-tree gdb is essentially obsolete.  We kept it for sparc64 (because
  gdb in ports lacked sparc64 support) and as a fallback for crashinfo.
  gdb was installed to /libexec on all archs other than sparc64, where the
  WITHOUT_GDB_LIBEXEC option was default, with gdb installed to /usr/bin.
  With sparc64's retirement WITH_GDB_LIBEXEC became the default for all
  architectures, but it was still possible to set it off and install gdb
  into /usr/bin.
  
  As the next step in gdb's retirement, remove the option and install gdb
  only into /libexec as the crashinfo fallback. We expect users to install
  the gdb port or package for debugging. The in-tree gdb lacks support for
  a number of supported architectures and does not support contemporary
  DWARF debug info.
  
  Reviewed by:	jhb (earlier)
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D24227

Deleted:
  head/tools/build/options/WITHOUT_GDB_LIBEXEC
  head/tools/build/options/WITH_GDB_LIBEXEC
Modified:
  head/ObsoleteFiles.inc
  head/gnu/usr.bin/gdb/Makefile
  head/gnu/usr.bin/gdb/Makefile.inc
  head/share/mk/src.opts.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Mon Mar 30 20:04:55 2020	(r359456)
+++ head/ObsoleteFiles.inc	Mon Mar 30 20:05:09 2020	(r359457)
@@ -36,6 +36,14 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20200330: GDB_LIBEXEC option retired (always true)
+OLD_FILES+=usr/bin/gdb
+OLD_FILES+=usr/bin/gdbserver
+OLD_FILES+=usr/bin/kgdb
+OLD_FILES+=usr/share/man/man1/gdb.1.gz
+OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
+OLD_FILES+=usr/share/man/man1/kgdb.1.gz
+
 # 20200327: OCF refactoring
 OLD_FILES+=usr/share/man/man9/crypto_find_driver.9
 OLD_FILES+=usr/share/man/man9/crypto_register.9

Modified: head/gnu/usr.bin/gdb/Makefile
==============================================================================
--- head/gnu/usr.bin/gdb/Makefile	Mon Mar 30 20:04:55 2020	(r359456)
+++ head/gnu/usr.bin/gdb/Makefile	Mon Mar 30 20:05:09 2020	(r359457)
@@ -4,10 +4,4 @@
 
 SUBDIR=	libgdb gdb kgdb
 
-.if ${MK_GDB_LIBEXEC} == "no"
-.if exists(${.CURDIR}/gdbserver/reg-${MACHINE_CPUARCH}.c)
-SUBDIR+=gdbserver
-.endif
-.endif
-
 .include <bsd.subdir.mk>

Modified: head/gnu/usr.bin/gdb/Makefile.inc
==============================================================================
--- head/gnu/usr.bin/gdb/Makefile.inc	Mon Mar 30 20:04:55 2020	(r359456)
+++ head/gnu/usr.bin/gdb/Makefile.inc	Mon Mar 30 20:05:09 2020	(r359457)
@@ -58,7 +58,7 @@ GENSRCS+= nm.h tm.h
 CFLAGS+= -DCROSS_DEBUGGER -I${BMAKE_ROOT:H:H}
 GDB_SUFFIX= -${TARGET_ARCH}
 MAN=
-.elif ${MK_GDB_LIBEXEC} != "no"
+.else
 BINDIR?=	/usr/libexec
 MAN=
 .endif

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Mon Mar 30 20:04:55 2020	(r359456)
+++ head/share/mk/src.opts.mk	Mon Mar 30 20:05:09 2020	(r359457)
@@ -106,7 +106,6 @@ __DEFAULT_YES_OPTIONS = \
     FTP \
     GAMES \
     GDB \
-    GDB_LIBEXEC \
     GNU_DIFF \
     GNU_GREP \
     GOOGLETEST \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Mar 30 20:04:55 2020	(r359456)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Mar 30 20:05:09 2020	(r359457)
@@ -2282,16 +2282,7 @@ OLD_FILES+=usr/bin/llvm-profdata
 OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
 .endif
 
-.if ${MK_GDB} == no || ${MK_GDB_LIBEXEC} == yes
-OLD_FILES+=usr/bin/gdb
-OLD_FILES+=usr/bin/gdbserver
-OLD_FILES+=usr/bin/kgdb
-OLD_FILES+=usr/share/man/man1/gdb.1.gz
-OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
-OLD_FILES+=usr/share/man/man1/kgdb.1.gz
-.endif
-
-.if ${MK_GDB} == no || ${MK_GDB_LIBEXEC} == no
+.if ${MK_GDB} == no
 OLD_FILES+=usr/libexec/gdb
 OLD_FILES+=usr/libexec/kgdb
 .endif