A first attempt at merging our local changes and fixes into the 2.17 codebase.

ld(1) needs a lot more work, as the upstream code evolved significantly since
2.15, mostly due to changes in PIE binaries layout, and we had already
diverged significantly to implement W^X.

2 files changed, 4 insertions, 4 deletions

diff --git a/gnu/usr.bin/binutils-2.17/gprof/Makefile.am b/gnu/usr.bin/binutils-2.17/gprof/Makefile.am
index 1b862675353..3869fca38ad 100644
--- a/gnu/usr.bin/binutils-2.17/gprof/Makefile.am
+++ b/gnu/usr.bin/binutils-2.17/gprof/Makefile.am
@@ -26,8 +26,8 @@ sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \
 	search_list.c symtab.c sym_ids.c utils.c \
 	i386.c alpha.c vax.c tahoe.c sparc.c mips.c
 gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
-gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLDEPS)
-gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLLIBS)
+gprof_DEPENDENCIES = ../bfd/libbfd.la $(INTLDEPS)
+gprof_LDADD = ../bfd/libbfd.la -liberty $(INTLLIBS)
 
 noinst_HEADERS = \
 	basic_blocks.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
diff --git a/gnu/usr.bin/binutils-2.17/gprof/Makefile.in b/gnu/usr.bin/binutils-2.17/gprof/Makefile.in
index 328a3da48d7..ea5b9c65efe 100644
--- a/gnu/usr.bin/binutils-2.17/gprof/Makefile.in
+++ b/gnu/usr.bin/binutils-2.17/gprof/Makefile.in
@@ -247,8 +247,8 @@ sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \
 	i386.c alpha.c vax.c tahoe.c sparc.c mips.c
 
 gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
-gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLDEPS)
-gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLLIBS)
+gprof_DEPENDENCIES = ../bfd/libbfd.la $(INTLDEPS)
+gprof_LDADD = ../bfd/libbfd.la -liberty $(INTLLIBS)
 noinst_HEADERS = \
 	basic_blocks.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
 	corefile.h gmon.h gmon_io.h gmon_out.h gprof.h hertz.h hist.h \