Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Aug 2015 18:30:01 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r286332 - in head: . gnu/usr.bin/binutils gnu/usr.bin/binutils/addr2line gnu/usr.bin/binutils/ar gnu/usr.bin/binutils/nm gnu/usr.bin/binutils/ranlib gnu/usr.bin/binutils/readelf gnu/usr...
Message-ID:  <201508051830.t75IU1Oo060513@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Wed Aug  5 18:30:00 2015
New Revision: 286332
URL: https://svnweb.freebsd.org/changeset/base/286332

Log:
  Remove old GNU Binutils tools now provided by ELF Tool Chain
  
  Reviewed by:	bapt, brooks
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D3238

Deleted:
  head/gnu/usr.bin/binutils/addr2line/Makefile
  head/gnu/usr.bin/binutils/addr2line/Makefile.depend
  head/gnu/usr.bin/binutils/addr2line/addr2line.1
  head/gnu/usr.bin/binutils/ar/Makefile.depend
  head/gnu/usr.bin/binutils/nm/Makefile
  head/gnu/usr.bin/binutils/nm/Makefile.depend
  head/gnu/usr.bin/binutils/nm/nm.1
  head/gnu/usr.bin/binutils/ranlib/Makefile.depend
  head/gnu/usr.bin/binutils/readelf/Makefile
  head/gnu/usr.bin/binutils/readelf/Makefile.depend
  head/gnu/usr.bin/binutils/readelf/readelf.1
  head/gnu/usr.bin/binutils/size/Makefile
  head/gnu/usr.bin/binutils/size/Makefile.depend
  head/gnu/usr.bin/binutils/size/size.1
  head/gnu/usr.bin/binutils/strings/Makefile
  head/gnu/usr.bin/binutils/strings/Makefile.depend
  head/gnu/usr.bin/binutils/strings/strings.1
  head/gnu/usr.bin/binutils/strip/Makefile
  head/gnu/usr.bin/binutils/strip/Makefile.depend
  head/gnu/usr.bin/binutils/strip/strip.1
  head/gnu/usr.bin/cc/c++filt/Makefile
  head/gnu/usr.bin/cc/c++filt/Makefile.depend
Modified:
  head/UPDATING
  head/gnu/usr.bin/binutils/Makefile
  head/gnu/usr.bin/cc/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/tools/build/options/WITHOUT_BINUTILS
  head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Aug  5 18:14:01 2015	(r286331)
+++ head/UPDATING	Wed Aug  5 18:30:00 2015	(r286332)
@@ -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".)
 
+20150805:
+	GNU Binutils versions of addr2line, c++filt, nm, readelf, size,
+	strings and strip have been removed. The src.conf(5) knob
+	WITHOUT_ELFTOOLCHAIN_TOOLS no longer provides the binutils tools.
+
 20150728:
 	As ZFS requires more kernel stack pages than is the default on some
 	architectures e.g. i386, it now warns if KSTACK_PAGES is less than
@@ -224,7 +229,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	taken from the ELF Tool Chain project rather than GNU binutils. They
 	should be drop-in replacements, with the addition of arm64 support.
 	The WITHOUT_ELFTOOLCHAIN_TOOLS= knob may be used to obtain the
-	binutils tools, if necessary.
+	binutils tools, if necessary. See 20150805 for updated information.
 
 20150105:
 	The default Unbound configuration now enables remote control

Modified: head/gnu/usr.bin/binutils/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile	Wed Aug  5 18:14:01 2015	(r286331)
+++ head/gnu/usr.bin/binutils/Makefile	Wed Aug  5 18:30:00 2015	(r286332)
@@ -7,25 +7,11 @@ SUBDIR=	doc\
 	libbfd \
 	libopcodes \
 	libbinutils \
-	${_addr2line} \
 	as \
 	ld \
-	${_nm} \
 	${_objcopy} \
 	objdump \
-	${_readelf} \
-	${_size} \
-	${_strings} \
-	${_strip}
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == "no"
-_addr2line=	addr2line
-_nm=		nm
-_readelf=	readelf
-_size=		size
-_strings=	strings
-_strip=		strip
-.endif
 .if ${MK_ELFTOOLCHAIN_TOOLS} == "no" || ${MK_ELFCOPY_AS_OBJCOPY} == "no"
 _objcopy=	objcopy
 .endif

Modified: head/gnu/usr.bin/cc/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/Makefile	Wed Aug  5 18:14:01 2015	(r286331)
+++ head/gnu/usr.bin/cc/Makefile	Wed Aug  5 18:30:00 2015	(r286332)
@@ -13,9 +13,6 @@ SUBDIR+= cpp
 
 .if ${MK_CXX} != "no"
 SUBDIR+= cc1plus c++
-.if ${MK_ELFTOOLCHAIN_TOOLS} == "no"
-SUBDIR+= c++filt
-.endif
 .endif
 
 .if ${MK_GCOV} != "no"

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Aug  5 18:14:01 2015	(r286331)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Aug  5 18:30:00 2015	(r286332)
@@ -1025,9 +1025,6 @@ OLD_DIRS+=usr/include/fs/cuse
 .if ${MK_CXX} == no
 OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/c++
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no
-OLD_FILES+=usr/bin/c++filt
-.endif
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .endif
@@ -1656,14 +1653,16 @@ OLD_FILES+=usr/bin/elfcopy
 OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
 .endif
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no && ${MK_BINUTILS} == no
+.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
@@ -1753,9 +1752,6 @@ OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
 .if ${MK_GCC} == no
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no
-OLD_FILES+=usr/bin/c++filt
-.endif
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/bin/gcov

Modified: head/tools/build/options/WITHOUT_BINUTILS
==============================================================================
--- head/tools/build/options/WITHOUT_BINUTILS	Wed Aug  5 18:14:01 2015	(r286331)
+++ head/tools/build/options/WITHOUT_BINUTILS	Wed Aug  5 18:30:00 2015	(r286332)
@@ -1,5 +1,4 @@
 .\" $FreeBSD$
-Set to not build or install binutils (as, c++-filt,
-ld, nm, objcopy, objdump, readelf, size and strip) as part
+Set to not build or install binutils (as, ld, objcopy, and objdump ) as part
 of the normal system build.
 The resulting system cannot build programs from source.

Modified: head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
==============================================================================
--- head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS	Wed Aug  5 18:14:01 2015	(r286331)
+++ head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS	Wed Aug  5 18:30:00 2015	(r286332)
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-Set to use
+Set to avoid building ELF Tool Chain tools
 .Xr addr2line 1 ,
 .Xr c++filt 1 ,
 .Xr nm 1 ,
@@ -7,5 +7,4 @@ Set to use
 .Xr size 1 ,
 .Xr strings 1 ,
 and
-.Xr strip 1
-from GNU binutils instead of the ELF Tool Chain project.
+.Xr strip 1 .



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508051830.t75IU1Oo060513>