From a8b621c8d1fe77251b8e4eafe258dc0ee7366dd5 Mon Sep 17 00:00:00 2001 From: login Date: Sun, 8 Jan 2023 15:47:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=94=B1=E4=BA=8Elibc?= =?UTF-8?q?=E4=B8=AD=E5=85=B7=E6=9C=89crti.S=E5=92=8Ccrtn.S=EF=BC=8C?= =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E4=B8=8Ex86=5F64-elf-gcc=E4=B8=8D?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98=20(#144)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/libs/libc/src/arch/x86_64/Makefile | 16 +++++++++------- user/libs/libc/src/arch/x86_64/crt0.c | 7 +++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/user/libs/libc/src/arch/x86_64/Makefile b/user/libs/libc/src/arch/x86_64/Makefile index 22623f6a..08aaba5b 100644 --- a/user/libs/libc/src/arch/x86_64/Makefile +++ b/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: diff --git a/user/libs/libc/src/arch/x86_64/crt0.c b/user/libs/libc/src/arch/x86_64/crt0.c index 047d4e35..49726c92 100644 --- a/user/libs/libc/src/arch/x86_64/crt0.c +++ b/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(){ + } \ No newline at end of file