From 418f1b6e463aa2c75254287636d8309a6543f159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Thu, 30 Jan 2025 11:54:03 +0100
Subject: [PATCH] 2025-01-30 11:54 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * src/vm/Makefile   * src/vm/vmmt/Makefile   *
 src/vm/dlmalloc.c     * In GCC builds >= 6.1 use          #pragma GCC
 diagnostic ignored "-Wnull-dereference"       instead of foringg
 HB_FM_STD_ALLOC

---
 ChangeLog.txt        | 8 ++++++++
 src/vm/Makefile      | 4 ----
 src/vm/dlmalloc.c    | 9 +++++++++
 src/vm/vmmt/Makefile | 4 ----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f8fb1ccfcb..4b6652cae5 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,14 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2025-01-30 11:54 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/vm/Makefile
+  * src/vm/vmmt/Makefile
+  * src/vm/dlmalloc.c
+    * In GCC builds >= 6.1 use
+         #pragma GCC diagnostic ignored "-Wnull-dereference"
+      instead of foringg HB_FM_STD_ALLOC
+
 2025-01-30 04:23 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbzebra/datamtrx.c
     * added '#pragma GCC diagnostic ignored "-Warray-bounds"'
diff --git a/src/vm/Makefile b/src/vm/Makefile
index cd2743563e..15d6a32be0 100644
--- a/src/vm/Makefile
+++ b/src/vm/Makefile
@@ -132,10 +132,6 @@ ifneq ($(HB_MT),no)
    DIRS += vmmt
 endif
 
-ifeq ($(HB_BUILD_TEST),strict)
-   HB_CFLAGS += -DHB_FM_STD_ALLOC
-endif
-
 include $(TOP)$(ROOT)config/lib.mk
 ifneq ($(DIRS),)
    include $(TOP)$(ROOT)config/dir.mk
diff --git a/src/vm/dlmalloc.c b/src/vm/dlmalloc.c
index 48b557f02f..349cae8d37 100644
--- a/src/vm/dlmalloc.c
+++ b/src/vm/dlmalloc.c
@@ -1460,6 +1460,11 @@ DLMALLOC_EXPORT int mspace_mallopt(int, int);
 #ifdef _MSC_VER
 #pragma warning( disable : 4146 ) /* no "unsigned" warnings */
 #endif /* _MSC_VER */
+#if defined(__GNUC__) && \
+      (__GNUC__ > 6 || (__GNUC__ == 6 && __GNUC_MINOR__ >= 1))
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnull-dereference"
+#endif
 #if !NO_MALLOC_STATS
 #include <stdio.h>       /* for printing in malloc_stats */
 #endif /* NO_MALLOC_STATS */
@@ -6058,6 +6063,10 @@ int mspace_mallopt(int param_number, int value) {
 
 #endif /* MSPACES */
 
+#if defined(__GNUC__) && \
+      (__GNUC__ > 6 || (__GNUC__ == 6 && __GNUC_MINOR__ >= 1))
+#pragma GCC diagnostic pop
+#endif
 
 /* -------------------- Alternative MORECORE functions ------------------- */
 
diff --git a/src/vm/vmmt/Makefile b/src/vm/vmmt/Makefile
index deb462ae50..564c8007d4 100644
--- a/src/vm/vmmt/Makefile
+++ b/src/vm/vmmt/Makefile
@@ -85,8 +85,4 @@ LIBNAME := hbvmmt
 
 HB_CFLAGS += -DHB_MT_VM
 
-ifeq ($(HB_BUILD_TEST),strict)
-   HB_CFLAGS += -DHB_FM_STD_ALLOC
-endif
-
 include $(TOP)$(ROOT)config/lib.mk