MihaelIsaev · April 9, 2025 17:22
diff --git a/Instruction.md b/Instruction.md
diff --git a/mimalloc_v2.1.7.diff b/mimalloc_v2.1.7.diff
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index bcfe91d8..a5473c69 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -481,7 +481,6 @@ endif()
 # static library
 if (MI_BUILD_STATIC)
   add_library(mimalloc-static STATIC ${mi_sources})
 -  set_property(TARGET mimalloc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
   target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB)
   target_compile_options(mimalloc-static PRIVATE ${mi_cflags} ${mi_cflags_static})
   target_link_libraries(mimalloc-static PRIVATE ${mi_libraries})
 diff --git a/src/alloc-override.c b/src/alloc-override.c
 index 12837cdd..e5bcda22 100644
 --- a/src/alloc-override.c
 +++ b/src/alloc-override.c
 @@ -191,7 +191,7 @@ typedef void* mi_nothrow_t;
   void* operator new[](std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
   #endif
 
 -#elif (defined(__GNUC__) || defined(__clang__))
 +#elif (defined(__GNUC__) || defined(__clang__) || defined(do_we_need_this))
   // ------------------------------------------------------
   // Override by defining the mangled C++ names of the operators (as
   // used by GCC and CLang).
 @@ -289,7 +289,7 @@ mi_decl_weak int reallocarr(void* p, size_t count, size_t size)    { return mi_r
   void  __libc_free(void* p)                            MI_FORWARD0(mi_free, p)
   void* __libc_memalign(size_t alignment, size_t size)  { return mi_memalign(alignment, size); }
 
 -#elif defined(__GLIBC__) && defined(__linux__)
 +#elif defined(__linux__) //defined(__GLIBC__) && defined(__linux__)
   // forward __libc interface (needed for glibc-based Linux distributions)
   void* __libc_malloc(size_t size)                      MI_FORWARD1(mi_malloc,size)
   void* __libc_calloc(size_t count, size_t size)        MI_FORWARD2(mi_calloc,count,size)

diff --git a/patch_musl.sh b/patch_musl.sh
 #!/bin/bash
 set -euo pipefail

 echo "Looking for libc.a in current directory..."
 LIBC_PATH="./libc.a"
 if [ ! -f "$LIBC_PATH" ]; then
    echo "Error: libc.a not found in the current directory."
    exit 1
 fi

 echo "Backing up original libc.a to libc.a.bak"
 cp "$LIBC_PATH" libc.a.bak

 echo "Building mimalloc static library..."
 if [ ! -d mimalloc ]; then
    echo "Cloning mimalloc..."
    git clone https://github.com/microsoft/mimalloc
 else
    echo "Using existing mimalloc directory."
 fi
 cd mimalloc

 git fetch --tags
 git checkout tags/v2.1.7

 # Clean up any previous modifications
 git reset --hard
 git clean -fd

 # Check if patch is already applied
 if git apply --check ../mimalloc_v2.1.7.diff 2>/dev/null; then
    echo "Applying patch..."
    git apply ../mimalloc_v2.1.7.diff
 else
    echo "Patch already applied or incompatible. Skipping patch step."
 fi

 cmake -Bout -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DMI_BUILD_SHARED=OFF -DMI_BUILD_OBJECT=OFF -DMI_BUILD_TESTS=OFF .
 cmake --build out

 echo "Patching musl libc.a with mimalloc..."
 cp ./out/libmimalloc.a .
 cp "$OLDPWD/libc.a" .

 # Remove musl malloc-related object files
 for symbol in aligned_alloc calloc donate free free libc_calloc lite_malloc malloc malloc_usable_size memalign posix_memalign realloc realloc reallocarray valloc strdup strndup; do
    llvm-ar -d libc.a "${symbol}.lo" || true
 done

 # Verify removals
 for symbol in aligned_alloc calloc donate free libc_calloc lite_malloc malloc malloc_usable_size memalign posix_memalign realloc reallocarray valloc strdup strndup; do
    if llvm-ar -t libc.a | grep -q "${symbol}.lo"; then
        echo "Warning: ${symbol}.lo still exists in libc.a"
    fi
 done

 # Inject mimalloc object files
 llvm-ar -x libmimalloc.a
 llvm-ar -r libc.a *.o

 echo "Replacing original libc.a with patched version..."
 cp libc.a "$OLDPWD/libc.a"

 cd "$OLDPWD"
 rm -rf mimalloc

 echo "✅ Done! libc.a has been patched with mimalloc."
	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index bcfe91d8..a5473c69 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -481,7 +481,6 @@ endif()
	# static library
	if (MI_BUILD_STATIC)
	add_library(mimalloc-static STATIC ${mi_sources})
	- set_property(TARGET mimalloc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
	target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB)
	target_compile_options(mimalloc-static PRIVATE ${mi_cflags} ${mi_cflags_static})
	target_link_libraries(mimalloc-static PRIVATE ${mi_libraries})
	diff --git a/src/alloc-override.c b/src/alloc-override.c
	index 12837cdd..e5bcda22 100644
	--- a/src/alloc-override.c
	+++ b/src/alloc-override.c
	@@ -191,7 +191,7 @@ typedef void* mi_nothrow_t;
	void* operator new[](std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
	#endif

	-#elif (defined(__GNUC__) \|\| defined(__clang__))
	+#elif (defined(__GNUC__) \|\| defined(__clang__) \|\| defined(do_we_need_this))
	// ------------------------------------------------------
	// Override by defining the mangled C++ names of the operators (as
	// used by GCC and CLang).
	@@ -289,7 +289,7 @@ mi_decl_weak int reallocarr(void* p, size_t count, size_t size) { return mi_r
	void __libc_free(void* p) MI_FORWARD0(mi_free, p)
	void* __libc_memalign(size_t alignment, size_t size) { return mi_memalign(alignment, size); }

	-#elif defined(__GLIBC__) && defined(__linux__)
	+#elif defined(__linux__) //defined(__GLIBC__) && defined(__linux__)
	// forward __libc interface (needed for glibc-based Linux distributions)
	void* __libc_malloc(size_t size) MI_FORWARD1(mi_malloc,size)
	void* __libc_calloc(size_t count, size_t size) MI_FORWARD2(mi_calloc,count,size)
	#!/bin/bash
	set -euo pipefail

	echo "Looking for libc.a in current directory..."
	LIBC_PATH="./libc.a"
	if [ ! -f "$LIBC_PATH" ]; then
	echo "Error: libc.a not found in the current directory."
	exit 1
	fi

	echo "Backing up original libc.a to libc.a.bak"
	cp "$LIBC_PATH" libc.a.bak

	echo "Building mimalloc static library..."
	if [ ! -d mimalloc ]; then
	echo "Cloning mimalloc..."
	git clone https://github.com/microsoft/mimalloc
	else
	echo "Using existing mimalloc directory."
	fi
	cd mimalloc

	git fetch --tags
	git checkout tags/v2.1.7

	# Clean up any previous modifications
	git reset --hard
	git clean -fd

	# Check if patch is already applied
	if git apply --check ../mimalloc_v2.1.7.diff 2>/dev/null; then
	echo "Applying patch..."
	git apply ../mimalloc_v2.1.7.diff
	else
	echo "Patch already applied or incompatible. Skipping patch step."
	fi

	cmake -Bout -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DMI_BUILD_SHARED=OFF -DMI_BUILD_OBJECT=OFF -DMI_BUILD_TESTS=OFF .
	cmake --build out

	echo "Patching musl libc.a with mimalloc..."
	cp ./out/libmimalloc.a .
	cp "$OLDPWD/libc.a" .

	# Remove musl malloc-related object files
	for symbol in aligned_alloc calloc donate free free libc_calloc lite_malloc malloc malloc_usable_size memalign posix_memalign realloc realloc reallocarray valloc strdup strndup; do
	llvm-ar -d libc.a "${symbol}.lo" \|\| true
	done

	# Verify removals
	for symbol in aligned_alloc calloc donate free libc_calloc lite_malloc malloc malloc_usable_size memalign posix_memalign realloc reallocarray valloc strdup strndup; do
	if llvm-ar -t libc.a \| grep -q "${symbol}.lo"; then
	echo "Warning: ${symbol}.lo still exists in libc.a"
	fi
	done

	# Inject mimalloc object files
	llvm-ar -x libmimalloc.a
	llvm-ar -r libc.a *.o

	echo "Replacing original libc.a with patched version..."
	cp libc.a "$OLDPWD/libc.a"

	cd "$OLDPWD"
	rm -rf mimalloc

	echo "✅ Done! libc.a has been patched with mimalloc."