diff options
| author | Mole Shang <[email protected]> | 2024-02-13 19:39:56 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-13 19:39:56 +0800 |
| commit | 89ef6f717ed4b3e702e5f6f906f58fe1ea27d366 (patch) | |
| tree | 760cce316675479a6cca77551438e8d2cc5fe9ae /Makefile | |
| parent | cfae93475dfb4cb5cfe264f4c029136e1447c262 (diff) | |
| parent | 4a6593f1a6f666c618d303a4858c4c6d31b41c63 (diff) | |
| download | xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.tar.gz xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.tar.bz2 xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.zip | |
Merge branch 'cow' into net
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/defs.h
kernel/syscall.c
kernel/vm.c
user/pingpong.c
user/user.h
user/usys.pl
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 34 |
1 files changed, 19 insertions, 15 deletions
@@ -13,12 +13,14 @@ OBJS = \ $K/kalloc.o \ $K/string.o \ $K/main.o \ + $K/cow.o \ $K/vm.o \ $K/proc.o \ $K/swtch.o \ $K/trampoline.o \ $K/trap.o \ $K/syscall.o \ + $K/sysinfo.o \ $K/sysproc.o \ $K/bio.o \ $K/fs.o \ @@ -90,7 +92,7 @@ CFLAGS = -Wall -Werror -O -fno-omit-frame-pointer -ggdb -gdwarf-2 ifdef LAB LABUPPER = $(shell echo $(LAB) | tr a-z A-Z) -XCFLAGS += -DSOL_$(LABUPPER) -DLAB_$(LABUPPER) +XCFLAGS += -DSOL_$(LABUPPER) -DLAB_$(LABUPPER) -DLAB_PGTBL endif CFLAGS += $(XCFLAGS) @@ -188,6 +190,13 @@ UPROGS=\ $U/_grind\ $U/_wc\ $U/_zombie\ + $U/_sleep\ + $U/_pingpong\ + $U/_primes\ + $U/_find\ + $U/_xargs\ + $U/_trace\ + $U/_sysinfotest\ @@ -197,21 +206,18 @@ UPROGS += \ $U/_stats endif -ifeq ($(LAB),traps) UPROGS += \ $U/_call\ - $U/_bttest -endif + $U/_bttest\ + $U/_alarmtest ifeq ($(LAB),lazy) UPROGS += \ $U/_lazytests endif -ifeq ($(LAB),cow) UPROGS += \ $U/_cowtest -endif ifeq ($(LAB),thread) UPROGS += \ @@ -231,10 +237,8 @@ barrier: notxv6/barrier.c gcc -o barrier -g -O2 $(XCFLAGS) notxv6/barrier.c -pthread endif -ifeq ($(LAB),pgtbl) UPROGS += \ $U/_pgtbltest -endif ifeq ($(LAB),lock) UPROGS += \ @@ -255,9 +259,7 @@ UPROGS += \ endif UEXTRA= -ifeq ($(LAB),util) - UEXTRA += user/xargstest.sh -endif +UEXTRA += user/xargstest.sh fs.img: mkfs/mkfs README $(UEXTRA) $(UPROGS) @@ -266,11 +268,13 @@ fs.img: mkfs/mkfs README $(UEXTRA) $(UPROGS) -include kernel/*.d user/*.d clean: - rm -rf *.tex *.dvi *.idx *.aux *.log *.ind *.ilg *.dSYM *.zip *.pcap \ + rm -f *.tex *.dvi *.idx *.aux *.log *.ind *.ilg *.dSYM *.zip \ */*.o */*.d */*.asm */*.sym \ - $U/initcode $U/initcode.out $U/usys.S $U/_* \ - $K/kernel \ - mkfs/mkfs fs.img .gdbinit __pycache__ xv6.out* \ + $U/initcode $U/initcode.out $K/kernel fs.img \ + mkfs/mkfs .gdbinit \ + $U/usys.S \ + $(UPROGS) \ + *.zip \ ph barrier # try to generate a unique GDB port |