Skip to content

Commit 76d4005

Browse files
committedAug 30, 2018
thanks mtasm
1 parent 6710e55 commit 76d4005

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed
 

‎Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@ ASFLAGS = -m32 -gdwarf-2 -Wa,-divide
8282
# FreeBSD ld wants ``elf_i386_fbsd''
8383
LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null | head -n 1)
8484

85+
# Disable PIE when possible (for Ubuntu 16.10 toolchain)
86+
ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
87+
CFLAGS += -fno-pie -no-pie
88+
endif
89+
ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]nopie'),)
90+
CFLAGS += -fno-pie -nopie
91+
endif
8592

8693
xv6.img: bootblock kernel
8794
dd if=/dev/zero of=xv6.img count=10000

‎mmu.h

-2
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,3 @@ struct gatedesc {
181181

182182
#endif
183183

184-
//PAGEBREAK!
185-
// Blank page.

‎runoff.list

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ x86.h
77
asm.h
88
mmu.h
99
elf.h
10+
date.h
1011

1112
# entering xv6
1213
entry.S
@@ -75,3 +76,5 @@ sh.c
7576
bootasm.S
7677
bootmain.c
7778

79+
# link
80+
kernel.ld

0 commit comments

Comments
 (0)
Please sign in to comment.