Skip to content

Commit

Permalink
libpmc: always generate libpmc_events.c
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mhorne committed May 31, 2021
1 parent 0c91502 commit 689c7e7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
4 changes: 1 addition & 3 deletions Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -2535,9 +2535,7 @@ _tcsh=bin/csh
_libmagic=lib/libmagic
.endif

.if ${MK_PMC} != "no" && \
(${TARGET_ARCH} == "aarch64" || ${TARGET_ARCH} == "amd64" || \
${TARGET_ARCH} == "i386")
.if ${MK_PMC} != "no"
_jevents=lib/libpmc/pmu-events
.endif

Expand Down
2 changes: 1 addition & 1 deletion Makefile.libcompat
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ _LC_INCDIRS= \
.if ${MK_FILE} != "no"
_libmagic= lib/libmagic
.endif
.if ${MK_PMC} != "no" && ${TARGET_ARCH} == "amd64"
.if ${MK_PMC} != "no"
_jevents= lib/libpmc/pmu-events
.endif

Expand Down
7 changes: 3 additions & 4 deletions lib/libpmc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ INCS= pmc.h pmclog.h pmcformat.h
CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
LDADD+= -lc++

.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386"

.if ${MACHINE_CPUARCH} == "aarch64"
EVENT_ARCH="arm64"
.elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
EVENT_ARCH="x86"
.elif ${MACHINE_ARCH} == "powerpc"
EVENT_ARCH="powerpc"
.else
# This will generate an empty events table
EVENT_ARCH="none"
.endif

.if ${MK_DIRDEPS_BUILD} == "yes"
Expand All @@ -40,7 +40,6 @@ libpmc_events.c: ${JEVENTS} .META
fi
CLEANFILES+= libpmc_events.c libpmc_events.c.tmp
SRCS+= libpmc_events.c
.endif

WARNS?= 3

Expand Down

0 comments on commit 689c7e7

Please sign in to comment.