From e05895f1fad7b89999a9a84bbe97c2272de79e3e Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Fri, 6 Dec 2013 18:51:07 +0100
Subject: [PATCH] Set binutils 2.24 as primary, binutils 2.22 as alternate

By default, world will now build with binutils 2.24 and objformat will
also default to these programs.  Previously binutils 2.22 has been
performing these duties.
---
 Makefile.inc1                 | 2 +-
 gnu/usr.bin/Makefile.buo      | 4 ++--
 usr.bin/objformat/objformat.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 33e4b0a565..8ab74702a8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -127,7 +127,7 @@ DESTDIRBASE:=		${OBJTREE}${.CURDIR}
 # This section sets the tools used to build the world/kernel
 WORLD_CCVER?=		gcc47
 WORLD_LDVER?=		ld.bfd
-WORLD_BINUTILSVER?=	binutils222
+WORLD_BINUTILSVER?=	binutils224
 
 # Set the backup parameters if they are not already defined
 #
diff --git a/gnu/usr.bin/Makefile.buo b/gnu/usr.bin/Makefile.buo
index 49aa4fc2e0..358657ecf9 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=	binutils222
-BU_BACKUP=	binutils224
+BU_PRIMARY=	binutils224
+BU_BACKUP=	binutils222
 
 .if defined(BUVERSION)
 .if (${BUVERSION} == ${BU_PRIMARY})
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index 76aee797b8..15e59de9b1 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -41,7 +41,7 @@
 #endif
 
 #ifndef BINUTILSVER_DEFAULT
-#define	BINUTILSVER_DEFAULT "binutils222"
+#define	BINUTILSVER_DEFAULT "binutils224"
 #endif
 
 #define LINKER_DEFAULT "ld.bfd"
-- 
2.41.0