From owner-svn-src-head@freebsd.org  Fri Aug 16 20:07:44 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 44CD4AD68B;
 Fri, 16 Aug 2019 20:07:44 +0000 (UTC)
 (envelope-from kevans@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 469Drc19h2z4hmX;
 Fri, 16 Aug 2019 20:07:44 +0000 (UTC)
 (envelope-from kevans@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 09AD167F9;
 Fri, 16 Aug 2019 20:07:44 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7GK7hVR000548;
 Fri, 16 Aug 2019 20:07:43 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7GK7hcY000547;
 Fri, 16 Aug 2019 20:07:43 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201908162007.x7GK7hcY000547@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 16 Aug 2019 20:07:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r351135 - head/stand/i386/boot2
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/stand/i386/boot2
X-SVN-Commit-Revision: 351135
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Aug 2019 20:07:44 -0000

Author: kevans
Date: Fri Aug 16 20:07:43 2019
New Revision: 351135
URL: https://svnweb.freebsd.org/changeset/base/351135

Log:
  stand: boot2: fix build with xtoolchain-llvm90
  
  ufsread.c grows a dependency on __ashldi3 with llvm90. Grab ashldi3.c out of
  compiler-rt rather than trying to link against libsa (for now).
  -Wno-missing-prototypes is necessary to compile ashldi3.c standalone.
  
  Reviewed by:	imp
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D21291

Modified:
  head/stand/i386/boot2/Makefile

Modified: head/stand/i386/boot2/Makefile
==============================================================================
--- head/stand/i386/boot2/Makefile	Fri Aug 16 19:46:22 2019	(r351134)
+++ head/stand/i386/boot2/Makefile	Fri Aug 16 20:07:43 2019	(r351135)
@@ -78,7 +78,12 @@ boot2.ldr:
 boot2.bin: boot2.out
 	${OBJCOPY} -S -O binary boot2.out ${.TARGET}
 
-boot2.out: ${BTXCRT} boot2.o sio.o
+# For __ashldi3
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins
+CFLAGS.ashldi3.c=	-Wno-missing-prototypes
+CLEANFILES+=	ashldi3.o
+
+boot2.out: ${BTXCRT} boot2.o sio.o ashldi3.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 SRCS=	boot2.c boot2.h