17 files changed, 20 insertions, 81 deletions

diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 2380738fa638..37649fa2e11f 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -14,4 +14,6 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
deleted file mode 100644
index a0a6360d68e0..000000000000
--- a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $FreeBSD$ */
-
-#include "tc-ia64.h"
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 81a46d5d21b0..6c59945808a2 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -5,10 +5,6 @@
 
 .PATH: ${SRCDIR}/ld
 
-.if ${TARGET_ARCH} == "ia64"
-CFLAGS+= -O1
-.endif
-
 PROG=	ld
 SCRIPTDIR= /usr/libdata/ldscripts
 SRCS+=	ldcref.c \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 b/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
index 9a0d07116a18..65ee0abc784b 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
+++ b/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	bin/cat.host \
 	gnu/lib/csu \
 	gnu/usr.bin/binutils/libbfd \
 	gnu/usr.bin/binutils/libiberty \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.ia64 b/gnu/usr.bin/binutils/ld/Makefile.ia64
deleted file mode 100644
index 50a7bb63a63b..000000000000
--- a/gnu/usr.bin/binutils/ld/Makefile.ia64
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-NATIVE_EMULATION= elf64_ia64_fbsd
-
-SRCS+=		e${NATIVE_EMULATION}.c
-CLEANFILES+=	e${NATIVE_EMULATION}.c
-e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \
-    scripttempl/elf.sc genscripts.sh stringify.sed
-	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSEARCHPATH} \
-	    ${TOOLS_PREFIX}/usr \
-	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
-	    ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \
-	    ${.CURDIR}/${NATIVE_EMULATION}.sh
-
-#XXX	EMS+=	eelf64_ia64
-
-SRCS+=	eelf64_ia64.c
-CLEANFILES+=	eelf64_ia64.c
-eelf64_ia64.c: emulparams/elf64_ia64.sh emultempl/elf32.em \
-    scripttempl/elf.sc genscripts.sh stringify.sed
-	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSEARCHPATH} \
-	    ${TOOLS_PREFIX}/usr \
-	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
-	    elf64_ia64 "" no elf64_ia64 ${TARGET_TUPLE}
diff --git a/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh b/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh
deleted file mode 100644
index 213b494736f5..000000000000
--- a/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-. ${srcdir}/emulparams/elf64_ia64.sh
-TEXT_START_ADDR="0x0000000100000000"
-unset DATA_ADDR
-unset SMALL_DATA_CTOR
-unset SMALL_DATA_DTOR
-. ${srcdir}/emulparams/elf_fbsd.sh
-OUTPUT_FORMAT="elf64-ia64-freebsd"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 1493ccf07e8e..a24dd045bec5 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -42,7 +42,7 @@ SRCS+=	archive.c \
 	targets.c \
 	targmatch.h \
 	tekhex.c
-.if (${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64")
+.if ${TARGET_ARCH} == "sparc64"
 WARNS?=	2
 .endif
 CFLAGS+= -D_GNU_SOURCE
@@ -84,7 +84,7 @@ bfdver.h: Makefile
 	echo '#define BFD_VERSION	217500000'	> ${.TARGET}
 	echo '#define BFD_VERSION_DATE	20070703'	>> ${.TARGET}
 	echo '#define BFD_VERSION_STRING ${VERSION}'	>> ${.TARGET}
-	echo '#define REPORT_BUGS_TO "<http://www.freebsd.org/send-pr.html>"' >> ${.TARGET}
+	echo '#define REPORT_BUGS_TO "<http://www.freebsd.org/support.html>"' >> ${.TARGET}
 
 targmatch.h: targmatch.sed config.bfd
 	sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
deleted file mode 100644
index 2e489bcc62e5..000000000000
--- a/gnu/usr.bin/binutils/libbfd/Makefile.ia64
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-DEFAULT_VECTOR=	bfd_elf64_ia64_freebsd_vec
-
-SRCS+=	cofflink.c \
-	cpu-ia64.c \
-	efi-app-ia64.c \
-	elf32.c \
-	elf32-gen.c \
-	elf32-target.h \
-	elf64.c \
-	elf64-gen.c \
-	elf64-ia64.c \
-	elf64-target.h \
-	elflink.c \
-	pepigen.c \
-	pex64igen.c
-
-VECS+=	${DEFAULT_VECTOR} \
-	bfd_efi_app_ia64_vec \
-	bfd_elf64_ia64_little_vec \
-	bfd_elf64_ia64_big_vec \
-	bfd_elf64_little_generic_vec bfd_elf64_big_generic_vec \
-	bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec
-
-CLEANFILES+=	elf64-ia64.c pepigen.c pex64igen.c
-
-elf64-ia64.c: elfxx-ia64.c
-	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
-
-pepigen.c: peXXigen.c
-	sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET}
-
-pex64igen.c: peXXigen.c
-	sed -e s/XX/pex64/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/bfd.h b/gnu/usr.bin/binutils/libbfd/bfd.h
index c9dfef54ae26..f65123351d7c 100644
--- a/gnu/usr.bin/binutils/libbfd/bfd.h
+++ b/gnu/usr.bin/binutils/libbfd/bfd.h
@@ -85,7 +85,7 @@ extern "C" {
 #define BFD_HOST_64BIT_LONG 0
 #define BFD_HOST_64_BIT long long
 #define BFD_HOST_U_64_BIT unsigned long long
-#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__)
+#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
 #define BFD_HOST_64BIT_LONG 1
 #define BFD_HOST_64_BIT long
 #define BFD_HOST_U_64_BIT unsigned long
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64 b/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
deleted file mode 100644
index 98198cdea109..000000000000
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-SRCS+=	ia64-dis.c ia64-opc.c
-CFLAGS+= -DARCH_ia64
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index 4ef2b8fdf65a..5945d25adfc6 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -15,4 +15,6 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index 66d99f4e7538..c23e1e856626 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -14,4 +14,6 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index 1a0d04625d1a..fb275ac6a403 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -16,4 +16,6 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index d90c3bcc9cc9..fd3110d06541 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile
+++ b/gnu/usr.bin/binutils/readelf/Makefile
@@ -17,4 +17,6 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index c5c19c1908e9..a22e67f22e29 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -14,4 +14,6 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index a432d51ddf65..0ff82eb0ba25 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -14,4 +14,6 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index d3cf8c454cdc..6d170673d016 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -15,4 +15,6 @@ DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 INSTALLFLAGS= -S
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>