From owner-svn-src-user@FreeBSD.ORG Wed Nov 25 05:42:54 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8E86A106566C;
Wed, 25 Nov 2009 05:42:54 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 7E6128FC0A;
Wed, 25 Nov 2009 05:42:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAP5gs7i040689;
Wed, 25 Nov 2009 05:42:54 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAP5gskV040687;
Wed, 25 Nov 2009 05:42:54 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911250542.nAP5gskV040687@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 25 Nov 2009 05:42:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199789 - user/kmacy/releng_8_fcs_buf_xen/sys/conf
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Nov 2009 05:42:54 -0000
Author: kmacy
Date: Wed Nov 25 05:42:54 2009
New Revision: 199789
URL: http://svn.freebsd.org/changeset/base/199789
Log:
make static ZFS compile on 32-bit
Modified:
user/kmacy/releng_8_fcs_buf_xen/sys/conf/kern.pre.mk
Modified: user/kmacy/releng_8_fcs_buf_xen/sys/conf/kern.pre.mk
==============================================================================
--- user/kmacy/releng_8_fcs_buf_xen/sys/conf/kern.pre.mk Wed Nov 25 04:55:50 2009 (r199788)
+++ user/kmacy/releng_8_fcs_buf_xen/sys/conf/kern.pre.mk Wed Nov 25 05:42:54 2009 (r199789)
@@ -127,9 +127,13 @@ CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KE
ZFS_CFLAGS= -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D_KERNEL
ZFS_CFLAGS+=-DHAVE_KERNEL_OPTION_HEADERS -nostdinc
-ZFS_CFLAGS+=-mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -ffreestanding
+ZFS_CFLAGS+= -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -ffreestanding
ZFS_CFLAGS+=${COPTFLAGS} ${ZFS_C_DIALECT} ${DEBUG} ${CWARNFLAGS}
ZFS_CFLAGS+=${ZFS_CWARNFLAGS} -include opt_global.h -I${.CURDIR}
+.if ${MACHINE_ARCH} == "amd64"
+ZFS_CFLAGS+=-mcmodel=kernel
+.endif
+
.if ${CC} != "icc"
CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}