From: Austin Clements <aclements@csail.mit.edu>
Date: Fri, 3 Oct 2014 13:39:09 +0000 (-0400)
Subject: Fix kernelmemfs linking
X-Git-Url: https://git.devinivas.org/?a=commitdiff_plain;h=0dd991dd209605277489d4f5a6881dd77ab4f986;p=cs3210-lab0.git

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.
---

diff --git a/Makefile b/Makefile
index 23b2fba..491382d 100644
--- a/Makefile
+++ b/Makefile
@@ -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