Author: dim Date: Tue Jan 28 21:46:59 2020 New Revision: 357232 URL: https://svnweb.freebsd.org/changeset/base/357232
Log: Merge r357231 from the clang1000-import branch: 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 Modified: head/stand/i386/gptboot/gptldr.S Directory Properties: head/ (props changed) Modified: head/stand/i386/gptboot/gptldr.S ============================================================================== --- head/stand/i386/gptboot/gptldr.S Tue Jan 28 21:41:37 2020 (r357231) +++ head/stand/i386/gptboot/gptldr.S Tue Jan 28 21:46:59 2020 (r357232) @@ -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: _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"