From ae557653090d866becd93b05253463be228ae3c8 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 28 Jan 2020 21:41:37 +0000 Subject: [PATCH] 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 --- stand/i386/gptboot/gptldr.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/i386/gptboot/gptldr.S b/stand/i386/gptboot/gptldr.S index c51a85aa8303..ca01082391f2 100644 --- a/stand/i386/gptboot/gptldr.S +++ b/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: