From 968d62e1a14f679c0a0ca39cc7d30efafe864ccc Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 7 Jan 2015 22:02:37 +0000
Subject: [PATCH] Use a set of ELF Tool Chain tools by default

These tools are now from the ELF Tool Chain project:

 * addr2line
 * elfcopy (strip)
 * nm
 * size
 * strings

The binutils versions are available by setting in src.conf:
WITHOUT_ELFTOOLCHAIN_TOOLS=yes

Thanks to antoine@ for multiple exp-runs and diagnosing many of the
failures.

PR:		195561 (ports exp-run)
Sponsored by:	The FreeBSD Foundation
---
 UPDATING                                                   | 7 +++++++
 share/mk/src.opts.mk                                       | 2 +-
 ...{WITH_ELFTOOLCHAIN_TOOLS => WITHOUT_ELFTOOLCHAIN_TOOLS} | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
 rename tools/build/options/{WITH_ELFTOOLCHAIN_TOOLS => WITHOUT_ELFTOOLCHAIN_TOOLS} (63%)

diff --git a/UPDATING b/UPDATING
index c2969a1f8de..8b32fee0803 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150107:
+	ELF tools addr2line, elfcopy (strip), nm, size, and strings are now
+	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.
+
 20150105:
 	The default Unbound configuration now enables remote control
 	using a local socket.  Users who have already enabled the
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index d66bbaa5936..f8adc30c963 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -73,6 +73,7 @@ __DEFAULT_YES_OPTIONS = \
     DMAGENT \
     DYNAMICROOT \
     ED_CRYPTO \
+    ELFTOOLCHAIN_TOOLS \
     EXAMPLES \
     FDT \
     FLOPPY \
@@ -159,7 +160,6 @@ __DEFAULT_NO_OPTIONS = \
     BSD_GREP \
     CLANG_EXTRAS \
     EISA \
-    ELFTOOLCHAIN_TOOLS \
     FMAKE \
     HESIOD \
     LLDB \
diff --git a/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS b/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
similarity index 63%
rename from tools/build/options/WITH_ELFTOOLCHAIN_TOOLS
rename to tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
index 1d6197851d7..e4780582c86 100644
--- a/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS
+++ b/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
@@ -6,4 +6,4 @@ Set to use
 .Xr strings 1 ,
 and
 .Xr strip 1
-from the elftoolchain project instead of GNU binutils.
+from GNU binutils instead of the ELF Tool Chain project.