From 5cc5a38c1e99afd87d0195107883f1cb1b66bb52 Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Mon, 19 Dec 2016 08:02:20 +0200
Subject: [PATCH] Switch to binutils227 as default base binutils.

DPorts were fixed to work with ld.gold version 1.12 from binutils 2.27,
some workarounds were added to few ports. Haskell.
ld(ld.gold) has become very strict, in some scenarios LDVER=ld.bfd will help.
Updated binutils bring better support for world/kernel compilation with -flto.
Also updated ld.gold now is able to link chromium without any DSO warnings.

Signed-off-by: marino, swildner
---
 Makefile.inc1                 |  2 +-
 UPDATING                      | 11 +++++++++++
 gnu/usr.bin/Makefile.buo      |  4 ++--
 share/man/man5/make.conf.5    |  8 ++++----
 share/mk/bsd.cpu.mk           |  2 +-
 usr.bin/objformat/objformat.c |  2 +-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 2b42094891..74398983a8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -125,7 +125,7 @@ DESTDIRBASE:=		${OBJTREE}${.CURDIR}
 # This section sets the tools used to build the world/kernel
 WORLD_CCVER?=		gcc50
 WORLD_LDVER?=		ld.gold
-WORLD_BINUTILSVER?=	binutils225
+WORLD_BINUTILSVER?=	binutils227
 
 # Set the backup parameters if they are not already defined
 #
diff --git a/UPDATING b/UPDATING
index 8281bb47c5..6d5748dcff 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,17 @@
 +         UPGRADING DRAGONFLY FROM 4.6 TO LATER VERSIONS                +
 +-----------------------------------------------------------------------+
 
+BINUTILS 2.27 REPLACES 2.24, PRIMARY
+------------------------------------
+
+The oldest of the two versions of Binutils, version 2.24, was removed
+and replaced with Binutils 2.27.  It becomes the primary version version
+of binutils and version 2.25 becomes the alternate.
+
+The accepted values of BINUTILSVER are now "binutils227" (default) and
+"binutils225".  The building of Binutils 2.25 can be prevented by setting
+NO_ALTBINUTILS=yes in make.conf.
+
 COMPAT_43 KERNEL OPTION REMOVED
 -------------------------------
 
diff --git a/gnu/usr.bin/Makefile.buo b/gnu/usr.bin/Makefile.buo
index d0e7cbe44d..0bb725a2b1 100644
--- a/gnu/usr.bin/Makefile.buo
+++ b/gnu/usr.bin/Makefile.buo
@@ -9,8 +9,8 @@
 # Ideally in the future the Makefiles are generic and only have to be
 # copied over in most cases.
 
-BU_PRIMARY=	binutils225
-BU_BACKUP=	binutils227
+BU_PRIMARY=	binutils227
+BU_BACKUP=	binutils225
 
 .if defined(BUVERSION)
 .if (${BUVERSION} == ${BU_PRIMARY})
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 6fd458220d..9b7be9110f 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
 .\"
-.Dd September 6, 2016
+.Dd December 19, 2016
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -148,15 +148,15 @@ is the default value.
 .Pq Vt str
 Controls which binutils to use by default.
 Currently accepted values are
-.Dq binutils227
-and
 .Dq binutils225
+and
+.Dq binutils227
 (default).
 .It Va WORLD_BINUTILSVER
 .Pq Vt str
 Controls which version of binutils builds the base system, including
 the kernel.
-.Dq binutils225
+.Dq binutils227
 is the default value.
 .It Va WORLD_CFLAGS
 .Pq Vt str
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 2902691a92..f09b107be6 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -15,7 +15,7 @@
 # we back off to something it probably does have.
 
 _DEFAULT_CCVER=		gcc50
-_DEFAULT_BINUTILSVER=	binutils225
+_DEFAULT_BINUTILSVER=	binutils227
 
 CCVER ?= ${_DEFAULT_CCVER}
 _CCVER := ${CCVER}
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index 0eb63a2199..b658bca0af 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -41,7 +41,7 @@
 #endif
 
 #ifndef BINUTILSVER_DEFAULT
-#define	BINUTILSVER_DEFAULT "binutils225"
+#define	BINUTILSVER_DEFAULT "binutils227"
 #endif
 
 #define LINKER_BFD     "ld.bfd"
-- 
2.41.0