summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-07 14:10:52 +0000
committerrsc <rsc>2006-09-07 14:10:52 +0000
commit7e019461c8bf0afbe73f959ca3394cce832501fd (patch)
treeeccf9c8cfdb427220cf595c7eb045c04ba9b5f4d /Makefile
parenta64cd81342188c80ce6aef13f1b98300018d786e (diff)
downloadxv6-labs-7e019461c8bf0afbe73f959ca3394cce832501fd.tar.gz
xv6-labs-7e019461c8bf0afbe73f959ca3394cce832501fd.tar.bz2
xv6-labs-7e019461c8bf0afbe73f959ca3394cce832501fd.zip
fix build
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1e1a0a8..731cf57 100644
--- a/Makefile
+++ b/Makefile
@@ -49,22 +49,22 @@ bootblock : bootasm.S bootmain.c
$(OBJCOPY) -S -O binary bootblock.o bootblock
./sign.pl bootblock
-kernel : $(OBJS) bootother.S init
+kernel : $(OBJS) bootother.S _init
$(CC) -nostdinc -I. -c bootother.S
$(LD) -N -e start -Ttext 0x7000 -o bootother.out bootother.o
$(OBJCOPY) -S -O binary bootother.out bootother
$(OBJDUMP) -S bootother.o > bootother.asm
- $(LD) -Ttext 0x100000 -e main0 -o kernel $(OBJS) -b binary bootother init
+ $(LD) -Ttext 0x100000 -e main0 -o kernel $(OBJS) -b binary bootother _init
$(OBJDUMP) -S kernel > kernel.asm
-tags: $(OBJS) bootother.S init
+tags: $(OBJS) bootother.S _init
etags *.S *.c
PRINT = \
runoff.list \
README\
types.h param.h defs.h x86.h asm.h elf.h mmu.h spinlock.h\
- bootasm.S bootother.S main.c init.c spinlock.c\
+ bootasm.S bootother.S main.c _init.c spinlock.c\
proc.h proc.c setjmp.S kalloc.c\
syscall.h trapasm.S traps.h trap.c vectors.pl syscall.c sysproc.c\
buf.h dev.h fcntl.h stat.h file.h fs.h fsvar.h fd.c fs.c bio.c ide.c sysfile.c\