From fb5ff7384cfdf48bd850eb9d6691c19f9139698f Mon Sep 17 00:00:00 2001 From: Steve Kiernan Date: Thu, 19 Jan 2023 18:07:38 -0800 Subject: [PATCH] arm64: Use FULLKERNEL instead of .ALLSRC in .bin target Using .ALLSRC may get additional arguments that we may not want and could cause the objcopy to fail. Reviewed by: emaste Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39639 --- sys/conf/Makefile.arm64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/Makefile.arm64 b/sys/conf/Makefile.arm64 index cda06346611..6719404c329 100644 --- a/sys/conf/Makefile.arm64 +++ b/sys/conf/Makefile.arm64 @@ -93,8 +93,8 @@ CLEAN+= ${KERNEL_KO}.bin # and the temp file together to make the kernel.bin file. ${KERNEL_KO}.bin: ${FULLKERNEL} @${OBJCOPY} --wildcard --strip-symbol='$$[adtx]*' \ - --output-target=binary ${.ALLSRC} ${.TARGET}.temp - @{ ${NM} ${.ALLSRC} | \ + --output-target=binary ${FULLKERNEL} ${.TARGET}.temp + @{ ${NM} ${FULLKERNEL} | \ ${AWK} -f $S/tools/arm_kernel_boothdr.awk -v hdrtype=v8booti && \ cat ${.TARGET}.temp; \ } > ${.TARGET}