Cleanup after recent changes

.github/workflows/c-coverage.yml

@@ -50,7 +50,7 @@ jobs:
     - name: Publish coverage-report
       uses: JamesIves/github-pages-deploy-action@v4
       with:
-        folder: llvm-cov-report
+        folder: coverage-report
         repository-name: '' # TODO Destination
         token: ${{ secrets.COVERAGE_DEPLOY_TOKEN }} # TODO: Use an organization-level token
         single-commit: true

Makefile.pre.in

@@ -37,7 +37,6 @@ abs_builddir=	@abs_builddir@
 CC=		@CC@
 CXX=		@CXX@
 LINKCC=		@LINKCC@
-CC_NAME=@CC_NAME@
 AR=		@AR@
 READELF=	@READELF@
 SOABI=		@SOABI@
@@ -657,8 +656,9 @@ bolt-opt: @PREBOLT_RULE@
 	rm -f $(BUILDPYTHON).bolt_inst
 	mv $(BUILDPYTHON).bolt $(BUILDPYTHON)
 
+# Support generating coverage reports
 .PHONY=coverage-report coverage coverage-generate-lcov coverage-generate-profdata
-coverage-report:
+coverage-report: regen-token regen-frozen
 	@ # build with coverage info
 	$(MAKE) coverage
 	@ # run tests, ignore failures
@@ -675,7 +675,9 @@ coverage-report:
 coverage:
 	@echo "Building with support for coverage checking:"
 	$(MAKE) clean
-	$(MAKE) @DEF_MAKE_RULE@ CC="$(COVERAGE_CC)" CFLAGS="$(CFLAGS) $(COVERAGE_CFLAGS)" LDFLAGS="$(LDFLAGS) $(COVERAGE_LDFLAGS)"
+	$(MAKE) @DEF_MAKE_RULE@ CC="$(COVERAGE_CC)" \
+		CFLAGS="$(CFLAGS) $(COVERAGE_CFLAGS)" \
+		LDFLAGS="$(LDFLAGS) $(COVERAGE_LDFLAGS)"
 
 coverage-generate-lcov:
 	@echo "Creating Coverage HTML report with LCOV:"

Misc/NEWS.d/next/Build/2022-07-13-13-24-01.gh-issue-94759.dTLMod.rst

@@ -1,2 +1 @@
-The ``coverage-report`` Makefile target will now automatically use ``llvm-cov`` to generate a coverage report when using ``clang``.
-This provides more details about branch coverage and subexpressions than the existing ``gcc`` and ``lcov`` based ``coverage-report``.
+The ``coverage-report`` Makefile now supports both the ``gcc/lcov`` and ``clang/llvm-profdata`` stacks to generate coverage reports, and will select the correct one based on the compiler in use.