From owner-svn-src-projects@freebsd.org Sun Oct 22 00:10:20 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17CA7E3E354 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 00:10:20 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id D30357067E; Sun, 22 Oct 2017 00:10:19 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9M0AIfR033836; Sun, 22 Oct 2017 00:10:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M0AInI033834; Sun, 22 Oct 2017 00:10:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710220010.v9M0AInI033834@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 00:10:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324840 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324840 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 00:10:20 -0000 Author: ngie Date: Sun Oct 22 00:10:18 2017 New Revision: 324840 URL: https://svnweb.freebsd.org/changeset/base/324840 Log: Have to evaluate GCDAS immediately b/c I .undef'ed the _GCDAS_SRCS var later. Otherwise GCDAS will be empty. Womp womp. Modified: projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Sat Oct 21 23:40:52 2017 (r324839) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 22 00:10:18 2017 (r324840) @@ -460,7 +460,7 @@ _libinstall: .include <bsd.nls.mk> .if defined(_COV_FLAG) _GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} -GCDAS= ${_GCDA_SRCS:R:S/$/.gcda/g} +GCDAS:= ${_GCDA_SRCS:R:S/$/.gcda/g} .undef _GCDA_SRCS .for _gcda in ${GCDAS} ${_gcda}: ${_gcda:R}.pico Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Sat Oct 21 23:40:52 2017 (r324839) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 00:10:18 2017 (r324840) @@ -307,7 +307,7 @@ NLSNAME?= ${PROG} .include <bsd.confs.mk> .if defined(_COV_FLAG) _GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} -GCDAS= ${_GCDA_SRCS:R:S/$/.gcda/g} +GCDAS:= ${_GCDA_SRCS:R:S/$/.gcda/g} .undef _GCDA_SRCS .for _gcda in ${GCDAS} ${_gcda}: ${_gcda:R}.pico From owner-svn-src-projects@freebsd.org Sun Oct 22 07:12:56 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1750E4B2CF for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 07:12:56 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id CD779802A9; Sun, 22 Oct 2017 07:12:56 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9M7CtH5010373; Sun, 22 Oct 2017 07:12:55 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M7Ct31010370; Sun, 22 Oct 2017 07:12:55 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710220712.v9M7Ct31010370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 07:12:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324847 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324847 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 07:12:57 -0000 Author: ngie Date: Sun Oct 22 07:12:55 2017 New Revision: 324847 URL: https://svnweb.freebsd.org/changeset/base/324847 Log: It _was_ .gcno's, not .gcda's that get produced with cc --coverage Try to install them instead of the .gcda's, since the .gcda's likely won't exist. TODO: verify that installworld does indeed do the right thing. Ref: gcc(1) -ftest-coverage description; --coverage (option in use) is an alias for -fprofile-arcs -ftest-coverage Modified: projects/runtime-coverage/share/mk/bsd.cov.mk projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Sun Oct 22 03:52:26 2017 (r324846) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Sun Oct 22 07:12:55 2017 (r324847) @@ -2,9 +2,9 @@ # # Snippet for dealing with runtime coverage logic. # -# .gcda files are generated from files that are compiled from source, e.g., -# foo.gcda is foo.c or foo.cpp's file. In order for the libraries and programs -# to be properly instrumented, the .gcda files must be installed to a prefix +# .gcno files are generated from files that are compiled from source, e.g., +# foo.gcno is foo.c or foo.cpp's file. In order for the libraries and programs +# to be properly instrumented, the .gcno files must be installed to a prefix # common to the object files. # # See gcov(1) for more details. @@ -13,12 +13,12 @@ FILESGROUPS?= FILES -.if !empty(GCDAS) -GCDAS:= ${GCDAS:O:u} -FILESGROUPS+= GCDAS -CLEANFILES+= ${GCDAS} +.if !empty(GCNOS) +GCNOS:= ${GCNOS:O:u} +FILESGROUPS+= GCNOS +CLEANFILES+= ${GCNOS} -.for _gcda in ${GCDAS} -GCDASDIR_${_gcda:T}= ${COVERAGEDIR}${_gcda:H:tA} +.for _gcno in ${GCNOS} +GCNOSDIR_${_gcno:T}= ${COVERAGEDIR}${_gcno:H:tA} .endfor .endif Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 22 03:52:26 2017 (r324846) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 22 07:12:55 2017 (r324847) @@ -459,11 +459,11 @@ _libinstall: .if !defined(LIBRARIES_ONLY) .include <bsd.nls.mk> .if defined(_COV_FLAG) -_GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} -GCDAS:= ${_GCDA_SRCS:R:S/$/.gcda/g} -.undef _GCDA_SRCS -.for _gcda in ${GCDAS} -${_gcda}: ${_gcda:R}.pico +_GCNO_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} +GCNOS:= ${_GCNO_SRCS:R:S/$/.gcno/g} +.undef _GCNO_SRCS +.for _gcno in ${GCNOS} +${_gcno}: ${_gcno:R}.pico .endfor .include <bsd.cov.mk> .endif Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 03:52:26 2017 (r324846) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 07:12:55 2017 (r324847) @@ -307,10 +307,10 @@ NLSNAME?= ${PROG} .include <bsd.confs.mk> .if defined(_COV_FLAG) _GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} -GCDAS:= ${_GCDA_SRCS:R:S/$/.gcda/g} +GCDAS:= ${_GCDA_SRCS:R:S/$/.gcno/g} .undef _GCDA_SRCS -.for _gcda in ${GCDAS} -${_gcda}: ${_gcda:R}.pico +.for _gcno in ${GCDAS} +${_gcno}: ${_gcno:R}.pico .endfor .include <bsd.cov.mk> .endif From owner-svn-src-projects@freebsd.org Sun Oct 22 07:16:36 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45C8AE4B34B for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 07:16:36 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 13399803CC; Sun, 22 Oct 2017 07:16:36 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9M7GZXm010533; Sun, 22 Oct 2017 07:16:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M7GZmH010532; Sun, 22 Oct 2017 07:16:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710220716.v9M7GZmH010532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 07:16:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324848 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324848 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 07:16:36 -0000 Author: ngie Date: Sun Oct 22 07:16:35 2017 New Revision: 324848 URL: https://svnweb.freebsd.org/changeset/base/324848 Log: Tweaks to make libraries and make installworld - Optimize/fix _prereq_libs and _generic_libs by not installing the .gcno files with "make install". This cuts down on installing unnecessary files to WORLDTMP and fixes the build, since BSD.coverage.dist wasn't being splatted on WORLDTMP. - Splat BSD.coverage.dist on ${DESTDIR}/usr/lib in distributeworld/installworld so the files will be installed to the proper places. Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Sun Oct 22 07:12:55 2017 (r324847) +++ projects/runtime-coverage/Makefile.inc1 Sun Oct 22 07:16:35 2017 (r324848) @@ -1170,6 +1170,10 @@ distributeworld installworld stageworld: _installcheck -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null +.if ${MK_COVERAGE} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.cov.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null +.endif .if ${MK_DEBUG_FILES} != "no" mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null @@ -2492,7 +2496,7 @@ ${_lib}__PL: .PHONY .MAKE if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ all; \ - ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ + ${MAKE} MK_COVERAGE=no MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ install .endif .endfor @@ -2504,7 +2508,7 @@ ${_lib}__L: .PHONY .MAKE cd ${.CURDIR}/${_lib}; \ if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install + ${MAKE} MK_COVERAGE=no MK_TESTS=no DIRPRFX=${_lib}/ install .endif .endfor From owner-svn-src-projects@freebsd.org Sun Oct 22 07:20:12 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC822E4B3B8 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 07:20:12 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 8BE14804D9; Sun, 22 Oct 2017 07:20:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9M7KB19010707; Sun, 22 Oct 2017 07:20:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M7KBfG010706; Sun, 22 Oct 2017 07:20:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710220720.v9M7KBfG010706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 07:20:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324849 - projects/runtime-coverage/tools/build/options X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/tools/build/options X-SVN-Commit-Revision: 324849 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 07:20:12 -0000 Author: ngie Date: Sun Oct 22 07:20:11 2017 New Revision: 324849 URL: https://svnweb.freebsd.org/changeset/base/324849 Log: Add more draft text to WITH_COVERAGE Modified: projects/runtime-coverage/tools/build/options/WITH_COVERAGE Modified: projects/runtime-coverage/tools/build/options/WITH_COVERAGE ============================================================================== --- projects/runtime-coverage/tools/build/options/WITH_COVERAGE Sun Oct 22 07:16:35 2017 (r324848) +++ projects/runtime-coverage/tools/build/options/WITH_COVERAGE Sun Oct 22 07:20:11 2017 (r324849) @@ -3,3 +3,15 @@ Set to build profiled libraries for use with .Xr gcov 1 , .Xr lcov 1 , etc. +.Em Warning: +this option is experimental. +Profiled libraries and binaries with runtime instrumentation built in will +consume large amounts of disk space (somewhere on the order of several +gigabytes). +.\" TODO: put this in build(7)? +GCDA files are installed to the +.Pa /usr/lib/cov +prefix. +.\" TODO: verify this claim in an e2e test. +The install directory mirrors the install path for the object directory, e.g., +.Pa /usr/lib/cov/usr/obj/lib/libc/stdio/vfprintf.gcda From owner-svn-src-projects@freebsd.org Sun Oct 22 07:58:30 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A19F7E4C069 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 07:58:30 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 5223A81711; Sun, 22 Oct 2017 07:58:30 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9M7wT2k027002; Sun, 22 Oct 2017 07:58:29 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M7wSkv026992; Sun, 22 Oct 2017 07:58:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710220758.v9M7wSkv026992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 07:58:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324852 - in projects/runtime-coverage: . share/man/man5 sys/boot sys/boot/i386/gptboot sys/boot/i386/gptzfsboot sys/boot/i386/libi386 sys/boot/i386/loader sys/sys X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: . share/man/man5 sys/boot sys/boot/i386/gptboot sys/boot/i386/gptzfsboot sys/boot/i386/libi386 sys/boot/i386/loader sys/sys X-SVN-Commit-Revision: 324852 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 07:58:30 -0000 Author: ngie Date: Sun Oct 22 07:58:28 2017 New Revision: 324852 URL: https://svnweb.freebsd.org/changeset/base/324852 Log: MFhead@r324851 Modified: projects/runtime-coverage/UPDATING projects/runtime-coverage/share/man/man5/src.conf.5 projects/runtime-coverage/sys/boot/Makefile.amd64 projects/runtime-coverage/sys/boot/Makefile.i386 projects/runtime-coverage/sys/boot/defs.mk projects/runtime-coverage/sys/boot/i386/gptboot/Makefile projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile projects/runtime-coverage/sys/boot/i386/libi386/Makefile projects/runtime-coverage/sys/boot/i386/loader/Makefile projects/runtime-coverage/sys/sys/errno.h Directory Properties: projects/runtime-coverage/ (props changed) Modified: projects/runtime-coverage/UPDATING ============================================================================== --- projects/runtime-coverage/UPDATING Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/UPDATING Sun Oct 22 07:58:28 2017 (r324852) @@ -51,6 +51,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20171021: + As part of the boot loader infrastructure cleanup, LOADER_*_SUPPORT + options are changing from controlling the build if defined / undefined + to controlling the build with explicit 'yes' or 'no' values. They will + shift to WITH/WITHOUT options to match other options in the system. + 20171010: libstand has turned into a private library for sys/boot use only. It is no longer supported as a public interface outside of sys/boot. Modified: projects/runtime-coverage/share/man/man5/src.conf.5 ============================================================================== --- projects/runtime-coverage/share/man/man5/src.conf.5 Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/share/man/man5/src.conf.5 Sun Oct 22 07:58:28 2017 (r324852) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd October 06, 2017 +.Dd October 10, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -162,7 +162,7 @@ Set to build and install binutils (as, ld, objcopy, an of the normal system build. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BINUTILS_BOOTSTRAP Set to not build binutils (as, ld, objcopy and objdump) as part of the bootstrap process. @@ -178,7 +178,7 @@ Set build binutils (as, ld, objcopy and objdump) as part of the bootstrap process. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BLACKLIST Set this if you do not want to build .Xr blacklistd 8 @@ -220,11 +220,6 @@ Set to not build the BSD licensed version of cpio base .Xr libarchive 3 . .It Va WITH_BSD_GREP Install BSD-licensed grep as '[ef]grep' instead of GNU grep. -.It Va WITHOUT_BSD_GREP_FASTMATCH -Set this option to exclude the fastmatch implementation from -.Xr bsdgrep 1 , -instead using only -.Xr regex 3 . .It Va WITHOUT_BSNMP Set to not build or install .Xr bsnmpd 1 @@ -325,7 +320,7 @@ When set, it enforces these options: Set to build the Clang C/C++ compiler during the normal phase of the build. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITHOUT_CLANG_BOOTSTRAP Set to not build the Clang C/C++ compiler during the bootstrap phase of the build. @@ -338,7 +333,7 @@ mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mi Set to build the Clang C/C++ compiler during the bootstrap phase of the build. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386. .It Va WITH_CLANG_EXTRAS Set to build additional clang and llvm tools, such as bugpoint. .It Va WITHOUT_CLANG_FULL @@ -352,7 +347,7 @@ Set to build the ARCMigrate, Rewriter and StaticAnalyz Clang C/C++ compiler. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITHOUT_CLANG_IS_CC Set to install the GCC compiler as .Pa /usr/bin/cc , @@ -370,7 +365,7 @@ and .Pa /usr/bin/cpp . .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386. .It Va WITHOUT_CPP Set to not build .Xr cpp 1 . @@ -437,7 +432,7 @@ Set to not build .Xr cxgbetool 8 .Pp This is a default setting on -arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpcspe, riscv/riscv64 and riscv/riscv64sf. +arm/arm, arm/armeb, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpcspe, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_CXGBETOOL Set to build .Xr cxgbetool 8 @@ -479,7 +474,7 @@ Set to build and related libraries. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_DEBUG_FILES Set to avoid building or installing standalone debug files for each executable binary and shared library. @@ -624,7 +619,7 @@ and .Xr efivar 8 . .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386. .It Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP Set to not build ELF Tool Chain tools (addr2line, nm, size, strings and strip) @@ -680,7 +675,7 @@ Set to not build games. Set to not build and install gcc and g++ as part of the normal build process. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_GCC Set to build and install gcc and g++. .Pp @@ -693,7 +688,7 @@ unless an alternative compiler is provided via XCC. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_GCC_BOOTSTRAP Set to build gcc and g++ as part of the bootstrap process. .Pp @@ -714,7 +709,7 @@ Set to build .Xr gdb 1 . .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_GDB_LIBEXEC Set to install .Xr gdb 1 @@ -722,7 +717,7 @@ into .Pa /usr/bin . .Pp This is a default setting on -arm/arm, arm/armeb, arm/armv6 and sparc64/sparc64. +arm/arm, arm/armeb, arm/armv6, arm/armv7 and sparc64/sparc64. .It Va WITH_GDB_LIBEXEC Set to install .Xr gdb 1 @@ -741,7 +736,7 @@ Do not build the GNU C++ stack (g++, libstdc++). This is the default on platforms where clang is the system compiler. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_GNUCXX Build the GNU C++ stack (g++, libstdc++). This is the default on platforms where gcc is the system compiler. @@ -769,7 +764,7 @@ Set to build the BSD licensed version of the device tr than the GPLed one from elinux.org. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITH_GPL_DTC Set to build the GPL'd version of the device tree compiler from elinux.org, instead of the BSD licensed one. @@ -962,12 +957,12 @@ mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mi Set to build LLVM's lld linker. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386. .It Va WITHOUT_LLDB Set to not build the LLDB debugger. .Pp This is a default setting on -arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. +arm/arm, arm/armeb, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. .It Va WITH_LLDB Set to build the LLDB debugger. .Pp @@ -980,7 +975,7 @@ To be able to build the system, either Binutils or LLD enabled unless an alternate linker is provided via XLD. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. .It Va WITH_LLD_BOOTSTRAP Set to build the LLD linker during the bootstrap phase of the build. .Pp @@ -990,7 +985,7 @@ arm64/aarch64. Set to use GNU binutils ld as the system linker, instead of LLVM's LLD. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. .It Va WITH_LLD_IS_LD Set to use LLVM's LLD as the system linker, instead of GNU binutils ld. .Pp @@ -1000,7 +995,7 @@ arm64/aarch64. Set to use GCC's stack unwinder (instead of LLVM's libunwind). .Pp This is a default setting on -arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +arm/arm, arm/armeb, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_LLVM_LIBUNWIND Set to use LLVM's libunwind stack unwinder (instead of GCC's unwinder). .Pp @@ -1269,7 +1264,7 @@ Set to build profiled libraries for use with .Xr gprof 8 . .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mipsn32, mips/mipselhf, mips/mipshf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mipsn32, mips/mipselhf, mips/mipshf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_QUOTAS Set to not build .Xr quota 1 @@ -1353,7 +1348,7 @@ mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mi Set to build world with propolice stack smashing protection. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64. .It Va WITH_STAGING Enable staging of files to a stage tree. This can be best thought of as auto-install to Modified: projects/runtime-coverage/sys/boot/Makefile.amd64 ============================================================================== --- projects/runtime-coverage/sys/boot/Makefile.amd64 Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/sys/boot/Makefile.amd64 Sun Oct 22 07:58:28 2017 (r324852) @@ -5,7 +5,7 @@ SUBDIR+= libsa32 SUBDIR+= zfs SUBDIR+= userboot -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" SUBDIR+= geli .endif Modified: projects/runtime-coverage/sys/boot/Makefile.i386 ============================================================================== --- projects/runtime-coverage/sys/boot/Makefile.i386 Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/sys/boot/Makefile.i386 Sun Oct 22 07:58:28 2017 (r324852) @@ -4,6 +4,6 @@ SUBDIR+= efi SUBDIR+= libsa32 SUBDIR+= zfs -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" SUBDIR+= geli .endif Modified: projects/runtime-coverage/sys/boot/defs.mk ============================================================================== --- projects/runtime-coverage/sys/boot/defs.mk Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/sys/boot/defs.mk Sun Oct 22 07:58:28 2017 (r324852) @@ -6,18 +6,24 @@ __BOOT_DEFS_MK__=${MFILE} BOOTDIR= ${SRCTOP}/sys/boot -FICLDIR= ${SRCTOP}/sys/boot/ficl +FICLDIR= ${BOOTDIR}/ficl LDR_MI= ${BOOTDIR}/common -SASRC= ${SRCTOP}/sys/boot/libsa +SASRC= ${BOOTDIR}/libsa SYSDIR= ${SRCTOP}/sys +BOOTOBJ= ${OBJTOP}/sys/boot + # NB: The makefiles depend on these being empty when we don't build forth. .if ${MK_FORTH} != "no" -LIBFICL= ${OBJTOP}/sys/boot/ficl/libficl.a -LIBFICL32= ${OBJTOP}/sys/boot/ficl32/libficl.a +LIBFICL= ${BOOTOBJ}/ficl/libficl.a +LIBFICL32= ${BOOTOBJ}/ficl32/libficl.a .endif -LIBSA= ${OBJTOP}/sys/boot/libsa/libsa.a -LIBSA32= ${OBJTOP}/sys/boot/libsa32/libsa32.a +LIBSA= ${BOOTOBJ}/libsa/libsa.a +.if ${MACHINE} == "i386" +LIBSA32= ${LIBSA} +.else +LIBSA32= ${BOOTOBJ}/libsa32/libsa32.a +.endif # Standard options: Modified: projects/runtime-coverage/sys/boot/i386/gptboot/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/i386/gptboot/Makefile Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/sys/boot/i386/gptboot/Makefile Sun Oct 22 07:58:28 2017 (r324852) @@ -41,11 +41,11 @@ CFLAGS+=-DBOOTPROG=\"gptboot\" \ CFLAGS.gcc+= --param max-inline-insns-single=100 -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${.CURDIR}/../../geli +CFLAGS+= -I${BOOTDIR}/geli CFLAGS+= -I${.CURDIR}/../../.. -LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a +LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto OPENCRYPTO_XTS= xform_aes_xts.o .endif Modified: projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 07:58:28 2017 (r324852) @@ -48,10 +48,10 @@ CFLAGS+= -Wno-tentative-definition-incomplete-type # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${.CURDIR}/../../geli -LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a +CFLAGS+= -I${BOOTDIR}/geli +LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto OPENCRYPTO_XTS= xform_aes_xts.o .endif Modified: projects/runtime-coverage/sys/boot/i386/libi386/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/i386/libi386/Makefile Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/sys/boot/i386/libi386/Makefile Sun Oct 22 07:58:28 2017 (r324852) @@ -25,10 +25,10 @@ CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} CFLAGS+= -DDISK_DEBUG .endif -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" # Decrypt encrypted drives CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${.CURDIR}/../../geli +CFLAGS+= -I${BOOTDIR}/geli .endif .if !defined(BOOT_HIDE_SERIAL_NUMBERS) Modified: projects/runtime-coverage/sys/boot/i386/loader/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/i386/loader/Makefile Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/sys/boot/i386/loader/Makefile Sun Oct 22 07:58:28 2017 (r324852) @@ -43,8 +43,8 @@ HAVE_ISABUS= yes .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${.CURDIR}/../../geli -LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a +CFLAGS+= -I${BOOTDIR}/geli +LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto SRCS+= xform_aes_xts.c CFLAGS+= -I${.CURDIR}/../../.. -D_STAND Modified: projects/runtime-coverage/sys/sys/errno.h ============================================================================== --- projects/runtime-coverage/sys/sys/errno.h Sun Oct 22 07:36:28 2017 (r324851) +++ projects/runtime-coverage/sys/sys/errno.h Sun Oct 22 07:58:28 2017 (r324852) @@ -38,7 +38,7 @@ #ifndef _SYS_ERRNO_H_ #define _SYS_ERRNO_H_ -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_STAND) #include <sys/cdefs.h> __BEGIN_DECLS int * __error(void); From owner-svn-src-projects@freebsd.org Sun Oct 22 08:42:02 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69BC4E4D26F for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 08:42:02 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 38CC782FC3; Sun, 22 Oct 2017 08:42:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9M8g1tW047218; Sun, 22 Oct 2017 08:42:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M8g1W0047217; Sun, 22 Oct 2017 08:42:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710220842.v9M8g1W0047217@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 08:42:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324854 - projects/runtime-coverage/share/man/man7 X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/man/man7 X-SVN-Commit-Revision: 324854 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 08:42:02 -0000 Author: ngie Date: Sun Oct 22 08:42:01 2017 New Revision: 324854 URL: https://svnweb.freebsd.org/changeset/base/324854 Log: Document /usr/lib/cov (COVERAGEDIR) in hier(7) Modified: projects/runtime-coverage/share/man/man7/hier.7 Modified: projects/runtime-coverage/share/man/man7/hier.7 ============================================================================== --- projects/runtime-coverage/share/man/man7/hier.7 Sun Oct 22 08:11:45 2017 (r324853) +++ projects/runtime-coverage/share/man/man7/hier.7 Sun Oct 22 08:42:01 2017 (r324854) @@ -346,6 +346,8 @@ shared libraries for compatibility .It Pa aout/ a.out backward compatibility libraries .El +.It Pa cov/ +standalone coverage data for base system libraries and binaries .It Pa debug/ standalone debug data for the kernel and base system libraries and binaries .It Pa dtrace/ From owner-svn-src-projects@freebsd.org Sun Oct 22 11:21:32 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3600EE50378 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 11:21:32 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 05FE130A1; Sun, 22 Oct 2017 11:21:31 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MBLV8M013082; Sun, 22 Oct 2017 11:21:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MBLV2v013081; Sun, 22 Oct 2017 11:21:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710221121.v9MBLV2v013081@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 11:21:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324859 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324859 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 11:21:32 -0000 Author: ngie Date: Sun Oct 22 11:21:31 2017 New Revision: 324859 URL: https://svnweb.freebsd.org/changeset/base/324859 Log: Do direct comparisons with TARGET for armv6/armv7 This simplifies the conditionals Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Sun Oct 22 11:15:58 2017 (r324858) +++ projects/runtime-coverage/share/mk/src.opts.mk Sun Oct 22 11:21:31 2017 (r324859) @@ -293,7 +293,7 @@ __DEFAULT_YES_OPTIONS+=CXGBETOOL __DEFAULT_NO_OPTIONS+=CXGBETOOL .endif .if ${__T} == "aarch64" || ${__T} == "arm" || ${__T} == "armeb" || \ - ${__T:Marmv6} != "" || ${__T:Marmv7} != "" + ${__T} == "armv6" || ${__T} == "armv7" BROKEN_OPTIONS+=COVERAGE .endif From owner-svn-src-projects@freebsd.org Sun Oct 22 11:45:52 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BFA14E50954 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 11:45:52 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 8DD513C6B; Sun, 22 Oct 2017 11:45:52 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MBjpRc024584; Sun, 22 Oct 2017 11:45:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MBjp6I024582; Sun, 22 Oct 2017 11:45:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710221145.v9MBjp6I024582@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 11:45:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324861 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324861 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 11:45:52 -0000 Author: ngie Date: Sun Oct 22 11:45:51 2017 New Revision: 324861 URL: https://svnweb.freebsd.org/changeset/base/324861 Log: Only try handling mutating GCNOS if SRCS is not empty This should cure the logspam in certain directory about SRCS:M not evaluating properly, e.g., etc/ Modified: projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 22 11:40:55 2017 (r324860) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 22 11:45:51 2017 (r324861) @@ -458,7 +458,7 @@ _libinstall: .if !defined(LIBRARIES_ONLY) .include <bsd.nls.mk> -.if defined(_COV_FLAG) +.if defined(_COV_FLAG) && !empty(SRCS) _GCNO_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} GCNOS:= ${_GCNO_SRCS:R:S/$/.gcno/g} .undef _GCNO_SRCS Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 11:40:55 2017 (r324860) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 11:45:51 2017 (r324861) @@ -305,7 +305,7 @@ NLSNAME?= ${PROG} .include <bsd.nls.mk> .include <bsd.confs.mk> -.if defined(_COV_FLAG) +.if defined(_COV_FLAG) && !empty(SRCS) _GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} GCDAS:= ${_GCDA_SRCS:R:S/$/.gcno/g} .undef _GCDA_SRCS From owner-svn-src-projects@freebsd.org Sun Oct 22 21:01:01 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 702A6E34DC7 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 21:01:01 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 3FB4B74837; Sun, 22 Oct 2017 21:01:01 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9ML10II055785; Sun, 22 Oct 2017 21:01:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9ML10dW055784; Sun, 22 Oct 2017 21:01:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710222101.v9ML10dW055784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 21:01:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324871 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324871 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 21:01:01 -0000 Author: ngie Date: Sun Oct 22 21:00:59 2017 New Revision: 324871 URL: https://svnweb.freebsd.org/changeset/base/324871 Log: Create GCNOS directories at install time if needed Add GCNOS{GRP,MODE,OWN} for parity with FILES{GRP,MODE,OWN}. The defaults are based on BIN{GRP,MODE,OWN}. GCNOSDIRMODE is added, strictly for configurability, if need be. Modified: projects/runtime-coverage/share/mk/bsd.cov.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Sun Oct 22 20:43:50 2017 (r324870) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Sun Oct 22 21:00:59 2017 (r324871) @@ -14,11 +14,25 @@ FILESGROUPS?= FILES .if !empty(GCNOS) + +GCNOSOWN?= ${BINOWN} +GCNOSGRP?= ${BINGRP} +GCNOSMODE?= 0644 +GCNOSDIRMODE?= 0755 + GCNOS:= ${GCNOS:O:u} FILESGROUPS+= GCNOS CLEANFILES+= ${GCNOS} .for _gcno in ${GCNOS} -GCNOSDIR_${_gcno:T}= ${COVERAGEDIR}${_gcno:H:tA} +_gcno_dir= ${COVERAGEDIR}${_gcno:H:tA} +GCNOSDIR_${_gcno:T}= ${_gcno_dir} +# Create _gcno_dir if it doesn't already exist. +.if !target(${DESTDIR}${_gcno_dir}) +${DESTDIR}${_gcno_dir}: + ${INSTALL} -d -o ${GCNOSOWN} -g ${GCNOSGRP} -m ${GCNOSDIRMODE} \ + ${.TARGET}/ +.endif +${_gcno}: ${DESTDIR}${_gcno_dir} .endfor .endif From owner-svn-src-projects@freebsd.org Sun Oct 22 21:34:38 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7775E36960 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 21:34:38 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id A4F8975A0E; Sun, 22 Oct 2017 21:34:38 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MLYboH072149; Sun, 22 Oct 2017 21:34:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MLYbfE072147; Sun, 22 Oct 2017 21:34:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710222134.v9MLYbfE072147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 21:34:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324873 - in projects/runtime-coverage: lib/libclang_rt share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: lib/libclang_rt share/mk X-SVN-Commit-Revision: 324873 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 21:34:39 -0000 Author: ngie Date: Sun Oct 22 21:34:37 2017 New Revision: 324873 URL: https://svnweb.freebsd.org/changeset/base/324873 Log: Define TARGET_CPUARCH and use in libclang_rt as the basis for CRTARCH When cross-compiling, the wrong architecture was being embedded in the libclang_rt binary filenames. It should be based on TARGET_ARCH (target), not MACHINE_ARCH (host). This is a draft commit against my project branch. Will fix on ^/head soon. PR: 222925 Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc projects/runtime-coverage/share/mk/sys.mk Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc ============================================================================== --- projects/runtime-coverage/lib/libclang_rt/Makefile.inc Sun Oct 22 21:11:59 2017 (r324872) +++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc Sun Oct 22 21:34:37 2017 (r324873) @@ -2,7 +2,7 @@ .include <src.opts.mk> -CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/} +CRTARCH= ${TARGET_CPUARCH:C/amd64/x86_64/} CRTSRC= ${SRCTOP}/contrib/compiler-rt .PATH: ${CRTSRC}/lib Modified: projects/runtime-coverage/share/mk/sys.mk ============================================================================== --- projects/runtime-coverage/share/mk/sys.mk Sun Oct 22 21:11:59 2017 (r324872) +++ projects/runtime-coverage/share/mk/sys.mk Sun Oct 22 21:34:37 2017 (r324873) @@ -15,6 +15,7 @@ unix ?= We run FreeBSD, not UNIX. # __TO_CPUARCH=C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v[67])?(eb)?/arm/:C/powerpc(64|spe)/powerpc/:C/riscv64(sf)?/riscv/ MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}} +TARGET_CPUARCH=${TARGET_ARCH:${__TO_CPUARCH}} .endif From owner-svn-src-projects@freebsd.org Sun Oct 22 21:39:59 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99592E36A77 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 21:39:59 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 6767175C22; Sun, 22 Oct 2017 21:39:59 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MLdwol072371; Sun, 22 Oct 2017 21:39:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MLdwD2072370; Sun, 22 Oct 2017 21:39:58 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710222139.v9MLdwD2072370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 21:39:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324874 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324874 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 21:39:59 -0000 Author: ngie Date: Sun Oct 22 21:39:58 2017 New Revision: 324874 URL: https://svnweb.freebsd.org/changeset/base/324874 Log: Remove BROKEN_OPTIONS/MK_COVERAGE=no for gcc cross-toolchain reliant archs The cross-toolchain gcc toolchains aren't installing libgcov.a, but the host toolchain variants are. Don't hack around broken packages in the base system. PR: 223174 Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Sun Oct 22 21:34:37 2017 (r324873) +++ projects/runtime-coverage/share/mk/src.opts.mk Sun Oct 22 21:39:58 2017 (r324874) @@ -240,7 +240,6 @@ BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BO .endif .if ${__T:Mriscv*} != "" BROKEN_OPTIONS+=PROFILE # "sorry, unimplemented: profiler support for RISC-V" -BROKEN_OPTIONS+=COVERAGE # External toolchain (GNU-based) doesn't have libgcov.a . BROKEN_OPTIONS+=TESTS # "undefined reference to `_Unwind_Resume'" BROKEN_OPTIONS+=CXX # "libcxxrt.so: undefined reference to `_Unwind_Resume_or_Rethrow'" .endif @@ -292,10 +291,6 @@ __DEFAULT_YES_OPTIONS+=CXGBETOOL .else __DEFAULT_NO_OPTIONS+=CXGBETOOL .endif -.if ${__T} == "aarch64" || ${__T} == "arm" || ${__T} == "armeb" || \ - ${__T} == "armv6" || ${__T} == "armv7" -BROKEN_OPTIONS+=COVERAGE -.endif .include <bsd.mkopt.mk> @@ -473,9 +468,7 @@ MK_${var}_SUPPORT:= yes MK_LLDB:= no .endif -.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 -# Cross-toolchains unfortunately don't install libgcov.a . -MK_COVERAGE:=no +.if ${COMPILER_TYPE} == "gcc" # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. # while in theory we could build it with that, we don't want to do # that since it creates too much confusion for too little gain. From owner-svn-src-projects@freebsd.org Sun Oct 22 22:05:38 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3CBCE37841 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 22:05:38 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 8F2EC76AD1; Sun, 22 Oct 2017 22:05:38 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MM5b9k084597; Sun, 22 Oct 2017 22:05:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MM5bhk084596; Sun, 22 Oct 2017 22:05:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710222205.v9MM5bhk084596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 22:05:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324875 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324875 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 22:05:38 -0000 Author: ngie Date: Sun Oct 22 22:05:37 2017 New Revision: 324875 URL: https://svnweb.freebsd.org/changeset/base/324875 Log: Disable MK_COVERAGE in Makefile.inc1 when working with broken gcc packages It makes more sense to do this in the top-level Makefile, instead of down in src.opts.mk . PR: 223174 Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Sun Oct 22 21:39:58 2017 (r324874) +++ projects/runtime-coverage/Makefile.inc1 Sun Oct 22 22:05:37 2017 (r324875) @@ -624,6 +624,9 @@ TARGET_ABI= gnueabi .endif .if ${WANT_COMPILER_TYPE} == gcc || \ (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) +# The cross-toolchain gcc packages are broken with respect to libgcov.a, etc. +# PR: 223174 +MK_COVERAGE= no # GCC requires -isystem and -L when using a cross-compiler. --sysroot # won't set header path and -L is used to ensure the base library path # is added before the port PREFIX library path. From owner-svn-src-projects@freebsd.org Sun Oct 22 22:06:33 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91967E37869 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 22:06:33 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x22d.google.com (mail-pf0-x22d.google.com [IPv6:2607:f8b0:400e:c00::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5C8EC76BB6; Sun, 22 Oct 2017 22:06:33 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x22d.google.com with SMTP id t188so15678523pfd.10; Sun, 22 Oct 2017 15:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc:message-id:references :to; bh=+jUZDrx92jx4Mi6mb2e1BEK28b/01+nbjUxTNkBE/t4=; b=OD/zZaLSIBWuaxjXPso8YBNIIyFFqlyqo18ABdBYl1u6MrQubcC2M/I1GpxhHSnNTP pcI40kpifpcAykPSki62FxZ4jAR7b3wcAhwFGxzQuMQhe+yCYs20yqkVvRBQMXlUzX3h va236J/uFCmswUFjdvx6bTixlZE+AoUt9/C4+1fbw+7YHneBsWcouWzUzzhYrgN2R9XD NivmAyTSxkQXm9JhjhDmDX7Md2tEPJsTxWDtJcZU7fiysDzcdcTL1bf83E7/hUkj5Xne zSq26kwI+EFkWkC2aNX+tH/tLdNBhCddEM3qjybMG9M1r5R5fiKFXR2hCkvlAFz9wE3G TFHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=+jUZDrx92jx4Mi6mb2e1BEK28b/01+nbjUxTNkBE/t4=; b=Jn4Ps/zFILHzf/SBqVEcL3VZRX+pM2ou4mhvphXPZx3igK/jbeRP6OaD0KpDf9lLtn Ykr1VU8oN9uo38vtCDXGQLAnOKMGtR5MAUXnyHCvk3iYqk6wFod/jXDwZOyVLgm/HHhy YpnW9sMK3/Z/NhBV6iQ38dne4cAfc46ZAa22tqHErIz+oR1/E03qdHt1dosltBNnFb9S qmT9M0zxnQb+KAckGuqFxz6TiVNK6FDbA3tpQeT5WeeOI6pmF9/fbGwP/n3lKx12HbVk c2tXGnn9SOS96lb+p0a2mtRoO5DPHsvPbzOCWwGtBjwreeOoPC1cMS9Xoe4LfuIKeKIw iDbg== X-Gm-Message-State: AMCzsaW+cw1JH7KW66g06K/+1YuftqF94trn+c6GJjg6UE18Ra2d7SlM RxlaJqAuhS3C22yDAeA6Byo6QV45 X-Google-Smtp-Source: ABhQp+Sg3A+0wPBv2JySOyU/M0bZnf3MlQiGUfYiDK+oYqK1cKOO0XDIW1sFBYBPm5GX7ljufQyiSQ== X-Received: by 10.98.207.71 with SMTP id b68mr11128504pfg.125.1508709992623; Sun, 22 Oct 2017 15:06:32 -0700 (PDT) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id g16sm8727146pgn.43.2017.10.22.15.06.31 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Oct 2017 15:06:31 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_FBBD22DC-068A-4662-821E-1033510AA6B5"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: svn commit: r324874 - projects/runtime-coverage/share/mk From: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> In-Reply-To: <201710222139.v9MLdwD2072370@repo.freebsd.org> Date: Sun, 22 Oct 2017 15:06:30 -0700 Cc: src-committers <src-committers@freebsd.org>, svn-src-projects@freebsd.org Message-Id: <43D39B7F-563C-4661-9BE6-F53F991AEC0A@gmail.com> References: <201710222139.v9MLdwD2072370@repo.freebsd.org> To: Ngie Cooper <ngie@FreeBSD.org> X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 22:06:33 -0000 --Apple-Mail=_FBBD22DC-068A-4662-821E-1033510AA6B5 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Oct 22, 2017, at 14:39, Ngie Cooper <ngie@FreeBSD.org> wrote: >=20 > Author: ngie > Date: Sun Oct 22 21:39:58 2017 > New Revision: 324874 > URL: https://svnweb.freebsd.org/changeset/base/324874 >=20 > Log: > Remove BROKEN_OPTIONS/MK_COVERAGE=3Dno for gcc cross-toolchain = reliant archs >=20 > The cross-toolchain gcc toolchains aren't installing libgcov.a, but = the host > toolchain variants are. Don't hack around broken packages in the base = system. =E2=80=A6 well, in a less intuitive location at least. Please see: = r324875. Cheers, -Ngie --Apple-Mail=_FBBD22DC-068A-4662-821E-1033510AA6B5 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE5bk3FaGcY5rvqmb79YOpJmkwhhUFAlntFmYACgkQ9YOpJmkw hhXCiw/+PkAeYq6RmcXiKd4sOrrwuzDe/KHVdKhNqhHiu2Lcwfsl6r0710iVSPIn /z/aqmA+UKqAbNDAY+Wmse93Nth9hlFMuIWODx9KHHpkMLja0yCB3ly8TKqEXZ3d hq8S3Wda3agowjDs5tNsnGg4nAyfwmQn/+ygM5hBrd7MixKEJsQCT/e3lYhhTEEI Jsn9D5RoVvA9ZL15npSsZ6/5kwCuegSJ1zMioR/OLVCTWJYprqmmpaVz4mva0oZg +KYZ14DuusuMO5DtXMHW5zbn+ITCXL2pl3UWWuuo9nDIrC1QUph9x+9gQoR9hTPL EloGVEjd9Ons/eDcaD0F/+hHKfc6jeKTZa9+r631rT/wx/Sp1uIqEgiB6QPuxIIg 6o7AsSR+SE44mg5TQ9XPTtbtJZ8DHz8Wt2Qo/4UbLSDlxp7WZGYfNhBWCxvhL4L+ zN+SQka88EhnS79dctYNuPkCXDr4sHFxZmyM2CjLDkZRwSShbUVB+Hd0bRg3L6H0 S5Y8wFKp/a7qA7gJv9LaB/U6IXA5ZgP7GOB47Ldo8yU721+n/93/PYXy1rr03S5H CdTFpiUAiqdWFmepa08FUu3tsMo8zLx1VWmRBfCu9J7icwtCxuru4AgecydD2hDf QuMy5PDmG6BVatquIFiSySU2Tkn6dXa/XMpLE9tRKruxooVgI6Y= =qpIM -----END PGP SIGNATURE----- --Apple-Mail=_FBBD22DC-068A-4662-821E-1033510AA6B5-- From owner-svn-src-projects@freebsd.org Sun Oct 22 23:36:45 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F8DCE39E31 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 23:36:45 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 2CDF67E105; Sun, 22 Oct 2017 23:36:45 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MNaihI022165; Sun, 22 Oct 2017 23:36:44 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MNaiP9022164; Sun, 22 Oct 2017 23:36:44 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710222336.v9MNaiP9022164@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 23:36:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324884 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324884 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 23:36:45 -0000 Author: ngie Date: Sun Oct 22 23:36:43 2017 New Revision: 324884 URL: https://svnweb.freebsd.org/changeset/base/324884 Log: Restore gcc 4.8 version check I accidentally broke it when making changes Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Sun Oct 22 22:52:27 2017 (r324883) +++ projects/runtime-coverage/share/mk/src.opts.mk Sun Oct 22 23:36:43 2017 (r324884) @@ -468,7 +468,7 @@ MK_${var}_SUPPORT:= yes MK_LLDB:= no .endif -.if ${COMPILER_TYPE} == "gcc" +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. # while in theory we could build it with that, we don't want to do # that since it creates too much confusion for too little gain. From owner-svn-src-projects@freebsd.org Sun Oct 22 23:40:50 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF99DE3A0DB for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 22 Oct 2017 23:40:50 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 7991C7E343; Sun, 22 Oct 2017 23:40:50 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MNenwa022553; Sun, 22 Oct 2017 23:40:49 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MNen8h022549; Sun, 22 Oct 2017 23:40:49 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710222340.v9MNen8h022549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Sun, 22 Oct 2017 23:40:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324885 - in projects/runtime-coverage: cddl/contrib/opensolaris/lib/libctf/common include lib/libc/gen libexec/rtld-elf share/man/man4 sys/amd64/include sys/boot sys/boot/arm/at91/boot... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: cddl/contrib/opensolaris/lib/libctf/common include lib/libc/gen libexec/rtld-elf share/man/man4 sys/amd64/include sys/boot sys/boot/arm/at91/boot2 sys/boot/arm/uboot sys/... X-SVN-Commit-Revision: 324885 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 22 Oct 2017 23:40:50 -0000 Author: ngie Date: Sun Oct 22 23:40:49 2017 New Revision: 324885 URL: https://svnweb.freebsd.org/changeset/base/324885 Log: MFhead@r324884 Added: projects/runtime-coverage/sys/boot/uboot.mk - copied unchanged from r324884, head/sys/boot/uboot.mk projects/runtime-coverage/tools/boot/ - copied from r324884, head/tools/boot/ Deleted: projects/runtime-coverage/sys/boot/uboot/common/Makefile.inc Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libctf/common/ctf.5 projects/runtime-coverage/include/runetype.h projects/runtime-coverage/lib/libc/gen/sysctl.3 projects/runtime-coverage/libexec/rtld-elf/libmap.c projects/runtime-coverage/share/man/man4/udbp.4 projects/runtime-coverage/sys/amd64/include/param.h projects/runtime-coverage/sys/boot/arm/at91/boot2/boot2.c projects/runtime-coverage/sys/boot/arm/uboot/Makefile projects/runtime-coverage/sys/boot/defs.mk projects/runtime-coverage/sys/boot/fdt/Makefile projects/runtime-coverage/sys/boot/ficl.mk projects/runtime-coverage/sys/boot/ficl/Makefile projects/runtime-coverage/sys/boot/geli/Makefile projects/runtime-coverage/sys/boot/i386/Makefile.inc projects/runtime-coverage/sys/boot/i386/gptboot/Makefile projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile projects/runtime-coverage/sys/boot/i386/libi386/Makefile projects/runtime-coverage/sys/boot/i386/loader/Makefile projects/runtime-coverage/sys/boot/libsa/Makefile projects/runtime-coverage/sys/boot/loader.mk projects/runtime-coverage/sys/boot/mips/beri/loader/Makefile projects/runtime-coverage/sys/boot/mips/uboot/Makefile projects/runtime-coverage/sys/boot/powerpc/boot1.chrp/Makefile projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile projects/runtime-coverage/sys/boot/powerpc/uboot/Makefile projects/runtime-coverage/sys/boot/sparc64/loader/Makefile projects/runtime-coverage/sys/boot/uboot/lib/Makefile projects/runtime-coverage/sys/cddl/dev/sdt/sdt.c projects/runtime-coverage/sys/dev/usb/misc/udbp.c projects/runtime-coverage/sys/dev/usb/usbdevs projects/runtime-coverage/sys/fs/pseudofs/pseudofs.h projects/runtime-coverage/sys/kern/kern_sdt.c projects/runtime-coverage/sys/kern/subr_kdb.c projects/runtime-coverage/sys/kern/subr_sleepqueue.c projects/runtime-coverage/sys/kern/vfs_syscalls.c projects/runtime-coverage/sys/sys/kdb.h projects/runtime-coverage/sys/sys/priv.h projects/runtime-coverage/sys/sys/sdt.h projects/runtime-coverage/sys/vm/swap_pager.c projects/runtime-coverage/sys/vm/vm_param.h Directory Properties: projects/runtime-coverage/ (props changed) projects/runtime-coverage/cddl/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/ (props changed) Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libctf/common/ctf.5 ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libctf/common/ctf.5 Sun Oct 22 23:36:43 2017 (r324884) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libctf/common/ctf.5 Sun Oct 22 23:40:49 2017 (r324885) @@ -39,7 +39,8 @@ data contained in each file has information about the sizes of C types, including intrinsic types, enumerations, structures, typedefs, and unions, that are used by the corresponding .Sy ELF -object. The +object. +The .Nm data may also include information about the types of global objects and the return type and arguments of functions in the symbol table. @@ -51,41 +52,43 @@ file itself, it may also be referred to as a .Nm .Sy container . .Lp -On illumos systems, +On +.Fx +systems, .Nm -data is consumed by multiple programs. It can be used by the modular -debugger, -.Xr mdb 1 , -as well as by -.Xr dtrace 1M . +data is consumed by +.Xr dtrace 1 . Programmatic access to .Nm -data can be obtained through -.Xr libctf 3LIB . +data can be obtained through libctf. .Lp The .Nm -file format is broken down into seven different sections. The first -section is the +file format is broken down into seven different sections. +The first section is the .Sy preamble and .Sy header , which describes the version of the .Nm -file, links it has to other +file, the links it has to other .Nm -files, and the sizes of the other sections. The next section is the +files, and the sizes of the other sections. +The next section is the .Sy label section, which provides a way of identifying similar groups of .Nm -data across multiple files. This is followed by the +data across multiple files. +This is followed by the .Sy object -information section, which describes the type of global -symbols. The subsequent section is the +information section, which describes the types of global +symbols. +The subsequent section is the .Sy function information section, which describes the return -types and arguments of functions. The next section is the +types and arguments of functions. +The next section is the .Sy type information section, which describes the format and layout of the C types themselves, and finally the last @@ -106,29 +109,35 @@ A file may contain all of the type information that it requires, or it may optionally refer to another .Nm -file which holds the remaining types. When a +file which holds the remaining types. +When a .Nm file refers to another file, it is called the .Sy child and the file it refers to is called the .Sy parent . -A given file may only refer to one parent. This process is called +A given file may only refer to one parent. +This process is called .Em uniquification because it ensures each child only has type information that is -unique to it. A common example of this is that most kernel modules in -illumos are uniquified against the kernel module +unique to it. +A common example of this is that most kernel modules in illumos are uniquified +against the kernel module .Sy genunix and the type information that comes from the .Sy IP -module. This means that a module only has types that are unique to -itself and the most common types in the kernel are not duplicated. +module. +This means that a module only has types that are unique to itself and the most +common types in the kernel are not duplicated. .Sh FILE FORMAT This documents version .Em two of the .Nm -file format. All applications and tools currently produce and operate on -this version. +file format. +All applications and tools on +.Fx +currently produce and operate on this version. .Lp The file format can be summarized with the following image, the following sections will cover this in more detail. @@ -235,26 +244,31 @@ This .Sy preamble defines the version of the .Nm -file which defines the format of the rest of the header. While the -header may change in subsequent versions, the preamble will not change +file which defines the format of the rest of the header. +While the header may change in subsequent versions, the preamble will not change across versions, though the interpretation of its flags may change from -version to version. The +version to version. +The .Em ctp_magic member defines the magic number for the .Nm -file format. This must always be +file format. +This must always be .Li 0xcff1 . If another value is encountered, then the file should not be treated as a .Nm -file. The +file. +The .Em ctp_version member defines the version of the .Nm -file. The current version is +file. +The current version is .Li 2 . -It is possible to encounter an unsupported version. In that case, -software should not try to parse the format, as it may have changed. +It is possible to encounter an unsupported version. +In that case, software should not try to parse the format, as it may have +changed. Finally, the .Em ctp_flags member describes aspects of the file which modify its interpretation. @@ -273,9 +287,10 @@ has been compressed through the .Sy zlib library and its .Sy deflate -algorithm. If this flag is not present, then the body has not been -compressed and no special action is needed to interpret it. All offsets -into the data as described by +algorithm. +If this flag is not present, then the body has not been compressed and no +special action is needed to interpret it. +All offsets into the data as described by .Sy header , always refer to the .Sy uncompressed @@ -285,13 +300,13 @@ In version two of the .Nm file format, the .Sy header -denotes whether whether or not this +denotes whether or not this .Nm file is the child of another .Nm -file and also indicates the size of the remaining sections. The -structure for the -.Sy header , +file and also indicates the size of the remaining sections. +The structure for the +.Sy header logically contains a copy of the .Sy preamble and the two have a combined size of 36 bytes. @@ -315,37 +330,40 @@ the next two members .Em cth_parlablel and .Em cth_parname , -are used to identify the parent. The value of both members are offsets -into the +are used to identify the parent. +The value of both members are offsets into the .Sy string -section which point to the start of a null-terminated string. For more -information on the encoding of strings, see the subsection on +section which point to the start of a null-terminated string. +For more information on the encoding of strings, see the subsection on .Sx String Identifiers . If the value of either is zero, then there is no entry for that -member. If the member +member. +If the member .Em cth_parlabel is set, then the .Em ctf_parname member must be set, otherwise it will not be possible to find the -parent. If +parent. +If .Em ctf_parname is set, it is not necessary to define .Em cth_parlabel , -as the parent may not have a label. For more information on labels -and their interpretation, see +as the parent may not have a label. +For more information on labels and their interpretation, see .Sx The Label Section . .Lp The remaining members (excepting .Em cth_strlen ) -describe the beginning of the corresponding sections. These offsets are -relative to the end of the +describe the beginning of the corresponding sections. +These offsets are relative to the end of the .Sy header . Therefore, something with an offset of 0 is at an offset of thirty-six bytes relative to the start of the .Nm -file. The difference between members -indicates the size of the section itself. Different offsets have -different alignment requirements. The start of the +file. +The difference between members indicates the size of the section itself. +Different offsets have different alignment requirements. +The start of the .Em cth_objotoff and .Em cth_funcoff @@ -353,13 +371,14 @@ must be two byte aligned, while the sections .Em cth_lbloff and .Em cth_typeoff -must be four-byte aligned. The section +must be four-byte aligned. +The section .Em cth_stroff -has no alignment requirements. To calculate the size of a given section, -excepting the +has no alignment requirements. +To calculate the size of a given section, excepting the .Sy string -section, one should subtract the offset of the section from the following one. For -example, the size of the +section, one should subtract the offset of the section from the following one. +For example, the size of the .Sy types section can be calculated by subtracting .Em cth_stroff @@ -368,8 +387,8 @@ from .Lp Finally, the member .Em cth_strlen -describes the length of the string section itself. From it, you can also -calculate the size of the entire +describes the length of the string section itself. +From it, you can also calculate the size of the entire .Nm file by adding together the size of the .Sy ctf_header_t , @@ -380,9 +399,11 @@ and the size of the string section in .Ss Type Identifiers Through the .Nm ctf -data, types are referred to by identifiers. A given +data, types are referred to by identifiers. +A given .Nm -file supports up to 32767 (0x7fff) types. The first valid type identifier is 0x1. +file supports up to 32767 (0x7fff) types. +The first valid type identifier is 0x1. When a given .Nm file is a child, indicated by a non-zero entry for the @@ -403,18 +424,20 @@ Other consumers of information may use larger or opaque identifiers. .Ss String Identifiers String identifiers are always encoded as four byte unsigned integers -which are an offset into a string table. The +which are an offset into a string table. +The .Nm format supports two different string tables which have an identifier of -zero or one. This identifier is stored in the high-order bit of the -unsigned four byte offset. Therefore, the maximum supported offset into -one of these tables is 0x7ffffffff. +zero or one. +This identifier is stored in the high-order bit of the unsigned four byte +offset. +Therefore, the maximum supported offset into one of these tables is 0x7ffffffff. .Lp Table identifier zero, always refers to the .Sy string -section in the CTF file itself. String table identifier one refers to an -external string table which is the ELF string table for the ELF symbol -table associated with the +section in the CTF file itself. +String table identifier one refers to an external string table which is the ELF +string table for the ELF symbol table associated with the .Nm container. .Ss Type Encoding @@ -434,8 +457,8 @@ The length of the variable data .Lp The 16 bits that make up the encoding are broken down such that you have five bits for the kind, one bit for indicating whether or not it is a -root type, and 10 bits for the variable length. This is laid out as -follows: +root type, and 10 bits for the variable length. +This is laid out as follows: .Bd -literal -offset indent +--------------------+ | kind | root | vlen | @@ -443,12 +466,13 @@ follows: 15 11 10 9 0 .Ed .Lp -The current version of the file format defines 14 different kinds. The -interpretation of these different kinds will be discussed in the section +The current version of the file format defines 14 different kinds. +The interpretation of these different kinds will be discussed in the section .Sx The Type Section . If a kind is encountered that is not listed below, then it is not a valid .Nm -file. The kinds are defined as follows: +file. +The kinds are defined as follows: .Bd -literal -offset indent #define CTF_K_UNKNOWN 0 #define CTF_K_INTEGER 1 @@ -467,14 +491,16 @@ file. The kinds are defined as follows: .Ed .Lp Programs directly reference many types; however, other types are referenced -indirectly because they are part of some other structure. These types that are -referenced directly and used are called +indirectly because they are part of some other structure. +These types that are referenced directly and used are called .Sy root -types. Other types may be used indirectly, for example, a program may reference -a structure directly, but not one of its members which has a type. That type is -not considered a +types. +Other types may be used indirectly, for example, a program may reference +a structure directly, but not one of its members which has a type. +That type is not considered a .Sy root -type. If a type is a +type. +If a type is a .Sy root type, then it will have bit 10 set. .Lp @@ -499,16 +525,17 @@ When consuming .Nm data, it is often useful to know whether two different .Nm -containers come from the same source base and version. For example, when -building illumos, there are many kernel modules that are built against a -single collection of source code. A label is encoded into the +containers come from the same source base and version. +For example, when building illumos, there are many kernel modules that are built +against a single collection of source code. +A label is encoded into the .Nm -files that corresponds with the particular build. This ensures that if -files on the system were to become mixed up from multiple releases, that -they are not used together by tools, particularly when a child needs to -refer to a type in the parent. Because they are linked used the type -identifiers, if the wrong parent is used then the wrong type will be -encountered. +files that corresponds with the particular build. +This ensures that if files on the system were to become mixed up from multiple +releases, that they are not used together by tools, particularly when a child +needs to refer to a type in the parent. +Because they are linked using the type identifiers, if the wrong parent is used +then the wrong type will be encountered. .Lp Each label is encoded in the file format using the following eight byte structure: @@ -530,21 +557,22 @@ section. The type identifier encoded in the member .Em ctl_typeidx refers to the last type identifier that a label refers to in the current -file. Labels only refer to types in the current file, if the +file. +Labels only refer to types in the current file, if the .Nm file is a child, then it will have the same label as its parent; -however, its label will only refer to its types, not its parents. +however, its label will only refer to its types, not its parent's. .Lp It is also possible, though rather uncommon, for a .Nm -file to have multiple labels. Labels are placed one after another, every -eight bytes. When multiple labels are present, types may only belong to -a single label. +file to have multiple labels. +Labels are placed one after another, every eight bytes. +When multiple labels are present, types may only belong to a single label. .Ss The Object Section The object section provides a mapping from ELF symbols of type .Sy STT_OBJECT -in the symbol table to a type identifier. Every entry in this section is -a +in the symbol table to a type identifier. +Every entry in this section is a .Sy uint16_t which contains a type identifier as described in the section .Sx Type Identifiers . @@ -555,9 +583,10 @@ To walk the object section, you need to have a corresp .Sy symbol table in the ELF object that contains the .Nm -data. Not every object is included in this section. Specifically, when -walking the symbol table. An entry is skipped if it matches any of the -following conditions: +data. +Not every object is included in this section. +Specifically, when walking the symbol table, an entry is skipped if it matches +any of the following conditions: .Lp .Bl -bullet -offset indent -compact .It @@ -628,40 +657,45 @@ walk_symbols(uint16_t *objtoff, Elf_Data *symdata, Elf The function section of the .Nm file encodes the types of both the function's arguments and the function's -return type. Similar to +return value. +Similar to .Sx The Object Section , the function section encodes information for all symbols of type .Sy STT_FUNCTION , -excepting those that fit specific criteria. Unlike with objects, because -functions have a variable number of arguments, they start with a type encoding -as defined in +excepting those that fit specific criteria. +Unlike with objects, because functions have a variable number of arguments, they +start with a type encoding as defined in .Sx Type Encoding , which is the size of a .Sy uint16_t . For functions which have no type information available, they are encoded as .Li CTF_TYPE_INFO(CTF_K_UNKNOWN, 0, 0) . -Functions with arguments are encoded differently. Here, the variable length is -turned into the number of arguments in the function. If a function is a +Functions with arguments are encoded differently. +Here, the variable length is turned into the number of arguments in the +function. +If a function is a .Sy varargs -type function, then the number of arguments is increased by one. Functions with -type information are encoded as: +type function, then the number of arguments is increased by one. +Functions with type information are encoded as: .Li CTF_TYPE_INFO(CTF_K_FUNCTION, 0, nargs) . .Lp For functions that have no type information, nothing else is encoded, and the -next function is encoded. For functions with type information, the next +next function is encoded. +For functions with type information, the next .Sy uint16_t -is encoded with the type identifier of the return type of the function. It is -followed by each of the type identifiers of the arguments, if any exist, in the -order that they appear in the function. Therefore, argument 0 is the first type -identifier and so on. When a function has a final varargs argument, that is -encoded with the type identifier of zero. +is encoded with the type identifier of the return type of the function. +It is followed by each of the type identifiers of the arguments, if any exist, +in the order that they appear in the function. +Therefore, argument 0 is the first type identifier and so on. +When a function has a final varargs argument, that is encoded with the type +identifier of zero. .Lp Like .Sx The Object Section , -the function section is encoded in the order of the symbol table. It has -similar, but slightly different considerations from objects. While iterating the -symbol table, if any of the following conditions are true, then the entry is -skipped and no corresponding entry is written: +the function section is encoded in the order of the symbol table. +It has similar, but slightly different considerations from objects. +While iterating the symbol table, if any of the following conditions are true, +then the entry is skipped and no corresponding entry is written: .Lp .Bl -bullet -offset indent -compact .It @@ -683,10 +717,11 @@ ELF. .Ss The Type Section The type section is the heart of the .Nm -data. It encodes all of the information about the types themselves. The base of -the type information comes in two forms, a short form and a long form, each of -which may be followed by a variable number of arguments. The following -definitions describe the short and long forms: +data. +It encodes all of the information about the types themselves. +The base of the type information comes in two forms, a short form and a long +form, each of which may be followed by a variable number of arguments. +The following definitions describe the short and long forms: .Bd -literal #define CTF_MAX_SIZE 0xfffe /* max size of a type in bytes */ #define CTF_LSIZE_SENT 0xffff /* sentinel for ctt_size */ @@ -720,14 +755,17 @@ Type sizes are stored in .Sy bytes . The basic small form uses a .Sy ushort_t -to store the number of bytes. If the number of bytes in a structure would exceed -0xfffe, then the alternate form, the +to store the number of bytes. +If the number of bytes in a structure would exceed 0xfffe, then the alternate +form, the .Sy ctf_type_t , -is used instead. To indicate that the larger form is being used, the member +is used instead. +To indicate that the larger form is being used, the member .Em ctt_size is set to value of .Sy CTF_LSIZE_SENT -(0xffff). In general, when going through the type section, consumers use the +(0xffff). +In general, when going through the type section, consumers use the .Sy ctf_type_t structure, but pay attention to the value of the member .Em ctt_size @@ -739,36 +777,43 @@ Not all kinds of types use .Sy ctt_size . Those which do not, will always use the .Sy ctf_stype_t -structure. The individual sections for each kind have more information. +structure. +The individual sections for each kind have more information. .Lp -Types are written out in order. Therefore the first entry encountered has a type -id of 0x1, or 0x8000 if a child. The member +Types are written out in order. +Therefore the first entry encountered has a type id of 0x1, or 0x8000 if a +child. +The member .Em ctt_name is encoded as described in the section .Sx String Identifiers . -The string that it points to is the name of the type. If the identifier points -to an empty string (one that consists solely of a null terminator) then the type -does not have a name, this is common with anonymous structures and unions that -only have a typedef to name them, as well as, pointers and qualifiers. +The string that it points to is the name of the type. +If the identifier points to an empty string (one that consists solely of a null +terminator) then the type does not have a name, this is common with anonymous +structures and unions that only have a typedef to name them, as well as +pointers and qualifiers. .Lp The next member, the .Em ctt_info , is encoded as described in the section .Sx Type Encoding . -The types kind tells us how to interpret the remaining data in the +The type's kind tells us how to interpret the remaining data in the .Sy ctf_type_t -and any variable length data that may exist. The rest of this section will be -broken down into the interpretation of the various kinds. +and any variable length data that may exist. +The rest of this section will be broken down into the interpretation of the +various kinds. .Ss Encoding of Integers Integers, which are of type .Sy CTF_K_INTEGER , -have no variable length arguments. Instead, they are followed by a four byte +have no variable length arguments. +Instead, they are followed by a four byte .Sy uint_t -which describes their encoding. All integers must be encoded with a variable -length of zero. The +which describes their encoding. +All integers must be encoded with a variable length of zero. +The .Em ctt_size -member describes the length of the integer in bytes. In general, integer sizes -will be rounded up to the closest power of two. +member describes the length of the integer in bytes. +In general, integer sizes will be rounded up to the closest power of two. .Lp The integer encoding contains three different pieces of information: .Bl -bullet -offset indent -compact @@ -804,33 +849,37 @@ The following flags are defined for the encoding at th .Lp By default, an integer is considered to be unsigned, unless it has the .Sy CTF_INT_SIGNED -flag set. If the flag +flag set. +If the flag .Sy CTF_INT_CHAR is set, that indicates that the integer is of a type that stores character data, for example the intrinsic C type .Sy char would have the .Sy CTF_INT_CHAR -flag set. If the flag +flag set. +If the flag .Sy CTF_INT_BOOL -is set, that indicates that the integer represents a boolean type. For example, -the intrinsic C type +is set, that indicates that the integer represents a boolean type. +For example, the intrinsic C type .Sy _Bool would have the .Sy CTF_INT_BOOL -flag set. Finally, the flag +flag set. +Finally, the flag .Sy CTF_INT_VARARGS indicates that the integer is used as part of a variable number of arguments. This encoding is rather uncommon. .Ss Encoding of Floats Floats, which are of type .Sy CTF_K_FLOAT , -are similar to their integer counterparts. They have no variable length -arguments and are followed by a four byte encoding which describes the kind of -float that exists. The +are similar to their integer counterparts. +They have no variable length arguments and are followed by a four byte encoding +which describes the kind of float that exists. +The .Em ctt_size -member is the size, in bytes, of the float. The float encoding has three -different pieces of information inside of it: +member is the size, in bytes, of the float. +The float encoding has three different pieces of information inside of it: .Lp .Bl -bullet -offset indent -compact .It @@ -855,11 +904,12 @@ This encoding can be expressed through the following m (((encoding) << 24) | ((offset) << 16) | (bits)) .Ed .Lp -Where as the encoding for integers was a series of flags, the encoding for -floats maps to a specific kind of float. It is not a flag-based value. The kinds of floats -correspond to both their size, and the encoding. This covers all of the basic C -intrinsic floating point types. The following are the different kinds of floats -represented in the encoding: +Where as the encoding for integers is a series of flags, the encoding for +floats maps to a specific kind of float. +It is not a flag-based value. +The kinds of floats correspond to both their size, and the encoding. +This covers all of the basic C intrinsic floating point types. +The following are the different kinds of floats represented in the encoding: .Bd -literal -offset indent #define CTF_FP_SINGLE 1 /* IEEE 32-bit float encoding */ #define CTF_FP_DOUBLE 2 /* IEEE 64-bit float encoding */ @@ -877,12 +927,14 @@ represented in the encoding: .Ss Encoding of Arrays Arrays, which are of type .Sy CTF_K_ARRAY , -have no variable length arguments. They are followed by a structure which -describes the number of elements in the array, the type identifier of the -elements in the array, and the type identifier of the index of the array. With -arrays, the +have no variable length arguments. +They are followed by a structure which describes the number of elements in the +array, the type identifier of the elements in the array, and the type identifier +of the index of the array. +With arrays, the .Em ctt_size -member is set to zero. The structure that follows an array is defined as: +member is set to zero. +The structure that follows an array is defined as: .Bd -literal typedef struct ctf_array { ushort_t cta_contents; /* reference to type of array contents */ @@ -901,14 +953,15 @@ are type identifiers which are encoded as per the sect .Sx Type Identifiers . The member .Em cta_nelems -is a simple four byte unsigned count of the number of elements. This count may -be zero when encountering C99's flexible array members. +is a simple four byte unsigned count of the number of elements. +This count may be zero when encountering C99's flexible array members. .Ss Encoding of Functions Function types, which are of type .Sy CTF_K_FUNCTION , -use the variable length list to be the number of arguments in the function. When -the function has a final member which is a varargs, then the argument count is -incremented by one to account for the variable argument. Here, the +use the variable length list to be the number of arguments in the function. +When the function has a final member which is a varargs, then the argument count +is incremented by one to account for the variable argument. +Here, the .Em ctt_type member is encoded with the type identifier of the return type of the function. Note that the @@ -916,31 +969,40 @@ Note that the member is not used here. .Lp The variable argument list contains the type identifiers for the arguments of -the function, if any. Each one is represented by a +the function, if any. +Each one is represented by a .Sy uint16_t and encoded according to the .Sx Type Identifiers -section. If the function's last argument is of type varargs, then it is also -written out, but the type identifier is zero. This is included in the count of -the function's arguments. +section. +If the function's last argument is of type varargs, then it is also written out, +but the type identifier is zero. +This is included in the count of the function's arguments. +An extra type identifier may follow the argument and return type identifiers +in order to maintain four-byte alignment for the following type definition. +Such a type identifier is not included in the argument count and has a value +of zero. .Ss Encoding of Structures and Unions Structures and Unions, which are encoded with .Sy CTF_K_STRUCT and .Sy CTF_K_UNION -respectively, are very similar constructs in C. The main difference -between them is the fact that every member of a structure follows one another, -where as in a union, all members share the same memory. They are also very -similar in terms of their encoding in +respectively, are very similar constructs in C. +The main difference between them is the fact that members of a structure +follow one another, where as in a union, all members share the same memory. +They are also very similar in terms of their encoding in .Nm . The variable length argument for structures and unions represents the number of -members that they have. The value of the member +members that they have. +The value of the member .Em ctt_size -is the size of the structure and union. There are two different structures which -are used to encode members in the variable list. When the size of a structure or -union is greater than or equal to the large member threshold, 8192, then a -different structure is used to encode the member, all members are encoded using -the same structure. The structure for members is as follows: +is the size of the structure and union. +There are two different structures which are used to encode members in the +variable list. +When the size of a structure or union is greater than or equal to the large +member threshold, 8192, then a different structure is used to encode the member, +all members are encoded using the same structure. +The structure for members is as follows: .Bd -literal typedef struct ctf_member { uint_t ctm_name; /* reference to name in string table */ @@ -961,54 +1023,66 @@ Both the .Em ctm_name and .Em ctlm_name -refer to the name of the member. The name is encoded as an offset into the -string table as described by the section +refer to the name of the member. +The name is encoded as an offset into the string table as described by the +section .Sx String Identifiers . The members .Sy ctm_type and .Sy ctlm_type -both refer to the type of the member. They are encoded as per the section +both refer to the type of the member. +They are encoded as per the section .Sx Type Identifiers . .Lp The last piece of information that is present is the offset which describes the -offset in memory that the member begins at. For unions, this value will always -be zero because the start of unions in memory is always zero. For structures, -this is the offset in +offset in memory at which the member begins. +For unions, this value will always be zero because each member of a union has +an offset of zero. +For structures, this is the offset in .Sy bits -that the member begins at. Note that a compiler may lay out a type with padding. +at which the member begins. +Note that a compiler may lay out a type with padding. This means that the difference in offset between two consecutive members may be -larger than the size of the member. When the size of the overall structure is -strictly less than 8192 bytes, the normal structure, +larger than the size of the member. +When the size of the overall structure is strictly less than 8192 bytes, the +normal structure, .Sy ctf_member_t , is used and the offset in bits is stored in the member .Em ctm_offset . However, when the size of the structure is greater than or equal to 8192 bytes, -then the number of bits is split into two 32-bit quantities. One member, +then the number of bits is split into two 32-bit quantities. +One member, .Em ctlm_offsethi , represents the upper 32 bits of the offset, while the other member, .Em ctlm_offsetlo , -represents the lower 32 bits of the offset. These can be joined together to get -a 64-bit sized offset in bits by shifting the member +represents the lower 32 bits of the offset. +These can be joined together to get a 64-bit sized offset in bits by shifting +the member .Em ctlm_offsethi to the left by thirty two and then doing a binary or of .Em ctlm_offsetlo . .Ss Encoding of Enumerations Enumerations, noted by the type .Sy CTF_K_ENUM , -are similar to structures. Enumerations use the variable list to note the number -of values that the enumeration contains, which we'll term enumerators. In C, an -enumeration is always equivalent to the intrinsic type +are similar to structures. +Enumerations use the variable list to note the number of values that the +enumeration contains, which we'll term enumerators. +In C, an enumeration is always equivalent to the intrinsic type .Sy int , thus the value of the member .Em ctt_size is always the size of an integer which is determined based on the current model. -For illumos systems, this will always be 4, as an integer is always defined to +For +.Fx +systems, this will always be 4, as an integer is always defined to be 4 bytes large in both .Sy ILP32 and .Sy LP64 , regardless of the architecture. +For further details, see +.Xr arch 7 . .Lp The enumerators encoded in an enumeration have the following structure in the variable list: @@ -1032,25 +1106,27 @@ Forward references, types of kind .Sy CTF_K_FORWARD , in a .Nm -file refer to types which may not have a definition at all, only a name. If -the +file refer to types which may not have a definition at all, only a name. +If the .Nm file is a child, then it may be that the forward is resolved to an actual type in the parent, otherwise the definition may be in another .Nm -container or may not be known at all. The only member of the +container or may not be known at all. +The only member of the .Sy ctf_type_t that matters for a forward declaration is the .Em ctt_name which points to the name of the forward reference in the string table as -described earlier. There is no other information recorded for forward -references. +described earlier. +There is no other information recorded for forward references. .Ss Encoding of Pointers, Typedefs, Volatile, Const, and Restrict Pointers, typedefs, volatile, const, and restrict are all similar in .Nm . -They all refer to another type. In the case of typedefs, they provide an -alternate name, while volatile, const, and restrict change how the type is -interpreted in the C programming language. This covers the +They all refer to another type. +In the case of typedefs, they provide an alternate name, while volatile, const, +and restrict change how the type is interpreted in the C programming language. +This covers the .Nm kinds .Sy CTF_K_POINTER , @@ -1066,43 +1142,49 @@ to refer to the base type that they modify. .Ss Encoding of Unknown Types Types with the kind .Sy CTF_K_UNKNOWN -are used to indicate gaps in the type identifier space. These entries consume an -identifier, but do not define anything. Nothing should refer to these gap -identifiers. +are used to indicate gaps in the type identifier space. +These entries consume an identifier, but do not define anything. +Nothing should refer to these gap identifiers. .Ss Dependencies Between Types -C types can be imagined as a directed, cyclic, graph. Structures and unions may -refer to each other in a way that creates a cyclic dependency. In cases such as -these, the entire type section must be read in and processed. Consumers must -not assume that every type can be laid out in dependency order; they -cannot. +C types can be imagined as a directed, cyclic, graph. +Structures and unions may refer to each other in a way that creates a cyclic +dependency. +In cases such as these, the entire type section must be read in and processed. +Consumers must not assume that every type can be laid out in dependency order; +they cannot. .Ss The String Section The last section of the .Nm file is the .Sy string -section. This section encodes all of the strings that appear throughout -the other sections. It is laid out as a series of characters followed by -a null terminator. Generally, all names are written out in ASCII, as -most C compilers do not allow and characters to appear in identifiers -outside of a subset of ASCII. However, any extended characters sets -should be written out as a series of UTF-8 bytes. +section. +This section encodes all of the strings that appear throughout the other +sections. +It is laid out as a series of characters followed by a null terminator. +Generally, all names are written out in ASCII, as most C compilers do not allow +any characters to appear in identifiers outside of a subset of ASCII. +However, any extended characters sets should be written out as a series of UTF-8 +bytes. .Lp The first entry in the section, at offset zero, is a single null -terminator to reference the empty string. Following that, each C string -should be written out, including the null terminator. Offsets that refer -to something in this section should refer to the first byte which begins -a string. Beyond the first byte in the section being the null -terminator, the order of strings is unimportant. +terminator to reference the empty string. +Following that, each C string should be written out, including the null +terminator. +Offsets that refer to something in this section should refer to the first byte +which begins a string. +Beyond the first byte in the section being the null terminator, the order of +strings is unimportant. .Ss Data Encoding and ELF Considerations .Nm data is generally included in ELF objects which specify information to -identify the architecture and endianness of the file. A +identify the architecture and endianness of the file. +A .Nm -container inside such an object must match the endianness of the ELF -object. Aside from the question of the endian encoding of data, there -should be no other differences between architectures. While many of the -types in this document refer to non-fixed size C integral types, they -are equivalent in the models +container inside such an object must match the endianness of the ELF object. +Aside from the question of the endian encoding of data, there should be no other +differences between architectures. +While many of the types in this document refer to non-fixed size C integral +types, they are equivalent in the models .Sy ILP32 and .Sy LP64 . @@ -1118,15 +1200,16 @@ When placing a container inside of an ELF object, there are certain conventions that are expected for the purposes of tooling being able to find the .Nm -data. In particular, a given ELF object should only contain a single +data. +In particular, a given ELF object should only contain a single .Nm -section. Multiple containers should be merged together into a single -one. +section. +Multiple containers should be merged together into a single one. .Lp The .Nm -file should be included in its own ELF section. The section's name -must be +file should be included in its own ELF section. +The section's name must be .Ql .SUNW_ctf . The type of the section must be .Sy SHT_PROGBITS . @@ -1137,4 +1220,5 @@ alignment must be 4. .Xr elf 3 , .Xr gelf 3 , .Xr a.out 5 , -.Xr elf 5 +.Xr elf 5 , +.Xr arch 7 Modified: projects/runtime-coverage/include/runetype.h ============================================================================== --- projects/runtime-coverage/include/runetype.h Sun Oct 22 23:36:43 2017 (r324884) +++ projects/runtime-coverage/include/runetype.h Sun Oct 22 23:40:49 2017 (r324885) @@ -95,9 +95,7 @@ static __inline const _RuneLocale *__getCurrentRuneLoc if (_ThreadRuneLocale) return _ThreadRuneLocale; - if (_CurrentRuneLocale) - return _CurrentRuneLocale; - return &_DefaultRuneLocale; + return _CurrentRuneLocale; } #endif /* __NO_TLS || __RUNETYPE_INTERNAL */ #define _CurrentRuneLocale (__getCurrentRuneLocale()) Modified: projects/runtime-coverage/lib/libc/gen/sysctl.3 ============================================================================== --- projects/runtime-coverage/lib/libc/gen/sysctl.3 Sun Oct 22 23:36:43 2017 (r324884) +++ projects/runtime-coverage/lib/libc/gen/sysctl.3 Sun Oct 22 23:40:49 2017 (r324885) @@ -28,7 +28,7 @@ .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Mon Oct 23 00:10:04 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3DFA1E3ABAB for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 00:10:04 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 0F4E57EEE2; Mon, 23 Oct 2017 00:10:03 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N0A38b034850; Mon, 23 Oct 2017 00:10:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N0A17d034837; Mon, 23 Oct 2017 00:10:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230010.v9N0A17d034837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 00:10:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324886 - in projects/runtime-coverage/sys/boot: efi/loader geli i386/boot2 i386/btx/lib i386/loader mips/beri/loader powerpc/kboot powerpc/ofw powerpc/ps3 sparc64/loader userboot/ficl ... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage/sys/boot: efi/loader geli i386/boot2 i386/btx/lib i386/loader mips/beri/loader powerpc/kboot powerpc/ofw powerpc/ps3 sparc64/loader userboot/ficl userboot/test userboot/us... X-SVN-Commit-Revision: 324886 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 00:10:04 -0000 Author: ngie Date: Mon Oct 23 00:10:01 2017 New Revision: 324886 URL: https://svnweb.freebsd.org/changeset/base/324886 Log: Remove MK_COVERAGE=no sprinkled around sys/boot imp's recent refactoring on ^/head has made this unnecessary, as it seems everything is pulling MK_COVERAGE=no from sys/boot/Makefile.inc . Modified: projects/runtime-coverage/sys/boot/efi/loader/Makefile projects/runtime-coverage/sys/boot/geli/Makefile projects/runtime-coverage/sys/boot/i386/boot2/Makefile projects/runtime-coverage/sys/boot/i386/btx/lib/Makefile projects/runtime-coverage/sys/boot/i386/loader/Makefile projects/runtime-coverage/sys/boot/mips/beri/loader/Makefile projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile projects/runtime-coverage/sys/boot/sparc64/loader/Makefile projects/runtime-coverage/sys/boot/userboot/ficl/Makefile projects/runtime-coverage/sys/boot/userboot/test/Makefile projects/runtime-coverage/sys/boot/userboot/userboot/Makefile Modified: projects/runtime-coverage/sys/boot/efi/loader/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/efi/loader/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/efi/loader/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -4,7 +4,6 @@ MAN= .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no PROG= loader.sym Modified: projects/runtime-coverage/sys/boot/geli/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/geli/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/geli/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -4,7 +4,6 @@ MAN= .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no .include <bsd.init.mk> Modified: projects/runtime-coverage/sys/boot/i386/boot2/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/i386/boot2/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/i386/boot2/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -1,7 +1,6 @@ # $FreeBSD$ .include <bsd.own.mk> -MK_COVERAGE= no FILES= boot boot1 boot2 Modified: projects/runtime-coverage/sys/boot/i386/btx/lib/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/i386/btx/lib/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/i386/btx/lib/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -1,7 +1,6 @@ # $FreeBSD$ .include <src.opts.mk> -MK_COVERAGE=no PROG= crt0.o INTERNALPROG= Modified: projects/runtime-coverage/sys/boot/i386/loader/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/i386/loader/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/i386/loader/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -1,7 +1,6 @@ # $FreeBSD$ .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no LOADER?= loader Modified: projects/runtime-coverage/sys/boot/mips/beri/loader/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/mips/beri/loader/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/mips/beri/loader/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -30,7 +30,6 @@ # $FreeBSD$ .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no MAN= Modified: projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -1,7 +1,6 @@ # $FreeBSD$ .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no MAN= Modified: projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -1,7 +1,6 @@ # $FreeBSD$ .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no MAN= Modified: projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -1,7 +1,6 @@ # $FreeBSD$ .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no MAN= Modified: projects/runtime-coverage/sys/boot/sparc64/loader/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/sparc64/loader/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/sparc64/loader/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -1,7 +1,6 @@ # $FreeBSD$ .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no MAN= Modified: projects/runtime-coverage/sys/boot/userboot/ficl/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/userboot/ficl/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/userboot/ficl/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -1,7 +1,6 @@ # $FreeBSD$ # .include <bsd.own.mk> -MK_COVERAGE= no MK_SSP= no .PATH: ${.CURDIR}/../../ficl Modified: projects/runtime-coverage/sys/boot/userboot/test/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/userboot/test/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/userboot/test/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -4,7 +4,6 @@ MAN= .include <bsd.own.mk> -MK_COVERAGE= no MK_SSP= no PROG= test Modified: projects/runtime-coverage/sys/boot/userboot/userboot/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/userboot/userboot/Makefile Sun Oct 22 23:40:49 2017 (r324885) +++ projects/runtime-coverage/sys/boot/userboot/userboot/Makefile Mon Oct 23 00:10:01 2017 (r324886) @@ -3,7 +3,6 @@ MAN= .include <src.opts.mk> -MK_COVERAGE= no MK_SSP= no LOADER_MSDOS_SUPPORT?= yes From owner-svn-src-projects@freebsd.org Mon Oct 23 00:12:21 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70593E3AD18 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 00:12:21 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 3E23E7F215; Mon, 23 Oct 2017 00:12:21 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N0CKDL038680; Mon, 23 Oct 2017 00:12:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N0CKth038679; Mon, 23 Oct 2017 00:12:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230012.v9N0CKth038679@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 00:12:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324887 - projects/runtime-coverage/sys/boot/i386/btx/lib X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/sys/boot/i386/btx/lib X-SVN-Commit-Revision: 324887 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 00:12:21 -0000 Author: ngie Date: Mon Oct 23 00:12:20 2017 New Revision: 324887 URL: https://svnweb.freebsd.org/changeset/base/324887 Log: Diff reduce with ^/head Modified: projects/runtime-coverage/sys/boot/i386/btx/lib/Makefile Modified: projects/runtime-coverage/sys/boot/i386/btx/lib/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/i386/btx/lib/Makefile Mon Oct 23 00:10:01 2017 (r324886) +++ projects/runtime-coverage/sys/boot/i386/btx/lib/Makefile Mon Oct 23 00:12:20 2017 (r324887) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include <src.opts.mk> - PROG= crt0.o INTERNALPROG= MAN= From owner-svn-src-projects@freebsd.org Mon Oct 23 00:44:20 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C7DFE3B5E0 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 00:44:20 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id E5E857FE6C; Mon, 23 Oct 2017 00:44:19 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N0iJhe050923; Mon, 23 Oct 2017 00:44:19 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N0iJWp050922; Mon, 23 Oct 2017 00:44:19 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230044.v9N0iJWp050922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 00:44:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324888 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324888 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 00:44:20 -0000 Author: ngie Date: Mon Oct 23 00:44:18 2017 New Revision: 324888 URL: https://svnweb.freebsd.org/changeset/base/324888 Log: Try unbreaking MK_COVERAGE != no with make tinderbox Compile libgcov/libprofile_rt when bootstrapping/compiling gcc/clang. Hopefully this fixes platforms still on host gcc (mips, powerpc, etc). We'll see after the next tinderbox cycle on universe12a.freebsd.org *eyeroll*. Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 00:12:20 2017 (r324887) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 00:44:18 2017 (r324888) @@ -2261,10 +2261,14 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # for world to have runtime coverage instrumentation. # .if ${MK_COVERAGE} != "no" -_coverage_libs.${MK_CLANG}+= lib/libclang_rt/profile -_coverage_libs.${MK_GCC}+= gnu/lib/libgcov +.if ${WANT_COMPILER_TYPE} == "clang" || ${MK_CLANG} != "no" +_coverage_libs+= lib/libclang_rt/profile .endif -_prereq_libs+= ${_coverage_libs.yes} +.if ${WANT_COMPILER_TYPE} == "gcc" || ${MK_GCC} != "no" +_coverage_libs+= gnu/lib/libgcov +.endif +_prereq_libs+= ${_coverage_libs} +.endif # These dependencies are not automatically generated: # From owner-svn-src-projects@freebsd.org Mon Oct 23 00:57:00 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A5A2E3B841 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 00:57:00 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 09EFF802B5; Mon, 23 Oct 2017 00:56:59 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N0uxSW055062; Mon, 23 Oct 2017 00:56:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N0uxYu055061; Mon, 23 Oct 2017 00:56:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230056.v9N0uxYu055061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 00:56:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324889 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324889 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 00:57:00 -0000 Author: ngie Date: Mon Oct 23 00:56:59 2017 New Revision: 324889 URL: https://svnweb.freebsd.org/changeset/base/324889 Log: Need to make all of the variables immediate, or the last value for _gcno_dir wins This is particularly fun when relative paths are embedded in SRCS, like lib/libclang_rt does (which I argue is ripe for corruption via parallel builds). Modified: projects/runtime-coverage/share/mk/bsd.cov.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Mon Oct 23 00:44:18 2017 (r324888) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Mon Oct 23 00:56:59 2017 (r324889) @@ -25,8 +25,8 @@ FILESGROUPS+= GCNOS CLEANFILES+= ${GCNOS} .for _gcno in ${GCNOS} -_gcno_dir= ${COVERAGEDIR}${_gcno:H:tA} -GCNOSDIR_${_gcno:T}= ${_gcno_dir} +_gcno_dir:= ${COVERAGEDIR}${_gcno:H:tA} +GCNOSDIR_${_gcno:T}:= ${_gcno_dir} # Create _gcno_dir if it doesn't already exist. .if !target(${DESTDIR}${_gcno_dir}) ${DESTDIR}${_gcno_dir}: From owner-svn-src-projects@freebsd.org Mon Oct 23 01:42:49 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81863E3C5EA for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 01:42:49 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 4F2C581505; Mon, 23 Oct 2017 01:42:49 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N1gmE9075114; Mon, 23 Oct 2017 01:42:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N1gmB6075113; Mon, 23 Oct 2017 01:42:48 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230142.v9N1gmB6075113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 01:42:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324891 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324891 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 01:42:49 -0000 Author: ngie Date: Mon Oct 23 01:42:48 2017 New Revision: 324891 URL: https://svnweb.freebsd.org/changeset/base/324891 Log: Always compile libgcov and libprofile_rt I'm not fully grasping the intertwined complexity of how our bootstrap compiler is working, so just cut-to-the-chase and build/install both with `_prereq_libs`. Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 01:00:35 2017 (r324890) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 01:42:48 2017 (r324891) @@ -2261,13 +2261,10 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # for world to have runtime coverage instrumentation. # .if ${MK_COVERAGE} != "no" -.if ${WANT_COMPILER_TYPE} == "clang" || ${MK_CLANG} != "no" +# XXX (ngie): make this conditional sometime later _coverage_libs+= lib/libclang_rt/profile -.endif -.if ${WANT_COMPILER_TYPE} == "gcc" || ${MK_GCC} != "no" _coverage_libs+= gnu/lib/libgcov -.endif -_prereq_libs+= ${_coverage_libs} +_prereq_libs+= ${_coverage_libs} .endif # These dependencies are not automatically generated: From owner-svn-src-projects@freebsd.org Mon Oct 23 03:41:08 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E49B9E3F19C for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 03:41:08 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id B41DC83D7C; Mon, 23 Oct 2017 03:41:08 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N3f7Gb023576; Mon, 23 Oct 2017 03:41:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N3f7ki023575; Mon, 23 Oct 2017 03:41:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230341.v9N3f7ki023575@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 03:41:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324892 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324892 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 03:41:09 -0000 Author: ngie Date: Mon Oct 23 03:41:07 2017 New Revision: 324892 URL: https://svnweb.freebsd.org/changeset/base/324892 Log: Delete MK_COVERAGE=no with gcc. Let's see if this fixes cross-compilation :/ Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 01:42:48 2017 (r324891) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 03:41:07 2017 (r324892) @@ -624,9 +624,6 @@ TARGET_ABI= gnueabi .endif .if ${WANT_COMPILER_TYPE} == gcc || \ (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) -# The cross-toolchain gcc packages are broken with respect to libgcov.a, etc. -# PR: 223174 -MK_COVERAGE= no # GCC requires -isystem and -L when using a cross-compiler. --sysroot # won't set header path and -L is used to ensure the base library path # is added before the port PREFIX library path. From owner-svn-src-projects@freebsd.org Mon Oct 23 04:20:12 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C31FFE3FB93 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 04:20:12 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 9312DE70; Mon, 23 Oct 2017 04:20:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N4KBgR037624; Mon, 23 Oct 2017 04:20:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N4KBP2037623; Mon, 23 Oct 2017 04:20:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230420.v9N4KBP2037623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 04:20:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324893 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324893 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 04:20:12 -0000 Author: ngie Date: Mon Oct 23 04:20:11 2017 New Revision: 324893 URL: https://svnweb.freebsd.org/changeset/base/324893 Log: Handle host builds If TARGET_ARCH isn't defined, fallback to MACHINE_ARCH. This is a followup to r324873. PR: 222925 Modified: projects/runtime-coverage/share/mk/sys.mk Modified: projects/runtime-coverage/share/mk/sys.mk ============================================================================== --- projects/runtime-coverage/share/mk/sys.mk Mon Oct 23 03:41:07 2017 (r324892) +++ projects/runtime-coverage/share/mk/sys.mk Mon Oct 23 04:20:11 2017 (r324893) @@ -15,7 +15,11 @@ unix ?= We run FreeBSD, not UNIX. # __TO_CPUARCH=C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v[67])?(eb)?/arm/:C/powerpc(64|spe)/powerpc/:C/riscv64(sf)?/riscv/ MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}} +.ifdef TARGET_ARCH TARGET_CPUARCH=${TARGET_ARCH:${__TO_CPUARCH}} +.else +TARGET_CPUARCH=${MACHINE_CPUARCH} +.endif .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 04:22:18 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97258E3FD6F for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 04:22:18 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 64E4F11DD; Mon, 23 Oct 2017 04:22:18 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N4MHTP039413; Mon, 23 Oct 2017 04:22:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N4MHEH039412; Mon, 23 Oct 2017 04:22:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230422.v9N4MHEH039412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 04:22:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324894 - projects/runtime-coverage/lib/libclang_rt X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/lib/libclang_rt X-SVN-Commit-Revision: 324894 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 04:22:18 -0000 Author: ngie Date: Mon Oct 23 04:22:17 2017 New Revision: 324894 URL: https://svnweb.freebsd.org/changeset/base/324894 Log: Support compiling lib/libclang_rt/profile with gcc Several of the flags were being treated as CFLAGS, when they were actually technically CXXFLAGS. Move them there. Also, only apply -fno-sanitize=safe-stack with clang. This is a draft diff. PR: 223179 Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc ============================================================================== --- projects/runtime-coverage/lib/libclang_rt/Makefile.inc Mon Oct 23 04:20:11 2017 (r324893) +++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc Mon Oct 23 04:22:17 2017 (r324894) @@ -20,13 +20,13 @@ CFLAGS+= -DNDEBUG CFLAGS+= ${PICFLAG} CFLAGS+= -fno-builtin CFLAGS+= -fno-exceptions -CFLAGS+= -fno-rtti +CXXFLAGS+= -fno-rtti .if ${COMPILER_VERSION} >= 30700 -CFLAGS+= -fno-sanitize=safe-stack +CFLAGS.clang+= -fno-sanitize=safe-stack .endif CFLAGS+= -fno-stack-protector CFLAGS+= -funwind-tables -CFLAGS+= -fvisibility-inlines-hidden -CFLAGS+= -fvisibility=hidden +CXXFLAGS+= -fvisibility-inlines-hidden +CXXFLAGS+= -fvisibility=hidden CFLAGS+= -I${CRTSRC}/lib CXXFLAGS+= -std=c++11 From owner-svn-src-projects@freebsd.org Mon Oct 23 04:23:26 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1C36E3FE21 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 04:23:26 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 6D04613E4; Mon, 23 Oct 2017 04:23:26 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N4NP2v041657; Mon, 23 Oct 2017 04:23:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N4NPeQ041656; Mon, 23 Oct 2017 04:23:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230423.v9N4NPeQ041656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 04:23:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324895 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324895 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 04:23:26 -0000 Author: ngie Date: Mon Oct 23 04:23:25 2017 New Revision: 324895 URL: https://svnweb.freebsd.org/changeset/base/324895 Log: Get rid of now unnecessary intermediate variable, _coverage_libs Use _prereq_libs instead. Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 04:22:17 2017 (r324894) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 04:23:25 2017 (r324895) @@ -2259,9 +2259,8 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # .if ${MK_COVERAGE} != "no" # XXX (ngie): make this conditional sometime later -_coverage_libs+= lib/libclang_rt/profile -_coverage_libs+= gnu/lib/libgcov -_prereq_libs+= ${_coverage_libs} +_prereq_libs+= lib/libclang_rt/profile +_prereq_libs+= gnu/lib/libgcov .endif # These dependencies are not automatically generated: From owner-svn-src-projects@freebsd.org Mon Oct 23 04:42:58 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D13C0E40350 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 04:42:58 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 97F9B1BC1; Mon, 23 Oct 2017 04:42:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N4gv1I049820; Mon, 23 Oct 2017 04:42:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N4gv3l049818; Mon, 23 Oct 2017 04:42:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230442.v9N4gv3l049818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 04:42:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324896 - in projects/runtime-coverage: gnu/usr.bin/cc/cc_tools lib/libpam/libpam X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: gnu/usr.bin/cc/cc_tools lib/libpam/libpam X-SVN-Commit-Revision: 324896 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 04:42:58 -0000 Author: ngie Date: Mon Oct 23 04:42:57 2017 New Revision: 324896 URL: https://svnweb.freebsd.org/changeset/base/324896 Log: Diff reduce with ^/head This doesn't seem to be necessary after the changes to only apply --coverage to shared objects. We'll see if it works with make tinderbox. Modified: projects/runtime-coverage/gnu/usr.bin/cc/cc_tools/Makefile projects/runtime-coverage/lib/libpam/libpam/Makefile Modified: projects/runtime-coverage/gnu/usr.bin/cc/cc_tools/Makefile ============================================================================== --- projects/runtime-coverage/gnu/usr.bin/cc/cc_tools/Makefile Mon Oct 23 04:23:25 2017 (r324895) +++ projects/runtime-coverage/gnu/usr.bin/cc/cc_tools/Makefile Mon Oct 23 04:42:57 2017 (r324896) @@ -4,8 +4,6 @@ CFLAGS+= -I. -MK_COVERAGE= no - .include "../Makefile.inc" # Some of the logic needed in here is defined in Makefile.hdrs as it is shared # with gnu/lib. Modified: projects/runtime-coverage/lib/libpam/libpam/Makefile ============================================================================== --- projects/runtime-coverage/lib/libpam/libpam/Makefile Mon Oct 23 04:23:25 2017 (r324895) +++ projects/runtime-coverage/lib/libpam/libpam/Makefile Mon Oct 23 04:42:57 2017 (r324896) @@ -44,7 +44,6 @@ OPENPAM= ${SRCTOP}/contrib/openpam SHLIB= pam .endif -MK_COVERAGE=no # XXX: causes libpam to segfault. MK_PROFILE=no SRCS= openpam_asprintf.c \ From owner-svn-src-projects@freebsd.org Mon Oct 23 04:44:36 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5978BE4038D for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 04:44:36 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 28CA01CB9; Mon, 23 Oct 2017 04:44:36 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N4iZ9X049940; Mon, 23 Oct 2017 04:44:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N4iZ0w049939; Mon, 23 Oct 2017 04:44:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230444.v9N4iZ0w049939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 04:44:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324897 - projects/runtime-coverage/lib/libpam/static_libpam X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/lib/libpam/static_libpam X-SVN-Commit-Revision: 324897 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 04:44:36 -0000 Author: ngie Date: Mon Oct 23 04:44:35 2017 New Revision: 324897 URL: https://svnweb.freebsd.org/changeset/base/324897 Log: This shouldn't be required either Modified: projects/runtime-coverage/lib/libpam/static_libpam/Makefile Modified: projects/runtime-coverage/lib/libpam/static_libpam/Makefile ============================================================================== --- projects/runtime-coverage/lib/libpam/static_libpam/Makefile Mon Oct 23 04:42:57 2017 (r324896) +++ projects/runtime-coverage/lib/libpam/static_libpam/Makefile Mon Oct 23 04:44:35 2017 (r324897) @@ -45,7 +45,6 @@ NO_PIC= MAN= INCS= MLINKS= -MK_COVERAGE= no MK_TESTS= no # From owner-svn-src-projects@freebsd.org Mon Oct 23 05:08:33 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 876F4E4090B for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 05:08:33 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 573DF2538; Mon, 23 Oct 2017 05:08:33 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N58Wrt058170; Mon, 23 Oct 2017 05:08:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N58W8G058169; Mon, 23 Oct 2017 05:08:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230508.v9N58W8G058169@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 05:08:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324898 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324898 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 05:08:33 -0000 Author: ngie Date: Mon Oct 23 05:08:32 2017 New Revision: 324898 URL: https://svnweb.freebsd.org/changeset/base/324898 Log: libprofile_rt requires c++-11 Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 04:44:35 2017 (r324897) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 05:08:32 2017 (r324898) @@ -2259,7 +2259,9 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # .if ${MK_COVERAGE} != "no" # XXX (ngie): make this conditional sometime later +.if ${COMPILER_FEATURES:Mc++11} _prereq_libs+= lib/libclang_rt/profile +.endif _prereq_libs+= gnu/lib/libgcov .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 05:11:02 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53782E40987 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 05:11:02 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 231C026A6; Mon, 23 Oct 2017 05:11:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N5B1WD059879; Mon, 23 Oct 2017 05:11:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N5B1Wj059878; Mon, 23 Oct 2017 05:11:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230511.v9N5B1Wj059878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 05:11:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324899 - projects/runtime-coverage/lib/libclang_rt/profile X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/lib/libclang_rt/profile X-SVN-Commit-Revision: 324899 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 05:11:02 -0000 Author: ngie Date: Mon Oct 23 05:11:00 2017 New Revision: 324899 URL: https://svnweb.freebsd.org/changeset/base/324899 Log: -fvisibility is a c++ thing, per gcc(1) Followup to r324894 PR: 223179 Modified: projects/runtime-coverage/lib/libclang_rt/profile/Makefile Modified: projects/runtime-coverage/lib/libclang_rt/profile/Makefile ============================================================================== --- projects/runtime-coverage/lib/libclang_rt/profile/Makefile Mon Oct 23 05:08:32 2017 (r324898) +++ projects/runtime-coverage/lib/libclang_rt/profile/Makefile Mon Oct 23 05:11:00 2017 (r324899) @@ -5,7 +5,7 @@ LIB= clang_rt.profile-${CRTARCH} # This is needed for --coverage -CFLAGS+= -fvisibility=default +CXXFLAGS+= -fvisibility=default SRCS+= profile/GCDAProfiling.c SRCS+= profile/InstrProfiling.c From owner-svn-src-projects@freebsd.org Mon Oct 23 05:19:41 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF8A3E40BB8 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 05:19:41 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id B218A2A57; Mon, 23 Oct 2017 05:19:41 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N5JebC062356; Mon, 23 Oct 2017 05:19:40 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N5JeOj062354; Mon, 23 Oct 2017 05:19:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230519.v9N5JeOj062354@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 05:19:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324900 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324900 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 05:19:42 -0000 Author: ngie Date: Mon Oct 23 05:19:40 2017 New Revision: 324900 URL: https://svnweb.freebsd.org/changeset/base/324900 Log: Use -fprofile_dir=${COVERAGEDIR} with --coverage This option implies that it will automatically prefix .gcda files, when created, thus allowing for the desired prefixing I've added in via bsd.cov.mk . This option is only available in clang and later versions of gcc, so I'll likely have to mark MK_COVERAGE broken from a "fully-fledged feature" perspective, as I don't want to go through the annoyance of implementing the feature in gcc and testing it. Modified: projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Mon Oct 23 05:11:00 2017 (r324899) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Mon Oct 23 05:19:40 2017 (r324900) @@ -76,7 +76,7 @@ CTFFLAGS+= -g _WANTS_DEBUG= .endif .if ${MK_COVERAGE} != "no" && defined(_WANTS_DEBUG) && defined(SHLIB_NAME) -_COV_FLAG= --coverage +_COV_FLAG= --coverage -fprofile_dir=${COVERAGEDIR} SHARED_CFLAGS+= ${_COV_FLAG} SHARED_CXXFLAGS+= ${_COV_FLAG} .endif Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Mon Oct 23 05:11:00 2017 (r324899) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Mon Oct 23 05:19:40 2017 (r324900) @@ -62,7 +62,7 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} LDFLAGS+= -static .else .if defined(_WANTS_DEBUG) && ${MK_COVERAGE} != "no" -_COV_FLAG= --coverage +_COV_FLAG= --coverage -fprofile_dir=${COVERAGEDIR} CFLAGS+= ${_COV_FLAG} CXXFLAGS+= ${_COV_FLAG} .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 05:26:23 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E95ADE40DA3 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 05:26:22 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 98F5E2E15; Mon, 23 Oct 2017 05:26:22 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N5QLpl066425; Mon, 23 Oct 2017 05:26:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N5QLEZ066423; Mon, 23 Oct 2017 05:26:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230526.v9N5QLEZ066423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 05:26:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324901 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324901 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 05:26:23 -0000 Author: ngie Date: Mon Oct 23 05:26:21 2017 New Revision: 324901 URL: https://svnweb.freebsd.org/changeset/base/324901 Log: Fix typo in previous commit My brain was remembering the spelling of the C++ variable, not the option. Modified: projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Mon Oct 23 05:19:40 2017 (r324900) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Mon Oct 23 05:26:21 2017 (r324901) @@ -76,7 +76,7 @@ CTFFLAGS+= -g _WANTS_DEBUG= .endif .if ${MK_COVERAGE} != "no" && defined(_WANTS_DEBUG) && defined(SHLIB_NAME) -_COV_FLAG= --coverage -fprofile_dir=${COVERAGEDIR} +_COV_FLAG= --coverage -fprofile-dir=${COVERAGEDIR} SHARED_CFLAGS+= ${_COV_FLAG} SHARED_CXXFLAGS+= ${_COV_FLAG} .endif Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Mon Oct 23 05:19:40 2017 (r324900) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Mon Oct 23 05:26:21 2017 (r324901) @@ -62,7 +62,7 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} LDFLAGS+= -static .else .if defined(_WANTS_DEBUG) && ${MK_COVERAGE} != "no" -_COV_FLAG= --coverage -fprofile_dir=${COVERAGEDIR} +_COV_FLAG= --coverage -fprofile-dir=${COVERAGEDIR} CFLAGS+= ${_COV_FLAG} CXXFLAGS+= ${_COV_FLAG} .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 05:36:40 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67ACCE40FDF for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 05:36:40 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 36BFA31CE; Mon, 23 Oct 2017 05:36:40 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N5add6070626; Mon, 23 Oct 2017 05:36:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N5adlM070625; Mon, 23 Oct 2017 05:36:39 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230536.v9N5adlM070625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 05:36:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324902 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324902 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 05:36:40 -0000 Author: ngie Date: Mon Oct 23 05:36:39 2017 New Revision: 324902 URL: https://svnweb.freebsd.org/changeset/base/324902 Log: Let's just nip gcc 4.2.1 in the bud and say MK_COVERAGE=no Reasoning: gcc 4.2.1 lacks -fprofile-dir support Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 05:26:21 2017 (r324901) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 05:36:39 2017 (r324902) @@ -468,7 +468,12 @@ MK_${var}_SUPPORT:= yes MK_LLDB:= no .endif -.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 +.if ${COMPILER_TYPE} == "gcc" +.if ${COMPILER_VERSION} == 40201 +# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning +# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . +MK_COVERAGE:=no +.elif ${COMPILER_VERSION} >= 40800 # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. # while in theory we could build it with that, we don't want to do # that since it creates too much confusion for too little gain. @@ -477,6 +482,7 @@ MK_LLDB:= no # and to support 'make delete-old' when supplying an external toolchain. MK_GNUCXX:=no MK_GCC:=no +.endif .endif .endif # !target(__<src.opts.mk>__) From owner-svn-src-projects@freebsd.org Mon Oct 23 06:21:36 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6D82E41CB4 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 06:21:36 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 768EC6378B; Mon, 23 Oct 2017 06:21:36 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N6LZdd087189; Mon, 23 Oct 2017 06:21:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N6LZlv087188; Mon, 23 Oct 2017 06:21:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230621.v9N6LZlv087188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 06:21:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324903 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324903 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 06:21:36 -0000 Author: ngie Date: Mon Oct 23 06:21:35 2017 New Revision: 324903 URL: https://svnweb.freebsd.org/changeset/base/324903 Log: Trying to get libgcov to work was a stupid, stupid rabbit hole to go down Just use clang and ports gcc. I will fix the cross-toolchain stuff to actually work with MK_COVERAGE -- for now the host-only compilers work just fine. Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 05:36:39 2017 (r324902) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 06:21:35 2017 (r324903) @@ -2258,11 +2258,11 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # for world to have runtime coverage instrumentation. # .if ${MK_COVERAGE} != "no" -# XXX (ngie): make this conditional sometime later -.if ${COMPILER_FEATURES:Mc++11} +.if ${COMPILER_TYPE} == clang _prereq_libs+= lib/libclang_rt/profile +.else +.error "Runtime coverage isn't supported with ${COMPILER_TYPE}" .endif -_prereq_libs+= gnu/lib/libgcov .endif # These dependencies are not automatically generated: From owner-svn-src-projects@freebsd.org Mon Oct 23 06:31:02 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44EECE41F90 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 06:31:02 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 1319963C7A; Mon, 23 Oct 2017 06:31:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N6V1PO091363; Mon, 23 Oct 2017 06:31:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N6V104091362; Mon, 23 Oct 2017 06:31:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230631.v9N6V104091362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 06:31:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324904 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324904 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 06:31:02 -0000 Author: ngie Date: Mon Oct 23 06:31:00 2017 New Revision: 324904 URL: https://svnweb.freebsd.org/changeset/base/324904 Log: Use BROKEN_OPTIONS for MK_COVERAGE=no so it will be documented in src.conf(5) Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 06:21:35 2017 (r324903) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 06:31:00 2017 (r324904) @@ -233,6 +233,9 @@ __DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC GPL_ # Everything else disables Clang, and uses GCC instead. __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD +# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning +# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . +BROKEN_OPTIONS=COVERAGE .endif # In-tree binutils/gcc are older versions without modern architecture support. .if ${__T} == "aarch64" || ${__T:Mriscv*} != "" @@ -470,9 +473,6 @@ MK_LLDB:= no .if ${COMPILER_TYPE} == "gcc" .if ${COMPILER_VERSION} == 40201 -# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning -# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . -MK_COVERAGE:=no .elif ${COMPILER_VERSION} >= 40800 # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. # while in theory we could build it with that, we don't want to do From owner-svn-src-projects@freebsd.org Mon Oct 23 07:02:57 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3EC2EE42ADF for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 07:02:57 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 0C9AF64A28; Mon, 23 Oct 2017 07:02:56 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N72uij007691; Mon, 23 Oct 2017 07:02:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N72u1T007690; Mon, 23 Oct 2017 07:02:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230702.v9N72u1T007690@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 07:02:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324905 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324905 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 07:02:57 -0000 Author: ngie Date: Mon Oct 23 07:02:55 2017 New Revision: 324905 URL: https://svnweb.freebsd.org/changeset/base/324905 Log: Use MK_CLANG instead -_- Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 06:31:00 2017 (r324904) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 07:02:55 2017 (r324905) @@ -2258,10 +2258,10 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # for world to have runtime coverage instrumentation. # .if ${MK_COVERAGE} != "no" -.if ${COMPILER_TYPE} == clang +.if ${MK_CLANG} != "no" _prereq_libs+= lib/libclang_rt/profile .else -.error "Runtime coverage isn't supported with ${COMPILER_TYPE}" +.error "Runtime coverage is only supported with clang" .endif .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 07:07:46 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BB9FE42B40 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 07:07:46 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id C716C64B2D; Mon, 23 Oct 2017 07:07:45 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N77i3F007890; Mon, 23 Oct 2017 07:07:44 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N77iRJ007889; Mon, 23 Oct 2017 07:07:44 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230707.v9N77iRJ007889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 07:07:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324906 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324906 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 07:07:46 -0000 Author: ngie Date: Mon Oct 23 07:07:44 2017 New Revision: 324906 URL: https://svnweb.freebsd.org/changeset/base/324906 Log: mips, you cause me too much grief with make tinderbox. Try this instead Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 07:02:55 2017 (r324905) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 07:07:44 2017 (r324906) @@ -233,9 +233,6 @@ __DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC GPL_ # Everything else disables Clang, and uses GCC instead. __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD -# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning -# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . -BROKEN_OPTIONS=COVERAGE .endif # In-tree binutils/gcc are older versions without modern architecture support. .if ${__T} == "aarch64" || ${__T:Mriscv*} != "" @@ -324,6 +321,9 @@ MK_${var}:= no # Order is somewhat important. # .if !${COMPILER_FEATURES:Mc++11} +# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning +# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . +MK_COVERAGE:= no MK_LLVM_LIBUNWIND:= no .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 07:30:54 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BF3CE434DB for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 07:30:54 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id CDEA7657FD; Mon, 23 Oct 2017 07:30:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N7Uq0O017327; Mon, 23 Oct 2017 07:30:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N7UqDi017326; Mon, 23 Oct 2017 07:30:52 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230730.v9N7UqDi017326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 07:30:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324907 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324907 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 07:30:54 -0000 Author: ngie Date: Mon Oct 23 07:30:52 2017 New Revision: 324907 URL: https://svnweb.freebsd.org/changeset/base/324907 Log: Die. Die. Die. Tinderbox failures on mips/powerpc Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 07:07:44 2017 (r324906) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 07:30:52 2017 (r324907) @@ -279,6 +279,7 @@ BROKEN_OPTIONS+=LIBSOFT BROKEN_OPTIONS+=SSP .endif .if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} || ${__T:Mriscv*} +BROKEN_OPTIONS+=COVERAGE BROKEN_OPTIONS+=EFI .endif .if ${__T:Mmips64*} From owner-svn-src-projects@freebsd.org Mon Oct 23 07:52:18 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C46BE44258 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 07:52:18 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id ECF0266747; Mon, 23 Oct 2017 07:52:17 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N7qHLg028560; Mon, 23 Oct 2017 07:52:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N7qH19028559; Mon, 23 Oct 2017 07:52:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230752.v9N7qH19028559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 07:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324910 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324910 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 07:52:18 -0000 Author: ngie Date: Mon Oct 23 07:52:16 2017 New Revision: 324910 URL: https://svnweb.freebsd.org/changeset/base/324910 Log: Congrats riscv* : you unlike millions of americans will have coverage, even if the ACA is repealed Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 07:41:44 2017 (r324909) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 07:52:16 2017 (r324910) @@ -278,8 +278,10 @@ BROKEN_OPTIONS+=LIBSOFT .if ${__T:Mmips*} BROKEN_OPTIONS+=SSP .endif -.if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} || ${__T:Mriscv*} +.if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} BROKEN_OPTIONS+=COVERAGE +.endif +.if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} || ${__T:Mriscv*} BROKEN_OPTIONS+=EFI .endif .if ${__T:Mmips64*} From owner-svn-src-projects@freebsd.org Mon Oct 23 08:02:05 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03279E449A7 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 08:02:05 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id C71B966CE6; Mon, 23 Oct 2017 08:02:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N8233Z032052; Mon, 23 Oct 2017 08:02:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N8231r032051; Mon, 23 Oct 2017 08:02:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230802.v9N8231r032051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 08:02:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324912 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324912 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 08:02:05 -0000 Author: ngie Date: Mon Oct 23 08:02:03 2017 New Revision: 324912 URL: https://svnweb.freebsd.org/changeset/base/324912 Log: In the search of a perfect knob pairing Why in the heck is it so dang complicated now? Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 07:56:56 2017 (r324911) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 08:02:03 2017 (r324912) @@ -278,9 +278,6 @@ BROKEN_OPTIONS+=LIBSOFT .if ${__T:Mmips*} BROKEN_OPTIONS+=SSP .endif -.if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} -BROKEN_OPTIONS+=COVERAGE -.endif .if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} || ${__T:Mriscv*} BROKEN_OPTIONS+=EFI .endif @@ -324,9 +321,6 @@ MK_${var}:= no # Order is somewhat important. # .if !${COMPILER_FEATURES:Mc++11} -# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning -# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . -MK_COVERAGE:= no MK_LLVM_LIBUNWIND:= no .endif @@ -429,6 +423,13 @@ MK_CLANG_EXTRAS:= no MK_CLANG_FULL:= no .endif +# XXX: COMPILER_FEATURES and TARGET lies! +.if ${MK_CLANG} == "no" && ${MK_GCC} != "no" +# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning +# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . +MK_COVERAGE:= no +.endif + # # MK_* options whose default value depends on another option. # @@ -474,9 +475,7 @@ MK_${var}_SUPPORT:= yes MK_LLDB:= no .endif -.if ${COMPILER_TYPE} == "gcc" -.if ${COMPILER_VERSION} == 40201 -.elif ${COMPILER_VERSION} >= 40800 +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. # while in theory we could build it with that, we don't want to do # that since it creates too much confusion for too little gain. @@ -485,7 +484,6 @@ MK_LLDB:= no # and to support 'make delete-old' when supplying an external toolchain. MK_GNUCXX:=no MK_GCC:=no -.endif .endif .endif # !target(__<src.opts.mk>__) From owner-svn-src-projects@freebsd.org Mon Oct 23 08:04:00 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB813E44AE8 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 08:04:00 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id AAF3466E58; Mon, 23 Oct 2017 08:04:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N83xXN033057; Mon, 23 Oct 2017 08:03:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N83x1r033056; Mon, 23 Oct 2017 08:03:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230803.v9N83x1r033056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 08:03:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324913 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324913 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 08:04:01 -0000 Author: ngie Date: Mon Oct 23 08:03:59 2017 New Revision: 324913 URL: https://svnweb.freebsd.org/changeset/base/324913 Log: Every day I'm shuffling (comments) to diff reduce Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 08:02:03 2017 (r324912) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 08:03:59 2017 (r324913) @@ -475,13 +475,13 @@ MK_${var}_SUPPORT:= yes MK_LLDB:= no .endif -.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. # while in theory we could build it with that, we don't want to do # that since it creates too much confusion for too little gain. # XXX: This is incomplete and needs X_COMPILER_TYPE/VERSION checks too # to prevent Makefile.inc1 from bootstrapping unneeded dependencies # and to support 'make delete-old' when supplying an external toolchain. +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 MK_GNUCXX:=no MK_GCC:=no .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 08:04:57 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82802E44B22 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 08:04:57 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 520B766F42; Mon, 23 Oct 2017 08:04:57 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N84uN1033140; Mon, 23 Oct 2017 08:04:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N84umh033139; Mon, 23 Oct 2017 08:04:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230804.v9N84umh033139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 08:04:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324914 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324914 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 08:04:57 -0000 Author: ngie Date: Mon Oct 23 08:04:56 2017 New Revision: 324914 URL: https://svnweb.freebsd.org/changeset/base/324914 Log: Fix tabs before the style police nags me Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 08:03:59 2017 (r324913) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 08:04:56 2017 (r324914) @@ -427,7 +427,7 @@ MK_CLANG_FULL:= no .if ${MK_CLANG} == "no" && ${MK_GCC} != "no" # gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning # integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . -MK_COVERAGE:= no +MK_COVERAGE:= no .endif # From owner-svn-src-projects@freebsd.org Mon Oct 23 08:06:59 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14A15E44B7C for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 08:06:59 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id D813567119; Mon, 23 Oct 2017 08:06:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N86wwt033395; Mon, 23 Oct 2017 08:06:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N86vAA033393; Mon, 23 Oct 2017 08:06:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230806.v9N86vAA033393@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 08:06:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324915 - in projects/runtime-coverage: share/mk sys/kern X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: share/mk sys/kern X-SVN-Commit-Revision: 324915 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 08:06:59 -0000 Author: ngie Date: Mon Oct 23 08:06:57 2017 New Revision: 324915 URL: https://svnweb.freebsd.org/changeset/base/324915 Log: MFhead@r324914 Once more on to the MFC, my dear friends Modified: projects/runtime-coverage/share/mk/src.opts.mk projects/runtime-coverage/sys/kern/subr_witness.c Directory Properties: projects/runtime-coverage/ (props changed) Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 08:04:56 2017 (r324914) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 08:06:57 2017 (r324915) @@ -271,7 +271,7 @@ __DEFAULT_NO_OPTIONS+=GDB_LIBEXEC .else __DEFAULT_YES_OPTIONS+=GDB_LIBEXEC .endif -# Only doing soft float API stuff on armv6 +# Only doing soft float API stuff on armv6 and armv7 .if ${__T} != "armv6" && ${__T} != "armv7" BROKEN_OPTIONS+=LIBSOFT .endif Modified: projects/runtime-coverage/sys/kern/subr_witness.c ============================================================================== --- projects/runtime-coverage/sys/kern/subr_witness.c Mon Oct 23 08:04:56 2017 (r324914) +++ projects/runtime-coverage/sys/kern/subr_witness.c Mon Oct 23 08:06:57 2017 (r324915) @@ -137,7 +137,7 @@ __FBSDID("$FreeBSD$"); #define WITNESS_COUNT 1536 #endif #define WITNESS_HASH_SIZE 251 /* Prime, gives load factor < 2 */ -#define WITNESS_PENDLIST (1024 + MAXCPU) +#define WITNESS_PENDLIST (2048 + MAXCPU) /* Allocate 256 KB of stack data space */ #define WITNESS_LO_DATA_COUNT 2048 From owner-svn-src-projects@freebsd.org Mon Oct 23 16:02:06 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9BB1CE4EC25 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 16:02:06 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 6B9E975184; Mon, 23 Oct 2017 16:02:06 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9NG25Bt031946; Mon, 23 Oct 2017 16:02:05 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9NG25Zj031945; Mon, 23 Oct 2017 16:02:05 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710231602.v9NG25Zj031945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 16:02:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324922 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324922 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 16:02:06 -0000 Author: ngie Date: Mon Oct 23 16:02:05 2017 New Revision: 324922 URL: https://svnweb.freebsd.org/changeset/base/324922 Log: Move MK_COVERAGE fu before .include <bsd.mkopt.mk> so it's actually usable Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 15:43:38 2017 (r324921) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 16:02:05 2017 (r324922) @@ -292,6 +292,17 @@ __DEFAULT_YES_OPTIONS+=CXGBETOOL __DEFAULT_NO_OPTIONS+=CXGBETOOL .endif +# clang and gcc 4.8+ (c++11 supporting compilers) support -fprofile-dir and +# can compile lib/libclang_rt/profile . libgcov, etc, in base is a dead end +# that I (ngie) do not wish to support with MK_COVERAGE. +# +# NB: some gcc cross-toolchain packages are currently broken: bug 223174. +.if ${COMPILER_FEATURES:Mc++11} +__DEFAULT_NO_OPTIONS+= COVERAGE +.else +BROKEN_OPTIONS+=COVERAGE +.endif + .include <bsd.mkopt.mk> # @@ -421,13 +432,6 @@ MK_LLDB:= no .if ${MK_CLANG} == "no" MK_CLANG_EXTRAS:= no MK_CLANG_FULL:= no -.endif - -# XXX: COMPILER_FEATURES and TARGET lies! -.if ${MK_CLANG} == "no" && ${MK_GCC} != "no" -# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning -# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . -MK_COVERAGE:= no .endif # From owner-svn-src-projects@freebsd.org Mon Oct 23 16:08:20 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79915E4EFAD for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 16:08:20 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 47FE475786; Mon, 23 Oct 2017 16:08:20 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9NG8Jwb032263; Mon, 23 Oct 2017 16:08:19 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9NG8JHH032262; Mon, 23 Oct 2017 16:08:19 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710231608.v9NG8JHH032262@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 16:08:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324924 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324924 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 16:08:20 -0000 Author: ngie Date: Mon Oct 23 16:08:19 2017 New Revision: 324924 URL: https://svnweb.freebsd.org/changeset/base/324924 Log: Diff reduce and try to apply MK_COVERAGE only against c++11 compilers Hashtag crossesFingersAndHopeThisVoodooWorks Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 16:02:48 2017 (r324923) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 16:08:19 2017 (r324924) @@ -558,8 +558,8 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ - TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} MK_GDB=no \ - MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no # kernel-tools stage KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -2258,11 +2258,10 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # for world to have runtime coverage instrumentation. # .if ${MK_COVERAGE} != "no" -.if ${MK_CLANG} != "no" +.if ${X_COMPILER_FEATURES:Mc++11} _prereq_libs+= lib/libclang_rt/profile .else -.error "Runtime coverage is only supported with clang" -.endif +.error "Runtime coverage is only supported with c++11 capable compilers" .endif # These dependencies are not automatically generated: From owner-svn-src-projects@freebsd.org Mon Oct 23 16:10:18 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC21DE4EFD9 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 16:10:18 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id B9E1375890; Mon, 23 Oct 2017 16:10:18 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9NGAHfr032390; Mon, 23 Oct 2017 16:10:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9NGAHVx032389; Mon, 23 Oct 2017 16:10:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710231610.v9NGAHVx032389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 16:10:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324925 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324925 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 16:10:19 -0000 Author: ngie Date: Mon Oct 23 16:10:17 2017 New Revision: 324925 URL: https://svnweb.freebsd.org/changeset/base/324925 Log: Missing .endif FTL Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 16:08:19 2017 (r324924) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 16:10:17 2017 (r324925) @@ -2263,6 +2263,7 @@ _prereq_libs+= lib/libclang_rt/profile .else .error "Runtime coverage is only supported with c++11 capable compilers" .endif +.endif # These dependencies are not automatically generated: # From owner-svn-src-projects@freebsd.org Mon Oct 23 16:50:34 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D285E4FC42 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 16:50:34 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 6ADA776FF1; Mon, 23 Oct 2017 16:50:34 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9NGoXqv049148; Mon, 23 Oct 2017 16:50:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9NGoXjq049147; Mon, 23 Oct 2017 16:50:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710231650.v9NGoXjq049147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 16:50:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324927 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324927 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 16:50:34 -0000 Author: ngie Date: Mon Oct 23 16:50:33 2017 New Revision: 324927 URL: https://svnweb.freebsd.org/changeset/base/324927 Log: Don't require ${DESTDIR}${_gcno_dir} until install Modified: projects/runtime-coverage/share/mk/bsd.cov.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Mon Oct 23 16:14:55 2017 (r324926) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Mon Oct 23 16:50:33 2017 (r324927) @@ -32,7 +32,7 @@ GCNOSDIR_${_gcno:T}:= ${_gcno_dir} ${DESTDIR}${_gcno_dir}: ${INSTALL} -d -o ${GCNOSOWN} -g ${GCNOSGRP} -m ${GCNOSDIRMODE} \ ${.TARGET}/ +beforeinstall: ${DESTDIR}${_gcno_dir} .endif -${_gcno}: ${DESTDIR}${_gcno_dir} .endfor .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 17:05:37 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F324E500BA for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 17:05:37 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id E1629779AF; Mon, 23 Oct 2017 17:05:36 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9NH5aaD057294; Mon, 23 Oct 2017 17:05:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9NH5aE4057293; Mon, 23 Oct 2017 17:05:36 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710231705.v9NH5aE4057293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 17:05:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324930 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324930 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 17:05:37 -0000 Author: ngie Date: Mon Oct 23 17:05:35 2017 New Revision: 324930 URL: https://svnweb.freebsd.org/changeset/base/324930 Log: More trying to quash the stupidity of gcc 4.2.1 Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 16:55:22 2017 (r324929) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 17:05:35 2017 (r324930) @@ -2259,9 +2259,16 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # .if ${MK_COVERAGE} != "no" .if ${X_COMPILER_FEATURES:Mc++11} -_prereq_libs+= lib/libclang_rt/profile +_coverage_libs+= lib/libclang_rt/profile .else -.error "Runtime coverage is only supported with c++11 capable compilers" +.endif +.if empty(${_coverage_libs}) +# XXX(ngie): force MK_COVERAGE off since the compiler we're working with (at +# whatever stage we're at) obviously doesn't support --coverage support per +# src.opts.mk's minimum requirements. +MK_COVERAGE:= no +.else +_prereq_libs+= ${_coverage_libs} .endif .endif From owner-svn-src-projects@freebsd.org Mon Oct 23 17:11:19 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C400E50563 for <svn-src-projects@mailman.ysv.freebsd.org>; Mon, 23 Oct 2017 17:11:19 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 6BB1777D16; Mon, 23 Oct 2017 17:11:19 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9NHBI21061154; Mon, 23 Oct 2017 17:11:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9NHBIhX061153; Mon, 23 Oct 2017 17:11:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710231711.v9NHBIhX061153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Mon, 23 Oct 2017 17:11:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324931 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324931 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 23 Oct 2017 17:11:19 -0000 Author: ngie Date: Mon Oct 23 17:11:18 2017 New Revision: 324931 URL: https://svnweb.freebsd.org/changeset/base/324931 Log: Don't expand _coverage_libs Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Mon Oct 23 17:05:35 2017 (r324930) +++ projects/runtime-coverage/Makefile.inc1 Mon Oct 23 17:11:18 2017 (r324931) @@ -2262,7 +2262,7 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared _coverage_libs+= lib/libclang_rt/profile .else .endif -.if empty(${_coverage_libs}) +.if empty(_coverage_libs) # XXX(ngie): force MK_COVERAGE off since the compiler we're working with (at # whatever stage we're at) obviously doesn't support --coverage support per # src.opts.mk's minimum requirements. From owner-svn-src-projects@freebsd.org Wed Oct 25 04:57:04 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45CE3E3E84E for <svn-src-projects@mailman.ysv.freebsd.org>; Wed, 25 Oct 2017 04:57:04 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 137AF80FB7; Wed, 25 Oct 2017 04:57:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9P4v3lJ054333; Wed, 25 Oct 2017 04:57:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9P4v3ZL054332; Wed, 25 Oct 2017 04:57:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710250457.v9P4v3ZL054332@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Wed, 25 Oct 2017 04:57:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324968 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324968 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 25 Oct 2017 04:57:04 -0000 Author: ngie Date: Wed Oct 25 04:57:03 2017 New Revision: 324968 URL: https://svnweb.freebsd.org/changeset/base/324968 Log: I guess I have to use COMPILER_FEATURES, not X_COMPILER_FEATURES with _libraries+ *sigh* Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Wed Oct 25 01:07:45 2017 (r324967) +++ projects/runtime-coverage/Makefile.inc1 Wed Oct 25 04:57:03 2017 (r324968) @@ -2258,7 +2258,7 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # for world to have runtime coverage instrumentation. # .if ${MK_COVERAGE} != "no" -.if ${X_COMPILER_FEATURES:Mc++11} +.if ${COMPILER_FEATURES:U:Mc++11} _coverage_libs+= lib/libclang_rt/profile .else .endif From owner-svn-src-projects@freebsd.org Wed Oct 25 05:46:05 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03B85E3F894 for <svn-src-projects@mailman.ysv.freebsd.org>; Wed, 25 Oct 2017 05:46:05 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id C5D9D823F2; Wed, 25 Oct 2017 05:46:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9P5k3Tj074498; Wed, 25 Oct 2017 05:46:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9P5k3oI074497; Wed, 25 Oct 2017 05:46:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710250546.v9P5k3oI074497@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Wed, 25 Oct 2017 05:46:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324969 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324969 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 25 Oct 2017 05:46:05 -0000 Author: ngie Date: Wed Oct 25 05:46:03 2017 New Revision: 324969 URL: https://svnweb.freebsd.org/changeset/base/324969 Log: Try setting MK_COVERAGE in WMAKEENV Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Wed Oct 25 04:57:03 2017 (r324968) +++ projects/runtime-coverage/Makefile.inc1 Wed Oct 25 05:46:03 2017 (r324969) @@ -2266,7 +2266,7 @@ _coverage_libs+= lib/libclang_rt/profile # XXX(ngie): force MK_COVERAGE off since the compiler we're working with (at # whatever stage we're at) obviously doesn't support --coverage support per # src.opts.mk's minimum requirements. -MK_COVERAGE:= no +WMAKEENV:= ${WMAKEENV:NMK_COVERAGE*} MK_COVERAGE=no .else _prereq_libs+= ${_coverage_libs} .endif From owner-svn-src-projects@freebsd.org Wed Oct 25 05:55:14 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5FFBE3FD7B for <svn-src-projects@mailman.ysv.freebsd.org>; Wed, 25 Oct 2017 05:55:14 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id A3A5882973; Wed, 25 Oct 2017 05:55:14 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9P5tDwE078942; Wed, 25 Oct 2017 05:55:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9P5tDpv078941; Wed, 25 Oct 2017 05:55:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710250555.v9P5tDpv078941@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Wed, 25 Oct 2017 05:55:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324970 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324970 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 25 Oct 2017 05:55:14 -0000 Author: ngie Date: Wed Oct 25 05:55:13 2017 New Revision: 324970 URL: https://svnweb.freebsd.org/changeset/base/324970 Log: Let's try doing this... Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Wed Oct 25 05:46:03 2017 (r324969) +++ projects/runtime-coverage/Makefile.inc1 Wed Oct 25 05:55:13 2017 (r324970) @@ -2262,6 +2262,7 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared _coverage_libs+= lib/libclang_rt/profile .else .endif +.endif .if empty(_coverage_libs) # XXX(ngie): force MK_COVERAGE off since the compiler we're working with (at # whatever stage we're at) obviously doesn't support --coverage support per @@ -2269,7 +2270,6 @@ _coverage_libs+= lib/libclang_rt/profile WMAKEENV:= ${WMAKEENV:NMK_COVERAGE*} MK_COVERAGE=no .else _prereq_libs+= ${_coverage_libs} -.endif .endif # These dependencies are not automatically generated: From owner-svn-src-projects@freebsd.org Thu Oct 26 03:34:20 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4088EE3A874 for <svn-src-projects@mailman.ysv.freebsd.org>; Thu, 26 Oct 2017 03:34:20 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id E2F78698B3; Thu, 26 Oct 2017 03:34:19 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9Q3YJLI023922; Thu, 26 Oct 2017 03:34:19 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9Q3YHEG023905; Thu, 26 Oct 2017 03:34:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710260334.v9Q3YHEG023905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Thu, 26 Oct 2017 03:34:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325005 - in projects/runtime-coverage: . cddl/contrib/opensolaris/lib/libzfs/common contrib/jemalloc/include/jemalloc/internal etc/defaults etc/rc.d lib lib/clang lib/libc/sys lib/libp... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: . cddl/contrib/opensolaris/lib/libzfs/common contrib/jemalloc/include/jemalloc/internal etc/defaults etc/rc.d lib lib/clang lib/libc/sys lib/libpmcstat lib/libsysdecode l... X-SVN-Commit-Revision: 325005 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 26 Oct 2017 03:34:20 -0000 Author: ngie Date: Thu Oct 26 03:34:17 2017 New Revision: 325005 URL: https://svnweb.freebsd.org/changeset/base/325005 Log: MFhead@r325004 Added: projects/runtime-coverage/lib/libpmcstat/ - copied from r325004, head/lib/libpmcstat/ projects/runtime-coverage/sys/boot/efi/loader/framebuffer.c - copied unchanged from r325004, head/sys/boot/efi/loader/framebuffer.c projects/runtime-coverage/sys/boot/efi/loader/framebuffer.h - copied unchanged from r325004, head/sys/boot/efi/loader/framebuffer.h Deleted: projects/runtime-coverage/sys/boot/arm/at91/Makefile projects/runtime-coverage/sys/boot/arm/at91/Makefile.inc projects/runtime-coverage/sys/boot/arm/at91/boot0/Makefile projects/runtime-coverage/sys/boot/arm/at91/boot0/README projects/runtime-coverage/sys/boot/arm/at91/boot0/linker.cfg projects/runtime-coverage/sys/boot/arm/at91/boot0/main.c projects/runtime-coverage/sys/boot/arm/at91/boot0iic/Makefile projects/runtime-coverage/sys/boot/arm/at91/boot0iic/main.c projects/runtime-coverage/sys/boot/arm/at91/boot0spi/Makefile projects/runtime-coverage/sys/boot/arm/at91/boot0spi/main.c projects/runtime-coverage/sys/boot/arm/at91/boot2/Makefile projects/runtime-coverage/sys/boot/arm/at91/boot2/board.h projects/runtime-coverage/sys/boot/arm/at91/boot2/boot2.c projects/runtime-coverage/sys/boot/arm/at91/boot2/bwct_board.c projects/runtime-coverage/sys/boot/arm/at91/boot2/centipad_board.c projects/runtime-coverage/sys/boot/arm/at91/boot2/kb920x_board.c projects/runtime-coverage/sys/boot/arm/at91/bootiic/Makefile projects/runtime-coverage/sys/boot/arm/at91/bootiic/README projects/runtime-coverage/sys/boot/arm/at91/bootiic/env_vars.c projects/runtime-coverage/sys/boot/arm/at91/bootiic/env_vars.h projects/runtime-coverage/sys/boot/arm/at91/bootiic/loader_prompt.c projects/runtime-coverage/sys/boot/arm/at91/bootiic/loader_prompt.h projects/runtime-coverage/sys/boot/arm/at91/bootiic/main.c projects/runtime-coverage/sys/boot/arm/at91/bootspi/Makefile projects/runtime-coverage/sys/boot/arm/at91/bootspi/README projects/runtime-coverage/sys/boot/arm/at91/bootspi/ee.c projects/runtime-coverage/sys/boot/arm/at91/bootspi/ee.h projects/runtime-coverage/sys/boot/arm/at91/bootspi/env_vars.c projects/runtime-coverage/sys/boot/arm/at91/bootspi/env_vars.h projects/runtime-coverage/sys/boot/arm/at91/bootspi/loader_prompt.c projects/runtime-coverage/sys/boot/arm/at91/bootspi/loader_prompt.h projects/runtime-coverage/sys/boot/arm/at91/bootspi/main.c projects/runtime-coverage/sys/boot/arm/at91/libat91/Makefile projects/runtime-coverage/sys/boot/arm/at91/libat91/arm_init.S projects/runtime-coverage/sys/boot/arm/at91/libat91/at91rm9200.h projects/runtime-coverage/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c projects/runtime-coverage/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h projects/runtime-coverage/sys/boot/arm/at91/libat91/delay.c projects/runtime-coverage/sys/boot/arm/at91/libat91/eeprom.c projects/runtime-coverage/sys/boot/arm/at91/libat91/emac.c projects/runtime-coverage/sys/boot/arm/at91/libat91/emac.h projects/runtime-coverage/sys/boot/arm/at91/libat91/emac_init.c projects/runtime-coverage/sys/boot/arm/at91/libat91/getc.c projects/runtime-coverage/sys/boot/arm/at91/libat91/lib.h projects/runtime-coverage/sys/boot/arm/at91/libat91/lib_AT91RM9200.h projects/runtime-coverage/sys/boot/arm/at91/libat91/mci_device.h projects/runtime-coverage/sys/boot/arm/at91/libat91/memcmp.c projects/runtime-coverage/sys/boot/arm/at91/libat91/memcpy.c projects/runtime-coverage/sys/boot/arm/at91/libat91/memset.c projects/runtime-coverage/sys/boot/arm/at91/libat91/p_string.c projects/runtime-coverage/sys/boot/arm/at91/libat91/printf.c projects/runtime-coverage/sys/boot/arm/at91/libat91/putchar.c projects/runtime-coverage/sys/boot/arm/at91/libat91/reset.c projects/runtime-coverage/sys/boot/arm/at91/libat91/sd-card.c projects/runtime-coverage/sys/boot/arm/at91/libat91/sd-card.h projects/runtime-coverage/sys/boot/arm/at91/libat91/spi_flash.c projects/runtime-coverage/sys/boot/arm/at91/libat91/spi_flash.h projects/runtime-coverage/sys/boot/arm/at91/libat91/strcmp.c projects/runtime-coverage/sys/boot/arm/at91/libat91/strcpy.c projects/runtime-coverage/sys/boot/arm/at91/libat91/strcvt.c projects/runtime-coverage/sys/boot/arm/at91/libat91/strlen.c projects/runtime-coverage/sys/boot/arm/at91/libat91/tag_list.c projects/runtime-coverage/sys/boot/arm/at91/libat91/tag_list.h projects/runtime-coverage/sys/boot/arm/at91/libat91/xmodem.c projects/runtime-coverage/sys/boot/arm/at91/linker.cfg projects/runtime-coverage/sys/boot/arm/ixp425/Makefile.inc projects/runtime-coverage/sys/boot/arm/ixp425/boot2/Makefile projects/runtime-coverage/sys/boot/arm/ixp425/boot2/arm_init.S projects/runtime-coverage/sys/boot/arm/ixp425/boot2/boot2.c projects/runtime-coverage/sys/boot/arm/ixp425/boot2/cf_ata.h projects/runtime-coverage/sys/boot/arm/ixp425/boot2/ixp425_board.c projects/runtime-coverage/sys/boot/arm/ixp425/boot2/lib.h projects/runtime-coverage/sys/boot/efi/loader/arch/amd64/framebuffer.c projects/runtime-coverage/sys/boot/efi/loader/arch/amd64/framebuffer.h Modified: projects/runtime-coverage/Makefile.inc1 projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/runtime-coverage/contrib/jemalloc/include/jemalloc/internal/tsd.h projects/runtime-coverage/etc/defaults/rc.conf projects/runtime-coverage/etc/rc.d/dumpon projects/runtime-coverage/lib/Makefile projects/runtime-coverage/lib/clang/llvm.build.mk projects/runtime-coverage/lib/libc/sys/aio_suspend.2 projects/runtime-coverage/lib/libc/sys/lio_listio.2 projects/runtime-coverage/lib/libc/sys/reboot.2 projects/runtime-coverage/lib/libsysdecode/flags.c projects/runtime-coverage/lib/libugidfw/Makefile projects/runtime-coverage/lib/libugidfw/ugidfw.c projects/runtime-coverage/libexec/rtld-elf/libmap.c projects/runtime-coverage/libexec/rtld-elf/rtld.c projects/runtime-coverage/sbin/dumpon/dumpon.8 projects/runtime-coverage/sbin/dumpon/dumpon.c projects/runtime-coverage/sbin/init/init.8 projects/runtime-coverage/sbin/init/init.c projects/runtime-coverage/sbin/nvmecontrol/logpage.c projects/runtime-coverage/sbin/reboot/reboot.8 projects/runtime-coverage/sbin/reboot/reboot.c projects/runtime-coverage/sbin/savecore/savecore.8 projects/runtime-coverage/sbin/savecore/savecore.c projects/runtime-coverage/sbin/shutdown/shutdown.8 projects/runtime-coverage/sbin/shutdown/shutdown.c projects/runtime-coverage/share/man/man4/ipmi.4 projects/runtime-coverage/share/man/man5/rc.conf.5 projects/runtime-coverage/share/man/man8/uefi.8 projects/runtime-coverage/share/man/man9/atomic.9 projects/runtime-coverage/share/mk/src.libnames.mk projects/runtime-coverage/sys/amd64/amd64/pmap.c projects/runtime-coverage/sys/arm/arm/pmap-v6.c projects/runtime-coverage/sys/arm64/arm64/pmap.c projects/runtime-coverage/sys/arm64/include/metadata.h projects/runtime-coverage/sys/boot/arm/uboot/Makefile projects/runtime-coverage/sys/boot/defs.mk projects/runtime-coverage/sys/boot/efi/Makefile.inc projects/runtime-coverage/sys/boot/efi/loader/Makefile projects/runtime-coverage/sys/boot/efi/loader/arch/amd64/Makefile.inc projects/runtime-coverage/sys/boot/efi/loader/bootinfo.c projects/runtime-coverage/sys/boot/i386/Makefile.inc projects/runtime-coverage/sys/boot/mips/beri/Makefile.inc projects/runtime-coverage/sys/boot/mips/beri/boot2/Makefile projects/runtime-coverage/sys/boot/mips/uboot/Makefile projects/runtime-coverage/sys/boot/powerpc/boot1.chrp/Makefile projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile projects/runtime-coverage/sys/boot/powerpc/uboot/Makefile projects/runtime-coverage/sys/boot/sparc64/Makefile.inc projects/runtime-coverage/sys/cam/ata/ata_da.c projects/runtime-coverage/sys/cam/cam_iosched.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/runtime-coverage/sys/dev/bnxt/bnxt.h projects/runtime-coverage/sys/dev/bnxt/bnxt_hwrm.c projects/runtime-coverage/sys/dev/bnxt/bnxt_hwrm.h projects/runtime-coverage/sys/dev/bnxt/bnxt_sysctl.c projects/runtime-coverage/sys/dev/bnxt/bnxt_sysctl.h projects/runtime-coverage/sys/dev/bnxt/if_bnxt.c projects/runtime-coverage/sys/dev/cxgbe/adapter.h projects/runtime-coverage/sys/dev/cxgbe/common/common.h projects/runtime-coverage/sys/dev/cxgbe/common/t4_hw.c projects/runtime-coverage/sys/dev/cxgbe/t4_main.c projects/runtime-coverage/sys/dev/cxgbe/t4_sge.c projects/runtime-coverage/sys/dev/ipmi/ipmi.c projects/runtime-coverage/sys/dev/ipmi/ipmivars.h projects/runtime-coverage/sys/dev/iscsi/iscsi.c projects/runtime-coverage/sys/dev/liquidio/base/cn23xx_pf_device.c projects/runtime-coverage/sys/dev/liquidio/base/lio_device.c projects/runtime-coverage/sys/dev/liquidio/base/lio_device.h projects/runtime-coverage/sys/dev/liquidio/base/lio_droq.c projects/runtime-coverage/sys/dev/liquidio/base/lio_mem_ops.c projects/runtime-coverage/sys/dev/liquidio/base/lio_request_manager.c projects/runtime-coverage/sys/dev/liquidio/lio_main.c projects/runtime-coverage/sys/dev/liquidio/lio_main.h projects/runtime-coverage/sys/dev/liquidio/lio_rxtx.c projects/runtime-coverage/sys/dev/liquidio/lio_sysctl.c projects/runtime-coverage/sys/dev/null/null.c projects/runtime-coverage/sys/fs/ext2fs/ext2_alloc.c projects/runtime-coverage/sys/fs/ext2fs/ext2_extents.c projects/runtime-coverage/sys/fs/ext2fs/ext2_extern.h projects/runtime-coverage/sys/fs/ext2fs/ext2_inode.c projects/runtime-coverage/sys/fs/ext2fs/ext2_subr.c projects/runtime-coverage/sys/fs/tmpfs/tmpfs_vfsops.c projects/runtime-coverage/sys/geom/geom_dev.c projects/runtime-coverage/sys/i386/i386/pmap.c projects/runtime-coverage/sys/kern/kern_gzio.c projects/runtime-coverage/sys/kern/kern_shutdown.c projects/runtime-coverage/sys/kern/vfs_aio.c projects/runtime-coverage/sys/modules/Makefile projects/runtime-coverage/sys/net/iflib.c projects/runtime-coverage/sys/netinet/sctp_auth.c projects/runtime-coverage/sys/netinet/sctp_input.c projects/runtime-coverage/sys/netinet6/ip6_fastfwd.c projects/runtime-coverage/sys/netpfil/ipfw/ip_fw2.c projects/runtime-coverage/sys/sys/bus.h projects/runtime-coverage/sys/sys/conf.h projects/runtime-coverage/sys/sys/disk.h projects/runtime-coverage/sys/sys/gzio.h projects/runtime-coverage/sys/sys/ipmi.h projects/runtime-coverage/sys/sys/kerneldump.h projects/runtime-coverage/sys/sys/reboot.h projects/runtime-coverage/sys/ufs/ffs/ffs_softdep.c projects/runtime-coverage/sys/vm/vm_page.c projects/runtime-coverage/tests/sys/kern/ptrace_test.c projects/runtime-coverage/tools/boot/universe.sh projects/runtime-coverage/tools/tools/nanobsd/defaults.sh projects/runtime-coverage/usr.bin/top/machine.c projects/runtime-coverage/usr.sbin/pmcstat/Makefile projects/runtime-coverage/usr.sbin/pmcstat/pmcpl_callgraph.c projects/runtime-coverage/usr.sbin/pmcstat/pmcpl_callgraph.h projects/runtime-coverage/usr.sbin/pmcstat/pmcpl_calltree.c projects/runtime-coverage/usr.sbin/pmcstat/pmcpl_calltree.h projects/runtime-coverage/usr.sbin/pmcstat/pmcpl_gprof.c projects/runtime-coverage/usr.sbin/pmcstat/pmcstat.c projects/runtime-coverage/usr.sbin/pmcstat/pmcstat.h projects/runtime-coverage/usr.sbin/pmcstat/pmcstat_log.c projects/runtime-coverage/usr.sbin/pmcstat/pmcstat_log.h Directory Properties: projects/runtime-coverage/ (props changed) projects/runtime-coverage/cddl/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/runtime-coverage/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/Makefile.inc1 Thu Oct 26 03:34:17 2017 (r325005) @@ -638,6 +638,8 @@ XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -s .endif .elif ${WANT_COMPILER_TYPE} == clang || \ (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang) +MACHINE_ABI?= unknown +MACHINE_TRIPLE?=${MACHINE_ARCH:C/amd64/x86_64/}-${MACHINE_ABI}-freebsd12.0 TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd12.0 XCFLAGS+= -target ${TARGET_TRIPLE} @@ -672,7 +674,7 @@ META_MODE_BAD_ABI_VERS+= 1200031 OBJDIR_HOST_OSRELDATE!= \ awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ ${OBJTREE}${.CURDIR}/host-osreldate.h -.else +.elif exists(${WORLDTMP}/usr/include/osreldate.h) OBJDIR_HOST_OSRELDATE= 0 .endif .export OBJDIR_HOST_OSRELDATE @@ -681,6 +683,7 @@ OBJDIR_HOST_OSRELDATE= 0 # Note that this logic is the opposite of normal BOOTSTRAP handling. We want # to compare the WORLDTMP's OSRELDATE to the host's OSRELDATE. If the WORLDTMP # is older than the ABI-breakage OSRELDATE of the HOST then we rebuild. +.if defined(OBJDIR_HOST_OSRELDATE) .for _ver in ${META_MODE_BAD_ABI_VERS} .if ${OSRELDATE} >= ${_ver} && ${OBJDIR_HOST_OSRELDATE} < ${_ver} _meta_mode_need_rebuild= ${_ver} @@ -690,8 +693,9 @@ _meta_mode_need_rebuild= ${_ver} .info META_MODE: Rebuilding host tools due to ABI breakage in __FreeBSD_version ${_meta_mode_need_rebuild}. NO_META_IGNORE_HOST_HEADERS= 1 .export NO_META_IGNORE_HOST_HEADERS -.endif -.endif +.endif # defined(_meta_mode_need_rebuild) +.endif # defined(OBJDIR_HOST_OSRELDATE) +.endif # ${MK_META_MODE} == "yes" && defined(NO_CLEAN) ... # This is only used for META_MODE+filemon to track what the oldest # __FreeBSD_version is in WORLDTMP. This purposely does NOT have # a make dependency on /usr/include/osreldate.h as the file should @@ -1850,7 +1854,6 @@ _vtfontcvt= usr.bin/vtfontcvt .endif .if ${BOOTSTRAPPING} < 1000033 -_libopenbsd= lib/libopenbsd _m4= usr.bin/m4 _lex= usr.bin/lex @@ -1936,9 +1939,6 @@ _kerberos5_bootstrap_tools= \ .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} .endif -# r283777 makewhatis(1) replaced with mandoc version which builds a database. -_libopenbsd?= lib/libopenbsd -_makewhatis= usr.bin/mandoc ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd bootstrap-tools: .PHONY @@ -1955,8 +1955,8 @@ bootstrap-tools: .PHONY ${_cat} \ ${_kbdcontrol} \ usr.bin/lorder \ - ${_libopenbsd} \ - ${_makewhatis} \ + lib/libopenbsd \ + usr.bin/mandoc \ usr.bin/rpcgen \ ${_yacc} \ ${_m4} \ @@ -2114,47 +2114,20 @@ cross-tools: .MAKE .PHONY ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor -NXBDESTDIR= ${OBJTREE}/nxb-bin -NXBENV= MAKEOBJDIRPREFIX=${OBJTREE}/nxb \ - TOOLS_PREFIX= \ - INSTALL="sh ${.CURDIR}/tools/install.sh" \ - PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin -NXBMAKE= ${NXBENV} ${MAKE} \ - LLVM_TBLGEN=${NXBDESTDIR}/usr/bin/llvm-tblgen \ - CLANG_TBLGEN=${NXBDESTDIR}/usr/bin/clang-tblgen \ - MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \ - MK_GDB=no MK_TESTS=no \ - SSP_CFLAGS= \ - MK_HTML=no NO_LINT=yes MK_MAN=no MK_MAN_UTILS=yes \ - -DNO_PIC MK_PROFILE=no -DNO_SHARED \ - -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ - MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no MK_DEBUG_FILES=no - +# # native-xtools is the current target for qemu-user cross builds of ports # via poudriere and the imgact_binmisc kernel module. -# For non-clang enabled targets that are still using the in tree gcc -# we must build a gperf binary for one instance of its Makefiles. On -# clang-enabled systems, the gperf binary is obsolete. -native-xtools: .PHONY -.if ${MK_GCC_BOOTSTRAP} != "no" - mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin - ${_+_}@${ECHODIR} "===> ${_gperf} (obj,all,install)"; \ - cd ${.CURDIR}/${_gperf}; \ - if [ -z "${NO_OBJ}" ]; then ${NXBMAKE} DIRPRFX=${_gperf}/ obj; fi; \ - ${NXBMAKE} DIRPRFX=${_gperf}/ all; \ - ${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install -.endif - mkdir -p ${NXBDESTDIR}/bin ${NXBDESTDIR}/sbin ${NXBDESTDIR}/usr - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ - -p ${NXBDESTDIR}/usr >/dev/null - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${NXBDESTDIR}/usr/include >/dev/null -.if ${MK_DEBUG_FILES} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ - -p ${NXBDESTDIR}/usr/lib >/dev/null -.endif -.for _tool in \ +# This target merely builds a toolchan/sysroot, then builds the tools it wants +# with the options it wants in a special MAKEOBJDIRPREFIX, using the toolchain +# already built. It then installs the static tools to NXBDESTDIR for Poudriere +# to pickup. +# +NXBOBJDIR= ${MAKEOBJDIRPREFIX}/nxb/${TARGET}.${TARGET_ARCH} +NXBDESTDIR= ${NXBOBJDIR}${.CURDIR}/nxb-bin + +# This is the list of tools to be built/installed as static and where +# appropriate to build for the given TARGET.TARGET_ARCH. +NXBDIRS+= \ bin/cat \ bin/chmod \ bin/cp \ @@ -2172,24 +2145,18 @@ native-xtools: .PHONY bin/rmdir \ bin/sh \ bin/sleep \ - ${_clang_tblgen} \ - usr.bin/ar \ - ${_binutils} \ - ${_elftctools} \ - ${_gcc} \ - ${_gcc_tools} \ - ${_clang_libs} \ - ${_clang} \ - ${_lld} \ sbin/md5 \ sbin/sysctl \ - usr.bin/diff \ + usr.bin/addr2line \ + usr.bin/ar \ usr.bin/awk \ usr.bin/basename \ usr.bin/bmake \ usr.bin/bzip2 \ usr.bin/cmp \ + usr.bin/diff \ usr.bin/dirname \ + usr.bin/elfcopy \ usr.bin/env \ usr.bin/fetch \ usr.bin/find \ @@ -2199,14 +2166,16 @@ native-xtools: .PHONY usr.bin/lex \ usr.bin/limits \ usr.bin/lorder \ - ${_libopenbsd} \ - ${_makewhatis} \ + usr.bin/mandoc \ usr.bin/mktemp \ usr.bin/mt \ + usr.bin/nm \ usr.bin/patch \ usr.bin/readelf \ usr.bin/sed \ + usr.bin/size \ usr.bin/sort \ + usr.bin/strings \ usr.bin/tar \ usr.bin/touch \ usr.bin/tr \ @@ -2218,12 +2187,81 @@ native-xtools: .PHONY usr.bin/xz \ usr.bin/yacc \ usr.sbin/chown - ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - if [ -z "${NO_OBJ}" ]; then ${NXBMAKE} DIRPRFX=${_tool}/ obj; fi; \ - ${NXBMAKE} DIRPRFX=${_tool}/ all; \ - ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install -.endfor + +.if ${MK_CLANG} != "no" +NXBDIRS+= lib/clang +SUBDIR_DEPEND_usr.bin/clang= lib/clang +NXBDIRS+= usr.bin/clang +.elif ${MK_GCC} != "no" +NXBDIRS+= gnu/usr.bin/cc +.endif +.if ${MK_BINUTILS} != "no" +NXBDIRS+= gnu/usr.bin/binutils +.endif + +NXBMAKEENV+= \ + MAKEOBJDIRPREFIX=${NXBOBJDIR:Q} + +NXBMAKEARGS+= \ + OBJTREE=${NXBOBJDIR:Q} \ + -DNO_SHARED \ + -DNO_CPU_CFLAGS \ + -DNO_PIC \ + SSP_CFLAGS= \ + MK_CLANG_EXTRAS=no \ + MK_CLANG_FULL=no \ + MK_CTF=no \ + MK_DEBUG_FILES=no \ + MK_GDB=no \ + MK_HTML=no \ + MK_LLDB=no \ + MK_MAN=no \ + MK_MAN_UTILS=yes \ + MK_OFED=no \ + MK_OPENSSH=no \ + MK_PROFILE=no \ + MK_SENDMAIL=no \ + MK_SVNLITE=no \ + MK_TESTS=no \ + MK_WARNS=no \ + MK_ZFS=no + + +# For 'toolchain' we want to produce native binaries that themselves generate +# native binaries. +NXBTMAKE= ${NXBMAKEENV} ${MAKE} ${NXBMAKEARGS:N-DNO_PIC:N-DNO_SHARED} \ + TARGET=${MACHINE} TARGET_ARCH=${MACHINE_ARCH} +# For 'everything' we want to produce native binaries (hence -target to +# be MACHINE) that themselves generate TARGET.TARGET_ARCH binaries. +# TARGET/TARGET_ARCH are still passed along from user. +NXBMAKE= ${NXBMAKEENV} ${MAKE} ${NXBMAKEARGS} \ + TARGET_TRIPLE=${MACHINE_TRIPLE:Q} +native-xtools: .PHONY + # Build the bootstrap/host/cross tools that produce native binaries + ${_+_}cd ${.CURDIR}; ${NXBTMAKE} kernel-toolchain + # Populate includes/libraries sysroot that produce native binaries. + # This is split out from 'toolchain' above mostly so that target LLVM + # libraries have a proper LLVM_DEFAULT_TARGET_TRIPLE without + # polluting the cross-compiler build. The LLVM/GCC libs are skipped + # here to avoid the problem but are kept in 'toolchain' so that + # needed build tools are built. + ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes MK_CLANG=no MK_GCC=no + ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries MK_CLANG=no MK_GCC=no +.if !defined(NO_OBJ) + ${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" _obj +.endif + ${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" \ + everything + mkdir -p ${NXBDESTDIR}/bin ${NXBDESTDIR}/sbin ${NXBDESTDIR}/usr + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${NXBDESTDIR}/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${NXBDESTDIR}/usr/include >/dev/null + ${_+_}cd ${.CURDIR}; ${NXBMAKE} -f Makefile.inc1 \ + DESTDIR=${NXBDESTDIR} \ + SUBDIR_OVERRIDE="${NXBDIRS:M*}" \ + -DNO_ROOT \ + install # # hierarchy - ensure that all the needed directories are present Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Thu Oct 26 03:34:17 2017 (r325005) @@ -930,7 +930,7 @@ zpool_read_all_labels(int fd, nvlist_t **config) struct aiocb aiocbs[VDEV_LABELS]; struct aiocb *aiocbps[VDEV_LABELS]; int l; - vdev_label_t *labels; + vdev_phys_t *labels; uint64_t state, txg, size; int nlabels = 0; @@ -940,15 +940,15 @@ zpool_read_all_labels(int fd, nvlist_t **config) return (0); size = P2ALIGN_TYPED(statbuf.st_size, sizeof (vdev_label_t), uint64_t); - if ((labels = calloc(VDEV_LABELS, sizeof (vdev_label_t))) == NULL) + if ((labels = calloc(VDEV_LABELS, sizeof (vdev_phys_t))) == NULL) return (0); memset(aiocbs, 0, sizeof(aiocbs)); for (l = 0; l < VDEV_LABELS; l++) { aiocbs[l].aio_fildes = fd; - aiocbs[l].aio_offset = label_offset(size, l); + aiocbs[l].aio_offset = label_offset(size, l) + VDEV_SKIP_SIZE; aiocbs[l].aio_buf = &labels[l]; - aiocbs[l].aio_nbytes = sizeof(vdev_label_t); + aiocbs[l].aio_nbytes = sizeof(vdev_phys_t); aiocbs[l].aio_lio_opcode = LIO_READ; aiocbps[l] = &aiocbs[l]; } @@ -962,17 +962,18 @@ zpool_read_all_labels(int fd, nvlist_t **config) (void)aio_return(&aiocbs[l]); } } + free(labels); return (0); } for (l = 0; l < VDEV_LABELS; l++) { nvlist_t *temp = NULL; - if (aio_return(&aiocbs[l]) != sizeof(vdev_label_t)) + if (aio_return(&aiocbs[l]) != sizeof(vdev_phys_t)) continue; - if (nvlist_unpack(labels[l].vl_vdev_phys.vp_nvlist, - sizeof (labels[l].vl_vdev_phys.vp_nvlist), &temp, 0) != 0) + if (nvlist_unpack(labels[l].vp_nvlist, + sizeof (labels[l].vp_nvlist), &temp, 0) != 0) continue; if (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_STATE, Modified: projects/runtime-coverage/contrib/jemalloc/include/jemalloc/internal/tsd.h ============================================================================== --- projects/runtime-coverage/contrib/jemalloc/include/jemalloc/internal/tsd.h Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/contrib/jemalloc/include/jemalloc/internal/tsd.h Thu Oct 26 03:34:17 2017 (r325005) @@ -120,7 +120,8 @@ struct tsd_s { t use_a_getter_or_setter_instead_##n; MALLOC_TSD #undef O -}; +/* AddressSanitizer requires TLS data to be aligned to at least 8 bytes. */ +} JEMALLOC_ALIGNED(16); /* * Wrapper around tsd_t that makes it possible to avoid implicit conversion Modified: projects/runtime-coverage/etc/defaults/rc.conf ============================================================================== --- projects/runtime-coverage/etc/defaults/rc.conf Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/etc/defaults/rc.conf Thu Oct 26 03:34:17 2017 (r325005) @@ -596,9 +596,8 @@ nscd_enable="NO" # Run the nsswitch caching daemon. chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd. chkprintcap_flags="-d" # Create missing directories by default. dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO). +dumpon_flags="" # Options to pass to dumpon(8), followed by dumpdev. dumpdir="/var/crash" # Directory where crash dumps are to be stored -dumppubkey="" # Public key for encrypted kernel crash dumps. - # See dumpon(8) for more details. savecore_enable="YES" # Extract core from dump devices if any savecore_flags="-m 10" # Used if dumpdev is enabled above, and present. # By default, only the 10 most recent kernel dumps Modified: projects/runtime-coverage/etc/rc.d/dumpon ============================================================================== --- projects/runtime-coverage/etc/rc.d/dumpon Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/etc/rc.d/dumpon Thu Oct 26 03:34:17 2017 (r325005) @@ -16,11 +16,14 @@ stop_cmd="dumpon_stop" dumpon_try() { + local flags + + flags=${dumpon_flags} if [ -n "${dumppubkey}" ]; then - /sbin/dumpon -k "${dumppubkey}" "${1}" - else - /sbin/dumpon "${1}" + warn "The dumppubkey variable is deprecated. Use dumpon_flags." + flags="${flags} -k ${dumppubkey}" fi + /sbin/dumpon ${flags} "${1}" if [ $? -eq 0 ]; then # Make a symlink in devfs for savecore ln -fs "${1}" /dev/dumpdev Modified: projects/runtime-coverage/lib/Makefile ============================================================================== --- projects/runtime-coverage/lib/Makefile Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/lib/Makefile Thu Oct 26 03:34:17 2017 (r325005) @@ -186,7 +186,7 @@ _libdl= libdl .endif SUBDIR.${MK_OPENSSL}+= libmp -SUBDIR.${MK_PMC}+= libpmc +SUBDIR.${MK_PMC}+= libpmc libpmcstat SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_TELNET}+= libtelnet Modified: projects/runtime-coverage/lib/clang/llvm.build.mk ============================================================================== --- projects/runtime-coverage/lib/clang/llvm.build.mk Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/lib/clang/llvm.build.mk Thu Oct 26 03:34:17 2017 (r325005) @@ -33,11 +33,11 @@ TARGET_ABI= VENDOR= unknown OS_VERSION= freebsd12.0 -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI} -BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION} +LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI} +LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION} -CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" -CFLAGS+= -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" +CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\" +CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\" CFLAGS+= -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" CFLAGS+= -ffunction-sections Modified: projects/runtime-coverage/lib/libc/sys/aio_suspend.2 ============================================================================== --- projects/runtime-coverage/lib/libc/sys/aio_suspend.2 Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/lib/libc/sys/aio_suspend.2 Thu Oct 26 03:34:17 2017 (r325005) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 2, 1999 +.Dd Oct 23, 2017 .Dt AIO_SUSPEND 2 .Os .Sh NAME @@ -85,10 +85,10 @@ expired before any I/O requests completed. The .Fa iocbs argument -contains more than -.Dv AIO_LISTIO_MAX -asynchronous I/O requests, or at least one of the requests is not -valid. +contains more asynchronous I/O requests than the +.Va vfs.aio.max_aio_queue_per_proc +.Xr sysctl 8 +variable, or at least one of the requests is not valid. .It Bq Er EINTR the suspend was interrupted by a signal. .El Modified: projects/runtime-coverage/lib/libc/sys/lio_listio.2 ============================================================================== --- projects/runtime-coverage/lib/libc/sys/lio_listio.2 Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/lib/libc/sys/lio_listio.2 Thu Oct 26 03:34:17 2017 (r325005) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 15, 2016 +.Dd Oct 23, 2017 .Dt LIO_LISTIO 2 .Os .Sh NAME @@ -161,7 +161,7 @@ function will fail if: There are not enough resources to enqueue the requests. .It Bq Er EAGAIN The request would cause the system-wide limit -.Dv AIO_MAX +.Dv {AIO_MAX} to be exceeded. .It Bq Er EINVAL The @@ -173,7 +173,7 @@ nor or .Fa nent is greater than -.Dv AIO_LISTIO_MAX . +.Dv {AIO_LISTIO_MAX} . .It Bq Er EINVAL The asynchronous notification method in .Fa sig->sigev_notify Modified: projects/runtime-coverage/lib/libc/sys/reboot.2 ============================================================================== --- projects/runtime-coverage/lib/libc/sys/reboot.2 Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/lib/libc/sys/reboot.2 Thu Oct 26 03:34:17 2017 (r325005) @@ -28,7 +28,7 @@ .\" @(#)reboot.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd September 18, 2015 +.Dd October 24, 2017 .Dt REBOOT 2 .Os .Sh NAME @@ -84,6 +84,14 @@ for more information. .It Dv RB_HALT The processor is simply halted; no reboot takes place. This option should be used with caution. +.It Dv RB_POWERCYCLE +After halting, the shutdown code will do what it can to turn +off the power and then turn the power back on. +This requires hardware support, usually an auxiliary microprocessor +that can sequence the power supply. +At present only the +.Xr ipmi 4 +driver implements this feature. .It Dv RB_POWEROFF After halting, the shutdown code will do what it can to turn off the power. Modified: projects/runtime-coverage/lib/libsysdecode/flags.c ============================================================================== --- projects/runtime-coverage/lib/libsysdecode/flags.c Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/lib/libsysdecode/flags.c Thu Oct 26 03:34:17 2017 (r325005) @@ -647,9 +647,9 @@ sysdecode_reboot_howto(FILE *fp, int howto, int *rem) /* * RB_AUTOBOOT is special in that its value is zero, but it is * also an implied argument if a different operation is not - * requested via RB_HALT, RB_POWEROFF, or RB_REROOT. + * requested via RB_HALT, RB_POWERCYCLE, RB_POWEROFF, or RB_REROOT. */ - if (howto != 0 && (howto & (RB_HALT | RB_POWEROFF | RB_REROOT)) == 0) { + if (howto != 0 && (howto & (RB_HALT | RB_POWEROFF | RB_REROOT | RB_POWERCYCLE)) == 0) { fputs("RB_AUTOBOOT|", fp); printed = true; } else Modified: projects/runtime-coverage/lib/libugidfw/Makefile ============================================================================== --- projects/runtime-coverage/lib/libugidfw/Makefile Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/lib/libugidfw/Makefile Thu Oct 26 03:34:17 2017 (r325005) @@ -2,7 +2,7 @@ PACKAGE=lib${LIB} LIB= ugidfw -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 5 SRCS= ugidfw.c INCS= ugidfw.h Modified: projects/runtime-coverage/lib/libugidfw/ugidfw.c ============================================================================== --- projects/runtime-coverage/lib/libugidfw/ugidfw.c Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/lib/libugidfw/ugidfw.c Thu Oct 26 03:34:17 2017 (r325005) @@ -194,7 +194,7 @@ bsde_rule_to_string(struct mac_bsdextended_rule *rule, cur += len; } if (rule->mbr_subject.mbs_flags & MBS_PRISON_DEFINED) { - len = snprintf(cur, left, "jailid %d ", + len = snprintf(cur, left, "jailid %d ", rule->mbr_subject.mbs_prison); if (len < 0 || len > left) goto truncated; @@ -334,7 +334,7 @@ bsde_rule_to_string(struct mac_bsdextended_rule *rule, &(mntbuf[i].f_fsid), sizeof(mntbuf[i].f_fsid)) == 0) break; - len = snprintf(cur, left, "filesys %s ", + len = snprintf(cur, left, "filesys %s ", i == numfs ? "???" : mntbuf[i].f_mntonname); if (len < 0 || len > left) goto truncated; @@ -512,7 +512,6 @@ bsde_parse_uidrange(char *spec, uid_t *min, uid_t *max uid_t uid1, uid2; char *spec1, *spec2, *endp; unsigned long value; - size_t len; spec2 = spec; spec1 = strsep(&spec2, ":"); @@ -523,8 +522,7 @@ bsde_parse_uidrange(char *spec, uid_t *min, uid_t *max else { value = strtoul(spec1, &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid uid: '%s'", spec1); + snprintf(errstr, buflen, "invalid uid: '%s'", spec1); return (-1); } uid1 = value; @@ -541,8 +539,7 @@ bsde_parse_uidrange(char *spec, uid_t *min, uid_t *max else { value = strtoul(spec2, &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid uid: '%s'", spec2); + snprintf(errstr, buflen, "invalid uid: '%s'", spec2); return (-1); } uid2 = value; @@ -561,7 +558,6 @@ bsde_parse_gidrange(char *spec, gid_t *min, gid_t *max gid_t gid1, gid2; char *spec1, *spec2, *endp; unsigned long value; - size_t len; spec2 = spec; spec1 = strsep(&spec2, ":"); @@ -572,8 +568,7 @@ bsde_parse_gidrange(char *spec, gid_t *min, gid_t *max else { value = strtoul(spec1, &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid gid: '%s'", spec1); + snprintf(errstr, buflen, "invalid gid: '%s'", spec1); return (-1); } gid1 = value; @@ -590,8 +585,7 @@ bsde_parse_gidrange(char *spec, gid_t *min, gid_t *max else { value = strtoul(spec2, &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid gid: '%s'", spec2); + snprintf(errstr, buflen, "invalid gid: '%s'", spec2); return (-1); } gid2 = value; @@ -613,7 +607,6 @@ bsde_parse_subject(int argc, char *argv[], uid_t uid_min, uid_max; gid_t gid_min, gid_max; int jid = 0; - size_t len; long value; current = 0; @@ -630,11 +623,11 @@ bsde_parse_subject(int argc, char *argv[], while (current < argc) { if (strcmp(argv[current], "uid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "uid short"); + snprintf(errstr, buflen, "uid short"); return (-1); } if (flags & MBS_UID_DEFINED) { - len = snprintf(errstr, buflen, "one uid only"); + snprintf(errstr, buflen, "one uid only"); return (-1); } if (bsde_parse_uidrange(argv[current+1], @@ -648,11 +641,11 @@ bsde_parse_subject(int argc, char *argv[], current += 2; } else if (strcmp(argv[current], "gid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "gid short"); + snprintf(errstr, buflen, "gid short"); return (-1); } if (flags & MBS_GID_DEFINED) { - len = snprintf(errstr, buflen, "one gid only"); + snprintf(errstr, buflen, "one gid only"); return (-1); } if (bsde_parse_gidrange(argv[current+1], @@ -666,17 +659,17 @@ bsde_parse_subject(int argc, char *argv[], current += 2; } else if (strcmp(argv[current], "jailid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "prison short"); + snprintf(errstr, buflen, "prison short"); return (-1); } if (flags & MBS_PRISON_DEFINED) { - len = snprintf(errstr, buflen, "one jail only"); + snprintf(errstr, buflen, "one jail only"); return (-1); } value = strtol(argv[current+1], &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid jid: '%s'", argv[current+1]); + snprintf(errstr, buflen, "invalid jid: '%s'", + argv[current+1]); return (-1); } jid = value; @@ -688,14 +681,13 @@ bsde_parse_subject(int argc, char *argv[], current += 2; } else if (strcmp(argv[current], "!") == 0) { if (nextnot) { - len = snprintf(errstr, buflen, - "double negative"); + snprintf(errstr, buflen, "double negative"); return (-1); } nextnot = 1; current += 1; } else { - len = snprintf(errstr, buflen, "'%s' not expected", + snprintf(errstr, buflen, "'%s' not expected", argv[current]); return (-1); } @@ -723,7 +715,6 @@ bsde_parse_subject(int argc, char *argv[], static int bsde_parse_type(char *spec, int *type, size_t buflen, char *errstr) { - size_t len; int i; *type = 0; @@ -755,10 +746,10 @@ bsde_parse_type(char *spec, int *type, size_t buflen, *type |= MBO_ALL_TYPE; break; default: - len = snprintf(errstr, buflen, "Unknown type code: %c", + snprintf(errstr, buflen, "Unknown type code: %c", spec[i]); return (-1); - } + } } return (0); @@ -767,11 +758,10 @@ bsde_parse_type(char *spec, int *type, size_t buflen, static int bsde_parse_fsid(char *spec, struct fsid *fsid, size_t buflen, char *errstr) { - size_t len; struct statfs buf; if (statfs(spec, &buf) < 0) { - len = snprintf(errstr, buflen, "Unable to get id for %s: %s", + snprintf(errstr, buflen, "Unable to get id for %s: %s", spec, strerror(errno)); return (-1); } @@ -791,7 +781,6 @@ bsde_parse_object(int argc, char *argv[], uid_t uid_min, uid_max; gid_t gid_min, gid_max; struct fsid fsid; - size_t len; current = 0; flags = 0; @@ -808,11 +797,11 @@ bsde_parse_object(int argc, char *argv[], while (current < argc) { if (strcmp(argv[current], "uid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "uid short"); + snprintf(errstr, buflen, "uid short"); return (-1); } if (flags & MBO_UID_DEFINED) { - len = snprintf(errstr, buflen, "one uid only"); + snprintf(errstr, buflen, "one uid only"); return (-1); } if (bsde_parse_uidrange(argv[current+1], @@ -826,11 +815,11 @@ bsde_parse_object(int argc, char *argv[], current += 2; } else if (strcmp(argv[current], "gid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "gid short"); + snprintf(errstr, buflen, "gid short"); return (-1); } if (flags & MBO_GID_DEFINED) { - len = snprintf(errstr, buflen, "one gid only"); + snprintf(errstr, buflen, "one gid only"); return (-1); } if (bsde_parse_gidrange(argv[current+1], @@ -844,11 +833,11 @@ bsde_parse_object(int argc, char *argv[], current += 2; } else if (strcmp(argv[current], "filesys") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "filesys short"); + snprintf(errstr, buflen, "filesys short"); return (-1); } if (flags & MBO_FSID_DEFINED) { - len = snprintf(errstr, buflen, "one fsid only"); + snprintf(errstr, buflen, "one fsid only"); return (-1); } if (bsde_parse_fsid(argv[current+1], &fsid, @@ -890,11 +879,11 @@ bsde_parse_object(int argc, char *argv[], current += 1; } else if (strcmp(argv[current], "type") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "type short"); + snprintf(errstr, buflen, "type short"); return (-1); } if (flags & MBO_TYPE_DEFINED) { - len = snprintf(errstr, buflen, "one type only"); + snprintf(errstr, buflen, "one type only"); return (-1); } if (bsde_parse_type(argv[current+1], &type, @@ -908,14 +897,14 @@ bsde_parse_object(int argc, char *argv[], current += 2; } else if (strcmp(argv[current], "!") == 0) { if (nextnot) { - len = snprintf(errstr, buflen, + snprintf(errstr, buflen, "double negative'"); return (-1); } nextnot = 1; current += 1; } else { - len = snprintf(errstr, buflen, "'%s' not expected", + snprintf(errstr, buflen, "'%s' not expected", argv[current]); return (-1); } @@ -946,16 +935,15 @@ int bsde_parse_mode(int argc, char *argv[], mode_t *mode, size_t buflen, char *errstr) { - size_t len; int i; if (argc == 0) { - len = snprintf(errstr, buflen, "mode expects mode value"); + snprintf(errstr, buflen, "mode expects mode value"); return (-1); } if (argc != 1) { - len = snprintf(errstr, buflen, "'%s' unexpected", argv[1]); + snprintf(errstr, buflen, "'%s' unexpected", argv[1]); return (-1); } @@ -981,10 +969,10 @@ bsde_parse_mode(int argc, char *argv[], mode_t *mode, /* ignore */ break; default: - len = snprintf(errstr, buflen, "Unknown mode letter: %c", + snprintf(errstr, buflen, "Unknown mode letter: %c", argv[0][i]); return (-1); - } + } } return (0); @@ -998,17 +986,16 @@ bsde_parse_rule(int argc, char *argv[], struct mac_bsd int object, object_elements, object_elements_length; int mode, mode_elements, mode_elements_length; int error, i; - size_t len; bzero(rule, sizeof(*rule)); if (argc < 1) { - len = snprintf(errstr, buflen, "Rule must begin with subject"); + snprintf(errstr, buflen, "Rule must begin with subject"); return (-1); } if (strcmp(argv[0], "subject") != 0) { - len = snprintf(errstr, buflen, "Rule must begin with subject"); + snprintf(errstr, buflen, "Rule must begin with subject"); return (-1); } subject = 0; @@ -1022,7 +1009,7 @@ bsde_parse_rule(int argc, char *argv[], struct mac_bsd object = i; if (object == -1) { - len = snprintf(errstr, buflen, "Rule must contain an object"); + snprintf(errstr, buflen, "Rule must contain an object"); return (-1); } @@ -1033,7 +1020,7 @@ bsde_parse_rule(int argc, char *argv[], struct mac_bsd mode = i; if (mode == -1) { - len = snprintf(errstr, buflen, "Rule must contain mode"); + snprintf(errstr, buflen, "Rule must contain mode"); return (-1); } @@ -1112,12 +1099,12 @@ bsde_check_version(size_t buflen, char *errstr) len = sizeof(version); error = sysctlbyname(MIB ".rule_version", &version, &len, NULL, 0); if (error) { - len = snprintf(errstr, buflen, "version check failed: %s", + snprintf(errstr, buflen, "version check failed: %s", strerror(errno)); return (-1); } if (version != MB_VERSION) { - len = snprintf(errstr, buflen, "module v%d != library v%d", + snprintf(errstr, buflen, "module v%d != library v%d", version, MB_VERSION); return (-1); } @@ -1134,11 +1121,11 @@ bsde_get_rule_count(size_t buflen, char *errstr) len = sizeof(rule_count); error = sysctlbyname(MIB ".rule_count", &rule_count, &len, NULL, 0); if (error) { - len = snprintf(errstr, buflen, "%s", strerror(errno)); + snprintf(errstr, buflen, "%s", strerror(errno)); return (-1); } if (len != sizeof(rule_count)) { - len = snprintf(errstr, buflen, "Data error in %s.rule_count", + snprintf(errstr, buflen, "Data error in %s.rule_count", MIB); return (-1); } @@ -1156,12 +1143,11 @@ bsde_get_rule_slots(size_t buflen, char *errstr) len = sizeof(rule_slots); error = sysctlbyname(MIB ".rule_slots", &rule_slots, &len, NULL, 0); if (error) { - len = snprintf(errstr, buflen, "%s", strerror(errno)); + snprintf(errstr, buflen, "%s", strerror(errno)); return (-1); } if (len != sizeof(rule_slots)) { - len = snprintf(errstr, buflen, "Data error in %s.rule_slots", - MIB); + snprintf(errstr, buflen, "Data error in %s.rule_slots", MIB); return (-1); } @@ -1187,7 +1173,7 @@ bsde_get_rule(int rulenum, struct mac_bsdextended_rule len = 10; error = bsde_get_mib(MIB ".rules", name, &len); if (error) { - len = snprintf(errstr, errlen, "%s: %s", MIB ".rules", + snprintf(errstr, errlen, "%s: %s", MIB ".rules", strerror(errno)); return (-1); } @@ -1199,11 +1185,11 @@ bsde_get_rule(int rulenum, struct mac_bsdextended_rule if (error == -1 && errno == ENOENT) return (-2); if (error) { - len = snprintf(errstr, errlen, "%s.%d: %s", MIB ".rules", + snprintf(errstr, errlen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); return (-1); } else if (size != sizeof(*rule)) { - len = snprintf(errstr, errlen, "Data error in %s.%d: %s", + snprintf(errstr, errlen, "Data error in %s.%d: %s", MIB ".rules", rulenum, strerror(errno)); return (-1); } @@ -1225,7 +1211,7 @@ bsde_delete_rule(int rulenum, size_t buflen, char *err len = 10; error = bsde_get_mib(MIB ".rules", name, &len); if (error) { - len = snprintf(errstr, buflen, "%s: %s", MIB ".rules", + snprintf(errstr, buflen, "%s: %s", MIB ".rules", strerror(errno)); return (-1); } @@ -1235,7 +1221,7 @@ bsde_delete_rule(int rulenum, size_t buflen, char *err error = sysctl(name, len, NULL, NULL, &rule, 0); if (error) { - len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", + snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); return (-1); } @@ -1257,7 +1243,7 @@ bsde_set_rule(int rulenum, struct mac_bsdextended_rule len = 10; error = bsde_get_mib(MIB ".rules", name, &len); if (error) { - len = snprintf(errstr, buflen, "%s: %s", MIB ".rules", + snprintf(errstr, buflen, "%s: %s", MIB ".rules", strerror(errno)); return (-1); } @@ -1267,7 +1253,7 @@ bsde_set_rule(int rulenum, struct mac_bsdextended_rule error = sysctl(name, len, NULL, NULL, rule, sizeof(*rule)); if (error) { - len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", + snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); return (-1); } @@ -1290,14 +1276,14 @@ bsde_add_rule(int *rulenum, struct mac_bsdextended_rul len = 10; error = bsde_get_mib(MIB ".rules", name, &len); if (error) { - len = snprintf(errstr, buflen, "%s: %s", MIB ".rules", + snprintf(errstr, buflen, "%s: %s", MIB ".rules", strerror(errno)); return (-1); } rule_slots = bsde_get_rule_slots(BUFSIZ, charstr); if (rule_slots == -1) { - len = snprintf(errstr, buflen, "unable to get rule slots: %s", + snprintf(errstr, buflen, "unable to get rule slots: %s", strerror(errno)); return (-1); } @@ -1307,7 +1293,7 @@ bsde_add_rule(int *rulenum, struct mac_bsdextended_rul error = sysctl(name, len, NULL, NULL, rule, sizeof(*rule)); if (error) { - len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", + snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rule_slots, strerror(errno)); return (-1); } Modified: projects/runtime-coverage/libexec/rtld-elf/libmap.c ============================================================================== --- projects/runtime-coverage/libexec/rtld-elf/libmap.c Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/libexec/rtld-elf/libmap.c Thu Oct 26 03:34:17 2017 (r325005) @@ -100,6 +100,7 @@ lmc_parse_file(char *path) { struct lmc *p; struct stat st; + ssize_t retval; int fd; char *lm_map; @@ -128,10 +129,11 @@ lmc_parse_file(char *path) } } - lm_map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (lm_map == (const char *)MAP_FAILED) { + lm_map = xmalloc(st.st_size); + retval = read(fd, lm_map, st.st_size); + if (retval != st.st_size) { close(fd); - dbg("lm_parse_file: mmap(\"%s\") failed, %s", path, + dbg("lm_parse_file: read(\"%s\") failed, %s", path, rtld_strerror(errno)); return; } @@ -142,7 +144,7 @@ lmc_parse_file(char *path) p->ino = st.st_ino; TAILQ_INSERT_HEAD(&lmc_head, p, next); lmc_parse(lm_map, st.st_size); - munmap(lm_map, st.st_size); + free(lm_map); } static void Modified: projects/runtime-coverage/libexec/rtld-elf/rtld.c ============================================================================== --- projects/runtime-coverage/libexec/rtld-elf/rtld.c Wed Oct 25 23:24:30 2017 (r325004) +++ projects/runtime-coverage/libexec/rtld-elf/rtld.c Thu Oct 26 03:34:17 2017 (r325005) @@ -138,7 +138,7 @@ static int rtld_dirname(const char *, char *); static int rtld_dirname_abs(const char *, char *); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Thu Oct 26 03:38:41 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3E9FE3A92A for <svn-src-projects@mailman.ysv.freebsd.org>; Thu, 26 Oct 2017 03:38:41 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 8910F69A0D; Thu, 26 Oct 2017 03:38:41 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9Q3ceOs024099; Thu, 26 Oct 2017 03:38:40 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9Q3ce7b024098; Thu, 26 Oct 2017 03:38:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710260338.v9Q3ce7b024098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper <ngie@FreeBSD.org> Date: Thu, 26 Oct 2017 03:38:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325006 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 325006 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 26 Oct 2017 03:38:41 -0000 Author: ngie Date: Thu Oct 26 03:38:40 2017 New Revision: 325006 URL: https://svnweb.freebsd.org/changeset/base/325006 Log: Remove unnecessary :U when testing COMPILER_FEATURES Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Thu Oct 26 03:34:17 2017 (r325005) +++ projects/runtime-coverage/Makefile.inc1 Thu Oct 26 03:38:40 2017 (r325006) @@ -2296,7 +2296,7 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # for world to have runtime coverage instrumentation. # .if ${MK_COVERAGE} != "no" -.if ${COMPILER_FEATURES:U:Mc++11} +.if ${COMPILER_FEATURES:Mc++11} _coverage_libs+= lib/libclang_rt/profile .else .endif