diff --git a/Makefile.in b/Makefile.in
index ff5aabfdd..d30f6e7fd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -194,10 +194,10 @@ ifneq ("$(GENHTML)", "")
 lcov:
 	$(RM) -rf $(LCOV_REPORTS_DIR)
 	$(MKDIR_P) $(LCOV_REPORTS_DIR)
-	$(LCOV) --capture --directory $(top_builddir) --ignore-errors source,negative \
+	$(LCOV) --capture --directory $(top_builddir) --ignore-errors source \
 		--output-file $(LCOV_REPORTS_DIR)/out.info
 	-test ! -s $(LCOV_REPORTS_DIR)/out.info || \
-		$(GENHTML) -o $(LCOV_REPORTS_DIR) --ignore-errors source,negative \
+		$(GENHTML) -o $(LCOV_REPORTS_DIR) --ignore-errors source \
 		$(LCOV_REPORTS_DIR)/out.info
 endif
 
diff --git a/configure b/configure
index e827813f7..fe6a9a515 100755
--- a/configure
+++ b/configure
@@ -11574,7 +11574,7 @@ printf "%s\n" "$PROFILING" >&6; }
 if test "$PROFILING" = "yes"
 then :
 
-  COPTIMISE_FLAG="$COPTIMISE_FLAG -fprofile-arcs -ftest-coverage"
+  COPTIMISE_FLAG="$COPTIMISE_FLAG -fprofile-arcs -fprofile-update=atomic -ftest-coverage"
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lcov", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lcov; ac_word=$2
diff --git a/configure.ac b/configure.ac
index e1900f673..1f5c7045f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -839,7 +839,7 @@ AC_ARG_ENABLE(profiling,
 AC_MSG_RESULT([$PROFILING])
 
 AS_IF([test "$PROFILING" = "yes"], [
-  COPTIMISE_FLAG="$COPTIMISE_FLAG -fprofile-arcs -ftest-coverage"
+  COPTIMISE_FLAG="$COPTIMISE_FLAG -fprofile-arcs -fprofile-update=atomic -ftest-coverage"
   AC_PATH_TOOL(LCOV, lcov)
   AC_PATH_TOOL(GENHTML, genhtml)
   AS_IF([test -z "$LCOV" || test -z "$GENHTML"], [