configure.ac, cmake: Support coverage build with clang.

AmokHuginnsson · Sep 19, 2018 · 992706a · 992706a
1 parent ca1e164
commit 992706a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 2 deletions.
diff --git a/Makefile.mk.in b/Makefile.mk.in
@@ -44,6 +44,7 @@ include $(DIR_ROOT)/_aux/mk/40_commit-id.mk
 include $(DIR_ROOT)/_aux/mk/50_wrapper.mk
 include $(DIR_ROOT)/_aux/mk/60_flags.mk
 EXTRA_COMPILER_DEBUG_FLAGS=@EXTRA_COMPILER_DEBUG_FLAGS@
+EXTRA_COMPILER_COVERAGE_FLAGS=@EXTRA_COMPILER_COVERAGE_FLAGS@
 EXTRA_COMPILER_OPTIMIZATION_FLAGS=@EXTRA_COMPILER_OPTIMIZATION_FLAGS@
 EXTRA_INCLUDE_PATHS=@EXTRA_INCLUDE_PATHS@
 EXTRA_LIBRARY_PATHS=@EXTRA_LIBRARY_PATHS@

diff --git a/_aux/aclib.m4 b/_aux/aclib.m4
@@ -284,6 +284,8 @@ AC_DEFUN_ONCE([YAAL_DETECT_COMMON_FLAGS], [
 	else
 		YAAL_DETECT_FLAGS(EXTRA_LXXFLAGS, [-Wl,--no-keep-memory], [C++])
 	fi
+	YAAL_DETECT_FLAGS(EXTRA_COMPILER_COVERAGE_FLAGS, [-fno-default-inline], [C++])
+	YAAL_DETECT_FLAGS(EXTRA_COMPILER_COVERAGE_FLAGS, [-fno-inline-small-functions], [C++])
 	if test ["x${START_GROUP}"] != ["x"] ; then
 		END_GROUP=["-Wl,--end-group"]
 	fi

diff --git a/_aux/client-configure.m4 b/_aux/client-configure.m4
@@ -104,6 +104,7 @@ AC_SUBST([EXTRA_LIBRARY_PATHS], [${EXTRA_LIBRARY_PATHS}])
 AC_SUBST([EXTRA_CXXFLAGS],[${EXTRA_CXXFLAGS}])
 AC_SUBST([EXTRA_LXXFLAGS],[${EXTRA_LXXFLAGS}])
 AC_SUBST([EXTRA_COMPILER_DEBUG_FLAGS],[${EXTRA_COMPILER_DEBUG_FLAGS}])
+AC_SUBST([EXTRA_COMPILER_COVERAGE_FLAGS],[${EXTRA_COMPILER_COVERAGE_FLAGS}])
 AC_SUBST([EXTRA_COMPILER_OPTIMIZATION_FLAGS],[${EXTRA_COMPILER_OPTIMIZATION_FLAGS}])
 AC_SUBST([YAAL_LXXFLAGS],[${YAAL_LXXFLAGS}])
 AC_SUBST([START_GROUP],[${START_GROUP}])

diff --git a/_aux/cmake/common.cmake b/_aux/cmake/common.cmake
@@ -270,6 +270,8 @@ elseif ( "${CMAKE_BUILD_TYPE}" STREQUAL "cov" )
 	set( LIB_INFIX "-c" )
 	set( CMAKE_REQUIRED_LIBRARIES --coverage )
 	use_cxx_compiler_flag( --coverage )
+	use_cxx_compiler_flag( -femit-class-debug-always )
+	use_cxx_compiler_flag( -fno-eliminate-unused-debug-types )
 	set( CMAKE_SHARED_LINKER_FLAGS --coverage )
 	set( CMAKE_EXE_LINKER_FLAGS --coverage )
 	add_definitions( -D__DEBUG__ )

diff --git a/_aux/configure.mk.in b/_aux/configure.mk.in
@@ -22,6 +22,7 @@ GTAGS                             = @GTAGS@
 START_GROUP                       = @START_GROUP@
 END_GROUP                         = @END_GROUP@
 EXTRA_COMPILER_DEBUG_FLAGS        = @EXTRA_COMPILER_DEBUG_FLAGS@
+EXTRA_COMPILER_COVERAGE_FLAGS     = @EXTRA_COMPILER_COVERAGE_FLAGS@
 EXTRA_COMPILER_OPTIMIZATION_FLAGS = @EXTRA_COMPILER_OPTIMIZATION_FLAGS@
 EXTRA_INCLUDE_PATHS               = @EXTRA_INCLUDE_PATHS@
 EXTRA_LIBRARY_PATHS               = @EXTRA_LIBRARY_PATHS@

diff --git a/_aux/mk/60_flags.mk b/_aux/mk/60_flags.mk
@@ -77,7 +77,7 @@ endif
 ifdef DO_COVERAGE
 	TARGET=cov
 	COMPILER_COVERAGE_FLAGS = --coverage
-	COMPILER_DEBUG_FLAGS = -D__DEBUG__ -fno-inline -fno-inline-small-functions -fno-default-inline
+	COMPILER_DEBUG_FLAGS = -D__DEBUG__ -fno-inline $(EXTRA_COMPILER_COVERAGE_FLAGS)
 	LINKER_COVERAGE_FLAGS   = --coverage
 	LIB_INFIX = -c
 endif

diff --git a/configure.ac b/configure.ac
@@ -502,6 +502,7 @@ AC_SUBST([EXTRA_LIBRARY_PATHS], [${EXTRA_LIBRARY_PATHS}])
 AC_SUBST([EXTRA_CXXFLAGS],[${EXTRA_CXXFLAGS}])
 AC_SUBST([EXTRA_LXXFLAGS],[${EXTRA_LXXFLAGS}])
 AC_SUBST([EXTRA_COMPILER_DEBUG_FLAGS],[${EXTRA_COMPILER_DEBUG_FLAGS}])
+AC_SUBST([EXTRA_COMPILER_COVERAGE_FLAGS],[${EXTRA_COMPILER_COVERAGE_FLAGS}])
 AC_SUBST([EXTRA_COMPILER_OPTIMIZATION_FLAGS],[${EXTRA_COMPILER_OPTIMIZATION_FLAGS}])
 AC_SUBST([YAAL_LXXFLAGS],[${YAAL_LXXFLAGS}])
 AC_SUBST([START_GROUP],[${START_GROUP}])

diff --git a/tools/huginn/expression.cxx b/tools/huginn/expression.cxx
@@ -804,7 +804,7 @@ inline HHuginn::value_t fill_assoc( HThread* thread_, HHuginn::value_t&& assoc_,
 	for ( int i( 0 ), S( static_cast<int>( values_.get_size() ) ); i < S; i += 2 ) {
 		dict->insert( thread_, values_[i]._value, values_[i + 1]._value, values_[i]._position );
 	}
-	return ( assoc_ );
+	return ( yaal::move( assoc_ ) );
 }
 
 }