diff options
| author | Toomas Soome <tsoome@me.com> | 2018-07-12 22:05:22 +0300 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2018-07-17 18:28:25 +0000 |
| commit | 3dd539e3fd0ab91cff2829d6bc9105d44a90a037 (patch) | |
| tree | ca84011285264edf497b47afc855ca7fdee5ffcd | |
| parent | 5a468b1a16156e8727f59abe2ad97833d57f04e8 (diff) | |
| download | illumos-joyent-3dd539e3fd0ab91cff2829d6bc9105d44a90a037.tar.gz | |
9652 loader.efi: use explicit lea in multiboot_tramp.S
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/boot/sys/boot/efi/loader/arch/amd64/multiboot_tramp.S | 10 |
1 files changed, 5 insertions, 5 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 |