Skip to content

Commit

Permalink
thanks mtasm
Browse files Browse the repository at this point in the history
  • Loading branch information
@kaashoek
kaashoek committed Aug 30, 2018
1 parent 6710e55 commit 76d4005
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
7 changes: 7 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions mmu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,3 @@ struct gatedesc {

#endif

//PAGEBREAK!
// Blank page.
3 changes: 3 additions & 0 deletions runoff.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ x86.h
asm.h
mmu.h
elf.h
date.h

# entering xv6
entry.S
Expand Down Expand Up @@ -75,3 +76,5 @@ sh.c
bootasm.S
bootmain.c

# link
kernel.ld

1 comment on commit 76d4005

@PFSymah2601
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok code but u can do better so try another kernel but with repository

Please sign in to comment.