svn commit: r195868 - in projects/ppc64: . gnu/usr.bin/binutils gnu/usr.bin/binutils/as gnu/usr.bin/binutils/as/powerpc64-freebsd gnu/usr.bin/binutils/as/ppc64-freebsd gnu/usr.bin/binutils/gdb gnu/...

Nathan Whitehorn nwhitehorn at FreeBSD.org
Sat Jul 25 14:31:25 UTC 2009 

Author: nwhitehorn
Date: Sat Jul 25 14:31:24 2009
New Revision: 195868
URL: http://svn.freebsd.org/changeset/base/195868

Log:
  Before I get too far, rename the architecture from 'ppc64' to 'powerpc64'.
  This seems to be a more common name.

Added:
  projects/ppc64/gnu/usr.bin/binutils/as/powerpc64-freebsd/
     - copied from r195670, projects/ppc64/gnu/usr.bin/binutils/as/ppc64-freebsd/
  projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile.powerpc64
     - copied unchanged from r195670, projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile.ppc64
  projects/ppc64/gnu/usr.bin/binutils/ld/Makefile.powerpc64
     - copied unchanged from r195670, projects/ppc64/gnu/usr.bin/binutils/ld/Makefile.ppc64
  projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64
     - copied unchanged from r195670, projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile.ppc64
  projects/ppc64/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
     - copied unchanged from r195670, projects/ppc64/gnu/usr.bin/binutils/libopcodes/Makefile.ppc64
Deleted:
  projects/ppc64/gnu/usr.bin/binutils/as/ppc64-freebsd/
  projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile.ppc64
  projects/ppc64/gnu/usr.bin/binutils/ld/Makefile.ppc64
  projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile.ppc64
  projects/ppc64/gnu/usr.bin/binutils/libopcodes/Makefile.ppc64
Modified:
  projects/ppc64/Makefile.inc1
  projects/ppc64/gnu/usr.bin/binutils/Makefile.inc0
  projects/ppc64/gnu/usr.bin/binutils/as/Makefile
  projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile
  projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile
  projects/ppc64/gnu/usr.bin/cc/Makefile.tgt
  projects/ppc64/gnu/usr.bin/cc/cc_tools/Makefile
  projects/ppc64/gnu/usr.bin/cc/include/Makefile
  projects/ppc64/lib/libc/Makefile
  projects/ppc64/lib/msun/Makefile
  projects/ppc64/share/mk/bsd.endian.mk
  projects/ppc64/sys/conf/kern.mk

Modified: projects/ppc64/Makefile.inc1
==============================================================================
--- projects/ppc64/Makefile.inc1	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/Makefile.inc1	Sat Jul 25 14:31:24 2009	(r195868)
@@ -128,7 +128,7 @@ TARGET=		${TARGET_ARCH}
 TARGET?=	${MACHINE}
 TARGET_ARCH?=	${MACHINE_ARCH}
 
-KNOWN_ARCHES?=	amd64 arm i386 i386/pc98 ia64 mips powerpc ppc64 sparc64 sparc64/sun4v
+KNOWN_ARCHES?=	amd64 arm i386 i386/pc98 ia64 mips powerpc powerpc64 sparc64 sparc64/sun4v
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else

Modified: projects/ppc64/gnu/usr.bin/binutils/Makefile.inc0
==============================================================================
--- projects/ppc64/gnu/usr.bin/binutils/Makefile.inc0	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/gnu/usr.bin/binutils/Makefile.inc0	Sat Jul 25 14:31:24 2009	(r195868)
@@ -9,8 +9,6 @@ VERSION=	"2.15 [FreeBSD] 2004-05-23"
 TARGET_ARCH?=	${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64"
 BINUTILS_ARCH=x86_64
-.elif ${TARGET_ARCH} == "ppc64"
-BINUTILS_ARCH=powerpc64
 .else
 BINUTILS_ARCH=${TARGET_ARCH}
 .endif

Modified: projects/ppc64/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- projects/ppc64/gnu/usr.bin/binutils/as/Makefile	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/gnu/usr.bin/binutils/as/Makefile	Sat Jul 25 14:31:24 2009	(r195868)
@@ -26,7 +26,7 @@ SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.
 
 .if ${TARGET_ARCH} == "amd64"
 SRCS+=	tc-i386.c
-.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "ppc64"
+.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

Modified: projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile
==============================================================================
--- projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile	Sat Jul 25 14:31:24 2009	(r195868)
@@ -12,7 +12,7 @@ GDBDIR= ${.CURDIR}/../../../../contrib/g
 GDB_CPU=	sparc
 .elif ${TARGET_ARCH} == "amd64"
 GDB_CPU=	i386
-.elif ${TARGET_ARCH} == "ppc64"
+.elif ${TARGET_ARCH} == "powerpc64"
 GDB_CPU=        powerpc
 .else
 GDB_CPU=	${TARGET_ARCH}

Copied: projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile.powerpc64 (from r195670, projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile.ppc64)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile.powerpc64	Sat Jul 25 14:31:24 2009	(r195868, copy of r195670, projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile.ppc64)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+XSRCS+=	ppcnbsd-nat.c ppc-tdep.c \
+	core-regset.c
+CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_powerpc_vec

Copied: projects/ppc64/gnu/usr.bin/binutils/ld/Makefile.powerpc64 (from r195670, projects/ppc64/gnu/usr.bin/binutils/ld/Makefile.ppc64)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ppc64/gnu/usr.bin/binutils/ld/Makefile.powerpc64	Sat Jul 25 14:31:24 2009	(r195868, copy of r195670, projects/ppc64/gnu/usr.bin/binutils/ld/Makefile.ppc64)
@@ -0,0 +1,12 @@
+# $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}

Modified: projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile
==============================================================================
--- projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile	Sat Jul 25 14:31:24 2009	(r195868)
@@ -25,7 +25,7 @@ SELARCH=
 SELARCH= &bfd_i386_arch
 .elif ${TARGET_ARCH} == "sparc64"
 SELARCH= &bfd_sparc_arch
-.elif ${TARGET_ARCH} == "ppc64"
+.elif ${TARGET_ARCH} == "powerpc64"
 SELARCH= &bfd_powerpc_arch
 .else
 .for _a in ${ARCHS}

Copied: projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64 (from r195670, projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile.ppc64)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64	Sat Jul 25 14:31:24 2009	(r195868, copy of r195670, projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile.ppc64)
@@ -0,0 +1,25 @@
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.9 2006/08/24 02:36:21 marcel Exp $
+
+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 

Copied: projects/ppc64/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64 (from r195670, projects/ppc64/gnu/usr.bin/binutils/libopcodes/Makefile.ppc64)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ppc64/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64	Sat Jul 25 14:31:24 2009	(r195868, copy of r195670, projects/ppc64/gnu/usr.bin/binutils/libopcodes/Makefile.ppc64)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SRCS+=	ppc-dis.c ppc-opc.c
+CFLAGS+= -DARCH_powerpc -DARCH_rs6000

Modified: projects/ppc64/gnu/usr.bin/cc/Makefile.tgt
==============================================================================
--- projects/ppc64/gnu/usr.bin/cc/Makefile.tgt	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/gnu/usr.bin/cc/Makefile.tgt	Sat Jul 25 14:31:24 2009	(r195868)
@@ -4,7 +4,7 @@ TARGET_ARCH?=	${MACHINE_ARCH}
 
 .if ${TARGET_ARCH} == "amd64"
 GCC_CPU=	i386
-.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "ppc64"
+.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 GCC_CPU=	rs6000
 .elif ${TARGET_ARCH} == "sparc64"
 GCC_CPU=	sparc
@@ -21,7 +21,7 @@ TARGET_CPU_DEFAULT= 16
 .if ${TARGET_ARCH} == "sparc64"
 TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc
 .endif
-.if ${TARGET_ARCH} == "ppc64"
+.if ${TARGET_ARCH} == "powerpc64"
 TARGET_CPU_DEFAULT= \"powerpc64\"
 .endif
 

Modified: projects/ppc64/gnu/usr.bin/cc/cc_tools/Makefile
==============================================================================
--- projects/ppc64/gnu/usr.bin/cc/cc_tools/Makefile	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/gnu/usr.bin/cc/cc_tools/Makefile	Sat Jul 25 14:31:24 2009	(r195868)
@@ -56,7 +56,7 @@ TARGET_INC+=	${GCC_CPU}/freebsd.h
 .if ${TARGET_ARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/freebsd64.h
 .endif
-.if ${TARGET_ARCH} == "ppc64"
+.if ${TARGET_ARCH} == "powerpc64"
 TARGET_INC+=    ${GCC_CPU}/default64.h
 .endif
 .if ${TARGET_ARCH} == "arm"
@@ -174,7 +174,7 @@ OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/
 OPT_FILES+=	${.CURDIR}/${GCC_CPU}-freebsd.opt
 .endif
 
-.if ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "ppc64"
+.if ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/sysv4.opt
 .endif
 

Modified: projects/ppc64/gnu/usr.bin/cc/include/Makefile
==============================================================================
--- projects/ppc64/gnu/usr.bin/cc/include/Makefile	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/gnu/usr.bin/cc/include/Makefile	Sat Jul 25 14:31:24 2009	(r195868)
@@ -10,7 +10,7 @@ INCS=	emmintrin.h mmintrin.h pmmintrin.h
 INCS=	ia64intrin.h
 .elif ${TARGET_ARCH} == "arm"
 INCS=	mmintrin.h
-.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "ppc64"
+.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 INCS=	ppc-asm.h altivec.h spe.h
 .endif
 

Modified: projects/ppc64/lib/libc/Makefile
==============================================================================
--- projects/ppc64/lib/libc/Makefile	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/lib/libc/Makefile	Sat Jul 25 14:31:24 2009	(r195868)
@@ -51,6 +51,7 @@ NOASM=
 .include "${.CURDIR}/posix1e/Makefile.inc"
 .if ${MACHINE_ARCH} != "amd64" && \
     ${MACHINE_ARCH} != "ia64" && \
+    ${MACHINE_ARCH} != "powerpc64" && \
     ${MACHINE_ARCH} != "sparc64"
 .include "${.CURDIR}/quad/Makefile.inc"
 .endif

Modified: projects/ppc64/lib/msun/Makefile
==============================================================================
--- projects/ppc64/lib/msun/Makefile	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/lib/msun/Makefile	Sat Jul 25 14:31:24 2009	(r195868)
@@ -14,6 +14,8 @@
 
 .if ${MACHINE_ARCH} == "i386"
 ARCH_SUBDIR= i387
+.elif ${MACHINE_ARCH} == "powerpc64"
+ARCH_SUBDIR= powerpc
 .else
 ARCH_SUBDIR= ${MACHINE_ARCH}
 .endif

Modified: projects/ppc64/share/mk/bsd.endian.mk
==============================================================================
--- projects/ppc64/share/mk/bsd.endian.mk	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/share/mk/bsd.endian.mk	Sat Jul 25 14:31:24 2009	(r195868)
@@ -7,7 +7,7 @@
     (${MACHINE_ARCH} == "mips" && !defined(TARGET_BIG_ENDIAN))
 TARGET_ENDIANNESS= 1234
 .elif ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_ARCH} == "ppc64" || \
+    ${MACHINE_ARCH} == "powerpc64" || \
     ${MACHINE_ARCH} == "sparc64" || \
     ${MACHINE_ARCH} == "arm" || \
     ${MACHINE_ARCH} == "mips"

Modified: projects/ppc64/sys/conf/kern.mk
==============================================================================
--- projects/ppc64/sys/conf/kern.mk	Sat Jul 25 11:10:51 2009	(r195867)
+++ projects/ppc64/sys/conf/kern.mk	Sat Jul 25 14:31:24 2009	(r195868)
@@ -80,7 +80,7 @@ INLINE_LIMIT?=	8000
 # floating point registers for integer operations which it has a tendency to do.
 # Also explicitly disable Altivec instructions inside the kernel.
 #
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "ppc64"
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-msoft-float -mno-altivec
 INLINE_LIMIT?=	15000
 .endif

More information about the svn-src-projects mailing list