From owner-svn-src-stable-9@FreeBSD.ORG Mon May 11 08:31:39 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9FA45EB; Mon, 11 May 2015 08:31:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D891D1FDC; Mon, 11 May 2015 08:31:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4B8Vd6w007773; Mon, 11 May 2015 08:31:39 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4B8VdOH007772; Mon, 11 May 2015 08:31:39 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201505110831.t4B8VdOH007772@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 11 May 2015 08:31:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282752 - stable/9/cddl/contrib/opensolaris/lib/libnvpair X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 08:31:40 -0000 Author: avg Date: Mon May 11 08:31:39 2015 New Revision: 282752 URL: https://svnweb.freebsd.org/changeset/base/282752 Log: MFC r282121: dump_nvlist: handle DATA_TYPE_BOOLEAN_ARRAY Modified: stable/9/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Directory Properties: stable/9/cddl/contrib/opensolaris/lib/libnvpair/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Mon May 11 08:30:57 2015 (r282751) +++ stable/9/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Mon May 11 08:31:39 2015 (r282752) @@ -793,6 +793,7 @@ dump_nvlist(nvlist_t *list, int indent) { nvpair_t *elem = NULL; boolean_t bool_value; + boolean_t *bool_array_value; nvlist_t *nvlist_value; nvlist_t **nvlist_array_value; uint_t i, count; @@ -853,6 +854,16 @@ dump_nvlist(nvlist_t *list, int indent) NVP(elem, string, char *, char *, "'%s'"); break; + case DATA_TYPE_BOOLEAN_ARRAY: + (void) nvpair_value_boolean_array(elem, + &bool_array_value, &count); + for (i = 0; i < count; i++) { + (void) printf("%*s%s[%d]: %s\n", indent, "", + nvpair_name(elem), i, + bool_array_value[i] ? "true" : "false"); + } + break; + case DATA_TYPE_BYTE_ARRAY: NVPA(elem, byte_array, uchar_t, int, "%u"); break; From owner-svn-src-stable-9@FreeBSD.ORG Mon May 11 08:34:09 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35B268A6; Mon, 11 May 2015 08:34:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2444D1007; Mon, 11 May 2015 08:34:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4B8Y9vY008370; Mon, 11 May 2015 08:34:09 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4B8Y85Z008369; Mon, 11 May 2015 08:34:09 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201505110834.t4B8Y85Z008369@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 11 May 2015 08:34:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282754 - stable/9/sys/cddl/contrib/opensolaris/common/nvpair X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 08:34:09 -0000 Author: avg Date: Mon May 11 08:34:08 2015 New Revision: 282754 URL: https://svnweb.freebsd.org/changeset/base/282754 Log: MFC r282122: nvpair_type_is_array: DATA_TYPE_INT8_ARRAY was not recognized Modified: stable/9/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c Mon May 11 08:33:49 2015 (r282753) +++ stable/9/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c Mon May 11 08:34:08 2015 (r282754) @@ -1227,6 +1227,7 @@ nvpair_type_is_array(nvpair_t *nvp) data_type_t type = NVP_TYPE(nvp); if ((type == DATA_TYPE_BYTE_ARRAY) || + (type == DATA_TYPE_INT8_ARRAY) || (type == DATA_TYPE_UINT8_ARRAY) || (type == DATA_TYPE_INT16_ARRAY) || (type == DATA_TYPE_UINT16_ARRAY) || From owner-svn-src-stable-9@FreeBSD.ORG Mon May 11 08:41:23 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 17312F93; Mon, 11 May 2015 08:41:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 DFCA41159; Mon, 11 May 2015 08:41:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4B8fMl6009981; Mon, 11 May 2015 08:41:22 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4B8fM5C009979; Mon, 11 May 2015 08:41:22 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201505110841.t4B8fM5C009979@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 11 May 2015 08:41:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282757 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 08:41:23 -0000 Author: avg Date: Mon May 11 08:41:21 2015 New Revision: 282757 URL: https://svnweb.freebsd.org/changeset/base/282757 Log: MFC r282126: FV r282123: 5610 zfs clone from different source and target pools Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c Mon May 11 08:40:55 2015 (r282756) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c Mon May 11 08:41:21 2015 (r282757) @@ -23,6 +23,7 @@ * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. */ /* Portions Copyright 2010 Robert Milkowski */ @@ -842,11 +843,7 @@ dmu_objset_clone_check(void *arg, dmu_tx dsl_dir_rele(pdd, FTAG); return (SET_ERROR(EEXIST)); } - /* You can't clone across pools. */ - if (pdd->dd_pool != dp) { - dsl_dir_rele(pdd, FTAG); - return (SET_ERROR(EXDEV)); - } + error = dsl_fs_ss_limit_check(pdd, 1, ZFS_PROP_FILESYSTEM_LIMIT, NULL, doca->doca_cred); if (error != 0) { @@ -859,12 +856,6 @@ dmu_objset_clone_check(void *arg, dmu_tx if (error != 0) return (error); - /* You can't clone across pools. */ - if (origin->ds_dir->dd_pool != dp) { - dsl_dataset_rele(origin, FTAG); - return (SET_ERROR(EXDEV)); - } - /* You can only clone snapshots, not the head datasets. */ if (!dsl_dataset_is_snapshot(origin)) { dsl_dataset_rele(origin, FTAG); Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May 11 08:40:55 2015 (r282756) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May 11 08:41:21 2015 (r282757) @@ -24,6 +24,7 @@ * All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2014 Joyent, Inc. All rights reserved. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. */ #include @@ -404,7 +405,7 @@ dsl_dir_hold(dsl_pool_t *dp, const char /* Make sure the name is in the specified pool. */ spaname = spa_name(dp->dp_spa); if (strcmp(buf, spaname) != 0) - return (SET_ERROR(EINVAL)); + return (SET_ERROR(EXDEV)); ASSERT(dsl_pool_config_held(dp)); From owner-svn-src-stable-9@FreeBSD.ORG Mon May 11 08:43:38 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 291BD2EC; Mon, 11 May 2015 08:43:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 1765D117B; Mon, 11 May 2015 08:43:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4B8hbhl013419; Mon, 11 May 2015 08:43:37 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4B8hbWd013418; Mon, 11 May 2015 08:43:37 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201505110843.t4B8hbWd013418@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 11 May 2015 08:43:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282759 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 08:43:38 -0000 Author: avg Date: Mon May 11 08:43:37 2015 New Revision: 282759 URL: https://svnweb.freebsd.org/changeset/base/282759 Log: MFC r282127: dsl_dir_rename_check: return EXDEV on cross-pool rename attempt Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May 11 08:43:20 2015 (r282758) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May 11 08:43:37 2015 (r282759) @@ -1698,7 +1698,7 @@ dsl_dir_rename_check(void *arg, dmu_tx_t if (dd->dd_pool != newparent->dd_pool) { dsl_dir_rele(newparent, FTAG); dsl_dir_rele(dd, FTAG); - return (SET_ERROR(ENXIO)); + return (SET_ERROR(EXDEV)); } /* new name should not already exist */ From owner-svn-src-stable-9@FreeBSD.ORG Mon May 11 08:46:24 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48AAF587; Mon, 11 May 2015 08:46:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 36E801199; Mon, 11 May 2015 08:46:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4B8kOns013940; Mon, 11 May 2015 08:46:24 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4B8kOrU013938; Mon, 11 May 2015 08:46:24 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201505110846.t4B8kOrU013938@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 11 May 2015 08:46:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282761 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 08:46:24 -0000 Author: avg Date: Mon May 11 08:46:23 2015 New Revision: 282761 URL: https://svnweb.freebsd.org/changeset/base/282761 Log: MFC r282130: zfs_onexit_fd_hold: return EBADF even if devfs_get_cdevpriv gave ENOENT Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Mon May 11 08:46:03 2015 (r282760) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Mon May 11 08:46:23 2015 (r282761) @@ -136,7 +136,7 @@ zfs_onexit_fd_hold(int fd, minor_t *mino *minorp = (minor_t)(uintptr_t)data; curthread->td_fpop = tmpfp; if (error != 0) - return (error); + return (SET_ERROR(EBADF)); return (zfs_onexit_minor_to_state(*minorp, &zo)); } From owner-svn-src-stable-9@FreeBSD.ORG Mon May 11 09:43:17 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 583C3AE2; Mon, 11 May 2015 09:43:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2C528185B; Mon, 11 May 2015 09:43:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4B9hHBC043138; Mon, 11 May 2015 09:43:17 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4B9hHTS043137; Mon, 11 May 2015 09:43:17 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201505110943.t4B9hHTS043137@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 11 May 2015 09:43:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282765 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 09:43:17 -0000 Author: avg Date: Mon May 11 09:43:16 2015 New Revision: 282765 URL: https://svnweb.freebsd.org/changeset/base/282765 Log: MFC r282131: replace a comment about zfs recv -F corner case with a longer one Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Mon May 11 09:43:03 2015 (r282764) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Mon May 11 09:43:16 2015 (r282765) @@ -1319,15 +1319,25 @@ zfs_rezget(znode_t *zp) } /* - * XXXPJD: Not sure how is that possible, but under heavy - * zfs recv -F load it happens that z_gen is the same, but - * vnode type is different than znode type. This would mean - * that for example regular file was replaced with directory - * which has the same object number. + * It is highly improbable but still quite possible that two + * objects in different datasets are created with the same + * object numbers and in transaction groups with the same + * numbers. znodes corresponding to those objects would + * have the same z_id and z_gen, but their other attributes + * may be different. + * zfs recv -F may replace one of such objects with the other. + * As a result file properties recorded in the replaced + * object's vnode may no longer match the received object's + * properties. At present the only cached property is the + * files type recorded in v_type. + * So, handle this case by leaving the old vnode and znode + * disassociated from the actual object. A new vnode and a + * znode will be created if the object is accessed + * (e.g. via a look-up). The old vnode and znode will be + * recycled when the last vnode reference is dropped. */ vp = ZTOV(zp); - if (vp != NULL && - vp->v_type != IFTOVT((mode_t)zp->z_mode)) { + if (vp != NULL && vp->v_type != IFTOVT((mode_t)zp->z_mode)) { zfs_znode_dmu_fini(zp); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); return (EIO); From owner-svn-src-stable-9@FreeBSD.ORG Wed May 13 10:17:35 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8533CCDC; Wed, 13 May 2015 10:17:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 58A311F13; Wed, 13 May 2015 10:17:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DAHZ2v085964; Wed, 13 May 2015 10:17:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DAHZvU085963; Wed, 13 May 2015 10:17:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201505131017.t4DAHZvU085963@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 13 May 2015 10:17:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282838 - stable/9/tools/regression/gaithrstress X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2015 10:17:35 -0000 Author: ngie Date: Wed May 13 10:17:34 2015 New Revision: 282838 URL: https://svnweb.freebsd.org/changeset/base/282838 Log: MFC r282062: Fix -Wformat warnings by using proper format string qualifiers for long and unsigned[ long] types Modified: stable/9/tools/regression/gaithrstress/gaithrstress.c Directory Properties: stable/9/ (props changed) stable/9/tools/ (props changed) stable/9/tools/regression/ (props changed) Modified: stable/9/tools/regression/gaithrstress/gaithrstress.c ============================================================================== --- stable/9/tools/regression/gaithrstress/gaithrstress.c Wed May 13 10:15:26 2015 (r282837) +++ stable/9/tools/regression/gaithrstress/gaithrstress.c Wed May 13 10:17:34 2015 (r282838) @@ -230,7 +230,7 @@ usage: err(1, "reading word file %s", wordfile); if (nrandwords < 1) errx(1, "word file %s did not have >0 words", wordfile); - printf("Read %u random words from %s.\n", nrandwords, wordfile); + printf("Read %zu random words from %s.\n", nrandwords, wordfile); workers = calloc(nworkers, sizeof(*workers)); if (workers == NULL) err(1, "allocating workers"); @@ -242,8 +242,8 @@ usage: for (i = 0; i < nworkers; i++) { if (pthread_create(&workers[i].w_thread, NULL, work, &workers[i]) != 0) - err(1, "creating worker %u", i); - printf("%u%s", i, i == nworkers - 1 ? ".\n" : ", "); + err(1, "creating worker %zu", i); + printf("%zu%s", i, i == nworkers - 1 ? ".\n" : ", "); fflush(stdout); } @@ -255,7 +255,7 @@ usage: fflush(stdout); for (i = 0; i < nworkers; i++) { pthread_join(workers[i].w_thread, NULL); - printf("%u%s", i, i == nworkers - 1 ? ".\n" : ", "); + printf("%zu%s", i, i == nworkers - 1 ? ".\n" : ", "); fflush(stdout); } @@ -264,7 +264,7 @@ usage: printf("%-10s%-20s%-20s%-29s\n", "------", "--------------", "----------", "---------------------------"); for (i = 0; i < nworkers; i++) { - printf("%-10u%-20ju%-20ju%u:%s%.2f\n", i, + printf("%-10zu%-20ju%-20ju%ld:%s%.2f\n", i, workers[i].w_lookup_success, workers[i].w_lookup_failure, workers[i].w_max_lookup_time.tv_sec / 60, workers[i].w_max_lookup_time.tv_sec % 60 < 10 ? "0" : "", From owner-svn-src-stable-9@FreeBSD.ORG Wed May 13 10:43:51 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E884DE40; Wed, 13 May 2015 10:43:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D598B12E7; Wed, 13 May 2015 10:43:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DAhoQY001448; Wed, 13 May 2015 10:43:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DAhoqA001446; Wed, 13 May 2015 10:43:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201505131043.t4DAhoqA001446@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 13 May 2015 10:43:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282847 - in stable/9/sys: dev/ixgbe sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2015 10:43:51 -0000 Author: ngie Date: Wed May 13 10:43:49 2015 New Revision: 282847 URL: https://svnweb.freebsd.org/changeset/base/282847 Log: MFstable/10 r281951,r281954: r281951: Backport MHSIZE/MPKTHSIZE equivalents from head These macros are equivalent to the ones on head, except they are only exposed when _KERNEL is defined, i.e. to kernel code, whereas the code on head is exposed to userland as well This is for improved forwards compatibility with mbuf(9) macros in head@r277203+, and is required for a clean MFC of r279393 This is a direct commit to stable/10 Differential Revision: https://reviews.freebsd.org/D2126 Reviewed by: glebius, rwatson Sponsored by: EMC / Isilon Storage Division r281954: MFC r279393: Pad RX copy alignment calculation to avoid illegal memory accesses The optimization made in r239940 is valid for struct mbuf's current structure and size in FreeBSD, but hardcodes assumptions about sizes of struct mbuf, which are unfortunately broken if additional data is added to the beginning of struct mbuf X-MFC note (discussed with rwatson): This change requires the MPKTHSIZE definition, which is only available after head@r277203 and will not be MFCed as it breaks mbuf(9) KPI. A direct commit to stable/10 and merges to other branches to add the necessary definitions to work with the code as-is will be done to facilitate this MFC PR: 194314 Approved/Reviewed by: erj, jfv Sponsored by: EMC / Isilon Storage Division Modified: stable/9/sys/dev/ixgbe/ixgbe.h stable/9/sys/sys/mbuf.h Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/sys/dev/ixgbe/ixgbe.h ============================================================================== --- stable/9/sys/dev/ixgbe/ixgbe.h Wed May 13 10:35:34 2015 (r282846) +++ stable/9/sys/dev/ixgbe/ixgbe.h Wed May 13 10:43:49 2015 (r282847) @@ -160,8 +160,9 @@ * modern Intel CPUs, results in 40 bytes wasted and a significant drop * in observed efficiency of the optimization, 97.9% -> 81.8%. */ -#define IXGBE_RX_COPY_LEN 160 -#define IXGBE_RX_COPY_ALIGN (MHLEN - IXGBE_RX_COPY_LEN) +#define IXGBE_RX_COPY_HDR_PADDED ((((MPKTHSIZE - 1) / 32) + 1) * 32) +#define IXGBE_RX_COPY_LEN (MSIZE - IXGBE_RX_COPY_HDR_PADDED) +#define IXGBE_RX_COPY_ALIGN (IXGBE_RX_COPY_HDR_PADDED - MPKTHSIZE) /* Keep older OS drivers building... */ #if !defined(SYSCTL_ADD_UQUAD) Modified: stable/9/sys/sys/mbuf.h ============================================================================== --- stable/9/sys/sys/mbuf.h Wed May 13 10:35:34 2015 (r282846) +++ stable/9/sys/sys/mbuf.h Wed May 13 10:43:49 2015 (r282847) @@ -174,6 +174,16 @@ struct mbuf { #define m_pktdat M_dat.MH.MH_dat.MH_databuf #define m_dat M_dat.M_databuf +/* + * NOTE: forwards compatibility definitions for mbuf(9) + * + * These aren't 1:1 with the macros in r277203; in particular they're exposed + * to both userland and kernel, whereas this is exposed to just _KERNEL -- to + * avoid disruption with existing KBI/KPIs + */ +#define MHSIZE offsetof(struct mbuf, m_dat) +#define MPKTHSIZE offsetof(struct mbuf, m_pktdat) + /* * mbuf flags. */ From owner-svn-src-stable-9@FreeBSD.ORG Wed May 13 11:07:41 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4338914; Wed, 13 May 2015 11:07:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 85184162A; Wed, 13 May 2015 11:07:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DB7fBl012224; Wed, 13 May 2015 11:07:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DB7f1w012222; Wed, 13 May 2015 11:07:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201505131107.t4DB7f1w012222@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 13 May 2015 11:07:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282852 - stable/9/tools/regression/mmap X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2015 11:07:41 -0000 Author: ngie Date: Wed May 13 11:07:40 2015 New Revision: 282852 URL: https://svnweb.freebsd.org/changeset/base/282852 Log: MFstable/10 r282851: MFC r282075: Convert this testcase over to a TAP format testcase Modified: stable/9/tools/regression/mmap/mmap.c Directory Properties: stable/9/ (props changed) stable/9/tools/ (props changed) stable/9/tools/regression/ (props changed) Modified: stable/9/tools/regression/mmap/mmap.c ============================================================================== --- stable/9/tools/regression/mmap/mmap.c Wed May 13 11:06:12 2015 (r282851) +++ stable/9/tools/regression/mmap/mmap.c Wed May 13 11:07:40 2015 (r282852) @@ -31,10 +31,11 @@ #include #include +#include #include -#include +#include -const struct tests { +static const struct { void *addr; int ok[2]; /* Depending on security.bsd.map_at_zero {0, !=0}. */ } tests[] = { @@ -49,6 +50,8 @@ const struct tests { { (void *)(0x1000 * PAGE_SIZE), { 1, 1 } }, }; +#define MAP_AT_ZERO "security.bsd.map_at_zero" + int main(void) { @@ -60,37 +63,43 @@ main(void) /* Get the current sysctl value of security.bsd.map_at_zero. */ len = sizeof(mib) / sizeof(*mib); - if (sysctlnametomib("security.bsd.map_at_zero", mib, &len) == -1) - err(1, "sysctlnametomib(security.bsd.map_at_zero)"); + if (sysctlnametomib(MAP_AT_ZERO, mib, &len) == -1) { + printf("1..0 # SKIP: sysctlnametomib(\"%s\") failed: %s\n", + MAP_AT_ZERO, strerror(errno)); + return (0); + } len = sizeof(map_at_zero); - if (sysctl(mib, 3, &map_at_zero, &len, NULL, 0) == -1) - err(1, "sysctl(security.bsd.map_at_zero)"); + if (sysctl(mib, 3, &map_at_zero, &len, NULL, 0) == -1) { + printf("1..0 # SKIP: sysctl for %s failed: %s\n", MAP_AT_ZERO, + strerror(errno)); + return (0); + } /* Normalize to 0 or 1 for array access. */ map_at_zero = !!map_at_zero; - for (i=0; i < (sizeof(tests) / sizeof(*tests)); i++) { + printf("1..%zu\n", nitems(tests)); + for (i = 0; i < (int)nitems(tests); i++) { p = mmap((void *)tests[i].addr, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_FIXED, -1, 0); if (p == MAP_FAILED) { if (tests[i].ok[map_at_zero] != 0) error++; - warnx("%s: mmap(%p, ...) failed.", - (tests[i].ok[map_at_zero] == 0) ? "OK " : "ERR", - tests[i].addr); + printf("%sok %d # mmap(%p, ...) failed\n", + tests[i].ok[map_at_zero] == 0 ? "" : "not ", + i + 1, + tests[i].addr); } else { if (tests[i].ok[map_at_zero] != 1) error++; - warnx("%s: mmap(%p, ...) succeeded: p=%p", - (tests[i].ok[map_at_zero] == 1) ? "OK " : "ERR", + printf("%sok %d # mmap(%p, ...) succeeded: p=%p\n", + tests[i].ok[map_at_zero] == 1 ? "" : "not ", + i + 1, tests[i].addr, p); } } - if (error) - err(1, "---\nERROR: %d unexpected results.", error); - return (error != 0); } From owner-svn-src-stable-9@FreeBSD.ORG Wed May 13 22:36:53 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86E5B427; Wed, 13 May 2015 22:36:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 68757105A; Wed, 13 May 2015 22:36:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DMarmT059189; Wed, 13 May 2015 22:36:53 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DMaqgD059187; Wed, 13 May 2015 22:36:52 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505132236.t4DMaqgD059187@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 13 May 2015 22:36:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282871 - stable/9/usr.sbin/freebsd-update X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2015 22:36:53 -0000 Author: delphij Date: Wed May 13 22:36:52 2015 New Revision: 282871 URL: https://svnweb.freebsd.org/changeset/base/282871 Log: MFC r279571,281563 (allanjude): Add a new safetly belt to freebsd-update to prevent a user doing a minor update (-pX) while having an unfinished major upgrade (9.x to 9.y) Safetly belt can be disabled with the -F flag Additionally, add the --not-running-from-cron flag they bypasses the TTY requirement, and allows freebsd-update to be invoked by orchestration frameworks, scripts, or otherwise. PR: 196760 Modified: stable/9/usr.sbin/freebsd-update/freebsd-update.8 stable/9/usr.sbin/freebsd-update/freebsd-update.sh Directory Properties: stable/9/usr.sbin/freebsd-update/ (props changed) Modified: stable/9/usr.sbin/freebsd-update/freebsd-update.8 ============================================================================== --- stable/9/usr.sbin/freebsd-update/freebsd-update.8 Wed May 13 22:36:00 2015 (r282870) +++ stable/9/usr.sbin/freebsd-update/freebsd-update.8 Wed May 13 22:36:52 2015 (r282871) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 14, 2010 +.Dd March 2, 2015 .Dt FREEBSD-UPDATE 8 .Os FreeBSD .Sh NAME @@ -36,10 +36,12 @@ .Op Fl b Ar basedir .Op Fl d Ar workdir .Op Fl f Ar conffile +.Op Fl F .Op Fl k Ar KEY .Op Fl r Ar newrelease .Op Fl s Ar server .Op Fl t Ar address +.Op Fl -not-running-from-cron .Cm command ... .Sh DESCRIPTION The @@ -54,16 +56,16 @@ by the .Fx Release Engineering Team, e.g., .Fx -7.3-RELEASE and +9.3-RELEASE and .Fx -8.0-RELEASE, but not +10.1-RELEASE, but not .Fx -6.3-STABLE or +9.3-STABLE or .Fx -9.0-CURRENT. +11-CURRENT. .Sh OPTIONS The following options are supported: -.Bl -tag -width "-f conffile" +.Bl -tag -width "-r newrelease" .It Fl b Ar basedir Operate on a system mounted at .Ar basedir . @@ -81,6 +83,10 @@ Read configuration options from .Ar conffile . (default: .Pa /etc/freebsd-update.conf ) +.It Fl F +Force +.Nm Cm fetch +to proceed where it normally would not, such as an unfinished upgrade .It Fl k Ar KEY Trust an RSA key with SHA256 of .Ar KEY . @@ -98,12 +104,21 @@ Mail output of command, if any, to .Ar address . (default: root, or as given in the configuration file.) +.It Fl -not-running-from-cron +Force +.Nm Cm fetch +to proceed when there is no controlling tty. +This is for use by automated scripts and orchestration tools. +Please do not run +.Nm Cm fetch +from crontab or similar using this flag, see: +.Nm Cm cron .El .Sh COMMANDS The .Cm command can be any one of the following: -.Bl -tag -width "-f conffile" +.Bl -tag -width "rollback" .It Cm fetch Based on the currently installed world and the configuration options set, fetch all available binary updates. Modified: stable/9/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- stable/9/usr.sbin/freebsd-update/freebsd-update.sh Wed May 13 22:36:00 2015 (r282870) +++ stable/9/usr.sbin/freebsd-update/freebsd-update.sh Wed May 13 22:36:52 2015 (r282871) @@ -43,12 +43,15 @@ Options: (default: /var/db/freebsd-update/) -f conffile -- Read configuration options from conffile (default: /etc/freebsd-update.conf) + -F -- Force a fetch operation to proceed -k KEY -- Trust an RSA key with SHA256 hash of KEY -r release -- Target for upgrade (e.g., 6.2-RELEASE) -s server -- Server from which to fetch updates (default: update.FreeBSD.org) -t address -- Mail output of cron command, if any, to address (default: root) + --not-running-from-cron + -- Run without a tty, for use by automated tools Commands: fetch -- Fetch updates from server cron -- Sleep rand(3600) seconds, fetch updates, and send an @@ -399,6 +402,12 @@ init_params () { # No commands specified yet COMMANDS="" + + # Force fetch to proceed + FORCEFETCH=0 + + # Run without a TTY + NOTTYOK=0 } # Parse the command line @@ -411,6 +420,12 @@ parse_cmdline () { if [ ! -z "${CONFFILE}" ]; then usage; fi shift; CONFFILE="$1" ;; + -F) + FORCEFETCH=1 + ;; + --not-running-from-cron) + NOTTYOK=1 + ;; # Configuration file equivalents -b) @@ -665,6 +680,14 @@ fetch_check_params () { echo "(Did you mean 'upgrade' instead?)" exit 1 fi + + # Check that we have updates ready to install + if [ -f ${BDHASH}-install/kerneldone -a $FORCEFETCH -eq 0 ]; then + echo "You have a partially completed upgrade pending" + echo "Run '$0 install' first." + echo "Run '$0 fetch -F' to proceed anyway." + exit 1 + fi } # Perform sanity checks etc. before fetching upgrades. @@ -3202,7 +3225,7 @@ get_params () { # Fetch command. Make sure that we're being called # interactively, then run fetch_check_params and fetch_run cmd_fetch () { - if [ ! -t 0 ]; then + if [ ! -t 0 -a $NOTTYOK -eq 0 ]; then echo -n "`basename $0` fetch should not " echo "be run non-interactively." echo "Run `basename $0` cron instead." From owner-svn-src-stable-9@FreeBSD.ORG Thu May 14 04:05:36 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D024E9D; Thu, 14 May 2015 04:05:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2AF311575; Thu, 14 May 2015 04:05:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4E45at3023091; Thu, 14 May 2015 04:05:36 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4E45asG023090; Thu, 14 May 2015 04:05:36 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505140405.t4E45asG023090@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 14 May 2015 04:05:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282875 - in stable: 10/release/doc/share/xml 8/release/doc/share/xml 9/release/doc/share/xml X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 May 2015 04:05:36 -0000 Author: gjb Date: Thu May 14 04:05:34 2015 New Revision: 282875 URL: https://svnweb.freebsd.org/changeset/base/282875 Log: Document EN-15:04 and EN-15:05. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/doc/share/xml/errata.xml Changes in other areas also in this revision: Modified: stable/10/release/doc/share/xml/errata.xml stable/8/release/doc/share/xml/errata.xml Modified: stable/9/release/doc/share/xml/errata.xml ============================================================================== --- stable/9/release/doc/share/xml/errata.xml Wed May 13 22:52:51 2015 (r282874) +++ stable/9/release/doc/share/xml/errata.xml Thu May 14 04:05:34 2015 (r282875) @@ -71,6 +71,14 @@ &man.freebsd-update.8; updates libraries in suboptimal order + + + FreeBSD-EN-15:04.freebsd-update + 13 May 2015 + &man.freebsd-update.8; does not ensure the + previous upgrade has completed + From owner-svn-src-stable-9@FreeBSD.ORG Thu May 14 05:19:30 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB4CAA6E; Thu, 14 May 2015 05:19:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A94401C2A; Thu, 14 May 2015 05:19:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4E5JU7i057797; Thu, 14 May 2015 05:19:30 GMT (envelope-from yongari@FreeBSD.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4E5JUNg057796; Thu, 14 May 2015 05:19:30 GMT (envelope-from yongari@FreeBSD.org) Message-Id: <201505140519.t4E5JUNg057796@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: yongari set sender to yongari@FreeBSD.org using -f From: Pyun YongHyeon Date: Thu, 14 May 2015 05:19:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282879 - stable/9/sys/dev/mii X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 May 2015 05:19:30 -0000 Author: yongari Date: Thu May 14 05:19:29 2015 New Revision: 282879 URL: https://svnweb.freebsd.org/changeset/base/282879 Log: MFC r281877: Add another variant of BCM5708S controller to IBM HS21 workaround list. PR: 118238 Modified: stable/9/sys/dev/mii/brgphy.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/dev/mii/brgphy.c ============================================================================== --- stable/9/sys/dev/mii/brgphy.c Thu May 14 05:10:42 2015 (r282878) +++ stable/9/sys/dev/mii/brgphy.c Thu May 14 05:19:29 2015 (r282879) @@ -158,25 +158,33 @@ static const struct mii_phy_funcs brgphy brgphy_reset }; -#define HS21_PRODUCT_ID "IBM eServer BladeCenter HS21" -#define HS21_BCM_CHIPID 0x57081021 +static const struct hs21_type { + const uint32_t id; + const char *prod; +} hs21_type_lists[] = { + { 0x57081021, "IBM eServer BladeCenter HS21" }, + { 0x57081011, "IBM eServer BladeCenter HS21 -[8853PAU]-" }, +}; static int detect_hs21(struct bce_softc *bce_sc) { char *sysenv; - int found; + int found, i; found = 0; - if (bce_sc->bce_chipid == HS21_BCM_CHIPID) { - sysenv = getenv("smbios.system.product"); - if (sysenv != NULL) { - if (strncmp(sysenv, HS21_PRODUCT_ID, - strlen(HS21_PRODUCT_ID)) == 0) - found = 1; - freeenv(sysenv); + sysenv = getenv("smbios.system.product"); + if (sysenv == NULL) + return (found); + for (i = 0; i < nitems(hs21_type_lists); i++) { + if (bce_sc->bce_chipid == hs21_type_lists[i].id && + strncmp(sysenv, hs21_type_lists[i].prod, + strlen(hs21_type_lists[i].prod)) == 0) { + found++; + break; } } + freeenv(sysenv); return (found); } From owner-svn-src-stable-9@FreeBSD.ORG Thu May 14 11:52:27 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB15BA9D; Thu, 14 May 2015 11:52:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D9CD9199A; Thu, 14 May 2015 11:52:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4EBqRcb080208; Thu, 14 May 2015 11:52:27 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4EBqRfR080206; Thu, 14 May 2015 11:52:27 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201505141152.t4EBqRfR080206@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Thu, 14 May 2015 11:52:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282895 - stable/9/sys/netinet6 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 May 2015 11:52:28 -0000 Author: ae Date: Thu May 14 11:52:27 2015 New Revision: 282895 URL: https://svnweb.freebsd.org/changeset/base/282895 Log: MFC r282578: Mark data checksum as valid for multicast packets, that we send back to myself via simloop. Also remove duplicate check under #ifdef DIAGNOSTIC. PR: 180065 Modified: stable/9/sys/netinet6/ip6_output.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netinet6/ip6_output.c ============================================================================== --- stable/9/sys/netinet6/ip6_output.c Thu May 14 11:47:18 2015 (r282894) +++ stable/9/sys/netinet6/ip6_output.c Thu May 14 11:52:27 2015 (r282895) @@ -3005,14 +3005,6 @@ ip6_mloopback(struct ifnet *ifp, struct if (copym == NULL) return; } - -#ifdef DIAGNOSTIC - if (copym->m_len < sizeof(*ip6)) { - m_freem(copym); - return; - } -#endif - ip6 = mtod(copym, struct ip6_hdr *); /* * clear embedded scope identifiers if necessary. @@ -3020,7 +3012,11 @@ ip6_mloopback(struct ifnet *ifp, struct */ in6_clearscope(&ip6->ip6_src); in6_clearscope(&ip6->ip6_dst); - + if (copym->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) { + copym->m_pkthdr.csum_flags |= CSUM_DATA_VALID_IPV6 | + CSUM_PSEUDO_HDR; + copym->m_pkthdr.csum_data = 0xffff; + } (void)if_simloop(ifp, copym, dst->sin6_family, 0); } From owner-svn-src-stable-9@FreeBSD.ORG Thu May 14 19:32:14 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E9E9910; Thu, 14 May 2015 19:32:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 234B71872; Thu, 14 May 2015 19:32:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4EJWEAd007979; Thu, 14 May 2015 19:32:14 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4EJWDIn007978; Thu, 14 May 2015 19:32:13 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201505141932.t4EJWDIn007978@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Thu, 14 May 2015 19:32:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282917 - stable/9/bin/cp X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 May 2015 19:32:14 -0000 Author: jilles Date: Thu May 14 19:32:13 2015 New Revision: 282917 URL: https://svnweb.freebsd.org/changeset/base/282917 Log: MFC r282482: cp: Remove fts sorting. In an attempt to improve performance, cp reordered directories first (although the comment says directories last). This is not effective with new UFS layout policies. The sorting reorders multiple arguments passed to cp, which may be undesirable. Additionally, the comparison function does not induce a total order. Per POSIX, this causes undefined behaviour in qsort(). NetBSD removed the sorting in 2009. On filesystems that return directory entries in hash/btree order, sorting by d_fileno before statting improves performance on large directories. However, this can only be implemented in fts(3). PR: 53475 Reviewed by: bde (in 2004) Modified: stable/9/bin/cp/cp.c Directory Properties: stable/9/bin/cp/ (props changed) Modified: stable/9/bin/cp/cp.c ============================================================================== --- stable/9/bin/cp/cp.c Thu May 14 18:29:05 2015 (r282916) +++ stable/9/bin/cp/cp.c Thu May 14 19:32:13 2015 (r282917) @@ -90,7 +90,6 @@ volatile sig_atomic_t info; enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; static int copy(char *[], enum op, int); -static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void siginfo(int __unused); int @@ -274,7 +273,7 @@ copy(char *argv[], enum op type, int fts mask = ~umask(0777); umask(~mask); - if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL) + if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL) err(1, "fts_open"); for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) { switch (curr->fts_info) { @@ -488,32 +487,6 @@ copy(char *argv[], enum op type, int fts return (rval); } -/* - * mastercmp -- - * The comparison function for the copy order. The order is to copy - * non-directory files before directory files. The reason for this - * is because files tend to be in the same cylinder group as their - * parent directory, whereas directories tend not to be. Copying the - * files first reduces seeking. - */ -static int -mastercmp(const FTSENT * const *a, const FTSENT * const *b) -{ - int a_info, b_info; - - a_info = (*a)->fts_info; - if (a_info == FTS_ERR || a_info == FTS_NS || a_info == FTS_DNR) - return (0); - b_info = (*b)->fts_info; - if (b_info == FTS_ERR || b_info == FTS_NS || b_info == FTS_DNR) - return (0); - if (a_info == FTS_D) - return (-1); - if (b_info == FTS_D) - return (1); - return (0); -} - static void siginfo(int sig __unused) { From owner-svn-src-stable-9@FreeBSD.ORG Fri May 15 06:28:10 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id CEB7FBFB; Fri, 15 May 2015 06:28:10 +0000 (UTC) Date: Fri, 15 May 2015 06:28:10 +0000 From: Alexey Dokuchaev To: Jilles Tjoelker Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r282917 - stable/9/bin/cp Message-ID: <20150515062810.GA76007@FreeBSD.org> References: <201505141932.t4EJWDIn007978@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201505141932.t4EJWDIn007978@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2015 06:28:10 -0000 On Thu, May 14, 2015 at 07:32:13PM +0000, Jilles Tjoelker wrote: > Author: jilles > Date: Thu May 14 19:32:13 2015 > New Revision: 282917 > URL: https://svnweb.freebsd.org/changeset/base/282917 > > Log: > MFC r282482: cp: Remove fts sorting. > > [...] Could (if should) it be MFCed to stable/8 as well? ./danfe From owner-svn-src-stable-9@FreeBSD.ORG Fri May 15 22:13:12 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D71E266F; Fri, 15 May 2015 22:13:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B901F1B55; Fri, 15 May 2015 22:13:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4FMDCZF017334; Fri, 15 May 2015 22:13:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4FMDBA4017329; Fri, 15 May 2015 22:13:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201505152213.t4FMDBA4017329@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 15 May 2015 22:13:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282992 - in stable/9/tools/regression/aio/kqueue: . lio X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2015 22:13:13 -0000 Author: ngie Date: Fri May 15 22:13:11 2015 New Revision: 282992 URL: https://svnweb.freebsd.org/changeset/base/282992 Log: MFC r280893,r280894,r280895: r280893: Cleanup and do minor refactoring before converting testcases to ATF - Convert errx(-1, ..) to errx(1, ..) - Move the aio(4) checks to a single function (aio_available); use modfind(2) instead of depending on SIGSYS (doesn't work when aio(4) support is missing, not documented in the aio syscall manpages). - Use aio_available liberally in the testcase functions - Use mkstemp(3) + unlink(2) instead of mktemp(3) - Fix some -Wunused warnings - Bump WARNS to 6 Submitted by: mjohnston [*] Sponsored by: EMC / Isilon Storage Division r280894: Minor cleanup before converting to ATF testcases - Remove blank (tab-only) lines. - Fix -Wunused warnings. - Bump up to WARNS= 6 r280895: - Fix -Wsign issue - Bump up to WARNS=6 Modified: stable/9/tools/regression/aio/kqueue/Makefile stable/9/tools/regression/aio/kqueue/aio_kqueue.c stable/9/tools/regression/aio/kqueue/lio/Makefile stable/9/tools/regression/aio/kqueue/lio/lio_kqueue.c Directory Properties: stable/9/ (props changed) stable/9/tools/ (props changed) stable/9/tools/regression/ (props changed) stable/9/tools/regression/aio/aiotest/ (props changed) Modified: stable/9/tools/regression/aio/kqueue/Makefile ============================================================================== --- stable/9/tools/regression/aio/kqueue/Makefile Fri May 15 21:33:19 2015 (r282991) +++ stable/9/tools/regression/aio/kqueue/Makefile Fri May 15 22:13:11 2015 (r282992) @@ -3,4 +3,8 @@ PROG= aio_kqueue NO_MAN= +WARNS?= 6 + +SUBDIR+= lio + .include Modified: stable/9/tools/regression/aio/kqueue/aio_kqueue.c ============================================================================== --- stable/9/tools/regression/aio/kqueue/aio_kqueue.c Fri May 15 21:33:19 2015 (r282991) +++ stable/9/tools/regression/aio/kqueue/aio_kqueue.c Fri May 15 22:13:11 2015 (r282992) @@ -177,7 +177,7 @@ main (int argc, char *argv[]) #endif if (result != sizeof(buffer)) { printf("FAIL: run %d, operation %d, result %d " - " (errno=%d) should be %d\n", run, pending, + " (errno=%d) should be %zu\n", run, pending, result, errno, sizeof(buffer)); failed++; } else Modified: stable/9/tools/regression/aio/kqueue/lio/Makefile ============================================================================== --- stable/9/tools/regression/aio/kqueue/lio/Makefile Fri May 15 21:33:19 2015 (r282991) +++ stable/9/tools/regression/aio/kqueue/lio/Makefile Fri May 15 22:13:11 2015 (r282992) @@ -3,4 +3,6 @@ PROG= lio_kqueue NO_MAN= +WARNS?= 6 + .include Modified: stable/9/tools/regression/aio/kqueue/lio/lio_kqueue.c ============================================================================== --- stable/9/tools/regression/aio/kqueue/lio/lio_kqueue.c Fri May 15 21:33:19 2015 (r282991) +++ stable/9/tools/regression/aio/kqueue/lio/lio_kqueue.c Fri May 15 22:13:11 2015 (r282992) @@ -37,13 +37,15 @@ * http://www.ambrisko.com/doug/listio_kqueue/listio_kqueue.patch */ -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include #include #define PATH_TEMPLATE "/tmp/aio.XXXXXXXXXX" @@ -52,9 +54,10 @@ #define MAX LIO_MAX * 16 #define MAX_RUNS 300 +int main(int argc, char *argv[]){ int fd; - struct aiocb *iocb[MAX], *kq_iocb; + struct aiocb *iocb[MAX]; struct aiocb **lio[LIO_MAX], **lio_element, **kq_lio; int i, result, run, error, j, k; char buffer[32768]; @@ -65,7 +68,7 @@ main(int argc, char *argv[]){ time_t time1, time2; char *file, pathname[sizeof(PATH_TEMPLATE)-1]; int tmp_file = 0, failed = 0; - + if (kq < 0) { perror("No kqeueue\n"); exit(1); @@ -89,7 +92,7 @@ main(int argc, char *argv[]){ #ifdef DEBUG printf("Hello kq %d fd %d\n", kq, fd); #endif - + for (run = 0; run < MAX_RUNS; run++){ #ifdef DEBUG printf("Run %d\n", run); @@ -137,13 +140,13 @@ main(int argc, char *argv[]){ printf("write %d is at %p\n", j, lio[j]); #endif } - + for(i = 0; i < LIO_MAX; i++) { for(j = LIO_MAX - 1; j >=0; j--) { if (lio[j]) break; } - + for(;;) { bzero(&ke, sizeof(ke)); bzero(&kq_returned, sizeof(ke)); @@ -169,18 +172,18 @@ main(int argc, char *argv[]){ kq_returned.udata, lio[j]); #endif - + if(kq_lio) break; #ifdef DEBUG printf("Try again\n"); #endif - } - + } + #ifdef DEBUG printf("lio %p\n", lio); #endif - + for (j = 0; j < LIO_MAX; j++) { if (lio[j] == kq_lio) { break; @@ -201,12 +204,12 @@ main(int argc, char *argv[]){ printf("PASS: run %d, operation %d result %d \n", run, LIO_MAX - i -1, result); } for(k = 0; k < MAX / LIO_MAX; k++){ - result = aio_return(kq_lio[k]); + result = aio_return(kq_lio[k]); #ifdef DEBUG printf("Return Resulto for %d %d is %d\n", j, k, result); #endif if (result != sizeof(buffer)) { - printf("FAIL: run %d, operation %d sub-opt %d result %d (errno=%d) should be %d\n", + printf("FAIL: run %d, operation %d sub-opt %d result %d (errno=%d) should be %zu\n", run, LIO_MAX - i -1, k, result, errno, sizeof(buffer)); } else { printf("PASS: run %d, operation %d sub-opt %d result %d\n", @@ -216,13 +219,13 @@ main(int argc, char *argv[]){ #ifdef DEBUG printf("\n"); #endif - + for(k = 0; k < MAX / LIO_MAX; k++) { free(lio[j][k]); } free(lio[j]); lio[j] = NULL; - } + } } #ifdef DEBUG printf("Done\n"); From owner-svn-src-stable-9@FreeBSD.ORG Fri May 15 22:14:43 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F1857B9; Fri, 15 May 2015 22:14:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 34A811B6F; Fri, 15 May 2015 22:14:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4FMEhWa017739; Fri, 15 May 2015 22:14:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4FMEhbO017738; Fri, 15 May 2015 22:14:43 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201505152214.t4FMEhbO017738@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 15 May 2015 22:14:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282993 - stable/9/tools/regression/aio/aiotest X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2015 22:14:43 -0000 Author: ngie Date: Fri May 15 22:14:42 2015 New Revision: 282993 URL: https://svnweb.freebsd.org/changeset/base/282993 Log: Remove mergeinfo for r280893 It wasn't actually committed to stable/9 in r282992 Modified: Directory Properties: stable/9/tools/regression/aio/aiotest/ (props changed) From owner-svn-src-stable-9@FreeBSD.ORG Fri May 15 22:15:58 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7ED38F9; Fri, 15 May 2015 22:15:57 +0000 (UTC) Received: from mail-ie0-x232.google.com (mail-ie0-x232.google.com [IPv6:2607:f8b0:4001:c03::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB7821B7C; Fri, 15 May 2015 22:15:57 +0000 (UTC) Received: by ieczm2 with SMTP id zm2so60280010iec.1; Fri, 15 May 2015 15:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=o59CIXkaoYExbQfTBPdMwESWDU7Iw9EIklEesU/BiqE=; b=zN6YgKvmevSUfs0XJ/x4NsjSC+ZxKCgnBeh2scTwCGHODuhzKrBBhiPKVez1yum1Y/ K/noNBkTkVj8UV1e7ECt2JmxvSEbSfEOAiUJ5DAcPjB/G/0inNfqs8lMAfWbsBgUpE+b cZQ6bWx026kqpJYISR7eXuw2cINWkh7kvqMsjmLjkzhrm1733CXq6W6JTCmt52QIUmCz KI8XBuSUQTpsc184cnBMtede3jpuQkRBMPxmSNIMWQN+tmMZa7mexLgKd5WQNGY+HbYo jat9b4EHVWaqObYKZZigd2i1OO6QgSxJblu+s1WvCI47W8w82Ch73kWtu6bJUvkpo6s6 9MsA== X-Received: by 10.68.186.1 with SMTP id fg1mr22264363pbc.147.1431728157161; Fri, 15 May 2015 15:15:57 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:10d2:46bc:67b9:c8b3? ([2601:8:ab80:7d6:10d2:46bc:67b9:c8b3]) by mx.google.com with ESMTPSA id ld1sm2833767pbc.26.2015.05.15.15.15.55 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 May 2015 15:15:56 -0700 (PDT) Subject: Re: svn commit: r282992 - in stable/9/tools/regression/aio/kqueue: . lio Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_E707D0D5-567F-4694-9911-7C8CB52F4DED"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Garrett Cooper In-Reply-To: <201505152213.t4FMDBA4017329@svn.freebsd.org> Date: Fri, 15 May 2015 15:15:53 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Message-Id: <7E44829A-A926-4076-A3DD-AD7A8F3E3B16@gmail.com> References: <201505152213.t4FMDBA4017329@svn.freebsd.org> To: Garrett Cooper X-Mailer: Apple Mail (2.1878.6) X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2015 22:15:58 -0000 --Apple-Mail=_E707D0D5-567F-4694-9911-7C8CB52F4DED Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On May 15, 2015, at 15:13, Garrett Cooper wrote: > Author: ngie > Date: Fri May 15 22:13:11 2015 > New Revision: 282992 > URL: https://svnweb.freebsd.org/changeset/base/282992 >=20 > Log: > MFC r280893,r280894,r280895: >=20 > r280893: >=20 > Cleanup and do minor refactoring before converting testcases to ATF >=20 > - Convert errx(-1, ..) to errx(1, ..) > - Move the aio(4) checks to a single function (aio_available); use = modfind(2) > instead of depending on SIGSYS (doesn't work when aio(4) support is = missing, > not documented in the aio syscall manpages). > - Use aio_available liberally in the testcase functions > - Use mkstemp(3) + unlink(2) instead of mktemp(3) > - Fix some -Wunused warnings > - Bump WARNS to 6 >=20 > Submitted by: mjohnston [*] > Sponsored by: EMC / Isilon Storage Division I forgot to remove this portion of the commit (fixed in r282993) -- I = ran into conflicts and couldn=92t do a simple merge. Will retry after I = figure out what revisions are missing from stable/10 and head=85 -NGie --Apple-Mail=_E707D0D5-567F-4694-9911-7C8CB52F4DED Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVVnAaAAoJEMZr5QU6S73eJN0H/0+suNX1Ant0JiFqFAvKbYzx tESKzalYF36V9es8vApR/jq0X3qHBcJ2J7NCde8rM/QjgmU5AKjcMr5BzvuU2fU7 3jMXH9e8PvSxk8nQcnSQlsUCCBQJYFgd94KpjCsUY1mhbqU5SW3d21mlYwER8eTi DcoP3QJCewkuabCAWEoHiMRvAkW8Ez+orH1dlHZR0ZhrzQuEgNA8YWSvUpo+FxNz UR+tk8+gMC4x+QqRt6BCGEu2bPJ52IEBX8aqtIssQzAyB+tAaPSf+9P4DjcIGbkv 1y4BX3DE5xwyiwR9GQE066VaiQaoPCFJtwqL2A1Q7/zziZcYqegVAYOQPjkffYE= =ThDT -----END PGP SIGNATURE----- --Apple-Mail=_E707D0D5-567F-4694-9911-7C8CB52F4DED-- From owner-svn-src-stable-9@FreeBSD.ORG Sat May 16 22:38:17 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE648263; Sat, 16 May 2015 22:38:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 AD7C41CE8; Sat, 16 May 2015 22:38:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GMcHlJ046744; Sat, 16 May 2015 22:38:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GMcHgX046743; Sat, 16 May 2015 22:38:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201505162238.t4GMcHgX046743@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 16 May 2015 22:38:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r283017 - stable/9/sbin/ifconfig X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2015 22:38:17 -0000 Author: ngie Date: Sat May 16 22:38:16 2015 New Revision: 283017 URL: https://svnweb.freebsd.org/changeset/base/283017 Log: MFstable/10 r283016: MFC r282747: Use MIN from sys/param.h instead of handrolling the macro Replace sys/types.h with sys/param.h per-style(9) Sponsored by: EMC / Isilon Storage Division Modified: stable/9/sbin/ifconfig/af_inet.c Directory Properties: stable/9/ (props changed) stable/9/sbin/ (props changed) stable/9/sbin/ifconfig/ (props changed) Modified: stable/9/sbin/ifconfig/af_inet.c ============================================================================== --- stable/9/sbin/ifconfig/af_inet.c Sat May 16 22:36:19 2015 (r283016) +++ stable/9/sbin/ifconfig/af_inet.c Sat May 16 22:38:16 2015 (r283017) @@ -32,7 +32,7 @@ static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ -#include +#include #include #include #include @@ -98,7 +98,6 @@ static struct sockaddr_in *sintab[] = { static void in_getaddr(const char *s, int which) { -#define MIN(a,b) ((a)<(b)?(a):(b)) struct sockaddr_in *sin = sintab[which]; struct hostent *hp; struct netent *np; @@ -139,7 +138,6 @@ in_getaddr(const char *s, int which) sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY); else errx(1, "%s: bad value", s); -#undef MIN } static void From owner-svn-src-stable-9@FreeBSD.ORG Sat May 16 23:00:07 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3DEB8729; Sat, 16 May 2015 23:00:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2A2EB1EC8; Sat, 16 May 2015 23:00:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GN07UF057765; Sat, 16 May 2015 23:00:07 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GN04OD057735; Sat, 16 May 2015 23:00:04 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201505162300.t4GN04OD057735@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 16 May 2015 23:00:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r283019 - in stable/9/contrib/llvm: include/llvm lib/CodeGen/AsmPrinter lib/Target/ARM tools/clang/include/clang/Driver tools/clang/include/clang/Frontend tools/clang/lib/CodeGen tools/... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2015 23:00:07 -0000 Author: dim Date: Sat May 16 23:00:03 2015 New Revision: 283019 URL: https://svnweb.freebsd.org/changeset/base/283019 Log: Bring clang 3.4.1 in stable/9 in sync with the version in stable/10. MFC r252503 (by andrew): Work around an ARM EABI issue where clang would sometimes incorrectly align the stack in a leaf function that uses TLS. The issue is, when using TLS, the function is no longer a leaf as it calls __aeabi_read_tp. With statically linked programs this is not an issue as it doesn't make use of the stack, however with dynamically linked applications we enter rtld which does use the stack and makes assumptions about it's alignment. This is only a temporary fix until a better patch can be made and submitted upstream. MFC r264826 (by emaste): Merge LLVM r202188: Debug info: Support variadic functions. Variadic functions have an unspecified parameter tag after the last argument. In IR this is represented as an unspecified parameter in the subroutine type. Paired commit with CFE r202185. rdar://problem/13690847 This re-applies r202184 + a bugfix in DwarfDebug's argument handling. This merge includes a change to use the LLVM 3.4 API in lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp: DwarfUnit -> CompileUnit Sponsored by: DARPA, AFRL MFC r264827 (by emaste): Merge Clang r202185: Debug info: Generate debug info for variadic functions. Paired commit with LLVM. rdar://problem/13690847 This merege includes changes to use the Clang 3.4 API (revisions 199686 and 200082) in lib/CodeGen/CGDebugInfo.cpp: getParamType -> getArgType getNumParams -> getNumArgs getReturnType -> getResultType Sponsored by: DARPA, AFRL MFC r265477 (by emaste): Merge -fstandalone-debug from Clang r198655: Implement a new -fstandalone-debug option. rdar://problem/15685848 It controls everything that -flimit-debug-info used to, plus the vtable type optimization. The old -fno-limit-debug-info option is now an alias to -fstandalone-debug and vice versa. Standalone is the default on Darwin until dtrace is updated to work with non-standalone debug info (rdar://problem/15758808). Note: I kept the LimitedDebugInfo name in CodeGenOptions::DebugInfoKind because NoStandaloneDebugInfo sounded even more confusing. MFC r269387 (by andrew): Update the ARMv6 core clang targets to be an arm1176jzf-s. This brings us in line with gcc in base as this makes llvm generate code for the armv6k variant of the instruction set. Modified: stable/9/contrib/llvm/include/llvm/DIBuilder.h stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp stable/9/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h stable/9/contrib/llvm/tools/clang/include/clang/Driver/Options.td stable/9/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp stable/9/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp Directory Properties: stable/9/ (props changed) stable/9/contrib/ (props changed) stable/9/contrib/llvm/ (props changed) stable/9/contrib/llvm/tools/clang/ (props changed) Modified: stable/9/contrib/llvm/include/llvm/DIBuilder.h ============================================================================== --- stable/9/contrib/llvm/include/llvm/DIBuilder.h Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/include/llvm/DIBuilder.h Sat May 16 23:00:03 2015 (r283019) @@ -439,7 +439,7 @@ namespace llvm { /// through debug info anchors. void retainType(DIType T); - /// createUnspecifiedParameter - Create unspeicified type descriptor + /// createUnspecifiedParameter - Create unspecified type descriptor /// for a subroutine type. DIDescriptor createUnspecifiedParameter(); Modified: stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp ============================================================================== --- stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Sat May 16 23:00:03 2015 (r283019) @@ -1116,6 +1116,22 @@ void CompileUnit::constructTypeDIE(DIE & addSourceLine(&Buffer, DTy); } +/// constructSubprogramArguments - Construct function argument DIEs. +void CompileUnit::constructSubprogramArguments(DIE &Buffer, DIArray Args) { + for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) { + DIDescriptor Ty = Args.getElement(i); + if (Ty.isUnspecifiedParameter()) { + assert(i == N-1 && "ellipsis must be the last argument"); + createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, Buffer); + } else { + DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, Buffer); + addType(Arg, DIType(Ty)); + if (DIType(Ty).isArtificial()) + addFlag(Arg, dwarf::DW_AT_artificial); + } + } +} + /// Return true if the type is appropriately scoped to be contained inside /// its own type unit. static bool isTypeUnitScoped(DIType Ty, const DwarfDebug *DD) { @@ -1170,19 +1186,12 @@ void CompileUnit::constructTypeDIE(DIE & addType(&Buffer, RTy); bool isPrototyped = true; - // Add arguments. - for (unsigned i = 1, N = Elements.getNumElements(); i < N; ++i) { - DIDescriptor Ty = Elements.getElement(i); - if (Ty.isUnspecifiedParameter()) { - createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, Buffer); - isPrototyped = false; - } else { - DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, Buffer); - addType(Arg, DIType(Ty)); - if (DIType(Ty).isArtificial()) - addFlag(Arg, dwarf::DW_AT_artificial); - } - } + if (Elements.getNumElements() == 2 && + Elements.getElement(1).isUnspecifiedParameter()) + isPrototyped = false; + + constructSubprogramArguments(Buffer, Elements); + // Add prototype flag if we're dealing with a C language and the // function has been prototyped. uint16_t Language = getLanguage(); @@ -1475,13 +1484,7 @@ DIE *CompileUnit::getOrCreateSubprogramD // Add arguments. Do not add arguments for subprogram definition. They will // be handled while processing variables. - for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) { - DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, *SPDie); - DIType ATy(Args.getElement(i)); - addType(Arg, ATy); - if (ATy.isArtificial()) - addFlag(Arg, dwarf::DW_AT_artificial); - } + constructSubprogramArguments(*SPDie, Args); } if (SP.isArtificial()) Modified: stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h ============================================================================== --- stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h Sat May 16 23:00:03 2015 (r283019) @@ -342,6 +342,9 @@ public: void emitHeader(const MCSection *ASection, const MCSymbol *ASectionSym); private: + /// constructSubprogramArguments - Construct function argument DIEs. + void constructSubprogramArguments(DIE &Buffer, DIArray Args); + /// constructTypeDIE - Construct basic type die from DIBasicType. void constructTypeDIE(DIE &Buffer, DIBasicType BTy); Modified: stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp ============================================================================== --- stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Sat May 16 23:00:03 2015 (r283019) @@ -404,15 +404,21 @@ DIE *DwarfDebug::updateSubprogramScopeDI DIArray Args = SPTy.getTypeArray(); uint16_t SPTag = SPTy.getTag(); if (SPTag == dwarf::DW_TAG_subroutine_type) + // FIXME: Use DwarfUnit::constructSubprogramArguments() here. for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) { - DIE *Arg = - SPCU->createAndAddDIE(dwarf::DW_TAG_formal_parameter, *SPDie); DIType ATy(Args.getElement(i)); - SPCU->addType(Arg, ATy); - if (ATy.isArtificial()) - SPCU->addFlag(Arg, dwarf::DW_AT_artificial); - if (ATy.isObjectPointer()) - SPCU->addDIEEntry(SPDie, dwarf::DW_AT_object_pointer, Arg); + if (ATy.isUnspecifiedParameter()) { + assert(i == N-1 && "ellipsis must be the last argument"); + SPCU->createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, *SPDie); + } else { + DIE *Arg = + SPCU->createAndAddDIE(dwarf::DW_TAG_formal_parameter, *SPDie); + SPCU->addType(Arg, ATy); + if (ATy.isArtificial()) + SPCU->addFlag(Arg, dwarf::DW_AT_artificial); + if (ATy.isObjectPointer()) + SPCU->addDIEEntry(SPDie, dwarf::DW_AT_object_pointer, Arg); + } } DIE *SPDeclDie = SPDie; SPDie = @@ -579,7 +585,7 @@ DIE *DwarfDebug::createScopeChildrenDIE( DIE *ObjectPointer = NULL; // Collect arguments for current function. - if (LScopes.isCurrentFunctionScope(Scope)) + if (LScopes.isCurrentFunctionScope(Scope)) { for (unsigned i = 0, N = CurrentFnArguments.size(); i < N; ++i) if (DbgVariable *ArgDV = CurrentFnArguments[i]) if (DIE *Arg = @@ -588,6 +594,16 @@ DIE *DwarfDebug::createScopeChildrenDIE( if (ArgDV->isObjectPointer()) ObjectPointer = Arg; } + // Create the unspecified parameter that marks a function as variadic. + DISubprogram SP(Scope->getScopeNode()); + assert(SP.Verify()); + DIArray FnArgs = SP.getType().getTypeArray(); + if (FnArgs.getElement(FnArgs.getNumElements()-1).isUnspecifiedParameter()) { + DIE *Ellipsis = new DIE(dwarf::DW_TAG_unspecified_parameters); + Children.push_back(Ellipsis); + } + } + // Collect lexical scope children first. const SmallVectorImpl &Variables =ScopeVariables.lookup(Scope); for (unsigned i = 0, N = Variables.size(); i < N; ++i) Modified: stable/9/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h ============================================================================== --- stable/9/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h Sat May 16 23:00:03 2015 (r283019) @@ -27,7 +27,7 @@ protected: public: explicit ARMFrameLowering(const ARMSubtarget &sti) - : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(), 0, 4), + : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(), 0, 8), STI(sti) { } Modified: stable/9/contrib/llvm/tools/clang/include/clang/Driver/Options.td ============================================================================== --- stable/9/contrib/llvm/tools/clang/include/clang/Driver/Options.td Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/tools/clang/include/clang/Driver/Options.td Sat May 16 23:00:03 2015 (r283019) @@ -549,8 +549,6 @@ def finstrument_functions : Flag<["-"], def fkeep_inline_functions : Flag<["-"], "fkeep-inline-functions">, Group; def flat__namespace : Flag<["-"], "flat_namespace">; def flax_vector_conversions : Flag<["-"], "flax-vector-conversions">, Group; -def flimit_debug_info : Flag<["-"], "flimit-debug-info">, Group, Flags<[CC1Option]>, - HelpText<"Limit debug information produced to reduce size of debug binary">; def flimited_precision_EQ : Joined<["-"], "flimited-precision=">, Group; def flto : Flag<["-"], "flto">, Group; def fno_lto : Flag<["-"], "fno-lto">, Group; @@ -645,8 +643,6 @@ def fno_inline : Flag<["-"], "fno-inline def fno_keep_inline_functions : Flag<["-"], "fno-keep-inline-functions">, Group; def fno_lax_vector_conversions : Flag<["-"], "fno-lax-vector-conversions">, Group, HelpText<"Disallow implicit conversions between vectors with a different number of elements or different element types">, Flags<[CC1Option]>; -def fno_limit_debug_info : Flag<["-"], "fno-limit-debug-info">, Group, Flags<[CC1Option]>, - HelpText<"Do not limit debug information produced to reduce size of debug binary">; def fno_merge_all_constants : Flag<["-"], "fno-merge-all-constants">, Group, Flags<[CC1Option]>, HelpText<"Disallow merging of constants">; def fno_modules : Flag <["-"], "fno-modules">, Group, @@ -774,6 +770,12 @@ def fno_signed_char : Flag<["-"], "fno-s def fsplit_stack : Flag<["-"], "fsplit-stack">, Group; def fstack_protector_all : Flag<["-"], "fstack-protector-all">, Group; def fstack_protector : Flag<["-"], "fstack-protector">, Group; +def fstandalone_debug : Flag<["-"], "fstandalone-debug">, Group, Flags<[CC1Option]>, + HelpText<"Emit full debug info for all types used by the program">; +def fno_standalone_debug : Flag<["-"], "fno-standalone-debug">, Group, Flags<[CC1Option]>, + HelpText<"Limit debug information produced to reduce size of debug binary">; +def flimit_debug_info : Flag<["-"], "flimit-debug-info">, Alias; +def fno_limit_debug_info : Flag<["-"], "fno-limit-debug-info">, Alias; def fstrict_aliasing : Flag<["-"], "fstrict-aliasing">, Group; def fstrict_enums : Flag<["-"], "fstrict-enums">, Group, Flags<[CC1Option]>, HelpText<"Enable optimizations based on the strict definition of an enum's " Modified: stable/9/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h ============================================================================== --- stable/9/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h Sat May 16 23:00:03 2015 (r283019) @@ -50,12 +50,20 @@ public: }; enum DebugInfoKind { - NoDebugInfo, // Don't generate debug info. - DebugLineTablesOnly, // Emit only debug info necessary for generating - // line number tables (-gline-tables-only). - LimitedDebugInfo, // Limit generated debug info to reduce size - // (-flimit-debug-info). - FullDebugInfo // Generate complete debug info. + NoDebugInfo, /// Don't generate debug info. + + DebugLineTablesOnly, /// Emit only debug info necessary for generating + /// line number tables (-gline-tables-only). + + LimitedDebugInfo, /// Limit generated debug info to reduce size + /// (-fno-standalone-debug). This emits + /// forward decls for types that could be + /// replaced with forward decls in the source + /// code. For dynamic C++ classes type info + /// is only emitted int the module that + /// contains the classe's vtable. + + FullDebugInfo /// Generate complete debug info. }; enum TLSModel { Modified: stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp ============================================================================== --- stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp Sat May 16 23:00:03 2015 (r283019) @@ -37,7 +37,7 @@ #include "llvm/IR/Module.h" #include "llvm/Support/Dwarf.h" #include "llvm/Support/FileSystem.h" -#include "llvm/Support/Path.h" +#include "llvm/Support/Path.h" using namespace clang; using namespace clang::CodeGen; @@ -342,9 +342,9 @@ void CGDebugInfo::CreateCompileUnit() { if (const FileEntry *MainFile = SM.getFileEntryForID(SM.getMainFileID())) { MainFileDir = MainFile->getDir()->getName(); if (MainFileDir != ".") { - llvm::SmallString<1024> MainFileDirSS(MainFileDir); - llvm::sys::path::append(MainFileDirSS, MainFileName); - MainFileName = MainFileDirSS.str(); + llvm::SmallString<1024> MainFileDirSS(MainFileDir); + llvm::sys::path::append(MainFileDirSS, MainFileName); + MainFileName = MainFileDirSS.str(); } } @@ -760,6 +760,8 @@ llvm::DIType CGDebugInfo::CreateType(con else if (const FunctionProtoType *FPT = dyn_cast(Ty)) { for (unsigned i = 0, e = FPT->getNumArgs(); i != e; ++i) EltTys.push_back(getOrCreateType(FPT->getArgType(i), Unit)); + if (FPT->isVariadic()) + EltTys.push_back(DBuilder.createUnspecifiedParameter()); } llvm::DIArray EltTypeArray = DBuilder.getOrCreateArray(EltTys); @@ -1454,13 +1456,13 @@ llvm::DIType CGDebugInfo::CreateType(con // declaration. The completeType, completeRequiredType, and completeClassData // callbacks will handle promoting the declaration to a definition. if (T || + // Under -flimit-debug-info: (DebugKind <= CodeGenOptions::LimitedDebugInfo && - // Under -flimit-debug-info, emit only a declaration unless the type is - // required to be complete. - !RD->isCompleteDefinitionRequired() && CGM.getLangOpts().CPlusPlus) || - // If the class is dynamic, only emit a declaration. A definition will be - // emitted whenever the vtable is emitted. - (CXXDecl && CXXDecl->hasDefinition() && CXXDecl->isDynamicClass()) || T) { + // Emit only a forward declaration unless the type is required. + ((!RD->isCompleteDefinitionRequired() && CGM.getLangOpts().CPlusPlus) || + // If the class is dynamic, only emit a declaration. A definition will be + // emitted whenever the vtable is emitted. + (CXXDecl && CXXDecl->hasDefinition() && CXXDecl->isDynamicClass())))) { llvm::DIDescriptor FDContext = getContextDescriptor(cast(RD->getDeclContext())); if (!T) @@ -2421,6 +2423,20 @@ llvm::DICompositeType CGDebugInfo::getOr llvm::DIArray EltTypeArray = DBuilder.getOrCreateArray(Elts); return DBuilder.createSubroutineType(F, EltTypeArray); } + + // Variadic function. + if (const FunctionDecl *FD = dyn_cast(D)) + if (FD->isVariadic()) { + SmallVector EltTys; + EltTys.push_back(getOrCreateType(FD->getResultType(), F)); + if (const FunctionProtoType *FPT = dyn_cast(FnType)) + for (unsigned i = 0, e = FPT->getNumArgs(); i != e; ++i) + EltTys.push_back(getOrCreateType(FPT->getArgType(i), F)); + EltTys.push_back(DBuilder.createUnspecifiedParameter()); + llvm::DIArray EltTypeArray = DBuilder.getOrCreateArray(EltTys); + return DBuilder.createSubroutineType(F, EltTypeArray); + } + return llvm::DICompositeType(getOrCreateType(FnType, F)); } Modified: stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp ============================================================================== --- stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp Sat May 16 23:00:03 2015 (r283019) @@ -208,7 +208,8 @@ static const char *getARMTargetCPU(const MArch = Triple.getArchName(); } - if (Triple.getOS() == llvm::Triple::NetBSD) { + if (Triple.getOS() == llvm::Triple::NetBSD || + Triple.getOS() == llvm::Triple::FreeBSD) { if (MArch == "armv6") return "arm1176jzf-s"; } Modified: stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp ============================================================================== --- stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat May 16 23:00:03 2015 (r283019) @@ -499,7 +499,8 @@ static std::string getARMTargetCPU(const MArch = Triple.getArchName(); } - if (Triple.getOS() == llvm::Triple::NetBSD) { + if (Triple.getOS() == llvm::Triple::NetBSD || + Triple.getOS() == llvm::Triple::FreeBSD) { if (MArch == "armv6") return "arm1176jzf-s"; } @@ -2988,8 +2989,8 @@ void Clang::ConstructJob(Compilation &C, Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls); Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions); Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions); - Args.AddLastArg(CmdArgs, options::OPT_flimit_debug_info); - Args.AddLastArg(CmdArgs, options::OPT_fno_limit_debug_info); + Args.AddLastArg(CmdArgs, options::OPT_fstandalone_debug); + Args.AddLastArg(CmdArgs, options::OPT_fno_standalone_debug); Args.AddLastArg(CmdArgs, options::OPT_fno_operator_names); // AltiVec language extensions aren't relevant for assembling. if (!isa(JA) || Modified: stable/9/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp ============================================================================== --- stable/9/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp Sat May 16 22:53:26 2015 (r283018) +++ stable/9/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp Sat May 16 23:00:03 2015 (r283019) @@ -295,7 +295,8 @@ static void ParseCommentArgs(CommentOpti } static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, - DiagnosticsEngine &Diags) { + DiagnosticsEngine &Diags, + const TargetOptions &TargetOpts) { using namespace options; bool Success = true; @@ -322,10 +323,16 @@ static bool ParseCodeGenArgs(CodeGenOpti Opts.setDebugInfo(CodeGenOptions::DebugLineTablesOnly); } else if (Args.hasArg(OPT_g_Flag) || Args.hasArg(OPT_gdwarf_2) || Args.hasArg(OPT_gdwarf_3) || Args.hasArg(OPT_gdwarf_4)) { - if (Args.hasFlag(OPT_flimit_debug_info, OPT_fno_limit_debug_info, true)) - Opts.setDebugInfo(CodeGenOptions::LimitedDebugInfo); - else + bool Default = false; + // Until dtrace (via CTF) can deal with distributed debug info, + // Darwin defaults to standalone/full debug info. + if (llvm::Triple(TargetOpts.Triple).isOSDarwin()) + Default = true; + + if (Args.hasFlag(OPT_fstandalone_debug, OPT_fno_standalone_debug, Default)) Opts.setDebugInfo(CodeGenOptions::FullDebugInfo); + else + Opts.setDebugInfo(CodeGenOptions::LimitedDebugInfo); } Opts.DebugColumnInfo = Args.hasArg(OPT_dwarf_column_info); Opts.SplitDwarfFile = Args.getLastArgValue(OPT_split_dwarf_file); @@ -1657,8 +1664,9 @@ bool CompilerInvocation::CreateFromArgs( ParseFileSystemArgs(Res.getFileSystemOpts(), *Args); // FIXME: We shouldn't have to pass the DashX option around here InputKind DashX = ParseFrontendArgs(Res.getFrontendOpts(), *Args, Diags); - Success = ParseCodeGenArgs(Res.getCodeGenOpts(), *Args, DashX, Diags) - && Success; + ParseTargetArgs(Res.getTargetOpts(), *Args); + Success = ParseCodeGenArgs(Res.getCodeGenOpts(), *Args, DashX, Diags, + Res.getTargetOpts()) && Success; ParseHeaderSearchArgs(Res.getHeaderSearchOpts(), *Args); if (DashX != IK_AST && DashX != IK_LLVM_IR) { ParseLangArgs(*Res.getLangOpts(), *Args, DashX, Diags); @@ -1673,8 +1681,6 @@ bool CompilerInvocation::CreateFromArgs( ParsePreprocessorArgs(Res.getPreprocessorOpts(), *Args, FileMgr, Diags); ParsePreprocessorOutputArgs(Res.getPreprocessorOutputOpts(), *Args, Res.getFrontendOpts().ProgramAction); - ParseTargetArgs(Res.getTargetOpts(), *Args); - return Success; } From owner-svn-src-stable-9@FreeBSD.ORG Sat May 16 23:18:56 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E78B6953; Sat, 16 May 2015 23:18:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D3A721087; Sat, 16 May 2015 23:18:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GNIurB067014; Sat, 16 May 2015 23:18:56 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GNIU2W066843; Sat, 16 May 2015 23:18:30 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201505162318.t4GNIU2W066843@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 16 May 2015 23:18:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r283020 - stable/9/contrib/llvm/patches X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2015 23:18:57 -0000 Author: dim Date: Sat May 16 23:18:30 2015 New Revision: 283020 URL: https://svnweb.freebsd.org/changeset/base/283020 Log: Bring the contrib/llvm/patches directory up-to-date for stable/9. MFC r263892: Add the llvm/clang patch for r263891. MFC r264350: Update the llvm/clang patch for r264345. MFC r264828: Add patches corresponding to r264826 and r264827 MFC r266630: Add the clang patch for r265477. While here, add a description to the patch for r263619, and unify all the URLs to point to svnweb. MFC r266675: Add the clang patch for r266674. MFC r275651: Add llvm patch corresponding to r275633. MFC r275747: Update llvm patches for r274286 and r275633 so all the tests will pass. MFC r275760: Add clang patch corresponding to r275759. MFC r275772: Update clang patch for r275759 to use correct test cases. MFC r283015: Bring the contrib/llvm/patches directory up-to-date. MFC r263892: Add the llvm/clang patch for r263891. MFC r264350: Update the llvm/clang patch for r264345. MFC r266675: Add the clang patch for r266674. MFC r275651: Add llvm patch corresponding to r275633. MFC r275747: Update llvm patches for r274286 and r275633 so all the tests will pass. MFC r275760: Add clang patch corresponding to r275759. MFC r275772: Update clang patch for r275759 to use correct test cases. Partially merge r283015 from stable/10: Additionally: * Remove the clang patch corresponding to r263619, as ARM EABI hard-float support was never MFC'd. * Add clang patch corresponding to r279302. Added: stable/9/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff - copied unchanged from r264350, head/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff stable/9/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff - copied, changed from r264828, head/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff stable/9/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff - copied, changed from r264828, head/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff stable/9/contrib/llvm/patches/patch-r265477-clang-r198655-standalone-debug.diff - copied unchanged from r266630, head/contrib/llvm/patches/patch-r265477-clang-r198655-standalone-debug.diff stable/9/contrib/llvm/patches/patch-r266674-clang-r209489-fix-xmmintrin.diff - copied unchanged from r266675, head/contrib/llvm/patches/patch-r266674-clang-r209489-fix-xmmintrin.diff stable/9/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff - copied, changed from r275651, head/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff stable/9/contrib/llvm/patches/patch-r275759-clang-r221170-ppc-vaarg.diff - copied, changed from r275760, head/contrib/llvm/patches/patch-r275759-clang-r221170-ppc-vaarg.diff stable/9/contrib/llvm/patches/patch-r279302-clang-r211785-add-fuse-ld.diff - copied unchanged from r283015, stable/10/contrib/llvm/patches/patch-r279302-clang-r211785-add-fuse-ld.diff Modified: stable/9/contrib/llvm/patches/patch-r208961-clang-version-include.diff stable/9/contrib/llvm/patches/patch-r208987-format-extensions.diff stable/9/contrib/llvm/patches/patch-r209107-clang-vendor-suffix.diff stable/9/contrib/llvm/patches/patch-r213492-amd64-multi-os-dot.diff stable/9/contrib/llvm/patches/patch-r221503-default-target-triple.diff stable/9/contrib/llvm/patches/patch-r243830-arm-disable-clear-cache.diff stable/9/contrib/llvm/patches/patch-r252503-arm-transient-stack-alignment.diff stable/9/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff stable/9/contrib/llvm/patches/patch-r259053-gcc-installation-detector.diff stable/9/contrib/llvm/patches/patch-r259498-add-fxsave.diff stable/9/contrib/llvm/patches/patch-r261680-clang-r200899-fix-security-quantis.diff stable/9/contrib/llvm/patches/patch-r261991-llvm-r195391-fix-dwarf2.diff stable/9/contrib/llvm/patches/patch-r261991-llvm-r198385-fix-dwarf2.diff stable/9/contrib/llvm/patches/patch-r261991-llvm-r198389-fix-dwarf2.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198028-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198029-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198030-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198145-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198149-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198157-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198280-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198281-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198286-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198480-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198484-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198533-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198565-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198567-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198580-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198591-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198592-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198658-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198681-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198738-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198739-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198740-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198893-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198909-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r198910-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199014-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199024-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199028-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199031-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199033-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199061-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199186-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199187-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199775-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199781-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199786-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199940-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199974-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199975-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r199977-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200103-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200104-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200112-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200130-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200131-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200141-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200282-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200368-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200373-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200376-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200509-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200617-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200960-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200961-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200962-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200963-sparc.diff stable/9/contrib/llvm/patches/patch-r262261-llvm-r200965-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r198311-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r198312-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r198911-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r198912-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r198918-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r198923-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r199012-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r199034-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r199037-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r199188-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r199399-sparc.diff stable/9/contrib/llvm/patches/patch-r262262-clang-r200452-sparc.diff stable/9/contrib/llvm/patches/patch-r262264-llvm-r200453-sparc.diff stable/9/contrib/llvm/patches/patch-r262265-llvm-r201718-sparc.diff stable/9/contrib/llvm/patches/patch-r262303-enable-ppc-integrated-as.diff stable/9/contrib/llvm/patches/patch-r262415-llvm-r201994-sparc.diff stable/9/contrib/llvm/patches/patch-r262460-llvm-r202059-sparc.diff stable/9/contrib/llvm/patches/patch-r262535-clang-r202177-sparc.diff stable/9/contrib/llvm/patches/patch-r262536-clang-r202179-sparc.diff stable/9/contrib/llvm/patches/patch-r262582-llvm-r202422-sparc.diff stable/9/contrib/llvm/patches/patch-r262611-llvm-r196874-fix-invalid-pwd-crash.diff stable/9/contrib/llvm/patches/patch-r263048-clang-r203624-fix-CC-aliases.diff stable/9/contrib/llvm/patches/patch-r263312-llvm-r169939-inline-asm-with-realign.diff stable/9/contrib/llvm/patches/patch-r263312-llvm-r196940-update-inline-asm-test.diff stable/9/contrib/llvm/patches/patch-r263312-llvm-r196986-allow-realign-alloca.diff stable/9/contrib/llvm/patches/patch-r263312-llvm-r202930-fix-alloca-esi-clobber.diff stable/9/contrib/llvm/patches/patch-r263313-llvm-r203311-fix-sse1-oom.diff stable/9/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff Directory Properties: stable/9/ (props changed) stable/9/contrib/ (props changed) stable/9/contrib/llvm/ (props changed) Modified: stable/9/contrib/llvm/patches/patch-r208961-clang-version-include.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r208961-clang-version-include.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r208961-clang-version-include.diff Sat May 16 23:18:30 2015 (r283020) @@ -1,7 +1,7 @@ This patch adjusts clang's default include paths to add FreeBSD-specific directories. -Introduced here: http://svn.freebsd.org/changeset/base/208961 +Introduced here: http://svnweb.freebsd.org/changeset/base/208961 Index: tools/clang/lib/Frontend/InitHeaderSearch.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r208987-format-extensions.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r208987-format-extensions.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r208987-format-extensions.diff Sat May 16 23:18:30 2015 (r283020) @@ -1,7 +1,7 @@ This patch adds support for the FreeBSD-specific -fformat-extension option, which enables additional printf modifiers for the kernel. -Introduced here: http://svn.freebsd.org/changeset/base/208987 +Introduced here: http://svnweb.freebsd.org/changeset/base/208987 Index: tools/clang/lib/Frontend/CompilerInvocation.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r209107-clang-vendor-suffix.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r209107-clang-vendor-suffix.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r209107-clang-vendor-suffix.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ This patch adds a FreeBSD-specific suffi usually of the form "(yyyyddmm)", representing the date when the compiler was last updated. -Introduced here: http://svn.freebsd.org/changeset/base/209107 +Introduced here: http://svnweb.freebsd.org/changeset/base/209107 Index: tools/clang/lib/Basic/Version.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r213492-amd64-multi-os-dot.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r213492-amd64-multi-os-dot.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r213492-amd64-multi-os-dot.diff Sat May 16 23:18:30 2015 (r283020) @@ -1,7 +1,7 @@ This patch makes "clang -print-multi-os-directory" print "." on amd64, which is required by certain ports. -Introduced here: http://svn.freebsd.org/changeset/base/213492 +Introduced here: http://svnweb.freebsd.org/changeset/base/213492 Index: tools/clang/lib/Driver/Driver.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r221503-default-target-triple.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r221503-default-target-triple.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r221503-default-target-triple.diff Sat May 16 23:18:30 2015 (r283020) @@ -1,7 +1,7 @@ This patch ensures the target triple that is passed during the compiler build is respected, instead of mangling it. -Introduced here: http://svn.freebsd.org/changeset/base/221503 +Introduced here: http://svnweb.freebsd.org/changeset/base/221503 Index: lib/Support/Unix/Host.inc =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r243830-arm-disable-clear-cache.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r243830-arm-disable-clear-cache.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r243830-arm-disable-clear-cache.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ This patch ensures __clear_cache is not clang, this special builtin was emitted as a function call, leading to link errors. -Introduced here: http://svn.freebsd.org/changeset/base/243830 +Introduced here: http://svnweb.freebsd.org/changeset/base/243830 Index: lib/Support/Unix/Memory.inc =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r252503-arm-transient-stack-alignment.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r252503-arm-transient-stack-alignment.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r252503-arm-transient-stack-alignment.diff Sat May 16 23:18:30 2015 (r283020) @@ -1,7 +1,7 @@ This patch applies a workaround for an ARM EABI issue, where clang would sometimes incorrectly align the stack in a leaf function that uses TLS. -Introduced here: http://svn.freebsd.org/changeset/base/252503 +Introduced here: http://svnweb.freebsd.org/changeset/base/252503 Index: test/CodeGen/Thumb2/large-stack.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff Sat May 16 23:18:30 2015 (r283020) @@ -1,7 +1,7 @@ This patch adds "CC" and "clang-CC" to the list of program name aliases which invoke the C++ compiler. -Introduced here: http://svn.freebsd.org/changeset/base/257109 +Introduced here: http://svnweb.freebsd.org/changeset/base/257109 Index: tools/clang/tools/driver/driver.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r259053-gcc-installation-detector.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r259053-gcc-installation-detector.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r259053-gcc-installation-detector.diff Sat May 16 23:18:30 2015 (r283020) @@ -1,7 +1,7 @@ This patch eliminates the unnecessary search for various gcc installation directories during each startup of clang. -Introduced here: http://svn.freebsd.org/changeset/base/259053 +Introduced here: http://svnweb.freebsd.org/changeset/base/259053 Index: tools/clang/lib/Driver/ToolChains.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r259498-add-fxsave.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r259498-add-fxsave.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r259498-add-fxsave.diff Sat May 16 23:18:30 2015 (r283020) @@ -1,6 +1,6 @@ This patch adds the alias bit_FXSAVE for bit_FXSR to cpuid.h. -Introduced here: http://svn.freebsd.org/changeset/base/259498 +Introduced here: http://svnweb.freebsd.org/changeset/base/259498 Index: tools/clang/lib/Headers/cpuid.h =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r261680-clang-r200899-fix-security-quantis.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r261680-clang-r200899-fix-security-quantis.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r261680-clang-r200899-fix-security-quantis.diff Sat May 16 23:18:30 2015 (r283020) @@ -15,7 +15,7 @@ Pull in r200899 from upstream clang trun Differential Revision: http://llvm-reviews.chandlerc.com/D2688 -Introduced here: http://svn.freebsd.org/changeset/base/261680 +Introduced here: http://svnweb.freebsd.org/changeset/base/261680 Index: tools/clang/test/SemaCXX/c99-variable-length-array.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r261991-llvm-r195391-fix-dwarf2.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r261991-llvm-r195391-fix-dwarf2.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r261991-llvm-r195391-fix-dwarf2.diff Sat May 16 23:18:30 2015 (r283020) @@ -18,7 +18,7 @@ Pull in r195391 from upstream llvm trunk Patch (slightly modified) by Keith Walker! -Introduced here: http://svn.freebsd.org/changeset/base/261991 +Introduced here: http://svnweb.freebsd.org/changeset/base/261991 Index: lib/CodeGen/AsmPrinter/DIE.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r261991-llvm-r198385-fix-dwarf2.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r261991-llvm-r198385-fix-dwarf2.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r261991-llvm-r198385-fix-dwarf2.diff Sat May 16 23:18:30 2015 (r283020) @@ -5,7 +5,7 @@ Pull in r198385 from upstream llvm trunk Apologies for the noise - we're seeing some Go failures with cgo interacting with Clang's debug info due to this change. -Introduced here: http://svn.freebsd.org/changeset/base/261991 +Introduced here: http://svnweb.freebsd.org/changeset/base/261991 Index: lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r261991-llvm-r198389-fix-dwarf2.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r261991-llvm-r198389-fix-dwarf2.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r261991-llvm-r198389-fix-dwarf2.diff Sat May 16 23:18:30 2015 (r283020) @@ -8,7 +8,7 @@ Pull in r198389 from upstream llvm trunk This reverts commit r198385. -Introduced here: http://svn.freebsd.org/changeset/base/261991 +Introduced here: http://svnweb.freebsd.org/changeset/base/261991 Index: lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198028-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198028-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198028-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198028 from upstream llvm trunk [Sparc] Add MCInstPrinter implementation for SPARC. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/InstPrinter/LLVMBuild.txt =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198029-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198029-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198029-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198029 from upstream llvm trunk [Sparc] Add target specific MCExpr class to handle sparc specific modifiers like %hi, %lo, etc., -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198030-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198030-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198030-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198030 from upstream llvm trunk [Sparc] Lower and MachineInstr to MC and print assembly using MCInstPrinter. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcTargetStreamer.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198145-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198145-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198145-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -3,7 +3,7 @@ Pull in r198145 from upstream llvm trunk [SparcV9]: Implement lowering of long double (fp128) arguments in Sparc64 ABI. Also, pass fp128 arguments to varargs through integer registers if necessary. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/CodeGen/SPARC/64abi.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198149-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198149-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198149-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -3,7 +3,7 @@ Pull in r198149 from upstream llvm trunk [SparcV9] For codegen generated library calls that return float, set inreg flag manually in LowerCall(). This makes the sparc backend to generate Sparc64 ABI compliant code. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcISelLowering.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198157-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198157-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198157-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -3,7 +3,7 @@ Pull in r198157 from upstream llvm trunk [SparcV9] Use separate instruction patterns for 64 bit arithmetic instructions instead of reusing 32 bit instruction patterns. This is done to avoid spilling the result of the 64-bit instructions to a 4-byte slot. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcAsmPrinter.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198280-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198280-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198280-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198280 from upstream llvm trunk [SparcV9]: Use SRL instead of SLL to clear top 32-bits in ctpop:i32. SLL does not clear top 32 bit, only SRL does. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcInstrInfo.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198281-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198281-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198281-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198281 from upstream llvm trunk [SparcV9]: Custom lower UMULO/SMULO so that the arguments are send to __multi3() in correct order. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcISelLowering.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198286-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198286-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198286-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198286 from upstream llvm trunk [Sparc] Handle atomic loads/stores in sparc backend. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcInstrInfo.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198480-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198480-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198480-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198480 from upstream llvm trunk [SparcV9]: Implement RETURNADDR and FRAMEADDR lowering in SPARC64. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcISelLowering.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198484-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198484-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198484-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198484 from upstream llvm trunk [Sparc] Add the initial implementation of an asm parser for sparc/sparcv9. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198533-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198533-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198533-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198533 from upstream llvm trunk [Sparc] Add initial implementation of MC Code emitter for sparc. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcInstrInfo.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198565-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198565-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198565-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198565 from upstream llvm trunk ELF relocation types for sparc. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: include/llvm/Support/ELF.h =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198567-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198567-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198567-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198567 from upstream llvm trunk SPARC: Make helper function static. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcAsmPrinter.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198580-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198580-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198580-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198580 from upstream llvm trunk [Sparc] Add ELF Object Writer for Sparc. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198591-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198591-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198591-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198591 from upstream llvm trunk [Sparc] Add initial implementation of disassembler for sparc -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcInstrFormats.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198592-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198592-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198592-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198592 from upstream llvm trunk [Sparc] Explicitly cast -1 to unsigned to fix buildbot errors. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/Disassembler/SparcDisassembler.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198658-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198658-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198658-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198658 from upstream llvm trunk [Sparc] Add support for parsing memory operands in sparc AsmParser. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/MC/Sparc/sparc-ctrl-instructions.s =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198681-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198681-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198681-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -3,7 +3,7 @@ Pull in r198681 from upstream llvm trunk [Sparc] Add support for parsing sparc asm modifiers such as %hi, %lo etc., Also, correct the offsets for FixupsKindInfo. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198738-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198738-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198738-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198738 from upstream llvm trunk [Sparc] Add support for parsing branch instructions and conditional moves. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/MC/Disassembler/Sparc/sparc.txt =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198739-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198739-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198739-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198739 from upstream llvm trunk [Sparc] Correct the mask for fixup_sparc_br19. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198740-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198740-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198740-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198740 from upstream llvm trunk [SparcV9] Rename operands in some sparc64 instructions so that TableGen can encode them correctly. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/MC/Sparc/sparc64-alu-instructions.s =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198893-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198893-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198893-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198893 from upstream llvm trunk [Sparc] Multiclass for loads/stores. No functionality change intended. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcInstr64Bit.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198909-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198909-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198909-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198909 from upstream llvm trunk [Sparc] Add support for parsing jmpl instruction and make indirect call and jmp instructions as aliases to jmpl. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/AsmParser/SparcAsmParser.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r198910-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r198910-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r198910-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198910 from upstream llvm trunk [Sparc] Emit retl/ret instead of jmp instruction. It improves the readability of the assembly generated. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/CodeGen/SPARC/ctpop.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199014-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199014-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199014-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199014 from upstream llvm trunk [Sparc] Bundle instruction with delay slow and its filler. Now, we can use -verify-machineinstrs with SPARC backend. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/DelaySlotFiller.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199024-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199024-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199024-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199024 from upstream llvm trunk [Sparc] Add missing processor types: v7 and niagara -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/Sparc.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199028-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199028-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199028-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -13,7 +13,7 @@ Pull in r199028 from upstream llvm trunk 'inreg' flag on the return value, so that behavior is unchanged. This also happens when returning a float _Complex. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/CodeGen/SPARC/64abi.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199031-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199031-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199031-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199031 from upstream llvm trunk [Sparc] Replace (unsigned)-1 with ~OU as suggested by Reid Kleckner. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/Disassembler/SparcDisassembler.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199033-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199033-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199033-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199033 from upstream llvm trunk [Sparc] Add support for parsing floating point instructions. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcInstrInfo.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199061-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199061-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199061-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -8,7 +8,7 @@ Pull in r199061 from upstream llvm trunk Teach isBlockOnlyReachableByFallthrough to find any MBB operands on bundled terminators so SPARC doesn't need to specialize this function. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/CodeGen/SPARC/missinglabel.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199186-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199186-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199186-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -11,7 +11,7 @@ Pull in r199186 from upstream llvm trunk The allocation order for DPair begins with the QPR registers, so register allocation is unlikely to change much. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/ARM/ARMISelLowering.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199187-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199187-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199187-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -19,7 +19,7 @@ Pull in r199187 from upstream llvm trunk This fixes a problem where InstrEmitter was picking 32-bit register classes for 64-bit values on SPARC. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/CodeGen/SPARC/spillsize.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199775-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199775-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199775-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -3,7 +3,7 @@ Pull in r199775 from upstream llvm trunk [Sparc] Do not add PC to _GLOBAL_OFFSET_TABLE_ address to access GOT in absolute code. Fixes PR#18521 -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcAsmPrinter.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199781-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199781-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199781-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199781 from upstream llvm trunk [Sparc] Add support for inline assembly constraint 'I'. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/CodeGen/SPARC/inlineasm.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199786-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199786-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199786-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199786 from upstream llvm trunk [Sparc] Add support for inline assembly constraints which specify registers by their aliases. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcISelLowering.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199940-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199940-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199940-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -4,7 +4,7 @@ Pull in r199940 from upstream llvm trunk code this looks correct, but could use review. The previous was definitely not correct. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/AsmParser/SparcAsmParser.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199974-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199974-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199974-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -3,7 +3,7 @@ Pull in r199974 from upstream llvm trunk [Sparc] Correct quad register list in the asm parser. Add test cases to check parsing of v9 double registers and their aliased quad registers. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/MC/Disassembler/Sparc/sparc-fp.txt =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199975-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199975-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199975-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -4,7 +4,7 @@ Pull in r199975 from upstream llvm trunk These all use the compare-and-swap CASA/CASXA instructions. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/CodeGen/SPARC/atomics.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r199977-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r199977-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r199977-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -3,7 +3,7 @@ Pull in r199977 from upstream llvm trunk [SparcV9] Add support for JIT in Sparc64. With this change, all supported tests in test/ExecutionEngine pass in sparcv9. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcJITInfo.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200103-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200103-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200103-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200103 from upstream llvm trunk Missing ELF relocations for Sparc. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: include/llvm/Support/ELF.h =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200104-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200104-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200104-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200104 from upstream llvm trunk removing duplicate enum value -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: include/llvm/Support/ELF.h =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200112-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200112-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200112-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200112 from upstream llvm trunk [Sparc] Add support for sparc relocation types in ELF object file. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/MC/Sparc/sparc-relocations.s =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200130-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200130-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200130-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -4,7 +4,7 @@ Pull in r200130 from upstream llvm trunk Found by SingleSource/UnitTests/AtomicOps.c -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcISelLowering.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200131-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200131-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200131-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -5,7 +5,7 @@ Pull in r200131 from upstream llvm trunk The popc instruction is defined in the SPARCv9 instruction set architecture, but it was emulated on CPUs older than Niagara 2. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcISelLowering.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200141-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200141-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200141-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200141 from upstream llvm trunk Clean up the Legal/Expand logic for SPARC popc. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcSubtarget.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200282-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200282-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200282-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -5,7 +5,7 @@ Pull in r200282 from upstream llvm trunk Also emit the stubs that were generated for references to typeinfo symbols. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcAsmPrinter.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200368-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200368-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200368-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull r200368 from upstream llvm trunk (b [SparcV9] Use correct register class (I64RegClass) to hold the address of _GLOBAL_OFFSET_TABLE_ in sparcv9. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcInstrInfo.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200373-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200373-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200373-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -6,7 +6,7 @@ Pull in r200373 from upstream llvm trunk combines symbols in different segments". This is because MC computes pc_rel entries with subtract expression between labels from different sections. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcTargetObjectFile.h =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200376-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200376-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200376-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -4,7 +4,7 @@ Pull in r200376 from upstream llvm trunk This makes MCAsmInfo::getExprForFDESymbol() a virtual function and overrides it in SparcMCAsmInfo. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.h =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200509-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200509-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200509-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200509 from upstream llvm trunk [Sparc] Save and restore float registers that may be used for parameter passing. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcJITInfo.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200617-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200617-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200617-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200617 from upstream llvm trunk [Sparc] Set %o7 as the return address register instead of %i7 in MCRegisterInfo. Also, add CFI instructions to initialize the frame correctly. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200960-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200960-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200960-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200960 from upstream llvm trunk [Sparc] Use SparcMCExpr::VariantKind itself as MachineOperand's target flags. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcISelLowering.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200961-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200961-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200961-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200961 from upstream llvm trunk [Sparc] Emit correct relocations for PIC code when integrated assembler is used. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/CodeGen/SPARC/obj-relocs.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200962-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200962-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200962-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200962 from upstream llvm trunk [Sparc] Emit relocations for Thread Local Storage (TLS) when integrated assembler is used. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200963-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200963-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200963-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200963 from upstream llvm trunk [Sparc] Emit correct encoding for atomic instructions. Also, add support for parsing CAS instructions to test the CAS encoding. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: test/MC/Sparc/sparc-atomic-instructions.s =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262261-llvm-r200965-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262261-llvm-r200965-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262261-llvm-r200965-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r200965 from upstream llvm trunk [Sparc] Add support for parsing synthetic instruction 'mov'. -Introduced here: http://svn.freebsd.org/changeset/base/262261 +Introduced here: http://svnweb.freebsd.org/changeset/base/262261 Index: lib/Target/Sparc/SparcInstrAliases.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r198311-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r198311-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r198311-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -3,7 +3,7 @@ Pull in r198311 from upstream clang trun In the FreeBSD assembler driver, inform the sparc assembler that we're producing PIC code. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/Driver/Tools.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r198312-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r198312-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r198312-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198312 from upstream clang trun Remove a tab that snuck in. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/Driver/Tools.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r198911-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r198911-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r198911-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198911 from upstream clang trun Pass -32/-64 to the assembler when building for sparc/sparc64. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/test/Driver/linux-as.c =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r198912-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r198912-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r198912-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198912 from upstream clang trun Give the linker the right ELF type for SPARC targets. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/Driver/Tools.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r198918-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r198918-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r198918-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198918 from upstream clang trun Locate GCC installations on SPARC systems. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/Driver/ToolChains.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r198923-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r198923-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r198923-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r198923 from upstream clang trun Use the right dynamic linker for SPARC Linux executables. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/Driver/Tools.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r199012-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r199012-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r199012-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199012 from upstream clang trun Select the UltraSPARC instruction set when invoking the assembler. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/Driver/Tools.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r199034-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r199034-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r199034-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199034 from upstream clang trun MIPS and SPARC assemblers both take the -KPIC flag. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/Driver/Tools.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r199037-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r199037-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r199037-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199037 from upstream clang trun SPARC passes non-trivial C++ objects indirectly like everybody else. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/CodeGen/TargetInfo.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r199188-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r199188-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r199188-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -5,7 +5,7 @@ Pull in r199188 from upstream clang trun Pad these structs up so they are sret-returned even on that architecture. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/test/CodeGen/sret.c =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r199399-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r199399-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r199399-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r199399 from upstream clang trun SPARCv9 implements long double as an IEEE quad. -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/test/CodeGen/sparcv9-abi.c =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262262-clang-r200452-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262262-clang-r200452-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262262-clang-r200452-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -4,7 +4,7 @@ Pull in r200452 from upstream clang trun Patch by Roman Divacky! -Introduced here: http://svn.freebsd.org/changeset/base/262262 +Introduced here: http://svnweb.freebsd.org/changeset/base/262262 Index: tools/clang/lib/Basic/Targets.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262264-llvm-r200453-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262264-llvm-r200453-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262264-llvm-r200453-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -6,7 +6,7 @@ Pull in r200453 from upstream llvm trunk atomic swap can be implemented in terms of CASX, like the other atomic rmw primitives. -Introduced here: http://svn.freebsd.org/changeset/base/262264 +Introduced here: http://svnweb.freebsd.org/changeset/base/262264 Index: lib/Target/Sparc/SparcInstr64Bit.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262265-llvm-r201718-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262265-llvm-r201718-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262265-llvm-r201718-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r201718 from upstream llvm trunk Expand 64bit {SHL,SHR,SRA}_PARTS on sparcv9. -Introduced here: http://svn.freebsd.org/changeset/base/262265 +Introduced here: http://svnweb.freebsd.org/changeset/base/262265 Index: test/CodeGen/SPARC/parts.ll =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262303-enable-ppc-integrated-as.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262303-enable-ppc-integrated-as.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262303-enable-ppc-integrated-as.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r197521 from upstream clang trun Use the integrated assembler by default on FreeBSD/ppc and ppc64. -Introduced here: http://svn.freebsd.org/changeset/base/262303 +Introduced here: http://svnweb.freebsd.org/changeset/base/262303 Index: tools/clang/lib/Driver/ToolChains.h =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262415-llvm-r201994-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262415-llvm-r201994-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262415-llvm-r201994-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r201994 from upstream llvm trunk SPARC: Implement TRAP lowering. Matches what GCC emits. -Introduced here: http://svn.freebsd.org/changeset/base/262415 +Introduced here: http://svnweb.freebsd.org/changeset/base/262415 Index: lib/Target/Sparc/SparcInstrInfo.td =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262460-llvm-r202059-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262460-llvm-r202059-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262460-llvm-r202059-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r202059 from upstream clang trun Implement getDwarfEHStackPointer() and initDwarfEHRegSizeTable() for sparcv9. -Introduced here: http://svn.freebsd.org/changeset/base/262460 +Introduced here: http://svnweb.freebsd.org/changeset/base/262460 Index: tools/clang/lib/CodeGen/TargetInfo.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262535-clang-r202177-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262535-clang-r202177-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262535-clang-r202177-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -4,7 +4,7 @@ Pull in r202177 from upstream clang trun -march which doesnt exist on sparc gcc to -mcpu. While here adjust a few tests to not write an unused temporary file. -Introduced here: http://svn.freebsd.org/changeset/base/262535 +Introduced here: http://svnweb.freebsd.org/changeset/base/262535 Index: tools/clang/lib/Basic/Targets.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262536-clang-r202179-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262536-clang-r202179-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262536-clang-r202179-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -2,7 +2,7 @@ Pull in r202179 from upstream clang trun Pass the sparc architecture variant to the assembler. -Introduced here: http://svn.freebsd.org/changeset/base/262536 +Introduced here: http://svnweb.freebsd.org/changeset/base/262536 Index: tools/clang/lib/Driver/Tools.cpp =================================================================== Modified: stable/9/contrib/llvm/patches/patch-r262582-llvm-r202422-sparc.diff ============================================================================== --- stable/9/contrib/llvm/patches/patch-r262582-llvm-r202422-sparc.diff Sat May 16 23:00:03 2015 (r283019) +++ stable/9/contrib/llvm/patches/patch-r262582-llvm-r202422-sparc.diff Sat May 16 23:18:30 2015 (r283020) @@ -4,7 +4,7 @@ Pull in r202422 from upstream llvm trunk expensive libcall. Also, Qp_neg is not implemented on at least FreeBSD. This is also what gcc is doing. -Introduced here: http://svn.freebsd.org/changeset/base/262582 +Introduced here: http://svnweb.freebsd.org/changeset/base/262582 Index: lib/Target/Sparc/SparcISelLowering.cpp =================================================================== *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***