 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.kern.inc,v 1.282 2021/09/11 20:28:05 andvar Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.283 2021/10/25 07:54:44 ryo 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.
 @@ -140,28 +140,28 @@ COMPILE_CTFCONVERT=	${_MKSHECHO}\
 			${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
 			${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .else
 COMPILE_CTFCONVERT=	${_MKSHNOECHO}
 .endif
 KCOMPILE.c=	${CC} ${COPTS.${<:T}} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
 KCOMPILE.s=	${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} -c $< -o $@
 KLINK.o=	${LD} -r ${LINKFORMAT} -Map=${.TARGET}.map -o ${.TARGET} ${.ALLSRC}
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # NOPROF and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 NORMAL_C?=	@${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}" && \
-		${_MKSHECHO} ${KCOMPILE.c} ${PROF} && \
+		${_MKSHECHO} ${KCOMPILE.c} ${PROF.${.IMPSRC:T}:U${PROF}} && \
-		${KCOMPILE.c} ${PROF} && \
+		${KCOMPILE.c} ${PROF.${.IMPSRC:T}:U${PROF}} && \
 		${COMPILE_CTFCONVERT}
 NOPROF_C?=	@${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}" && \
 		${_MKSHECHO} ${KCOMPILE.c} && \
 		${KCOMPILE.c} && \
 		${COMPILE_CTFCONVERT}
 NORMAL_S?=	@${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}" && \
 		${_MKSHECHO} ${KCOMPILE.s} && \
 		${KCOMPILE.s}
 # link rules:
 LINK_O?=	@${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}" && \
 		${_MKSHECHO} ${KLINK.o} && \
 		${KLINK.o}

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.libkern,v 1.51 2021/05/17 08:50:36 mrg Exp $
+#	$NetBSD: Makefile.libkern,v 1.52 2021/10/25 07:54:44 ryo Exp $
+#
 # Variable definitions for libkern.
+#
 # Before including this, you _must_ set
 #   KERNDIR: location of sys/lib/libkern
+#
 # You *may* set:
 #   LIBKERN_ARCH: architecture subdir to be used
 #   KERNCPPFLAGS: see Makefile.inc
 #   KERNMISCCPPFLAGS: see Makefile.inc
+#
 @@ -45,27 +45,27 @@ CPPFLAGS+=	-I${KERNDIR}/../../../common/
 .endif
 .if !defined(RUMPKERNEL)
 .include "${.PARSEDIR}/Makefile.compiler-rt"
 .endif
 # Other stuff
 SRCS+=	kern_assert.c __main.c
 SRCS+=	cpuset.c inet_addr.c intoa.c
 .if empty(SRCS:Mbyte_swap_8.*)
 SRCS+=	bswap64.c
 .endif
 SRCS+=	md4c.c md5c.c rmd160.c sha1.c sha2.c sha3.c keccak.c murmurhash.c
-SRCS+=	pmatch.c mcount.c crc32.c
+SRCS+=	pmatch.c crc32.c
 SRCS+=	strlist.c
 SRCS+=	ppath_kmem_alloc.c
 SRCS+=	copystr.c
 SRCS+=	strsep.c strstr.c
 SRCS+=	strlcpy.c strlcat.c
 SRCS+=	imax.c imin.c lmax.c lmin.c uimax.c uimin.c ulmax.c ulmin.c
 SRCS+=	memmove.c
 SRCS+=	strchr.c strrchr.c
 SRCS+=	memcmp.c memmem.c
 @@ -92,26 +92,30 @@ SRCS+=	xlat_mbr_fstype.c
 SRCS+=	heapsort.c ptree.c radixtree.c rb.c rpst.c
 SRCS+=	hexdump.c
 # for crypto
 SRCS+=	explicit_memset.c consttime_memequal.c
 SRCS+=	entpool.c
 SRCS+=	dkcksum.c
 SRCS+=	disklabel_swap.c
 # for profiling
 SRCS+=	mcount.c
 PROF.mcount.c=			# mcount.c itself is never a profiling target
 .PATH:	${NETBSDSRCDIR}/common/lib/libc/cdb
 SRCS+=	cdbr.c
 SRCS+=	mi_vector_hash.c
 # Files to clean up
 CLEANFILES+= lib${LIB}.o lib${LIB}.po
 # Remove from SRCS the .c files for any .S files added by the MD makefiles,
 # also remove from SRCS the .c files for the .c files in NO_SRCS.
 # (Unlike libc, we don't worry about lint)
 .for check_file in ${SRCS:M*.S} ${NO_SRCS}
 unwanted_file := ${SRCS:M${check_file:.S=.c}}

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.README,v 1.419 2021/10/14 11:45:46 nia Exp $
+#	$NetBSD: bsd.README,v 1.420 2021/10/25 07:54:44 ryo Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 This is the README file for the make "include" files for the NetBSD
 source tree.  The files are installed in /usr/share/mk, and are,
 by convention, named with the suffix ".mk".
 Note, this file is not intended to replace reading through the .mk
 files for anything tricky.
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 RANDOM THINGS WORTH KNOWING:
 @@ -1620,26 +1620,30 @@ LDADD		Additional loader objects.  Usual
 			LDADD+=-lutil -lcompat
 LDFLAGS		Additional linker flags (passed to ${CC} during link).
 LINKS		See <bsd.links.mk>
 OBJCOPTS	Additional flags to the compiler when creating ObjC objects.
 OBJCOPTS.<fn>	Additional flags to the compiler when creating the
 		ObjC objects for <fn>.
 		For <fn>.[ly], "<fn>.c" must be used.
 PROF.<fn>	Alternative flag instead of "-pg" to pass to the compiler
 		when profiling <fn>. For <fn>.[ly], "<fn>.c" must be used.
 		Usually used to exclude a particular file from profiling.
 SYMLINKS	See <bsd.links.mk>
 MAN		Manual pages (should end in .1 - .9).  If no MAN variable is
 		defined, "MAN=${PROG}.1" is assumed.
 PAXCTL_FLAGS	If defined, run paxctl(1) on the program binary after link
 		time, with the value of this variable as args to paxctl(1).
 PAXCTL_FLAGS.${PROG} Custom override for PAXCTL_FLAGS.
 PROG		The name of the program to build.  If not supplied, nothing
 		is built.

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.lib.mk,v 1.385 2021/08/21 11:55:24 andvar Exp $
+#	$NetBSD: bsd.lib.mk,v 1.386 2021/10/25 07:54:44 ryo Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 .include <bsd.init.mk>
 .include <bsd.shlib.mk>
 .include <bsd.gcc.mk>
 .include <bsd.sanitizer.mk>
 # Pull in <bsd.sys.mk> here so we can override its .c.o rule
 .include <bsd.sys.mk>
 LIBISMODULE?=	no
 LIBISPRIVATE?=	no
 LIBISCXX?=	no
 @@ -41,27 +41,28 @@ MKPROFILE:=	no
 realinstall:	checkver libinstall
 ##### LIB specific flags.
 # XXX: This is needed for programs that link with .a libraries
 # Perhaps a more correct solution is to always generate _pic.a
 # files or always have a shared library.
 # Another fix is to provide rcrt0.o like OpenBSD does and
 # do relocations for static PIE.
 .if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
 CFLAGS+=        ${PIE_CFLAGS}
 AFLAGS+=        ${PIE_AFLAGS}
 .endif
-PGFLAGS+=	-pg
+PROF?=		-pg
 PGFLAGS+=	${PROF.${.IMPSRC:T}:U${PROF}}
 .if ${MKPIC} != "no"
 PGFLAGS+=	-fPIC
 .endif
 ##### Libraries that this may depend upon.
 .if defined(LIBDPLIBS) && ${MKPIC} != "no"				# {
 .for _lib _dir in ${LIBDPLIBS}
 .if !defined(LIBDO.${_lib})
 LIBDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=LIBDO.${_lib}
 .endif
 .if ${LIBDO.${_lib}} == "_external"
 LDADD+=		-l${_lib}