9 files changed, 79 insertions, 1 deletions

diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index cd37311ad437..72cbd5384876 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -26,7 +26,7 @@ SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.l
 
 .if ${TARGET_ARCH} == "amd64"
 SRCS+=	tc-i386.c
-.elif ${TARGET_ARCH} == "powerpc"
+.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 SRCS+=	tc-ppc.c
 .elif ${TARGET_ARCH} == "sparc64"
 # change back to tc-sparc.c when new binutils is imported
diff --git a/gnu/usr.bin/binutils/as/powerpc64-freebsd/itbl-cpu.h b/gnu/usr.bin/binutils/as/powerpc64-freebsd/itbl-cpu.h
new file mode 100644
index 000000000000..b55da9afd1aa
--- /dev/null
+++ b/gnu/usr.bin/binutils/as/powerpc64-freebsd/itbl-cpu.h
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+
+/* Values for processors will be from 0 to NUMBER_OF_PROCESSORS-1 */
+#define NUMBER_OF_PROCESSORS 1
+
+#include "itbl-ppc.h"
diff --git a/gnu/usr.bin/binutils/as/powerpc64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/powerpc64-freebsd/targ-cpu.h
new file mode 100644
index 000000000000..891bd6cabaf1
--- /dev/null
+++ b/gnu/usr.bin/binutils/as/powerpc64-freebsd/targ-cpu.h
@@ -0,0 +1,3 @@
+/* $FreeBSD$ */
+
+#include "tc-ppc.h"
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index ecf8cce33ed9..6e52616ad309 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -12,6 +12,8 @@ GDBDIR= ${.CURDIR}/../../../../contrib/gdb
 GDB_CPU=	sparc
 .elif ${TARGET_ARCH} == "amd64"
 GDB_CPU=	i386
+.elif ${TARGET_ARCH} == "powerpc64"
+GDB_CPU=        powerpc
 .else
 GDB_CPU=	${TARGET_ARCH}
 .endif
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.powerpc64 b/gnu/usr.bin/binutils/gdb/Makefile.powerpc64
new file mode 100644
index 000000000000..4cea11345a12
--- /dev/null
+++ b/gnu/usr.bin/binutils/gdb/Makefile.powerpc64
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+XSRCS+=	ppcnbsd-nat.c ppc-tdep.c \
+	core-regset.c
+CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_powerpc_vec
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc64 b/gnu/usr.bin/binutils/ld/Makefile.powerpc64
new file mode 100644
index 000000000000..3dd3bf93b5e9
--- /dev/null
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc64
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+NATIVE_EMULATION=	elf64ppc
+
+SRCS+=		e${NATIVE_EMULATION}.c
+CLEANFILES+=	e${NATIVE_EMULATION}.c
+e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
+	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \
+	    ${TOOLS_PREFIX}/usr \
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    ${NATIVE_EMULATION} ""  no ${NATIVE_EMULATION} ${TARGET_TUPLE}
+
+PPC32_EMULATION= elf32ppc
+_ppc32_path=	\"${TOOLS_PREFIX}/usr/lib32\"
+EMS+=		${PPC32_EMULATION}
+.for ext in ${ELF_SCR_EXT}
+LDSCRIPTS+=	${PPC32_EMULATION}.${ext}
+.endfor
+
+SRCS+=		e${PPC32_EMULATION}.c
+CLEANFILES+=	e${PPC32_EMULATION}.c
+e${PPC32_EMULATION}.c: emulparams/${PPC32_EMULATION}.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
+	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_ppc32_path} \
+	    ${TOOLS_PREFIX}/usr \
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    ${PPC32_EMULATION} "" no ${PPC32_EMULATION} ${TARGET_TUPLE}
+
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 3bd512c40a84..8ace1e24cd26 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -24,6 +24,8 @@ SELARCH=
 SELARCH= &bfd_i386_arch
 .elif ${TARGET_ARCH} == "sparc64"
 SELARCH= &bfd_sparc_arch
+.elif ${TARGET_ARCH} == "powerpc64"
+SELARCH= &bfd_powerpc_arch,&bfd_rs6000_arch
 .else
 .for _a in ${ARCHS}
 .if ${SELARCH} == ""
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64 b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64
new file mode 100644
index 000000000000..d65e3d142cb8
--- /dev/null
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+ARCHS+=	rs6000
+
+DEFAULT_VECTOR=	bfd_elf64_powerpc_vec
+
+SRCS+=	cpu-powerpc.c	\
+	cpu-rs6000.c	\
+	elf32.c		\
+	elf32-gen.c	\
+	elf32-ppc.c	\
+	elf32-target.h	\
+	elflink.c	\
+	elf64.c		\
+	elf64-gen.c	\
+	elf64-ppc.c	\
+	elf64-target.h	\
+	elflink.c	\
+	ppcboot.c	\
+	xcofflink.c
+
+VECS+=	${DEFAULT_VECTOR} \
+	bfd_elf64_powerpcle_vec	\
+	bfd_elf32_powerpc_vec \
+	bfd_elf32_powerpcle_vec \
+	ppcboot_vec
+
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64 b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
new file mode 100644
index 000000000000..cc010ec4a306
--- /dev/null
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SRCS+=	ppc-dis.c ppc-opc.c
+CFLAGS+= -DARCH_powerpc -DARCH_rs6000