justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add the VDSO to the initrd

Browse Source
This commit is contained in:
Justin C. Miller
2019-10-10 00:14:46 -07:00
parent 991b13424e
commit 71fe3d733b
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/initrd.toml
View File

@@ -8,6 +8,10 @@
# # initial application for the kernel to execute # # initial application for the kernel to execute
# # on startup # # on startup
[[files]]
dest = "vdso.so"
source = "host/libvdso.so"
[[files]] [[files]]
dest = "screenfont.psf" dest = "screenfont.psf"
source = "../assets/fonts/tamsyn8x16r.psf" source = "../assets/fonts/tamsyn8x16r.psf"

1
scripts/templates/build.ninja.j2
View File

@@ -187,6 +187,7 @@ build $builddir/fatroot/efi/boot/bootx64.efi : cp $builddir/boot/boot.efi
name = bootloader to FAT image name = bootloader to FAT image
build $builddir/fatroot/initrd.img : makerd ${srcroot}/assets/initrd.toml | $ build $builddir/fatroot/initrd.img : makerd ${srcroot}/assets/initrd.toml | $
${builddir}/host/libvdso.so $
${builddir}/native/makerd $ ${builddir}/native/makerd $
${builddir}/user/nulldrv ${builddir}/user/nulldrv

8
src/arch/x86_64/vdso.ld
View File

@@ -1,5 +1,6 @@
PHDRS { PHDRS {
rodata PT_LOAD FLAGS(4) FILEHDR PHDRS ; headers PT_PHDR FLAGS(4) FILEHDR PHDRS ;
rodata PT_LOAD FLAGS(4) ;
text PT_LOAD FLAGS(5) ; text PT_LOAD FLAGS(5) ;
dynamic PT_DYNAMIC FLAGS(4) ; dynamic PT_DYNAMIC FLAGS(4) ;
note PT_NOTE ; note PT_NOTE ;
@@ -14,6 +15,7 @@ SECTIONS {
*(.plt*) *(.plt*)
*(.note.*) *(.note.*)
*(.hash*) *(.hash*)
*(.debug*)
} }
.illegal.relocations : { .illegal.relocations : {
@@ -53,6 +55,10 @@ SECTIONS {
KEEP(*(.eh_frame_hdr)) KEEP(*(.eh_frame_hdr))
} :eh_frame } :eh_frame
.shstrtab : {
*(.shstrtab)
}
.text ALIGN(0x1000) : { .text ALIGN(0x1000) : {
*(.text*) *(.text*)
*(.init*) *(.init*)