@@ -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/%
@@ -2263,6 +2264,46 @@ ifdef USE_NED_ALLOCATOR
22632264 OVERRIDE_STRDUP = YesPlease
22642265endif
22652266
2267+ ifdef USE_MIMALLOC
2268+ MIMALLOC_OBJS = \
2269+ compat/mimalloc/alloc-aligned.o \
2270+ compat/mimalloc/alloc.o \
2271+ compat/mimalloc/arena.o \
2272+ compat/mimalloc/bitmap.o \
2273+ compat/mimalloc/heap.o \
2274+ compat/mimalloc/init.o \
2275+ compat/mimalloc/libc.o \
2276+ compat/mimalloc/options.o \
2277+ compat/mimalloc/os.o \
2278+ compat/mimalloc/page.o \
2279+ compat/mimalloc/random.o \
2280+ compat/mimalloc/prim/prim.o \
2281+ compat/mimalloc/segment.o \
2282+ compat/mimalloc/segment-map.o \
2283+ compat/mimalloc/stats.o
2284+
2285+ COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11
2286+ COMPAT_OBJS += $(MIMALLOC_OBJS)
2287+
2288+ $(MIMALLOC_OBJS ) : COMPAT_CFLAGS += -DBANNED_H
2289+
2290+ $(MIMALLOC_OBJS ) : COMPAT_CFLAGS += \
2291+ -DMI_WIN_USE_FLS \
2292+ -Wno-attributes \
2293+ -Wno-unknown-pragmas \
2294+ -Wno-unused-function \
2295+ -Wno-array-bounds
2296+
2297+ ifdef DEVELOPER
2298+ $(MIMALLOC_OBJS ) : COMPAT_CFLAGS += \
2299+ -Wno-pedantic \
2300+ -Wno-declaration-after-statement \
2301+ -Wno-old-style-definition \
2302+ -Wno-missing-prototypes \
2303+ -Wno-implicit-function-declaration
2304+ endif
2305+ endif
2306+
22662307ifdef OVERRIDE_STRDUP
22672308 COMPAT_CFLAGS += -DOVERRIDE_STRDUP
22682309 COMPAT_OBJS += compat/strdup.o
0 commit comments