提交 0dd991dd 创建 作者: Austin Clements's avatar Austin Clements

Fix kernelmemfs linking

Commit 9aa0337d introduced a linker script for linking the kernel image, but only changed the kernel target to use it. kernelmemfs was still using the old linker command line arguments, which weren't sufficient.
上级 053082fb
...@@ -124,7 +124,7 @@ kernel: $(OBJS) entry.o entryother initcode kernel.ld ...@@ -124,7 +124,7 @@ kernel: $(OBJS) entry.o entryother initcode kernel.ld
# needing a scratch disk. # needing a scratch disk.
MEMFSOBJS = $(filter-out ide.o,$(OBJS)) memide.o MEMFSOBJS = $(filter-out ide.o,$(OBJS)) memide.o
kernelmemfs: $(MEMFSOBJS) entry.o entryother initcode fs.img kernelmemfs: $(MEMFSOBJS) entry.o entryother initcode fs.img
$(LD) $(LDFLAGS) -Ttext 0x100000 -e main -o kernelmemfs entry.o $(MEMFSOBJS) -b binary initcode entryother fs.img $(LD) $(LDFLAGS) -T kernel.ld -o kernelmemfs entry.o $(MEMFSOBJS) -b binary initcode entryother fs.img
$(OBJDUMP) -S kernelmemfs > kernelmemfs.asm $(OBJDUMP) -S kernelmemfs > kernelmemfs.asm
$(OBJDUMP) -t kernelmemfs | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernelmemfs.sym $(OBJDUMP) -t kernelmemfs | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernelmemfs.sym
......
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论