From owner-svn-src-all@freebsd.org Thu May 24 21:22:04 2018 Return-Path: Delivered-To: svn-src-all@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 8D6E0EFE934; Thu, 24 May 2018 21:22:04 +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 4119784DD0; Thu, 24 May 2018 21:22:04 +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 23F8E17B99; Thu, 24 May 2018 21:22:04 +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 w4OLM4cJ019449; Thu, 24 May 2018 21:22:04 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4OLM3HL019447; Thu, 24 May 2018 21:22:03 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805242122.w4OLM3HL019447@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Thu, 24 May 2018 21:22:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334186 - in head: . lib/libpmcstat X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in head: . lib/libpmcstat X-SVN-Commit-Revision: 334186 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2018 21:22:04 -0000 Author: mmacy Date: Thu May 24 21:22:03 2018 New Revision: 334186 URL: https://svnweb.freebsd.org/changeset/base/334186 Log: libpmcstat: Don't build pmu tables on !amd64 until the corresponding util routines have been written and tested. Currently building them breaks the build on power64 Reported by: emaste Modified: head/Makefile.inc1 head/lib/libpmcstat/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu May 24 21:13:46 2018 (r334185) +++ head/Makefile.inc1 Thu May 24 21:22:03 2018 (r334186) @@ -2029,8 +2029,7 @@ _tcsh=bin/csh _libmagic=lib/libmagic .endif -.if (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "powerpc") +.if ${MACHINE_CPUARCH} == "amd64" _jevents=lib/libpmcstat/pmu-events .endif Modified: head/lib/libpmcstat/Makefile ============================================================================== --- head/lib/libpmcstat/Makefile Thu May 24 21:13:46 2018 (r334185) +++ head/lib/libpmcstat/Makefile Thu May 24 21:22:03 2018 (r334186) @@ -15,8 +15,8 @@ INCS= libpmcstat.h CFLAGS+= -I${.CURDIR} -.if (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "powerpc") +.if ${MACHINE_CPUARCH} == "amd64" + .if ${MACHINE_CPUARCH} == "aarch64" EVENT_ARCH="arm64" .elif ${MACHINE_CPUARCH} == "amd64"