Merge pull request #1145 from darlinghq/relocate_libmalloc

Relocate `libmalloc` Into Seperate Repo

.gitmodules

@@ -372,3 +372,6 @@
 [submodule "src/external/pyobjc"]
 	path = src/external/pyobjc
 	url = ../darling-pyobjc.git
+[submodule "src/external/libmalloc"]
+	path = src/external/libmalloc
+	url = https://github.com/darlinghq/darling-libmalloc.git

Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/malloc/_malloc.h

@@ -1 +1 @@
-../../../../../../../../../src/libmalloc/include/malloc/_malloc.h
+../../../../../../../../../src/external/libmalloc/include/malloc/_malloc.h

Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/malloc/malloc.h

@@ -1 +1 @@
-../../../../../../../../../src/libmalloc/include/malloc/malloc.h
+../../../../../../../../../src/external/libmalloc/include/malloc/malloc.h

Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/malloc_implementation.h

@@ -1 +1 @@
-../../../../../../../../src/libmalloc/private/malloc_implementation.h
+../../../../../../../../src/external/libmalloc/private/malloc_implementation.h

Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/malloc_private.h

@@ -0,0 +1 @@
+../../../../../../../../src/external/libmalloc/private/malloc_private.h

Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/stack_logging.h

@@ -1 +1 @@
-../../../../../../../../src/libmalloc/private/stack_logging.h
+../../../../../../../../src/external/libmalloc/private/stack_logging.h

Developer/symlinks.sh

@@ -18,7 +18,7 @@ ln -sf "$BUILD/src/libremovefile/libremovefile.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/copyfile/libcopyfile.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/libsystem_coreservices/libsystem_coreservices.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/external/coretls/libsystem_coretls.dylib" "$LIBS/system"
-ln -sf "$BUILD/src/libmalloc/libsystem_malloc.dylib" "$LIBS/system"
+ln -sf "$BUILD/src/external/libmalloc/libsystem_malloc.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/libc/libsystem_c.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/kernel/libsystem_kernel.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/keymgr/libkeymgr.dylib" "$LIBS/system"

cmake/use_ld64.cmake

@@ -40,7 +40,7 @@ FUNCTION(use_ld64 target)
 -Wl,-dylib_file,/usr/lib/libresolv.9.dylib:${CMAKE_BINARY_DIR}/src/libresolv/libresolv.9.dylib \
 -Wl,-dylib_file,/usr/lib/system/libxpc.dylib:${CMAKE_BINARY_DIR}/src/external/libxpc/libxpc_firstpass.dylib \
 -Wl,-dylib_file,/usr/lib/libc++.1.dylib:${CMAKE_BINARY_DIR}/src/external/libcxx/libc++.1.dylib \
--Wl,-dylib_file,/usr/lib/system/libsystem_malloc.dylib:${CMAKE_BINARY_DIR}/src/libmalloc/libsystem_malloc_firstpass.dylib \
+-Wl,-dylib_file,/usr/lib/system/libsystem_malloc.dylib:${CMAKE_BINARY_DIR}/src/external/libmalloc/libsystem_malloc_firstpass.dylib \
 -Wl,-dylib_file,/usr/lib/libobjc.A.dylib:${CMAKE_BINARY_DIR}/src/external/objc4/runtime/libobjc.A.dylib \
 -Wl,-dylib_file,/usr/lib/libicucore.A.dylib:${CMAKE_BINARY_DIR}/src/external/icu/icuSources/libicucore.A.dylib \
 -Wl,-dylib_file,/usr/lib/libncurses.5.4.dylib:${CMAKE_BINARY_DIR}/src/ncurses/ncurses/libncurses.5.4.dylib \

src/CMakeLists.txt

@@ -132,7 +132,7 @@ add_subdirectory(libgcc)
 add_subdirectory(copyfile)
 add_subdirectory(libinfo)
 add_subdirectory(quarantine)
-add_subdirectory(libmalloc)
+add_subdirectory(external/libmalloc)
 add_subdirectory(libunwind)
 add_subdirectory(networkextension)
 add_subdirectory(libsystem)

src/libc/CMakeLists.txt

@@ -30,8 +30,8 @@ include_directories(
 	"${CMAKE_CURRENT_SOURCE_DIR}/fbsdcompat"
 	"${CMAKE_CURRENT_SOURCE_DIR}/darwin"
 	"${CMAKE_CURRENT_SOURCE_DIR}/derived"
-	"${CMAKE_CURRENT_SOURCE_DIR}/../libmalloc/src"
-	"${CMAKE_CURRENT_SOURCE_DIR}/../libmalloc/private"
+	"${CMAKE_CURRENT_SOURCE_DIR}/../external/libmalloc/src"
+	"${CMAKE_CURRENT_SOURCE_DIR}/../external/libmalloc/private"
 	"${CMAKE_CURRENT_SOURCE_DIR}/locale"
 	"${CMAKE_CURRENT_SOURCE_DIR}/gen"
 	"${CMAKE_CURRENT_SOURCE_DIR}/locale/FreeBSD"