diff options
| author | Austin Clements <[email protected]> | 2014-10-03 09:39:09 -0400 |
|---|---|---|
| committer | Austin Clements <[email protected]> | 2014-10-03 09:39:09 -0400 |
| commit | 0dd991dd209605277489d4f5a6881dd77ab4f986 (patch) | |
| tree | b37c0f7af4d162e78cc1550d805c65057ac39902 /Makefile | |
| parent | 053082fbed145108b811978a0cc0558afcb909ac (diff) | |
| download | xv6-labs-0dd991dd209605277489d4f5a6881dd77ab4f986.tar.gz xv6-labs-0dd991dd209605277489d4f5a6881dd77ab4f986.tar.bz2 xv6-labs-0dd991dd209605277489d4f5a6881dd77ab4f986.zip | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |