aboutsummaryrefslogtreecommitdiffstats
path: root/src/firemon/netstats.c
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-06-15 16:17:56 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-06-25 17:00:35 -0300
commitb408b20c70816ed16ed6343e36af3f9d26976752 (patch)
treede10b7793095605b3ee2ee6deae65e273c76d9e7 /src/firemon/netstats.c
parentgcov: add missing gcov.h includes (diff)
downloadfirejail-b408b20c70816ed16ed6343e36af3f9d26976752.tar.gz
firejail-b408b20c70816ed16ed6343e36af3f9d26976752.tar.zst
firejail-b408b20c70816ed16ed6343e36af3f9d26976752.zip
gcov: fix build failure with gcc 11.1.0
The build currently fails if gcov support is enabled: $ pacman -Q gcc gcc 11.1.0-1 $ ./configure --prefix=/usr --enable-apparmor --enable-gcov >/dev/null $ make >/dev/null [...] netstats.c: In function ‘netstats’: netstats.c:250:25: warning: implicit declaration of function ‘__gcov_flush’; did you mean ‘__gcov_dump’? [-Wimplicit-function-declaration] 250 | __gcov_flush(); | ^~~~~~~~~~~~ | __gcov_dump [...] /usr/bin/ld: netstats.o: in function `netstats': /tmp/firejail-git/src/firejail-git/src/firemon/netstats.c:250: undefined reference to `__gcov_flush' [...] collect2: error: ld returned 1 exit status make[1]: *** [Makefile:10: firemon] Error 1 make: *** [Makefile:42: src/firemon/firemon] Error 2 [...] This happens because __gcov_flush was removed on gcc 11.1.0[1] [2] [3]. See the following gcc commits: * d39f7dc8d5 ("Do locking for __gcov_dump and __gcov_reset as well.") * c0532db47d ("Use __gcov_dump and __gcov_reset in execv and fork context.") * 811b7636cb ("Remove __gcov_flush.") Its implementation did the following[4]: __gcov_lock (); __gcov_dump_int (); __gcov_reset_int (); __gcov_unlock (); As hinted in the commit messages above, the function is no longer needed because locking is now done inside each of __gcov_dump and __gcov_reset. So add an implementation of __gcov_flush (on a new gcov_wrapper.h file) for gcc >= 11.1.0, which just calls __gcov_dump and then __gcov_reset. Commands used to search and replace: $ git grep -Flz '#include <gcov.h>' -- '*.c' | xargs -0 -I '{}' sh -c \ "printf '%s\n' \"\`sed 's|<gcov\\.h>|\"../include/gcov_wrapper.h\"|' '{}'\`\" >'{}'" Note: This is the continuation of commit 31557e9c7 ("gcov: add missing gcov.h includes") / PR #4360. [1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d39f7dc8d558ca31a661b02d08ff090ce65e6652 [2] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=c0532db47d092430f8e8f497b2dc53343527bb13 [3] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=811b7636cb8c10f1a550a76242b5666c7ae36da2 [4] https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=libgcc/libgcov-interface.c;h=855e8612018d1c9caf90396a3271337aaefdb9b3#l86
Diffstat (limited to 'src/firemon/netstats.c')
-rw-r--r--src/firemon/netstats.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/firemon/netstats.c b/src/firemon/netstats.c
index 23d228e26..bc951aa26 100644
--- a/src/firemon/netstats.c
+++ b/src/firemon/netstats.c
@@ -25,7 +25,7 @@
25#include <unistd.h> 25#include <unistd.h>
26 26
27#ifdef HAVE_GCOV 27#ifdef HAVE_GCOV
28#include <gcov.h> 28#include "../include/gcov_wrapper.h"
29#endif 29#endif
30 30
31#define MAXBUF 4096 31#define MAXBUF 4096