File tree 3 files changed +10
-2
lines changed
3 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -82,6 +82,13 @@ ASFLAGS = -m32 -gdwarf-2 -Wa,-divide
82
82
# FreeBSD ld wants ``elf_i386_fbsd''
83
83
LDFLAGS += -m $(shell $(LD ) -V | grep elf_i386 2>/dev/null | head -n 1)
84
84
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
85
92
86
93
xv6.img : bootblock kernel
87
94
dd if=/dev/zero of=xv6.img count=10000
Original file line number Diff line number Diff line change @@ -181,5 +181,3 @@ struct gatedesc {
181
181
182
182
#endif
183
183
184
- //PAGEBREAK!
185
- // Blank page.
Original file line number Diff line number Diff line change 7
7
asm.h
8
8
mmu.h
9
9
elf.h
10
+ date.h
10
11
11
12
# entering xv6
12
13
entry.S
75
76
bootasm.S
76
77
bootmain.c
77
78
79
+ # link
80
+ kernel.ld
You can’t perform that action at this time.
0 commit comments