Date: Thu, 31 May 2018 22:26:56 +0000 (UTC) From: Matt Macy <mmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334455 - in head: . lib/libpmc Message-ID: <201805312226.w4VMQuts065974@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmacy Date: Thu May 31 22:26:55 2018 New Revision: 334455 URL: https://svnweb.freebsd.org/changeset/base/334455 Log: libpmc/pmu: enable for i386 as well Modified: head/Makefile.inc1 head/Makefile.libcompat head/lib/libpmc/Makefile head/lib/libpmc/libpmc_pmu_util.c (contents, props changed) Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu May 31 22:26:50 2018 (r334454) +++ head/Makefile.inc1 Thu May 31 22:26:55 2018 (r334455) @@ -2030,7 +2030,7 @@ _tcsh=bin/csh _libmagic=lib/libmagic .endif -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _jevents=lib/libpmc/pmu-events .endif Modified: head/Makefile.libcompat ============================================================================== --- head/Makefile.libcompat Thu May 31 22:26:50 2018 (r334454) +++ head/Makefile.libcompat Thu May 31 22:26:55 2018 (r334455) @@ -192,7 +192,7 @@ build${libcompat}: .PHONY DIRPRFX=${_dir}/ ${_t} .endfor .endfor -.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic +.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic lib/libpmc/pmu-events ${_+_}cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ Modified: head/lib/libpmc/Makefile ============================================================================== --- head/lib/libpmc/Makefile Thu May 31 22:26:50 2018 (r334454) +++ head/lib/libpmc/Makefile Thu May 31 22:26:55 2018 (r334455) @@ -8,13 +8,13 @@ INCS= pmc.h pmclog.h CFLAGS+= -I${.CURDIR} -.if ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -.if ${MACHINE_CPUARCH} == "aarch64" +.if ${MACHINE_ARCH} == "aarch64" EVENT_ARCH="arm64" -.elif ${MACHINE_CPUARCH} == "amd64" +.elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" EVENT_ARCH="x86" -.elif ${MACHINE_CPUARCH} == "powerpc" +.elif ${MACHINE_ARCH} == "powerpc" EVENT_ARCH="powerpc" .endif Modified: head/lib/libpmc/libpmc_pmu_util.c ============================================================================== --- head/lib/libpmc/libpmc_pmu_util.c Thu May 31 22:26:50 2018 (r334454) +++ head/lib/libpmc/libpmc_pmu_util.c Thu May 31 22:26:55 2018 (r334455) @@ -40,7 +40,7 @@ #include <libpmcstat.h> #include "pmu-events/pmu-events.h" -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) struct pmu_alias { const char *pa_alias; const char *pa_name;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805312226.w4VMQuts065974>