svn commit: r215276 - in head/gnu/usr.bin: binutils cc gdb gdb/libgdb

[Warner Losh]

Author: imp
Date: Sun Nov 14 01:52:19 2010
New Revision: 215276
URL: http://svn.freebsd.org/changeset/base/215276

Log:
  We need to add powerpc64->powerpc translations (I knew I hated copying
  this code in the first place).
  
  Also MACHINE_ARCH powerpc is 32-bit, not MACHINE_CPUARCH == powerpc.
  
  Submitted by:	nathanw

Modified:
  head/gnu/usr.bin/binutils/Makefile.inc0
  head/gnu/usr.bin/cc/Makefile.tgt
  head/gnu/usr.bin/gdb/Makefile.inc
  head/gnu/usr.bin/gdb/libgdb/Makefile

Modified: head/gnu/usr.bin/binutils/Makefile.inc0
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile.inc0	Sun Nov 14 01:50:40 2010	(r215275)
+++ head/gnu/usr.bin/binutils/Makefile.inc0	Sun Nov 14 01:52:19 2010	(r215276)
@@ -7,7 +7,7 @@
 VERSION=	"2.15 [FreeBSD] 2004-05-23"
 
 .if defined(TARGET_ARCH)
-TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif
@@ -27,7 +27,7 @@ RELSRC=	${RELTOP}/../../../contrib/binut
 SRCDIR=	${.CURDIR}/${RELSRC}
 
 .if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "i386" || \
-	${TARGET_CPUARCH} == "powerpc" || \
+	${TARGET_ARCH} == "powerpc" || \
 	(${TARGET_CPUARCH} == "mips" && \
 		(!defined(TARGET_ABI) || ${TARGET_ABI} != "n64"))
 CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32

Modified: head/gnu/usr.bin/cc/Makefile.tgt
==============================================================================
--- head/gnu/usr.bin/cc/Makefile.tgt	Sun Nov 14 01:50:40 2010	(r215275)
+++ head/gnu/usr.bin/cc/Makefile.tgt	Sun Nov 14 01:52:19 2010	(r215276)
@@ -4,7 +4,7 @@
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
 
 .if defined(TARGET_ARCH)
-TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif

Modified: head/gnu/usr.bin/gdb/Makefile.inc
==============================================================================
--- head/gnu/usr.bin/gdb/Makefile.inc	Sun Nov 14 01:50:40 2010	(r215275)
+++ head/gnu/usr.bin/gdb/Makefile.inc	Sun Nov 14 01:52:19 2010	(r215276)
@@ -20,7 +20,7 @@ OBJ_GDB= ${OBJ_ROOT}/gdb
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
 
 .if defined(TARGET_ARCH)
-TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif

Modified: head/gnu/usr.bin/gdb/libgdb/Makefile
==============================================================================
--- head/gnu/usr.bin/gdb/libgdb/Makefile	Sun Nov 14 01:50:40 2010	(r215275)
+++ head/gnu/usr.bin/gdb/libgdb/Makefile	Sun Nov 14 01:52:19 2010	(r215276)
@@ -4,7 +4,7 @@
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
 
 .if defined(TARGET_ARCH)
-TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif