-# ToDo: use THREADS=$threads, see #1558
-make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
+if [ "$hpc" = 1 ]
+then
+ # XXX With threads we'd need to give a different tix file to each thread
+ # and then sum them up at the end
+ threads=1
+ HPCTIXFILE=$thisdir/testsuite/hpc_output/ghc.tix
+ export HPCTIXFILE
+ rm -f $HPCTIXFILE
+fi
+
+make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+
+if [ "$hpc" = 1 ]
+then
+ utils/hpc/hpc markup --hpcdir=. --srcdir=compiler --srcdir=testsuite/hpc_output --destdir=testsuite/hpc_output testsuite/hpc_output/ghc.tix
+fi