From owner-svn-src-stable-11@freebsd.org Fri Jan 31 21:20:22 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EBBA61ED155; Fri, 31 Jan 2020 21:20:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 488VVt62K5z4F0w; Fri, 31 Jan 2020 21:20:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA4E91C26C; Fri, 31 Jan 2020 21:20:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00VLKMMW016438; Fri, 31 Jan 2020 21:20:22 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00VLKMRI016437; Fri, 31 Jan 2020 21:20:22 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202001312120.00VLKMRI016437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 31 Jan 2020 21:20:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r357354 - in stable: 11/stand/i386/gptboot 12/stand/i386/gptboot X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 11/stand/i386/gptboot 12/stand/i386/gptboot X-SVN-Commit-Revision: 357354 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jan 2020 21:20:23 -0000 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: