Merge pull request #69 from ToolmanP/fix-capatibility

fix: fix darwin/aarch64 compatibility issue
SJTU-IPADS · Dec 11, 2024 · 4af5b0d · 4af5b0d
2 parents 18b64e0 + 33594c5
commit 4af5b0d
Show file tree

Hide file tree

Showing 78 changed files with 30 additions and 1,482 deletions.
diff --git a/Lab3/user/chcore-libc/CMakeLists.txt b/Lab3/user/chcore-libc/CMakeLists.txt
@@ -101,7 +101,7 @@ add_custom_target(libc-build ALL
 # Install libc as usual
 add_custom_target(libc-install ALL
     WORKING_DIRECTORY ${_libc_target_dir}
-    COMMAND make install
+    COMMAND make -j1 install
     DEPENDS libc-build)
 
 # clean target

diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/Makefile b/Lab3/user/chcore-libc/libchcore/porting/overrides/Makefile
@@ -151,11 +151,11 @@ CC_CMD = $(CC) $(CFLAGS_ALL) -c -o $@ $<
 ifeq ($(ADD_CFI),yes)
 	AS_CMD = LC_ALL=C awk -f $(srcdir)/tools/add-cfi.common.awk -f $(srcdir)/tools/add-cfi.$(ARCH).awk $< | $(CC) $(CFLAGS_ALL) -x assembler -c -o $@ -
 else
-	AS_CMD = $(CC_CMD)
+	AS_CMD = $(CC) $(CFLAGS_ALL) -x assembler-with-cpp -c -o $@ $<
 endif
 
 obj/%.o: $(srcdir)/%.s
-	$(AS_CMD)
+	($(AS_CMD) 2> /dev/null) || $(CC_CMD)
 
 obj/%.o: $(srcdir)/%.S
 	$(CC_CMD)
@@ -164,7 +164,7 @@ obj/%.o: $(srcdir)/%.c $(GENH) $(IMPH)
 	$(CC_CMD)
 
 obj/%.lo: $(srcdir)/%.s
-	$(AS_CMD)
+	($(AS_CMD) 2> /dev/null) || $(CC_CMD)
 
 obj/%.lo: $(srcdir)/%.S
 	$(CC_CMD)

diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/setjump/sparc/longjmp.S b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/setjump/sparc/longjmp.S
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/setjump/sparc/setjmp.S b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/setjump/sparc/setjmp.S
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/aarch64/CMakeLists.txt b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/aarch64/CMakeLists.txt
@@ -8,4 +8,4 @@
 # PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-target_sources(libchcore-porting-symbols PRIVATE __unmapself.S)
+target_sources(libchcore-porting-symbols PRIVATE __unmapself.s)
diff --git a/...rrides/src/thread/aarch64/__thread_exit.S → ...rrides/src/thread/aarch64/__thread_exit.s b/...rrides/src/thread/aarch64/__thread_exit.S → ...rrides/src/thread/aarch64/__thread_exit.s
diff --git a/...verrides/src/thread/aarch64/__unmapself.S → ...verrides/src/thread/aarch64/__unmapself.s b/...verrides/src/thread/aarch64/__unmapself.S → ...verrides/src/thread/aarch64/__unmapself.s
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/aarch64/__unmapself.s.del b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/aarch64/__unmapself.s.del
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/riscv64/CMakeLists.txt b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/riscv64/CMakeLists.txt
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/riscv64/__thread_exit.S b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/riscv64/__thread_exit.S
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/riscv64/__unmapself.S b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/riscv64/__unmapself.S
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/__set_thread_area.s b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/__set_thread_area.s
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/__thread_exit.S b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/__thread_exit.S
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/__unmapself.S b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/__unmapself.S
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/atomics.c b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/atomics.c
diff --git a/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/clone.S b/Lab3/user/chcore-libc/libchcore/porting/overrides/src/thread/sparc/clone.S