From owner-svn-src-projects@freebsd.org  Thu May 12 18:20:53 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC574B387A5
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 12 May 2016 18:20:53 +0000 (UTC)
 (envelope-from sbruno@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 mx1.freebsd.org (Postfix) with ESMTPS id 84B3F1069;
 Thu, 12 May 2016 18:20:53 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4CIKqf6004770;
 Thu, 12 May 2016 18:20:52 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4CIKqTo004768;
 Thu, 12 May 2016 18:20:52 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201605121820.u4CIKqTo004768@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Thu, 12 May 2016 18:20:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r299550 - in projects/mips64-clang/sys/boot/mips: .
 beri/boot2
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 May 2016 18:20:53 -0000

Author: sbruno
Date: Thu May 12 18:20:52 2016
New Revision: 299550
URL: https://svnweb.freebsd.org/changeset/base/299550

Log:
  Fixups for beri code to assemble with GAS.
  
  Exclude uboot code as clang just flatout can't build it.

Modified:
  projects/mips64-clang/sys/boot/mips/Makefile
  projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile

Modified: projects/mips64-clang/sys/boot/mips/Makefile
==============================================================================
--- projects/mips64-clang/sys/boot/mips/Makefile	Thu May 12 18:20:36 2016	(r299549)
+++ projects/mips64-clang/sys/boot/mips/Makefile	Thu May 12 18:20:52 2016	(r299550)
@@ -1,17 +1,19 @@
 # $FreeBSD$
 .include <src.opts.mk>
 
-SUBDIR= 	uboot
-
 #
 # The BERI boot loader port works only on 64-bit MIPS; not a hard port to
 # 32-bit if someone is interested.  Build on all 64-bit MIPS platforms to
 # ensure it gets adequate build-test coverage.
 #
 .if ${MACHINE_ARCH} == "mips64" 
-.if ${COMPILER_TYPE} == "gcc"
 SUBDIR+=	beri
 .endif
+
+#
+# clang is unable to compile this uboot code at this time
+.if ${COMPILER_TYPE} == "gcc"
+SUBDIR+=	uboot
 .endif
 
 .include <bsd.subdir.mk>

Modified: projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile
==============================================================================
--- projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile	Thu May 12 18:20:36 2016	(r299549)
+++ projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile	Thu May 12 18:20:52 2016	(r299550)
@@ -46,13 +46,15 @@ MAN=
 
 AFLAGS=		-G0
 
+CFLAGS.gcc+=	-Xassembler -G0
+
 CFLAGS=		-ffreestanding			\
 		-I${.CURDIR}			\
 		-I${.CURDIR}/../../../common	\
 		-I${.CURDIR}/../../../..	\
 		-D_KERNEL			\
 		-Wall				\
-		-G0 -Xassembler -G0		\
+		-G0				\
 		-fno-pic -mno-abicalls		\
 		-msoft-float			\
 		-g
@@ -86,4 +88,8 @@ jtagboot.md5: jtagboot
 
 CLEANFILES+=	flashboot.elf
 
-.include <bsd.prog.mk>
+.include <bsd.lib.mk>
+
+# XXX: clang integrated-as doesn't grok the use of dla in these files
+CFLAGS.relocate.S=       ${CLANG_NO_IAS}
+CFLAGS.start.S=       ${CLANG_NO_IAS}