summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMole Shang <[email protected]>2024-02-11 14:44:22 +0800
committerMole Shang <[email protected]>2024-02-11 16:06:15 +0800
commit2fe04bc8faa4bf737a86c36a8017473e84814f3b (patch)
tree2146d3dae86f21060e2e807ad364f5a949fd1c53 /Makefile
parent5ce1f630132d8b7b35b9dc46b4a55f860eb85d5c (diff)
parent48a5e34fcd07852b4a68825ce8e37feb6f6d04d7 (diff)
downloadxv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.gz
xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.bz2
xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.zip
Merge branch 'traps' into cow
Conflicts: .gitignore Makefile conf/lab.mk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 13 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 365c91b..ecb0f9e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ OBJS = \
$K/trampoline.o \
$K/trap.o \
$K/syscall.o \
+ $K/sysinfo.o \
$K/sysproc.o \
$K/bio.o \
$K/fs.o \
@@ -90,7 +91,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 +189,13 @@ UPROGS=\
$U/_grind\
$U/_wc\
$U/_zombie\
+ $U/_sleep\
+ $U/_pingpong\
+ $U/_primes\
+ $U/_find\
+ $U/_xargs\
+ $U/_trace\
+ $U/_sysinfotest\
@@ -200,7 +208,8 @@ endif
ifeq ($(LAB),traps)
UPROGS += \
$U/_call\
- $U/_bttest
+ $U/_bttest\
+ $U/_alarmtest
endif
ifeq ($(LAB),lazy)
@@ -265,8 +274,8 @@ fs.img: mkfs/mkfs README $(UEXTRA) $(UPROGS)
-include kernel/*.d user/*.d
-clean:
- rm -f *.tex *.dvi *.idx *.aux *.log *.ind *.ilg \
+clean:
+ rm -f *.tex *.dvi *.idx *.aux *.log *.ind *.ilg *.dSYM *.zip \
*/*.o */*.d */*.asm */*.sym \
$U/initcode $U/initcode.out $K/kernel fs.img \
mkfs/mkfs .gdbinit \