From f413db3a54c221accdb42c9fc8aee5d57c344276 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Thu, 1 Dec 2011 18:32:06 +0100
Subject: [PATCH] gold linker 2.22: Unbreak it

The trick to avoid rebuilding 6 object files unnecessarily ended up making
the gold linker of binutils 2.22 stop working.  This commit takes them
off of the gold library and back to the gold program, and again to the
incremental-dump program.  Until somebody shows me the way the latter
program can use object files from the former one, we're just going to
build them twice.
---
 gnu/usr.bin/binutils222/gold/Makefile    |  8 +++++++-
 gnu/usr.bin/binutils222/incdump/Makefile |  7 +++++++
 gnu/usr.bin/binutils222/libgold/Makefile | 12 ------------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/gnu/usr.bin/binutils222/gold/Makefile b/gnu/usr.bin/binutils222/gold/Makefile
index d7e2e73721..a096a5251b 100644
--- a/gnu/usr.bin/binutils222/gold/Makefile
+++ b/gnu/usr.bin/binutils222/gold/Makefile
@@ -1,7 +1,13 @@
 .include "../Makefile.gld"
 
 PROG_CXX= ld.gold
-SRCS+=	  main.cc
+SRCS+=	main.cc			\
+	i386.cc			\
+	x86_64.cc		\
+	sparc.cc		\
+	powerpc.cc		\
+	arm.cc			\
+	arm-reloc-property.cc
 NOMAN=
 WARNS=	1
 CFLAGS+= -I${.CURDIR}/../libgold
diff --git a/gnu/usr.bin/binutils222/incdump/Makefile b/gnu/usr.bin/binutils222/incdump/Makefile
index 19c90750dc..b4cfa1ef08 100644
--- a/gnu/usr.bin/binutils222/incdump/Makefile
+++ b/gnu/usr.bin/binutils222/incdump/Makefile
@@ -1,6 +1,13 @@
 .include "../Makefile.gld"
 
 PROG_CXX= incremental-dump
+SRCS+=	incremental-dump.cc	\
+	i386.cc			\
+	x86_64.cc		\
+	sparc.cc		\
+	powerpc.cc		\
+	arm.cc			\
+	arm-reloc-property.cc
 NOMAN=
 WARNS=	1
 CFLAGS+= -I${.CURDIR}/../libgold
diff --git a/gnu/usr.bin/binutils222/libgold/Makefile b/gnu/usr.bin/binutils222/libgold/Makefile
index e42bccb88c..e618b010f5 100644
--- a/gnu/usr.bin/binutils222/libgold/Makefile
+++ b/gnu/usr.bin/binutils222/libgold/Makefile
@@ -51,16 +51,4 @@ SRCS+=	archive.cc		\
 	yyscript.c		\
 	mremap.c
 
-# The next files aren't really part of libgold, but they are common to both
-# ld.gold and incremental dump, so add them here to avoid building object
-# files twice
-
-SRCS+=	i386.cc			\
-	x86_64.cc		\
-	sparc.cc		\
-	powerpc.cc		\
-	arm.cc			\
-	arm-reloc-property.cc
-
-
 .include <bsd.lib.mk>
-- 
2.41.0