From a4f008fde52d6772b2eca3bd765c21eea5849cbc Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 24 Feb 2024 03:41:22 -0800
Subject: [PATCH] Reorganize files

---
 native/src/crt0/Android.mk                                    | 4 ++--
 native/src/crt0/{ => bionic}/dirent.cpp                       | 0
 native/src/crt0/{syscall => bionic}/private/bionic_asm.h      | 0
 native/src/crt0/{syscall => bionic}/private/bionic_asm_arm.h  | 0
 .../src/crt0/{syscall => bionic}/private/bionic_asm_arm64.h   | 0
 .../src/crt0/{syscall => bionic}/private/bionic_asm_riscv64.h | 0
 native/src/crt0/{syscall => bionic}/private/bionic_asm_x86.h  | 0
 .../src/crt0/{syscall => bionic}/private/bionic_asm_x86_64.h  | 0
 native/src/crt0/{syscall => bionic}/syscall-arm.S             | 0
 native/src/crt0/{syscall => bionic}/syscall-arm64.S           | 0
 native/src/crt0/{syscall => bionic}/syscall-x86.S             | 0
 native/src/crt0/{syscall => bionic}/syscall-x86_64.S          | 0
 12 files changed, 2 insertions(+), 2 deletions(-)
 rename native/src/crt0/{ => bionic}/dirent.cpp (100%)
 rename native/src/crt0/{syscall => bionic}/private/bionic_asm.h (100%)
 rename native/src/crt0/{syscall => bionic}/private/bionic_asm_arm.h (100%)
 rename native/src/crt0/{syscall => bionic}/private/bionic_asm_arm64.h (100%)
 rename native/src/crt0/{syscall => bionic}/private/bionic_asm_riscv64.h (100%)
 rename native/src/crt0/{syscall => bionic}/private/bionic_asm_x86.h (100%)
 rename native/src/crt0/{syscall => bionic}/private/bionic_asm_x86_64.h (100%)
 rename native/src/crt0/{syscall => bionic}/syscall-arm.S (100%)
 rename native/src/crt0/{syscall => bionic}/syscall-arm64.S (100%)
 rename native/src/crt0/{syscall => bionic}/syscall-x86.S (100%)
 rename native/src/crt0/{syscall => bionic}/syscall-x86_64.S (100%)

diff --git a/native/src/crt0/Android.mk b/native/src/crt0/Android.mk
index c76c1833d..261062e01 100644
--- a/native/src/crt0/Android.mk
+++ b/native/src/crt0/Android.mk
@@ -9,14 +9,14 @@ LOCAL_compiler_rt := $(shell $(TARGET_CC) -target $(LLVM_TRIPLE)$(TARGET_PLATFOR
 LOCAL_EXPORT_LDFLAGS := -static -nostartfiles -nodefaultlibs $(LOCAL_compiler_rt) -Wl,--error-limit=0
 
 LOCAL_SRC_FILES := \
-    dirent.cpp \
 	malloc.c \
 	mem.c \
 	misc.c \
 	nolibc.c \
 	stdio.c \
 	syscall.c \
-	syscall/syscall-$(TARGET_ARCH).S \
+	bionic/dirent.cpp \
+	bionic/syscall-$(TARGET_ARCH).S \
 	tinystdio/tinystdio.c
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/native/src/crt0/dirent.cpp b/native/src/crt0/bionic/dirent.cpp
similarity index 100%
rename from native/src/crt0/dirent.cpp
rename to native/src/crt0/bionic/dirent.cpp
diff --git a/native/src/crt0/syscall/private/bionic_asm.h b/native/src/crt0/bionic/private/bionic_asm.h
similarity index 100%
rename from native/src/crt0/syscall/private/bionic_asm.h
rename to native/src/crt0/bionic/private/bionic_asm.h
diff --git a/native/src/crt0/syscall/private/bionic_asm_arm.h b/native/src/crt0/bionic/private/bionic_asm_arm.h
similarity index 100%
rename from native/src/crt0/syscall/private/bionic_asm_arm.h
rename to native/src/crt0/bionic/private/bionic_asm_arm.h
diff --git a/native/src/crt0/syscall/private/bionic_asm_arm64.h b/native/src/crt0/bionic/private/bionic_asm_arm64.h
similarity index 100%
rename from native/src/crt0/syscall/private/bionic_asm_arm64.h
rename to native/src/crt0/bionic/private/bionic_asm_arm64.h
diff --git a/native/src/crt0/syscall/private/bionic_asm_riscv64.h b/native/src/crt0/bionic/private/bionic_asm_riscv64.h
similarity index 100%
rename from native/src/crt0/syscall/private/bionic_asm_riscv64.h
rename to native/src/crt0/bionic/private/bionic_asm_riscv64.h
diff --git a/native/src/crt0/syscall/private/bionic_asm_x86.h b/native/src/crt0/bionic/private/bionic_asm_x86.h
similarity index 100%
rename from native/src/crt0/syscall/private/bionic_asm_x86.h
rename to native/src/crt0/bionic/private/bionic_asm_x86.h
diff --git a/native/src/crt0/syscall/private/bionic_asm_x86_64.h b/native/src/crt0/bionic/private/bionic_asm_x86_64.h
similarity index 100%
rename from native/src/crt0/syscall/private/bionic_asm_x86_64.h
rename to native/src/crt0/bionic/private/bionic_asm_x86_64.h
diff --git a/native/src/crt0/syscall/syscall-arm.S b/native/src/crt0/bionic/syscall-arm.S
similarity index 100%
rename from native/src/crt0/syscall/syscall-arm.S
rename to native/src/crt0/bionic/syscall-arm.S
diff --git a/native/src/crt0/syscall/syscall-arm64.S b/native/src/crt0/bionic/syscall-arm64.S
similarity index 100%
rename from native/src/crt0/syscall/syscall-arm64.S
rename to native/src/crt0/bionic/syscall-arm64.S
diff --git a/native/src/crt0/syscall/syscall-x86.S b/native/src/crt0/bionic/syscall-x86.S
similarity index 100%
rename from native/src/crt0/syscall/syscall-x86.S
rename to native/src/crt0/bionic/syscall-x86.S
diff --git a/native/src/crt0/syscall/syscall-x86_64.S b/native/src/crt0/bionic/syscall-x86_64.S
similarity index 100%
rename from native/src/crt0/syscall/syscall-x86_64.S
rename to native/src/crt0/bionic/syscall-x86_64.S