 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.aarch64,v 1.24 2023/07/26 03:39:55 rin Exp $
+#	$NetBSD: Makefile.aarch64,v 1.25 2023/07/28 02:41:30 rin Exp $
 # Makefile for NetBSD
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/<arch>/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/arm/conf/Makefile.arm
 # after which config should be rerun for all machines of that type.
+#
 @@ -85,35 +85,29 @@ ${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFIL
 .endif
 locore.o: ${ARM}/aarch64/locore.S assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 KERNLDSCRIPT?=	${ARM}/conf/kern.ldscript
 LOADADDRESS?=	0xffffc00000000000
 LINKFLAGS_NORMAL=	-X
 # Strip AArch64 mapping symbols from the kernel image, as they interfere
-# with ddb, but don't strip them in netbsd.gdb.
+# with ddb, but don't strip them in netbsd.gdb. See Makefile.kern.inc.
-AA64_STRIP_SYMBOLS=	--strip-symbol='[$$][dx]' \
+ARCH_STRIP_SYMBOLS=	--strip-symbol='[$$][dx]' \
 			--strip-symbol='[$$][dx]\.*'
 .if (defined(DEBUG) && !empty(DEBUG:M-g*)) || (!defined(DEBUG) && \
 	(${MKDEBUGKERNEL:Uno} == "yes" || ${MKDEBUG:Uno} == "yes"))
 OBJCOPY_STRIPFLAGS=	-g -w ${AA64_STRIP_SYMBOLS}
 .else
 SYSTEM_LD_TAIL=		@${OBJCOPY} -w ${AA64_STRIP_SYMBOLS} $@
 .endif
 ##
 ## (6) port specific target dependencies
 ##
 # depend on DIAGNOSTIC etc.
 cpuswitch.o fault.o machdep.o: Makefile
 # various assembly files that depend on assym.h
 atomic.o bcopy_page.o bcopyinout.o copystr.o cpuswitch.o cpu_in_cksum.o: assym.h
 exception.o sigcode.o: assym.h
 spl.o vectors.o: assym.h

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.arm,v 1.56 2023/07/26 03:39:55 rin Exp $
+#	$NetBSD: Makefile.arm,v 1.57 2023/07/28 02:41:30 rin Exp $
 # Makefile for NetBSD
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/<arch>/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/arm/conf/Makefile.arm
 # after which config should be rerun for all machines of that type.
+#
 @@ -96,35 +96,29 @@ MD_SFILES+=	${SYSTEM_FIRST_SFILE} ${ARM}
 ${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFILE} assym.h
 	${NORMAL_S}
 .endif
 locore.o: ${ARM}/arm32/locore.S assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 LOADADDRESS?=	0xF0000000
 LINKFLAGS_NORMAL=	-X
 # Strip ARM mapping symbols from the kernel image, as they interfere
-# with ddb, but don't strip them in netbsd.gdb.
+# with ddb, but don't strip them in netbsd.gdb. See Makefile.kern.inc.
-ARM_STRIP_SYMBOLS=	--strip-symbol='[$$][atd]' \
+ARCH_STRIP_SYMBOLS=	--strip-symbol='[$$][atd]' \
 			--strip-symbol='[$$][atd]\.*'
 .if (defined(DEBUG) && !empty(DEBUG:M-g*)) || (!defined(DEBUG) && \
 	(${MKDEBUGKERNEL:Uno} == "yes" || ${MKDEBUG:Uno} == "yes"))
 OBJCOPY_STRIPFLAGS=	-g -w ${ARM_STRIP_SYMBOLS}
 .else
 SYSTEM_LD_TAIL=		@${OBJCOPY} -w ${ARM_STRIP_SYMBOLS} $@
 .endif
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 cpufunc.o cpufunc_asm.o: Makefile
 # depend on DIAGNOSTIC etc.
 cpuswitch.o fault.o machdep.o: Makefile
 # various assembly files that depend on assym.h
 atomic.o bcopy_page.o bcopyinout.o copystr.o cpuswitch.o cpu_in_cksum.o: assym.h

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.kern.inc,v 1.298 2023/07/26 03:39:55 rin Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.299 2023/07/28 02:41:31 rin Exp $
+#
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
+#
 # Each target in this file should be protected with `if !target(target)'
 # or `if !commands(target)' and each variable should only be conditionally
 # assigned `VAR ?= VALUE', so that everything can be overridden.
+#
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
 @@ -235,32 +235,42 @@ SYSTEM_LD?=	${_MKSHMSG} "   link  ${.CUR
 		${OBJS:M*swap${.TARGET}.o}
 TEXTADDR?=	${LOADADDRESS}			# backwards compatibility
 LINKTEXT?=	${TEXTADDR:C/.+/-Ttext &/}
 LINKDATA?=	${DATAADDR:C/.+/-Tdata &/}
 ENTRYPOINT?=	start
 LINKENTRY?=	${ENTRYPOINT:C/.+/-e &/}
 LINKFLAGS?=	${LINKFORMAT} ${LINKSCRIPT} ${LINKTEXT} ${LINKDATA} ${LINKENTRY} \
 		${EXTRA_LINKFLAGS}
 LINKFLAGS_DEBUG?=	-X
 KERNEL_CONFIG?=	${KERNEL_BUILD:T}
-SYSTEM_LD_TAIL?= @${_MKSHECHO}
+SYSTEM_LD_TAIL?=	@${_MKSHECHO}
-SYSTEM_LD_TAIL+= && ${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c && \
+OBJCOPY_STRIPFLAGS?=	-g
 		${SIZE} $@ && ${SYSTEM_CTFMERGE} && chmod 755 $@
 SYSTEM_LD_TAIL+= && runit() { echo $$@; $$@; }
-OBJCOPY_STRIPFLAGS?= -g
+# Strip some architecture-defined symbols from kernel image, while
 # keep them in netbsd.gdb.
 .if defined(ARCH_STRIP_SYMBOLS)
 .if empty(DEBUG:M-g*)
 SYSTEM_LD_TAIL+=	&& ${OBJCOPY} -w ${ARCH_STRIP_SYMBOLS} $@
 .endif
 OBJCOPY_STRIPFLAGS+=	-w ${ARCH_STRIP_SYMBOLS}
 .endif
 SYSTEM_LD_TAIL+= && ${TOOL_SED} \
 	'/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c && \
 	${SIZE} $@ && ${SYSTEM_CTFMERGE} && chmod 755 $@ && \
 	runit() { echo $$@; $$@; }
 SYSTEM_LD_TAIL_DEBUG?=&& \
 	runit mv -f $@ $@.gdb && \
 	runit ${OBJCOPY} --only-keep-debug $@.gdb $@-${KERNEL_CONFIG}.debug && \
 	runit ${OBJCOPY} ${OBJCOPY_STRIPFLAGS} -p -R .gnu_debuglink \
 	    --add-gnu-debuglink=$@-${KERNEL_CONFIG}.debug $@.gdb $@ && \
 	runit chmod 755 $@ $@.gdb $@-${KERNEL_CONFIG}.debug
 LINKFLAGS_NORMAL?=	-S
 STRIPFLAGS?=	-g
 .if !empty(DEBUG:M-g*)
 SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_DEBUG}