提交 c53c558b 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer

Makefile tweaks.

上级 10452353
-include config.mk
OBJS = \ OBJS = \
asm.o \ asm.o \
bio.o \ bio.o \
...@@ -22,11 +20,12 @@ OBJS = \ ...@@ -22,11 +20,12 @@ OBJS = \
trap.o \ trap.o \
trapasm.o trapasm.o
# Cross-compiling (e.g., on Mac OS X) # Custom config file? Set the default below..
TOOLPREFIX ?= x86_64-jos-elf- -include config.mk
# If the makefile can't find QEMU, specify its path here TOOLPREFIX ?= x86_64-jos-elf-
QEMU = qemu-system-x86_64 QEMU ?= qemu-system-x86_64
CPUS ?= 2
NM = $(TOOLPREFIX)nm NM = $(TOOLPREFIX)nm
CC = $(TOOLPREFIX)gcc CC = $(TOOLPREFIX)gcc
...@@ -43,7 +42,6 @@ LDFLAGS += -m elf_x86_64 ...@@ -43,7 +42,6 @@ LDFLAGS += -m elf_x86_64
kernel: boot.o $(OBJS) initcode kernel: boot.o $(OBJS) initcode
$(LD) $(LDFLAGS) -T kernel.ld -z max-page-size=4096 -e start \ $(LD) $(LDFLAGS) -T kernel.ld -z max-page-size=4096 -e start \
-o $@ boot.o $(OBJS) -b binary initcode -o $@ boot.o $(OBJS) -b binary initcode
$(OBJDUMP) -S $@ >$@.asm
initcode: initcode.S initcode: initcode.S
$(CC) $(CFLAGS) -nostdinc -I. -c initcode.S $(CC) $(CFLAGS) -nostdinc -I. -c initcode.S
...@@ -61,17 +59,11 @@ xv6memfs.img: bootblock kernelmemfs ...@@ -61,17 +59,11 @@ xv6memfs.img: bootblock kernelmemfs
.PHONY: clean qemu ud0 .PHONY: clean qemu ud0
clean: clean:
rm -f *.tex *.dvi *.idx *.aux *.log *.ind *.ilg \ rm -f *.o *.d *.asm *.sym initcode kernel
*.o *.d *.asm *.sym vectors.S parport.out \
bootblock kernel xv6.img fs.img mkfs
ifndef CPUS
CPUS := 2
endif
QEMUOPTS = -smp $(CPUS) -m 512
QEMUOPTS = -smp $(CPUS) -m 512 -nographic
qemu: kernel qemu: kernel
$(QEMU) $(QEMUOPTS) -kernel kernel -nographic $(QEMU) $(QEMUOPTS) -kernel kernel
ud0: kernel ud0: kernel
rsync -avP kernel amsterdam.csail.mit.edu:/tftpboot/ud0/kernel.xv6 rsync -avP kernel amsterdam.csail.mit.edu:/tftpboot/ud0/kernel.xv6
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论