Make crt0 an external submodule

topjohnwu · Feb 27, 2024 · 8f7d2e3 · 8f7d2e3
1 parent be433fa
commit 8f7d2e3
Show file tree

Hide file tree

Showing 37 changed files with 8 additions and 16,312 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -34,6 +34,9 @@
 [submodule "system_properties"]
 	path = native/src/external/system_properties
 	url = https://github.com/topjohnwu/system_properties.git
+[submodule "crt0"]
+	path = native/src/external/crt0
+	url = https://github.com/topjohnwu/crt0.git
 [submodule "termux-elf-cleaner"]
 	path = tools/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner.git
diff --git a/native/src/Android.mk b/native/src/Android.mk
@@ -79,8 +79,6 @@ LOCAL_SRC_FILES := \
 LOCAL_LDFLAGS := -static -T src/lto_fix.lds
 
 ifdef B_CRT0
-# -lc -lm is hardcoded in this variable, disable it
-TARGET_LDLIBS :=
 LOCAL_STATIC_LIBRARIES += crt0
 LOCAL_LDFLAGS :=
 endif
@@ -172,7 +170,6 @@ include $(BUILD_STATIC_LIBRARY)
 include src/Android-rs.mk
 include src/base/Android.mk
 include src/external/Android.mk
-include src/crt0/Android.mk
 
 ifdef B_BB
 

diff --git a/native/src/Application.mk b/native/src/Application.mk
@@ -12,7 +12,6 @@ ifdef B_CRT0
 
 # Disable all security and debugging features
 APP_CFLAGS       +=	-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-stack-protector -U_FORTIFY_SOURCE
-APP_LDFLAGS		 += -Wl,-wrap,abort_message
 # Override output folder to make sure all dependencies are rebuilt with new CFLAGS
 NDK_APP_OUT      := ./obj/nolibc
 

diff --git a/native/src/crt0/Android.mk b/native/src/crt0/Android.mk
diff --git a/native/src/crt0/bionic/dirent.cpp b/native/src/crt0/bionic/dirent.cpp
diff --git a/native/src/crt0/bionic/private/ErrnoRestorer.h b/native/src/crt0/bionic/private/ErrnoRestorer.h
diff --git a/native/src/crt0/bionic/private/bionic_asm.h b/native/src/crt0/bionic/private/bionic_asm.h