Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jan 2020 21:41:38 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r357231 - projects/clang1000-import/stand/i386/gptboot
Message-ID:  <202001282141.00SLfcp4037557@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Tue Jan 28 21:41:37 2020
New Revision: 357231
URL: https://svnweb.freebsd.org/changeset/base/357231

Log:
  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:
  projects/clang1000-import/stand/i386/gptboot/gptldr.S

Modified: projects/clang1000-import/stand/i386/gptboot/gptldr.S
==============================================================================
--- projects/clang1000-import/stand/i386/gptboot/gptldr.S	Tue Jan 28 20:56:40 2020	(r357230)
+++ projects/clang1000-import/stand/i386/gptboot/gptldr.S	Tue Jan 28 21:41:37 2020	(r357231)
@@ -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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001282141.00SLfcp4037557>