From owner-svn-src-head@freebsd.org Sat Jun 9 17:15:54 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 926881011500; Sat, 9 Jun 2018 17:15:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 43D357BC1B; Sat, 9 Jun 2018 12:17:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (unknown [72.142.116.18]) by mail.baldwin.cx (Postfix) with ESMTPSA id 5395010AFD2; Sat, 9 Jun 2018 08:17:28 -0400 (EDT) Subject: Re: svn commit: r334867 - in head: lib usr.sbin To: Matt Macy , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201806090225.w592PIMH061577@repo.freebsd.org> From: John Baldwin Message-ID: Date: Sat, 9 Jun 2018 08:17:27 -0400 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <201806090225.w592PIMH061577@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Sat, 09 Jun 2018 08:17:28 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean 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: Sat, 09 Jun 2018 17:15:54 -0000 On 6/8/18 10:25 PM, Matt Macy wrote: > Author: mmacy > Date: Sat Jun 9 02:25:18 2018 > New Revision: 334867 > URL: https://svnweb.freebsd.org/changeset/base/334867 > > Log: > pmc: fix logic in skipping riscv This would still appear to not be right as eventually riscv will use llvm. Also, I wonder if the more normal way of handling this would be to make MK_PMC a BROKEN_OPTION for riscv in src.opts.mk as then it is centralized in one place. Similarly, what is the actual compiler requirement? If you need C++11 support for example then it would be better to express this in terms of COMPILER_FEATURES (and that might also be doable in src.opts.mk so that it is centralized). > Modified: > head/lib/Makefile > head/usr.sbin/Makefile > > Modified: head/lib/Makefile > ============================================================================== > --- head/lib/Makefile Sat Jun 9 02:18:15 2018 (r334866) > +++ head/lib/Makefile Sat Jun 9 02:25:18 2018 (r334867) > @@ -202,7 +202,7 @@ _libdl= libdl > .endif > > SUBDIR.${MK_OPENSSL}+= libmp > -.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100) && ${MACHINE_CPUARCH} != "riscv") > +.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv")) > SUBDIR.${MK_PMC}+= libpmc libpmcstat > .endif > SUBDIR.${MK_RADIUS_SUPPORT}+= libradius > > Modified: head/usr.sbin/Makefile > ============================================================================== > --- head/usr.sbin/Makefile Sat Jun 9 02:18:15 2018 (r334866) > +++ head/usr.sbin/Makefile Sat Jun 9 02:25:18 2018 (r334867) > @@ -179,7 +179,7 @@ SUBDIR.${MK_OPENSSL}+= keyserv > SUBDIR.${MK_PC_SYSINSTALL}+= pc-sysinstall > SUBDIR.${MK_PF}+= ftp-proxy > SUBDIR.${MK_PKGBOOTSTRAP}+= pkg > -.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100) && ${MACHINE_CPUARCH} != "riscv") > +.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv")) > SUBDIR.${MK_PMC}+= pmc > SUBDIR.${MK_PMC}+= pmcannotate > SUBDIR.${MK_PMC}+= pmccontrol > -- John Baldwin