CVS commit: src/sys/arch/evbarm/bcm53xx
Module Name:src
Committed By: matt
Date: Sun Jun 30 22:02:29 UTC 2013
Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_start.S
Log Message:
Add MD_CPU_HATCH
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.5 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.6
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.5 Mon Jun 17 20:30:49 2013
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S Sun Jun 30 22:02:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_start.S,v 1.5 2013/06/17 20:30:49 matt Exp $ */
+/* $NetBSD: bcm53xx_start.S,v 1.6 2013/06/30 22:02:29 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -45,7 +45,7 @@
#define CONADDR 0x18000300
#endif
-RCSID("$NetBSD: bcm53xx_start.S,v 1.5 2013/06/17 20:30:49 matt Exp $")
+RCSID("$NetBSD: bcm53xx_start.S,v 1.6 2013/06/30 22:02:29 matt Exp $")
#undef VERBOSE_INIT_ARM
#define VERBOSE_INIT_ARM
@@ -57,6 +57,8 @@ RCSID("$NetBSD: bcm53xx_start.S,v 1.5 20
#define XPUTC(n)
#endif
+#define MD_CPU_HATCH bcm53xx_cpu_hatch
+
/*
* Kernel start routine for BCM5301X boards.
* At this point, this code has been loaded into SDRAM
CVS commit: src/sys/arch/evbarm/bcm53xx
Module Name:src
Committed By: matt
Date: Sun Jun 30 22:02:56 UTC 2013
Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c
Log Message:
Print out PMUSERSR
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.6 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.6 Tue Oct 23 23:16:05 2012
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Sun Jun 30 22:02:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.6 2012/10/23 23:16:05 matt Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.7 2013/06/30 22:02:56 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define IDM_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.6 2012/10/23 23:16:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.7 2013/06/30 22:02:56 matt Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_broadcom.h"
@@ -238,8 +238,8 @@ initarm(void *arg)
arm_cpu_max + 1, arm_cpu_max + 1 ? "s" : "",
arm_cpu_hatched);
#endif
- printf(", CLIDR=%010o CTR=%#x",
- armreg_clidr_read(), armreg_ctr_read());
+ printf(", CLIDR=%010o CTR=%#x PMUSERSR=%#x",
+ armreg_clidr_read(), armreg_ctr_read(), armreg_pmuserenr_read());
printf("\n");
#endif
CVS commit: src/sys/arch/shark
Module Name:src Committed By: matt Date: Sun Jun 30 21:56:44 UTC 2013 Modified Files: src/sys/arch/shark: Makefile Log Message: Move stand to its own line. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/shark/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/shark/Makefile diff -u src/sys/arch/shark/Makefile:1.3 src/sys/arch/shark/Makefile:1.4 --- src/sys/arch/shark/Makefile:1.3 Sat Oct 25 22:27:38 2008 +++ src/sys/arch/shark/Makefile Sun Jun 30 21:56:44 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $ +# $NetBSD: Makefile,v 1.4 2013/06/30 21:56:44 matt Exp $ # Makefile for shark tags file and boot blocks @@ -25,6 +25,7 @@ links: cd $$i && rm -f tags; ln -s ../tags tags; done -SUBDIR= compile include # stand +SUBDIR= compile include +#SUBDIR+= stand .include
CVS commit: src/sys/arch/shark/stand/ofwboot
Module Name:src
Committed By: matt
Date: Sun Jun 30 21:54:26 UTC 2013
Modified Files:
src/sys/arch/shark/stand/ofwboot: Makefile
Log Message:
Add -fno-unwind-tables
Add CPUFLAGS=-mcpu-strongarm
Add ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/shark/stand/ofwboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/shark/stand/ofwboot/Makefile
diff -u src/sys/arch/shark/stand/ofwboot/Makefile:1.12 src/sys/arch/shark/stand/ofwboot/Makefile:1.13
--- src/sys/arch/shark/stand/ofwboot/Makefile:1.12 Sat Jan 22 19:19:23 2011
+++ src/sys/arch/shark/stand/ofwboot/Makefile Sun Jun 30 21:54:26 2013
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2011/01/22 19:19:23 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/30 21:54:26 matt Exp $
+
+NOMAN= # defined
.include
@@ -22,7 +24,6 @@ LIBC=
LIBCRTBEGIN=
LIBCRTEND=
-NOMAN= # defined
STRIPFLAG=
BINMODE= 444
@@ -36,6 +37,8 @@ CLEANFILES+= vers.c
CPPFLAGS+= -nostdinc -I. -I${.CURDIR}/../../.. -I${S}
CPPFLAGS+= -DRELOC=0x${RELOC}
+CFLAGS+= -fno-unwind-tables
+CPUFLAGS= -mcpu=strongarm
.if !make(obj) && !make(clean) && !make(cleandir)
.BEGIN:
@@ -70,6 +73,7 @@ vers.c: version
${.CURDIR}/version "shark" ${NEWVERSWHAT}
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -s -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${.TARGET}.aout \
${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${OBJCOPY} -O binary ${.TARGET}.aout ${.TARGET}
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Sun Jun 30 19:19:12 UTC 2013 Modified Files: src/lib/libc/gen: fts.3 Log Message: Strings are NUL-terminated, not NULL-terminated. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/lib/libc/gen/fts.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/fts.3 diff -u src/lib/libc/gen/fts.3:1.30 src/lib/libc/gen/fts.3:1.31 --- src/lib/libc/gen/fts.3:1.30 Wed Mar 30 16:29:26 2011 +++ src/lib/libc/gen/fts.3 Sun Jun 30 19:19:12 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: fts.3,v 1.30 2011/03/30 16:29:26 jruoho Exp $ +.\" $NetBSD: fts.3,v 1.31 2013/06/30 19:19:12 wiz Exp $ .\" .\" Copyright (c) 1989, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -332,7 +332,7 @@ Therefore, the and .Fa fts_accpath fields are guaranteed to be -.Dv NULL Ns -terminated +.Dv NUL Ns -terminated .Em only for the file most recently returned by .Fn fts_read . @@ -350,7 +350,7 @@ are attempted. The .Fa fts_name field is always -.Dv NULL Ns -terminated . +.Dv NUL Ns -terminated . .Sh FTS_OPEN The .Fn fts_open
CVS commit: src/sys/dist/pf/net
Module Name:src
Committed By: njoly
Date: Sun Jun 30 17:23:52 UTC 2013
Modified Files:
src/sys/dist/pf/net: pf_if.c
Log Message:
Fix pf module build. Adjust pfil_remove_hook 3rd arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dist/pf/net/pf_if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dist/pf/net/pf_if.c
diff -u src/sys/dist/pf/net/pf_if.c:1.22 src/sys/dist/pf/net/pf_if.c:1.23
--- src/sys/dist/pf/net/pf_if.c:1.22 Sun Jun 30 14:58:48 2013
+++ src/sys/dist/pf/net/pf_if.c Sun Jun 30 17:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_if.c,v 1.22 2013/06/30 14:58:48 rmind Exp $ */
+/* $NetBSD: pf_if.c,v 1.23 2013/06/30 17:23:52 njoly Exp $ */
/* $OpenBSD: pf_if.c,v 1.47 2007/07/13 09:17:48 markus Exp $ */
/*
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pf_if.c,v 1.22 2013/06/30 14:58:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_if.c,v 1.23 2013/06/30 17:23:52 njoly Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -145,8 +145,8 @@ pfi_destroy(void)
struct pfi_kif *p;
int i;
- pfil_remove_hook(pfil_ifaddr_wrapper, NULL, PFIL_IFADDR, &if_pfil);
- pfil_remove_hook(pfil_ifnet_wrapper, NULL, PFIL_IFNET, &if_pfil);
+ pfil_remove_hook(pfil_ifaddr_wrapper, NULL, PFIL_IFADDR, if_pfil);
+ pfil_remove_hook(pfil_ifnet_wrapper, NULL, PFIL_IFNET, if_pfil);
for (i = 0; i < if_indexlim; i++) {
struct ifnet *ifp = ifindex2ifnet[i];
CVS commit: src/sys/rump/net/lib/libnetinet
Module Name:src
Committed By: pooka
Date: Sun Jun 30 16:04:36 UTC 2013
Modified Files:
src/sys/rump/net/lib/libnetinet: component.c
Log Message:
Raise lo0 so that ipv6 config gets done for it.
Requested and tested by Justin Cormack.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libnetinet/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libnetinet/component.c
diff -u src/sys/rump/net/lib/libnetinet/component.c:1.5 src/sys/rump/net/lib/libnetinet/component.c:1.6
--- src/sys/rump/net/lib/libnetinet/component.c:1.5 Tue Jan 11 09:24:06 2011
+++ src/sys/rump/net/lib/libnetinet/component.c Sun Jun 30 16:04:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.5 2011/01/11 09:24:06 pooka Exp $ */
+/* $NetBSD: component.c,v 1.6 2013/06/30 16:04:36 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.5 2011/01/11 09:24:06 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.6 2013/06/30 16:04:36 pooka Exp $");
#include
#include
@@ -84,5 +84,6 @@ RUMP_COMPONENT(RUMP_COMPONENT_NET_IFCFG)
sin->sin_addr.s_addr = inet_addr("127.255.255.255");
in_control(so, SIOCAIFADDR, &ia, lo0ifp, curlwp);
+ if_up(lo0ifp);
soclose(so);
}
CVS commit: src/tests/fs/common
Module Name:src
Committed By: martin
Date: Sun Jun 30 15:42:43 UTC 2013
Modified Files:
src/tests/fs/common: fstest_udf.c
Log Message:
Initialize mount args version info.
Add comment about a bogusly used "newfs" where "newfs_udf" is meant.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/common/fstest_udf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/common/fstest_udf.c
diff -u src/tests/fs/common/fstest_udf.c:1.2 src/tests/fs/common/fstest_udf.c:1.3
--- src/tests/fs/common/fstest_udf.c:1.2 Sun Jun 30 15:05:49 2013
+++ src/tests/fs/common/fstest_udf.c Sun Jun 30 15:42:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fstest_udf.c,v 1.2 2013/06/30 15:05:49 martin Exp $ */
+/* $NetBSD: fstest_udf.c,v 1.3 2013/06/30 15:42:43 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -63,6 +63,10 @@ udf_fstest_newfs(const atf_tc_t *tc, voi
struct sigaction act, oact;
size /= 512;
+ /*
+ * XXX newfs should be newfs_udf here!
+ * But newfs_udf does not support plain file mode.
+ */
snprintf(cmd, 1024, "newfs -F -s %"PRId64" %s >/dev/null", size, image);
memset(&act, 0, sizeof(act));
act.sa_handler = SIG_DFL;
@@ -83,6 +87,7 @@ udf_fstest_newfs(const atf_tc_t *tc, voi
snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.udf", num);
snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
args->ta_uargs.fspec = args->ta_devpath;
+ args->ta_uargs.version = UDFMNT_VERSION;
res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
if (res != 0) {
CVS commit: src/tests/fs/common
Module Name:src
Committed By: martin
Date: Sun Jun 30 15:05:49 UTC 2013
Modified Files:
src/tests/fs/common: fstest_udf.c
Log Message:
Fix copy & pasto, notice by Nicolas Joly, one step closer to solving
PR kern/47974.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/common/fstest_udf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/common/fstest_udf.c
diff -u src/tests/fs/common/fstest_udf.c:1.1 src/tests/fs/common/fstest_udf.c:1.2
--- src/tests/fs/common/fstest_udf.c:1.1 Wed Jun 26 19:29:24 2013
+++ src/tests/fs/common/fstest_udf.c Sun Jun 30 15:05:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fstest_udf.c,v 1.1 2013/06/26 19:29:24 reinoud Exp $ */
+/* $NetBSD: fstest_udf.c,v 1.2 2013/06/30 15:05:49 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -47,7 +47,7 @@
#include "h_fsmacros.h"
struct udftestargs {
-struct ufs_args ta_uargs;
+struct udf_args ta_uargs;
char ta_devpath[MAXPATHLEN];
char ta_imgpath[MAXPATHLEN];
};
CVS commit: src/sys/dist/pf/net
Module Name:src
Committed By: rmind
Date: Sun Jun 30 14:58:49 UTC 2013
Modified Files:
src/sys/dist/pf/net: pf_if.c pf_ioctl.c
Log Message:
Update pf to pfil(9) changes. Missed in previous commit.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dist/pf/net/pf_if.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dist/pf/net/pf_ioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dist/pf/net/pf_if.c
diff -u src/sys/dist/pf/net/pf_if.c:1.21 src/sys/dist/pf/net/pf_if.c:1.22
--- src/sys/dist/pf/net/pf_if.c:1.21 Mon Apr 12 13:57:38 2010
+++ src/sys/dist/pf/net/pf_if.c Sun Jun 30 14:58:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_if.c,v 1.21 2010/04/12 13:57:38 ahoka Exp $ */
+/* $NetBSD: pf_if.c,v 1.22 2013/06/30 14:58:48 rmind Exp $ */
/* $OpenBSD: pf_if.c,v 1.47 2007/07/13 09:17:48 markus Exp $ */
/*
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pf_if.c,v 1.21 2010/04/12 13:57:38 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_if.c,v 1.22 2013/06/30 14:58:48 rmind Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -133,8 +133,8 @@ pfi_initialize(void)
}
}
- pfil_add_hook(pfil_ifnet_wrapper, NULL, PFIL_IFNET, &if_pfil);
- pfil_add_hook(pfil_ifaddr_wrapper, NULL, PFIL_IFADDR, &if_pfil);
+ pfil_add_hook(pfil_ifnet_wrapper, NULL, PFIL_IFNET, if_pfil);
+ pfil_add_hook(pfil_ifaddr_wrapper, NULL, PFIL_IFADDR, if_pfil);
#endif /* __NetBSD__ */
}
Index: src/sys/dist/pf/net/pf_ioctl.c
diff -u src/sys/dist/pf/net/pf_ioctl.c:1.46 src/sys/dist/pf/net/pf_ioctl.c:1.47
--- src/sys/dist/pf/net/pf_ioctl.c:1.46 Mon Nov 28 08:05:05 2011
+++ src/sys/dist/pf/net/pf_ioctl.c Sun Jun 30 14:58:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_ioctl.c,v 1.46 2011/11/28 08:05:05 tls Exp $ */
+/* $NetBSD: pf_ioctl.c,v 1.47 2013/06/30 14:58:48 rmind Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.182 2007/06/24 11:17:13 mcbride Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.46 2011/11/28 08:05:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.47 2013/06/30 14:58:48 rmind Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3327,16 +3327,16 @@ pfil6_wrapper(void *arg, struct mbuf **m
static int
pf_pfil_attach(void)
{
- struct pfil_head *ph_inet;
+ pfil_head_t *ph_inet;
#ifdef INET6
- struct pfil_head *ph_inet6;
+ pfil_head_t *ph_inet6;
#endif /* INET6 */
int error;
if (pf_pfil_attached)
return (EBUSY);
- ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
+ ph_inet = pfil_head_get(PFIL_TYPE_AF, (void *)AF_INET);
if (ph_inet)
error = pfil_add_hook((void *)pfil4_wrapper, NULL,
PFIL_IN|PFIL_OUT, ph_inet);
@@ -3346,7 +3346,7 @@ pf_pfil_attach(void)
return (error);
#ifdef INET6
- ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
+ ph_inet6 = pfil_head_get(PFIL_TYPE_AF, (void *)AF_INET6);
if (ph_inet6)
error = pfil_add_hook((void *)pfil6_wrapper, NULL,
PFIL_IN|PFIL_OUT, ph_inet6);
@@ -3371,20 +3371,20 @@ bad:
static int
pf_pfil_detach(void)
{
- struct pfil_head *ph_inet;
+ pfil_head_t *ph_inet;
#ifdef INET6
- struct pfil_head *ph_inet6;
+ pfil_head_t *ph_inet6;
#endif /* INET6 */
if (pf_pfil_attached == 0)
return (EBUSY);
- ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
+ ph_inet = pfil_head_get(PFIL_TYPE_AF, (void *)AF_INET);
if (ph_inet)
pfil_remove_hook((void *)pfil4_wrapper, NULL,
PFIL_IN|PFIL_OUT, ph_inet);
#ifdef INET6
- ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
+ ph_inet6 = pfil_head_get(PFIL_TYPE_AF, (void *)AF_INET6);
if (ph_inet6)
pfil_remove_hook((void *)pfil6_wrapper, NULL,
PFIL_IN|PFIL_OUT, ph_inet6);
CVS commit: src/common/lib/libc/hash/murmurhash
Module Name:src
Committed By: rmind
Date: Sun Jun 30 12:20:32 UTC 2013
Modified Files:
src/common/lib/libc/hash/murmurhash: murmurhash.c
Log Message:
RUMP fix: ifdef weak alias. Pointed out by martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/hash/murmurhash/murmurhash.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/hash/murmurhash/murmurhash.c
diff -u src/common/lib/libc/hash/murmurhash/murmurhash.c:1.4 src/common/lib/libc/hash/murmurhash/murmurhash.c:1.5
--- src/common/lib/libc/hash/murmurhash/murmurhash.c:1.4 Tue Jul 10 17:05:38 2012
+++ src/common/lib/libc/hash/murmurhash/murmurhash.c Sun Jun 30 12:20:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: murmurhash.c,v 1.4 2012/07/10 17:05:38 christos Exp $ */
+/* $NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $ */
/*
* MurmurHash2 -- from the original code:
@@ -14,12 +14,12 @@
#include
#if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: murmurhash.c,v 1.4 2012/07/10 17:05:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $");
#else
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: murmurhash.c,v 1.4 2012/07/10 17:05:38 christos Exp $");
+__RCSID("$NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -28,9 +28,11 @@ __RCSID("$NetBSD: murmurhash.c,v 1.4 201
#include
#include
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#ifdef __weak_alias
__weak_alias(murmurhash2,_murmurhash2)
#endif
+#endif
uint32_t
murmurhash2(const void *key, size_t len, uint32_t seed)
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Sun Jun 30 11:48:42 UTC 2013 Modified Files: src/lib/libc/sys: rename.2 Log Message: Fix second problem noted by Henning Petersen in PR 47975: renameat is in unistd.h. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/sys/rename.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/rename.2 diff -u src/lib/libc/sys/rename.2:1.28 src/lib/libc/sys/rename.2:1.29 --- src/lib/libc/sys/rename.2:1.28 Sun Jun 30 11:47:00 2013 +++ src/lib/libc/sys/rename.2 Sun Jun 30 11:48:42 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: rename.2,v 1.28 2013/06/30 11:47:00 wiz Exp $ +.\" $NetBSD: rename.2,v 1.29 2013/06/30 11:48:42 wiz Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)rename.2 8.1 (Berkeley) 6/4/93 .\" -.Dd November 18, 2012 +.Dd June 30, 2013 .Dt RENAME 2 .Os .Sh NAME @@ -42,6 +42,7 @@ .In stdio.h .Ft int .Fn rename "const char *from" "const char *to" +.In unistd.h .Ft int .Fn renameat "int fromfd" "const char *from" "int tofd" "const char *to" .Sh DESCRIPTION
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Sun Jun 30 11:47:00 UTC 2013 Modified Files: src/lib/libc/sys: rename.2 Log Message: Fix typo in SYNOPSIS. From Henning Petersen in PR 47975. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/sys/rename.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/rename.2 diff -u src/lib/libc/sys/rename.2:1.27 src/lib/libc/sys/rename.2:1.28 --- src/lib/libc/sys/rename.2:1.27 Sun Jan 13 08:15:02 2013 +++ src/lib/libc/sys/rename.2 Sun Jun 30 11:47:00 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: rename.2,v 1.27 2013/01/13 08:15:02 dholland Exp $ +.\" $NetBSD: rename.2,v 1.28 2013/06/30 11:47:00 wiz Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -43,7 +43,7 @@ .Ft int .Fn rename "const char *from" "const char *to" .Ft int -.Fn rename "int fromfd" "const char *from" "int tofd" "const char *to" +.Fn renameat "int fromfd" "const char *from" "int tofd" "const char *to" .Sh DESCRIPTION .Fn rename causes the link named
CVS commit: xsrc/external/mit/libXrandr/dist/src
Module Name:xsrc Committed By: wiz Date: Sun Jun 30 11:34:54 UTC 2013 Modified Files: xsrc/external/mit/libXrandr/dist/src: XrrProvider.c Log Message: Reduce diff to upstream. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXrandr/dist/src/XrrProvider.c diff -u xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.3 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.4 --- xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.3 Sat Jun 1 08:00:47 2013 +++ xsrc/external/mit/libXrandr/dist/src/XrrProvider.c Sun Jun 30 11:34:54 2013 @@ -77,7 +77,7 @@ XRRGetProviderResources(Display *dpy, Wi xrpr->nproviders = rep.nProviders; xrpr->providers = (RRProvider *)(xrpr + 1); -_XRead32(dpy, (RRProvider *)xrpr->providers, rep.nProviders << 2); +_XRead32(dpy, xrpr->providers, rep.nProviders << 2); if (nbytes > nbytesRead) _XEatData (dpy, (unsigned long) (nbytes - nbytesRead)); @@ -156,7 +156,7 @@ XRRGetProviderInfo(Display *dpy, XRRScre _XRead32(dpy, xpi->outputs, rep.nOutputs << 2); _XRead32(dpy, xpi->associated_providers, rep.nAssociatedProviders << 2); -_XRead32(dpy, (RRProvider *)xpi->associated_capability, rep.nAssociatedProviders << 2); +_XRead32(dpy, (long int *)xpi->associated_capability, rep.nAssociatedProviders << 2); _XReadPad(dpy, xpi->name, rep.nameLength); xpi->name[rep.nameLength] = '\0';
CVS commit: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: wiz Date: Sun Jun 30 11:31:43 UTC 2013 Modified Files: xsrc/external/mit/xauth/dist: process.c Log Message: Use copystring instead of UNCONST. This version has a higher chance of being accepted upstream. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xauth/dist/process.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xauth/dist/process.c diff -u xsrc/external/mit/xauth/dist/process.c:1.2 xsrc/external/mit/xauth/dist/process.c:1.3 --- xsrc/external/mit/xauth/dist/process.c:1.2 Fri May 31 06:46:39 2013 +++ xsrc/external/mit/xauth/dist/process.c Sun Jun 30 11:31:42 2013 @@ -1894,10 +1894,7 @@ do_generate(const char *inputfilename, i auth_in->name = DEFAULT_PROTOCOL; } else -#ifndef __UNCONST -# define __UNCONST(x) x -#endif - auth_in->name = __UNCONST(protoname); + auth_in->name = copystring (protoname, strlen(protoname)); auth_in->name_length = strlen(auth_in->name); auth_in->data = authdata; auth_in->data_length = authdatalen;
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: martin
Date: Sun Jun 30 10:07:43 UTC 2013
Modified Files:
src/lib/libc/gen: getttyent.c
Log Message:
Rearrange to make lint deal with it (to unbreak the build).
Someone please (1) fix lint and then (2) back this out ;-)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/gen/getttyent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/getttyent.c
diff -u src/lib/libc/gen/getttyent.c:1.25 src/lib/libc/gen/getttyent.c:1.26
--- src/lib/libc/gen/getttyent.c:1.25 Sun Jun 30 07:50:54 2013
+++ src/lib/libc/gen/getttyent.c Sun Jun 30 10:07:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: getttyent.c,v 1.25 2013/06/30 07:50:54 matt Exp $ */
+/* $NetBSD: getttyent.c,v 1.26 2013/06/30 10:07:43 martin Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getttyent.c,v 1.25 2013/06/30 07:50:54 matt Exp $");
+__RCSID("$NetBSD: getttyent.c,v 1.26 2013/06/30 10:07:43 martin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -231,15 +231,19 @@ setttyentpath(const char *path)
/*
* Try .$MACHINE (e.g. etc/ttys.amd64)
*/
- char machine[_SYS_NMLN];
- const int mib[] = { [0] = CTL_HW, [1] = HW_MACHINE, };
- size_t len = sizeof(machine);
-
-if (sysctl(mib, __arraycount(mib), machine, &len, NULL, 0) != -1) {
- char npath[PATH_MAX];
- (void)snprintf(npath, sizeof(npath), "%s.%s", path, machine);
- if ((tf = fopen(npath, "re")) != NULL)
- return 1;
+ {
+ char machine[_SYS_NMLN];
+ const int mib[] = { [0] = CTL_HW, [1] = HW_MACHINE, };
+ size_t len = sizeof(machine);
+
+ if (sysctl(mib, (u_int)__arraycount(mib), machine, &len,
+ NULL, 0) != -1) {
+ char npath[PATH_MAX];
+ (void)snprintf(npath, sizeof(npath), "%s.%s", path,
+ machine);
+ if ((tf = fopen(npath, "re")) != NULL)
+return 1;
+ }
}
if ((tf = fopen(path, "re")) != NULL)
CVS commit: src/lib/csu/arch/mips
Module Name:src
Committed By: matt
Date: Sun Jun 30 08:00:35 UTC 2013
Modified Files:
src/lib/csu/arch/mips: crtbegin.h crti.S crtn.S
Log Message:
For O32, don't save $gp on the stack, save $s0 instead and just keep $gp
in $s0.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/mips/crtbegin.h
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/mips/crti.S \
src/lib/csu/arch/mips/crtn.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/mips/crtbegin.h
diff -u src/lib/csu/arch/mips/crtbegin.h:1.2 src/lib/csu/arch/mips/crtbegin.h:1.3
--- src/lib/csu/arch/mips/crtbegin.h:1.2 Tue Jun 25 16:51:14 2013
+++ src/lib/csu/arch/mips/crtbegin.h Sun Jun 30 08:00:34 2013
@@ -32,8 +32,7 @@ __asm( "\n\t"
#ifdef __mips_o32
".set noreorder" "\n\t"
".set nomacro" "\n\t"
- "lw $28,16($sp)" "\n\t"
- "nop" "\n\t"
+ "move $28,$16" "\n\t"
"lw $25,%got(__do_global_ctors_aux)($28)" "\n\t"
"nop" "\n\t"
"addiu $25,$25,%lo(__do_global_ctors_aux)" "\n\t"
@@ -52,8 +51,7 @@ __asm( "\n\t"
#ifdef __mips_o32
".set noreorder" "\n\t"
".set nomacro" "\n\t"
- "lw $28,16($sp)" "\n\t"
- "nop" "\n\t"
+ "move $28,$16" "\n\t"
"lw $25,%got(__do_global_dtors_aux)($28)" "\n\t"
"nop" "\n\t"
"addiu $25,$25,%lo(__do_global_dtors_aux)" "\n\t"
Index: src/lib/csu/arch/mips/crti.S
diff -u src/lib/csu/arch/mips/crti.S:1.1 src/lib/csu/arch/mips/crti.S:1.2
--- src/lib/csu/arch/mips/crti.S:1.1 Sat Jun 22 02:37:09 2013
+++ src/lib/csu/arch/mips/crti.S Sun Jun 30 08:00:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crti.S,v 1.1 2013/06/22 02:37:09 matt Exp $ */
+/* $NetBSD: crti.S,v 1.2 2013/06/30 08:00:34 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-RCSID("$NetBSD: crti.S,v 1.1 2013/06/22 02:37:09 matt Exp $")
+RCSID("$NetBSD: crti.S,v 1.2 2013/06/30 08:00:34 matt Exp $")
#include "sysident.S"
@@ -39,16 +39,22 @@ RCSID("$NetBSD: crti.S,v 1.1 2013/06/22
NESTED_NOPROFILE(_init, CALLFRAME_SIZ, ra)
SETUP_GP
PTR_SUBU sp, sp, CALLFRAME_SIZ # allocate stack frame
-SAVE_GP(CALLFRAME_GP)
-SETUP_GP64(CALLFRAME_GP, _init)
REG_S ra, CALLFRAME_RA(sp) # save RA
+#ifdef __mips_o32
+ REG_S s0, CALLFRAME_S0(sp) # save s0
+ move s0, gp
+#endif
+SETUP_GP64(CALLFRAME_GP, _init)
END(_init)
.section ".fini", "ax", @progbits
NESTED_NOPROFILE(_fini, CALLFRAME_SIZ, ra)
SETUP_GP
PTR_SUBU sp, sp, CALLFRAME_SIZ # allocate stack frame
-SAVE_GP(CALLFRAME_GP)
-SETUP_GP64(CALLFRAME_GP, _fini)
REG_S ra, CALLFRAME_RA(sp) # save RA
+#ifdef __mips_o32
+ REG_S s0, CALLFRAME_S0(sp) # save s0
+ move s0, gp
+#endif
+SETUP_GP64(CALLFRAME_GP, _fini)
END(_fini)
Index: src/lib/csu/arch/mips/crtn.S
diff -u src/lib/csu/arch/mips/crtn.S:1.1 src/lib/csu/arch/mips/crtn.S:1.2
--- src/lib/csu/arch/mips/crtn.S:1.1 Sat Jun 22 02:37:09 2013
+++ src/lib/csu/arch/mips/crtn.S Sun Jun 30 08:00:34 2013
@@ -29,16 +29,24 @@
#include
-RCSID("$NetBSD: crtn.S,v 1.1 2013/06/22 02:37:09 matt Exp $")
+RCSID("$NetBSD: crtn.S,v 1.2 2013/06/30 08:00:34 matt Exp $")
.section ".init", "ax", @progbits
- RESTORE_GP64
REG_L ra, CALLFRAME_RA(sp)
+#if defined(__mips_o32) || defined(__mips_o64)
+ REG_L s0, CALLFRAME_S0(sp)
+#else
+ REG_L gp, CALLFRAME_GP(sp)
+#endif
PTR_ADDU sp, sp, CALLFRAME_SIZ
jr ra
.section ".fini", "ax", @progbits
- RESTORE_GP64
REG_L ra, CALLFRAME_RA(sp)
+#ifdef __mips_o32
+ REG_L s0, CALLFRAME_S0(sp)
+#else
+ REG_L gp, CALLFRAME_GP(sp)
+#endif
PTR_ADDU sp, sp, CALLFRAME_SIZ
jr ra
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: matt
Date: Sun Jun 30 07:50:54 UTC 2013
Modified Files:
src/lib/libc/gen: getttyent.c
Log Message:
When opening a ttys files, try path. first. This helps
machine archs which have multiple ttys files (arm, mips, powerpc, m68k, sh3)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/gen/getttyent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/getttyent.c
diff -u src/lib/libc/gen/getttyent.c:1.24 src/lib/libc/gen/getttyent.c:1.25
--- src/lib/libc/gen/getttyent.c:1.24 Sat Oct 15 23:00:01 2011
+++ src/lib/libc/gen/getttyent.c Sun Jun 30 07:50:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: getttyent.c,v 1.24 2011/10/15 23:00:01 christos Exp $ */
+/* $NetBSD: getttyent.c,v 1.25 2013/06/30 07:50:54 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getttyent.c,v 1.24 2011/10/15 23:00:01 christos Exp $");
+__RCSID("$NetBSD: getttyent.c,v 1.25 2013/06/30 07:50:54 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -49,6 +49,9 @@ __RCSID("$NetBSD: getttyent.c,v 1.24 201
#include
#include
+#include
+#include
+
#ifdef __weak_alias
__weak_alias(endttyent,_endttyent)
__weak_alias(getttyent,_getttyent)
@@ -223,7 +226,23 @@ setttyentpath(const char *path)
if (tf) {
rewind(tf);
return 1;
- } else if ((tf = fopen(path, "re")) != NULL)
+ }
+
+ /*
+ * Try .$MACHINE (e.g. etc/ttys.amd64)
+ */
+ char machine[_SYS_NMLN];
+ const int mib[] = { [0] = CTL_HW, [1] = HW_MACHINE, };
+ size_t len = sizeof(machine);
+
+if (sysctl(mib, __arraycount(mib), machine, &len, NULL, 0) != -1) {
+ char npath[PATH_MAX];
+ (void)snprintf(npath, sizeof(npath), "%s.%s", path, machine);
+ if ((tf = fopen(npath, "re")) != NULL)
+ return 1;
+ }
+
+ if ((tf = fopen(path, "re")) != NULL)
return 1;
return 0;
}
