From owner-svn-src-all@freebsd.org  Fri Feb 26 08:06:27 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 008B5AB5633;
 Fri, 26 Feb 2016 08:06:27 +0000 (UTC)
 (envelope-from sgalabov@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 C5661CF6;
 Fri, 26 Feb 2016 08:06:26 +0000 (UTC)
 (envelope-from sgalabov@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1Q86Pfr079476;
 Fri, 26 Feb 2016 08:06:25 GMT (envelope-from sgalabov@FreeBSD.org)
Received: (from sgalabov@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1Q86PR1079474;
 Fri, 26 Feb 2016 08:06:25 GMT (envelope-from sgalabov@FreeBSD.org)
Message-Id: <201602260806.u1Q86PR1079474@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sgalabov set sender to
 sgalabov@FreeBSD.org using -f
From: Stanislav Galabov <sgalabov@FreeBSD.org>
Date: Fri, 26 Feb 2016 08:06:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296079 - in head/sys/boot: ficl mips/beri/loader
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Feb 2016 08:06:27 -0000

Author: sgalabov
Date: Fri Feb 26 08:06:25 2016
New Revision: 296079
URL: https://svnweb.freebsd.org/changeset/base/296079

Log:
  Currently BERI's loader is including the 32-bit version of the FICL MIPS sysdep.h (sys/boot/ficl/mips/sysdep.h) instead of the 64-bit version (sys/boot/ficl/mips64/sysdep.h).
  
  Although this may not be an issue in practice, it would be more correct if the 64-bit version was used. Also, using the 64-bit version would make it easier to add support for 64-bit ubldr on MIPS.
  
  Approved by:	adrian (mentor)
  Differential Revision:	https://reviews.freebsd.org/D5310

Modified:
  head/sys/boot/ficl/Makefile
  head/sys/boot/mips/beri/loader/Makefile

Modified: head/sys/boot/ficl/Makefile
==============================================================================
--- head/sys/boot/ficl/Makefile	Fri Feb 26 03:34:32 2016	(r296078)
+++ head/sys/boot/ficl/Makefile	Fri Feb 26 08:06:25 2016	(r296079)
@@ -55,6 +55,8 @@ CFLAGS+=	-m32 -mcpu=powerpc -I.
 
 .if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
 FICL_CPUARCH=	i386
+.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
+FICL_CPUARCH=	mips64
 .else
 FICL_CPUARCH=	${MACHINE_CPUARCH}
 .endif

Modified: head/sys/boot/mips/beri/loader/Makefile
==============================================================================
--- head/sys/boot/mips/beri/loader/Makefile	Fri Feb 26 03:34:32 2016	(r296078)
+++ head/sys/boot/mips/beri/loader/Makefile	Fri Feb 26 08:06:25 2016	(r296079)
@@ -72,7 +72,7 @@ CFLAGS+=	-DLOADER_BZIP2_SUPPORT
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../../ficl
-CFLAGS+=	-I${.CURDIR}/../../../ficl/mips
+CFLAGS+=	-I${.CURDIR}/../../../ficl/mips64
 LIBFICL=	${.OBJDIR}/../../../ficl/libficl.a
 .endif