Initial set of changes to build powerpc64 toolchain.

Disable PIC/PIE for powerpc64 for now.

4 files changed, 14 insertions, 10 deletions

diff --git a/Makefile.cross b/Makefile.cross
index ad5d4f10860..610741b8fe5 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.107 2019/11/07 11:32:23 mpi Exp $
+# $OpenBSD: Makefile.cross,v 1.108 2020/05/30 19:22:00 drahn Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -28,7 +28,7 @@ TARGET_CPU?=	${TARGET_ARCH}
 
 # List of LP64 archs
 # XXX move to bsd.*.mk?
-LP64_ARCH = aarch64 amd64 alpha mips64 mips64el sparc64
+LP64_ARCH = aarch64 amd64 alpha mips64 mips64el sparc64 powerpc64
 
 TARGET_IS_LP64 =
 MACHINE_IS_LP64 =
diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
index 63df8b5d830..41ca6e57a19 100644
--- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.20 2020/01/03 03:50:44 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.21 2020/05/30 19:22:00 drahn Exp $
 
 .include <bsd.own.mk>
 
@@ -32,7 +32,7 @@ INST_SUBDIRS+=	binutils
 MAN+=		binutils/doc/ar.1 binutils/doc/ranlib.1 \
 		binutils/doc/strings.1 binutils/doc/strip.1
 
-.if ${TARGET_ARCH} != "aarch64"
+.if (${TARGET_ARCH} != "aarch64" && ${TARGET_ARCH} != "powerpc64")
 SUBDIRS+=	ld gas
 CONF_SUBDIRS+=	ld gas
 INST_SUBDIRS+=	ld gas
@@ -58,7 +58,7 @@ CONFIGTARGET=--target=${TARGET_ARCH}-unknown-openbsd${OSREV}
 CONFIGTARGET=
 .endif
 
-.if ${TARGET_ARCH} == "aarch64"
+.if ${TARGET_ARCH} == "aarch64" || ${TARGET_ARCH} == "powerpc64"
 CONFIGTARGET+=--without-gnu-ld
 CONFIGTARGET+=--without-gnu-as
 .endif
diff --git a/gnu/usr.bin/clang/Makefile.arch b/gnu/usr.bin/clang/Makefile.arch
index b1a1c03f629..85deb95ac92 100644
--- a/gnu/usr.bin/clang/Makefile.arch
+++ b/gnu/usr.bin/clang/Makefile.arch
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile.arch,v 1.6 2019/03/05 06:04:32 jsg Exp $
+# $OpenBSD: Makefile.arch,v 1.7 2020/05/30 19:22:00 drahn Exp $
 
 LLVM_ARCHS=AArch64 AMDGPU ARM Mips PowerPC Sparc X86
 
 LLVM_ARCH?=
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 LLVM_ARCH=	X86
-.elif ${MACHINE_ARCH} == "powerpc"
+.elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
 LLVM_ARCH=	PowerPC
 .elif ${MACHINE_ARCH} == "sparc64"
 LLVM_ARCH=	Sparc
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 52bce77cea4..98a440097a6 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.201 2020/04/02 17:58:43 kettenis Exp $
+#	$OpenBSD: bsd.own.mk,v 1.202 2020/05/30 19:22:00 drahn Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -15,15 +15,19 @@ SKEY?=		yes
 # Set `YP' to `yes' to build with support for NIS/YP.
 YP?=		yes
 
-CLANG_ARCH=aarch64 amd64 arm i386 mips64 mips64el powerpc sparc64
+CLANG_ARCH=aarch64 amd64 arm i386 mips64 mips64el powerpc powerpc64 sparc64
 GCC4_ARCH=alpha hppa mips64el sh sparc64
 GCC3_ARCH=m88k
-LLD_ARCH=aarch64 amd64 arm i386
+LLD_ARCH=aarch64 amd64 arm i386 powerpc64
 
 .if ${MACHINE} == "sgi"
 GCC4_ARCH+=mips64
 .endif
 
+.if ${MACHINE_ARCH} == "powerpc64"
+NOPIC=
+.endif
+
 # m88k: ?
 PIE_ARCH=aarch64 alpha amd64 arm hppa i386 mips64 mips64el powerpc sh sparc64
 STATICPIE_ARCH=aarch64 alpha amd64 arm hppa i386 mips64 mips64el powerpc sh sparc64