diff options
| author | kaashoek <kaashoek> | 2006-07-06 21:47:22 +0000 |
|---|---|---|
| committer | kaashoek <kaashoek> | 2006-07-06 21:47:22 +0000 |
| commit | 7837c71b32fc716101a859302e0349061416bd6e (patch) | |
| tree | 57ec72178b980a3cd794b2f93bd021e08004368f /Makefile | |
| parent | b22d898297a2496ba4cfd31d445769fbebc0a46d (diff) | |
| download | xv6-labs-7837c71b32fc716101a859302e0349061416bd6e.tar.gz xv6-labs-7837c71b32fc716101a859302e0349061416bd6e.tar.bz2 xv6-labs-7837c71b32fc716101a859302e0349061416bd6e.zip | |
disable all interrupts when acquiring lock
user program that makes a blocking system call
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -20,12 +20,12 @@ bootblock : bootasm.S bootmain.c $(OBJCOPY) -S -O binary bootblock.o bootblock ./sign.pl bootblock -kernel : $(OBJS) bootother.S user1 usertests +kernel : $(OBJS) bootother.S user1 usertests userfs $(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 main -o kernel $(OBJS) -b binary bootother user1 usertests + $(LD) -Ttext 0x100000 -e main -o kernel $(OBJS) -b binary bootother user1 usertests userfs $(OBJDUMP) -S kernel > kernel.asm vectors.S : vectors.pl @@ -41,6 +41,11 @@ usertests : usertests.c ulib.o $(LD) -N -e main -Ttext 0 -o usertests usertests.o ulib.o $(OBJDUMP) -S usertests > usertests.asm +userfs : userfs.c ulib.o + $(CC) -nostdinc -I. -c userfs.c + $(LD) -N -e main -Ttext 0 -o userfs userfs.o ulib.o + $(OBJDUMP) -S userfs > userfs.asm + ulib.o : ulib.c $(CC) -nostdinc -I. -c ulib.c |