7 files changed, 13 insertions, 4 deletions

diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index c6a69be427d3..c20cf6c04cc4 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
-		addr2line ar as gasp ld nm objcopy objdump ranlib \
+		addr2line ar as gasp ld nm objcopy objdump ranlib readelf \
 		size strings strip doc
 
 .if !defined(NO_GDB)
diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index 46160c5e29d5..ab37ee714f32 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -8,7 +8,7 @@
 # definitions before the sub-Makefile is processed.
 #
 
-VERSION=	2.10.0
+VERSION=	2.10.1
 TARGET_ARCH?=	${MACHINE_ARCH}
 
 .if ${TARGET_ARCH} == "mipsel" || ${TARGET_ARCH} == "mipseb"
diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index dbfe76b3d964..67d1bb4ba17d 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -17,9 +17,9 @@ INFOENTRY_binutils= "* Binutils: (binutils).		The GNU Binary Utilities."
 
 MAKEINFOFLAGS+= --no-validate
 MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc -I ${SRCDIR}/ld -I ${SRCDIR}/bfd/doc
+MAKEINFOFLAGS+= -I ${SRCDIR}/binutils
 MAKEINFOFLAGS+= -I ${GDBDIR}/gdb/doc
 MAKEINFOFLAGS+= -I ${CONTRIBDIR}/libreadline/doc
-MAKEINFOFLAGS+= -I ${CONTRIBDIR}/binutils/binutils
 
 CLEANFILES= gdb-cfg.texi inc-hist.texi inc-hist.texi.orig
 
diff --git a/gnu/usr.bin/binutils/libbfd/alpha/bfd.h b/gnu/usr.bin/binutils/libbfd/alpha/bfd.h
index af911c459561..d15fbae056eb 100644
--- a/gnu/usr.bin/binutils/libbfd/alpha/bfd.h
+++ b/gnu/usr.bin/binutils/libbfd/alpha/bfd.h
@@ -53,6 +53,9 @@ extern "C" {
 
 #include "ansidecl.h"
 
+/* FreeBSD does not adhere to the System V 64-bit ABI.  */
+#define ELF_DYNAMIC_INTERPRETER "/usr/libexec/ld-elf.so.1"
+
 /* These two lines get substitutions done by commands in Makefile.in.  */
 /* #define BFD_VERSION  "2.9.5" */
 #define BFD_ARCH_SIZE 64
diff --git a/gnu/usr.bin/binutils/libbfd/i386/bfd.h b/gnu/usr.bin/binutils/libbfd/i386/bfd.h
index 618dc1f31cd9..8ce14ccf5efd 100644
--- a/gnu/usr.bin/binutils/libbfd/i386/bfd.h
+++ b/gnu/usr.bin/binutils/libbfd/i386/bfd.h
@@ -53,6 +53,9 @@ extern "C" {
 
 #include "ansidecl.h"
 
+/* FreeBSD does not adhere to the Intel386 System V ABI.  */
+#define ELF_DYNAMIC_INTERPRETER "/usr/libexec/ld-elf.so.1"
+
 /* These two lines get substitutions done by commands in Makefile.in.  */
 /* #define BFD_VERSION  "2.9.5" */
 #define BFD_ARCH_SIZE 32
diff --git a/gnu/usr.bin/binutils/libbfd/sparc/bfd.h b/gnu/usr.bin/binutils/libbfd/sparc/bfd.h
index 618dc1f31cd9..fc8182e99544 100644
--- a/gnu/usr.bin/binutils/libbfd/sparc/bfd.h
+++ b/gnu/usr.bin/binutils/libbfd/sparc/bfd.h
@@ -53,6 +53,9 @@ extern "C" {
 
 #include "ansidecl.h"
 
+/* FreeBSD does not adhere to the Solaris/System V ABI.  */
+#define ELF_DYNAMIC_INTERPRETER "/usr/libexec/ld-elf.so.1"
+
 /* These two lines get substitutions done by commands in Makefile.in.  */
 /* #define BFD_VERSION  "2.9.5" */
 #define BFD_ARCH_SIZE 32
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile
index 0c66f6069a9e..dd1a99f147e8 100644
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@@ -7,7 +7,7 @@
 .PATH: ${SRCDIR}/libiberty
 
 LIB=		iberty
-SRCS=		argv.c basename.c choose-temp.c concat.c cplus-dem.c \
+SRCS=		argv.c basename.c choose-temp.c concat.c cp-demangle.c cplus-dem.c dyn-string.c \
 		fdmatch.c fnmatch.c getopt.c getopt1.c getruntime.c \
 		hex.c floatformat.c objalloc.c obstack.c spaces.c \
 		strerror.c strsignal.c xatexit.c xexit.c xmalloc.c \