Skip to content

Commit eb749d2

Browse files
committed
fixup! Merge pull request #4013 from dscho/mimalloc
In preparation for vendoring in a newer version of mimalloc, let's drop the current version of the topic. This reverts commit 8f9a61f, reversing changes made to 145a228. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 8f9a61f commit eb749d2

27 files changed

+8
-12787
lines changed

Makefile

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,6 @@ BUILTIN_OBJS += builtin/write-tree.o
13281328
# upstream unnecessarily (making merging in future changes easier).
13291329
THIRD_PARTY_SOURCES += compat/inet_ntop.c
13301330
THIRD_PARTY_SOURCES += compat/inet_pton.c
1331-
THIRD_PARTY_SOURCES += compat/mimalloc/%
13321331
THIRD_PARTY_SOURCES += compat/nedmalloc/%
13331332
THIRD_PARTY_SOURCES += compat/obstack.%
13341333
THIRD_PARTY_SOURCES += compat/poll/%
@@ -2052,39 +2051,6 @@ ifdef USE_NED_ALLOCATOR
20522051
OVERRIDE_STRDUP = YesPlease
20532052
endif
20542053

2055-
ifdef USE_MIMALLOC
2056-
MIMALLOC_OBJS = \
2057-
compat/mimalloc/alloc-aligned.o \
2058-
compat/mimalloc/alloc.o \
2059-
compat/mimalloc/arena.o \
2060-
compat/mimalloc/bitmap.o \
2061-
compat/mimalloc/heap.o \
2062-
compat/mimalloc/init.o \
2063-
compat/mimalloc/options.o \
2064-
compat/mimalloc/os.o \
2065-
compat/mimalloc/page.o \
2066-
compat/mimalloc/random.o \
2067-
compat/mimalloc/segment.o \
2068-
compat/mimalloc/segment-cache.o \
2069-
compat/mimalloc/stats.o
2070-
2071-
COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11
2072-
COMPAT_OBJS += $(MIMALLOC_OBJS)
2073-
2074-
$(MIMALLOC_OBJS): COMPAT_CFLAGS += -DBANNED_H
2075-
2076-
ifdef DEVELOPER
2077-
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2078-
-Wno-attributes \
2079-
-Wno-pedantic \
2080-
-Wno-unknown-pragmas \
2081-
-Wno-declaration-after-statement \
2082-
-Wno-old-style-definition \
2083-
-Wno-missing-prototypes \
2084-
-Wno-array-bounds
2085-
endif
2086-
endif
2087-
20882054
ifdef OVERRIDE_STRDUP
20892055
COMPAT_CFLAGS += -DOVERRIDE_STRDUP
20902056
COMPAT_OBJS += compat/strdup.o

compat/mimalloc/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

compat/mimalloc/alloc-aligned.c

Lines changed: 0 additions & 260 deletions
This file was deleted.

0 commit comments

Comments
 (0)