From owner-dev-commits-src-main@freebsd.org Mon May 31 20:39:22 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A5AC164F0F3; Mon, 31 May 2021 20:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fv6bG3Vn4z3Cm4; Mon, 31 May 2021 20:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B78B16DC6; Mon, 31 May 2021 20:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14VKdMi6040680; Mon, 31 May 2021 20:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14VKdMNK040679; Mon, 31 May 2021 20:39:22 GMT (envelope-from git) Date: Mon, 31 May 2021 20:39:22 GMT Message-Id: <202105312039.14VKdMNK040679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 689c7e7975cd - main - libpmc: always generate libpmc_events.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 689c7e7975cdee38ca6fd60ad3372d55c43c948c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2021 20:39:22 -0000 The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=689c7e7975cdee38ca6fd60ad3372d55c43c948c commit 689c7e7975cdee38ca6fd60ad3372d55c43c948c Author: Mitchell Horne AuthorDate: 2021-05-31 14:24:04 +0000 Commit: Mitchell Horne CommitDate: 2021-05-31 20:39:05 +0000 libpmc: always generate libpmc_events.c 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 --- Makefile.inc1 | 4 +--- Makefile.libcompat | 2 +- lib/libpmc/Makefile | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5fd1fe81c2e7..d72e0ca56beb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 diff --git a/Makefile.libcompat b/Makefile.libcompat index e4d9cd94e835..779bcb163cf7 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -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 diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index 42aa14e58471..1006b6f93469 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -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" @@ -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