Module Name: src
Committed By: ryo
Date: Wed Oct 27 03:06:59 UTC 2021
Modified Files:
src/share/mk: bsd.README bsd.lib.mk
src/sys/conf: Makefile.kern.inc
src/sys/lib/libkern: Makefile.libkern
Log Message:
revert previous:
http://mail-index.netbsd.org/source-changes/2021/10/25/msg133295.html
going to add __always_inline to the functions called from _mcount()
discussed on
http://mail-index.netbsd.org/source-changes-d/2021/10/25/msg013480.html
To generate a diff of this commit:
cvs rdiff -u -r1.420 -r1.421 src/share/mk/bsd.README
cvs rdiff -u -r1.386 -r1.387 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.283 -r1.284 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.52 -r1.53 src/sys/lib/libkern/Makefile.libkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.420 src/share/mk/bsd.README:1.421
--- src/share/mk/bsd.README:1.420 Mon Oct 25 07:54:44 2021
+++ src/share/mk/bsd.README Wed Oct 27 03:06:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.420 2021/10/25 07:54:44 ryo Exp $
+# $NetBSD: bsd.README,v 1.421 2021/10/27 03:06:59 ryo Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1630,10 +1630,6 @@ OBJCOPTS.<fn> Additional flags to the co
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
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.386 src/share/mk/bsd.lib.mk:1.387
--- src/share/mk/bsd.lib.mk:1.386 Mon Oct 25 07:54:44 2021
+++ src/share/mk/bsd.lib.mk Wed Oct 27 03:06:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.386 2021/10/25 07:54:44 ryo Exp $
+# $NetBSD: bsd.lib.mk,v 1.387 2021/10/27 03:06:59 ryo Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -51,8 +51,7 @@ CFLAGS+= ${PIE_CFLAGS}
AFLAGS+= ${PIE_AFLAGS}
.endif
-PROF?= -pg
-PGFLAGS+= ${PROF.${.IMPSRC:T}:U${PROF}}
+PGFLAGS+= -pg
.if ${MKPIC} != "no"
PGFLAGS+= -fPIC
.endif
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.283 src/sys/conf/Makefile.kern.inc:1.284
--- src/sys/conf/Makefile.kern.inc:1.283 Mon Oct 25 07:54:44 2021
+++ src/sys/conf/Makefile.kern.inc Wed Oct 27 03:06:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.283 2021/10/25 07:54:44 ryo Exp $
+# $NetBSD: Makefile.kern.inc,v 1.284 2021/10/27 03:06:59 ryo Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -150,8 +150,8 @@ KLINK.o= ${LD} -r ${LINKFORMAT} -Map=${.
# 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.${.IMPSRC:T}:U${PROF}} && \
- ${KCOMPILE.c} ${PROF.${.IMPSRC:T}:U${PROF}} && \
+ ${_MKSHECHO} ${KCOMPILE.c} ${PROF} && \
+ ${KCOMPILE.c} ${PROF} && \
${COMPILE_CTFCONVERT}
NOPROF_C?= @${_MKSHMSG} "compile ${.CURDIR:T}/${.TARGET}" && \
${_MKSHECHO} ${KCOMPILE.c} && \
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.52 src/sys/lib/libkern/Makefile.libkern:1.53
--- src/sys/lib/libkern/Makefile.libkern:1.52 Mon Oct 25 07:54:44 2021
+++ src/sys/lib/libkern/Makefile.libkern Wed Oct 27 03:06:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.52 2021/10/25 07:54:44 ryo Exp $
+# $NetBSD: Makefile.libkern,v 1.53 2021/10/27 03:06:59 ryo Exp $
#
# Variable definitions for libkern.
@@ -55,7 +55,7 @@ SRCS+= cpuset.c inet_addr.c intoa.c
SRCS+= bswap64.c
.endif
SRCS+= md4c.c md5c.c rmd160.c sha1.c sha2.c sha3.c keccak.c murmurhash.c
-SRCS+= pmatch.c crc32.c
+SRCS+= pmatch.c mcount.c crc32.c
SRCS+= strlist.c
SRCS+= ppath_kmem_alloc.c
@@ -102,10 +102,6 @@ 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
