Switch macppc to ld.lld

Add powerpc to LLD_ARCH.  Remove -Wl,-relax flag; ld.bfd needed it,
but ld.lld can't take this flag.

To avoid linker errors on macppc, you need a snapshot where
/usr/bin/ld is LLD.

ok kettenis@ deraadt@

diff --git a/gnu/usr.bin/clang/Makefile.inc b/gnu/usr.bin/clang/Makefile.inc
index 208d270..5c16e10 100644 (file)
--- a/gnu/usr.bin/clang/Makefile.inc
+++ b/gnu/usr.bin/clang/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.24 2021/05/19 23:18:40 drahn Exp $
+# $OpenBSD: Makefile.inc,v 1.25 2021/08/21 03:00:02 gkoehler Exp $
 
 CLANG_SRCS?=   ${.CURDIR}/../../../llvm/clang
 LLDB_SRCS?=    ${.CURDIR}/../../../llvm/lldb
@@ -77,7 +77,3 @@ DPADD+=       ${.OBJDIR}/../lib${lib}/lib${lib}.a
 LDADD+=        ${.OBJDIR}/../lib${lib}/lib${lib}.a
 .endfor
 LDADD+=-Wl,--end-group
-
-.if ${MACHINE_ARCH} == "powerpc"
-LDADD+=-Wl,-relax
-.endif

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 7e8d5b2..2406339 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.own.mk,v 1.210 2021/05/02 22:32:31 naddy Exp $
+#      $OpenBSD: bsd.own.mk,v 1.211 2021/08/21 03:00:02 gkoehler Exp $
 #      $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -18,7 +18,7 @@ YP?=          yes
 CLANG_ARCH=aarch64 amd64 arm i386 mips64 mips64el powerpc powerpc64 riscv64 sparc64
 GCC4_ARCH=alpha hppa sh sparc64
 GCC3_ARCH=m88k
-LLD_ARCH=aarch64 amd64 arm i386 powerpc64 riscv64
+LLD_ARCH=aarch64 amd64 arm i386 powerpc powerpc64 riscv64
 
 # m88k: ?
 PIE_ARCH=aarch64 alpha amd64 arm hppa i386 mips64 mips64el powerpc powerpc64 riscv64 sh sparc64