mingw: drop the build-system plumbing for nedmalloc
With the previous commit removing every opt-in, the build-system plumbing for nedmalloc has nothing left to switch on. Remove it so that the upcoming deletion of the compat/nedmalloc/ tree is a pure file removal. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
c9eb040e4b
commit
cefcada1d3
17
Makefile
17
Makefile
|
|
@ -283,13 +283,9 @@ include shared.mak
|
|||
# Define SKIP_DASHED_BUILT_INS if you do not need the dashed versions of the
|
||||
# built-ins to be linked/copied at all.
|
||||
#
|
||||
# Define USE_NED_ALLOCATOR if you want to replace the platforms default
|
||||
# memory allocators with the nedmalloc allocator written by Niall Douglas.
|
||||
#
|
||||
# Define OVERRIDE_STRDUP to override the libc version of strdup(3).
|
||||
# This is necessary when using a custom allocator in order to avoid
|
||||
# crashes due to allocation and free working on different 'heaps'.
|
||||
# It's defined automatically if USE_NED_ALLOCATOR is set.
|
||||
#
|
||||
# Define NO_REGEX if your C library lacks regex support with REG_STARTEND
|
||||
# feature.
|
||||
|
|
@ -1511,7 +1507,6 @@ BUILTIN_OBJS += builtin/write-tree.o
|
|||
# upstream unnecessarily (making merging in future changes easier).
|
||||
THIRD_PARTY_SOURCES += compat/inet_ntop.c
|
||||
THIRD_PARTY_SOURCES += compat/inet_pton.c
|
||||
THIRD_PARTY_SOURCES += compat/nedmalloc/%
|
||||
THIRD_PARTY_SOURCES += compat/obstack.%
|
||||
THIRD_PARTY_SOURCES += compat/poll/%
|
||||
THIRD_PARTY_SOURCES += compat/regex/%
|
||||
|
|
@ -2267,12 +2262,6 @@ ifdef NATIVE_CRLF
|
|||
BASIC_CFLAGS += -DNATIVE_CRLF
|
||||
endif
|
||||
|
||||
ifdef USE_NED_ALLOCATOR
|
||||
COMPAT_CFLAGS += -Icompat/nedmalloc
|
||||
COMPAT_OBJS += compat/nedmalloc/nedmalloc.o
|
||||
OVERRIDE_STRDUP = YesPlease
|
||||
endif
|
||||
|
||||
ifdef OVERRIDE_STRDUP
|
||||
COMPAT_CFLAGS += -DOVERRIDE_STRDUP
|
||||
COMPAT_OBJS += compat/strdup.o
|
||||
|
|
@ -2983,12 +2972,6 @@ compat/regex/regex.sp compat/regex/regex.o: EXTRA_CPPFLAGS = \
|
|||
-DGAWK -DNO_MBSUPPORT
|
||||
endif
|
||||
|
||||
ifdef USE_NED_ALLOCATOR
|
||||
compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
|
||||
-DNDEBUG -DREPLACE_SYSTEM_ALLOCATOR
|
||||
compat/nedmalloc/nedmalloc.sp: SP_EXTRA_FLAGS += -Wno-non-pointer-null
|
||||
endif
|
||||
|
||||
headless-git.o: compat/win32/headless.c GIT-CFLAGS
|
||||
$(QUIET_CC)$(CC) $(ALL_CFLAGS) $(COMPAT_CFLAGS) \
|
||||
-fno-stack-protector -o $@ -c -Wall -Wwrite-strings $<
|
||||
|
|
|
|||
|
|
@ -491,7 +491,6 @@ ifeq ($(uname_S),Windows)
|
|||
USE_WIN32_IPC = YesPlease
|
||||
USE_WIN32_MMAP = YesPlease
|
||||
MMAP_PREVENTS_DELETE = UnfortunatelyYes
|
||||
# USE_NED_ALLOCATOR = YesPlease
|
||||
UNRELIABLE_FSTAT = UnfortunatelyYes
|
||||
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
|
||||
NO_REGEX = YesPlease
|
||||
|
|
|
|||
|
|
@ -202,7 +202,6 @@ cat >.vscode/settings.json.new <<\EOF ||
|
|||
"\\bUSE_STDEV\\b",
|
||||
"\\Wchar *\\*\\W*utfs\\W",
|
||||
"cURL's",
|
||||
"nedmalloc'ed",
|
||||
"ntifs\\.h",
|
||||
],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -698,7 +698,6 @@ third_party_excludes = [
|
|||
':!contrib',
|
||||
':!compat/inet_ntop.c',
|
||||
':!compat/inet_pton.c',
|
||||
':!compat/nedmalloc',
|
||||
':!compat/obstack.*',
|
||||
':!compat/poll',
|
||||
':!compat/regex',
|
||||
|
|
|
|||
Loading…
Reference in New Issue