Index: share/mk/bsd.compat.mk =================================================================== --- share/mk/bsd.compat.mk +++ share/mk/bsd.compat.mk @@ -52,15 +52,11 @@ LIB32CPUFLAGS+= -m32 .else LIB32CPUFLAGS+= -target powerpc-unknown-freebsd13.0 - -# Use BFD to workaround ld.lld issues on PowerPC 32 bit -LIB32CPUFLAGS+= -fuse-ld=${LD_BFD} .endif LIB32_MACHINE= powerpc LIB32_MACHINE_ARCH= powerpc -LIB32WMAKEFLAGS= \ - LD="${LD_BFD} -m elf32ppc_fbsd" +LIB32WMAKEFLAGS= -m elf32ppc_fbsd .elif ${COMPAT_ARCH:Mmips64*} != "" HAS_COMPAT=32 Index: share/mk/bsd.cpu.mk =================================================================== --- share/mk/bsd.cpu.mk +++ share/mk/bsd.cpu.mk @@ -388,16 +388,3 @@ CFLAGS += ${CFLAGS.${MACHINE_ARCH}} CXXFLAGS += ${CXXFLAGS.${MACHINE_ARCH}} - -# Defines a variable for Binutils linker, to be used to workaround some -# issue with LLVM LLD (i.e. support for PowerPC32 bit on PowerPC64) -# -# This is an unavoidable cross coupling with Makefile.inc1 and -# normal builds works when CROSS_BINUTILS_PREFIX and could be removed -# when LLD PowerPC 32 bit support is completed -.if defined(CROSS_BINUTILS_PREFIX) -LD_BFD=${LOCALBASE}/bin/${CROSS_BINUTILS_PREFIX}-ld.bfd -.else -LD_BFD=${OBJTOP}/tmp/usr/bin/ld.bfd -.endif - Index: share/mk/src.opts.mk =================================================================== --- share/mk/src.opts.mk +++ share/mk/src.opts.mk @@ -300,7 +300,7 @@ .if ${__T} == "aarch64" || ${__T:Mriscv*} != "" BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB .endif -.if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*} +.if ${__T} == "amd64" || ${__T} == "i386" __DEFAULT_YES_OPTIONS+=BINUTILS_BOOTSTRAP .else __DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP @@ -308,7 +308,7 @@ .if ${__T:Mriscv*} != "" BROKEN_OPTIONS+=OFED .endif -.if ${__TT} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" +.if ${__TT} != "mips" __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD .else __DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD Index: stand/defs.mk =================================================================== --- stand/defs.mk +++ stand/defs.mk @@ -99,12 +99,9 @@ # All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc # or powerpc64. .if ${MACHINE_ARCH} == "powerpc64" +# XXX Use COMPAT_CPUTYPE CFLAGS+= -m32 -mcpu=powerpc -# Use ld.bfd to workaround ld.lld issues on PowerPC 32 bit -.if "${COMPILER_TYPE}" == "clang" && "${LINKER_TYPE}" == "lld" -CFLAGS+= -fuse-ld=${LD_BFD} .endif -.endif # For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is # build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here