D30531.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D30531.diff
View Options

	diff --git a/Makefile.inc1 b/Makefile.inc1
	--- a/Makefile.inc1
	+++ b/Makefile.inc1
	@@ -2535,9 +2535,7 @@
	_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

	diff --git a/Makefile.libcompat b/Makefile.libcompat
	--- a/Makefile.libcompat
	+++ b/Makefile.libcompat
	@@ -51,7 +51,7 @@
	.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

	diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
	--- a/lib/libpmc/Makefile
	+++ b/lib/libpmc/Makefile
	@@ -8,15 +8,15 @@
	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"
	@@ -40,7 +40,6 @@
	fi
	CLEANFILES+= libpmc_events.c libpmc_events.c.tmp
	SRCS+= libpmc_events.c
	-.endif

	WARNS?= 3