Browse Source

修正由于libc中具有crti.S和crtn.S,造成的与x86_64-elf-gcc不兼容的问题 (#144)

login 2 years ago
parent
commit
a8b621c8d1
2 changed files with 16 additions and 7 deletions
  1. 9 7
      user/libs/libc/src/arch/x86_64/Makefile
  2. 7 0
      user/libs/libc/src/arch/x86_64/crt0.c

+ 9 - 7
user/libs/libc/src/arch/x86_64/Makefile

@@ -7,16 +7,18 @@ ECHO:
 $(libc_arch_objs): ECHO
 	$(CC) $(CFLAGS) -c $@ -o $@.o
 
-all: $(libc_arch_objs) crti.o crtn.o
+# 由于目前使用的是raw的gcc,所以不需要crti.o和crtn.o(待更换为x86_64-dragonos-gcc后再改这里)
+# all: $(libc_arch_objs) crti.o crtn.o
+all: $(libc_arch_objs)
 	mv crt0.c.o crt0.o
 
-crti.o: crti.S
-	$(CC) -E crti.S > _crti.s # 预处理
-	$(AS) $(ASFLAGS) -o crti.o _crti.s
+# crti.o: crti.S
+# 	$(CC) -E crti.S > _crti.s # 预处理
+# 	$(AS) $(ASFLAGS) -o crti.o _crti.s
 
-crtn.o: crtn.S
-	$(CC) -E crtn.S > _crtn.s # 预处理
-	$(AS) $(ASFLAGS) -o crtn.o _crtn.s
+# crtn.o: crtn.S
+# 	$(CC) -E crtn.S > _crtn.s # 预处理
+# 	$(AS) $(ASFLAGS) -o crtn.o _crtn.s
 
 clean:
 	

+ 7 - 0
user/libs/libc/src/arch/x86_64/crt0.c

@@ -13,4 +13,11 @@ void _start(int argc, char **argv)
     _libc_init();
     int retval = main(argc, argv);
     exit(retval);
+}
+
+void _init(){
+
+}
+void _fini(){
+    
 }