d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r357231 from the clang1000-import branch:

Browse Source 
Work around assembler error from clang 10.0.0 in gptboot:

stand/i386/gptboot/gptldr.S:141:3: error: value of 36878 is too large for field of 2 bytes.
  jmp MEM_JMP # Start BTX
  ^

Use the same construct as in stand/i386/boot2/boot1.S, which ensures the
jump distance does not become too large.

MFC after:	3 days
This commit is contained in:
dim 2020-01-28 21:46:59 +00:00
parent 63da139a92
commit 0f3dd1b985
1 changed files with 1 additions and 1 deletions

2
stand/i386/gptboot/gptldr.S

@ -138,5 +138,5 @@ seta20.3: sti # Enable interrupts
* Save drive number from BIOS so boot2 can see it and start BTX.
*/
movb %dl,MEM_ARG
jmp MEM_JMP # Start BTX
jmp start+MEM_JMP-MEM_ORG # Start BTX
end: