diff options
| author | Frans Kaashoek <[email protected]> | 2011-08-09 21:37:35 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2011-08-09 21:37:35 -0400 |
| commit | 66ba8079c7e376c189ccb3367b8d13825141b8ec (patch) | |
| tree | 93343a9d7c9ea75a02c05e4ce078ef2d4a48e2da /Makefile | |
| parent | 3a038106431314c85a5950c473b113a7037ac1aa (diff) | |
| download | xv6-labs-66ba8079c7e376c189ccb3367b8d13825141b8ec.tar.gz xv6-labs-66ba8079c7e376c189ccb3367b8d13825141b8ec.tar.bz2 xv6-labs-66ba8079c7e376c189ccb3367b8d13825141b8ec.zip | |
Use static page table for boot, mapping first 4Mbyte; no more segment trick
Allocate proper kernel page table immediately in main using boot allocator
Remove pginit
Simplify address space layout a tiny bit
More to come (e.g., superpages to simplify static table)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -72,7 +72,8 @@ AS = $(TOOLPREFIX)gas LD = $(TOOLPREFIX)ld OBJCOPY = $(TOOLPREFIX)objcopy OBJDUMP = $(TOOLPREFIX)objdump -CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 -Werror -fno-omit-frame-pointer +#CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 -Werror -fno-omit-frame-pointer +CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -MD -ggdb -m32 -Werror -fno-omit-frame-pointer CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector) ASFLAGS = -m32 -gdwarf-2 -Wa,-divide # FreeBSD ld wants ``elf_i386_fbsd'' @@ -198,7 +199,7 @@ QEMUGDB = $(shell if $(QEMU) -help | grep -q '^-gdb'; \ then echo "-gdb tcp::$(GDBPORT)"; \ else echo "-s -p $(GDBPORT)"; fi) ifndef CPUS -CPUS := 2 +CPUS := 1 endif QEMUOPTS = -hdb fs.img xv6.img -smp $(CPUS) -m 512 |