Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -772,7 +772,6 @@
 		MK_CLANG_FULL=no \
 		MK_HTML=no \
 		MK_MAN=no \
-		MK_PROFILE=no \
 		MK_RETPOLINE=no \
 		MK_SSP=no \
 		MK_TESTS=no \
@@ -839,7 +838,6 @@
 		MK_CTF=no \
 		MK_HTML=no \
 		MK_MAN=no \
-		MK_PROFILE=no \
 		MK_SSP=no \
 		MK_RETPOLINE=no \
 		MK_WERROR=no
@@ -1209,7 +1207,7 @@
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG MK_HTML=no -DNO_LINT MK_MAN=no \
-	    MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS_SUPPORT} \
+	    MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS_SUPPORT} \
 	    libraries
 everything: .PHONY
 	@echo
@@ -3088,7 +3086,6 @@
 	MK_MAN_UTILS=yes \
 	MK_OFED=no \
 	MK_OPENSSH=no \
-	MK_PROFILE=no \
 	MK_RETPOLINE=no \
 	MK_SENDMAIL=no \
 	MK_SSP=no \
@@ -3453,9 +3450,9 @@
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \
 		cd ${.CURDIR}/${_lib}; \
 		if [ -z "${NO_OBJWALK}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \
-		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
+		${MAKE} MK_TESTS=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ all; \
-		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
+		${MAKE} MK_TESTS=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
@@ -3758,7 +3755,7 @@
 .endif
 
 NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \
-	MK_MAN=no MK_NLS=no MK_PROFILE=no \
+	MK_MAN=no MK_NLS=no \
 	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WERROR=no \
 	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
Index: cddl/lib/libzpool/Makefile
===================================================================
--- cddl/lib/libzpool/Makefile
+++ cddl/lib/libzpool/Makefile
@@ -283,9 +283,6 @@
 
 LIBADD=		md pthread z spl icp nvpair avl umem
 
-# atomic.S doesn't like profiling.
-MK_PROFILE=	no
-
 CSTD=	c99
 
 # Since there are many asserts in this library, it makes no sense to compile
Index: contrib/bmake/mk/lib.mk
===================================================================
--- contrib/bmake/mk/lib.mk
+++ contrib/bmake/mk/lib.mk
@@ -257,9 +257,6 @@
 
 
 .if ${MK_LIBTOOL} == "yes"
-# because libtool is so fascist about naming the object files,
-# we cannot (yet) build profiled libs
-MK_PROFILE=no
 _LIBS=lib${LIB}.a
 .if exists(${.CURDIR}/shlib_version)
 SHLIB_AGE != . ${.CURDIR}/shlib_version ; echo $$age
Index: lib/libc++experimental/Makefile
===================================================================
--- lib/libc++experimental/Makefile
+++ lib/libc++experimental/Makefile
@@ -5,7 +5,6 @@
 
 LIB=		c++experimental
 NO_PIC=
-MK_PROFILE=	no
 
 .PATH:		${SRCDIR}/src
 
Index: lib/libc_nonshared/Makefile
===================================================================
--- lib/libc_nonshared/Makefile
+++ lib/libc_nonshared/Makefile
@@ -2,7 +2,6 @@
 # It is used exclusively with libc.so.* - there is no need for any other
 # compile modes.
 # bsd.lib.mk doesn't have an easy way to express that.
-MK_PROFILE?=no
 .include <src.opts.mk>
 NO_PIC=
 # -fpic on some platforms, -fPIC on others.
Index: lib/libclang_rt/Makefile.inc
===================================================================
--- lib/libclang_rt/Makefile.inc
+++ lib/libclang_rt/Makefile.inc
@@ -10,7 +10,6 @@
 SHLIBDIR=	${LIBDIR}
 
 NO_PIC=
-MK_PROFILE=	no
 MK_ASAN:=	no
 MK_SSP=		no
 MK_UBSAN:=	no
Index: lib/libcompiler_rt/Makefile
===================================================================
--- lib/libcompiler_rt/Makefile
+++ lib/libcompiler_rt/Makefile
@@ -40,8 +40,5 @@
 .if ${MK_INSTALLLIB} != "no"
 SYMLINKS+=	libcompiler_rt.a ${LIBDIR}/libgcc.a
 .endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=	libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a
-.endif
 
 .include <bsd.lib.mk>
Index: lib/libiconv_modules/Makefile.inc
===================================================================
--- lib/libiconv_modules/Makefile.inc
+++ lib/libiconv_modules/Makefile.inc
@@ -7,4 +7,3 @@
 
 SHLIBDIR= /usr/lib${COMPAT_libcompat:U}/i18n
 LIBDIR=	 ${SHLIBDIR}
-MK_PROFILE=	no
Index: lib/libpam/libpam/Makefile
===================================================================
--- lib/libpam/libpam/Makefile
+++ lib/libpam/libpam/Makefile
@@ -44,8 +44,6 @@
 
 PACKAGE=	runtime
 
-MK_PROFILE=no
-
 SRCS=	openpam_asprintf.c \
 	openpam_borrow_cred.c \
 	openpam_check_owner_perms.c \
Index: lib/libpam/modules/Makefile.inc
===================================================================
--- lib/libpam/modules/Makefile.inc
+++ lib/libpam/modules/Makefile.inc
@@ -1,7 +1,6 @@
 PAMDIR=		${SRCTOP}/contrib/openpam
 
 MK_INSTALLLIB=	no
-MK_PROFILE=	no
 
 CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam
 
Index: lib/libprocstat/Makefile
===================================================================
--- lib/libprocstat/Makefile
+++ lib/libprocstat/Makefile
@@ -63,8 +63,6 @@
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pico
 zfs/zfs_defs.pieo: .PHONY
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pieo
-zfs/zfs_defs.po: .PHONY
-	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.po
 .endif
 
 .include <bsd.lib.mk>
Index: lib/librpcsec_gss/Makefile
===================================================================
--- lib/librpcsec_gss/Makefile
+++ lib/librpcsec_gss/Makefile
@@ -11,7 +11,6 @@
 
 CFLAGS+= -I${SRCTOP}/include
 CFLAGS+= -I${SRCTOP}/lib/libc_rpc
-MK_PROFILE=	no
 
 MAN=	rpcsec_gss.3
 MAN+=	rpc_gss_seccreate.3
Index: lib/libssp_nonshared/Makefile
===================================================================
--- lib/libssp_nonshared/Makefile
+++ lib/libssp_nonshared/Makefile
@@ -1,7 +1,6 @@
 PACKAGE=	clibs
 LIB=		ssp_nonshared
 NO_PIC=
-MK_PROFILE=	no
 
 SRCS=		libssp_nonshared.c
 CFLAGS+=	-fPIC
Index: lib/libthr/Makefile
===================================================================
--- lib/libthr/Makefile
+++ lib/libthr/Makefile
@@ -91,9 +91,6 @@
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
 .endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
-.endif
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
Index: lib/libulog/Makefile
===================================================================
--- lib/libulog/Makefile
+++ lib/libulog/Makefile
@@ -28,8 +28,5 @@
 .if !defined(NO_PIC)
 SYMLINKS+=libulog.so ${LIBDIR}/libutempter.so
 .endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=libulog_p.a ${LIBDIR}/libutempter_p.a
-.endif
 
 .include <bsd.lib.mk>
Index: lib/ncurses/form/Makefile
===================================================================
--- lib/ncurses/form/Makefile
+++ lib/ncurses/form/Makefile
@@ -166,9 +166,6 @@
 .if !defined(NO_PIC)
 SYMLINKS+=	libformw.so ${LIBDIR}/libform.so
 .endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=	libformw_p.a ${LIBDIR}/libform_p.a
-.endif
 
 .include <bsd.lib.mk>
 
Index: lib/ncurses/menu/Makefile
===================================================================
--- lib/ncurses/menu/Makefile
+++ lib/ncurses/menu/Makefile
@@ -135,9 +135,6 @@
 .if !defined(NO_PIC)
 SYMLINKS+=	libmenuw.so ${LIBDIR}/libmenu.so
 .endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=	libmenuw_p.a ${LIBDIR}/libmenu_p.a
-.endif
 
 .include <bsd.lib.mk>
 
Index: lib/ncurses/ncurses/Makefile
===================================================================
--- lib/ncurses/ncurses/Makefile
+++ lib/ncurses/ncurses/Makefile
@@ -160,12 +160,6 @@
 SYMLINKS+=	libncursesw.so ${LIBDIR}/libncurses.so
 SYMLINKS+=	libncursesw.so ${LIBDIR}/libcurses.so
 .endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=	libncursesw_p.a ${LIBDIR}/libcursesw_p.a
-# backward compat
-SYMLINKS+=	libncursesw_p.a ${LIBDIR}/libncurses_p.a
-SYMLINKS+=	libncursesw_p.a ${LIBDIR}/libcurses_p.a
-.endif
 
 LIBADD+=	tinfow
 SHLIB_LDSCRIPT=	libncursesw.ldscript
Index: lib/ncurses/panel/Makefile
===================================================================
--- lib/ncurses/panel/Makefile
+++ lib/ncurses/panel/Makefile
@@ -62,9 +62,6 @@
 .if !defined(NO_PIC)
 SYMLINKS+=	libpanelw.so ${LIBDIR}/libpanel.so
 .endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=	libpanelw_p.a ${LIBDIR}/libpanel_p.a
-.endif
 
 INCS=	panel.h
 .include <bsd.lib.mk>
Index: lib/ncurses/tinfo/Makefile
===================================================================
--- lib/ncurses/tinfo/Makefile
+++ lib/ncurses/tinfo/Makefile
@@ -195,14 +195,6 @@
 SYMLINKS+=	libtinfow.so ${LIBDIR}/libtermlib.so
 SYMLINKS+=	libtinfow.so ${LIBDIR}/libtinfo.so
 .endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=	libtinfow_p.a ${LIBDIR}/libtermcapw_p.a
-SYMLINKS+=	libtinfow_p.a ${LIBDIR}/libtermlibw_p.a
-# backward compat
-SYMLINKS+=	libtinfow_p.a ${LIBDIR}/libtermcap_p.a
-SYMLINKS+=	libtinfow_p.a ${LIBDIR}/libtermlib_p.a
-SYMLINKS+=	libtinfow_p.a ${LIBDIR}/libtinfo_p.a
-.endif
 
 DOCSDIR=	${SHAREDIR}/doc/ncurses
 DOCS=		ncurses-intro.html hackguide.html
Index: lib/ofed/complib/Makefile
===================================================================
--- lib/ofed/complib/Makefile
+++ lib/ofed/complib/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		osmcomp
 SHLIB_MAJOR=    3
-MK_PROFILE=     no
 
 SRCS= \
 cl_complib.c \
Index: lib/ofed/libcxgb4/Makefile
===================================================================
--- lib/ofed/libcxgb4/Makefile
+++ lib/ofed/libcxgb4/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		cxgb4
 SHLIB_MAJOR=	1
-MK_PROFILE=	no
 
 SRCS= \
 cq.c \
Index: lib/ofed/libibcm/Makefile
===================================================================
--- lib/ofed/libibcm/Makefile
+++ lib/ofed/libibcm/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		ibcm
 SHLIB_MAJOR=	1
-MK_PROFILE=	no
 SRCS=		cm.c
 LIBADD=		ibverbs
 CFLAGS+=	-I${_spath}
Index: lib/ofed/libibmad/Makefile
===================================================================
--- lib/ofed/libibmad/Makefile
+++ lib/ofed/libibmad/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		ibmad
 SHLIB_MAJOR=	5
-MK_PROFILE=	no
 
 SRCS= \
 bm.c \
Index: lib/ofed/libibnetdisc/Makefile
===================================================================
--- lib/ofed/libibnetdisc/Makefile
+++ lib/ofed/libibnetdisc/Makefile
@@ -6,7 +6,6 @@
 SHLIBDIR?=	/usr/lib
 LIB_CXX=	ibnetdisc
 SHLIB_MAJOR=	5
-MK_PROFILE=	no
 
 SRCS= \
 chassis.c \
Index: lib/ofed/libibumad/Makefile
===================================================================
--- lib/ofed/libibumad/Makefile
+++ lib/ofed/libibumad/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		ibumad
 SHLIB_MAJOR=	1
-MK_PROFILE=	no
 SRCS= \
 umad.c \
 umad_str.c \
Index: lib/ofed/libibverbs/Makefile
===================================================================
--- lib/ofed/libibverbs/Makefile
+++ lib/ofed/libibverbs/Makefile
@@ -4,7 +4,6 @@
 LIB=		ibverbs
 SHLIB_MAJOR=	1
 SHLIBDIR?=	/lib
-MK_PROFILE=	no
 VERSION_MAP=	${_spath}/libibverbs.map
 
 CFLAGS+= -I${_spath}
Index: lib/ofed/libmlx4/Makefile
===================================================================
--- lib/ofed/libmlx4/Makefile
+++ lib/ofed/libmlx4/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		mlx4
 SHLIB_MAJOR=	1
-MK_PROFILE=	no
 
 SRCS= \
 buf.c \
Index: lib/ofed/libmlx5/Makefile
===================================================================
--- lib/ofed/libmlx5/Makefile
+++ lib/ofed/libmlx5/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/lib
 LIB=		mlx5
 SHLIB_MAJOR=	1
-MK_PROFILE=	no
 
 SRCS= \
 buf.c \
Index: lib/ofed/libopensm/Makefile
===================================================================
--- lib/ofed/libopensm/Makefile
+++ lib/ofed/libopensm/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		opensm
 SHLIB_MAJOR=	5
-MK_PROFILE=	no
 
 SRCS= \
 osm_log.c \
Index: lib/ofed/librdmacm/Makefile
===================================================================
--- lib/ofed/librdmacm/Makefile
+++ lib/ofed/librdmacm/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		rdmacm
 SHLIB_MAJOR=	1
-MK_PROFILE=	no
 CFLAGS+=	-I${_spath}
 
 SRCS= \
Index: lib/ofed/libvendor/Makefile
===================================================================
--- lib/ofed/libvendor/Makefile
+++ lib/ofed/libvendor/Makefile
@@ -4,7 +4,6 @@
 SHLIBDIR?=	/usr/lib
 LIB=		osmvendor
 SHLIB_MAJOR=	4
-MK_PROFILE=	no
 
 SRCS= \
 osm_vendor_ibumad.c \
Index: release/Makefile
===================================================================
--- release/Makefile
+++ release/Makefile
@@ -171,7 +171,7 @@
 	cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \
 	    DESTDIR=${.OBJDIR}/${.TARGET} INSTKERNNAME=kernel.GENERIC MK_AMD=no MK_AT=no \
 	    MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
-	    MK_TOOLCHAIN=no MK_PROFILE=no \
+	    MK_TOOLCHAIN=no \
 	    MK_RESCUE=no MK_DICT=no \
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
 	    -DDB_FROM_SRC
@@ -180,7 +180,7 @@
 	    DESTDIR=${.OBJDIR}/${.TARGET} MK_AT=no \
 	    MK_INSTALLLIB=no MK_MAIL=no \
 	    ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \
-	    MK_TOOLCHAIN=no MK_PROFILE=no \
+	    MK_TOOLCHAIN=no \
 	    MK_RESCUE=no MK_DICT=no \
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
 	    -DDB_FROM_SRC )
