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