D32734.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32734.diff
View Options

	diff --git a/sys/conf/Makefile.arm64 b/sys/conf/Makefile.arm64
	--- a/sys/conf/Makefile.arm64
	+++ b/sys/conf/Makefile.arm64
	@@ -94,7 +94,7 @@
	${KERNEL_KO}.bin: ${FULLKERNEL}
	@${OBJCOPY} --wildcard --strip-symbol='$$[adtx]*' \
	--output-target=binary ${.ALLSRC} ${.TARGET}.temp
	- @{ readelf -s ${.ALLSRC} \| \
	+ @{ ${NM} ${.ALLSRC} \| \
	${AWK} -f $S/tools/arm_kernel_boothdr.awk -v hdrtype=v8booti && \
	cat ${.TARGET}.temp; \
	} > ${.TARGET}
	diff --git a/sys/tools/arm_kernel_boothdr.awk b/sys/tools/arm_kernel_boothdr.awk
	--- a/sys/tools/arm_kernel_boothdr.awk
	+++ b/sys/tools/arm_kernel_boothdr.awk
	@@ -144,22 +144,22 @@

	/kernbase/ {
	# If the symbol name is exactly "kernbase" save its address.
	- if ($8 == "kernbase") {
	- gKernbase = hexstr_to_num($2)
	+ if ($3 == "kernbase") {
	+ gKernbase = hexstr_to_num($1)
	}
	}

	/_start/ {
	# If the symbol name is exactly "_start" save its address.
	- if ($8 == "_start") {
	- gStart = hexstr_to_num($2)
	+ if ($3 == "_start") {
	+ gStart = hexstr_to_num($1)
	}
	}

	/_end/ {
	# If the symbol name is exactly "_end" remember its value.
	- if ($8 == "_end") {
	- gEnd = hexstr_to_num($2)
	+ if ($3 == "_end") {
	+ gEnd = hexstr_to_num($1)
	}
	}