@@ -234,7 +234,7 @@
 	    MK_GAMES=no \
 	    MK_INSTALLLIB=no MK_MAIL=no \
 	    ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \
-	    MK_TOOLCHAIN=no MK_PROFILE=no \
+	    MK_TOOLCHAIN=no \
 	    MK_RESCUE=no MK_DICT=no \
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
 	    -DDB_FROM_SRC )
Index: sbin/nvmecontrol/modules/Makefile.inc
===================================================================
--- sbin/nvmecontrol/modules/Makefile.inc
+++ sbin/nvmecontrol/modules/Makefile.inc
@@ -2,7 +2,6 @@
 NVMECONTROLDIR=	${SRCTOP}/sbin/nvmecontrol
 
 MK_INSTALLLIB=	no
-MK_PROFILE=	no
 
 CFLAGS+=	-I${NVMECONTROLDIR}
 
Index: share/mk/bsd.lib.mk
===================================================================
--- share/mk/bsd.lib.mk
+++ share/mk/bsd.lib.mk
@@ -297,18 +297,6 @@
 
 .if !defined(INTERNALLIB)
 
-.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-_LIBS+=		lib${LIB_PRIVATE}${LIB}_p.a
-POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
-DEPENDOBJS+=	${POBJS}
-CLEANFILES+=	${POBJS}
-
-lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS}
-	@${ECHO} building profiled ${LIB} library
-	@rm -f ${.TARGET}
-	${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
-.endif
-
 .if defined(LLVM_LINK)
 lib${LIB_PRIVATE}${LIB}.bc: ${BCOBJS}
 	${LLVM_LINK} -o ${.TARGET} ${BCOBJS}
@@ -495,10 +483,6 @@
 .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a ${DESTDIR}${_LIBDIR}/
-.if ${MK_PROFILE} != "no"
-	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/
-.endif
 .endif
 .if defined(SHLIB_NAME)
 	${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
Index: share/mk/bsd.opts.mk
===================================================================
--- share/mk/bsd.opts.mk
+++ share/mk/bsd.opts.mk
@@ -79,7 +79,6 @@
     CCACHE_BUILD \
     CTF \
     INSTALL_AS_USER \
-    PROFILE \
     STALE_STAGED \
     UBSAN \
     UNDEFINED_VERSION
Index: stand/defs.mk
===================================================================
--- stand/defs.mk
+++ stand/defs.mk
@@ -10,7 +10,6 @@
 
 MK_CTF=		no
 MK_SSP=		no
-MK_PROFILE=	no
 MK_PIE=		no
 MAN=
 .if !defined(PIC)
Index: targets/pseudo/bootstrap-tools/Makefile
===================================================================
--- targets/pseudo/bootstrap-tools/Makefile
+++ targets/pseudo/bootstrap-tools/Makefile
@@ -47,7 +47,6 @@
 		MK_CLANG_FULL=no \
 		MK_HTML=no \
 		MK_MAN=no \
-		MK_PROFILE=no \
 		MK_RETPOLINE=no \
 		MK_SSP=no \
 		MK_TESTS=no \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -6850,7 +6850,7 @@
 OLD_FILES+=usr/share/man/man8/pppctl.8.gz
 .endif
 
-.if ${MK_PROFILE} == no
+# XXX move to ObsoleteFiles before pushing upstream
 OLD_FILES+=usr/lib/lib80211_p.a
 OLD_FILES+=usr/lib/lib9p_p.a
 OLD_FILES+=usr/lib/libBlocksRuntime_p.a
@@ -7032,7 +7032,6 @@
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzfsbootenv_p.a
 OLD_FILES+=usr/lib/libzutil_p.a
-.endif
 
 .if ${MK_QUOTAS} == no
 OLD_FILES+=sbin/quotacheck
Index: usr.bin/lex/lib/Makefile
===================================================================
--- usr.bin/lex/lib/Makefile
+++ usr.bin/lex/lib/Makefile
@@ -11,10 +11,5 @@
 LINKS+=	${LIBDIR}/libln.a ${LIBDIR}/libfl.a
 .endif
 
-.if ${MK_PROFILE} != "no"
-LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a
-LINKS+=	${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a
-.endif
-
 .include <bsd.lib.mk>