From: Willy Tarreau <w@1wt.eu>
Date: Sun, 10 Jul 2022 11:09:54 +0000 (+0200)
Subject: BUILD: debug: silence warning on gcc-5
X-Git-Tag: v2.7-dev2~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=481edaceb8f1cb2fa817ca4c4d6dec12edef17c9;p=thirdparty%2Fhaproxy.git

BUILD: debug: silence warning on gcc-5

In 2.6, 8a0fd3a36 ("BUILD: debug: work around gcc-12 excessive
-Warray-bounds warnings") disabled some warnings that were reported
around the the BUG() statement. But the -Wnull-dereference warning
isn't known from gcc-5, it only arrived in gcc-6, hence makes gcc-5
complain loudly that it doesn't know this directive. Let's just
condition this one to gcc-6.
---

diff --git a/include/haproxy/bug.h b/include/haproxy/bug.h
index 6a75177e12..e6303fd3cb 100644
--- a/include/haproxy/bug.h
+++ b/include/haproxy/bug.h
@@ -45,7 +45,9 @@ static inline __attribute((always_inline)) void ha_crash_now(void)
 #if __GNUC_PREREQ__(5, 0)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
+#if __GNUC_PREREQ__(6, 0)
 #pragma GCC diagnostic ignored "-Wnull-dereference"
+#endif
 #endif
 	*(volatile char *)1 = 0;
 #if __GNUC_PREREQ__(5, 0)