thanks mtasm

diff --git a/Makefile b/Makefile
index d17f1fa884b0c8bc9f7a03d77a563ab71b0ee73a..09d790cf63ba05423a1fb60e98f93e2590088e25 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,13 @@ ASFLAGS = -m32 -gdwarf-2 -Wa,-divide
 # FreeBSD ld wants ``elf_i386_fbsd''
 LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null | head -n 1)
 
+# Disable PIE when possible (for Ubuntu 16.10 toolchain)
+ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
+CFLAGS += -fno-pie -no-pie
+endif
+ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]nopie'),)
+CFLAGS += -fno-pie -nopie
+endif
 
 xv6.img: bootblock kernel
        dd if=/dev/zero of=xv6.img count=10000

diff --git a/mmu.h b/mmu.h
index 9d6673ce28b801d7cad27c40d6a587a5d0003fdf..d009d975e792898ac2637d02f2a9ca40596d3598 100644 (file)
--- a/mmu.h
+++ b/mmu.h
@@ -181,5 +181,3 @@ struct gatedesc {
 
 #endif
 
-//PAGEBREAK!
-// Blank page.

diff --git a/runoff.list b/runoff.list
index 02d1b6522f5c07922162eecb64eb662894d5cac9..2df9b816761d8a2ce299957b0d992f63fd718a62 100644 (file)
--- a/runoff.list
+++ b/runoff.list
@@ -7,6 +7,7 @@ x86.h
 asm.h
 mmu.h
 elf.h
+date.h
 
 # entering xv6
 entry.S
@@ -75,3 +76,5 @@ sh.c
 bootasm.S
 bootmain.c
 
+# link
+kernel.ld