[master] 9598facea Closer to getting GCOV back on panics: Now try global __gcov_flush()

Poul-Henning Kamp phk at FreeBSD.org
Wed Jun 10 04:46:07 UTC 2020


commit 9598facea5a8d7f59c4a23bcf78a94ac404ae378
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jun 10 04:44:56 2020 +0000

    Closer to getting GCOV back on panics:  Now try global __gcov_flush()

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 2623fa422..c59f35c53 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -64,7 +64,7 @@
  */
 
 #ifdef GCOVING
-    int __llvm_gcov_flush(void);
+    int __gcov_flush(void);
 #endif
 
 static struct vsb pan_vsb_storage, *pan_vsb;
@@ -816,7 +816,7 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
 	VSB_putc(pan_vsb, '\0');	/* NUL termination */
 
 #ifdef GCOVING
-	__llvm_gcov_flush();
+	__gcov_flush();
 #endif
 	abort();
 }
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 678c43f9e..18b6202b2 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -64,7 +64,7 @@ static const struct cli_cmd_desc *cmds[] = {
 };
 
 #ifdef GCOVING
-    int __llvm_gcov_flush(void);
+    int __gcov_flush(void);
 #endif
 
 static const int ncmds = sizeof cmds / sizeof cmds[0];
@@ -113,7 +113,7 @@ mcf_panic(struct cli *cli, const char * const *av, void *priv)
 	(void)av;
 	(void)priv;
 #ifdef GCOVING
-	__llvm_gcov_flush();
+	__gcov_flush();
 #endif
 	AZ(strcmp("", "You asked for it"));
 	/* NOTREACHED */


More information about the varnish-commit mailing list