Use macro defs for exports as done in python#31164

DinoV · DinoV · commit 1b2d106c5079 · 2023-10-06T12:56:20.000-07:00
diff --git a/Include/internal/pycore_mimalloc.h b/Include/internal/pycore_mimalloc.h
diff --git a/Include/mimalloc/mimalloc/types.h b/Include/mimalloc/mimalloc/types.h
@@ -524,7 +524,7 @@ struct mi_heap_s {
 #define MI_DEBUG_UNINIT     (0xD0)
 #endif
 #if !defined(MI_DEBUG_FREED)
-#define MI_DEBUG_FREED      (0xDD)
+#define MI_DEBUG_FREED      (0xDF)
 #endif
 #if !defined(MI_DEBUG_PADDING)
 #define MI_DEBUG_PADDING    (0xDE)
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -341,30 +341,14 @@ IO_OBJS=	\
 # mimalloc
 
 MIMALLOC_HEADERS= \
+                $(srcdir)/Include/internal/pycore_mimalloc.h \
 		$(srcdir)/Include/mimalloc/mimalloc.h \
 		$(srcdir)/Include/mimalloc/mimalloc/atomic.h \
 		$(srcdir)/Include/mimalloc/mimalloc/internal.h \
 		$(srcdir)/Include/mimalloc/mimalloc/prim.h \
 		$(srcdir)/Include/mimalloc/mimalloc/track.h \
 		$(srcdir)/Include/mimalloc/mimalloc/types.h
 
-MIMALLOC_OBJS= \
-		Objects/mimalloc/alloc-aligned.o \
-		Objects/mimalloc/alloc-posix.o \
-		Objects/mimalloc/alloc.o \
-		Objects/mimalloc/arena.o \
-		Objects/mimalloc/bitmap.o \
-		Objects/mimalloc/heap.o \
-		Objects/mimalloc/init.o \
-		Objects/mimalloc/options.o \
-		Objects/mimalloc/os.o \
-		Objects/mimalloc/page.o \
-		Objects/mimalloc/random.o \
-		Objects/mimalloc/segment.o \
-		Objects/mimalloc/segment-map.o \
-		Objects/mimalloc/stats.o \
-		Objects/mimalloc/prim/prim.o
-
 
 ##########################################################################
 # Parser
@@ -520,7 +504,6 @@ OBJECT_OBJS=	\
 		Objects/unicodectype.o \
 		Objects/unionobject.o \
 		Objects/weakrefobject.o \
-		@MIMALLOC_OBJS@ \
 		@PERF_TRAMPOLINE_OBJ@
 
 ##########################################################################
diff --git a/Objects/mimalloc/static.c b/Objects/mimalloc/static.c
@@ -0,0 +1,40 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2020, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
+#if defined(__sun)
+// same remarks as os.c for the static's context.
+#undef _XOPEN_SOURCE
+#undef _POSIX_C_SOURCE
+#endif
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+
+// For a static override we create a single object file
+// containing the whole library. If it is linked first
+// it will override all the standard library allocation
+// functions (on Unix's).
+#include "alloc.c"          // includes alloc-override.c
+#include "alloc-aligned.c"
+#include "alloc-posix.c"
+#include "arena.c"
+#include "bitmap.c"
+#include "heap.c"
+#include "init.c"
+#include "options.c"
+#include "os.c"
+#include "page.c"           // includes page-queue.c
+#include "random.c" 
+#include "segment.c"
+#include "segment-map.c"
+#include "stats.c"
+#include "prim/prim.c"
+#if MI_OSX_ZONE
+#include "prim/osx/alloc-override-zone.c"
+#endif
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
@@ -11,7 +11,8 @@
 #include <stdlib.h>               // malloc()
 #include <stdbool.h>
 #ifdef WITH_MIMALLOC
-#include "mimalloc.h"
+#include "pycore_mimalloc.h"
+#include "mimalloc/static.c"
 #include "mimalloc/internal.h"    // for stats
 #endif
 
diff --git a/Tools/build/smelly.py b/Tools/build/smelly.py
@@ -7,7 +7,7 @@
 import sysconfig
 
 
-ALLOWED_PREFIXES = ('Py', '_Py', 'mi_', '_mi_')
+ALLOWED_PREFIXES = ('Py', '_Py')
 if sys.platform == 'darwin':
     ALLOWED_PREFIXES += ('__Py',)
 
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -4548,13 +4548,11 @@ if test "$with_mimalloc" != no; then
   with_mimalloc=yes
   AC_DEFINE([WITH_MIMALLOC], [1], [Define if you want to compile in mimalloc memory allocator.])
   AC_SUBST([MIMALLOC_HEADERS], ['$(MIMALLOC_HEADERS)'])
-  AC_SUBST([MIMALLOC_OBJS], ['$(MIMALLOC_OBJS)'])
 fi
 
 AC_MSG_RESULT([$with_mimalloc])
 AC_SUBST([WITH_MIMALLOC])
 AC_SUBST([MIMALLOC_HEADERS])
-AC_SUBST([MIMALLOC_OBJS])
 
 # Check for Python-specific malloc support
 AC_MSG_CHECKING([for --with-pymalloc])
