svn commit: r320214 - in projects/runtime-coverage/gnu/lib: libstdc++ libsupc++

[Ngie Cooper]

Author: ngie
Date: Thu Jun 22 04:34:09 2017
New Revision: 320214
URL: https://svnweb.freebsd.org/changeset/base/320214

Log:
  Add COV_CXXFLAGS for gnu/lib/lib{std,sup}c++
  
  Mark libstdc++ with MK_COVERAGE?= no to disable runtime
  coverage instrumentation with libstdc++.
  
  For reasons I don't yet understand, COV_CXXFLAGS isn't being passed
  down properly to my bsd.lib.mk static rules -- coming in the next commit.

Modified:
  projects/runtime-coverage/gnu/lib/libstdc++/Makefile
  projects/runtime-coverage/gnu/lib/libsupc++/Makefile

Modified: projects/runtime-coverage/gnu/lib/libstdc++/Makefile
==============================================================================
--- projects/runtime-coverage/gnu/lib/libstdc++/Makefile	Thu Jun 22 04:14:25 2017	(r320213)
+++ projects/runtime-coverage/gnu/lib/libstdc++/Makefile	Thu Jun 22 04:34:09 2017	(r320214)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+# XXX (ngie): doesn't build with coverage today; COV_CXXFLAGS is getting passed
+# down improperly, resulting in a -Werror issue with strsignal in debug.c.
+MK_COVERAGE?=	no
+
 .include <src.opts.mk>
 
 GCCVER=	4.2
@@ -21,6 +25,7 @@ CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR}/include -I.
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
 		-Wno-deprecated
+COV_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}
 PO_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}
 
 LIBADD+=	m

Modified: projects/runtime-coverage/gnu/lib/libsupc++/Makefile
==============================================================================
--- projects/runtime-coverage/gnu/lib/libsupc++/Makefile	Thu Jun 22 04:14:25 2017	(r320213)
+++ projects/runtime-coverage/gnu/lib/libsupc++/Makefile	Thu Jun 22 04:34:09 2017	(r320214)
@@ -26,6 +26,7 @@ CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR} -I${GCCDIR}
 CFLAGS+=	-I${.CURDIR}/../libstdc++ -I.
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
+COV_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}
 PO_CXXFLAGS=    ${CXXFLAGS:N-ffunction-sections}
 
 HDRS=	exception new typeinfo cxxabi.h exception_defines.h