From owner-svn-src-projects@freebsd.org  Sun Aug 20 07:06: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 EEA51DE40C0
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 20 Aug 2017 07:06: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 BB59C767D8;
 Sun, 20 Aug 2017 07:06: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 v7K76D0t066874;
 Sun, 20 Aug 2017 07:06:13 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7K76DkR066871;
 Sun, 20 Aug 2017 07:06:13 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201708200706.v7K76DkR066871@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, 20 Aug 2017 07:06:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r322717 - 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: 322717
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 &quot; projects&quot;
 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, 20 Aug 2017 07:06:15 -0000

Author: ngie
Date: Sun Aug 20 07:06:13 2017
New Revision: 322717
URL: https://svnweb.freebsd.org/changeset/base/322717

Log:
  Need to account for SRCS that don't get compiled with --coverage, e.g., .S files

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 Aug 20 07:04:23 2017	(r322716)
+++ projects/runtime-coverage/share/mk/bsd.cov.mk	Sun Aug 20 07:06:13 2017	(r322717)
@@ -4,7 +4,12 @@
 
 FILESGROUPS?=	FILES
 
-GCNOS=		${COV_OBJS:.o=.gcno}
+cov_objs_no_suffixes=	${COV_OBJS:R}
+.for src in ${COV_SRCS:R}
+.if ${cov_objs_no_suffixes:M${src}}
+GCNOS+=	${src}.gcno
+.endif
+.endfor
 
 .if !empty(GCNOS)
 GCNOS:=		${GCNOS:O:u}

Modified: projects/runtime-coverage/share/mk/bsd.lib.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.lib.mk	Sun Aug 20 07:04:23 2017	(r322716)
+++ projects/runtime-coverage/share/mk/bsd.lib.mk	Sun Aug 20 07:06:13 2017	(r322717)
@@ -454,6 +454,7 @@ _libinstall:
 .include <bsd.nls.mk>
 .if defined(_COV_FLAG)
 COV_OBJS=	${SOBJS:.pico=.o}
+COV_SRCS=	${SRCS:M*.[c|cc|cpp|cxx|C]}
 .include <bsd.cov.mk>
 .endif
 .include <bsd.files.mk>

Modified: projects/runtime-coverage/share/mk/bsd.prog.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.prog.mk	Sun Aug 20 07:04:23 2017	(r322716)
+++ projects/runtime-coverage/share/mk/bsd.prog.mk	Sun Aug 20 07:06:13 2017	(r322717)
@@ -303,6 +303,7 @@ NLSNAME?=	${PROG}
 .include <bsd.confs.mk>
 .if defined(_COV_FLAG)
 COV_OBJS=	${OBJS}
+COV_SRCS=	${SRCS:M*.[c|cc|cpp|cxx|C]}
 .include <bsd.cov.mk>
 .endif
 .include <bsd.files.mk>