@@ -1505,6 +1505,7 @@ BUILTIN_OBJS += builtin/write-tree.o
15051505# upstream unnecessarily (making merging in future changes easier).
15061506THIRD_PARTY_SOURCES += compat/inet_ntop.c
15071507THIRD_PARTY_SOURCES += compat/inet_pton.c
1508+ THIRD_PARTY_SOURCES += compat/mimalloc/%
15081509THIRD_PARTY_SOURCES += compat/nedmalloc/%
15091510THIRD_PARTY_SOURCES += compat/obstack.%
15101511THIRD_PARTY_SOURCES += compat/poll/%
@@ -2266,6 +2267,46 @@ ifdef USE_NED_ALLOCATOR
22662267 OVERRIDE_STRDUP = YesPlease
22672268endif
22682269
2270+ ifdef USE_MIMALLOC
2271+ MIMALLOC_OBJS = \
2272+ compat/mimalloc/alloc-aligned.o \
2273+ compat/mimalloc/alloc.o \
2274+ compat/mimalloc/arena.o \
2275+ compat/mimalloc/bitmap.o \
2276+ compat/mimalloc/heap.o \
2277+ compat/mimalloc/init.o \
2278+ compat/mimalloc/libc.o \
2279+ compat/mimalloc/options.o \
2280+ compat/mimalloc/os.o \
2281+ compat/mimalloc/page.o \
2282+ compat/mimalloc/random.o \
2283+ compat/mimalloc/prim/prim.o \
2284+ compat/mimalloc/segment.o \
2285+ compat/mimalloc/segment-map.o \
2286+ compat/mimalloc/stats.o
2287+
2288+ COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11
2289+ COMPAT_OBJS += $(MIMALLOC_OBJS)
2290+
2291+ $(MIMALLOC_OBJS ) : COMPAT_CFLAGS += -DBANNED_H
2292+
2293+ $(MIMALLOC_OBJS ) : COMPAT_CFLAGS += \
2294+ -DMI_WIN_USE_FLS \
2295+ -Wno-attributes \
2296+ -Wno-unknown-pragmas \
2297+ -Wno-unused-function \
2298+ -Wno-array-bounds
2299+
2300+ ifdef DEVELOPER
2301+ $(MIMALLOC_OBJS ) : COMPAT_CFLAGS += \
2302+ -Wno-pedantic \
2303+ -Wno-declaration-after-statement \
2304+ -Wno-old-style-definition \
2305+ -Wno-missing-prototypes \
2306+ -Wno-implicit-function-declaration
2307+ endif
2308+ endif
2309+
22692310ifdef OVERRIDE_STRDUP
22702311 COMPAT_CFLAGS += -DOVERRIDE_STRDUP
22712312 COMPAT_OBJS += compat/strdup.o
0 commit comments