summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorrsc <rsc>2006-07-16 16:03:51 +0000
committerrsc <rsc>2006-07-16 16:03:51 +0000
commit8a7eb80e47546fab8decf3fdc1579cd8a137e406 (patch)
treee6d25804e17556d7b855436f42815bd3480bf691 /Makefile
parentb75c11b20edad4e507d5bc2455177de59a38ec9f (diff)
downloadxv6-labs-8a7eb80e47546fab8decf3fdc1579cd8a137e406.tar.gz
xv6-labs-8a7eb80e47546fab8decf3fdc1579cd8a137e406.tar.bz2
xv6-labs-8a7eb80e47546fab8decf3fdc1579cd8a137e406.zip
fix main return type
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1203a3d..e514580 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ kernel : $(OBJS) bootother.S user1 usertests userfs
$(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 main -o kernel $(OBJS) -b binary bootother user1 usertests userfs
+ $(LD) -Ttext 0x100000 -e main0 -o kernel $(OBJS) -b binary bootother user1 usertests userfs
$(OBJDUMP) -S kernel > kernel.asm
vectors.S : vectors.pl