CVS commit: src/tests/sbin/sysctl
Module Name:src
Committed By: pgoyette
Date: Fri Jun 17 03:55:35 UTC 2016
Modified Files:
src/tests/sbin/sysctl: t_perm.sh
Log Message:
When deadbeef is treated as a 32-bit signed integer, it actually has a
negative value. So, if the value gets written into a sysctl variable,
and then is read back, the twos-complement value is displayed.
So, when checking for the value having been written, make sure we check
for the correct value!
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/sbin/sysctl/t_perm.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/sysctl/t_perm.sh
diff -u src/tests/sbin/sysctl/t_perm.sh:1.6 src/tests/sbin/sysctl/t_perm.sh:1.7
--- src/tests/sbin/sysctl/t_perm.sh:1.6 Sun Mar 18 09:46:50 2012
+++ src/tests/sbin/sysctl/t_perm.sh Fri Jun 17 03:55:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_perm.sh,v 1.6 2012/03/18 09:46:50 jruoho Exp $
+# $NetBSD: t_perm.sh,v 1.7 2016/06/17 03:55:35 pgoyette Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,6 +39,7 @@ clean() {
sysctl_write() {
deadbeef="3735928559"
+ deadbeef_signed="-559038737"
sysctl $1 | cut -d= -f1 > $file
@@ -63,7 +64,7 @@ sysctl_write() {
# A functional verification that $deadbeef
# was not actually written to the node.
#
- if [ ! -z $(sysctl $1 | grep $deadbeef) ]; then
+ if [ ! -z $(sysctl $1 | grep -e $deadbeef -e $deadbeef_signed) ]; then
atf_fail "value was written"
fi
}
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: skrll
Date: Fri Jun 17 03:27:50 UTC 2016
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
arm-builtins needs insn-opinit.h
I had this sitting in my tree already, but prompted by Michael Plass on
port-arm
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/gpl3/gcc/usr.bin/backend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.31 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.32
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.31 Wed May 4 00:28:23 2016
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Fri Jun 17 03:27:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2016/05/04 00:28:23 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2016/06/17 03:27:50 skrll Exp $
LIBISPRIVATE= yes
@@ -449,6 +449,7 @@ alpha.d alpha.o: tm-constrs.h tm_p.h ins
.if ${MACHINE_CPU} == "arm"
arm.d arm.o: insn-constants.h tm_p.h insn-opinit.h target-hooks-def.h
+arm-builtins.d arm-builtins.o: insn-opinit.h
.endif
.if ${GCC_MACHINE_ARCH} == "i386" || ${GCC_MACHINE_ARCH} == "x86_64"
CVS commit: src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Thu Jun 16 23:09:44 UTC 2016
Modified Files:
src/sys/kern: kern_module.c
Log Message:
Check for duplicate module names before loading modules that were
"pushed" by the boot loader. The boot loader pushes the module
name for the root file system (unless the root file system is ffs)
even if the file system module is built into the kernel. When
this happens, we get a lot of "redefined symbol" error messages.
This fix does not alter the behavior of pushing the file system
name. It simply avoids the redefined symbol errors by detecting
that the module is already built-in to the kernel and not trying
to load another copy.
While here, differentiate the error message text between "failed
to load" and "failed to fetch_info" conditions.
Addresses PR kern/50357
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/kern/kern_module.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.110 src/sys/kern/kern_module.c:1.111
--- src/sys/kern/kern_module.c:1.110 Sat Feb 6 22:48:07 2016
+++ src/sys/kern/kern_module.c Thu Jun 16 23:09:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.110 2016/02/06 22:48:07 pgoyette Exp $ */
+/* $NetBSD: kern_module.c,v 1.111 2016/06/16 23:09:44 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.110 2016/02/06 22:48:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.111 2016/06/16 23:09:44 pgoyette Exp $");
#define _MODULE_INTERNAL
@@ -1235,6 +1235,8 @@ module_do_unload(const char *name, bool
int
module_prime(const char *name, void *base, size_t size)
{
+ __link_set_decl(modules, modinfo_t);
+ modinfo_t *const *mip;
module_t *mod;
int error;
@@ -1243,6 +1245,18 @@ module_prime(const char *name, void *bas
return ENOMEM;
}
+ /* Check for duplicate modules */
+
+ __link_set_foreach(mip, modules) {
+ if (*mip == &module_dummy)
+ continue;
+ if (strcmp((*mip)->mi_name, name) == 0) {
+ module_error("module `%s' pushed by boot loader "
+ "already exists", name);
+ kmem_free(mod, sizeof(*mod));
+ return EEXIST;
+ }
+ }
error = kobj_load_mem(&mod->mod_kobj, name, base, size);
if (error != 0) {
kmem_free(mod, sizeof(*mod));
@@ -1254,8 +1268,8 @@ module_prime(const char *name, void *bas
if (error != 0) {
kobj_unload(mod->mod_kobj);
kmem_free(mod, sizeof(*mod));
- module_error("unable to load `%s' pushed by boot loader, "
- "error %d", name, error);
+ module_error("unable to fetch_info for `%s' pushed by boot "
+ "loader, error %d", name, error);
return error;
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riastradh Date: Thu Jun 16 15:51:13 UTC 2016 Modified Files: src/sys/dev/ic: rt2860.c Log Message: Use m_set_rcvif, not M_SETCTX. M_SETCTX is only for driver-private use of rcvif, whereas here we really mean to set the receiving interface with m_set_rcvif. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/rt2860.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/rt2860.c diff -u src/sys/dev/ic/rt2860.c:1.13 src/sys/dev/ic/rt2860.c:1.14 --- src/sys/dev/ic/rt2860.c:1.13 Thu Jun 16 15:21:49 2016 +++ src/sys/dev/ic/rt2860.c Thu Jun 16 15:51:13 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rt2860.c,v 1.13 2016/06/16 15:21:49 nonaka Exp $ */ +/* $NetBSD: rt2860.c,v 1.14 2016/06/16 15:51:13 riastradh Exp $ */ /* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */ /*- @@ -23,7 +23,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.13 2016/06/16 15:21:49 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.14 2016/06/16 15:51:13 riastradh Exp $"); #include #include @@ -1337,7 +1337,7 @@ rt2860_rx_intr(struct rt2860_softc *sc) /* finalize mbuf */ m->m_data = (void *)(rxwi + 1); - M_SETCTX(m, ifp); + m_set_rcvif(m, ifp); m->m_pkthdr.len = m->m_len = le16toh(rxwi->len) & 0xfff; wh = mtod(m, struct ieee80211_frame *);
CVS commit: src/etc
Module Name:src
Committed By: kre
Date: Thu Jun 16 15:33:39 UTC 2016
Modified Files:
src/etc: MAKEDEV.tmpl
Log Message:
As discussed at the biginning of last week (June 6 & 7, 2016) on
tech-kern in messages with a Subject starting [Re:] /dev/sdN -> /dev/sdN[cd]
and in PR port-amd64/51216 :
Create bare (no letter suffix) device names (block & raw) that
refer to the raw device ('c' or 'd' partition as appropriate).
This commit was delayed waiting to see if there was to be any more
discussion - there wasn't a lot.
Caution: this is going to consume 2 more inodes per disc device
configured, everywhere that devices are configured using MAKEDEV
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/etc/MAKEDEV.tmpl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.180 src/etc/MAKEDEV.tmpl:1.181
--- src/etc/MAKEDEV.tmpl:1.180 Sat Jun 4 16:11:50 2016
+++ src/etc/MAKEDEV.tmpl Thu Jun 16 15:33:38 2016
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.180 2016/06/04 16:11:50 nonaka Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.181 2016/06/16 15:33:38 kre Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2252,6 +2252,10 @@ makedisk_p8()
{
name="$1"; unit="$2"; blk="$3"; chr="$4"
+ ro=%RAWDISK_OFF%
+ mkdev ${name}${unit} b $blk $(($unit * 8 + $ro)) 640 $g_operator
+ mkdev r${name}${unit} c $chr $(($unit * 8 + $ro)) 640 $g_operator
+
mkdev ${name}${unit}a b $blk $(($unit * 8 + 0)) 640 $g_operator
mkdev ${name}${unit}b b $blk $(($unit * 8 + 1)) 640 $g_operator
mkdev ${name}${unit}c b $blk $(($unit * 8 + 2)) 640 $g_operator
@@ -2275,6 +2279,10 @@ makedisk_p12high()
ho=524280 # offset for partition 9 to 11 (same as ...p16high)
name="$1"; unit="$2"; blk="$3"; chr="$4"
+ ro=%RAWDISK_OFF%
+ mkdev ${name}${unit} b $blk $(($unit * 8 + $ro)) 640 $g_operator
+ mkdev r${name}${unit} c $chr $(($unit * 8 + $ro)) 640 $g_operator
+
mkdev ${name}${unit}a b $blk $(($unit * 8 + 0)) 640 $g_operator
mkdev ${name}${unit}b b $blk $(($unit * 8 + 1)) 640 $g_operator
mkdev ${name}${unit}c b $blk $(($unit * 8 + 2)) 640 $g_operator
@@ -2305,6 +2313,10 @@ makedisk_p16()
{
name="$1"; unit="$2"; blk="$3"; chr="$4"
+ ro=%RAWDISK_OFF%
+ mkdev ${name}${unit} b $blk $(($unit * 16 + $ro)) 640 $g_operator
+ mkdev r${name}${unit} c $chr $(($unit * 16 + $ro)) 640 $g_operator
+
mkdev ${name}${unit}a b $blk $(($unit * 16 + 0)) 640 $g_operator
mkdev ${name}${unit}b b $blk $(($unit * 16 + 1)) 640 $g_operator
mkdev ${name}${unit}c b $blk $(($unit * 16 + 2)) 640 $g_operator
@@ -2344,6 +2356,10 @@ makedisk_p16high()
ho=524280 # offset for partition 9 to 16
name="$1"; unit="$2"; blk="$3"; chr="$4"
+ ro=%RAWDISK_OFF%
+ mkdev ${name}${unit} b $blk $(($unit * 8 + $ro)) 640 $g_operator
+ mkdev r${name}${unit} c $chr $(($unit * 8 + $ro)) 640 $g_operator
+
mkdev ${name}${unit}a b $blk $(($unit * 8 + 0)) 640 $g_operator
mkdev ${name}${unit}b b $blk $(($unit * 8 + 1)) 640 $g_operator
mkdev ${name}${unit}c b $blk $(($unit * 8 + 2)) 640 $g_operator
@@ -2387,6 +2403,9 @@ makedisk_minimal()
ro=%RAWDISK_OFF%
rn=%RAWDISK_NAME%
+ mkdev ${name}${unit} b $blk $(($unit * $doff + $ro)) 640 $g_operator
+ mkdev r${name}${unit} c $chr $(($unit * $doff + $ro)) 640 $g_operator
+
mkdev ${name}${unit}a b $blk $(($unit * $doff + 0)) 640 $g_operator
mkdev ${name}${unit}$rn b $blk $(($unit * $doff + $ro)) 640 $g_operator
mkdev r${name}${unit}a c $chr $(($unit * $doff + 0)) 640 $g_operator
CVS commit: src/sys/dev/ic
Module Name:src Committed By: nonaka Date: Thu Jun 16 15:21:49 UTC 2016 Modified Files: src/sys/dev/ic: rt2860.c Log Message: use M_SETCTX() macro. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/rt2860.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/rt2860.c diff -u src/sys/dev/ic/rt2860.c:1.12 src/sys/dev/ic/rt2860.c:1.13 --- src/sys/dev/ic/rt2860.c:1.12 Thu Jun 16 13:01:08 2016 +++ src/sys/dev/ic/rt2860.c Thu Jun 16 15:21:49 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rt2860.c,v 1.12 2016/06/16 13:01:08 christos Exp $ */ +/* $NetBSD: rt2860.c,v 1.13 2016/06/16 15:21:49 nonaka Exp $ */ /* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */ /*- @@ -23,7 +23,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.12 2016/06/16 13:01:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.13 2016/06/16 15:21:49 nonaka Exp $"); #include #include @@ -1337,7 +1337,7 @@ rt2860_rx_intr(struct rt2860_softc *sc) /* finalize mbuf */ m->m_data = (void *)(rxwi + 1); - m->m_pkthdr.rcvif = ifp; + M_SETCTX(m, ifp); m->m_pkthdr.len = m->m_len = le16toh(rxwi->len) & 0xfff; wh = mtod(m, struct ieee80211_frame *);
CVS commit: src/sys/net
Module Name:src
Committed By: riastradh
Date: Thu Jun 16 15:18:34 UTC 2016
Modified Files:
src/sys/net: if.c
Log Message:
Fix error branches of if_sdl_sysctl.
Can't release the psref if we didn't even find the interface!
To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/sys/net/if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.340 src/sys/net/if.c:1.341
--- src/sys/net/if.c:1.340 Thu Jun 16 03:03:33 2016
+++ src/sys/net/if.c Thu Jun 16 15:18:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.340 2016/06/16 03:03:33 ozaki-r Exp $ */
+/* $NetBSD: if.c,v 1.341 2016/06/16 15:18:33 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.340 2016/06/16 03:03:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.341 2016/06/16 15:18:33 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -3108,25 +3108,26 @@ if_sdl_sysctl(SYSCTLFN_ARGS)
ifp = if_get_byindex(name[0], &psref);
if (ifp == NULL) {
error = ENODEV;
- goto out;
+ goto out0;
}
sdl = ifp->if_sadl;
if (sdl == NULL) {
*oldlenp = 0;
- goto out;
+ goto out1;
}
if (oldp == NULL) {
*oldlenp = sdl->sdl_alen;
- goto out;
+ goto out1;
}
if (*oldlenp >= sdl->sdl_alen)
*oldlenp = sdl->sdl_alen;
error = sysctl_copyout(l, &sdl->sdl_data[sdl->sdl_nlen], oldp, *oldlenp);
-out:
+out1:
if_put(ifp, &psref);
+out0:
curlwp_bindx(bound);
return error;
}
CVS commit: src
Module Name:src
Committed By: agc
Date: Thu Jun 16 15:17:56 UTC 2016
Modified Files:
src/distrib/sets/lists/base: mi
src/external/public-domain/tz: tzdata2netbsd
src/external/public-domain/tz/share/zoneinfo: Makefile
Added Files:
src/external/public-domain/tz/dist: TZDATA_VERSION
Log Message:
Record the tzdata version in a separate file in the share/zoneinfo directory.
The file is kept up to date by the tzdata2netbsd script
To generate a diff of this commit:
cvs rdiff -u -r1.1127 -r1.1128 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.9 -r1.10 src/external/public-domain/tz/tzdata2netbsd
cvs rdiff -u -r0 -r1.1 src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.2 -r1.3 \
src/external/public-domain/tz/share/zoneinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1127 src/distrib/sets/lists/base/mi:1.1128
--- src/distrib/sets/lists/base/mi:1.1127 Sat Jun 4 16:29:35 2016
+++ src/distrib/sets/lists/base/mi Thu Jun 16 15:17:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1127 2016/06/04 16:29:35 nonaka Exp $
+# $NetBSD: mi,v 1.1128 2016/06/16 15:17:56 agc Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -5841,6 +5841,7 @@
./usr/share/zoneinfo/SystemV/PST8PDT base-obsolete obsolete
./usr/share/zoneinfo/SystemV/YST9 base-obsolete obsolete
./usr/share/zoneinfo/SystemV/YST9YDT base-obsolete obsolete
+./usr/share/zoneinfo/TZDATA_VERSION base-sys-share share
./usr/share/zoneinfo/Turkey base-sys-share share
./usr/share/zoneinfo/UCT base-sys-share share
./usr/share/zoneinfo/USbase-sys-share
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.9 src/external/public-domain/tz/tzdata2netbsd:1.10
--- src/external/public-domain/tz/tzdata2netbsd:1.9 Wed Jun 1 00:02:12 2016
+++ src/external/public-domain/tz/tzdata2netbsd Thu Jun 16 15:17:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.9 2016/06/01 00:02:12 agc Exp $
+# $NetBSD: tzdata2netbsd,v 1.10 2016/06/16 15:17:56 agc Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -194,6 +194,7 @@ trimnews()
// { if (inrange) print; }
' \
<"${NEWSFILE}" >"${NEWSTRIMFILE}"
+ echo "tzdata-${NEWVER}" > ${TZDISTDIR}/TZDATA_VERSION
}
# Create IMPORTMSGFILE from NEWSTRIMFILE, by ignoring some sections,
Index: src/external/public-domain/tz/share/zoneinfo/Makefile
diff -u src/external/public-domain/tz/share/zoneinfo/Makefile:1.2 src/external/public-domain/tz/share/zoneinfo/Makefile:1.3
--- src/external/public-domain/tz/share/zoneinfo/Makefile:1.2 Fri Aug 8 09:17:03 2014
+++ src/external/public-domain/tz/share/zoneinfo/Makefile Thu Jun 16 15:17:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/08/08 09:17:03 apb Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/16 15:17:56 agc Exp $
.include
.include "../../Makefile.inc"
@@ -138,6 +138,8 @@ afterinstall: ${DATA} ${REDO} ${TABDATA}
${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
${TZDISTDIR}/$$f ${DESTDIR}${TZDIR}; \
done
+ ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
+ ${TZDISTDIR}/TZDATA_VERSION ${DESTDIR}${TZDIR}/TZDATA_VERSION
.else # ${MKSHARE} == "no"
afterinstall:
.endif # ${MKSHARE} == "no"
Added files:
Index: src/external/public-domain/tz/dist/TZDATA_VERSION
diff -u /dev/null src/external/public-domain/tz/dist/TZDATA_VERSION:1.1
--- /dev/null Thu Jun 16 15:17:56 2016
+++ src/external/public-domain/tz/dist/TZDATA_VERSION Thu Jun 16 15:17:56 2016
@@ -0,0 +1 @@
+tzdata-2016d
CVS commit: src/usr.bin/man
Module Name:src Committed By: abhinav Date: Thu Jun 16 15:11:43 UTC 2016 Modified Files: src/usr.bin/man: man.conf.5 Log Message: Replace makewhatis(8) with makemandb(8) in SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/man/man.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/man/man.conf.5 diff -u src/usr.bin/man/man.conf.5:1.26 src/usr.bin/man/man.conf.5:1.27 --- src/usr.bin/man/man.conf.5:1.26 Tue Apr 7 10:17:21 2015 +++ src/usr.bin/man/man.conf.5 Thu Jun 16 15:11:43 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: man.conf.5,v 1.26 2015/04/07 10:17:21 plunky Exp $ +.\" $NetBSD: man.conf.5,v 1.27 2016/06/16 15:11:43 abhinav Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)man.conf.5 8.5 (Berkeley) 1/2/94 .\" -.Dd March 3, 2015 +.Dd June 16, 2016 .Dt MAN.CONF 5 .Os .Sh NAME @@ -283,4 +283,4 @@ of them were searched. .Xr fnmatch 3 , .Xr glob 3 , .Xr catman 8 , -.Xr makewhatis 8 +.Xr makemandb 8
CVS commit: src/usr.bin/man
Module Name:src
Committed By: abhinav
Date: Thu Jun 16 15:10:58 UTC 2016
Modified Files:
src/usr.bin/man: man.1 man.c
Log Message:
Document -f option for man(1).
Also remove unsupported options for `man -k` from the synopsis and usage.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/man/man.1
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/man/man.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/man/man.1
diff -u src/usr.bin/man/man.1:1.28 src/usr.bin/man/man.1:1.29
--- src/usr.bin/man/man.1:1.28 Thu Aug 14 15:44:47 2014
+++ src/usr.bin/man/man.1 Thu Jun 16 15:10:58 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: man.1,v 1.28 2014/08/14 15:44:47 apb Exp $
+.\" $NetBSD: man.1,v 1.29 2016/06/16 15:10:58 abhinav Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)man.1 8.2 (Berkeley) 1/2/94
.\"
-.Dd August 14, 2014
+.Dd June 16, 2016
.Dt MAN 1
.Os
.Sh NAME
@@ -49,10 +49,12 @@
.Oc
.Ar name Ar ...
.Nm
-.Fl k
.Op Fl C Ar file
-.Op Fl M Ar path
-.Op Fl m Ar path
+.Fl f
+.Ar command Ar ...
+.Nm
+.Op Fl C Ar file
+.Fl k
.Ar keyword Ar ...
.Nm
.Fl p
@@ -82,6 +84,12 @@ Copy the man page to the standard output
.Xr more 1
to paginate it.
This is done by default if the standard output is not a terminal device.
+.It Fl f
+Synonym for
+.Xr whatis 1 .
+It searches man pages for
+.Ar command
+in their names and displays header lines from all matching pages.
.It Fl h
Display only the
.Dq Tn SYNOPSIS
@@ -90,7 +98,7 @@ For commands, this is typically the comm
For library functions, this usually contains the required include
files and function prototypes.
.It Fl k
-Display the header lines for any man pages matching
+Search man pages for
.Ar keyword Ns Pq s ,
in the same manner as
.Xr apropos 1 .
Index: src/usr.bin/man/man.c
diff -u src/usr.bin/man/man.c:1.63 src/usr.bin/man/man.c:1.64
--- src/usr.bin/man/man.c:1.63 Sat May 21 17:21:40 2016
+++ src/usr.bin/man/man.c Thu Jun 16 15:10:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: man.c,v 1.63 2016/05/21 17:21:40 abhinav Exp $ */
+/* $NetBSD: man.c,v 1.64 2016/06/16 15:10:58 abhinav Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
-__RCSID("$NetBSD: man.c,v 1.63 2016/05/21 17:21:40 abhinav Exp $");
+__RCSID("$NetBSD: man.c,v 1.64 2016/06/16 15:10:58 abhinav Exp $");
#endif
#endif /* not lint */
@@ -1031,8 +1031,9 @@ usage(void)
{
(void)fprintf(stderr, "Usage: %s [-acw|-h] [-C cfg] [-M path] "
"[-m path] [-S srch] [[-s] sect] name ...\n", getprogname());
+ (void)fprintf(stderr, "Usage: %s [-C file] -f command ...\n", getprogname());
(void)fprintf(stderr,
- "Usage: %s -k [-C cfg] [-M path] [-m path] keyword ...\n",
+ "Usage: %s [-C file] -k keyword ...\n",
getprogname());
(void)fprintf(stderr, "Usage: %s -p\n", getprogname());
exit(EXIT_FAILURE);
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Thu Jun 16 14:51:56 UTC 2016 Modified Files: src/sys/arch/macppc/conf: files.macppc Log Message: make platinumfb.c conditional on platinumfb somehow that fell through the cracks too... To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/arch/macppc/conf/files.macppc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/macppc/conf/files.macppc diff -u src/sys/arch/macppc/conf/files.macppc:1.102 src/sys/arch/macppc/conf/files.macppc:1.103 --- src/sys/arch/macppc/conf/files.macppc:1.102 Fri Jun 10 21:32:46 2016 +++ src/sys/arch/macppc/conf/files.macppc Thu Jun 16 14:51:56 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.macppc,v 1.102 2016/06/10 21:32:46 macallan Exp $ +# $NetBSD: files.macppc,v 1.103 2016/06/16 14:51:56 macallan Exp $ # # macppc-specific configuration info @@ -310,4 +310,4 @@ defflag opt_valkyriefb.h VALKYRIEFB_DEBU device platinumfb: wsemuldisplaydev, rasops8, vcons, videomode attach platinumfb at mainbus -file arch/macppc/dev/platinumfb.c +file arch/macppc/dev/platinumfb.c platinumfb
CVS commit: src/sys/arch/macppc/dev
Module Name:src Committed By: macallan Date: Thu Jun 16 14:46:12 UTC 2016 Added Files: src/sys/arch/macppc/dev: platinumfbreg.h Log Message: somehow this fell through the cracks when I committed platinumfb.c thanks chuq for noticing To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/macppc/dev/platinumfbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/macppc/dev/platinumfbreg.h diff -u /dev/null src/sys/arch/macppc/dev/platinumfbreg.h:1.1 --- /dev/null Thu Jun 16 14:46:12 2016 +++ src/sys/arch/macppc/dev/platinumfbreg.h Thu Jun 16 14:46:12 2016 @@ -0,0 +1,62 @@ +/* + * 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 ``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 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 +__KERNEL_RCSID(0, "$NetBSD: platinumfbreg.h,v 1.1 2016/06/16 14:46:12 macallan Exp $"); + +#ifndef PLATINUMFBREG_H +#define PLATINUMFBREG_H + +/* + * platinum register address offsets. + * registers are each 32 bits with 12*8bits of padding, + * 128 registers total + */ +#define PLATINUM_REG_OFFSET_ADDR(x) (x * 0x10) +#define PLATINUM_REG_COUNT 128 + +/* + * colormap register addresses. + * registers are each 8 bits with 15*8 bits of padding + */ +#define PLATINUM_CMAP_BASE_ADDR 0xf301b000 /* XXX not in ofw ? */ +#define PLATINUM_CMAP_ADDR_OFFSET 0x +#define PLATINUM_CMAP_D1_OFFSET 0x0010 +#define PLATINUM_CMAP_D2_OFFSET 0x0020 +#define PLATINUM_CMAP_LUT_OFFSET 0x0030 +#define PLATINUM_CMAP_SIZE0x1000 /* XXX ofw says 0x800? */ + +/* framebuffer */ +#define PLATINUM_FB_BANK_SIZE 0x10 +#define PLATINUM_FB_MIN_SIZE (1 * PLATINUM_FB_BANK_SIZE) +#define PLATINUM_FB_MAX_SIZE (4 * PLATINUM_FB_BANK_SIZE) + +/* depth/colormodes */ +#define PLATINUM_CMODE_8 0 +#define PLATINUM_CMODE_16 1 +#define PLATINUM_CMODE_32 2 + +/* DACula types */ +#define PLATINUM_DAC_0 0x84 +#define PLATINUM_DAC_1 0x3c + +#endif /* PLATINUMFBREG_H */
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: abhinav Date: Thu Jun 16 14:07:16 UTC 2016 Modified Files: src/usr.sbin/makemandb: apropos.1 whatis.1 Log Message: Add man.conf(5) and man(1) in the SEE ALSO section. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makemandb/apropos.1 cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/makemandb/whatis.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/makemandb/apropos.1 diff -u src/usr.sbin/makemandb/apropos.1:1.16 src/usr.sbin/makemandb/apropos.1:1.17 --- src/usr.sbin/makemandb/apropos.1:1.16 Sun May 22 19:26:04 2016 +++ src/usr.sbin/makemandb/apropos.1 Thu Jun 16 14:07:16 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: apropos.1,v 1.16 2016/05/22 19:26:04 abhinav Exp $ +.\" $NetBSD: apropos.1,v 1.17 2016/06/16 14:07:16 abhinav Exp $ .\" .\" Copyright (c) 2011 Abhinav Upadhyay .\" All rights reserved. @@ -29,7 +29,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 22, 2016 +.Dd June 16, 2016 .Dt APROPOS 1 .Os .Sh NAME @@ -118,6 +118,7 @@ Command line options override the enviro .Sh SEE ALSO .Xr man 1 , .Xr whatis 1 , +.Xr man.conf 5 , .Xr makemandb 8 .Sh HISTORY The Index: src/usr.sbin/makemandb/whatis.1 diff -u src/usr.sbin/makemandb/whatis.1:1.3 src/usr.sbin/makemandb/whatis.1:1.4 --- src/usr.sbin/makemandb/whatis.1:1.3 Sun May 22 19:26:04 2016 +++ src/usr.sbin/makemandb/whatis.1 Thu Jun 16 14:07:16 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: whatis.1,v 1.3 2016/05/22 19:26:04 abhinav Exp $ +.\" $NetBSD: whatis.1,v 1.4 2016/06/16 14:07:16 abhinav Exp $ .\" .\" Copyright (c) 2012 Joerg Sonnenberger .\" All rights reserved. @@ -27,7 +27,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 22, 2016 +.Dd June 16, 2016 .Dt WHATIS 1 .Os .Sh NAME @@ -64,6 +64,8 @@ tag. .El .Sh SEE ALSO .Xr apropos 1 , +.Xr man 1 , +.Xr man.conf 5 , .Xr makemandb 8 .Sh HISTORY The
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Thu Jun 16 12:56:49 UTC 2016
Modified Files:
src/sys/dev/ic: rt2860.c
Log Message:
fix mbuf handling; we don't crash anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/rt2860.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.10 src/sys/dev/ic/rt2860.c:1.11
--- src/sys/dev/ic/rt2860.c:1.10 Thu May 26 01:04:46 2016
+++ src/sys/dev/ic/rt2860.c Thu Jun 16 08:56:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860.c,v 1.10 2016/05/26 05:04:46 ozaki-r Exp $ */
+/* $NetBSD: rt2860.c,v 1.11 2016/06/16 12:56:49 christos Exp $ */
/* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.10 2016/05/26 05:04:46 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.11 2016/06/16 12:56:49 christos Exp $");
#include
#include
@@ -700,7 +700,7 @@ rt2860_alloc_rx_ring(struct rt2860_softc
goto fail;
}
- MGET(data->m, M_DONTWAIT, MT_DATA);
+ MGETHDR(data->m, M_DONTWAIT, MT_DATA);
if (data->m == NULL) {
msg = "allocate Rx mbuf";
goto fail1;
@@ -1273,7 +1273,7 @@ rt2860_rx_intr(struct rt2860_softc *sc)
goto skip;
}
- MGET(m1, M_DONTWAIT, MT_DATA);
+ MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (__predict_false(m1 == NULL)) {
ifp->if_ierrors++;
goto skip;
@@ -1321,6 +1321,7 @@ rt2860_rx_intr(struct rt2860_softc *sc)
/* finalize mbuf */
m->m_data = (void *)(rxwi + 1);
+ m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = le16toh(rxwi->len) & 0xfff;
wh = mtod(m, struct ieee80211_frame *);
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Thu Jun 16 13:01:08 UTC 2016
Modified Files:
src/sys/dev/ic: rt2860.c
Log Message:
more conservating handling of memory.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/rt2860.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.11 src/sys/dev/ic/rt2860.c:1.12
--- src/sys/dev/ic/rt2860.c:1.11 Thu Jun 16 08:56:49 2016
+++ src/sys/dev/ic/rt2860.c Thu Jun 16 09:01:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860.c,v 1.11 2016/06/16 12:56:49 christos Exp $ */
+/* $NetBSD: rt2860.c,v 1.12 2016/06/16 13:01:08 christos Exp $ */
/* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.11 2016/06/16 12:56:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.12 2016/06/16 13:01:08 christos Exp $");
#include
#include
@@ -507,12 +507,18 @@ rt2860_reset_tx_ring(struct rt2860_softc
if ((data = ring->data[i]) == NULL)
continue; /* nothing mapped in this slot */
- bus_dmamap_sync(sc->sc_dmat, data->map, 0,
- data->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
- bus_dmamap_unload(sc->sc_dmat, data->map);
- m_freem(data->m);
- data->m= NULL;
- data->ni = NULL; /* node already freed */
+ if (data->ni != NULL) {
+ ieee80211_free_node(data->ni);
+ data->ni = NULL;
+ }
+
+ if (data->m != NULL) {
+ bus_dmamap_sync(sc->sc_dmat, data->map, 0,
+ data->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
+ bus_dmamap_unload(sc->sc_dmat, data->map);
+ m_freem(data->m);
+ data->m = NULL;
+ }
SLIST_INSERT_HEAD(&sc->data_pool, data, next);
ring->data[i] = NULL;
@@ -543,13 +549,23 @@ rt2860_free_tx_ring(struct rt2860_softc
if ((data = ring->data[i]) == NULL)
continue; /* nothing mapped in this slot */
- bus_dmamap_sync(sc->sc_dmat, data->map, 0,
- data->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
- bus_dmamap_unload(sc->sc_dmat, data->map);
- m_freem(data->m);
+ if (data->ni != NULL) {
+ ieee80211_free_node(data->ni);
+ data->ni = NULL;
+ }
+ if (data->m != NULL) {
+ bus_dmamap_sync(sc->sc_dmat, data->map, 0,
+ data->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
+ bus_dmamap_unload(sc->sc_dmat, data->map);
+ m_freem(data->m);
+ data->m = NULL;
+ }
SLIST_INSERT_HEAD(&sc->data_pool, data, next);
+ ring->data[i] = NULL;
}
+ ring->queued = 0;
+ ring->cur = ring->next = 0;
}
/*
CVS commit: src/lib/libc/sys
Module Name:src Committed By: ryoon Date: Thu Jun 16 12:48:09 UTC 2016 Modified Files: src/lib/libc/sys: nanosleep.2 Log Message: Bump date for previous To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/sys/nanosleep.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/nanosleep.2 diff -u src/lib/libc/sys/nanosleep.2:1.20 src/lib/libc/sys/nanosleep.2:1.21 --- src/lib/libc/sys/nanosleep.2:1.20 Thu Jun 16 12:47:10 2016 +++ src/lib/libc/sys/nanosleep.2 Thu Jun 16 12:48:09 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: nanosleep.2,v 1.20 2016/06/16 12:47:10 ryoon Exp $ +.\" $NetBSD: nanosleep.2,v 1.21 2016/06/16 12:48:09 ryoon Exp $ .\" .\" Copyright (c) 1986, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)sleep.3 8.1 (Berkeley) 6/4/93 .\" -.Dd December 30, 2015 +.Dd June 16, 2016 .Dt NANOSLEEP 2 .Os .Sh NAME
CVS commit: src/lib/libc/sys
Module Name:src Committed By: ryoon Date: Thu Jun 16 12:47:10 UTC 2016 Modified Files: src/lib/libc/sys: nanosleep.2 Log Message: Fix typo To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/sys/nanosleep.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/nanosleep.2 diff -u src/lib/libc/sys/nanosleep.2:1.19 src/lib/libc/sys/nanosleep.2:1.20 --- src/lib/libc/sys/nanosleep.2:1.19 Wed Dec 30 16:51:31 2015 +++ src/lib/libc/sys/nanosleep.2 Thu Jun 16 12:47:10 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: nanosleep.2,v 1.19 2015/12/30 16:51:31 wiz Exp $ +.\" $NetBSD: nanosleep.2,v 1.20 2016/06/16 12:47:10 ryoon Exp $ .\" .\" Copyright (c) 1986, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -132,7 +132,7 @@ function shall return \-1 and set .Va errno to the corresponding value, and the .Fn clock_nanosleep -function shall return the errnor number directly. +function shall return the error number directly. .Bl -tag -width Er .It Bq Er EFAULT Either
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: christos
Date: Thu Jun 16 11:34:13 UTC 2016
Modified Files:
src/libexec/ld.elf_so: Makefile map_object.c
Log Message:
Move relro after we've computed out relocbase and re-enable it.
(Matthias Weckbecker)
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.54 -r1.55 src/libexec/ld.elf_so/map_object.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.132 src/libexec/ld.elf_so/Makefile:1.133
--- src/libexec/ld.elf_so/Makefile:1.132 Wed Jun 15 08:08:47 2016
+++ src/libexec/ld.elf_so/Makefile Thu Jun 16 07:34:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2016/06/15 12:08:47 christos Exp $
+# $NetBSD: Makefile,v 1.133 2016/06/16 11:34:13 christos Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -93,7 +93,7 @@ BINDIR= ${SHLINKINSTALLDIR}
CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
CPPFLAGS+= -I${.CURDIR} -I. -D_KERNTYPES
CPPFLAGS+= -DRTLD_LOADER
-#CPPFLAGS+= -DGNU_RELRO
+CPPFLAGS+= -DGNU_RELRO
CPPFLAGS+= -D_RTLD_SOURCE
CPPFLAGS+= -DCOMBRELOC
#CPPFLAGS+= -DDEBUG
Index: src/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.54 src/libexec/ld.elf_so/map_object.c:1.55
--- src/libexec/ld.elf_so/map_object.c:1.54 Tue Jun 14 09:06:41 2016
+++ src/libexec/ld.elf_so/map_object.c Thu Jun 16 07:34:13 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: map_object.c,v 1.54 2016/06/14 13:06:41 christos Exp $ */
+/* $NetBSD: map_object.c,v 1.55 2016/06/16 11:34:13 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.54 2016/06/14 13:06:41 christos Exp $");
+__RCSID("$NetBSD: map_object.c,v 1.55 2016/06/16 11:34:13 christos Exp $");
#endif /* not lint */
#include
@@ -282,11 +282,6 @@ _rtld_map_object(const char *path, int f
obj->vaddrbase = base_vaddr;
obj->isdynamic = ehdr->e_type == ET_DYN;
-#ifdef GNU_RELRO
- obj->relro_page = obj->relocbase + round_down(relro_page);
- obj->relro_size = round_up(relro_size);
-#endif
-
#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
if (phtls != NULL) {
++_rtld_tls_dtv_generation;
@@ -408,6 +403,11 @@ _rtld_map_object(const char *path, int f
obj->mapsize = mapsize;
obj->relocbase = mapbase - base_vaddr;
+#ifdef GNU_RELRO
+ obj->relro_page = obj->relocbase + round_down(relro_page);
+ obj->relro_size = round_up(relro_size);
+#endif
+
if (obj->dynamic)
obj->dynamic = (void *)(obj->relocbase + (Elf_Addr)(uintptr_t)obj->dynamic);
if (obj->entry)
