From owner-svn-src-all@FreeBSD.ORG  Sun Aug  5 14:48:56 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 37EEF10657C1;
	Sun,  5 Aug 2012 14:48:56 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 22F268FC08;
	Sun,  5 Aug 2012 14:48:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q75Emt5r094394;
	Sun, 5 Aug 2012 14:48:55 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75EmtE1094391;
	Sun, 5 Aug 2012 14:48:55 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <201208051448.q75EmtE1094391@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Sun, 5 Aug 2012 14:48:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239069 - in head/sys/boot/pc98: cdboot libpc98
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2012 14:48:56 -0000

Author: nyan
Date: Sun Aug  5 14:48:55 2012
New Revision: 239069
URL: http://svn.freebsd.org/changeset/base/239069

Log:
  Reduce diffs against i386.

Modified:
  head/sys/boot/pc98/cdboot/cdboot.S
  head/sys/boot/pc98/libpc98/Makefile

Modified: head/sys/boot/pc98/cdboot/cdboot.S
==============================================================================
--- head/sys/boot/pc98/cdboot/cdboot.S	Sun Aug  5 14:48:28 2012	(r239068)
+++ head/sys/boot/pc98/cdboot/cdboot.S	Sun Aug  5 14:48:55 2012	(r239069)
@@ -30,14 +30,14 @@
 
 # $FreeBSD$
 
-#include <bootargs.h>
-
 #
 # Basically, we first create a set of boot arguments to pass to the loaded
 # binary.  Then we attempt to load /boot/loader from the CD we were booted
 # off of. 
 #
 
+#include <bootargs.h>
+
 #
 # Memory locations.
 #

Modified: head/sys/boot/pc98/libpc98/Makefile
==============================================================================
--- head/sys/boot/pc98/libpc98/Makefile	Sun Aug  5 14:48:28 2012	(r239068)
+++ head/sys/boot/pc98/libpc98/Makefile	Sun Aug  5 14:48:55 2012	(r239069)
@@ -37,7 +37,8 @@ CFLAGS+= -DTERM_EMU
 # XXX: make alloca() useable
 CFLAGS+= -Dalloca=__builtin_alloca
 
-CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
+CFLAGS+=	-I${.CURDIR}/../../common \
+		-I${.CURDIR}/../btx/lib \
 		-I${.CURDIR}/../../i386/libi386 \
 		-I${.CURDIR}/../../.. -I.
 # the location of libstand