From ce0cfc0ef3b9641ed144479ce4a07e1be6771050 Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 15 Nov 2010 22:12:13 +0000
Subject: [PATCH] Garbage-collect some code made obsolete by the TBEMD import.

---
 gnu/usr.bin/binutils/as/Makefile                     | 2 +-
 gnu/usr.bin/binutils/as/powerpc64-freebsd/itbl-cpu.h | 6 ------
 gnu/usr.bin/binutils/as/powerpc64-freebsd/targ-cpu.h | 3 ---
 gnu/usr.bin/binutils/libbfd/Makefile                 | 2 --
 gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64   | 4 ----
 5 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 gnu/usr.bin/binutils/as/powerpc64-freebsd/itbl-cpu.h
 delete mode 100644 gnu/usr.bin/binutils/as/powerpc64-freebsd/targ-cpu.h
 delete mode 100644 gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64

diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index e4a133f68a95..db76610584e4 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" || ${TARGET_ARCH} == "powerpc64"
+.elif ${TARGET_CPUARCH} == "powerpc"
 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
deleted file mode 100644
index b55da9afd1aa..000000000000
--- a/gnu/usr.bin/binutils/as/powerpc64-freebsd/itbl-cpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $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
deleted file mode 100644
index 891bd6cabaf1..000000000000
--- a/gnu/usr.bin/binutils/as/powerpc64-freebsd/targ-cpu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $FreeBSD$ */
-
-#include "tc-ppc.h"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 8ace1e24cd26..3bd512c40a84 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -24,8 +24,6 @@ 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/libopcodes/Makefile.powerpc64 b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
deleted file mode 100644
index cc010ec4a306..000000000000
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-SRCS+=	ppc-dis.c ppc-opc.c
-CFLAGS+= -DARCH_powerpc -DARCH_rs6000