diff options
| author | Russ Cox <rsc@x40.(none)> | 2009-09-02 10:07:59 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@x40.(none)> | 2009-09-02 10:07:59 -0700 |
| commit | 7e0cc8e36ea91d0299f375f3b3476ab58ab71dde (patch) | |
| tree | 0b02d5f1c1708ffeeb26ae84a4545cbc9a4c4265 /Makefile | |
| parent | 374362c55c7e1268ce6c52b029458ef22144c114 (diff) | |
| download | xv6-labs-7e0cc8e36ea91d0299f375f3b3476ab58ab71dde.tar.gz xv6-labs-7e0cc8e36ea91d0299f375f3b3476ab58ab71dde.tar.bz2 xv6-labs-7e0cc8e36ea91d0299f375f3b3476ab58ab71dde.zip | |
another attempt at cpu-local variables.
this time do it ourselves instead of piggybacking on TLS.
add -fno-pic to Makefile; pic code breaks our fake TLS.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -37,7 +37,7 @@ AS = $(TOOLPREFIX)gas LD = $(TOOLPREFIX)ld OBJCOPY = $(TOOLPREFIX)objcopy OBJDUMP = $(TOOLPREFIX)objdump -CFLAGS = -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 +CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector) ASFLAGS = -m32 # FreeBSD ld wants ``elf_i386_fbsd'' @@ -49,8 +49,8 @@ xv6.img: bootblock kernel fs.img dd if=kernel of=xv6.img seek=1 conv=notrunc bootblock: bootasm.S bootmain.c - $(CC) $(CFLAGS) -O -nostdinc -I. -c bootmain.c - $(CC) $(CFLAGS) -nostdinc -I. -c bootasm.S + $(CC) $(CFLAGS) -fno-pic -O -nostdinc -I. -c bootmain.c + $(CC) $(CFLAGS) -fno-pic -nostdinc -I. -c bootasm.S $(LD) $(LDFLAGS) -N -e start -Ttext 0x7C00 -o bootblock.o bootasm.o bootmain.o $(OBJDUMP) -S bootblock.o > bootblock.asm $(OBJCOPY) -S -O binary -j .text bootblock.o bootblock @@ -93,7 +93,7 @@ _forktest: forktest.o $(ULIB) $(OBJDUMP) -S _forktest > forktest.asm mkfs: mkfs.c fs.h - gcc $(CFLAGS) -Wall -o mkfs mkfs.c + gcc -Wall -o mkfs mkfs.c UPROGS=\ _cat\ @@ -139,7 +139,7 @@ bochs : fs.img xv6.img bochs -q qemu: fs.img xv6.img - qemu -parallel stdio -hdb fs.img xv6.img + qemu -parallel stdio -smp 2 -hdb fs.img xv6.img qemutty: fs.img xv6.img qemu -nographic -smp 2 -hdb fs.img xv6.img |