The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f21a6a6a8fc59393173d9a537ed8cebbdbd6343c
commit f21a6a6a8fc59393173d9a537ed8cebbdbd6343c Author: Warner Losh <[email protected]> AuthorDate: 2024-08-01 05:47:13 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2024-08-01 05:47:13 +0000 vmm: Build with proper ldscript on aarch64 A new instance of using ld with -T to bring in the kernel ld script crept into the tree after I originally did the refactoring. It too needs -L ${SYSDIR}/conf added. Fixes: 37d6d682af59 Sponsored by: Netflix --- sys/modules/vmm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index fc9340e9cd86..88586a39bf96 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -52,7 +52,7 @@ vmm_hyp.o: vmm_hyp.c ${.IMPSRC} -o ${.TARGET} -fpie vmm_hyp_blob.elf.full: vmm_hyp_exception.o vmm_hyp.o - ${LD} -m ${LD_EMULATION} -Bdynamic -T ${SYSDIR}/conf/ldscript.arm64 \ + ${LD} -m ${LD_EMULATION} -Bdynamic -L ${SYSDIR}/conf -T ${SYSDIR}/conf/ldscript.arm64 \ ${_LDFLAGS:N-zbti-report*} --no-warn-mismatch --warn-common --export-dynamic \ --dynamic-linker /red/herring -X -o ${.TARGET} ${.ALLSRC} \ --defsym=_start='0x0' --defsym=text_start='0x0'
