d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpmc: always generate libpmc_events.c

Browse Source 
The jevents build tool will create an empty table if it doesn't find any
events, so we can remove the extra $MACHINE_CPUARCH checks.

Reviewed by:	gnn, ray, emaste
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D30531
This commit is contained in:
Mitchell Horne 2021-05-31 11:24:04 -03:00
parent 0c915023db
commit 689c7e7975
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -2535,9 +2535,7 @@ _tcsh=bin/csh
_libmagic=lib/libmagic _libmagic=lib/libmagic
.endif .endif
.if ${MK_PMC} != "no" && \ .if ${MK_PMC} != "no"
(${TARGET_ARCH} == "aarch64" || ${TARGET_ARCH} == "amd64" || \
${TARGET_ARCH} == "i386")
_jevents=lib/libpmc/pmu-events _jevents=lib/libpmc/pmu-events
.endif .endif

2
Makefile.libcompat
View File

@ -51,7 +51,7 @@ _LC_INCDIRS= \
.if ${MK_FILE} != "no" .if ${MK_FILE} != "no"
_libmagic= lib/libmagic _libmagic= lib/libmagic
.endif .endif
.if ${MK_PMC} != "no" && ${TARGET_ARCH} == "amd64" .if ${MK_PMC} != "no"
_jevents= lib/libpmc/pmu-events _jevents= lib/libpmc/pmu-events
.endif .endif

7
lib/libpmc/Makefile
View File

@ -8,15 +8,15 @@ INCS= pmc.h pmclog.h pmcformat.h
CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
LDADD+= -lc++ LDADD+= -lc++
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386"
.if ${MACHINE_CPUARCH} == "aarch64" .if ${MACHINE_CPUARCH} == "aarch64"
EVENT_ARCH="arm64" EVENT_ARCH="arm64"
.elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" .elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
EVENT_ARCH="x86" EVENT_ARCH="x86"
.elif ${MACHINE_ARCH} == "powerpc" .elif ${MACHINE_ARCH} == "powerpc"
EVENT_ARCH="powerpc" EVENT_ARCH="powerpc"
.else
# This will generate an empty events table
EVENT_ARCH="none"
.endif .endif
.if ${MK_DIRDEPS_BUILD} == "yes" .if ${MK_DIRDEPS_BUILD} == "yes"
@ -40,7 +40,6 @@ libpmc_events.c: ${JEVENTS} .META
fi fi
CLEANFILES+= libpmc_events.c libpmc_events.c.tmp CLEANFILES+= libpmc_events.c libpmc_events.c.tmp
SRCS+= libpmc_events.c SRCS+= libpmc_events.c
.endif
WARNS?= 3 WARNS?= 3