From owner-svn-src-stable-9@FreeBSD.ORG  Fri Nov 23 13:55:39 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 32B793D3;
 Fri, 23 Nov 2012 13:55:39 +0000 (UTC)
 (envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 17E748FC08;
 Fri, 23 Nov 2012 13:55:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qANDtc7K026076;
 Fri, 23 Nov 2012 13:55:38 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qANDtc0o026075;
 Fri, 23 Nov 2012 13:55:38 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <201211231355.qANDtc0o026075@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Fri, 23 Nov 2012 13:55:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243452 - stable/9/sys/conf
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Nov 2012 13:55:39 -0000

Author: nyan
Date: Fri Nov 23 13:55:38 2012
New Revision: 243452
URL: http://svnweb.freebsd.org/changeset/base/243452

Log:
  MFC: r242870
  
    Fix build mpboot.s with clang.

Modified:
  stable/9/sys/conf/Makefile.pc98
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/9/sys/conf/Makefile.pc98
==============================================================================
--- stable/9/sys/conf/Makefile.pc98	Fri Nov 23 13:47:41 2012	(r243451)
+++ stable/9/sys/conf/Makefile.pc98	Fri Nov 23 13:55:38 2012	(r243452)
@@ -34,6 +34,10 @@ MACHINE=pc98
 
 MKMODULESENV+=	MACHINE=${MACHINE}
 
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+ASM_CFLAGS.mpboot.s=		${CLANG_NO_IAS}
+ASM_CFLAGS+=			${ASM_CFLAGS.${.IMPSRC:T}}
+
 %BEFORE_DEPEND
 
 %OBJS