From owner-svn-src-user@freebsd.org Fri Feb 5 08:32:19 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 48EB0A471C7
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 08:32:19 +0000 (UTC)
(envelope-from ngie@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 194D51488;
Fri, 5 Feb 2016 08:32:19 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u158WIWe028222;
Fri, 5 Feb 2016 08:32:18 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u158WIKH028221;
Fri, 5 Feb 2016 08:32:18 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602050832.u158WIKH028221@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 08:32:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295311 - user/ngie/stable-10-libnv/sys/boot/ia64/efi
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 08:32:19 -0000
Author: ngie
Date: Fri Feb 5 08:32:17 2016
New Revision: 295311
URL: https://svnweb.freebsd.org/changeset/base/295311
Log:
Add more MK_ZFS bits from r294999
Modified:
user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:25:20 2016 (r295310)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:32:17 2016 (r295311)
@@ -7,7 +7,22 @@ MK_SSP= no
PROG= loader.sym
INTERNALPROG=
+
+.if ${MK_ZFS} != "no"
+# Disable warnings that are currently incompatible with the zfs boot code
+CWARNFLAGS.zfs_module.c += -Wno-array-bounds
+CWARNFLAGS.zfs_module.c += -Wno-cast-align
+CWARNFLAGS.zfs_module.c += -Wno-cast-qual
+CWARNFLAGS.zfs_module.c += -Wno-missing-prototypes
+CWARNFLAGS.zfs_module.c += -Wno-sign-compare
+CWARNFLAGS.zfs_module.c += -Wno-unused-parameter
+CWARNFLAGS.zfs_module.c += -Wno-unused-function
+.endif
+
SRCS= conf.c efimd.c main.c pal.S start.S vers.c
+.if ${MK_ZFS} != "no"
+SRCS+= zfs_module.c
+.endif
.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
@@ -18,6 +33,12 @@ CFLAGS+= -I${.CURDIR}/../../efi/include/
CFLAGS+= -I${.CURDIR}/../../..
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
+.if ${MK_ZFS} != "no"
+CFLAGS+= -I${.CURDIR}/../../zfs/
+CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs/
+CFLAGS+= -DEFI_ZFS_BOOT
+.endif
+
LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_CPUARCH}
LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic