svn commit: r286730 - in head: . gnu/usr.bin/binutils lib targets/pseudo/toolchain tools/build/mk tools/build/options usr.bin

Thu Aug 13 17:50:50 UTC 2015

Author: emaste
Date: Thu Aug 13 17:50:47 2015
New Revision: 286730
URL: https://svnweb.freebsd.org/changeset/base/286730

Log:
  Roll WITHOUT_ELFTOOLCHAIN_TOOLS into WITHOUT_TOOLCHAIN
  
  The option was added only to ease the transition from GNU Binutils to
  ELF Tool Chain tools, and that process is now complete (for the viable
  replacements). Noting the removal in UPDATING is sufficient as we have
  not shipped a release with the option.
  
  Reviewed by:	brooks
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D3240

Deleted:
  head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
Modified:
  head/Makefile.inc1
  head/UPDATING
  head/gnu/usr.bin/binutils/Makefile
  head/lib/Makefile
  head/targets/pseudo/toolchain/Makefile.depend
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/Makefile

Modified: head/Makefile.inc1
==============================================================================

--- head/Makefile.inc1	Thu Aug 13 16:11:04 2015	(r286729)
+++ head/Makefile.inc1	Thu Aug 13 17:50:47 2015	(r286730)
@@ -1493,8 +1493,6 @@ _btxld=		usr.sbin/btxld
 .if ${XAS:M/*} == ""
 .if ${MK_BINUTILS_BOOTSTRAP} != "no"
 _binutils=	gnu/usr.bin/binutils
-.endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
 _elftctools=	lib/libelftc \
 		usr.bin/elfcopy \
 		usr.bin/nm \
@@ -1504,7 +1502,7 @@ _elftctools=	lib/libelftc \
 # cross-build on a FreeBSD 10 host:
 _elftctools+=	usr.bin/addr2line
 .endif
-.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_BINUTILS_BOOTSTRAP} != "no"
 # If cross-building with an external binutils we still need to build strip for
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Aug 13 16:11:04 2015	(r286729)
+++ head/UPDATING	Thu Aug 13 17:50:47 2015	(r286730)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150813:
+	The WITHOUT_ELFTOOLCHAIN_TOOLS src.conf(5) knob has been retired.
+	Control over building the ELF Tool Chain tools is now provided by
+	the WITHOUT_TOOLCHAIN knob.
+
 20150810:
 	The polarity of Pulse Per Second (PPS) capture events with the
 	uart(4) driver has been corrected.  Prior to this change the PPS

Modified: head/gnu/usr.bin/binutils/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile	Thu Aug 13 16:11:04 2015	(r286729)
+++ head/gnu/usr.bin/binutils/Makefile	Thu Aug 13 17:50:47 2015	(r286730)
@@ -12,7 +12,7 @@ SUBDIR=	doc\
 	${_objcopy} \
 	objdump \
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == "no" || ${MK_ELFCOPY_AS_OBJCOPY} == "no"
+.if ${MK_ELFCOPY_AS_OBJCOPY} == "no"
 _objcopy=	objcopy
 .endif
 

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Thu Aug 13 16:11:04 2015	(r286729)
+++ head/lib/Makefile	Thu Aug 13 17:50:47 2015	(r286730)
@@ -182,7 +182,7 @@ _clang=		clang
 _cuse=		libcuse
 .endif
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.if ${MK_TOOLCHAIN} != "no"
 _libelftc=	libelftc
 .endif
 

Modified: head/targets/pseudo/toolchain/Makefile.depend
==============================================================================
--- head/targets/pseudo/toolchain/Makefile.depend	Thu Aug 13 16:11:04 2015	(r286729)
+++ head/targets/pseudo/toolchain/Makefile.depend	Thu Aug 13 17:50:47 2015	(r286730)
@@ -9,7 +9,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,
 .endif
 DIRDEPS=
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == "yes"
+.if ${MK_TOOLCHAIN} == "yes"
 DIRDEPS+= \
 	usr.bin/addr2line \
 	usr.bin/cxxflit \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Aug 13 16:11:04 2015	(r286729)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Aug 13 17:50:47 2015	(r286730)
@@ -184,7 +184,7 @@ OLD_DIRS+=usr/share/examples/bhyve
 .if ${MK_BINUTILS} == no
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld
-.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
+.if ${MK_ELFCOPY_AS_OBJCOPY} == no
 OLD_FILES+=usr/bin/objcopy
 .endif
 OLD_FILES+=usr/bin/objdump
@@ -203,7 +203,7 @@ OLD_FILES+=usr/libdata/ldscripts/elf_x86
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man1/ld.1.gz
-.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
+.if ${MK_ELFCOPY_AS_OBJCOPY} == no
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
 .endif
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
@@ -1647,29 +1647,6 @@ OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 .endif
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no || \
-    (${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} != no)
-OLD_FILES+=usr/bin/elfcopy
-OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
-.endif
-
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no
-OLD_FILES+=usr/bin/addr2line
-OLD_FILES+=usr/bin/c++filt
-OLD_FILES+=usr/bin/nm
-OLD_FILES+=usr/bin/readelf
-OLD_FILES+=usr/bin/size
-OLD_FILES+=usr/bin/strings
-OLD_FILES+=usr/bin/strip
-OLD_FILES+=usr/share/man/man1/addr2line.1.gz
-OLD_FILES+=usr/share/man/man1/c++filt.1.gz
-OLD_FILES+=usr/share/man/man1/nm.1.gz
-OLD_FILES+=usr/share/man/man1/readelf.1.gz
-OLD_FILES+=usr/share/man/man1/size.1.gz
-OLD_FILES+=usr/share/man/man1/strings.1.gz
-OLD_FILES+=usr/share/man/man1/strip.1.gz
-.endif
-
 #.if ${MK_EXAMPLES} == no
 # to be filled in
 #.endif
@@ -7530,8 +7507,25 @@ OLD_FILES+=usr/share/man/man1/ul.1.gz
 .endif
 
 #.if ${MK_TOOLCHAIN} == no
-# to be filled in
+OLD_FILES+=usr/bin/addr2line
+OLD_FILES+=usr/bin/c++filt
+OLD_FILES+=usr/bin/nm
+OLD_FILES+=usr/bin/readelf
+OLD_FILES+=usr/bin/size
+OLD_FILES+=usr/bin/strings
+OLD_FILES+=usr/bin/strip
+OLD_FILES+=usr/share/man/man1/addr2line.1.gz
+OLD_FILES+=usr/share/man/man1/c++filt.1.gz
+OLD_FILES+=usr/share/man/man1/nm.1.gz
+OLD_FILES+=usr/share/man/man1/readelf.1.gz
+OLD_FILES+=usr/share/man/man1/size.1.gz
+OLD_FILES+=usr/share/man/man1/strings.1.gz
+OLD_FILES+=usr/share/man/man1/strip.1.gz
 #.endif
+.if ${MK_TOOLCHAIN} == no || ${MK_ELFCOPY_AS_OBJCOPY} != no
+OLD_FILES+=usr/bin/elfcopy
+OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
+.endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Thu Aug 13 16:11:04 2015	(r286729)
+++ head/usr.bin/Makefile	Thu Aug 13 17:50:47 2015	(r286730)
@@ -218,16 +218,6 @@ SUBDIR+=	clang
 SUBDIR+=	ee
 .endif
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
-SUBDIR+=	addr2line
-SUBDIR+=	cxxfilt
-SUBDIR+=	elfcopy
-SUBDIR+=	nm
-SUBDIR+=	readelf
-SUBDIR+=	size
-SUBDIR+=	strings
-.endif
-
 .if ${MK_FILE} != "no"
 SUBDIR+=	file
 .endif
@@ -361,10 +351,13 @@ SUBDIR+=	tftp
 .endif
 
 .if ${MK_TOOLCHAIN} != "no"
+SUBDIR+=	addr2line
 SUBDIR+=	ar
 SUBDIR+=	c89
 SUBDIR+=	c99
 SUBDIR+=	ctags
+SUBDIR+=	cxxfilt
+SUBDIR+=	elfcopy
 SUBDIR+=	file2c
 .if ${MACHINE_ARCH} != "aarch64" # ARM64TODO gprof does not build
 SUBDIR+=	gprof
@@ -372,8 +365,12 @@ SUBDIR+=	gprof
 SUBDIR+=	indent
 SUBDIR+=	lex
 SUBDIR+=	mkstr
+SUBDIR+=	nm
+SUBDIR+=	readelf
 SUBDIR+=	rpcgen
 SUBDIR+=	unifdef
+SUBDIR+=	size
+SUBDIR+=	strings
 .if ${MACHINE_ARCH} != "aarch64" # ARM64TODO xlint does not build
 SUBDIR+=	xlint
 .endif
