svn commit: r357354 - in stable: 11/stand/i386/gptboot 12/stand/i386/gptboot

[Dimitry Andric]

Author: dim
Date: Fri Jan 31 21:20:22 2020
New Revision: 357354
URL: https://svnweb.freebsd.org/changeset/base/357354

Log:
  MFC r357232:
  
  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.

Modified:
  stable/11/stand/i386/gptboot/gptldr.S
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/stand/i386/gptboot/gptldr.S
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/stand/i386/gptboot/gptldr.S
==============================================================================
--- stable/11/stand/i386/gptboot/gptldr.S	Fri Jan 31 21:08:33 2020	(r357353)
+++ stable/11/stand/i386/gptboot/gptldr.S	Fri Jan 31 21:20:22 2020	(r357354)
@@ -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: