From owner-svn-src-all@freebsd.org Tue Aug 21 03:45:12 2018
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:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA29F1087DB7;
Tue, 21 Aug 2018 03:45:11 +0000 (UTC)
(envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 8E0B970CBF;
Tue, 21 Aug 2018 03:45:11 +0000 (UTC)
(envelope-from mmacy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F00F1EB64;
Tue, 21 Aug 2018 03:45:11 +0000 (UTC)
(envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7L3jBWa035288;
Tue, 21 Aug 2018 03:45:11 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7L3jADR035282;
Tue, 21 Aug 2018 03:45:10 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201808210345.w7L3jADR035282@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Tue, 21 Aug 2018 03:45:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r338128 - in head: cddl/lib/libzpool cddl/usr.bin/ztest
cddl/usr.sbin/zdb sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys sys/conf
sys/modules/zfs
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: in head: cddl/lib/libzpool cddl/usr.bin/ztest
cddl/usr.sbin/zdb sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys sys/conf
sys/modules/zfs
X-SVN-Commit-Revision: 338128
X-SVN-Commit-Repository: base
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.27
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <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: Tue, 21 Aug 2018 03:45:12 -0000
Author: mmacy
Date: Tue Aug 21 03:45:09 2018
New Revision: 338128
URL: https://svnweb.freebsd.org/changeset/base/338128
Log:
Make dnode definition uniform on !x86
gcc4 requires -fms-extensions to accept anonymous union members
Modified:
head/cddl/lib/libzpool/Makefile
head/cddl/usr.bin/ztest/Makefile
head/cddl/usr.sbin/zdb/Makefile
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
head/sys/conf/kern.pre.mk
head/sys/modules/zfs/Makefile
Modified: head/cddl/lib/libzpool/Makefile
==============================================================================
--- head/cddl/lib/libzpool/Makefile Tue Aug 21 03:33:54 2018 (r338127)
+++ head/cddl/lib/libzpool/Makefile Tue Aug 21 03:45:09 2018 (r338128)
@@ -61,6 +61,7 @@ CFLAGS+= -DWANTS_MUTEX_OWNED
CFLAGS+= -I${SRCTOP}/lib/libpthread/thread
CFLAGS+= -I${SRCTOP}/lib/libpthread/sys
CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include
+CFLAGS.gcc+= -fms-extensions
LIBADD= md pthread z nvpair avl umem
Modified: head/cddl/usr.bin/ztest/Makefile
==============================================================================
--- head/cddl/usr.bin/ztest/Makefile Tue Aug 21 03:33:54 2018 (r338127)
+++ head/cddl/usr.bin/ztest/Makefile Tue Aug 21 03:45:09 2018 (r338128)
@@ -24,6 +24,7 @@ CSTD= c99
# Since there are many asserts in this program, it makes no sense to compile
# it without debugging.
CFLAGS+= -g -DDEBUG=1 -Wno-format
+CFLAGS.gcc+= -fms-extensions
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
Modified: head/cddl/usr.sbin/zdb/Makefile
==============================================================================
--- head/cddl/usr.sbin/zdb/Makefile Tue Aug 21 03:33:54 2018 (r338127)
+++ head/cddl/usr.sbin/zdb/Makefile Tue Aug 21 03:45:09 2018 (r338128)
@@ -25,6 +25,7 @@ CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
LIBADD= nvpair umem uutil zfs zpool
+CFLAGS.gcc+= -fms-extensions
# Since there are many asserts in this program, it makes no sense to compile
# it without debugging.
CFLAGS+= -g -DDEBUG=1
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h Tue Aug 21 03:33:54 2018 (r338127)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h Tue Aug 21 03:45:09 2018 (r338128)
@@ -185,7 +185,6 @@ typedef struct dnode_phys {
* | dn_blkptr[0] | dn_bonus[0..191] | dn_spill |
* +---------------+-----------------------+---------------+
*/
-#if defined(__i386__) || defined(__amd64__)
union {
blkptr_t dn_blkptr[1+DN_OLD_MAX_BONUSLEN/sizeof (blkptr_t)];
struct {
@@ -199,11 +198,6 @@ typedef struct dnode_phys {
blkptr_t dn_spill;
};
};
-#else
- blkptr_t dn_blkptr[1];
- uint8_t dn_bonus[DN_OLD_MAX_BONUSLEN - sizeof (blkptr_t)];
- blkptr_t dn_spill;
-#endif
} dnode_phys_t;
#define DN_SPILL_BLKPTR(dnp) (blkptr_t *)((char *)(dnp) + \
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Tue Aug 21 03:33:54 2018 (r338127)
+++ head/sys/conf/kern.pre.mk Tue Aug 21 03:45:09 2018 (r338128)
@@ -89,6 +89,7 @@ CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=10
CFLAGS.gcc+= -fno-common -fms-extensions -finline-limit=${INLINE_LIMIT}
CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
CFLAGS.gcc+= --param large-function-growth=${CFLAGS_PARAM_LARGE_FUNCTION_GROWTH}
+CFLAGS.gcc+= -fms-extensions
.if defined(CFLAGS_ARCH_PARAMS)
CFLAGS.gcc+=${CFLAGS_ARCH_PARAMS}
.endif
Modified: head/sys/modules/zfs/Makefile
==============================================================================
--- head/sys/modules/zfs/Makefile Tue Aug 21 03:33:54 2018 (r338127)
+++ head/sys/modules/zfs/Makefile Tue Aug 21 03:45:09 2018 (r338128)
@@ -95,6 +95,7 @@ CFLAGS+=-I${SYSDIR}
CFLAGS+=-I${SUNW}/common/zfs
CFLAGS+=-I${SUNW}/common
CFLAGS+=-DBUILDING_ZFS
+CFLAGS.gcc+=-fms-extensions
.if ${MACHINE_ARCH} == "powerpc64"
CFLAGS.gcc+=-mminimal-toc