svn commit: r301922 - head/sys/sys
Author: mjg
Date: Wed Jun 15 08:34:36 2016
New Revision: 301922
URL: https://svnweb.freebsd.org/changeset/base/301922
Log:
sdt: annotate the probe test as likely to fail
This saves a jump in plenty of cases.
Approved by: re (kib)
MFC after:1 week
Modified:
head/sys/sys/sdt.h
Modified: head/sys/sys/sdt.h
==
--- head/sys/sys/sdt.h Wed Jun 15 06:42:30 2016(r301921)
+++ head/sys/sys/sdt.h Wed Jun 15 08:34:36 2016(r301922)
@@ -161,7 +161,7 @@ SET_DECLARE(sdt_argtypes_set, struct sdt
extern struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1]
#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) do {
\
- if (sdt_##prov##_##mod##_##func##_##name->id)
\
+ if (__predict_false(sdt_##prov##_##mod##_##func##_##name->id))
\
(*sdt_probe_func)(sdt_##prov##_##mod##_##func##_##name->id,
\
(uintptr_t) arg0, (uintptr_t) arg1, (uintptr_t) arg2,
\
(uintptr_t) arg3, (uintptr_t) arg4);
\
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301928 - head/sys/fs/devfs
Author: kib
Date: Wed Jun 15 15:55:14 2016
New Revision: 301928
URL: https://svnweb.freebsd.org/changeset/base/301928
Log:
Another follow-up to r291460. Only access vp->v_rdev for VCHR vnodes
in devfs_reclaim().
Reported and tested by: pho
Sponsored by: The FreeBSD Foundation
Approved by: re (gjb)
MFC after:1 week
Modified:
head/sys/fs/devfs/devfs_vnops.c
Modified: head/sys/fs/devfs/devfs_vnops.c
==
--- head/sys/fs/devfs/devfs_vnops.c Wed Jun 15 14:12:22 2016
(r301927)
+++ head/sys/fs/devfs/devfs_vnops.c Wed Jun 15 15:55:14 2016
(r301928)
@@ -1360,10 +1360,10 @@ devfs_readlink(struct vop_readlink_args
static int
devfs_reclaim(struct vop_reclaim_args *ap)
{
- struct vnode *vp = ap->a_vp;
+ struct vnode *vp;
struct devfs_dirent *de;
- struct cdev *dev;
+ vp = ap->a_vp;
mtx_lock(&devfs_de_interlock);
de = vp->v_data;
if (de != NULL) {
@@ -1371,24 +1371,31 @@ devfs_reclaim(struct vop_reclaim_args *a
vp->v_data = NULL;
}
mtx_unlock(&devfs_de_interlock);
-
vnode_destroy_vobject(vp);
+ return (0);
+}
+
+static int
+devfs_reclaim_vchr(struct vop_reclaim_args *ap)
+{
+ struct vnode *vp;
+ struct cdev *dev;
+
+ vp = ap->a_vp;
+ MPASS(vp->v_type == VCHR);
+
+ devfs_reclaim(ap);
VI_LOCK(vp);
dev_lock();
dev = vp->v_rdev;
vp->v_rdev = NULL;
-
- if (dev == NULL) {
- dev_unlock();
- VI_UNLOCK(vp);
- return (0);
- }
-
- dev->si_usecount -= vp->v_usecount;
+ if (dev != NULL)
+ dev->si_usecount -= vp->v_usecount;
dev_unlock();
VI_UNLOCK(vp);
- dev_rel(dev);
+ if (dev != NULL)
+ dev_rel(dev);
return (0);
}
@@ -1898,7 +1905,7 @@ static struct vop_vector devfs_specops =
.vop_readdir = VOP_PANIC,
.vop_readlink = VOP_PANIC,
.vop_reallocblks = VOP_PANIC,
- .vop_reclaim = devfs_reclaim,
+ .vop_reclaim = devfs_reclaim_vchr,
.vop_remove = devfs_remove,
.vop_rename = VOP_PANIC,
.vop_revoke = devfs_revoke,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301929 - head/sys/kern
Author: kib
Date: Wed Jun 15 15:56:03 2016
New Revision: 301929
URL: https://svnweb.freebsd.org/changeset/base/301929
Log:
Do not assume that we own the use reference on the covered vnode until
we set MNTK_UNMOUNT flag on the mp. Otherwise parallel unmount which
wins race with us could dereference the covered vnode, and we are
left with the locked freed memory.
Reported and tested by: pho
Sponsored by: The FreeBSD Foundation
Approved by: re (gjb)
MFC after:1 week
Modified:
head/sys/kern/vfs_mount.c
Modified: head/sys/kern/vfs_mount.c
==
--- head/sys/kern/vfs_mount.c Wed Jun 15 15:55:14 2016(r301928)
+++ head/sys/kern/vfs_mount.c Wed Jun 15 15:56:03 2016(r301929)
@@ -1220,7 +1220,6 @@ dounmount(struct mount *mp, int flags, s
VI_LOCK(coveredvp);
vholdl(coveredvp);
vn_lock(coveredvp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY);
- vdrop(coveredvp);
/*
* Check for mp being unmounted while waiting for the
* covered vnode lock.
@@ -1228,18 +1227,22 @@ dounmount(struct mount *mp, int flags, s
if (coveredvp->v_mountedhere != mp ||
coveredvp->v_mountedhere->mnt_gen != mnt_gen_r) {
VOP_UNLOCK(coveredvp, 0);
+ vdrop(coveredvp);
vfs_rel(mp);
return (EBUSY);
}
}
+
/*
* Only privileged root, or (if MNT_USER is set) the user that did the
* original mount is permitted to unmount this filesystem.
*/
error = vfs_suser(mp, td);
if (error != 0) {
- if (coveredvp)
+ if (coveredvp != NULL) {
VOP_UNLOCK(coveredvp, 0);
+ vdrop(coveredvp);
+ }
vfs_rel(mp);
return (error);
}
@@ -1249,8 +1252,10 @@ dounmount(struct mount *mp, int flags, s
if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0 ||
!TAILQ_EMPTY(&mp->mnt_uppers)) {
MNT_IUNLOCK(mp);
- if (coveredvp)
+ if (coveredvp != NULL) {
VOP_UNLOCK(coveredvp, 0);
+ vdrop(coveredvp);
+ }
vn_finished_write(mp);
return (EBUSY);
}
@@ -1283,6 +1288,16 @@ dounmount(struct mount *mp, int flags, s
if (mp->mnt_flag & MNT_EXPUBLIC)
vfs_setpublicfs(NULL, NULL, NULL);
+ /*
+* From now, we can claim that the use reference on the
+* coveredvp is ours, and the ref can be released only by
+* successfull unmount by us, or left for later unmount
+* attempt. The previously acquired hold reference is no
+* longer needed to protect the vnode from reuse.
+*/
+ if (coveredvp != NULL)
+ vdrop(coveredvp);
+
vfs_msync(mp, MNT_WAIT);
MNT_ILOCK(mp);
async_flag = mp->mnt_flag & MNT_ASYNC;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301930 - in head/sys: dev/cxgbe/tom kern sys
Author: jhb
Date: Wed Jun 15 20:56:45 2016
New Revision: 301930
URL: https://svnweb.freebsd.org/changeset/base/301930
Log:
Move backend-specific fields of kaiocb into a union.
This reduces the size of kaiocb slightly. I've also added some generic
fields that other backends can use in place of the BIO-specific fields.
Change the socket and Chelsio DDP backends to use 'backend3' instead of
abusing _aiocb_private.status directly. This confines the use of
_aiocb_private to the AIO internals in vfs_aio.c.
Reviewed by: kib (earlier version)
Approved by: re (gjb)
Sponsored by: Chelsio Communications
Differential Revision:https://reviews.freebsd.org/D6547
Modified:
head/sys/dev/cxgbe/tom/t4_ddp.c
head/sys/kern/sys_socket.c
head/sys/kern/vfs_aio.c
head/sys/sys/aio.h
Modified: head/sys/dev/cxgbe/tom/t4_ddp.c
==
--- head/sys/dev/cxgbe/tom/t4_ddp.c Wed Jun 15 15:56:03 2016
(r301929)
+++ head/sys/dev/cxgbe/tom/t4_ddp.c Wed Jun 15 20:56:45 2016
(r301930)
@@ -74,6 +74,12 @@ VNET_DECLARE(int, tcp_autorcvbuf_inc);
VNET_DECLARE(int, tcp_autorcvbuf_max);
#define V_tcp_autorcvbuf_max VNET(tcp_autorcvbuf_max)
+/*
+ * Use the 'backend3' field in AIO jobs to store the amount of data
+ * received by the AIO job so far.
+ */
+#defineaio_receivedbackend3
+
static void aio_ddp_requeue_task(void *context, int pending);
static void ddp_complete_all(struct toepcb *toep, int error);
static void t4_aio_cancel_active(struct kaiocb *job);
@@ -204,7 +210,7 @@ ddp_complete_one(struct kaiocb *job, int
* it was cancelled, report it as a short read rather than an
* error.
*/
- copied = job->uaiocb._aiocb_private.status;
+ copied = job->aio_received;
if (copied != 0 || error == 0)
aio_complete(job, copied, 0);
else
@@ -350,7 +356,7 @@ insert_ddp_data(struct toepcb *toep, uin
MPASS((toep->ddp_flags & db_flag) != 0);
db = &toep->db[db_idx];
job = db->job;
- copied = job->uaiocb._aiocb_private.status;
+ copied = job->aio_received;
placed = n;
if (placed > job->uaiocb.aio_nbytes - copied)
placed = job->uaiocb.aio_nbytes - copied;
@@ -360,7 +366,7 @@ insert_ddp_data(struct toepcb *toep, uin
* t4_aio_cancel_active() completes this
* request.
*/
- job->uaiocb._aiocb_private.status += placed;
+ job->aio_received += placed;
} else if (copied + placed != 0) {
CTR4(KTR_CXGBE,
"%s: completing %p (copied %ld, placed %lu)",
@@ -601,16 +607,16 @@ handle_ddp_data(struct toepcb *toep, __b
* Update the job's length but defer completion to the
* TCB_RPL callback.
*/
- job->uaiocb._aiocb_private.status += len;
+ job->aio_received += len;
goto out;
} else if (!aio_clear_cancel_function(job)) {
/*
* Update the copied length for when
* t4_aio_cancel_active() completes this request.
*/
- job->uaiocb._aiocb_private.status += len;
+ job->aio_received += len;
} else {
- copied = job->uaiocb._aiocb_private.status;
+ copied = job->aio_received;
#ifdef VERBOSE_TRACES
CTR4(KTR_CXGBE, "%s: completing %p (copied %ld, placed %d)",
__func__, job, copied, len);
@@ -698,7 +704,7 @@ handle_ddp_tcb_rpl(struct toepcb *toep,
* also take care of updating the tp, etc.
*/
job = db->job;
- copied = job->uaiocb._aiocb_private.status;
+ copied = job->aio_received;
if (copied == 0) {
CTR2(KTR_CXGBE, "%s: cancelling %p", __func__, job);
aio_cancel(job);
@@ -746,7 +752,7 @@ handle_ddp_close(struct toepcb *toep, st
MPASS((toep->ddp_flags & db_flag) != 0);
db = &toep->db[db_idx];
job = db->job;
- copied = job->uaiocb._aiocb_private.status;
+ copied = job->aio_received;
placed = len;
if (placed > job->uaiocb.aio_nbytes - copied)
placed = job->uaiocb.aio_nbytes - copied;
@@ -756,7 +762,7 @@ handle_ddp_close(struct toepcb *toep, st
* t4_aio_cancel_active() completes this
* request.
*/
- job->uaiocb._aiocb_private.status += placed;
+ job->aio_received += placed;
} else {
svn commit: r301931 - head/tools/tools/decioctl
Author: jhb
Date: Wed Jun 15 21:01:53 2016
New Revision: 301931
URL: https://svnweb.freebsd.org/changeset/base/301931
Log:
Add a tool to decode ioctl commands.
One or more ioctl command values can be passed as arguments on the command
line. For each value, the command is broken down into it's components
(direction, group, number, and length). In addition, if a command has a
known name it is output via sysdecode_ioctlname().
Reviewed by: kib, emaste, avg
Approved by: re (gjb)
Differential Revision:https://reviews.freebsd.org/D6851
Added:
head/tools/tools/decioctl/
head/tools/tools/decioctl/Makefile (contents, props changed)
head/tools/tools/decioctl/decioctl.c (contents, props changed)
Added: head/tools/tools/decioctl/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/tools/decioctl/Makefile Wed Jun 15 21:01:53 2016
(r301931)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+PROG= decioctl
+SRCS= decioctl.c
+MAN=
+BINDIR?= /usr/bin
+
+LIBADD=sysdecode
+
+.include
Added: head/tools/tools/decioctl/decioctl.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/tools/decioctl/decioctl.cWed Jun 15 21:01:53 2016
(r301931)
@@ -0,0 +1,94 @@
+/*-
+ * Copyright (c) 2005-2006,2016 John H. Baldwin
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+static void
+usage(char **av)
+{
+ fprintf(stderr, "%s: [ ... ]\n", av[0]);
+ exit(1);
+}
+
+int
+main(int ac, char **av)
+{
+ unsigned long cmd;
+ const char *name;
+ char *cp;
+ int group, i;
+
+ if (ac < 2)
+ usage(av);
+ printf(" command : dir group num len name\n");
+ for (i = 1; i < ac; i++) {
+ errno = 0;
+ cmd = strtoul(av[i], &cp, 0);
+ if (*cp != '\0' || errno != 0) {
+ fprintf(stderr, "Invalid integer: %s\n", av[i]);
+ usage(av);
+ }
+ printf("0x%08lx: ", cmd);
+ switch (cmd & IOC_DIRMASK) {
+ case IOC_VOID:
+ printf("VOID ");
+ break;
+ case IOC_OUT:
+ printf("OUT ");
+ break;
+ case IOC_IN:
+ printf("IN ");
+ break;
+ case IOC_INOUT:
+ printf("INOUT");
+ break;
+ default:
+ printf("%01lx ???", (cmd & IOC_DIRMASK) >> 29);
+ break;
+ }
+ printf(" ");
+ group = IOCGROUP(cmd);
+ if (isprint(group))
+ printf(" '%c' ", group);
+ else
+ printf(" 0x%02x", group);
+ printf(" %3lu %4lu", cmd & 0xff, IOCPARM_LEN(cmd));
+ name = sysdecode_ioctlname(cmd);
+ if (name != NULL)
+ printf(" %s", name);
+ printf("\n");
+ }
+ return (0);
+}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301932 - head/sys/dev/cxgbe/tom
Author: jhb
Date: Wed Jun 15 21:08:51 2016
New Revision: 301932
URL: https://svnweb.freebsd.org/changeset/base/301932
Log:
Use sbused() instead of sbspace() to avoid signed issues.
Inserting a full mbuf with an external cluster into the socket buffer
resulted in sbspace() returning -MLEN. However, since sb_hiwat is
unsigned, the -MLEN value was converted to unsigned in comparisons. As a
result, the socket buffer was never autosized. Note that sb_lowat is signed
to permit direct comparisons with sbspace(), but sb_hiwat is unsigned.
Follow suit with what tcp_output() does and compare the value of sbused()
with sb_hiwat instead.
Approved by: re (gjb)
Sponsored by: Chelsio Communications
Modified:
head/sys/dev/cxgbe/tom/t4_cpl_io.c
Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c
==
--- head/sys/dev/cxgbe/tom/t4_cpl_io.c Wed Jun 15 21:01:53 2016
(r301931)
+++ head/sys/dev/cxgbe/tom/t4_cpl_io.c Wed Jun 15 21:08:51 2016
(r301932)
@@ -577,7 +577,7 @@ t4_push_frames(struct adapter *sc, struc
struct tcpcb *tp = intotcpcb(inp);
struct socket *so = inp->inp_socket;
struct sockbuf *sb = &so->so_snd;
- int tx_credits, shove, compl, space, sowwakeup;
+ int tx_credits, shove, compl, sowwakeup;
struct ofld_tx_sdesc *txsd = &toep->txsd[toep->txsd_pidx];
INP_WLOCK_ASSERT(inp);
@@ -652,9 +652,7 @@ t4_push_frames(struct adapter *sc, struc
}
}
- space = sbspace(sb);
-
- if (space <= sb->sb_hiwat * 3 / 8 &&
+ if (sbused(sb) > sb->sb_hiwat * 5 / 8 &&
toep->plen_nocompl + plen >= sb->sb_hiwat / 4)
compl = 1;
else
@@ -663,7 +661,7 @@ t4_push_frames(struct adapter *sc, struc
if (sb->sb_flags & SB_AUTOSIZE &&
V_tcp_do_autosndbuf &&
sb->sb_hiwat < V_tcp_autosndbuf_max &&
- space < sb->sb_hiwat / 8) {
+ sbused(sb) >= sb->sb_hiwat * 7 / 8) {
int newsize = min(sb->sb_hiwat + V_tcp_autosndbuf_inc,
V_tcp_autosndbuf_max);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r301931 - head/tools/tools/decioctl
On Wednesday, June 15, 2016 09:01:53 PM John Baldwin wrote: > Author: jhb > Date: Wed Jun 15 21:01:53 2016 > New Revision: 301931 > URL: https://svnweb.freebsd.org/changeset/base/301931 > > Log: > Add a tool to decode ioctl commands. > > One or more ioctl command values can be passed as arguments on the command > line. For each value, the command is broken down into it's components > (direction, group, number, and length). In addition, if a command has a > known name it is output via sysdecode_ioctlname(). > > Reviewed by:kib, emaste, avg > Approved by:re (gjb) > Differential Revision: https://reviews.freebsd.org/D6851 I've had a version of this in a private tree of utilities for several years. I added the sysdecode stuff yesterday though now that it's easy to do so. Sample output: % ./decioctl 0xc4d01902 0xc4e01902 0x4004667f command : dir group num len name 0xc4d01902: INOUT 0x19 2 1232 CAMIOCOMMAND 0xc4e01902: INOUT 0x19 2 1248 0x4004667f: OUT'f' 1274 FIONREAD -- John Baldwin ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r301932 - head/sys/dev/cxgbe/tom
On Wednesday, June 15, 2016 09:08:51 PM John Baldwin wrote: > Author: jhb > Date: Wed Jun 15 21:08:51 2016 > New Revision: 301932 > URL: https://svnweb.freebsd.org/changeset/base/301932 > > Log: > Use sbused() instead of sbspace() to avoid signed issues. > > Inserting a full mbuf with an external cluster into the socket buffer > resulted in sbspace() returning -MLEN. However, since sb_hiwat is > unsigned, the -MLEN value was converted to unsigned in comparisons. As a > result, the socket buffer was never autosized. Note that sb_lowat is signed > to permit direct comparisons with sbspace(), but sb_hiwat is unsigned. > Follow suit with what tcp_output() does and compare the value of sbused() > with sb_hiwat instead. > > Approved by:re (gjb) > Sponsored by: Chelsio Communications Amusingly (or not), sb_lowat used to be signed as well. Mike Karels changed it to signed in this commit to BSD: https://svnweb.freebsd.org/csrg/sys/sys/socketvar.h?revision=43896 The log reads: add SB_ASYNC in sockbuf, add SB_NOTIFY, SB_NOINTR; make lowat signed for comparison with sbspace (should probably give up and make all fields signed -- John Baldwin ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301938 - head
Author: bdrewery
Date: Wed Jun 15 23:58:00 2016
New Revision: 301938
URL: https://svnweb.freebsd.org/changeset/base/301938
Log:
tinderbox/universe: Only show arm64 warning if it was in the TARGETS list.
This was a flaw in my change in r287903 but also in the original change
in r282156 since it used empty(${TARGETS}) rather than empty(TARGETS).
Reported by: lidl
Approved by: re (gjb)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Wed Jun 15 23:57:57 2016(r301937)
+++ head/Makefile Wed Jun 15 23:58:00 2016(r301938)
@@ -418,9 +418,9 @@ TARGET_ARCHES_pc98?=i386
TARGET_ARCHES_${target}?= ${target}
.endfor
-# XXX Add arm64 to universe only if we have an external binutils installed.
+# XXX Remove arm64 from universe if the required binutils package is missing.
# It does not build with the in-tree linker.
-.if !exists(/usr/local/aarch64-freebsd/bin/ld) && empty(${TARGETS})
+.if !exists(/usr/local/aarch64-freebsd/bin/ld) && ${TARGETS:Marm64}
_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64}
universe: universe_arm64_skip .PHONY
universe_epilogue: universe_arm64_skip .PHONY
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301935 - in head: share/mk sys/conf
Author: bdrewery
Date: Wed Jun 15 23:57:50 2016
New Revision: 301935
URL: https://svnweb.freebsd.org/changeset/base/301935
Log:
WITH_META_MODE: Do include headers for specific guessed dependencies
This is a follow-up to r300343.
This is important for the OBJS_DEPEND_GUESS usage in
gnu/usr.bin/cc/cc_tools.
See comments for more details.
Approved by: re (implicit)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.dep.mk
head/sys/conf/kern.post.mk
Modified: head/share/mk/bsd.dep.mk
==
--- head/share/mk/bsd.dep.mkWed Jun 15 23:57:46 2016(r301934)
+++ head/share/mk/bsd.dep.mkWed Jun 15 23:57:50 2016(r301935)
@@ -221,9 +221,11 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.elif defined(_meta_filemon)
# For meta mode we still need to know which file to depend on to avoid
# ambiguous suffix transformation rules from .PATH. Meta mode does not
-# use .depend files. We really only need source files, not headers.
+# use .depend files. We really only need source files, not headers since
+# they are typically in SRCS/beforebuild already. For target-specific
+# guesses do include headers though since they may not be in SRCS.
${__obj}: ${OBJS_DEPEND_GUESS:N*.h}
-${__obj}: ${OBJS_DEPEND_GUESS.${__obj}:N*.h}
+${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.endif
.endfor
Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk Wed Jun 15 23:57:46 2016(r301934)
+++ head/sys/conf/kern.post.mk Wed Jun 15 23:57:50 2016(r301935)
@@ -254,11 +254,13 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.elif defined(_meta_filemon)
# For meta mode we still need to know which file to depend on to avoid
# ambiguous suffix transformation rules from .PATH. Meta mode does not
-# use .depend files. We really only need source files, not headers.
+# use .depend files. We really only need source files, not headers since
+# they are typically in SRCS/beforebuild already. For target-specific
+# guesses do include headers though since they may not be in SRCS.
.if ${SYSTEM_OBJS:M${__obj}}
${__obj}: ${OBJS_DEPEND_GUESS:N*.h}
.endif
-${__obj}: ${OBJS_DEPEND_GUESS.${__obj}:N*.h}
+${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.endif
.endfor
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301937 - head/share/mk
Author: bdrewery
Date: Wed Jun 15 23:57:57 2016
New Revision: 301937
URL: https://svnweb.freebsd.org/changeset/base/301937
Log:
WITH_META_MODE: Keep .MAKE.MODE/META_MODE clean
Due to META_MODE being passed into the environment it tends
to keep growing with the defaults.
Approved by: re (implicit)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/sys.mk
Modified: head/share/mk/sys.mk
==
--- head/share/mk/sys.mkWed Jun 15 23:57:53 2016(r301936)
+++ head/share/mk/sys.mkWed Jun 15 23:57:57 2016(r301937)
@@ -425,6 +425,10 @@ __MAKE_CONF?=/etc/make.conf
# late include for customization
.sinclude
+.if defined(META_MODE)
+META_MODE:=${META_MODE:O:u}
+.endif
+
.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
SHELL= ${__MAKE_SHELL}
.SHELL: path=${__MAKE_SHELL}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301933 - head/share/mk
Author: bdrewery
Date: Wed Jun 15 23:57:32 2016
New Revision: 301933
URL: https://svnweb.freebsd.org/changeset/base/301933
Log:
Don't truncate OBJS_DEPEND_GUESS.target from Makefile
This is important to allow a Makefile to override OBJS_DEPEND_GUESS for
handling in META_MODE when its depend files are missing.
Approved by: re (implicit)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.dep.mk
head/share/mk/bsd.lib.mk
Modified: head/share/mk/bsd.dep.mk
==
--- head/share/mk/bsd.dep.mkWed Jun 15 21:08:51 2016(r301932)
+++ head/share/mk/bsd.dep.mkWed Jun 15 23:57:32 2016(r301933)
@@ -86,7 +86,7 @@ _SKIP_READ_DEPEND=1
CLEANFILES?=
.for _S in ${SRCS:N*.[dhly]}
-OBJS_DEPEND_GUESS.${_S:R}.o= ${_S}
+OBJS_DEPEND_GUESS.${_S:R}.o+= ${_S}
.endfor
# Lexical analyzers
@@ -94,7 +94,7 @@ OBJS_DEPEND_GUESS.${_S:R}.o= ${_S}
.for _LC in ${_LSRC:R}.c
${_LC}: ${_LSRC}
${LEX} ${LFLAGS} -o${.TARGET} ${.ALLSRC}
-OBJS_DEPEND_GUESS.${_LC:R}.o= ${_LC}
+OBJS_DEPEND_GUESS.${_LC:R}.o+= ${_LC}
SRCS:= ${SRCS:S/${_LSRC}/${_LC}/}
CLEANFILES+= ${_LC}
.endfor
@@ -125,7 +125,7 @@ CLEANFILES+= ${_YH}
${_YC}: ${_YSRC}
${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC}
.endif
-OBJS_DEPEND_GUESS.${_YC:R}.o= ${_YC}
+OBJS_DEPEND_GUESS.${_YC:R}.o+= ${_YC}
.endfor
.endfor
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkWed Jun 15 21:08:51 2016(r301932)
+++ head/share/mk/bsd.lib.mkWed Jun 15 23:57:32 2016(r301933)
@@ -424,13 +424,13 @@ lint: ${SRCS:M*.c}
.if defined(LIB) && !empty(LIB)
OBJS_DEPEND_GUESS+= ${SRCS:M*.h}
.for _S in ${SRCS:N*.[hly]}
-OBJS_DEPEND_GUESS.${_S:R}.po= ${_S}
+OBJS_DEPEND_GUESS.${_S:R}.po+= ${_S}
.endfor
.endif
.if defined(SHLIB_NAME) || \
defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
.for _S in ${SRCS:N*.[hly]}
-OBJS_DEPEND_GUESS.${_S:R}.So= ${_S}
+OBJS_DEPEND_GUESS.${_S:R}.So+= ${_S}
.endfor
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301936 - head/gnu/usr.bin/cc/cc_tools
Author: bdrewery
Date: Wed Jun 15 23:57:53 2016
New Revision: 301936
URL: https://svnweb.freebsd.org/changeset/base/301936
Log:
WITH_META_MODE: Don't expect a .meta file for side-effect generated files.
This is the same as r301285.
Approved by: re (implicit)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/gnu/usr.bin/cc/cc_tools/Makefile
Modified: head/gnu/usr.bin/cc/cc_tools/Makefile
==
--- head/gnu/usr.bin/cc/cc_tools/Makefile Wed Jun 15 23:57:50 2016
(r301935)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile Wed Jun 15 23:57:53 2016
(r301936)
@@ -261,7 +261,7 @@ gengtype-lex.c: gengtype-lex.l
gengtype-yacc.h: gengtype-yacc.y
yacc -d -o gengtype-yacc.c ${.ALLSRC}
-gengtype-yacc.c: gengtype-yacc.h
+gengtype-yacc.c: gengtype-yacc.h .NOMETA
gengtype-yacc+%DIKED.c: gengtype-yacc.c
cat${.ALLSRC} > ${.TARGET}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301939 - in head: . share/mk
Author: bdrewery
Date: Wed Jun 15 23:58:03 2016
New Revision: 301939
URL: https://svnweb.freebsd.org/changeset/base/301939
Log:
Fix native powerpc64 build of lib32 with in-tree GCC.
- This was broken by r300350 and r300885.
- Add some comments around the external GCC logic since it is spread out
and in need of some cleanup.
- The problem was that X_COMPILER_TYPE is always defined from CC->XCC's
default, so if /usr/bin/cc is GCC (as it is on native powerpc64) then
X_COMPILER_TYPE was getting GCC and triggering the external logic in
Makefile.libcompat. It was intended to always provide -isystem with
GCC since --sysroot is used into the lib32 sysroot which won't modify
the header path without the -isystem. The use of the libc++/std=c++11
override was only intended to be used for external compilers though
(more accurately GCC 4.8+ but that's a separate assumption to
cleanup). Apply the same logic from Makefile.inc1 to Makefile.libcompat
to only add the libc++ override when needed for external compilers.
Pointyhat to: bdrewery
Tested with: native ppc64 (swills), universe, ppc64 xtoolchain,
amd64 xtoolchain, sparc64 cross-build of ppc64 (host GCC 4.2)
Reported by: andreast, swills
Approved by: re (gjb)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile.inc1
head/Makefile.libcompat
head/share/mk/src.opts.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Wed Jun 15 23:58:00 2016(r301938)
+++ head/Makefile.inc1 Wed Jun 15 23:58:03 2016(r301939)
@@ -543,9 +543,12 @@ TARGET_ABI=gnueabi
.endif
.endif
.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
-# GCC requires -isystem and -L when using a cross-compiler.
+# GCC requires -isystem and -L when using a cross-compiler. --sysroot
+# won't set header path and -L is used to ensure the base library path
+# is added before the port PREFIX library path.
XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
# Force using libc++ for external GCC.
+# XXX: This should be checking MK_GNUCXX == no
XCXXFLAGS+=-isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
-nostdinc++ -L${WORLDTMP}/../lib/libc++
.else
Modified: head/Makefile.libcompat
==
--- head/Makefile.libcompat Wed Jun 15 23:58:00 2016(r301938)
+++ head/Makefile.libcompat Wed Jun 15 23:58:03 2016(r301939)
@@ -72,13 +72,21 @@ LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \
# -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for
# Clang/GCC.
LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat}
+
.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
-# GCC requires -isystem when using a cross-compiler.
+# GCC requires -isystem when using a cross-compiler and --sysroot. Note that
+# Makefile.inc1 only applies this with an external compiler but libcompat
+# always does since even in-tree GCC 4.2 needs this to override the built-in
+# sysroot path which --sysroot does not actually do for headers.
LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include
# Force using libc++ for external GCC.
+# XXX: This should be checking MK_GNUCXX == no
+.if ${MK_CROSS_COMPILER} == "no" || \
+(${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
LIBCOMPATCXXFLAGS+=-isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
-nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++
.endif
+.endif
# Yes, the flags are redundant.
LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Wed Jun 15 23:58:00 2016(r301938)
+++ head/share/mk/src.opts.mk Wed Jun 15 23:58:03 2016(r301939)
@@ -419,6 +419,9 @@ MK_LLDB:= no
# gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case.
# while in theory we could build it with that, we don't want to do
# that since it creates too much confusion for too little gain.
+# XXX: This is incomplete and needs X_COMPILER_TYPE/VERSION checks too
+# to prevent Makefile.inc1 from bootstrapping unneeded dependencies
+# and to support 'make delete-old' when supplying an external toolchain.
.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800
MK_GNUCXX:=no
MK_GCC:=no
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301934 - head/gnu/usr.bin/cc/cc_tools
Author: bdrewery
Date: Wed Jun 15 23:57:46 2016
New Revision: 301934
URL: https://svnweb.freebsd.org/changeset/base/301934
Log:
Convert to new FAST_DEPEND syntax for guessed dependencies.
This OBJS_DEPEND_GUESS is needed since each target gets its
own .depend.target.o file but also because it is spelled
.meta.target.o with WITH_META_MODE. The OBJS_DEPEND_GUESS
will apply the dependency if the required file is missing.
Also remove redundant .c files while here to avoid prolems with
targets using .ALLSRC and getting multiple source files.
Approved by: re (implicit)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/gnu/usr.bin/cc/cc_tools/Makefile
head/gnu/usr.bin/cc/cc_tools/Makefile.dep
Modified: head/gnu/usr.bin/cc/cc_tools/Makefile
==
--- head/gnu/usr.bin/cc/cc_tools/Makefile Wed Jun 15 23:57:32 2016
(r301933)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile Wed Jun 15 23:57:46 2016
(r301934)
@@ -438,9 +438,7 @@ CLEANFILES+=${GENSRCS} ${GENONLY} ${GEN
#---
# Manual dependencies.
-.if !exists(${DEPENDFILE})
.include "Makefile.dep"
-.endif
.include
# DO NOT DELETE
Modified: head/gnu/usr.bin/cc/cc_tools/Makefile.dep
==
--- head/gnu/usr.bin/cc/cc_tools/Makefile.dep Wed Jun 15 23:57:32 2016
(r301933)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile.dep Wed Jun 15 23:57:46 2016
(r301934)
@@ -1,131 +1,131 @@
# $FreeBSD$
-errors.o: bconfig.h auto-host.h
+OBJS_DEPEND_GUESS.errors.o+= bconfig.h auto-host.h
-genattr.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genattr.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genattrtab.o: bconfig.h \
+OBJS_DEPEND_GUESS.genattrtab.o+= bconfig.h \
auto-host.h \
tm.h options.h \
insn-modes.h \
gtype-desc.h
-genautomata.o: bconfig.h \
+OBJS_DEPEND_GUESS.genautomata.o+= bconfig.h \
auto-host.h \
tm.h options.h \
insn-modes.h
-gencheck.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.gencheck.o+= bconfig.h auto-host.h \
tm.h options.h \
gencheck.h
-genchecksum.o: bconfig.h \
+OBJS_DEPEND_GUESS.genchecksum.o+= bconfig.h \
auto-host.h
-gencodes.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.gencodes.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genconditions.o: bconfig.h \
+OBJS_DEPEND_GUESS.genconditions.o+= bconfig.h \
auto-host.h \
tm.h options.h \
insn-modes.h
-genconfig.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genconfig.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genconstants.o: bconfig.h \
+OBJS_DEPEND_GUESS.genconstants.o+= bconfig.h \
auto-host.h \
tm.h options.h \
insn-modes.h
-genemit.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genemit.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genextract.o: bconfig.h \
+OBJS_DEPEND_GUESS.genextract.o+= bconfig.h \
auto-host.h \
tm.h options.h \
insn-modes.h \
insn-config.h
-genflags.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genflags.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-gengenrtl.o: bconfig.h auto-host.h
+OBJS_DEPEND_GUESS.gengenrtl.o+= bconfig.h auto-host.h
-gengtype.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.gengtype.o+= bconfig.h auto-host.h \
tm.h options.h \
gtyp-gen.h
-genmddeps.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genmddeps.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genmodes.o: bconfig.h auto-host.h
+OBJS_DEPEND_GUESS.genmodes.o+= bconfig.h auto-host.h
-genopinit.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genopinit.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genoutput.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genoutput.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genpeep.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genpeep.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genpreds.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genpreds.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-genrecog.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genrecog.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-gensupport.o: bconfig.h \
+OBJS_DEPEND_GUESS.gensupport.o+= bconfig.h \
auto-host.h \
tm.h options.h \
insn-modes.h
-ggc-none.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.ggc-none.o+= bconfig.h auto-host.h \
gtype-desc.h
-print-rtl.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.print-rtl.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-read-rtl.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.read-rtl.o+= bconfig.h auto-host.h \
tm.h options.h \
insn-modes.h
-rtl.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.rtl.o+= bconfig.h auto-host.h \
svn commit: r301941 - head/share/mk
Author: bdrewery
Date: Wed Jun 15 23:58:09 2016
New Revision: 301941
URL: https://svnweb.freebsd.org/changeset/base/301941
Log:
Mark targets with _SUBDIR as .PHONY.
This is mostly fixing META_MODE with realinstall wanting a .meta
file when it does not need one. These targets really should
always run though since they have _SUBDIR on them.
Approved by: re (implicit)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.subdir.mk
Modified: head/share/mk/bsd.subdir.mk
==
--- head/share/mk/bsd.subdir.mk Wed Jun 15 23:58:06 2016(r301940)
+++ head/share/mk/bsd.subdir.mk Wed Jun 15 23:58:09 2016(r301941)
@@ -158,9 +158,9 @@ ${__target}_subdir_${DIRPRFX}${__dir}: .
${_SUBDIR_SH};
.endif
.endfor# __dir in ${SUBDIR}
-${__target}: ${__subdir_targets}
+${__target}: ${__subdir_targets} .PHONY
.else
-${__target}: _SUBDIR
+${__target}: _SUBDIR .PHONY
.endif # SUBDIR_PARALLEL || _is_standalone_target
.endif # make(${__target})
.endfor# __target in ${SUBDIR_TARGETS}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301940 - head
Author: bdrewery
Date: Wed Jun 15 23:58:06 2016
New Revision: 301940
URL: https://svnweb.freebsd.org/changeset/base/301940
Log:
WITH_META_MODE: Whitelist 'make kernel' and 'make world'.
installkernel is technically META_MODE safe but doesn't need an explicit
approval to use it since it's all disabled via .PHONY.
world uses 'make -B installworld' which already will disable META_MODE
via the -B (.MAKE.MODE=compat) usage.
Approved by: re (implicit)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Wed Jun 15 23:58:03 2016(r301939)
+++ head/Makefile Wed Jun 15 23:58:06 2016(r301940)
@@ -150,9 +150,9 @@ TGTS+= ${BITGTS}
# the ones that benefit from it.
META_TGT_WHITELIST+= \
_* build32 buildfiles buildincludes buildkernel buildsoft \
- buildworld everything kernel-toolchains kernels libraries \
+ buildworld everything kernel-toolchains kernel kernels libraries \
native-xtools showconfig tinderbox toolchain toolchains universe \
- worlds xdev xdev-build
+ world worlds xdev xdev-build
.ORDER: buildworld installworld
.ORDER: buildworld distributeworld
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r300943 - in head: . lib/libc++ lib/libcxxrt share/mk
On 6/12/2016 1:02 PM, Andreas Tobler wrote: > Hi Bryan, > > On 29.05.16 08:20, Bryan Drewery wrote: >> Author: bdrewery >> Date: Sun May 29 06:20:15 2016 >> New Revision: 300943 >> URL: https://svnweb.freebsd.org/changeset/base/300943 >> >> Log: >> GCC External: Revert r300886, r300904, r300917, r300918 >> >> The fix in r300873 is mostly enough. A fix for lib32 will be >> committed.separately. > > Did this commit already happen? > > I still suffer a broken buildworld on powerpc64 for 32-bit with internal > tools. > > Unknown option -std=c++11... Fixed in r301939. -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
Re: svn commit: r301931 - head/tools/tools/decioctl
On Thu, Jun 16, 2016 at 5:12 AM, John Baldwin wrote: > On Wednesday, June 15, 2016 09:01:53 PM John Baldwin wrote: >> Author: jhb >> Date: Wed Jun 15 21:01:53 2016 >> New Revision: 301931 >> URL: https://svnweb.freebsd.org/changeset/base/301931 >> >> Log: >> Add a tool to decode ioctl commands. >> >> One or more ioctl command values can be passed as arguments on the command >> line. For each value, the command is broken down into it's components >> (direction, group, number, and length). In addition, if a command has a >> known name it is output via sysdecode_ioctlname(). >> >> Reviewed by:kib, emaste, avg >> Approved by:re (gjb) >> Differential Revision: https://reviews.freebsd.org/D6851 > > I've had a version of this in a private tree of utilities for several years. > I added the sysdecode stuff yesterday though now that it's easy to do so. > > Sample output: > > % ./decioctl 0xc4d01902 0xc4e01902 0x4004667f > command : dir group num len name > 0xc4d01902: INOUT 0x19 2 1232 CAMIOCOMMAND > 0xc4e01902: INOUT 0x19 2 1248 > 0x4004667f: OUT'f' 1274 FIONREAD Haha, very nice :D -- Tomorrow Will Never Die ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301944 - head/share/zoneinfo
Author: gjb
Date: Thu Jun 16 03:00:10 2016
New Revision: 301944
URL: https://svnweb.freebsd.org/changeset/base/301944
Log:
Fix zoneinfo file packaging.
This change fixes 468 of 488 zoneinfo file packaging issues,
the rest still to be investigated.
Approved by: re (blanket, pkgbase)
Sponsored by: The FreeBSD Foundation
Modified:
head/share/zoneinfo/Makefile
Modified: head/share/zoneinfo/Makefile
==
--- head/share/zoneinfo/MakefileThu Jun 16 02:48:18 2016
(r301943)
+++ head/share/zoneinfo/MakefileThu Jun 16 03:00:10 2016
(r301944)
@@ -82,10 +82,10 @@ zoneinfo: yearistype ${TDATA}
beforeinstall: install-zoneinfo
install-zoneinfo:
cd ${TZBUILDDIR} && \
- find -s * -type f -print -exec ${INSTALL} \
+ find -s * -type f -print -exec ${INSTALL} -T ${TAGS} \
-o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
\{} ${DESTDIR}/usr/share/zoneinfo/\{} \;
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+ ${INSTALL} -T ${TAGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
afterinstall:
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r301945 - head/release/tools
Author: manu
Date: Thu Jun 16 03:02:27 2016
New Revision: 301945
URL: https://svnweb.freebsd.org/changeset/base/301945
Log:
Bump /tmp from 30m to 50m for ARM release images.
30m isn't enough for pkg anymore to extract packagesite.txz.
40m is fine for now but let's take a safer way as we don't know when pkg
will need more.
Reported by: many
Approved by: re (gjb), andrew (mentor)
Modified:
head/release/tools/arm.subr
Modified: head/release/tools/arm.subr
==
--- head/release/tools/arm.subr Thu Jun 16 03:00:10 2016(r301944)
+++ head/release/tools/arm.subr Thu Jun 16 03:02:27 2016(r301945)
@@ -109,7 +109,7 @@ arm_install_base() {
>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
echo "/dev/msdosfs/MSDOSBOOT /boot/msdos msdosfs rw,noatime 0 0" \
>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
- echo "tmpfs /tmp tmpfs rw,mode=1777,size=30m 0 0" \
+ echo "tmpfs /tmp tmpfs rw,mode=1777,size=50m 0 0" \
>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
local hostname
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
