From owner-svn-src-head@FreeBSD.ORG  Wed Feb 11 15:49:15 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2F883FC9;
 Wed, 11 Feb 2015 15:49:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 1B32D13A;
 Wed, 11 Feb 2015 15:49:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BFnE4Z066518;
 Wed, 11 Feb 2015 15:49:14 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BFnEiC066517;
 Wed, 11 Feb 2015 15:49:14 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201502111549.t1BFnEiC066517@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 11 Feb 2015 15:49:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278582 - head/sys/boot/pc98/boot2
X-SVN-Group: head
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.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 15:49:15 -0000

Author: jhb
Date: Wed Feb 11 15:49:14 2015
New Revision: 278582
URL: https://svnweb.freebsd.org/changeset/base/278582

Log:
  MFi386:
  When building some of the boot loaders with clang, and DEBUG_FLAGS or
  CFLAGS having '-g' in it, clang outputs several assembly directives that
  are too new for our version of binutils.
  
  Therefore, assemble the resulting .s files with clang instead.  A more
  general solution can be implemented when a GNU as-compatible driver for
  clang's integrated assembler appears.
  
  Tested by:	gjb

Modified:
  head/sys/boot/pc98/boot2/Makefile

Modified: head/sys/boot/pc98/boot2/Makefile
==============================================================================
--- head/sys/boot/pc98/boot2/Makefile	Wed Feb 11 15:21:25 2015	(r278581)
+++ head/sys/boot/pc98/boot2/Makefile	Wed Feb 11 15:49:14 2015	(r278582)
@@ -92,6 +92,7 @@ boot2.out: ${BTXCRT} boot2.o sio.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 boot2.o: boot2.s
+	${CC} ${ACFLAGS} -c boot2.s
 
 SRCS=	boot2.c boot2.h