svn commit: r264367 - in head: gnu/lib/libgcc share/mk
Author: des
Date: Sat Apr 12 12:44:09 2014
New Revision: 264367
URL: http://svnweb.freebsd.org/changeset/base/264367
Log:
Introduce RANLIBFLAGS to mirror ARFLAGS and add -D to both. This sets
all timestamps in static libraries to 0 so that consecutive builds
from the same source, even on different machines, produce identical
libraries.
MFC after:3 weeks
Modified:
head/gnu/lib/libgcc/Makefile
head/share/mk/bsd.lib.mk
head/share/mk/sys.mk
Modified: head/gnu/lib/libgcc/Makefile
==
--- head/gnu/lib/libgcc/MakefileSat Apr 12 06:50:11 2014
(r264366)
+++ head/gnu/lib/libgcc/MakefileSat Apr 12 12:44:09 2014
(r264367)
@@ -352,7 +352,7 @@ libgcc_eh.a:${EH_OBJS_T}
@${ECHO} building static gcc_eh library
@rm -f ${.TARGET}
@${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
- ${RANLIB} ${.TARGET}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
all: libgcc_eh.a
@@ -361,7 +361,7 @@ libgcc_eh_p.a: ${EH_OBJS_P}
@${ECHO} building profiled gcc_eh library
@rm -f ${.TARGET}
@${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
- ${RANLIB} ${.TARGET}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
all: libgcc_eh_p.a
.endif
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkSat Apr 12 06:50:11 2014(r264366)
+++ head/share/mk/bsd.lib.mkSat Apr 12 12:44:09 2014(r264367)
@@ -172,7 +172,7 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
.else
@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} |
tsort -q` ${ARADD}
.endif
- ${RANLIB} ${.TARGET}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
.if !defined(INTERNALLIB)
@@ -189,7 +189,7 @@ lib${LIB}_p.a: ${POBJS}
.else
@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q`
${ARADD}
.endif
- ${RANLIB} ${.TARGET}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
.if defined(SHLIB_NAME) || \
@@ -246,7 +246,7 @@ lib${LIB}_pic.a: ${SOBJS}
@${ECHO} building special pic ${LIB} library
@rm -f ${.TARGET}
@${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
Modified: head/share/mk/sys.mk
==
--- head/share/mk/sys.mkSat Apr 12 06:50:11 2014(r264366)
+++ head/share/mk/sys.mkSat Apr 12 12:44:09 2014(r264367)
@@ -39,9 +39,12 @@ AR ?= ar
.if defined(%POSIX)
ARFLAGS?= -rv
.else
-ARFLAGS?= cru
+ARFLAGS?= -crD
.endif
RANLIB ?= ranlib
+.if !defined(%POSIX)
+RANLIBFLAGS?= -D
+.endif
AS ?= as
AFLAGS ?=
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264368 - in stable/10/sys: kern sys
Author: kib
Date: Sat Apr 12 14:08:53 2014
New Revision: 264368
URL: http://svnweb.freebsd.org/changeset/base/264368
Log:
MFC r264146:
Fix a race between kqueue_register() and kqueue_scan() setting KN_INFLUX
flag while knlist is not locked, which caused lost notifications from
parallel knote().
Modified:
stable/10/sys/kern/kern_event.c
stable/10/sys/sys/event.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_event.c
==
--- stable/10/sys/kern/kern_event.c Sat Apr 12 12:44:09 2014
(r264367)
+++ stable/10/sys/kern/kern_event.c Sat Apr 12 14:08:53 2014
(r264368)
@@ -468,7 +468,7 @@ knote_fork(struct knlist *list, int pid)
continue;
kq = kn->kn_kq;
KQ_LOCK(kq);
- if ((kn->kn_status & KN_INFLUX) == KN_INFLUX) {
+ if ((kn->kn_status & (KN_INFLUX | KN_SCAN)) == KN_INFLUX) {
KQ_UNLOCK(kq);
continue;
}
@@ -1145,7 +1145,7 @@ findkn:
* but doing so will not reset any filter which has already been
* triggered.
*/
- kn->kn_status |= KN_INFLUX;
+ kn->kn_status |= KN_INFLUX | KN_SCAN;
KQ_UNLOCK(kq);
KN_LIST_LOCK(kn);
kn->kn_kevent.udata = kev->udata;
@@ -1168,7 +1168,7 @@ done_ev_add:
KQ_LOCK(kq);
if (event)
KNOTE_ACTIVATE(kn, 1);
- kn->kn_status &= ~KN_INFLUX;
+ kn->kn_status &= ~(KN_INFLUX | KN_SCAN);
KN_LIST_UNLOCK(kn);
if ((kev->flags & EV_DISABLE) &&
@@ -1477,7 +1477,7 @@ retry:
KQ_LOCK(kq);
kn = NULL;
} else {
- kn->kn_status |= KN_INFLUX;
+ kn->kn_status |= KN_INFLUX | KN_SCAN;
KQ_UNLOCK(kq);
if ((kn->kn_status & KN_KQUEUE) == KN_KQUEUE)
KQ_GLOBAL_LOCK(&kq_global, haskqglobal);
@@ -1486,7 +1486,8 @@ retry:
KQ_LOCK(kq);
KQ_GLOBAL_UNLOCK(&kq_global, haskqglobal);
kn->kn_status &=
- ~(KN_QUEUED | KN_ACTIVE | KN_INFLUX);
+ ~(KN_QUEUED | KN_ACTIVE | KN_INFLUX |
+ KN_SCAN);
kq->kq_count--;
KN_LIST_UNLOCK(kn);
influx = 1;
@@ -1516,7 +1517,7 @@ retry:
} else
TAILQ_INSERT_TAIL(&kq->kq_head, kn, kn_tqe);
- kn->kn_status &= ~(KN_INFLUX);
+ kn->kn_status &= ~(KN_INFLUX | KN_SCAN);
KN_LIST_UNLOCK(kn);
influx = 1;
}
@@ -1834,28 +1835,33 @@ knote(struct knlist *list, long hint, in
*/
SLIST_FOREACH(kn, &list->kl_list, kn_selnext) {
kq = kn->kn_kq;
- if ((kn->kn_status & KN_INFLUX) != KN_INFLUX) {
+ KQ_LOCK(kq);
+ if ((kn->kn_status & (KN_INFLUX | KN_SCAN)) == KN_INFLUX) {
+ /*
+* Do not process the influx notes, except for
+* the influx coming from the kq unlock in the
+* kqueue_scan(). In the later case, we do
+* not interfere with the scan, since the code
+* fragment in kqueue_scan() locks the knlist,
+* and cannot proceed until we finished.
+*/
+ KQ_UNLOCK(kq);
+ } else if ((lockflags & KNF_NOKQLOCK) != 0) {
+ kn->kn_status |= KN_INFLUX;
+ KQ_UNLOCK(kq);
+ error = kn->kn_fop->f_event(kn, hint);
KQ_LOCK(kq);
- if ((kn->kn_status & KN_INFLUX) == KN_INFLUX) {
- KQ_UNLOCK(kq);
- } else if ((lockflags & KNF_NOKQLOCK) != 0) {
- kn->kn_status |= KN_INFLUX;
- KQ_UNLOCK(kq);
- error = kn->kn_fop->f_event(kn, hint);
- KQ_LOCK(kq);
- kn->kn_status &= ~KN_INFLUX;
- if (error)
- KNOTE_ACTIVATE(kn, 1);
- KQ_UNLOCK_FLUX(kq);
- } else {
- kn->kn_status |= KN_HASKQLOCK;
- if (kn->kn_fop->f_event(kn, hint))
- KNOTE_ACTIVATE(kn, 1);
-
svn commit: r264369 - in stable/9/sys: kern sys
Author: kib
Date: Sat Apr 12 14:09:35 2014
New Revision: 264369
URL: http://svnweb.freebsd.org/changeset/base/264369
Log:
MFC r264146:
Fix a race between kqueue_register() and kqueue_scan() setting KN_INFLUX
flag while knlist is not locked, which caused lost notifications from
parallel knote().
Modified:
stable/9/sys/kern/kern_event.c
stable/9/sys/sys/event.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/sys/ (props changed)
Modified: stable/9/sys/kern/kern_event.c
==
--- stable/9/sys/kern/kern_event.c Sat Apr 12 14:08:53 2014
(r264368)
+++ stable/9/sys/kern/kern_event.c Sat Apr 12 14:09:35 2014
(r264369)
@@ -465,7 +465,7 @@ knote_fork(struct knlist *list, int pid)
continue;
kq = kn->kn_kq;
KQ_LOCK(kq);
- if ((kn->kn_status & KN_INFLUX) == KN_INFLUX) {
+ if ((kn->kn_status & (KN_INFLUX | KN_SCAN)) == KN_INFLUX) {
KQ_UNLOCK(kq);
continue;
}
@@ -1129,7 +1129,7 @@ findkn:
* but doing so will not reset any filter which has already been
* triggered.
*/
- kn->kn_status |= KN_INFLUX;
+ kn->kn_status |= KN_INFLUX | KN_SCAN;
KQ_UNLOCK(kq);
KN_LIST_LOCK(kn);
kn->kn_kevent.udata = kev->udata;
@@ -1152,7 +1152,7 @@ done_ev_add:
KQ_LOCK(kq);
if (event)
KNOTE_ACTIVATE(kn, 1);
- kn->kn_status &= ~KN_INFLUX;
+ kn->kn_status &= ~(KN_INFLUX | KN_SCAN);
KN_LIST_UNLOCK(kn);
if ((kev->flags & EV_DISABLE) &&
@@ -1469,7 +1469,7 @@ start:
KQ_LOCK(kq);
kn = NULL;
} else {
- kn->kn_status |= KN_INFLUX;
+ kn->kn_status |= KN_INFLUX | KN_SCAN;
KQ_UNLOCK(kq);
if ((kn->kn_status & KN_KQUEUE) == KN_KQUEUE)
KQ_GLOBAL_LOCK(&kq_global, haskqglobal);
@@ -1478,7 +1478,8 @@ start:
KQ_LOCK(kq);
KQ_GLOBAL_UNLOCK(&kq_global, haskqglobal);
kn->kn_status &=
- ~(KN_QUEUED | KN_ACTIVE | KN_INFLUX);
+ ~(KN_QUEUED | KN_ACTIVE | KN_INFLUX |
+ KN_SCAN);
kq->kq_count--;
KN_LIST_UNLOCK(kn);
influx = 1;
@@ -1508,7 +1509,7 @@ start:
} else
TAILQ_INSERT_TAIL(&kq->kq_head, kn, kn_tqe);
- kn->kn_status &= ~(KN_INFLUX);
+ kn->kn_status &= ~(KN_INFLUX | KN_SCAN);
KN_LIST_UNLOCK(kn);
influx = 1;
}
@@ -1826,28 +1827,33 @@ knote(struct knlist *list, long hint, in
*/
SLIST_FOREACH(kn, &list->kl_list, kn_selnext) {
kq = kn->kn_kq;
- if ((kn->kn_status & KN_INFLUX) != KN_INFLUX) {
+ KQ_LOCK(kq);
+ if ((kn->kn_status & (KN_INFLUX | KN_SCAN)) == KN_INFLUX) {
+ /*
+* Do not process the influx notes, except for
+* the influx coming from the kq unlock in the
+* kqueue_scan(). In the later case, we do
+* not interfere with the scan, since the code
+* fragment in kqueue_scan() locks the knlist,
+* and cannot proceed until we finished.
+*/
+ KQ_UNLOCK(kq);
+ } else if ((lockflags & KNF_NOKQLOCK) != 0) {
+ kn->kn_status |= KN_INFLUX;
+ KQ_UNLOCK(kq);
+ error = kn->kn_fop->f_event(kn, hint);
KQ_LOCK(kq);
- if ((kn->kn_status & KN_INFLUX) == KN_INFLUX) {
- KQ_UNLOCK(kq);
- } else if ((lockflags & KNF_NOKQLOCK) != 0) {
- kn->kn_status |= KN_INFLUX;
- KQ_UNLOCK(kq);
- error = kn->kn_fop->f_event(kn, hint);
- KQ_LOCK(kq);
- kn->kn_status &= ~KN_INFLUX;
- if (error)
- KNOTE_ACTIVATE(kn, 1);
- KQ_UNLOCK_FLUX(kq);
- } else {
- kn->kn_status |= KN_HASKQLOCK;
- if (kn->kn_fop->f_event(kn, hint))
- KNOT
svn commit: r264370 - stable/10/sys/kern
Author: kib
Date: Sat Apr 12 14:18:25 2014
New Revision: 264370
URL: http://svnweb.freebsd.org/changeset/base/264370
Log:
MFC r264173:
Use realloc(9) instead of doing the reallocation inline.
Modified:
stable/10/sys/kern/kern_linker.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_linker.c
==
--- stable/10/sys/kern/kern_linker.cSat Apr 12 14:09:35 2014
(r264369)
+++ stable/10/sys/kern/kern_linker.cSat Apr 12 14:18:25 2014
(r264370)
@@ -725,14 +725,8 @@ linker_file_add_dependency(linker_file_t
linker_file_t *newdeps;
sx_assert(&kld_sx, SA_XLOCKED);
- newdeps = malloc((file->ndeps + 1) * sizeof(*newdeps), M_LINKER,
- M_WAITOK | M_ZERO);
-
- if (file->deps) {
- bcopy(file->deps, newdeps, file->ndeps * sizeof(*newdeps));
- free(file->deps, M_LINKER);
- }
- file->deps = newdeps;
+ file->deps = realloc(file->deps, (file->ndeps + 1) * sizeof(*newdeps),
+ M_LINKER, M_WAITOK | M_ZERO);
file->deps[file->ndeps] = dep;
file->ndeps++;
KLD_DPF(FILE, ("linker_file_add_dependency:"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264371 - stable/9/sys/kern
Author: kib
Date: Sat Apr 12 14:18:48 2014
New Revision: 264371
URL: http://svnweb.freebsd.org/changeset/base/264371
Log:
MFC r264173:
Use realloc(9) instead of doing the reallocation inline.
Modified:
stable/9/sys/kern/kern_linker.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/kern/kern_linker.c
==
--- stable/9/sys/kern/kern_linker.c Sat Apr 12 14:18:25 2014
(r264370)
+++ stable/9/sys/kern/kern_linker.c Sat Apr 12 14:18:48 2014
(r264371)
@@ -733,14 +733,8 @@ linker_file_add_dependency(linker_file_t
linker_file_t *newdeps;
sx_assert(&kld_sx, SA_XLOCKED);
- newdeps = malloc((file->ndeps + 1) * sizeof(*newdeps), M_LINKER,
- M_WAITOK | M_ZERO);
-
- if (file->deps) {
- bcopy(file->deps, newdeps, file->ndeps * sizeof(*newdeps));
- free(file->deps, M_LINKER);
- }
- file->deps = newdeps;
+ file->deps = realloc(file->deps, (file->ndeps + 1) * sizeof(*newdeps),
+ M_LINKER, M_WAITOK | M_ZERO);
file->deps[file->ndeps] = dep;
file->ndeps++;
KLD_DPF(FILE, ("linker_file_add_dependency:"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264372 - stable/10
Author: bapt
Date: Sat Apr 12 15:06:15 2014
New Revision: 264372
URL: http://svnweb.freebsd.org/changeset/base/264372
Log:
MFC: r263881, r263952, r263983, r264068, r264090, r264131
Some xdev fixes:
- if TARGET_ARCH is not defined and XDEV_ARCH is defined then early define
TARGET_ARCH to the valud of XDEV_ARCH: This allow the xdev-build target
to be able to correctly chose the compiler it needs to build
- Allow overwriting XDTP to allow a user to not chose where the xdev env will
live in
- Fix build for gcc only xdev (like ia64) by providing the proper -B to the
toolchain and not relying on gcc being installed already in base
- Fix TOOLS_PREFIX so the generated toolchain has the right default sysroot
when
installed intead of getting the DESTDIR one
- Fix supporting DESTDIR
- Also overwrite CXX (needed for cross building c++ libraries with clang) and
CPP (needed to cross build some libraries when gcc is the target default
compiler but gcc is not installed on the building host)
- Prevent XDTP from being a relative path:
XDTP is used as the default SYSROOT for clang and thus should be an
absolute path.
- Respect default CC
Modified:
stable/10/Makefile.inc1
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==
--- stable/10/Makefile.inc1 Sat Apr 12 14:18:48 2014(r264371)
+++ stable/10/Makefile.inc1 Sat Apr 12 15:06:15 2014(r264372)
@@ -975,6 +975,8 @@ INSTALLKERNEL= ${_kernel}
.endif
.endfor
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
+
#
# buildkernel
#
@@ -1369,6 +1371,9 @@ build-tools: .MAKE
#
# cross-tools: Build cross-building tools
#
+.if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
+TARGET_ARCH= ${XDEV_ARCH}
+.endif
.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld=usr.sbin/btxld
@@ -1875,15 +1880,21 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU
CPUTYPE=${XDEV_CPUTYPE}
XDDIR=${XDEV_ARCH}-freebsd
-XDTP=usr/${XDDIR}
+XDTP?=/usr/${XDDIR}
+.if ${XDTP:N/*}
+.error XDTP variable should be an absolute path
+.endif
+
CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
INSTALL="sh ${.CURDIR}/tools/install.sh"
CDENV= ${CDBENV} \
_SHLIBDIRPREFIX=${XDDESTDIR} \
- TOOLS_PREFIX=${XDDESTDIR}
+ TOOLS_PREFIX=${XDTP}
CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \
- -B${XDDESTDIR}/usr/lib
-CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" \
+ --sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \
+ -B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib
+CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \
+ CPP="${CPP} ${CD2CFLAGS}" \
MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH}
CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
@@ -1922,11 +1933,11 @@ _xb-build-tools:
_xb-cross-tools:
.for _tool in \
-gnu/usr.bin/binutils \
-gnu/usr.bin/cc \
+${_binutils} \
usr.bin/ar \
${_clang_libs} \
-${_clang}
+${_clang} \
+${_cc}
${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
cd ${.CURDIR}/${_tool} && \
${CDMAKE} DIRPRFX=${_tool}/ obj && \
@@ -1950,10 +1961,11 @@ xdev-install: xdev-build _xi-mtree _xi-c
_xi-cross-tools:
@echo "_xi-cross-tools"
.for _tool in \
-gnu/usr.bin/binutils \
-gnu/usr.bin/cc \
+${_binutils} \
usr.bin/ar \
-${_clang}
+${_clang_libs} \
+${_clang} \
+${_cc}
${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
cd ${.CURDIR}/${_tool}; \
${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
@@ -1980,5 +1992,3 @@ _xi-links:
xdev xdev-build xdev-install:
@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for
\"${.TARGET}\" target"
.endif
-
-buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264373 - stable/10/contrib/byacc
Author: bapt
Date: Sat Apr 12 15:13:43 2014
New Revision: 264373
URL: http://svnweb.freebsd.org/changeset/base/264373
Log:
MFC: r263948
Convert an unused banner from skeleton.c into a comment.
It is added to every generated files and fix build at certain warning level
with clang 3.4
Submitted by: Thomas Dickey (byacc upstream)
Spotted by: glebius
Modified:
stable/10/contrib/byacc/skeleton.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/byacc/skeleton.c
==
--- stable/10/contrib/byacc/skeleton.c Sat Apr 12 15:06:15 2014
(r264372)
+++ stable/10/contrib/byacc/skeleton.c Sat Apr 12 15:13:43 2014
(r264373)
@@ -16,9 +16,9 @@
const char *const banner[] =
{
-"#ifndef lint",
-"static const char yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley)
02/21/93\";",
-"#endif",
+"/* original parser id follows */",
+"/* yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\" */",
+"/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */",
"",
"#define YYBYACC 1",
CONCAT1("#define YYMAJOR ", YYMAJOR),
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264374 - in head: contrib/amd/amd usr.sbin/amd/include
Author: des Date: Sat Apr 12 18:01:25 2014 New Revision: 264374 URL: http://svnweb.freebsd.org/changeset/base/264374 Log: Remove the names of the build host and user and the build date. This still leaves the host OS and version, but these are harder to remove. MFC after:3 weeks Modified: head/contrib/amd/amd/get_args.c head/usr.sbin/amd/include/newvers.sh Modified: head/contrib/amd/amd/get_args.c == --- head/contrib/amd/amd/get_args.c Sat Apr 12 15:13:43 2014 (r264373) +++ head/contrib/amd/amd/get_args.c Sat Apr 12 18:01:25 2014 (r264374) @@ -93,12 +93,6 @@ get_version_string(void) strlcat(vers, tmpbuf, len); xsnprintf(tmpbuf, sizeof(tmpbuf), "Report bugs to %s.\n", PACKAGE_BUGREPORT); strlcat(vers, tmpbuf, len); - xsnprintf(tmpbuf, sizeof(tmpbuf), "Configured by %s@%s on date %s.\n", - USER_NAME, HOST_NAME, CONFIG_DATE); - strlcat(vers, tmpbuf, len); - xsnprintf(tmpbuf, sizeof(tmpbuf), "Built by %s@%s.\n", - BUILD_USER, BUILD_HOST); - strlcat(vers, tmpbuf, len); xsnprintf(tmpbuf, sizeof(tmpbuf), "cpu=%s (%s-endian), arch=%s, karch=%s.\n", cpu, endian, gopt.arch, gopt.karch); strlcat(vers, tmpbuf, len); Modified: head/usr.sbin/amd/include/newvers.sh == --- head/usr.sbin/amd/include/newvers.shSat Apr 12 15:13:43 2014 (r264373) +++ head/usr.sbin/amd/include/newvers.shSat Apr 12 18:01:25 2014 (r264374) @@ -31,13 +31,4 @@ fi cat << __EOF -/* Define name of host */ -#define BUILD_HOST "`hostname`" - -/* Define user name */ -#define BUILD_USER "`whoami`" - -/* Define configuration date */ -#define BUILD_DATE "`LC_ALL=C date`" - __EOF ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264375 - in stable/10/sys: modules/sound/driver/ai2s powerpc/include powerpc/powermac
Author: andreast
Date: Sat Apr 12 19:57:15 2014
New Revision: 264375
URL: http://svnweb.freebsd.org/changeset/base/264375
Log:
MFC r260607, r260610, r260934:
r260607:
The onyx codec works also as module, so add it.
r260610:
Described in the man page but not implemented. Here it comes,
atomic_swap_32/64. The latter only for powerpc64.
r260934:
Fix the resource information for the i2s-a node on certain G5 PowerMacs.
This is the first step needed to get the snapper codec working on those
machines.
The second step is to enable the corresponding I2S device and its clock.
Tested on machines where the snapper codec was already working, a G4 PowerBook
and a PowerMac9,1 with a Shasta based macio.
The PowerMac7,2/7,3 with a K2 based macio can now also play sound.
Modified:
stable/10/sys/modules/sound/driver/ai2s/Makefile
stable/10/sys/powerpc/include/atomic.h
stable/10/sys/powerpc/powermac/macio.c
stable/10/sys/powerpc/powermac/maciovar.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/modules/sound/driver/ai2s/Makefile
==
--- stable/10/sys/modules/sound/driver/ai2s/MakefileSat Apr 12 18:01:25
2014(r264374)
+++ stable/10/sys/modules/sound/driver/ai2s/MakefileSat Apr 12 19:57:15
2014(r264375)
@@ -5,6 +5,6 @@
KMOD= snd_ai2s
SRCS= device_if.h bus_if.h ofw_bus_if.h
SRCS+= channel_if.h feeder_if.h mixer_if.h
-SRCS+= snapper.c tumbler.c aoa.c i2s.c
+SRCS+= onyx.c snapper.c tumbler.c aoa.c i2s.c
.include
Modified: stable/10/sys/powerpc/include/atomic.h
==
--- stable/10/sys/powerpc/include/atomic.h Sat Apr 12 18:01:25 2014
(r264374)
+++ stable/10/sys/powerpc/include/atomic.h Sat Apr 12 19:57:15 2014
(r264375)
@@ -684,10 +684,47 @@ atomic_fetchadd_long(volatile u_long *p,
return (value);
}
+static __inline u_int
+atomic_swap_32(volatile u_int *p, u_int v)
+{
+ u_int prev;
+
+ __asm __volatile(
+ "1: lwarx %0,0,%2\n"
+ " stwcx. %3,0,%2\n"
+ " bne-1b\n"
+ : "=&r" (prev), "+m" (*(volatile u_int *)p)
+ : "r" (p), "r" (v)
+ : "cc", "memory");
+
+ return (prev);
+}
+
+#ifdef __powerpc64__
+static __inline u_long
+atomic_swap_64(volatile u_long *p, u_long v)
+{
+ u_long prev;
+
+ __asm __volatile(
+ "1: ldarx %0,0,%2\n"
+ " stdcx. %3,0,%2\n"
+ " bne-1b\n"
+ : "=&r" (prev), "+m" (*(volatile u_long *)p)
+ : "r" (p), "r" (v)
+ : "cc", "memory");
+
+ return (prev);
+}
+#endif
+
#defineatomic_fetchadd_32 atomic_fetchadd_int
+#defineatomic_swap_int atomic_swap_32
#ifdef __powerpc64__
#defineatomic_fetchadd_64 atomic_fetchadd_long
+#defineatomic_swap_longatomic_swap_64
+#defineatomic_swap_ptr atomic_swap_64
#endif
#undef __ATOMIC_REL
Modified: stable/10/sys/powerpc/powermac/macio.c
==
--- stable/10/sys/powerpc/powermac/macio.c Sat Apr 12 18:01:25 2014
(r264374)
+++ stable/10/sys/powerpc/powermac/macio.c Sat Apr 12 19:57:15 2014
(r264375)
@@ -236,13 +236,45 @@ macio_add_intr(phandle_t devnode, struct
static void
macio_add_reg(phandle_t devnode, struct macio_devinfo *dinfo)
{
- struct macio_reg *reg;
- int i, nreg;
+ struct macio_reg *reg, *regp;
+ phandle_t child;
+ charbuf[8];
+ int i, layout_id = 0, nreg, res;
nreg = OF_getprop_alloc(devnode, "reg", sizeof(*reg), (void **)®);
if (nreg == -1)
return;
+/*
+ * Some G5's have broken properties in the i2s-a area. If so we try
+ * to fix it. Right now we know of two different cases, one for
+ * sound layout-id 36 and the other one for sound layout-id 76.
+ * What is missing is the base address for the memory addresses.
+ * We take them from the parent node (i2s) and use the size
+ * information from the child.
+ */
+
+if (reg[0].mr_base == 0) {
+ child = OF_child(devnode);
+ while (child != 0) {
+ res = OF_getprop(child, "name", buf, sizeof(buf));
+ if (res > 0 && strcmp(buf, "sound") == 0)
+ break;
+ child = OF_peer(child);
+ }
+
+res = OF_getprop(child, "layout-id", &layout_id,
+ sizeof(layout_id));
+
+if (res > 0 && (layout_id == 36 || layout_id == 76)) {
+res = OF_getprop_alloc(OF_parent(devnode), "reg",
+
svn commit: r264376 - stable/9/sys/powerpc/include
Author: andreast
Date: Sat Apr 12 19:58:31 2014
New Revision: 264376
URL: http://svnweb.freebsd.org/changeset/base/264376
Log:
MFC r260610:
Described in the man page but not implemented. Here it comes,
atomic_swap_32/64. The latter only for powerpc64.
Modified:
stable/9/sys/powerpc/include/atomic.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/powerpc/include/atomic.h
==
--- stable/9/sys/powerpc/include/atomic.h Sat Apr 12 19:57:15 2014
(r264375)
+++ stable/9/sys/powerpc/include/atomic.h Sat Apr 12 19:58:31 2014
(r264376)
@@ -666,10 +666,47 @@ atomic_fetchadd_long(volatile u_long *p,
return (value);
}
+static __inline u_int
+atomic_swap_32(volatile u_int *p, u_int v)
+{
+ u_int prev;
+
+ __asm __volatile(
+ "1: lwarx %0,0,%2\n"
+ " stwcx. %3,0,%2\n"
+ " bne-1b\n"
+ : "=&r" (prev), "+m" (*(volatile u_int *)p)
+ : "r" (p), "r" (v)
+ : "cc", "memory");
+
+ return (prev);
+}
+
+#ifdef __powerpc64__
+static __inline u_long
+atomic_swap_64(volatile u_long *p, u_long v)
+{
+ u_long prev;
+
+ __asm __volatile(
+ "1: ldarx %0,0,%2\n"
+ " stdcx. %3,0,%2\n"
+ " bne-1b\n"
+ : "=&r" (prev), "+m" (*(volatile u_long *)p)
+ : "r" (p), "r" (v)
+ : "cc", "memory");
+
+ return (prev);
+}
+#endif
+
#defineatomic_fetchadd_32 atomic_fetchadd_int
+#defineatomic_swap_int atomic_swap_32
#ifdef __powerpc64__
#defineatomic_fetchadd_64 atomic_fetchadd_long
+#defineatomic_swap_longatomic_swap_64
+#defineatomic_swap_ptr atomic_swap_64
#endif
#endif /* ! _MACHINE_ATOMIC_H_ */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264377 - in stable/10: crypto/openssh crypto/openssh/contrib/caldera crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/openssh/regress secu...
Author: des Date: Sat Apr 12 20:22:59 2014 New Revision: 264377 URL: http://svnweb.freebsd.org/changeset/base/264377 Log: MFH (r263712): upgrade openssh to 6.6p1 MFH (r264308): restore p level in debugging output Added: stable/10/crypto/openssh/digest-libc.c - copied unchanged from r263712, head/crypto/openssh/digest-libc.c stable/10/crypto/openssh/digest-openssl.c - copied unchanged from r263712, head/crypto/openssh/digest-openssl.c stable/10/crypto/openssh/hmac.c - copied unchanged from r263712, head/crypto/openssh/hmac.c stable/10/crypto/openssh/hmac.h - copied unchanged from r263712, head/crypto/openssh/hmac.h stable/10/crypto/openssh/openbsd-compat/explicit_bzero.c - copied unchanged from r263712, head/crypto/openssh/openbsd-compat/explicit_bzero.c stable/10/crypto/openssh/regress/dhgex.sh - copied unchanged from r263712, head/crypto/openssh/regress/dhgex.sh Deleted: stable/10/crypto/openssh/auth2-jpake.c stable/10/crypto/openssh/digest.c stable/10/crypto/openssh/jpake.c stable/10/crypto/openssh/jpake.h stable/10/crypto/openssh/schnorr.h Modified: stable/10/crypto/openssh/ChangeLog stable/10/crypto/openssh/Makefile.in stable/10/crypto/openssh/README stable/10/crypto/openssh/auth-rsa.c stable/10/crypto/openssh/auth.h stable/10/crypto/openssh/auth1.c stable/10/crypto/openssh/auth2-chall.c stable/10/crypto/openssh/auth2-gss.c stable/10/crypto/openssh/auth2-passwd.c stable/10/crypto/openssh/auth2.c stable/10/crypto/openssh/authfd.c stable/10/crypto/openssh/authfile.c stable/10/crypto/openssh/bufaux.c stable/10/crypto/openssh/bufbn.c stable/10/crypto/openssh/bufec.c stable/10/crypto/openssh/buffer.c stable/10/crypto/openssh/canohost.c stable/10/crypto/openssh/channels.c stable/10/crypto/openssh/cipher-3des1.c stable/10/crypto/openssh/cipher-chachapoly.c stable/10/crypto/openssh/cipher.c stable/10/crypto/openssh/clientloop.c stable/10/crypto/openssh/config.h stable/10/crypto/openssh/config.h.in stable/10/crypto/openssh/configure stable/10/crypto/openssh/configure.ac stable/10/crypto/openssh/contrib/caldera/openssh.spec stable/10/crypto/openssh/contrib/redhat/openssh.spec stable/10/crypto/openssh/contrib/suse/openssh.spec stable/10/crypto/openssh/digest.h stable/10/crypto/openssh/gss-serv.c stable/10/crypto/openssh/hostfile.c stable/10/crypto/openssh/kex.c stable/10/crypto/openssh/kex.h stable/10/crypto/openssh/kexc25519.c stable/10/crypto/openssh/kexdhc.c stable/10/crypto/openssh/kexdhs.c stable/10/crypto/openssh/kexecdhc.c stable/10/crypto/openssh/kexecdhs.c stable/10/crypto/openssh/kexgexc.c stable/10/crypto/openssh/kexgexs.c stable/10/crypto/openssh/key.c stable/10/crypto/openssh/krl.c stable/10/crypto/openssh/mac.c stable/10/crypto/openssh/moduli.0 stable/10/crypto/openssh/monitor.c stable/10/crypto/openssh/monitor.h stable/10/crypto/openssh/monitor_wrap.c stable/10/crypto/openssh/monitor_wrap.h stable/10/crypto/openssh/openbsd-compat/Makefile.in stable/10/crypto/openssh/openbsd-compat/bsd-poll.c stable/10/crypto/openssh/openbsd-compat/openbsd-compat.h stable/10/crypto/openssh/openbsd-compat/openssl-compat.c stable/10/crypto/openssh/openbsd-compat/openssl-compat.h stable/10/crypto/openssh/packet.c stable/10/crypto/openssh/readconf.c stable/10/crypto/openssh/readconf.h stable/10/crypto/openssh/readpass.c stable/10/crypto/openssh/regress/Makefile stable/10/crypto/openssh/regress/agent-ptrace.sh stable/10/crypto/openssh/regress/agent.sh stable/10/crypto/openssh/regress/cert-hostkey.sh stable/10/crypto/openssh/regress/host-expand.sh stable/10/crypto/openssh/regress/login-timeout.sh stable/10/crypto/openssh/regress/scp-ssh-wrapper.sh stable/10/crypto/openssh/regress/scp.sh stable/10/crypto/openssh/regress/setuid-allowed.c stable/10/crypto/openssh/regress/sftp-chroot.sh stable/10/crypto/openssh/rsa.c stable/10/crypto/openssh/sandbox-capsicum.c stable/10/crypto/openssh/sandbox-seccomp-filter.c stable/10/crypto/openssh/sandbox-systrace.c stable/10/crypto/openssh/scp.0 stable/10/crypto/openssh/servconf.c stable/10/crypto/openssh/servconf.h stable/10/crypto/openssh/serverloop.c stable/10/crypto/openssh/session.c stable/10/crypto/openssh/sftp-client.c stable/10/crypto/openssh/sftp-server.0 stable/10/crypto/openssh/sftp.0 stable/10/crypto/openssh/ssh-add.0 stable/10/crypto/openssh/ssh-add.c stable/10/crypto/openssh/ssh-agent.0 stable/10/crypto/openssh/ssh-agent.c stable/10/crypto/openssh/ssh-dss.c stable/10/crypto/openssh/ssh-ecdsa.c stable/10/crypto/openssh/ssh-ed25519.c stable/10/crypto/openssh/ssh-gss.h stable/10/crypto/openssh/ssh-keygen.0 stable/10/crypto/openssh/ssh-keygen.1 stable/10/crypto/openssh/ssh-keygen.c stable/10/crypto/openssh/ssh-keyscan.0 stable/10/crypto/openssh/ssh-keyscan.1 stable/10/crypto/openssh/ssh-keysign.0 stable/10/crypto/openssh/ssh-pkcs11-he
svn commit: r264378 - head/sys/geom/part
Author: marcel
Date: Sat Apr 12 20:28:39 2014
New Revision: 264378
URL: http://svnweb.freebsd.org/changeset/base/264378
Log:
Align and round the partitionable disk space to 4K by default.
Since this would also apply when recovering, make sure not to
align or round when that would have a partition fall outside
the partitionable area.
Modified:
head/sys/geom/part/g_part_gpt.c
Modified: head/sys/geom/part/g_part_gpt.c
==
--- head/sys/geom/part/g_part_gpt.c Sat Apr 12 20:22:59 2014
(r264377)
+++ head/sys/geom/part/g_part_gpt.c Sat Apr 12 20:28:39 2014
(r264378)
@@ -1174,9 +1174,12 @@ g_part_gpt_write(struct g_part_table *ba
static void
g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp)
{
+ struct g_part_entry *baseentry;
+ struct g_part_gpt_entry *entry;
struct g_part_gpt_table *table;
- quad_t last;
- size_t tblsz;
+ quad_t start, end, min, max;
+ quad_t lba, last;
+ size_t spb, tblsz;
table = (struct g_part_gpt_table *)basetable;
last = pp->mediasize / pp->sectorsize - 1;
@@ -1192,11 +1195,31 @@ g_gpt_set_defaults(struct g_part_table *
table->state[GPT_ELT_SECHDR] = GPT_STATE_OK;
table->state[GPT_ELT_SECTBL] = GPT_STATE_OK;
- table->hdr->hdr_lba_start = 2 + tblsz;
- table->hdr->hdr_lba_end = last - tblsz - 1;
+ max = start = 2 + tblsz;
+ min = end = last - tblsz - 1;
+ LIST_FOREACH(baseentry, &basetable->gpt_entry, gpe_entry) {
+ if (baseentry->gpe_deleted)
+ continue;
+ entry = (struct g_part_gpt_entry *)baseentry;
+ if (entry->ent.ent_lba_start < min)
+ min = entry->ent.ent_lba_start;
+ if (entry->ent.ent_lba_end > max)
+ max = entry->ent.ent_lba_end;
+ }
+ spb = 4096 / pp->sectorsize;
+ if (spb > 1) {
+ lba = start + ((start % spb) ? spb - start % spb : 0);
+ if (lba <= min)
+ start = lba;
+ lba = end - (end + 1) % spb;
+ if (max <= lba)
+ end = lba;
+ }
+ table->hdr->hdr_lba_start = start;
+ table->hdr->hdr_lba_end = end;
- basetable->gpt_first = table->hdr->hdr_lba_start;
- basetable->gpt_last = table->hdr->hdr_lba_end;
+ basetable->gpt_first = start;
+ basetable->gpt_last = end;
}
static void
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264379 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sat Apr 12 20:32:46 2014 New Revision: 264379 URL: http://svnweb.freebsd.org/changeset/base/264379 Log: Document r264377, OpenSSH update to 6.6p1. While here, bump copyright year. Todo: strip old entries from this file since 10.0-RELEASE. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:28:39 2014(r264378) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:32:46 2014(r264379) @@ -27,6 +27,7 @@ 2011 2012 2013 +2014 mailto:d...@freebsd.org";>The &os; Documentation Project @@ -455,6 +456,9 @@ hv_vmbus_load="YES" Al Userland Changes +OpenSSH has + been updated to version 6.6p1. + On platforms where &man.clang.1; is the default system compiler, (such as i386, amd64, arm) GCC and GNU libstdc++ are no longer built by default. &man.clang.1; and libc++ from LLVM are used on ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264380 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sat Apr 12 20:42:03 2014 New Revision: 264380 URL: http://svnweb.freebsd.org/changeset/base/264380 Log: Trim stale entries. Use consistent for empty sections. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:32:46 2014(r264379) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:42:03 2014(r264380) @@ -111,238 +111,52 @@ Security Advisories - + Kernel Changes -The use of unmapped VMIO buffers eliminates the need to perform - TLB shootdown for mapping on buffer creation and reuse, greatly reducing the - amount of IPIs for shootdown on big-SMP machines and eliminating up to 25-30% - of the system time on i/o intensive workloads. - -The maximum amount of memory the &os; kernel - can address has been increased from 1TB to 4TB. - -A new &man.cpuset.2; API has been added - for thread to CPU binding and CPU resource grouping and - assignment. The &man.cpuset.1; userland utility has been added - to allow manipulation of processor sets. - -The &man.ddb.4; kernel debugger now has an output capture - facility. Input and output from &man.ddb.4; can now be captured - to a memory buffer for later inspection using &man.sysctl.8; or - a textdump. The new capture command controls - this feature. - -The &man.ddb.4; debugger now supports a simple scripting - facility, which supports a set of named scripts consisting of a - set of &man.ddb.4; commands. These commands can be managed from - within &man.ddb.4; or with the use of the new &man.ddb.8; - utility. More details can be found in the &man.ddb.4; manual - page. - -The kernel now supports a new textdump format of kernel - dumps. A textdump provides higher-level information via - mechanically generated/extracted debugging output, rather than a - simple memory dump. This facility can be used to generate brief - kernel bug reports that are rich in debugging information, but - are not dependent on kernel symbol tables or precisely - synchronized source code. More information can be found in the - &man.textdump.4; manual page. - -Kernel support for M:N threading has been removed. While - the KSE (Kernel Scheduled Entities) project was quite successful - in bringing threading to FreeBSD, the M:N approach taken by the - KSE library was never developed to its full potential. - Backwards compatibility for applications using KSE threading - will be provided via &man.libmap.conf.5; for dynamically linked - binaries. The &os; Project greatly appreciates the work of - &a.julian;, &a.deischen;, and &a.davidxu; on KSE support. - -The &os; kernel now exports information about certain kernel - features via the kern.features sysctl tree. - The &man.feature.present.3; library call provides a convenient - interface for user applications to test the presence of - features. - -The &os; kernel now has support for large - memory page mappings (superpages). - -The ULE - scheduler is now the default process scheduler - in GENERIC kernels. - -Support was added for - the new Intel on-CPU Bull Mountain random number - generator, found on IvyBridge and supposedly later CPUs, - accessible with RDRAND instruction. + Virtualization support - The BSD Hypervisor, &man.bhyve.8; is included -with &os;. &man.bhyve.8; requires Intel CPUs with VT-x and Extended Page Table (EPT) -support. These features are on all Nehalem models and beyond -(e.g. Nehalem and newer), but not on the lower-end Atom CPUs. - - &man.virtio.4; support has been added. &man.virtio.4; is the -name for the paravirtualization interface developed for the Linux KVM, but -since adopted to other virtual machine hypervisors (with the notable exception of Xen). -This work brings in a BSD-licensed clean-room implementation of the virtio kernel drivers -for disk IO (&man.virtio_blk.4; and &man.virtio_scsi.4;), network IO (&man.vtnet.4;), -memory ballooning (&man.virtio_balloon.4;), and PCI. -Tested with on Qemu/KVM, VirtualBox, and &man.bhyve.4;. - - Paravirtualized drivers which -support Microsoft Hyper-V have been imported and made -part of the amd64 GENERIC kernel. For i386, these drivers are not part of -GENERIC, so the following lines must be added to -/boot/loader.conf to load these drivers: -hv_ata_pci_disengage_load="YES" -hv_netsvc_l
svn commit: r264381 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sat Apr 12 20:49:07 2014 New Revision: 264381 URL: http://svnweb.freebsd.org/changeset/base/264381 Log: Clean up leading/trailing whitespace. Rewrap paragraphs and long lines. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:42:03 2014(r264380) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:49:07 2014(r264381) @@ -1,14 +1,16 @@ %release; ]> http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0"> -&os; &release.current; Release Notes - + + &os; &release.current; Release Notes - The &os; Project + +The &os; Project + $FreeBSD$ @@ -41,13 +43,13 @@ -The release notes for &os; &release.current; contain a summary - of the changes made to the &os; base system on the - &release.branch; development line. - This document lists applicable security advisories that were issued since - the last release, as well as significant changes to the &os; - kernel and userland. - Some brief remarks on upgrading are also presented. +The release notes for &os; &release.current; contain + a summary of the changes made to the &os; base system on the + &release.branch; development line. This document lists + applicable security advisories that were issued since the last + release, as well as significant changes to the &os; kernel and + userland. Some brief remarks on upgrading are also + presented. @@ -55,30 +57,32 @@ Introduction This document contains the release notes for &os; -&release.current;. It -describes recently added, changed, or deleted features of &os;. -It also provides some notes on upgrading -from previous versions of &os;. - - The &release.type; distribution to which these release notes -apply represents the latest point along the &release.branch; development -branch since &release.branch; was created. Information regarding pre-built, binary -&release.type; distributions along this branch -can be found at &release.url;. - - The &release.type; distribution to which these release notes -apply represents a point along the &release.branch; development -branch between &release.prev; and the future &release.next;. -Information regarding -pre-built, binary &release.type; distributions along this branch -can be found at &release.url;. - - This distribution of &os; &release.current; is a -&release.type; distribution. It can be found at &release.url; or any of its mirrors. More -information on obtaining this (or other) &release.type; -distributions of &os; can be found in the Obtaining -&os; appendix to the &os; -Handbook. +&release.current;. It describes recently added, changed, or +deleted features of &os;. It also provides some notes on +upgrading from previous versions of &os;. + + The &release.type; distribution to which +these release notes apply represents the latest point along the +&release.branch; development branch since &release.branch; was +created. Information regarding pre-built, binary &release.type; +distributions along this branch can be found at &release.url;. + + The &release.type; distribution to +which these release notes apply represents a point along the +&release.branch; development branch between &release.prev; and the +future &release.next;. Information regarding pre-built, binary +&release.type; distributions along this branch can be found at +&release.url;. + + This distribution of &os; +&release.current; is a &release.type; distribution. It can be +found at &release.url; or +any of its mirrors. More information on obtaining this (or other) +&release.type; distributions of &os; can be found in the Obtaining + &os; appendix to the &os; Handbook. All users are encouraged to consult the release errata before installing &os;. The errata document is updated with @@ -87,26 +91,22 @@ information on known bugs, security advisories, and corrections to documentation. An up-to-date copy of the errata for &os; &release.current; can be found on the &os; Web site. - What's New - This section describes -the most user-visible new or changed features in &os; -since &release.prev;. - - Typical release note items -document recent security advisories issued after -&release.prev;, -new drivers or hardware support, new commands or options, -major bug fixes, or contributed software upgrades. They may also -list changes to major ports/packages or release engineering -practices.
svn commit: r264382 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sat Apr 12 20:50:31 2014 New Revision: 264382 URL: http://svnweb.freebsd.org/changeset/base/264382 Log: Remove reference to FreeBSD 6.2-R in the freebsd-update(8) note. Rewrap. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:49:07 2014(r264381) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:50:31 2014(r264382) @@ -229,14 +229,14 @@ Upgrading from Previous Releases of &os; - Beginning with &os; 6.2-RELEASE, binary -upgrades between RELEASE versions (and snapshots of the various -security branches) are supported using the &man.freebsd-update.8; -utility. The binary upgrade procedure will update unmodified -userland utilities, as well as unmodified GENERIC or SMP kernels -distributed as a part of an official &os; release. The -&man.freebsd-update.8; utility requires that the host being -upgraded have Internet connectivity. + Binary upgrades between RELEASE versions +(and snapshots of the various security branches) are supported +using the &man.freebsd-update.8; utility. The binary upgrade +procedure will update unmodified userland utilities, as well as +unmodified GENERIC or SMP kernels distributed as a part of an +official &os; release. The &man.freebsd-update.8; utility +requires that the host being upgraded have Internet +connectivity. Source-based upgrades (those based on recompiling the &os; base system from source code) from previous versions are ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264383 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sat Apr 12 20:51:38 2014 New Revision: 264383 URL: http://svnweb.freebsd.org/changeset/base/264383 Log: Move OpenSSH entry to 'contrib' where it belongs. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:50:31 2014(r264382) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Apr 12 20:51:38 2014(r264383) @@ -186,8 +186,7 @@ Userland Changes -OpenSSH has - been updated to version 6.6p1. + /etc/rc.d Scripts @@ -200,7 +199,8 @@ Contributed Software - +OpenSSH has + been updated to version 6.6p1. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264384 - head/share/man/man4
Author: brueffer Date: Sat Apr 12 21:04:53 2014 New Revision: 264384 URL: http://svnweb.freebsd.org/changeset/base/264384 Log: mdoc and language improvements. MFC after:1 week Modified: head/share/man/man4/timecounters.4 Modified: head/share/man/man4/timecounters.4 == --- head/share/man/man4/timecounters.4 Sat Apr 12 20:51:38 2014 (r264383) +++ head/share/man/man4/timecounters.4 Sat Apr 12 21:04:53 2014 (r264384) @@ -31,20 +31,20 @@ .Nm timecounters .Nd kernel time counters subsystem .Sh SYNOPSIS -Kernel uses several types of time-related devices, such as: real time clocks, +The kernel uses several types of time-related devices, such as: real time clocks, time counters and event timers. -Real time clocks responsible for tracking real world time, mostly when system +Real time clocks are responsible for tracking real world time, mostly when the system is down. -Time counters are responsible for tracking purposes, when system is running. -Event timers are responsible for generating interrupts at specified time or +Time counters are responsible for tracking purposes, when the system is running. +Event timers are responsible for generating interrupts at a specified time or periodically, to run different time-based events. This page is about the second. .Sh DESCRIPTION -Time counters are the lowest level of time tracking in kernel. +Time counters are the lowest level of time tracking in the kernel. They provide monotonically increasing timestamps with known width and update frequency. -They can overflow, drift, etc and so in raw form used only in very limited -performance-critical places like process scheduler. +They can overflow, drift, etc and so in raw form can be used only in very limited +performance-critical places like the process scheduler. .Pp More usable time is created by scaling the values read from the selected time counter and combining it with some offset, regularly updated by @@ -54,13 +54,14 @@ on invocation. .Pp Different platforms provide different kinds of timer hardware. -The goal of the time counters subsystem is to provide unified way to access +The goal of the time counters subsystem is to provide a unified way to access that hardware. .Pp -Each driver implementing time counters, registers them at the subsystem. -It is possible to see the list of present time counters, like this, via +Each driver implementing time counters registers them with the subsystem. +It is possible to see the list of present time counters, via the .Va kern.timecounter -sysctl: +.Xr sysctl 8 +variable: .Bd -literal kern.timecounter.choice: TSC-low(-100) HPET(950) i8254(0) ACPI-fast(900) dummy(-100) kern.timecounter.tc.ACPI-fast.mask: 16777215 @@ -81,7 +82,7 @@ kern.timecounter.tc.TSC-low.frequency: 1 kern.timecounter.tc.TSC-low.quality: -100 .Ed .Pp -where: +The output nodes are defined as follows: .Bl -inset .It Va kern.timecounter.tc. Ns Ar X Ns Va .mask is a bitmask, defining valid counter bits, @@ -90,13 +91,13 @@ is a present counter value, .It Va kern.timecounter.tc. Ns Ar X Ns Va .frequency is a counter update frequency, .It Va kern.timecounter.tc. Ns Ar X Ns Va .quality -is an integral value, defining how good is this time counter, -comparing to others. -Negative value means that this time counter is broken and should not be used. +is an integral value, defining the quality of this time counter +compared to others. +A negative value means this time counter is broken and should not be used. .El .Pp -Time management code of the kernel chooses one time counter from that list. -Current choice can be read and affected via +The time management code of the kernel chooses one time counter from that list. +The current choice can be read and affected via the .Va kern.timecounter.hardware tunable/sysctl. .Sh SEE ALSO ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264385 - head/sys/kern
Author: bdrewery Date: Sat Apr 12 21:39:17 2014 New Revision: 264385 URL: http://svnweb.freebsd.org/changeset/base/264385 Log: Use proper MFSNAMELEN for fs type. MFC after:2 weeks Reviewed by: rodrigc Also spotted by:ambrisko Modified: head/sys/kern/vfs_mount.c Modified: head/sys/kern/vfs_mount.c == --- head/sys/kern/vfs_mount.c Sat Apr 12 21:04:53 2014(r264384) +++ head/sys/kern/vfs_mount.c Sat Apr 12 21:39:17 2014(r264385) @@ -748,7 +748,7 @@ sys_mount(td, uap) return (EOPNOTSUPP); } - ma = mount_argsu(ma, "fstype", uap->type, MNAMELEN); + ma = mount_argsu(ma, "fstype", uap->type, MFSNAMELEN); ma = mount_argsu(ma, "fspath", uap->path, MNAMELEN); ma = mount_argb(ma, flags & MNT_RDONLY, "noro"); ma = mount_argb(ma, !(flags & MNT_NOSUID), "nosuid"); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264386 - head/share/man/man4
Author: brueffer Date: Sat Apr 12 22:05:03 2014 New Revision: 264386 URL: http://svnweb.freebsd.org/changeset/base/264386 Log: Improve markup and remove contractions. MFC after:1 week Modified: head/share/man/man4/usb_quirk.4 Modified: head/share/man/man4/usb_quirk.4 == --- head/share/man/man4/usb_quirk.4 Sat Apr 12 21:39:17 2014 (r264385) +++ head/share/man/man4/usb_quirk.4 Sat Apr 12 22:05:03 2014 (r264386) @@ -49,13 +49,13 @@ swap left and right channels .It UQ_AU_INP_ASYNC input is async despite claim of adaptive .It UQ_AU_NO_FRAC -don't adjust for fractional samples +do not adjust for fractional samples .It UQ_AU_NO_XU audio device has broken extension unit .It UQ_BAD_ADC bad audio spec version number .It UQ_BAD_AUDIO -device claims audio class, but isn't +device claims audio class, but is not .It UQ_BROKEN_BIDIR printer has broken bidir mode .It UQ_BUS_POWERED @@ -69,7 +69,7 @@ device should set the boot protocol .It UQ_UMS_IGNORE device should be ignored by ums class .It UQ_MS_BAD_CLASS -doesn't identify properly +does not identify properly .It UQ_MS_LEADING_BYTE mouse sends an unknown leading byte .It UQ_MS_REVZ @@ -150,27 +150,28 @@ ejects after Huawei USB command ejects after Sierra USB command .It UQ_MSC_EJECT_SCSIEJECT ejects after SCSI eject command -0x1b000200 +.Dv 0x1b000200 .It UQ_MSC_EJECT_REZERO ejects after SCSI rezero command -0x0100 +.Dv 0x0100 .It UQ_MSC_EJECT_ZTESTOR ejects after ZTE SCSI command -0x85010101180101010101 +.Dv 0x85010101180101010101 .It UQ_MSC_EJECT_CMOTECH ejects after C-motech SCSI command -0xff52444556434847 +.Dv 0xff52444556434847 .It UQ_MSC_EJECT_WAIT wait for the device to eject .It UQ_MSC_EJECT_SAEL_M460 ejects after Sael USB commands .It UQ_MSC_EJECT_HUAWEISCSI ejects after Huawei SCSI command -0x1106 +.Dv 0x1106 .It UQ_MSC_EJECT_TCT ejects after TCT SCSI command -0x06f504025270 +.Dv 0x06f504025270 .El +.Pp See .Pa /sys/dev/usb/quirk/usb_quirk.h for the complete list of supported quirks. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264387 - head/usr.bin/find
Author: jilles
Date: Sat Apr 12 22:36:26 2014
New Revision: 264387
URL: http://svnweb.freebsd.org/changeset/base/264387
Log:
find: Correctly propagate -exec/-execdir ... {} + exit status.
As per POSIX, the -exec ... {} + primary always returns true, but a non-zero
exit status causes find to return a non-zero exit status itself. GNU does
the same, and also for -execdir ... {} +.
It does not make much sense to return false from the primary only when the
child process happens to be run.
The behaviour for -exec/-execdir ... ; remains unchanged: the primary
returns true or false depending on the exit status, and find's exit status
is unaffected.
Modified:
head/usr.bin/find/extern.h
head/usr.bin/find/find.1
head/usr.bin/find/find.c
head/usr.bin/find/function.c
head/usr.bin/find/main.c
Modified: head/usr.bin/find/extern.h
==
--- head/usr.bin/find/extern.h Sat Apr 12 22:05:03 2014(r264386)
+++ head/usr.bin/find/extern.h Sat Apr 12 22:36:26 2014(r264387)
@@ -118,6 +118,7 @@ extern int ftsoptions, ignore_readdir_ra
extern int issort, isxargs;
extern int mindepth, maxdepth;
extern int regexp_flags;
+extern int exitstatus;
extern time_t now;
extern int dotfd;
extern FTS *tree;
Modified: head/usr.bin/find/find.1
==
--- head/usr.bin/find/find.1Sat Apr 12 22:05:03 2014(r264386)
+++ head/usr.bin/find/find.1Sat Apr 12 22:36:26 2014(r264387)
@@ -31,7 +31,7 @@
.\"@(#)find.1 8.7 (Berkeley) 5/9/95
.\" $FreeBSD$
.\"
-.Dd January 5, 2014
+.Dd April 12, 2014
.Dt FIND 1
.Os
.Sh NAME
@@ -384,6 +384,12 @@ is replaced with as many pathnames as po
.Ar utility .
This behaviour is similar to that of
.Xr xargs 1 .
+The primary always returns true;
+if at least one invocation of
+.Ar utility
+returns a non-zero exit status,
+.Nm
+will return a non-zero exit status.
.It Ic -execdir Ar utility Oo Ar argument ... Oc Li \&;
The
.Ic -execdir
@@ -406,6 +412,12 @@ is replaced with as many pathnames as po
.Ar utility .
This behaviour is similar to that of
.Xr xargs 1 .
+The primary always returns true;
+if at least one invocation of
+.Ar utility
+returns a non-zero exit status,
+.Nm
+will return a non-zero exit status.
.It Ic -flags Oo Cm - Ns | Ns Cm + Oc Ns Ar flags , Ns Ar notflags
The flags are specified using symbolic names (see
.Xr chflags 1 ) .
Modified: head/usr.bin/find/find.c
==
--- head/usr.bin/find/find.cSat Apr 12 22:05:03 2014(r264386)
+++ head/usr.bin/find/find.cSat Apr 12 22:36:26 2014(r264387)
@@ -175,13 +175,14 @@ find_execute(PLAN *plan, char *paths[])
{
FTSENT *entry;
PLAN *p;
- int e, rval;
+ int e;
tree = fts_open(paths, ftsoptions, (issort ? find_compare : NULL));
if (tree == NULL)
err(1, "ftsopen");
- for (rval = 0; errno = 0, (entry = fts_read(tree)) != NULL;) {
+ exitstatus = 0;
+ while (errno = 0, (entry = fts_read(tree)) != NULL) {
if (maxdepth != -1 && entry->fts_level >= maxdepth) {
if (fts_set(tree, entry, FTS_SKIP))
err(1, "%s", entry->fts_path);
@@ -206,7 +207,7 @@ find_execute(PLAN *plan, char *paths[])
(void)fflush(stdout);
warnx("%s: %s",
entry->fts_path, strerror(entry->fts_errno));
- rval = 1;
+ exitstatus = 1;
continue;
#ifdef FTS_W
case FTS_W:
@@ -217,7 +218,7 @@ find_execute(PLAN *plan, char *paths[])
if (isxargs && strpbrk(entry->fts_path, BADCH)) {
(void)fflush(stdout);
warnx("%s: illegal path", entry->fts_path);
- rval = 1;
+ exitstatus = 1;
continue;
}
@@ -235,5 +236,5 @@ find_execute(PLAN *plan, char *paths[])
finish_execplus();
if (e && (!ignore_readdir_race || e != ENOENT))
errc(1, e, "fts_read");
- return (rval);
+ return (exitstatus);
}
Modified: head/usr.bin/find/function.c
==
--- head/usr.bin/find/function.cSat Apr 12 22:05:03 2014
(r264386)
+++ head/usr.bin/find/function.cSat Apr 12 22:36:26 2014
(r264387)
@@ -671,7 +671,13 @@ doexec:if ((plan->flags & F_NEEDOK) &&
plan->e_psize = plan->e_pbsize;
}
pid = waitpid(pid, &status, 0);
- return (pid != -1 && WIFEXITED(status) && !WEXITSTATUS(status));
+ if (pid != -1 && WIFEXITED(status) && !WEXITSTATUS(status))
+ retu
svn commit: r264388 - in head/sys: kern sys
Author: davide
Date: Sat Apr 12 23:29:29 2014
New Revision: 264388
URL: http://svnweb.freebsd.org/changeset/base/264388
Log:
Hide internal details of sbintime_t implementation wrapping INT64_MAX into
SBT_MAX, to make it more robust in case internal type representation will
change in the future. All the consumers were migrated to SBT_MAX and
every new consumer (if any) should from now use this interface.
Requested by: bapt, jmg, Ryan Lortie (implictly)
Reviewed by: mav, bde
Modified:
head/sys/kern/kern_clocksource.c
head/sys/kern/kern_event.c
head/sys/kern/kern_timeout.c
head/sys/kern/sys_generic.c
head/sys/sys/time.h
Modified: head/sys/kern/kern_clocksource.c
==
--- head/sys/kern/kern_clocksource.cSat Apr 12 22:36:26 2014
(r264387)
+++ head/sys/kern/kern_clocksource.cSat Apr 12 23:29:29 2014
(r264388)
@@ -217,13 +217,13 @@ handleevents(sbintime_t now, int fake)
} else
state->nextprof = state->nextstat;
if (now >= state->nextcallopt) {
- state->nextcall = state->nextcallopt = INT64_MAX;
+ state->nextcall = state->nextcallopt = SBT_MAX;
callout_process(now);
}
#ifdef KDTRACE_HOOKS
if (fake == 0 && now >= state->nextcyc && cyclic_clock_func != NULL) {
- state->nextcyc = INT64_MAX;
+ state->nextcyc = SBT_MAX;
(*cyclic_clock_func)(frame);
}
#endif
@@ -509,7 +509,7 @@ configtimer(int start)
state = DPCPU_ID_PTR(cpu, timerstate);
state->now = now;
if (!smp_started && cpu != CPU_FIRST())
- state->nextevent = INT64_MAX;
+ state->nextevent = SBT_MAX;
else
state->nextevent = next;
if (periodic)
@@ -598,10 +598,10 @@ cpu_initclocks_bsp(void)
state = DPCPU_ID_PTR(cpu, timerstate);
mtx_init(&state->et_hw_mtx, "et_hw_mtx", NULL, MTX_SPIN);
#ifdef KDTRACE_HOOKS
- state->nextcyc = INT64_MAX;
+ state->nextcyc = SBT_MAX;
#endif
- state->nextcall = INT64_MAX;
- state->nextcallopt = INT64_MAX;
+ state->nextcall = SBT_MAX;
+ state->nextcallopt = SBT_MAX;
}
periodic = want_periodic;
/* Grab requested timer or the best of present. */
Modified: head/sys/kern/kern_event.c
==
--- head/sys/kern/kern_event.c Sat Apr 12 22:36:26 2014(r264387)
+++ head/sys/kern/kern_event.c Sat Apr 12 23:29:29 2014(r264388)
@@ -528,8 +528,8 @@ timer2sbintime(intptr_t data)
{
#ifdef __LP64__
- if (data > INT64_MAX / SBT_1MS)
- return INT64_MAX;
+ if (data > SBT_MAX / SBT_1MS)
+ return (SBT_MAX);
#endif
return (SBT_1MS * data);
}
@@ -1399,7 +1399,7 @@ kqueue_scan(struct kqueue *kq, int maxev
rsbt = tstosbt(*tsp);
if (TIMESEL(&asbt, rsbt))
asbt += tc_tick_sbt;
- if (asbt <= INT64_MAX - rsbt)
+ if (asbt <= SBT_MAX - rsbt)
asbt += rsbt;
else
asbt = 0;
Modified: head/sys/kern/kern_timeout.c
==
--- head/sys/kern/kern_timeout.cSat Apr 12 22:36:26 2014
(r264387)
+++ head/sys/kern/kern_timeout.cSat Apr 12 23:29:29 2014
(r264388)
@@ -302,7 +302,7 @@ callout_cpu_init(struct callout_cpu *cc)
for (i = 0; i < callwheelsize; i++)
LIST_INIT(&cc->cc_callwheel[i]);
TAILQ_INIT(&cc->cc_expireq);
- cc->cc_firstevent = INT64_MAX;
+ cc->cc_firstevent = SBT_MAX;
for (i = 0; i < 2; i++)
cc_cce_cleanup(cc, i);
if (cc->cc_callout == NULL) /* Only cpu0 handles timeout(9) */
@@ -574,8 +574,8 @@ callout_cc_add(struct callout *c, struct
* Inform the eventtimers(4) subsystem there's a new callout
* that has been inserted, but only if really required.
*/
- if (INT64_MAX - c->c_time < c->c_precision)
- c->c_precision = INT64_MAX - c->c_time;
+ if (SBT_MAX - c->c_time < c->c_precision)
+ c->c_precision = SBT_MAX - c->c_time;
sbt = c->c_time + c->c_precision;
if (sbt < cc->cc_firstevent) {
cc->cc_firstevent = sbt;
@@ -953,8 +953,8 @@ callout_reset_sbt_on(struct callout *c,
to_sbt += tick_sbt;
} else
svn commit: r264389 - head/sys/dev/ata
Author: rpaulo
Date: Sat Apr 12 23:40:54 2014
New Revision: 264389
URL: http://svnweb.freebsd.org/changeset/base/264389
Log:
Fix the style of ata_interrupt_locked().
Modified:
head/sys/dev/ata/ata-all.c
Modified: head/sys/dev/ata/ata-all.c
==
--- head/sys/dev/ata/ata-all.c Sat Apr 12 23:29:29 2014(r264388)
+++ head/sys/dev/ata/ata-all.c Sat Apr 12 23:40:54 2014(r264389)
@@ -360,24 +360,23 @@ ata_interrupt(void *data)
static void
ata_interrupt_locked(void *data)
{
-struct ata_channel *ch = (struct ata_channel *)data;
-struct ata_request *request;
+ struct ata_channel *ch = (struct ata_channel *)data;
+ struct ata_request *request;
-do {
/* ignore interrupt if its not for us */
if (ch->hw.status && !ch->hw.status(ch->dev))
- break;
+ return;
/* do we have a running request */
if (!(request = ch->running))
- break;
+ return;
ATA_DEBUG_RQ(request, "interrupt");
/* safetycheck for the right state */
if (ch->state == ATA_IDLE) {
- device_printf(request->dev, "interrupt on idle channel ignored\n");
- break;
+ device_printf(request->dev, "interrupt on idle channel
ignored\n");
+ return;
}
/*
@@ -385,13 +384,12 @@ ata_interrupt_locked(void *data)
* if it finishes immediately otherwise wait for next interrupt
*/
if (ch->hw.end_transaction(request) == ATA_OP_FINISHED) {
- ch->running = NULL;
- if (ch->state == ATA_ACTIVE)
- ch->state = ATA_IDLE;
- ata_cam_end_transaction(ch->dev, request);
- return;
+ ch->running = NULL;
+ if (ch->state == ATA_ACTIVE)
+ ch->state = ATA_IDLE;
+ ata_cam_end_transaction(ch->dev, request);
+ return;
}
-} while (0);
}
static void
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264390 - stable/10/contrib/wpa/src/drivers
Author: rpaulo Date: Sat Apr 12 23:48:02 2014 New Revision: 264390 URL: http://svnweb.freebsd.org/changeset/base/264390 Log: MFC r263925 Enable all cryptocaps because net80211 can do software encryption. Modified: stable/10/contrib/wpa/src/drivers/driver_bsd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/wpa/src/drivers/driver_bsd.c == --- stable/10/contrib/wpa/src/drivers/driver_bsd.c Sat Apr 12 23:40:54 2014(r264389) +++ stable/10/contrib/wpa/src/drivers/driver_bsd.c Sat Apr 12 23:48:02 2014(r264390) @@ -1446,6 +1446,17 @@ static int wpa_driver_bsd_capa(struct bs drv->capa.key_mgmt = WPA_DRIVER_CAPA_KEY_MGMT_WPA2 | WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK; +#ifdef __FreeBSD__ + drv->capa.enc |= WPA_DRIVER_CAPA_ENC_WEP40 | + WPA_DRIVER_CAPA_ENC_WEP104 | + WPA_DRIVER_CAPA_ENC_TKIP | + WPA_DRIVER_CAPA_ENC_CCMP; +#else + /* +* XXX +* FreeBSD exports hardware cryptocaps. These have no meaning for wpa +* since net80211 performs software crypto. +*/ if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_WEP) drv->capa.enc |= WPA_DRIVER_CAPA_ENC_WEP40 | WPA_DRIVER_CAPA_ENC_WEP104; @@ -1453,6 +1464,7 @@ static int wpa_driver_bsd_capa(struct bs drv->capa.enc |= WPA_DRIVER_CAPA_ENC_TKIP; if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_CCM) drv->capa.enc |= WPA_DRIVER_CAPA_ENC_CCMP; +#endif if (devcaps.dc_drivercaps & IEEE80211_C_HOSTAP) drv->capa.flags |= WPA_DRIVER_FLAGS_AP; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264269 - in head: sys/conf sys/kern sys/modules sys/modules/imgact_binmisc sys/sys usr.sbin usr.sbin/binmiscctl
Sean Bruno wrote this message on Tue, Apr 08, 2014 at 15:01 -0700: > > > Added: > > > head/sys/kern/imgact_binmisc.c (contents, props changed) > > > head/sys/modules/imgact_binmisc/ > > > head/sys/modules/imgact_binmisc/Makefile (contents, props changed) > > > head/sys/sys/imgact_binmisc.h (contents, props changed) > > > head/usr.sbin/binmiscctl/ > > > head/usr.sbin/binmiscctl/Makefile (contents, props changed) > > > head/usr.sbin/binmiscctl/binmiscctl.8 (contents, props changed) > > > head/usr.sbin/binmiscctl/binmiscctl.c (contents, props changed) > > > Modified: > > > head/sys/conf/files.amd64 > > > head/sys/conf/files.i386 > > > head/sys/modules/Makefile > > > head/usr.sbin/Makefile > > > > Maybe put it in sys/conf/files instead of only amd64|i386? You enabled > > the module build for all architectures. Please also add it to > > sys/conf/NOTES. > > > I've adjusted things to only build on amd64/i386. Thank you for > pointing out my misconfiguration. > > I've updated NOTES as well at svn r264280 to reflext this and updated > options for amd64/i386. > > I haven't tested on non-x86 h/w and have no idea if it works or not. I > didn't feel comfortable building this driver in the non-x86 case. If > there is a use case/tester for the other arch's, I'll be more than happy > to change this. Can we make sure that this choice is well documented? Too often things are marked for a particular arch w/o notice why it is limited, and this just continues to make non-i386/amd64 arches harder to become first class citzens as people will say feature X is broken on arch Y for no good reason... If you believe it should work on all archs, make it available for all and send out a call for testers to the various lists... Thanks. -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264391 - in head/sys/boot: amd64 amd64/boot1.efi common
Author: nwhitehorn
Date: Sun Apr 13 01:14:25 2014
New Revision: 264391
URL: http://svnweb.freebsd.org/changeset/base/264391
Log:
Add a simple EFI stub loader. This is a quick and dirty of boot1.chrp from
the PowerPC port with all the Open Firmware bits removed and replaced by
their EFI counterparts. On the whole, I think I prefer Open Firmware.
This code is supposed to be an immutable shim that sits on the EFI system
partition, loads /boot/loader.efi from UFS and tells the real loader what
disk/partition to look at. It finds the UFS root partition by the somewhat
braindead approach of picking the first UFS partition it can find. Better
approaches are called for, but this works for now. This shim loader will
also be useful for secure boot in the future, which will require some
rearchitecture.
Added:
head/sys/boot/amd64/boot1.efi/
head/sys/boot/amd64/boot1.efi/Makefile (contents, props changed)
head/sys/boot/amd64/boot1.efi/boot1.c (contents, props changed)
Modified:
head/sys/boot/amd64/Makefile
head/sys/boot/common/ufsread.c
Modified: head/sys/boot/amd64/Makefile
==
--- head/sys/boot/amd64/MakefileSat Apr 12 23:48:02 2014
(r264390)
+++ head/sys/boot/amd64/MakefileSun Apr 13 01:14:25 2014
(r264391)
@@ -2,6 +2,6 @@
.include
-SUBDIR=efi
+SUBDIR=efi boot1.efi
.include
Added: head/sys/boot/amd64/boot1.efi/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/amd64/boot1.efi/Makefile Sun Apr 13 01:14:25 2014
(r264391)
@@ -0,0 +1,70 @@
+# $FreeBSD$
+
+NO_MAN=
+
+.include
+
+# In-tree GCC does not support __attribute__((ms_abi)).
+.if ${COMPILER_TYPE} != "gcc"
+
+MK_SSP=no
+
+PROG= loader.sym
+INTERNALPROG=
+
+# architecture-specific loader code
+SRCS= boot1.c reloc.c start.S
+
+CFLAGS+= -fPIC
+CFLAGS+= -I.
+CFLAGS+= -I${.CURDIR}/../../efi/include
+CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH}
+CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include
+CFLAGS+= -I${.CURDIR}/../../..
+
+# Always add MI sources
+.PATH: ${.CURDIR}/../../common ../efi
+CFLAGS+= -I${.CURDIR}/../../common
+
+FILES= boot1.efi
+FILESMODE_boot1.efi= ${BINMODE}
+
+LDSCRIPT= ${.CURDIR}/../efi/ldscript.${MACHINE_CPUARCH}
+LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared -Wl,-znocombreloc
+
+${PROG}: ${LDSCRIPT}
+
+OBJCOPY?= objcopy
+OBJDUMP?= objdump
+
+.if ${MACHINE_CPUARCH} == "amd64"
+EFI_TARGET=efi-app-x86_64
+.else
+EFI_TARGET=efi-app-ia32
+.endif
+
+boot1.efi: loader.sym
+ if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
+ ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
+ exit 1; \
+ fi
+ ${OBJCOPY} -j .text -j .sdata -j .data \
+ -j .dynamic -j .dynsym -j .rel.dyn \
+ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
+ --target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
+
+CFLAGS+= -I${.CURDIR}/../../common
+
+.endif # ${COMPILER_TYPE} != "gcc"
+
+.include
+
+beforedepend ${OBJS}: machine x86
+
+CLEANFILES+= machine x86
+
+machine:
+ ln -sf ${.CURDIR}/../../../amd64/include machine
+
+x86:
+ ln -sf ${.CURDIR}/../../../x86/include x86
Added: head/sys/boot/amd64/boot1.efi/boot1.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/amd64/boot1.efi/boot1.c Sun Apr 13 01:14:25 2014
(r264391)
@@ -0,0 +1,447 @@
+/*-
+ * Copyright (c) 1998 Robert Nordier
+ * All rights reserved.
+ * Copyright (c) 2001 Robert Drehmel
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+
+#include
+
+#define _PATH_LOADER "/boot/loader.efi"
+#define _PATH_KERNEL "/boot/kernel/kernel"
+
+#define BSIZEMAX 16384
+
+typedef int putc_func_t(char c, void *arg);
+
+struct sp_data {
+ char*sp_buf;
+ u_int sp_len;
+ u_int sp_size;
+};
+
+static const char digits[] = "0123456789abcdef";
+
+static void panic(const char *fmt, ...) __dead2;
+static int printf(const char *fmt, ...);
+static int putchar(char c, void *arg);
+static int vprintf(const char *fmt,
svn commit: r264392 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: davide
Date: Sun Apr 13 01:15:37 2014
New Revision: 264392
URL: http://svnweb.freebsd.org/changeset/base/264392
Log:
Fix a panic in zfs_rename().
this is due to a wrong dereference of a vnode when it's not locked and
can be (potentially) recycled. 'sdvp' cannot be locked on zfs_rename()
entry point because the VFS can't be sure that this scenario is
LOR-free (it might violate the parent->child lock acquisition rule).
Dereference 'tdvp' instead, which is already locked on entry, and access
'sdvp' fields only when it's safe, i.e. under ZFS_ENTER scope.
While at it, remove the usage of VOP_REALVP, as long as this is a NOP
on FreeBSD.
Discussed with: avg
Reviewed by: pjd
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Apr
13 01:14:25 2014(r264391)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Apr
13 01:15:37 2014(r264392)
@@ -3723,9 +3723,8 @@ static int
zfs_rename(vnode_t *sdvp, char *snm, vnode_t *tdvp, char *tnm, cred_t *cr,
caller_context_t *ct, int flags)
{
- znode_t *tdzp, *szp, *tzp;
- znode_t *sdzp = VTOZ(sdvp);
- zfsvfs_t*zfsvfs = sdzp->z_zfsvfs;
+ znode_t *tdzp, *sdzp, *szp, *tzp;
+ zfsvfs_t*zfsvfs;
zilog_t *zilog;
vnode_t *realvp;
zfs_dirlock_t *sdl, *tdl;
@@ -3736,24 +3735,27 @@ zfs_rename(vnode_t *sdvp, char *snm, vno
int zflg = 0;
boolean_t waited = B_FALSE;
+ tdzp = VTOZ(tdvp);
+ ZFS_VERIFY_ZP(tdzp);
+ zfsvfs = tdzp->z_zfsvfs;
ZFS_ENTER(zfsvfs);
- ZFS_VERIFY_ZP(sdzp);
zilog = zfsvfs->z_log;
+ sdzp = VTOZ(sdvp);
/*
-* Make sure we have the real vp for the target directory.
+* In case sdzp is not valid, let's be sure to exit from the right
+* zfsvfs_t.
*/
- if (VOP_REALVP(tdvp, &realvp, ct) == 0)
- tdvp = realvp;
-
- tdzp = VTOZ(tdvp);
- ZFS_VERIFY_ZP(tdzp);
+ if (sdzp->z_sa_hdl == NULL) {
+ ZFS_EXIT(zfsvfs);
+ return (SET_ERROR(EIO));
+ }
/*
* We check z_zfsvfs rather than v_vfsp here, because snapshots and the
* ctldir appear to have the same v_vfsp.
*/
- if (tdzp->z_zfsvfs != zfsvfs || zfsctl_is_node(tdvp)) {
+ if (sdzp->z_zfsvfs != zfsvfs || zfsctl_is_node(tdvp)) {
ZFS_EXIT(zfsvfs);
return (SET_ERROR(EXDEV));
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264392 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Interesting, I'd be curious to know what the panic for this looks like? - Original Message - From: "Davide Italiano" Author: davide Date: Sun Apr 13 01:15:37 2014 New Revision: 264392 URL: http://svnweb.freebsd.org/changeset/base/264392 Log: Fix a panic in zfs_rename(). this is due to a wrong dereference of a vnode when it's not locked and can be (potentially) recycled. 'sdvp' cannot be locked on zfs_rename() entry point because the VFS can't be sure that this scenario is LOR-free (it might violate the parent->child lock acquisition rule). Dereference 'tdvp' instead, which is already locked on entry, and access 'sdvp' fields only when it's safe, i.e. under ZFS_ENTER scope. While at it, remove the usage of VOP_REALVP, as long as this is a NOP on FreeBSD. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264393 - head/bin/ls
Author: gjb Date: Sun Apr 13 01:47:15 2014 New Revision: 264393 URL: http://svnweb.freebsd.org/changeset/base/264393 Log: Bump Dd, missed as part of r264098 and related commits. Sponsored by: The FreeBSD Foundation Modified: head/bin/ls/ls.1 Modified: head/bin/ls/ls.1 == --- head/bin/ls/ls.1Sun Apr 13 01:15:37 2014(r264392) +++ head/bin/ls/ls.1Sun Apr 13 01:47:15 2014(r264393) @@ -32,7 +32,7 @@ .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" $FreeBSD$ .\" -.Dd March 15, 2013 +.Dd April 4, 2014 .Dt LS 1 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264392 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
On Sat, Apr 12, 2014 at 6:43 PM, Steven Hartland wrote: > Interesting, I'd be curious to know what the panic for this looks like? > It's more like a 'trap 12: page fault while in kernel mode'. Post-mortem analysis with kgdb shows the vnode fields filled with garbage (e.g. 0xdeadc0de), if you're lucky and can get a dump. -- Davide "There are no solved problems; there are only problems that are more or less solved" -- Henri Poincare ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264394 - head/share/man/man4
Author: gjb Date: Sun Apr 13 02:03:14 2014 New Revision: 264394 URL: http://svnweb.freebsd.org/changeset/base/264394 Log: Clean trailing whitespace. Add missing .El to fix formatting. Found with: mandoc(1) Sponsored by: The FreeBSD Foundation Modified: head/share/man/man4/uftdi.4 Modified: head/share/man/man4/uftdi.4 == --- head/share/man/man4/uftdi.4 Sun Apr 13 01:47:15 2014(r264393) +++ head/share/man/man4/uftdi.4 Sun Apr 13 02:03:14 2014(r264394) @@ -136,7 +136,7 @@ the desired mode, then you .Xr read 2 and .Xr write 2 -data which either reflects pin state or is interpreted +data which either reflects pin state or is interpreted as MPSSE commands and parameters, depending on the mode. .It Dv UFTDIIOC_GET_BITMODE Pq Vt "struct uftdi_bitmode" Return the state of the bitbang pins at the time of the call in the @@ -149,7 +149,7 @@ member is unused. Set the character which is inserted into the buffer to mark the point of an error such as FIFO overflow. .It Dv UFTDIIOC_SET_EVENT_CHAR Pq Vt int -Set the character which causes a partial FIFO full of data +Set the character which causes a partial FIFO full of data to be returned immediately even if the FIFO is not full. .It Dv UFTDIIOC_SET_LATENCY Pq Vt int Set the amount of time to wait for a full FIFO, @@ -164,6 +164,7 @@ This is the .Va bcdDevice value from the .Va usb_device_descriptor . +.El .Sh HARDWARE The .Nm ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264399 - head/share/mk
Author: imp
Date: Sun Apr 13 05:21:48 2014
New Revision: 264399
URL: http://svnweb.freebsd.org/changeset/base/264399
Log:
Don't apply ctf conversions in POSIX mode. These can't happen there
because they pollute the POSIX environment, which doens't allow
for these extentions. ctf conversions are really only relevant when
used in coordination with the rest of the bsd*.mk system anyway.
Leave them in place for the normal, non-posix enviornment since
they are quite useful there.
Modified:
head/share/mk/sys.mk
Modified: head/share/mk/sys.mk
==
--- head/share/mk/sys.mkSun Apr 13 05:21:43 2014(r264398)
+++ head/share/mk/sys.mkSun Apr 13 05:21:48 2014(r264399)
@@ -171,11 +171,9 @@ YFLAGS ?= -d
# SINGLE SUFFIX RULES
.c:
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC}
- ${CTFCONVERT_CMD}
.f:
${FC} ${FFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC}
- ${CTFCONVERT_CMD}
.sh:
cp -f ${.IMPSRC} ${.TARGET}
@@ -185,25 +183,21 @@ YFLAGS?= -d
.c.o:
${CC} ${CFLAGS} -c ${.IMPSRC}
- ${CTFCONVERT_CMD}
.f.o:
${FC} ${FFLAGS} -c ${.IMPSRC}
- ${CTFCONVERT_CMD}
.y.o:
${YACC} ${YFLAGS} ${.IMPSRC}
${CC} ${CFLAGS} -c y.tab.c
rm -f y.tab.c
mv y.tab.o ${.TARGET}
- ${CTFCONVERT_CMD}
.l.o:
${LEX} ${LFLAGS} ${.IMPSRC}
${CC} ${CFLAGS} -c lex.yy.c
rm -f lex.yy.c
mv lex.yy.o ${.TARGET}
- ${CTFCONVERT_CMD}
.y.c:
${YACC} ${YFLAGS} ${.IMPSRC}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264396 - in head: . tools/build
Author: imp
Date: Sun Apr 13 05:21:30 2014
New Revision: 264396
URL: http://svnweb.freebsd.org/changeset/base/264396
Log:
Up the minimum system to build FreeBSD current to 8.0-RELEASE. The
issues with vendors that needed 7.x support have been resolved. Many
vendors are still using 8.x build platforms, however, so bumping this
up to 9.0 will have to wait until that is resolved. Actual support for
building from 8.x still relies on those vendors fixing bugs that are
present as most developers have moved onto 9.x or newer platforms.
Reviewed by: marcel@
Modified:
head/Makefile.inc1
head/tools/build/Makefile
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Apr 13 05:21:22 2014(r264395)
+++ head/Makefile.inc1 Sun Apr 13 05:21:30 2014(r264396)
@@ -1159,8 +1159,8 @@ update:
# legacy: Build compatibility shims for the next three targets
#
legacy:
-.if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0
- @echo "ERROR: Source upgrades from versions prior to 7.0 not
supported."; \
+.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
+ @echo "ERROR: Source upgrades from versions prior to 8.0 not
supported."; \
false
.endif
.for _tool in tools/build
@@ -1188,14 +1188,6 @@ _gperf= gnu/usr.bin/gperf
_groff=gnu/usr.bin/groff
.endif
-.if ${BOOTSTRAPPING} < 800022
-_ar= usr.bin/ar
-.endif
-
-.if ${BOOTSTRAPPING} < 800013
-_mklocale= usr.bin/mklocale
-.endif
-
.if ${BOOTSTRAPPING} < 92
_sed= usr.bin/sed
.endif
@@ -1279,13 +1271,11 @@ bootstrap-tools: .MAKE
${_strfile} \
${_gperf} \
${_groff} \
-${_ar} \
${_dtc} \
${_awk} \
${_cat} \
usr.bin/lorder \
usr.bin/makewhatis \
-${_mklocale} \
usr.bin/rpcgen \
${_sed} \
${_yacc} \
@@ -1362,7 +1352,7 @@ kernel-tools: .MAKE
.if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
TARGET_ARCH= ${XDEV_ARCH}
.endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld=usr.sbin/btxld
.endif
Modified: head/tools/build/Makefile
==
--- head/tools/build/Makefile Sun Apr 13 05:21:22 2014(r264395)
+++ head/tools/build/Makefile Sun Apr 13 05:21:30 2014(r264396)
@@ -9,18 +9,6 @@ INCS=
BOOTSTRAPPING?=0
-_WITH_GETLINE!=grep -c _WITH_GETLINE /usr/include/stdio.h || true
-.if ${_WITH_GETLINE} == 0
-.PATH: ${.CURDIR}/../../contrib/file ${.CURDIR}/../../lib/libmagic
-SRCS= getline.c config.h
-CFLAGS+= -DHAVE_CONFIG_H -I.
-CLEANFILES+= config.h
-
-${SRCS:N*.h:R:S/$/.o/}: config.h
-config.h: ${.CURDIR}/../../lib/libmagic/config.h
- grep -v HAVE_GETLINE ${.ALLSRC} > ${.TARGET}
-.endif
-
_WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/pwd.h || true
.if ${_WITH_PWCACHEDB} == 0
.PATH: ${.CURDIR}/../../contrib/libc-pwcache
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264395 - head
Author: imp
Date: Sun Apr 13 05:21:22 2014
New Revision: 264395
URL: http://svnweb.freebsd.org/changeset/base/264395
Log:
Determine whether to build clang and its bootstrap tools the same
way. This allows a clang bootstrap to happen, even when WITHOUT_CLANG
is defined. This is a minimal version of a more extensive change which
can be MFC'd more easily. However, we have to also test to see if
we're building clang as not cc, since the bootstrap for that needs
these cross tools and it is easier to build them in just one place.
MFC after: 1 week
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Apr 13 02:03:14 2014(r264394)
+++ head/Makefile.inc1 Sun Apr 13 05:21:22 2014(r264395)
@@ -1234,7 +1234,7 @@ _awk= usr.bin/awk
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
-.if ${MK_CLANG} != "no"
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" || ${MK_CLANG} !=
"no"
_clang_tblgen= \
lib/clang/libllvmsupport \
lib/clang/libllvmtablegen \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264398 - head/tools/build
Author: imp
Date: Sun Apr 13 05:21:43 2014
New Revision: 264398
URL: http://svnweb.freebsd.org/changeset/base/264398
Log:
Check the right file for pwcache_groupdb.
Modified:
head/tools/build/Makefile
Modified: head/tools/build/Makefile
==
--- head/tools/build/Makefile Sun Apr 13 05:21:35 2014(r264397)
+++ head/tools/build/Makefile Sun Apr 13 05:21:43 2014(r264398)
@@ -9,7 +9,7 @@ INCS=
BOOTSTRAPPING?=0
-_WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/pwd.h || true
+_WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/grp.h || true
.if ${_WITH_PWCACHEDB} == 0
.PATH: ${.CURDIR}/../../contrib/libc-pwcache
CFLAGS+= -I${.CURDIR}/../../contrib/libc-pwcache \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264397 - head
Author: imp
Date: Sun Apr 13 05:21:35 2014
New Revision: 264397
URL: http://svnweb.freebsd.org/changeset/base/264397
Log:
We no longer support upgrading from FreeBSD 4, so we don't need the
NOMAN and NOSHARED defines here. They have been obsolete for almost a
decade anyway.
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Sun Apr 13 05:21:30 2014(r264396)
+++ head/Makefile Sun Apr 13 05:21:35 2014(r264397)
@@ -325,8 +325,7 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
MMAKE= ${MMAKEENV} ${MAKE} \
- -D_UPGRADING \
- -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
+ -D_UPGRADING -DNO_MAN -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T}
make bmake: .PHONY
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264402 - in head/share: examples/etc man/man5 mk
Author: imp
Date: Sun Apr 13 05:22:26 2014
New Revision: 264402
URL: http://svnweb.freebsd.org/changeset/base/264402
Log:
Convert NO_MANCOMPRESS to normal convention.
Modified:
head/share/examples/etc/make.conf
head/share/man/man5/make.conf.5
head/share/mk/bsd.man.mk
head/share/mk/bsd.own.mk
Modified: head/share/examples/etc/make.conf
==
--- head/share/examples/etc/make.conf Sun Apr 13 05:22:22 2014
(r264401)
+++ head/share/examples/etc/make.conf Sun Apr 13 05:22:26 2014
(r264402)
@@ -138,7 +138,7 @@
# If you do not want unformatted manual pages to be compressed
# when they are installed:
#
-#NO_MANCOMPRESS=
+#WITHOUT_MANCOMPRESS=t
#
#
# Default format for system documentation, depends on your printer.
Modified: head/share/man/man5/make.conf.5
==
--- head/share/man/man5/make.conf.5 Sun Apr 13 05:22:22 2014
(r264401)
+++ head/share/man/man5/make.conf.5 Sun Apr 13 05:22:26 2014
(r264402)
@@ -434,8 +434,11 @@ Set this to run
.Dq Li "${MAKE} clean"
instead of
.Dq Li "${MAKE} cleandir" .
-.It Va NO_MANCOMPRESS
-.Pq Vt bool
+.It Va WITH_MANCOMPRESS
+.Pq Vt defined
+Set to install manual pages compressed.
+.It Va WITHOUT_MANCOMPRESS
+.Pq Vt defined
Set to install manual pages uncompressed.
.It Va NO_SHARE
.Pq Vt bool
Modified: head/share/mk/bsd.man.mk
==
--- head/share/mk/bsd.man.mkSun Apr 13 05:22:22 2014(r264401)
+++ head/share/mk/bsd.man.mkSun Apr 13 05:22:26 2014(r264402)
@@ -30,9 +30,6 @@
# second, and there may be multiple pairs. The files
# are hard-linked.
#
-# NO_MANCOMPRESS If you do not want unformatted manual pages to be
-# compressed when they are installed. [not set]
-#
# NO_MLINKSIf you do not want install manual page links. [not set]
#
# MANFILTERcommand to pipe the raw man page through before compressing
@@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}}
_manpages:
all-man: _manpages
-.if defined(NO_MANCOMPRESS)
+.if ${MK_MANCOMPRESS} != "no"
# Make special arrangements to filter to a temporary file at build time
-# for NO_MANCOMPRESS.
+# for MK_MANCOMPRESS == no.
.if defined(MANFILTER)
FILTEXTENSION= .filt
.else
@@ -162,7 +159,7 @@ maninstall: _maninstall
_maninstall:
.if defined(MAN) && !empty(MAN)
_maninstall: ${MAN}
-.if defined(NO_MANCOMPRESS)
+.if ${MK_MANCOMPRESS} == "no"
.if defined(MANFILTER)
.for __page in ${MAN}
${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkSun Apr 13 05:22:22 2014(r264401)
+++ head/share/mk/bsd.own.mkSun Apr 13 05:22:26 2014(r264402)
@@ -301,6 +301,7 @@ __DEFAULT_YES_OPTIONS = \
MAILWRAPPER \
MAKE \
MAN \
+MANCOMPRESS \
NCURSESW \
NDIS \
NETCAT \
@@ -458,11 +459,14 @@ MK_${var}:= no
# Supported NO_* options (if defined, MK_* will be forced to "no",
# regardless of user's setting).
#
+# These are transitional and will disappaer in the fullness of time.
+#
.for var in \
CTF \
DEBUG_FILES \
INSTALLLIB \
MAN \
+MANCOMPRESS \
PROFILE
.if defined(NO_${var})
MK_${var}:=no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264400 - in head: cddl/usr.bin/sgsmsg cddl/usr.bin/zinject cddl/usr.bin/zlook cddl/usr.bin/ztest cddl/usr.sbin/zhack contrib/libucl contrib/libucl/doc contrib/libucl/tests contrib/libu...
Author: imp Date: Sun Apr 13 05:21:56 2014 New Revision: 264400 URL: http://svnweb.freebsd.org/changeset/base/264400 Log: NO_MAN= has been deprecated in favor of MAN= for some time, go ahead and finish the job. ncurses is now the only Makefile in the tree that uses it since it wasn't a simple mechanical change, and will be addressed in a future commit. Modified: head/cddl/usr.bin/sgsmsg/Makefile head/cddl/usr.bin/zinject/Makefile head/cddl/usr.bin/zlook/Makefile head/cddl/usr.bin/ztest/Makefile head/cddl/usr.sbin/zhack/Makefile head/contrib/libucl/Makefile.am head/contrib/libucl/doc/Makefile.am head/contrib/libucl/tests/Makefile.am head/contrib/libucl/utils/Makefile.am head/contrib/ofed/usr.bin/ibsendtrap/Makefile head/contrib/ofed/usr.lib/libsdp/Makefile head/crypto/heimdal/appl/Makefile.am head/crypto/heimdal/appl/ftp/Makefile.am head/crypto/heimdal/appl/ftp/common/Makefile.am head/crypto/heimdal/lib/Makefile.am head/crypto/heimdal/lib/ipc/Makefile.am head/games/fortune/unstr/Makefile head/games/ppt/Makefile head/games/primes/Makefile head/gnu/usr.bin/cc/c++/Makefile head/gnu/usr.bin/cc/c++filt/Makefile head/gnu/usr.bin/cc/cc1/Makefile head/gnu/usr.bin/cc/cc1plus/Makefile head/gnu/usr.bin/cc/collect2/Makefile head/gnu/usr.bin/cc/protoize/Makefile head/gnu/usr.bin/gdb/Makefile.inc head/gnu/usr.bin/gdb/gdbtui/Makefile head/gnu/usr.bin/groff/src/devices/grohtml/Makefile head/gnu/usr.bin/groff/src/preproc/html/Makefile head/kerberos5/libexec/digest-service/Makefile head/kerberos5/libexec/ipropd-slave/Makefile head/kerberos5/tools/asn1_compile/Makefile head/kerberos5/tools/make-roken/Makefile head/kerberos5/tools/slc/Makefile head/kerberos5/usr.bin/hxtool/Makefile head/kerberos5/usr.bin/ksu/Makefile head/lib/libarchive/test/Makefile head/lib/libauditd/Makefile head/lib/libproc/Makefile head/lib/libproc/test/t1-bkpt/Makefile head/lib/libproc/test/t2-name2map/Makefile head/lib/libproc/test/t3-name2sym/Makefile head/lib/ncurses/form/Makefile head/lib/ncurses/menu/Makefile head/lib/ncurses/ncurses/Makefile head/lib/ncurses/panel/Makefile head/libexec/bootpd/bootpgw/Makefile head/libexec/casper/dns/Makefile head/libexec/casper/grp/Makefile head/libexec/casper/pwd/Makefile head/libexec/casper/random/Makefile head/libexec/casper/sysctl/Makefile head/libexec/dma-mbox-create/Makefile head/libexec/ulog-helper/Makefile head/release/picobsd/tinyware/aps/Makefile head/release/picobsd/tinyware/help/Makefile head/release/picobsd/tinyware/msg/Makefile head/release/picobsd/tinyware/ns/Makefile head/release/picobsd/tinyware/oinit/Makefile head/release/picobsd/tinyware/simple_httpd/Makefile head/release/picobsd/tinyware/sps/Makefile head/release/picobsd/tinyware/view/Makefile head/release/picobsd/tinyware/vm/Makefile head/rescue/rescue/Makefile head/sbin/geom/Makefile head/sbin/rtsol/Makefile head/secure/lib/libcrypto/engines/lib4758cca/Makefile head/share/examples/FreeBSD_version/Makefile head/share/examples/autofs/driver/Makefile head/share/examples/find_interface/Makefile head/share/examples/kld/cdev/test/Makefile head/share/examples/kld/syscall/test/Makefile head/share/examples/libvgl/Makefile head/share/examples/perfmon/Makefile head/share/examples/ppi/Makefile head/share/mk/bsd.README head/sys/boot/amd64/efi/Makefile head/sys/boot/arm/at91/boot0/Makefile head/sys/boot/arm/at91/boot0iic/Makefile head/sys/boot/arm/at91/boot0spi/Makefile head/sys/boot/arm/at91/boot2/Makefile head/sys/boot/arm/at91/bootiic/Makefile head/sys/boot/arm/at91/bootspi/Makefile head/sys/boot/arm/at91/libat91/Makefile head/sys/boot/arm/ixp425/boot2/Makefile head/sys/boot/i386/boot0/Makefile head/sys/boot/i386/btx/btx/Makefile head/sys/boot/i386/btx/btxldr/Makefile head/sys/boot/i386/btx/lib/Makefile head/sys/boot/i386/cdboot/Makefile head/sys/boot/i386/kgzldr/Makefile head/sys/boot/i386/mbr/Makefile head/sys/boot/i386/pmbr/Makefile head/sys/boot/i386/zfsloader/Makefile head/sys/boot/ia64/efi/Makefile head/sys/boot/ia64/ski/Makefile head/sys/boot/libstand32/Makefile head/sys/boot/mips/beri/boot2/Makefile head/sys/boot/pc98/boot0.5/Makefile head/sys/boot/pc98/boot0/Makefile head/sys/boot/pc98/btx/btx/Makefile head/sys/boot/pc98/btx/btxldr/Makefile head/sys/boot/pc98/btx/lib/Makefile head/sys/boot/pc98/cdboot/Makefile head/sys/boot/pc98/kgzldr/Makefile head/sys/boot/powerpc/boot1.chrp/Makefile head/sys/boot/powerpc/uboot/Makefile head/sys/boot/sparc64/boot1/Makefile head/sys/boot/userboot/libstand/Makefile head/sys/boot/userboot/test/Makefile head/sys/boot/userboot/userboot/Makefile head/sys/crypto/rijndael/Makefile head/sys/dev/aic7xxx/aicasm/Makefile head/sys/dev/patm/genrtab/Makefile head/tools/KSE/ksetest/Makefile head/tools/KSE/rr/Makefile head/tools/bsdbox/Makefile head/tools/diag/dumpvfscache/Makefile h
svn commit: r264401 - head/sbin/mount_fusefs
Author: imp
Date: Sun Apr 13 05:22:22 2014
New Revision: 264401
URL: http://svnweb.freebsd.org/changeset/base/264401
Log:
In tree makefile shouldn't be setting policy piecemeal. Don't set
NO_MANCOMPRESS here.
Modified:
head/sbin/mount_fusefs/Makefile
Modified: head/sbin/mount_fusefs/Makefile
==
--- head/sbin/mount_fusefs/Makefile Sun Apr 13 05:21:56 2014
(r264400)
+++ head/sbin/mount_fusefs/Makefile Sun Apr 13 05:22:22 2014
(r264401)
@@ -23,7 +23,6 @@ DEBUG_FLAGS+= -DFUSE4BSD_VERSION="\"${F4
PROG= mount_fusefs
SRCS= mount_fusefs.c getmntopts.c
MAN8= mount_fusefs.8
-NO_MANCOMPRESS?= yes
MOUNT= ${.CURDIR}/../mount
CFLAGS+= -I${MOUNT}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264403 - head/sys/boot/amd64/boot1.efi
Author: nwhitehorn
Date: Sun Apr 13 06:24:01 2014
New Revision: 264403
URL: http://svnweb.freebsd.org/changeset/base/264403
Log:
Fix buildworld. I had some local bits in my build tree that caused this
to work by accident.
Modified:
head/sys/boot/amd64/boot1.efi/Makefile
Modified: head/sys/boot/amd64/boot1.efi/Makefile
==
--- head/sys/boot/amd64/boot1.efi/Makefile Sun Apr 13 05:22:26 2014
(r264402)
+++ head/sys/boot/amd64/boot1.efi/Makefile Sun Apr 13 06:24:01 2014
(r264403)
@@ -22,8 +22,8 @@ CFLAGS+= -I${.CURDIR}/../../efi/include/
CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include
CFLAGS+= -I${.CURDIR}/../../..
-# Always add MI sources
-.PATH: ${.CURDIR}/../../common ../efi
+# Always add MI sources and REGULAR efi loader bits
+.PATH: ${.CURDIR}/../efi ${.CURDIR}/../../common
CFLAGS+= -I${.CURDIR}/../../common
FILES= boot1.efi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264404 - head/sys/boot/amd64/boot1.efi
Author: nwhitehorn Date: Sun Apr 13 06:30:02 2014 New Revision: 264404 URL: http://svnweb.freebsd.org/changeset/base/264404 Log: Add my copyright here. Most of this is unmodified from the original sparc64 version, but at least some indication of changes that postdate the actual invention of EFI is probably a good idea. Modified: head/sys/boot/amd64/boot1.efi/boot1.c Modified: head/sys/boot/amd64/boot1.efi/boot1.c == --- head/sys/boot/amd64/boot1.efi/boot1.c Sun Apr 13 06:24:01 2014 (r264403) +++ head/sys/boot/amd64/boot1.efi/boot1.c Sun Apr 13 06:30:02 2014 (r264404) @@ -3,6 +3,8 @@ * All rights reserved. * Copyright (c) 2001 Robert Drehmel * All rights reserved. + * Copyright (c) 2014 Nathan Whitehorn + * All rights reserved. * * Redistribution and use in source and binary forms are freely * permitted provided that the above copyright notice and this ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
