ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Fix kernelmemfs linking

Browse source 
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.
This commit is contained in:
Austin Clements 2014-10-03 09:39:09 -04:00
parent 053082fbed
commit 0dd991dd20
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -124,7 +124,7 @@ kernel: $(OBJS) entry.o entryother initcode kernel.ld
# needing a scratch disk.
MEMFSOBJS = $(filter-out ide.o,$(OBJS)) memide.o
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) -t kernelmemfs | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernelmemfs.sym