From owner-svn-src-head@freebsd.org Thu May 31 22:26:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34C36F78A34; Thu, 31 May 2018 22:26:59 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4699F83F4B; Thu, 31 May 2018 22:26:57 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18AD12043C; Thu, 31 May 2018 22:26:57 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4VMQuAS065978; Thu, 31 May 2018 22:26:56 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4VMQuts065974; Thu, 31 May 2018 22:26:56 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805312226.w4VMQuts065974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Thu, 31 May 2018 22:26:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334455 - in head: . lib/libpmc X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in head: . lib/libpmc X-SVN-Commit-Revision: 334455 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 May 2018 22:26:59 -0000 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 #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;