diff options
| author | Austin Clements <[email protected]> | 2011-09-02 14:51:55 -0400 |
|---|---|---|
| committer | Austin Clements <[email protected]> | 2011-09-02 14:51:55 -0400 |
| commit | dd4438b4fe934eef3f631238d45b3681a3abdd4d (patch) | |
| tree | 4b885aa386da63f1de44446ef2df577ba0211dcd /Makefile | |
| parent | ce6dd9de27a926e77e275de0287ee36fce93ce7f (diff) | |
| download | xv6-labs-dd4438b4fe934eef3f631238d45b3681a3abdd4d.tar.gz xv6-labs-dd4438b4fe934eef3f631238d45b3681a3abdd4d.tar.bz2 xv6-labs-dd4438b4fe934eef3f631238d45b3681a3abdd4d.zip | |
Nuke data.S, since we do have a custom linker script.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -109,8 +109,8 @@ initcode: initcode.S $(OBJCOPY) -S -O binary initcode.out initcode $(OBJDUMP) -S initcode.o > initcode.asm -kernel: $(OBJS) entry.o data.o entryother initcode - $(LD) $(LDFLAGS) -T kernel.ld -e entry -o kernel entry.o data.o $(OBJS) -b binary initcode entryother +kernel: $(OBJS) entry.o entryother initcode + $(LD) $(LDFLAGS) -T kernel.ld -e entry -o kernel entry.o $(OBJS) -b binary initcode entryother $(OBJDUMP) -S kernel > kernel.asm $(OBJDUMP) -t kernel | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernel.sym @@ -121,8 +121,8 @@ kernel: $(OBJS) entry.o data.o entryother initcode # great for testing the kernel on real hardware without # needing a scratch disk. MEMFSOBJS = $(filter-out ide.o,$(OBJS)) memide.o -kernelmemfs: $(MEMFSOBJS) entry.o data.o entryother initcode fs.img - $(LD) $(LDFLAGS) -Ttext 0x100000 -e main -o kernelmemfs entry.o data.o $(MEMFSOBJS) -b binary initcode entryother 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 $(OBJDUMP) -S kernelmemfs > kernelmemfs.asm $(OBJDUMP) -t kernelmemfs | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernelmemfs.sym |