diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-07-18 12:20:06 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-07-18 12:20:06 +0000 |
| commit | 68687f36834e36f95885b75155ae1959bd96d450 (patch) | |
| tree | 4185056016437add222dbf657e3c89b5f2ced7d3 | |
| parent | 251183602619045ad135f45b198a24867b0b1299 (diff) | |
| parent | bf62a5c5b223db5d80a4a241cf0cfb34f8c8ca73 (diff) | |
| download | illumos-joyent-68687f36834e36f95885b75155ae1959bd96d450.tar.gz | |
[illumos-gate merge]
commit 3dd539e3fd0ab91cff2829d6bc9105d44a90a037
9652 loader.efi: use explicit lea in multiboot_tramp.S
commit 5a468b1a16156e8727f59abe2ad97833d57f04e8
9653 consfonts: duplicate entry in usr/src/data/consfonts/Makefile
| -rw-r--r-- | usr/src/boot/sys/boot/efi/loader/arch/amd64/multiboot_tramp.S | 10 | ||||
| -rw-r--r-- | usr/src/data/consfonts/Makefile | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/multiboot_tramp.S b/usr/src/boot/sys/boot/efi/loader/arch/amd64/multiboot_tramp.S index dffa273563..061c638b59 100644 --- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/multiboot_tramp.S +++ b/usr/src/boot/sys/boot/efi/loader/arch/amd64/multiboot_tramp.S @@ -59,20 +59,20 @@ multiboot_tramp: movq %rax, %rbx /* MBI */ popq %rsi /* entry to rsi */ popq %rdi /* restore magic */ - movq gdt@GOTPCREL(%rip), %rax - movq gdtaddr@GOTPCREL(%rip), %rdx + lea gdt(%rip), %rax + lea gdtaddr(%rip), %rdx movq %rax, (%rdx) - movq gdtdesc@GOTPCREL(%rip), %rax + lea gdtdesc(%rip), %rax lgdt (%rax) /* record the address */ - movq multiboot_tramp_2@GOTPCREL(%rip), %rcx + lea multiboot_tramp_2(%rip), %rcx movq %rsp, %rax pushq $SEL_SDATA pushq %rax pushf pushq $SEL_SCODE - movq multiboot_tramp_1@GOTPCREL(%rip), %rax + lea multiboot_tramp_1(%rip), %rax pushq %rax iretq diff --git a/usr/src/data/consfonts/Makefile b/usr/src/data/consfonts/Makefile index b94eb53200..3caad425c1 100644 --- a/usr/src/data/consfonts/Makefile +++ b/usr/src/data/consfonts/Makefile @@ -25,9 +25,6 @@ GALLANT_SRC= Gallant19.bdf 8x16_FNT= 8x16.fnt 8x16_SRC= ter-u16n.bdf ter-u16b.bdf -8x16_FNT= 8x16.fnt -8x16_SRC= ter-u16n.bdf ter-u16b.bdf - 10x18_FNT= 10x18.fnt 10x18_SRC= ter-u18n.bdf ter-u18b.bdf |