CVS commit: src/sys/arch/acorn26/acorn26
Module Name:src Committed By: he Date: Sun May 10 21:47:57 UTC 2009 Modified Files: src/sys/arch/acorn26/acorn26: pmap.c Log Message: Also update the prototype for pmap_enter1() after the recent int -> u_int change. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn26/acorn26/pmap.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/acorn26/acorn26/pmap.c diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.27 src/sys/arch/acorn26/acorn26/pmap.c:1.28 --- src/sys/arch/acorn26/acorn26/pmap.c:1.27 Tue Apr 21 21:29:58 2009 +++ src/sys/arch/acorn26/acorn26/pmap.c Sun May 10 21:47:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.27 2009/04/21 21:29:58 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.28 2009/05/10 21:47:57 he Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 Ben Harris * All rights reserved. @@ -102,7 +102,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.27 2009/04/21 21:29:58 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.28 2009/05/10 21:47:57 he Exp $"); #include /* for cold */ #include @@ -202,7 +202,7 @@ static struct pv_entry *pv_get(pmap_t pmap, int ppn, int lpn); static void pv_release(pmap_t pmap, int ppn, int lpn); -static int pmap_enter1(pmap_t, vaddr_t, paddr_t, vm_prot_t, int, int); +static int pmap_enter1(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int, int); static void *pmap_find(paddr_t);
CVS commit: src/dist/pdisk
Module Name:src
Committed By: he
Date: Sun May 10 22:03:22 UTC 2009
Modified Files:
src/dist/pdisk: dump.c
Log Message:
Now that we have strnlen() in libc, get rid of the local
and type-conflicting implementation here instead of fixing
it locally. I don't think (hope!) this is size-critical.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/dist/pdisk/dump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pdisk/dump.c
diff -u src/dist/pdisk/dump.c:1.9 src/dist/pdisk/dump.c:1.10
--- src/dist/pdisk/dump.c:1.9 Sat Apr 18 06:37:35 2009
+++ src/dist/pdisk/dump.c Sun May 10 22:03:22 2009
@@ -131,7 +131,6 @@
int get_max_base_or_length(partition_map_header *map);
int get_max_name_string_length(partition_map_header *map);
int get_max_type_string_length(partition_map_header *map);
-int strnlen(char *s, int n);
//
@@ -787,20 +786,6 @@
}
int
-strnlen(char *s, int n)
-{
-int i;
-
-for (i = 0; i < n; i++) {
- if (*s == 0) {
- break;
- }
- s++;
-}
-return i;
-}
-
-int
get_max_type_string_length(partition_map_header *map)
{
partition_map * entry;
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src
Committed By: he
Date: Mon May 11 16:09:24 UTC 2009
Modified Files:
src/sys/arch/powerpc/ibm4xx: pmap.c
Log Message:
Follow up the changed prototype of pmap_enter(), flag from int to u_int.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.54 src/sys/arch/powerpc/ibm4xx/pmap.c:1.55
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.54 Wed Mar 18 10:22:34 2009
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Mon May 11 16:09:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.54 2009/03/18 10:22:34 cegger Exp $ */
+/* $NetBSD: pmap.c,v 1.55 2009/05/11 16:09:24 he Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.54 2009/03/18 10:22:34 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.55 2009/05/11 16:09:24 he Exp $");
#include
#include
@@ -809,7 +809,7 @@
* Insert physical page at pa into the given pmap at virtual address va.
*/
int
-pmap_enter(struct pmap *pm, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
+pmap_enter(struct pmap *pm, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
{
int s;
u_int tte;
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: he Date: Mon May 11 16:16:42 UTC 2009 Modified Files: src/sys/arch/evbppc/conf: WALNUT Log Message: Bump SYMTAB_SPACE so that it fits again. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbppc/conf/WALNUT 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/evbppc/conf/WALNUT diff -u src/sys/arch/evbppc/conf/WALNUT:1.40 src/sys/arch/evbppc/conf/WALNUT:1.41 --- src/sys/arch/evbppc/conf/WALNUT:1.40 Fri Mar 6 20:31:48 2009 +++ src/sys/arch/evbppc/conf/WALNUT Mon May 11 16:16:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: WALNUT,v 1.40 2009/03/06 20:31:48 joerg Exp $ +# $NetBSD: WALNUT,v 1.41 2009/05/11 16:16:42 he Exp $ # # GENERIC -- everything that's currently supported # @@ -39,7 +39,7 @@ options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB options TRAP_PANICWAIT -options SYMTAB_SPACE=40 # size for embedded symbol table +options SYMTAB_SPACE=41 # size for embedded symbol table makeoptions DEBUG="-g" # compile full symbol table
CVS commit: src/crypto/external/bsd/netpgp/bin
Module Name:src
Committed By: he
Date: Sun May 17 11:38:43 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/bin: Makefile
Log Message:
Add LDADD+= and DPADD+= settings so that this builds on sun2 as well,
where we can't rely on shared libraries expressing the needs of the
program.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/netpgp/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/bin/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/Makefile:1.1.1.1 src/crypto/external/bsd/netpgp/bin/Makefile:1.2
--- src/crypto/external/bsd/netpgp/bin/Makefile:1.1.1.1 Thu Apr 23 06:31:55 2009
+++ src/crypto/external/bsd/netpgp/bin/Makefile Sun May 17 11:38:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/04/23 06:31:55 agc Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/17 11:38:42 he Exp $
.include
@@ -11,6 +11,9 @@
LDADD+= -L${LIBNETPGPDIR} -lnetpgp
DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+LDADD+= -lcrypto -lz -lbz2
+DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
MAN= netpgp.1
# although the code is/was WARNS=4 clean, when linking, there is a warning
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: he
Date: Mon May 18 00:14:27 UTC 2009
Modified Files:
src/sys/dev/pci: tgavar.h
Log Message:
Complete the device_t / softc split by changing the sc_dev member
from "struct device" to "device_t". Commit overlooked when tga.c was
changed?
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/tgavar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/tgavar.h
diff -u src/sys/dev/pci/tgavar.h:1.17 src/sys/dev/pci/tgavar.h:1.18
--- src/sys/dev/pci/tgavar.h:1.17 Wed Jan 7 01:31:01 2009
+++ src/sys/dev/pci/tgavar.h Mon May 18 00:14:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tgavar.h,v 1.17 2009/01/07 01:31:01 ahoka Exp $ */
+/* $NetBSD: tgavar.h,v 1.18 2009/05/18 00:14:27 he Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -94,7 +94,7 @@
};
struct tga_softc {
- struct device sc_dev;
+ device_t sc_dev;
struct tga_devconfig *sc_dc; /* device configuration */
void *sc_intr; /* interrupt handler info */
CVS commit: src/usr.sbin/hilinfo
Module Name:src
Committed By: he
Date: Wed May 20 08:16:52 UTC 2009
Modified Files:
src/usr.sbin/hilinfo: hilinfo.c
Log Message:
Spread some 'const' to deal without warnings with string constants.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/hilinfo/hilinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/hilinfo/hilinfo.c
diff -u src/usr.sbin/hilinfo/hilinfo.c:1.5 src/usr.sbin/hilinfo/hilinfo.c:1.6
--- src/usr.sbin/hilinfo/hilinfo.c:1.5 Thu May 30 18:01:03 2002
+++ src/usr.sbin/hilinfo/hilinfo.c Wed May 20 08:16:52 2009
@@ -19,12 +19,12 @@
* improvements that they make and grant CSS redistribution rights.
*
* from: Utah $Hdr: hilinfo.c 1.3 94/04/04$
- * $NetBSD: hilinfo.c,v 1.5 2002/05/30 18:01:03 thorpej Exp $
+ * $NetBSD: hilinfo.c,v 1.6 2009/05/20 08:16:52 he Exp $
*/
#include
#ifndef lint
-__RCSID("$NetBSD: hilinfo.c,v 1.5 2002/05/30 18:01:03 thorpej Exp $");
+__RCSID("$NetBSD: hilinfo.c,v 1.6 2009/05/20 08:16:52 he Exp $");
#endif
#include
@@ -46,7 +46,7 @@
struct hil_info {
u_char hil_lo;
u_char hil_hi;
- char *hil_name;
+ const char *hil_name;
} info[] = {
{0xA0, 0xFF, "keyboard"},
{0x60, 0x6B, "mouse"},
@@ -58,7 +58,7 @@
int getinfo __P((void));
int main __P((int, char **));
-char *tname __P((void));
+const char *tname __P((void));
void printall __P((void));
void usage __P((void));
@@ -141,7 +141,7 @@
printf("\n");
}
-char *
+const char *
tname()
{
struct hil_info *hp;
CVS commit: src/sys/arch/mvme68k/include
Module Name:src Committed By: he Date: Fri May 22 08:08:36 UTC 2009 Modified Files: src/sys/arch/mvme68k/include: intr.h Log Message: Remove a no-longer-needed include of , which now created a build problem because dvl_mtx has an incomplete type when building cacheops.o. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mvme68k/include/intr.h 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/mvme68k/include/intr.h diff -u src/sys/arch/mvme68k/include/intr.h:1.19 src/sys/arch/mvme68k/include/intr.h:1.20 --- src/sys/arch/mvme68k/include/intr.h:1.19 Thu Jun 26 02:52:29 2008 +++ src/sys/arch/mvme68k/include/intr.h Fri May 22 08:08:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.19 2008/06/26 02:52:29 isaki Exp $ */ +/* $NetBSD: intr.h,v 1.20 2009/05/22 08:08:36 he Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -32,7 +32,6 @@ #ifndef _MVME68K_INTR_H #define _MVME68K_INTR_H -#include #include #define IPL_NONE 0 /* disable only this interrupt */
CVS commit: src/sys/dev/dec
Module Name:src Committed By: he Date: Sat May 23 19:11:19 UTC 2009 Modified Files: src/sys/dev/dec: clockvar.h Log Message: After the change from "struct device *" to "device_t", we now depend on the definitions from , so include it here. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/dec/clockvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/dec/clockvar.h diff -u src/sys/dev/dec/clockvar.h:1.10 src/sys/dev/dec/clockvar.h:1.11 --- src/sys/dev/dec/clockvar.h:1.10 Tue May 12 14:18:16 2009 +++ src/sys/dev/dec/clockvar.h Sat May 23 19:11:19 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: clockvar.h,v 1.10 2009/05/12 14:18:16 cegger Exp $ */ +/* $NetBSD: clockvar.h,v 1.11 2009/05/23 19:11:19 he Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -27,6 +27,8 @@ * rights to redistribute these changes. */ +#include + /* * Definitions for CPU-independent clock handling for the alpha and pmax. */
CVS commit: src/libexec/ld.elf_so/arch/alpha
Module Name:src
Committed By: he
Date: Sun May 24 18:29:03 UTC 2009
Modified Files:
src/libexec/ld.elf_so/arch/alpha: alpha_reloc.c
Log Message:
Copy build fix from i386: Fix const issues (cast const pointers
to "const uint8_t *" instead of "caddr_t").
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
diff -u src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.31 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.32
--- src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.31 Thu Jul 24 04:39:25 2008
+++ src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c Sun May 24 18:29:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_reloc.c,v 1.31 2008/07/24 04:39:25 matt Exp $ */
+/* $NetBSD: alpha_reloc.c,v 1.32 2009/05/24 18:29:03 he Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -62,7 +62,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: alpha_reloc.c,v 1.31 2008/07/24 04:39:25 matt Exp $");
+__RCSID("$NetBSD: alpha_reloc.c,v 1.32 2009/05/24 18:29:03 he Exp $");
#endif /* not lint */
#include
@@ -187,7 +187,7 @@
break;
}
}
- relalim = (const Elf_Rela *)((caddr_t)rela + relasz);
+ relalim = (const Elf_Rela *)((const uint8_t *)rela + relasz);
for (; rela < relalim; rela++) {
where = (Elf_Addr *)(relocbase + rela->r_offset);
/* XXX For some reason I see a few GLOB_DAT relocs here. */
@@ -475,7 +475,8 @@
caddr_t
_rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
{
- const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj->pltrela + reloff);
+ const Elf_Rela *rela =
+ (const Elf_Rela *)((const uint8_t *)obj->pltrela + reloff);
Elf_Addr result;
int err;
CVS commit: src/libexec/ld.elf_so/arch/powerpc
Module Name:src
Committed By: he
Date: Sun May 24 20:35:41 UTC 2009
Modified Files:
src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c
Log Message:
Apply fix borrowed from i386: Fix const issue (cast const pointers
to "const uint8_t *" instead of "caddr_t").
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
diff -u src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.41 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.42
--- src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.41 Thu Jul 24 04:39:25 2008
+++ src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Sun May 24 20:35:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ppc_reloc.c,v 1.41 2008/07/24 04:39:25 matt Exp $ */
+/* $NetBSD: ppc_reloc.c,v 1.42 2009/05/24 20:35:41 he Exp $ */
/*-
* Copyright (C) 1998 Tsubai Masanari
@@ -30,7 +30,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ppc_reloc.c,v 1.41 2008/07/24 04:39:25 matt Exp $");
+__RCSID("$NetBSD: ppc_reloc.c,v 1.42 2009/05/24 20:35:41 he Exp $");
#endif /* not lint */
#include
@@ -123,7 +123,7 @@
break;
}
}
- relalim = (const Elf_Rela *)((caddr_t)rela + relasz);
+ relalim = (const Elf_Rela *)((const uint8_t *)rela + relasz);
for (; rela < relalim; rela++) {
where = (Elf_Addr *)(relocbase + rela->r_offset);
*where = (Elf_Addr)(relocbase + rela->r_addend);
CVS commit: src/sys/arch/hp300/dev
Module Name:src
Committed By: he
Date: Tue May 26 06:38:26 UTC 2009
Modified Files:
src/sys/arch/hp300/dev: mt.c
Log Message:
Remove a now-unused local variable.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hp300/dev/mt.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/hp300/dev/mt.c
diff -u src/sys/arch/hp300/dev/mt.c:1.48 src/sys/arch/hp300/dev/mt.c:1.49
--- src/sys/arch/hp300/dev/mt.c:1.48 Tue May 26 00:46:22 2009
+++ src/sys/arch/hp300/dev/mt.c Tue May 26 06:38:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.48 2009/05/26 00:46:22 ad Exp $ */
+/* $NetBSD: mt.c,v 1.49 2009/05/26 06:38:26 he Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.48 2009/05/26 00:46:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.49 2009/05/26 06:38:26 he Exp $");
#include
#include
@@ -424,7 +424,6 @@
static int
mtcommand(dev_t dev, int cmd, int cnt)
{
- struct mt_softc *sc = device_lookup_private(&mt_cd,UNIT(dev));
int error = 0;
buf_t *bp;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: he Date: Sun May 31 14:11:18 UTC 2009 Modified Files: src/sys/dev/ic: smc90cx6.c Log Message: Don't include anymore since it has been removed (at least from the amiga port) and appears to no longer be required. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ic/smc90cx6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/smc90cx6.c diff -u src/sys/dev/ic/smc90cx6.c:1.59 src/sys/dev/ic/smc90cx6.c:1.60 --- src/sys/dev/ic/smc90cx6.c:1.59 Sat Mar 14 15:36:17 2009 +++ src/sys/dev/ic/smc90cx6.c Sun May 31 14:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: smc90cx6.c,v 1.59 2009/03/14 15:36:17 dsl Exp $ */ +/* $NetBSD: smc90cx6.c,v 1.60 2009/05/31 14:11:17 he Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.59 2009/03/14 15:36:17 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.60 2009/05/31 14:11:17 he Exp $"); /* #define BAHSOFTCOPY */ #define BAHRETRANSMIT /**/ @@ -77,7 +77,6 @@ #include #include -#include #include #include
CVS commit: src/sys/arch/evbarm/g42xxeb
Module Name:src
Committed By: he
Date: Sun May 31 17:47:26 UTC 2009
Modified Files:
src/sys/arch/evbarm/g42xxeb: gb225_pcic.c
Log Message:
Adapt to changes in sa11x0 code, with struct device * -> device_t changes.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/g42xxeb/gb225_pcic.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/g42xxeb/gb225_pcic.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.7 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.8
--- src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.7 Sat Dec 15 00:39:15 2007
+++ src/sys/arch/evbarm/g42xxeb/gb225_pcic.c Sun May 31 17:47:26 2009
@@ -120,7 +120,7 @@
{
struct opcic_softc *sc = (struct opcic_softc *)(so->ss.sc);
struct opio_softc *osc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
return bus_space_read_1(osc->sc_iot, osc->sc_ioh,
GB225_CFDET + 2 * so->ss.socket);
@@ -184,7 +184,7 @@
paa.iosize = 0x400;
sc->sc_socket[i].ss.pcmcia =
- (struct device *)config_found_ia(&sc->sc_pc.sc_dev,
+ config_found_ia(sc->sc_pc.sc_dev,
"pcmciabus", &paa, opcic_print);
#ifndef DONT_USE_CARD_DETECT_INTR
@@ -284,9 +284,9 @@
struct opcic_socket *so = (struct opcic_socket *)__so;
struct opcic_softc *sc = (struct opcic_softc *)so->ss.sc;
struct opio_softc *psc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
struct obio_softc *bsc =
- (struct obio_softc *) device_parent(&psc->sc_dev);
+ device_private(device_parent(&psc->sc_dev));
switch (which) {
case SAPCIC_CONTROL_RESET:
@@ -317,7 +317,7 @@
struct opcic_socket *so = (struct opcic_socket *)__so;
struct opcic_softc *sc = (struct opcic_softc *)so->ss.sc;
struct opio_softc *psc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
int shift, save;
volatile uint8_t *p;
@@ -352,9 +352,9 @@
{
struct opcic_softc *sc = (struct opcic_softc *)so->sc;
struct opio_softc *psc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
struct obio_softc *bsc =
- (struct obio_softc *) device_parent(&psc->sc_dev);
+ device_private(device_parent(&psc->sc_dev));
int irq;
DPRINTF(("opcic_intr_establish %d\n", so->socket));
@@ -369,7 +369,7 @@
{
struct opcic_softc *sc = (struct opcic_softc *)so->sc;
struct opio_softc *psc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
struct obio_softc *bsc =
(struct obio_softc *) device_parent(&psc->sc_dev);
int (* func)(void *) = ((struct obio_handler *)ih)->func;
CVS commit: src/distrib/sparc/miniroot
Module Name:src
Committed By: he
Date: Mon Jun 1 13:06:03 UTC 2009
Modified Files:
src/distrib/sparc/miniroot: Makefile.inc
Log Message:
The sparc miniroot actually doesn't use "file" anymore to distinguish
between a.out and ELF objects, so omit the now no-longer-present "magic"
file (deprecated after latest "file" update).
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/sparc/miniroot/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc/miniroot/Makefile.inc
diff -u src/distrib/sparc/miniroot/Makefile.inc:1.12 src/distrib/sparc/miniroot/Makefile.inc:1.13
--- src/distrib/sparc/miniroot/Makefile.inc:1.12 Sun Jun 13 05:27:18 2004
+++ src/distrib/sparc/miniroot/Makefile.inc Mon Jun 1 13:06:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2004/06/13 05:27:18 sjg Exp $
+# $NetBSD: Makefile.inc,v 1.13 2009/06/01 13:06:03 he Exp $
IMAGESIZE= 8192k
MAKEFS_FLAGS= -o density=4k
@@ -8,7 +8,7 @@
IMAGEDEPENDS+= ${ARCHDIR}/../install.md ${ARCHDIR}/dot.profile \
${ARCHDIR}/termcap.src \
${DESTDIR}/etc/disktab \
- ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/share/misc/magic \
+ ${DESTDIR}/usr/mdec/boot \
${KERNOBJDIR}/GENERIC/netbsd
IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} \
CVS commit: src
Module Name:src
Committed By: he
Date: Tue Jun 9 11:06:10 UTC 2009
Modified Files:
src/distrib/sparc/ramdisk: Makefile list
src/sys/arch/sparc/conf: INSTALL
Log Message:
Add -lprop to the ramdisk build, so that it builds again, due to
recent changes in newfs. Bump the ramdisk size from 1536 to 1800
blocks as a consequence.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/sparc/ramdisk/Makefile
cvs rdiff -u -r1.18 -r1.19 src/distrib/sparc/ramdisk/list
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc/ramdisk/Makefile
diff -u src/distrib/sparc/ramdisk/Makefile:1.40 src/distrib/sparc/ramdisk/Makefile:1.41
--- src/distrib/sparc/ramdisk/Makefile:1.40 Wed Jun 25 03:33:06 2008
+++ src/distrib/sparc/ramdisk/Makefile Tue Jun 9 11:06:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/06/25 03:33:06 matt Exp $
+# $NetBSD: Makefile,v 1.41 2009/06/09 11:06:09 he Exp $
#
# ramdisk.fs is the microroot filesystem intended for use with
# the INSTALL kernel. It provides just enough tools to extract the
@@ -10,7 +10,7 @@
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 1536b
+IMAGESIZE= 1800b
WARNS= 1
DBG= -Os
Index: src/distrib/sparc/ramdisk/list
diff -u src/distrib/sparc/ramdisk/list:1.18 src/distrib/sparc/ramdisk/list:1.19
--- src/distrib/sparc/ramdisk/list:1.18 Wed Jun 26 16:17:41 2002
+++ src/distrib/sparc/ramdisk/list Tue Jun 9 11:06:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.18 2002/06/26 16:17:41 grant Exp $
+# $NetBSD: list,v 1.19 2009/06/09 11:06:09 he Exp $
SRCDIRS bin sbin usr.bin usr.sbin
@@ -25,7 +25,7 @@
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL umount srcdir distrib/utils/x_umount
-LIBS libhack.o -lz -ll -lutil -lrmt
+LIBS libhack.o -lz -ll -lutil -lrmt -lprop
COPY ${CURDIR}/dot.profile .profile
Index: src/sys/arch/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.68 src/sys/arch/sparc/conf/INSTALL:1.69
--- src/sys/arch/sparc/conf/INSTALL:1.68 Tue May 5 23:58:50 2009
+++ src/sys/arch/sparc/conf/INSTALL Tue Jun 9 11:06:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.68 2009/05/05 23:58:50 macallan Exp $
+# $NetBSD: INSTALL,v 1.69 2009/06/09 11:06:09 he Exp $
#
# from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
#
@@ -19,7 +19,7 @@
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
## The miniroot size must be kept in sync manually with the size of
## the `ramdisk' image (which is built in distrib/sparc/ramdisk).
-options MEMORY_DISK_ROOT_SIZE=1536 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=1800 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
pseudo-device md 1 # memory disk device (ramdisk)
CVS commit: src/tests/rump/rumpkern
Module Name:src Committed By: he Date: Tue Jun 9 11:18:50 UTC 2009 Modified Files: src/tests/rump/rumpkern: Makefile Log Message: Apparently, there's not a clear dependency ordering for the libraries, this becomes apparent when linking statically (e.g. as for sun2). Add an extra instance of -lrump to the library list so that it can be linked statically as well. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/rump/rumpkern/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/rump/rumpkern/Makefile diff -u src/tests/rump/rumpkern/Makefile:1.1 src/tests/rump/rumpkern/Makefile:1.2 --- src/tests/rump/rumpkern/Makefile:1.1 Sat May 2 16:02:19 2009 +++ src/tests/rump/rumpkern/Makefile Tue Jun 9 11:18:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/05/02 16:02:19 pooka Exp $ +# $NetBSD: Makefile,v 1.2 2009/06/09 11:18:50 he Exp $ .include @@ -6,6 +6,6 @@ TESTS_C= t_modcmd -LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread +LDADD+= -lrump -lrumpvfs -lrump -lrumpuser -lpthread .include
CVS commit: xsrc/external/mit/xorg-server/dist/cfb
Module Name:xsrc
Committed By: he
Date: Wed Jun 10 06:55:57 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/cfb: cfbmskbits.h
Log Message:
The ldl_u() macro wants an "unsigned int *" as the argument, so ensure
that it gets that via a cast. Fixes the build for at least arc.
OK'ed by mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/cfb/cfbmskbits.h
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/xorg-server/dist/cfb/cfbmskbits.h
diff -u xsrc/external/mit/xorg-server/dist/cfb/cfbmskbits.h:1.2 xsrc/external/mit/xorg-server/dist/cfb/cfbmskbits.h:1.3
--- xsrc/external/mit/xorg-server/dist/cfb/cfbmskbits.h:1.2 Sat Feb 14 12:33:18 2009
+++ xsrc/external/mit/xorg-server/dist/cfb/cfbmskbits.h Wed Jun 10 06:55:57 2009
@@ -819,7 +819,7 @@
#else /* BITMAP_BIT_ORDER == LSB */
/* this must load 32 bits worth; for most machines, thats an int */
-#define CfbFetchUnaligned(x) ldl_u(x)
+#define CfbFetchUnaligned(x) ldl_u((unsigned int *)x)
#define getstipplepixels( psrcstip, xt, w, ones, psrcpix, destpix ) \
{ \
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: he
Date: Wed Jun 10 11:41:44 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: vm.c
Log Message:
Add a dummy uvm_readahead() function, to fix build issues after it
recently got added to the kernel.
OK'ed by pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/rump/librump/rumpkern/vm.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/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.57 src/sys/rump/librump/rumpkern/vm.c:1.58
--- src/sys/rump/librump/rumpkern/vm.c:1.57 Wed Jun 3 16:06:10 2009
+++ src/sys/rump/librump/rumpkern/vm.c Wed Jun 10 11:41:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.57 2009/06/03 16:06:10 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.58 2009/06/10 11:41:43 he Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.57 2009/06/03 16:06:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.58 2009/06/10 11:41:43 he Exp $");
#include
#include
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
#include "rump_private.h"
@@ -449,6 +450,14 @@
/* nada for now */
}
+int
+uvm_readahead(struct uvm_object *uobj, off_t off, off_t size)
+{
+
+ /* nada for now */
+ return 0;
+}
+
/*
* Kmem
*/
CVS commit: src/sys/lib/libkern/arch/vax
Module Name:src Committed By: he Date: Thu Jun 18 07:56:04 UTC 2009 Modified Files: src/sys/lib/libkern/arch/vax: Makefile.inc Log Message: Add memset.c, so that the references from sha2.c can be satisfied, and so that the kernel and puffs applications can link again. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/lib/libkern/arch/vax/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/vax/Makefile.inc diff -u src/sys/lib/libkern/arch/vax/Makefile.inc:1.19 src/sys/lib/libkern/arch/vax/Makefile.inc:1.20 --- src/sys/lib/libkern/arch/vax/Makefile.inc:1.19 Fri Apr 13 22:12:04 2007 +++ src/sys/lib/libkern/arch/vax/Makefile.inc Thu Jun 18 07:56:04 2009 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.19 2007/04/13 22:12:04 matt Exp $ +# $NetBSD: Makefile.inc,v 1.20 2009/06/18 07:56:04 he Exp $ # # The rest of the lib routines are in machine/macros.h # SRCS+= __assert.c \ blkcpy.S blkset.S bswap16.S bswap32.S bswap64.S \ - __main.c memchr.c memcmp.c \ + __main.c memchr.c memcmp.c memset.c \ random.S \ strcasecmp.c strcat.c strcmp.c strcpy.c strncasecmp.c strncmp.c \ strncpy.c strlen.c strtoul.c \
CVS commit: src
Module Name:src
Committed By: he
Date: Thu Jun 18 15:22:24 UTC 2009
Modified Files:
src/common/lib/libc/hash/sha2: sha2.c
src/sys/lib/libkern/arch/vax: Makefile.inc
Log Message:
Back out the addition of memset.c to the vax libkern, and instead do
as tsutsui@ suggested, and include in sha2.c instead.
On the vax, this causes to be included, and it contains
that machine's memset() macro+inline.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/common/lib/libc/hash/sha2/sha2.c
cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libkern/arch/vax/Makefile.inc
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/sha2/sha2.c
diff -u src/common/lib/libc/hash/sha2/sha2.c:1.15 src/common/lib/libc/hash/sha2/sha2.c:1.16
--- src/common/lib/libc/hash/sha2/sha2.c:1.15 Sun Jun 14 14:04:07 2009
+++ src/common/lib/libc/hash/sha2/sha2.c Thu Jun 18 15:22:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $ */
+/* $NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $ */
/* $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $ */
/*
@@ -41,16 +41,17 @@
#endif
#include
+#include
#if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $");
#include
#else
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $");
+__RCSID("$NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
Index: src/sys/lib/libkern/arch/vax/Makefile.inc
diff -u src/sys/lib/libkern/arch/vax/Makefile.inc:1.20 src/sys/lib/libkern/arch/vax/Makefile.inc:1.21
--- src/sys/lib/libkern/arch/vax/Makefile.inc:1.20 Thu Jun 18 07:56:04 2009
+++ src/sys/lib/libkern/arch/vax/Makefile.inc Thu Jun 18 15:22:24 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.20 2009/06/18 07:56:04 he Exp $
+# $NetBSD: Makefile.inc,v 1.21 2009/06/18 15:22:24 he Exp $
#
# The rest of the lib routines are in machine/macros.h
#
SRCS+= __assert.c \
blkcpy.S blkset.S bswap16.S bswap32.S bswap64.S \
- __main.c memchr.c memcmp.c memset.c \
+ __main.c memchr.c memcmp.c \
random.S \
strcasecmp.c strcat.c strcmp.c strcpy.c strncasecmp.c strncmp.c \
strncpy.c strlen.c strtoul.c \
CVS commit: src/sys/arch/arm/ep93xx
Module Name:src Committed By: he Date: Mon Aug 3 06:57:09 UTC 2009 Modified Files: src/sys/arch/arm/ep93xx: epgpio.c Log Message: Move the include of up above , so that GPIOMAXNAME gets defined before being used. Also remove the > 0 test on NGPIO around the include of . To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ep93xx/epgpio.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/arm/ep93xx/epgpio.c diff -u src/sys/arch/arm/ep93xx/epgpio.c:1.2 src/sys/arch/arm/ep93xx/epgpio.c:1.3 --- src/sys/arch/arm/ep93xx/epgpio.c:1.2 Fri Feb 27 03:13:55 2009 +++ src/sys/arch/arm/ep93xx/epgpio.c Mon Aug 3 06:57:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: epgpio.c,v 1.2 2009/02/27 03:13:55 kenh Exp $ */ +/* $NetBSD: epgpio.c,v 1.3 2009/08/03 06:57:09 he Exp $ */ /* * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.2 2009/02/27 03:13:55 kenh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.3 2009/08/03 06:57:09 he Exp $"); #include #include @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -41,9 +42,6 @@ #include #include "opt_ep93xx_gpio_mask.h" #include "gpio.h" -#if NGPIO > 0 -#include -#endif #include "locators.h" #ifdef EPGPIO_DEBUG
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: he Date: Tue Aug 18 09:22:47 UTC 2009 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: No longer rely on including . Hi, m...@! To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/cats/cats/cats_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/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.65 src/sys/arch/cats/cats/cats_machdep.c:1.66 --- src/sys/arch/cats/cats/cats_machdep.c:1.65 Tue Aug 11 17:04:15 2009 +++ src/sys/arch/cats/cats/cats_machdep.c Tue Aug 18 09:22:47 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.65 2009/08/11 17:04:15 matt Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.66 2009/08/18 09:22:47 he Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.65 2009/08/11 17:04:15 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.66 2009/08/18 09:22:47 he Exp $"); #include "opt_ddb.h" #include "opt_modular.h" @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: he Date: Wed Aug 19 08:24:44 UTC 2009 Modified Files: src/distrib/sets/lists/comp: ad.mips md.algor md.arc md.cobalt md.evbmips md.hpcmips md.mipsco md.newsmips md.pmax md.sbmips md.sgimips Log Message: Don't remove the mips a.out entries outright, but instead mark them as obsolete, so that they will be removed from DESTDIR. Hi, m...@! To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/md.algor \ src/distrib/sets/lists/comp/md.evbmips cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/comp/md.arc \ src/distrib/sets/lists/comp/md.cobalt cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/comp/md.hpcmips \ src/distrib/sets/lists/comp/md.newsmips cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/comp/md.mipsco cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/comp/md.pmax cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/comp/md.sbmips cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/comp/md.sgimips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.35 src/distrib/sets/lists/comp/ad.mips:1.36 --- src/distrib/sets/lists/comp/ad.mips:1.35 Wed Aug 12 23:38:20 2009 +++ src/distrib/sets/lists/comp/ad.mips Wed Aug 19 08:24:43 2009 @@ -1,8 +1,11 @@ -# $NetBSD: ad.mips,v 1.35 2009/08/12 23:38:20 matt Exp $ +# $NetBSD: ad.mips,v 1.36 2009/08/19 08:24:43 he Exp $ +./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/mipscomp-c-include ./usr/include/mips/ansi.h comp-c-include +./usr/include/mips/aout_machdep.h comp-obsolete obsolete ./usr/include/mips/asm.h comp-c-include +./usr/include/mips/bsd-aout.h comp-obsolete obsolete ./usr/include/mips/bswap.h comp-c-include ./usr/include/mips/cachectl.h comp-c-include ./usr/include/mips/cdefs.h comp-c-include @@ -56,4 +59,5 @@ ./usr/include/mips/varargs.h comp-c-include ./usr/include/mips/vmparam.h comp-c-include ./usr/include/mips/wchar_limits.h comp-c-include +./usr/libdata/debug/usr/bin/elf2aout.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutil-debug debug Index: src/distrib/sets/lists/comp/md.algor diff -u src/distrib/sets/lists/comp/md.algor:1.13 src/distrib/sets/lists/comp/md.algor:1.14 --- src/distrib/sets/lists/comp/md.algor:1.13 Wed Aug 12 23:38:20 2009 +++ src/distrib/sets/lists/comp/md.algor Wed Aug 19 08:24:43 2009 @@ -1,9 +1,11 @@ -# $NetBSD: md.algor,v 1.13 2009/08/12 23:38:20 matt Exp $ +# $NetBSD: md.algor,v 1.14 2009/08/19 08:24:43 he Exp $ ./usr/include/algorcomp-c-include ./usr/include/algor/_G_config.h comp-obsolete obsolete ./usr/include/algor/ansi.h comp-c-include +./usr/include/algor/aout_machdep.h comp-obsolete obsolete ./usr/include/algor/asm.h comp-c-include ./usr/include/algor/autoconf.h comp-c-include +./usr/include/algor/bsd-aout.h comp-obsolete obsolete ./usr/include/algor/bswap.h comp-c-include ./usr/include/algor/bus.h comp-c-include ./usr/include/algor/cdefs.h comp-c-include Index: src/distrib/sets/lists/comp/md.evbmips diff -u src/distrib/sets/lists/comp/md.evbmips:1.13 src/distrib/sets/lists/comp/md.evbmips:1.14 --- src/distrib/sets/lists/comp/md.evbmips:1.13 Wed Aug 12 23:38:20 2009 +++ src/distrib/sets/lists/comp/md.evbmips Wed Aug 19 08:24:44 2009 @@ -1,8 +1,10 @@ -# $NetBSD: md.evbmips,v 1.13 2009/08/12 23:38:20 matt Exp $ +# $NetBSD: md.evbmips,v 1.14 2009/08/19 08:24:44 he Exp $ ./usr/include/evbmipscomp-c-include ./usr/include/evbmips/_G_config.h comp-obsolete obsolete ./usr/include/evbmips/ansi.h comp-c-include +./usr/include/evbmips/aout_machdep.h comp-obsolete obsolete ./usr/include/evbmips/asm.h comp-c-include +./usr/include/evbmips/bsd-aout.h comp-obsolete obsolete ./usr/include/evbmips/bswap.h comp-c-include ./usr/include/evbmips/bus.h comp-c-include ./usr/include/evbmips/cdefs.h comp-c-include Index: src/distrib/sets/lists/comp/md.arc diff -u src/distrib/sets/lists/comp/md.arc:1.22 src/distrib/sets/lists/comp/md.arc:1.23 --- src/distrib/sets/lists/comp/md.arc:1.22 Wed Aug 12 23:38:20 2009 +++ src/distrib/sets/lists/comp/md.arc Wed Aug 19 08:24:44 2009 @@ -1,9 +1,11 @@ -# $NetBSD: md.arc,v 1.22 2009/08/12 23:38:20 matt Exp $ +# $NetBSD: md.arc,v 1.23 2009/08/19 08:24:44 he Exp $ ./usr/include/arccomp-c-include ./usr/include/arc/_G_config.h comp-obsolete obsolete ./usr/include/arc/ansi.h comp-c-include +./usr/include/arc/aout_machdep.h comp-obsolete obsolete ./usr/include/arc/asm.hcomp-c-include ./usr/include/arc/autoconf.h comp-obsolete obsolete +./usr/include/arc/bsd-aout.h comp-obsolete obsolete ./usr/include/arc/bswap.h comp-c-include ./usr/include/arc/cdefs.h com
CVS commit: src/sys/arch/atari/atari
Module Name:src Committed By: he Date: Wed Aug 19 19:39:05 UTC 2009 Modified Files: src/sys/arch/atari/atari: atari_init.c Log Message: One more file needing . To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/sys/arch/atari/atari/atari_init.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/atari/atari/atari_init.c diff -u src/sys/arch/atari/atari/atari_init.c:1.83 src/sys/arch/atari/atari/atari_init.c:1.84 --- src/sys/arch/atari/atari/atari_init.c:1.83 Wed Jul 8 12:23:09 2009 +++ src/sys/arch/atari/atari/atari_init.c Wed Aug 19 19:39:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: atari_init.c,v 1.83 2009/07/08 12:23:09 tsutsui Exp $ */ +/* $NetBSD: atari_init.c,v 1.84 2009/08/19 19:39:05 he Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.83 2009/07/08 12:23:09 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.84 2009/08/19 19:39:05 he Exp $"); #include "opt_ddb.h" #include "opt_mbtype.h" @@ -55,6 +55,7 @@ #include #include #include +#include #include #include
CVS commit: src/sys/arch/atari/atari
Module Name:src Committed By: he Date: Wed Aug 19 23:46:52 UTC 2009 Modified Files: src/sys/arch/atari/atari: machdep.c Log Message: Another needing . To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/arch/atari/atari/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/atari/atari/machdep.c diff -u src/sys/arch/atari/atari/machdep.c:1.160 src/sys/arch/atari/atari/machdep.c:1.161 --- src/sys/arch/atari/atari/machdep.c:1.160 Thu Mar 5 13:42:59 2009 +++ src/sys/arch/atari/atari/machdep.c Wed Aug 19 23:46:52 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.160 2009/03/05 13:42:59 tsutsui Exp $ */ +/* $NetBSD: machdep.c,v 1.161 2009/08/19 23:46:52 he Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.160 2009/03/05 13:42:59 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.161 2009/08/19 23:46:52 he Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -106,6 +106,7 @@ #include #include #include +#include #include #if defined(DDB) && defined(__ELF__) #include
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: he
Date: Thu Aug 20 08:30:04 UTC 2009
Modified Files:
src/lib/libc/gen: nlist.c nlist_aout.c
Log Message:
Instead of including to get at "struct nlist" (with a comment
to explain it), include instead, so that our mips ports don't
error out in the absence of aout_machdep.h.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/nlist.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/gen/nlist_aout.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/nlist.c
diff -u src/lib/libc/gen/nlist.c:1.21 src/lib/libc/gen/nlist.c:1.22
--- src/lib/libc/gen/nlist.c:1.21 Thu Aug 7 16:42:54 2003
+++ src/lib/libc/gen/nlist.c Thu Aug 20 08:30:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist.c,v 1.21 2003/08/07 16:42:54 agc Exp $ */
+/* $NetBSD: nlist.c,v 1.22 2009/08/20 08:30:04 he Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -66,7 +66,7 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: nlist.c,v 1.21 2003/08/07 16:42:54 agc Exp $");
+__RCSID("$NetBSD: nlist.c,v 1.22 2009/08/20 08:30:04 he Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,7 +81,7 @@
#include
#include
#include
-#include /* for 'struct nlist' declaration */
+#include
#if 0
#ifdef __weak_alias
Index: src/lib/libc/gen/nlist_aout.c
diff -u src/lib/libc/gen/nlist_aout.c:1.19 src/lib/libc/gen/nlist_aout.c:1.20
--- src/lib/libc/gen/nlist_aout.c:1.19 Sun Aug 16 03:56:26 2009
+++ src/lib/libc/gen/nlist_aout.c Thu Aug 20 08:30:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_aout.c,v 1.19 2009/08/16 03:56:26 matt Exp $ */
+/* $NetBSD: nlist_aout.c,v 1.20 2009/08/20 08:30:04 he Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -66,7 +66,7 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: nlist_aout.c,v 1.19 2009/08/16 03:56:26 matt Exp $");
+__RCSID("$NetBSD: nlist_aout.c,v 1.20 2009/08/20 08:30:04 he Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -82,7 +82,7 @@
#include
#include
#include
-#include /* for 'struct nlist' declaration */
+#include
#include "nlist_private.h"
CVS commit: src/dist/ipf/tools
Module Name:src
Committed By: he
Date: Thu Aug 20 08:12:05 UTC 2009
Modified Files:
src/dist/ipf/tools: ippool.c
Log Message:
The type of iplf_count is u_int, not size_t, so print with %u, not %zu.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/dist/ipf/tools/ippool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/ipf/tools/ippool.c
diff -u src/dist/ipf/tools/ippool.c:1.6 src/dist/ipf/tools/ippool.c:1.7
--- src/dist/ipf/tools/ippool.c:1.6 Tue May 20 07:08:07 2008
+++ src/dist/ipf/tools/ippool.c Thu Aug 20 08:12:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ippool.c,v 1.6 2008/05/20 07:08:07 darrenr Exp $ */
+/* $NetBSD: ippool.c,v 1.7 2009/08/20 08:12:05 he Exp $ */
/*
* Copyright (C) 2002-2006 by Darren Reed.
@@ -499,7 +499,7 @@
}
}
- printf("%zu object%s flushed\n", flush.iplf_count,
+ printf("%u object%s flushed\n", flush.iplf_count,
(flush.iplf_count == 1) ? "" : "s");
return 0;
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: he
Date: Thu Aug 20 10:19:36 UTC 2009
Modified Files:
src/lib/libc/gen: nlist_aout.c
Log Message:
Actually, when we really need the a.out defines from , we
need to include anyway. Move it inside #ifdef NLIST_AOUT.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/gen/nlist_aout.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/nlist_aout.c
diff -u src/lib/libc/gen/nlist_aout.c:1.20 src/lib/libc/gen/nlist_aout.c:1.21
--- src/lib/libc/gen/nlist_aout.c:1.20 Thu Aug 20 08:30:04 2009
+++ src/lib/libc/gen/nlist_aout.c Thu Aug 20 10:19:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_aout.c,v 1.20 2009/08/20 08:30:04 he Exp $ */
+/* $NetBSD: nlist_aout.c,v 1.21 2009/08/20 10:19:36 he Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -66,7 +66,7 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: nlist_aout.c,v 1.20 2009/08/20 08:30:04 he Exp $");
+__RCSID("$NetBSD: nlist_aout.c,v 1.21 2009/08/20 10:19:36 he Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -82,11 +82,11 @@
#include
#include
#include
-#include
#include "nlist_private.h"
#ifdef NLIST_AOUT
+#include
#include
int
CVS commit: src/lib/libkvm
Module Name:src
Committed By: he
Date: Thu Aug 20 11:18:55 UTC 2009
Modified Files:
src/lib/libkvm: kvm.c
Log Message:
Anoter instance of -> .
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/lib/libkvm/kvm.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/libkvm/kvm.c
diff -u src/lib/libkvm/kvm.c:1.92 src/lib/libkvm/kvm.c:1.93
--- src/lib/libkvm/kvm.c:1.92 Tue Jan 15 14:16:30 2008
+++ src/lib/libkvm/kvm.c Thu Aug 20 11:18:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm.c,v 1.92 2008/01/15 14:16:30 ad Exp $ */
+/* $NetBSD: kvm.c,v 1.93 2009/08/20 11:18:55 he Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94";
#else
-__RCSID("$NetBSD: kvm.c,v 1.92 2008/01/15 14:16:30 ad Exp $");
+__RCSID("$NetBSD: kvm.c,v 1.93 2009/08/20 11:18:55 he Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -51,7 +51,7 @@
#include
#include
-#include
+#include
#include
#include
CVS commit: src/sys/arch/arm/footbridge/isa
Module Name:src
Committed By: he
Date: Thu Aug 20 12:51:28 UTC 2009
Modified Files:
src/sys/arch/arm/footbridge/isa: isa_machdep.c
Log Message:
Typo correction: it's isa_dmadestroy(), not isa_dma_destroy(), apparently.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/footbridge/isa/isa_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/arm/footbridge/isa/isa_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.15 src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.16
--- src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.15 Wed Aug 19 15:01:07 2009
+++ src/sys/arch/arm/footbridge/isa/isa_machdep.c Thu Aug 20 12:51:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.15 2009/08/19 15:01:07 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.16 2009/08/20 12:51:28 he Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.15 2009/08/19 15:01:07 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.16 2009/08/20 12:51:28 he Exp $");
#include "opt_irqstats.h"
@@ -504,7 +504,7 @@
isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
#if NISADMA > 0
- isa_dma_destroy();
+ isa_dmadestroy(ic);
#endif
}
CVS commit: src/usr.bin/crunch/crunchide
Module Name:src
Committed By: he
Date: Thu Aug 20 17:39:51 UTC 2009
Modified Files:
src/usr.bin/crunch/crunchide: crunchide.c exec_coff.c
Log Message:
Remove the include of , since these files do not appear
to need it. Fixes build for mips ports.
Also fix a comment: crunchide walks "the symbol table", not
just "the a.out symbol table".
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/crunch/crunchide/crunchide.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/crunch/crunchide/exec_coff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/crunch/crunchide/crunchide.c
diff -u src/usr.bin/crunch/crunchide/crunchide.c:1.12 src/usr.bin/crunch/crunchide/crunchide.c:1.13
--- src/usr.bin/crunch/crunchide/crunchide.c:1.12 Tue Aug 24 12:25:26 2004
+++ src/usr.bin/crunch/crunchide/crunchide.c Thu Aug 20 17:39:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crunchide.c,v 1.12 2004/08/24 12:25:26 wiz Exp $ */
+/* $NetBSD: crunchide.c,v 1.13 2009/08/20 17:39:51 he Exp $ */
/*
* Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.
@@ -28,7 +28,7 @@
*/
/*
- * crunchide.c - tiptoes through an a.out symbol table, hiding all defined
+ * crunchide.c - tiptoes through a symbol table, hiding all defined
* global symbols. Allows the user to supply a "keep list" of symbols
* that are not to be hidden. This program relies on the use of the
* linker's -dc flag to actually put global bss data into the file's
@@ -63,7 +63,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: crunchide.c,v 1.12 2004/08/24 12:25:26 wiz Exp $");
+__RCSID("$NetBSD: crunchide.c,v 1.13 2009/08/20 17:39:51 he Exp $");
#endif
#include
@@ -72,7 +72,6 @@
#include
#include
#include
-#include
#include
#include
Index: src/usr.bin/crunch/crunchide/exec_coff.c
diff -u src/usr.bin/crunch/crunchide/exec_coff.c:1.6 src/usr.bin/crunch/crunchide/exec_coff.c:1.7
--- src/usr.bin/crunch/crunchide/exec_coff.c:1.6 Sat Jul 26 20:34:12 2003
+++ src/usr.bin/crunch/crunchide/exec_coff.c Thu Aug 20 17:39:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_coff.c,v 1.6 2003/07/26 20:34:12 salo Exp $ */
+/* $NetBSD: exec_coff.c,v 1.7 2009/08/20 17:39:51 he Exp $ */
/*
* Copyright (c) 1997 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: exec_coff.c,v 1.6 2003/07/26 20:34:12 salo Exp $");
+__RCSID("$NetBSD: exec_coff.c,v 1.7 2009/08/20 17:39:51 he Exp $");
#endif
#include
@@ -44,7 +44,6 @@
#include
#include
#include
-#include
#include
#include
#include
CVS commit: src/usr.bin/crunch/crunchide
Module Name:src
Committed By: he
Date: Thu Aug 20 17:40:26 UTC 2009
Modified Files:
src/usr.bin/crunch/crunchide: exec_aout.c
Log Message:
Move the include of and until after
we have determined that the current machine actually supports a.out.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/crunch/crunchide/exec_aout.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/crunch/crunchide/exec_aout.c
diff -u src/usr.bin/crunch/crunchide/exec_aout.c:1.11 src/usr.bin/crunch/crunchide/exec_aout.c:1.12
--- src/usr.bin/crunch/crunchide/exec_aout.c:1.11 Sun Aug 16 18:15:28 2009
+++ src/usr.bin/crunch/crunchide/exec_aout.c Thu Aug 20 17:40:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_aout.c,v 1.11 2009/08/16 18:15:28 martin Exp $ */
+/* $NetBSD: exec_aout.c,v 1.12 2009/08/20 17:40:26 he Exp $ */
/*
* Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.
@@ -29,7 +29,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: exec_aout.c,v 1.11 2009/08/16 18:15:28 martin Exp $");
+__RCSID("$NetBSD: exec_aout.c,v 1.12 2009/08/20 17:40:26 he Exp $");
#endif
#include
@@ -37,15 +37,16 @@
#include
#include
#include
-#include
#include
#include
-#include
#include "extern.h"
#if defined(NLIST_AOUT)
+#include
+#include
+
int nsyms, ntextrel, ndatarel;
struct exec *hdrp;
char *aoutdata, *strbase;
CVS commit: src/usr.bin/ldd
Module Name:src
Committed By: he
Date: Thu Aug 20 19:17:19 UTC 2009
Modified Files:
src/usr.bin/ldd: Makefile ldd.c ldd_elfxx.c
Log Message:
Don't include unless it's needed, and don't build
the aout subdir if on mips. Fixes build for mips ports.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/ldd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/ldd/ldd.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/ldd/ldd_elfxx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/Makefile
diff -u src/usr.bin/ldd/Makefile:1.10 src/usr.bin/ldd/Makefile:1.11
--- src/usr.bin/ldd/Makefile:1.10 Tue Apr 14 22:15:22 2009
+++ src/usr.bin/ldd/Makefile Thu Aug 20 19:17:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/04/14 22:15:22 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2009/08/20 19:17:19 he Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
@@ -8,9 +8,14 @@
SRCS= ldd.c
MAN= ldd.1
-SUBDIR= aout elf32 elf64
+
+.if (${MACHINE_ARCH} != "mips")
+SUBDIR= aout
LIB_AOUTDIR!= cd ${.CURDIR}/aout && ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_AOUTDIR}/libldd_aout.a
+.endif
+
+SUBDIR+= elf32 elf64
.if (${MACHINE_ARCH} != "alpha")
LIB_ELF32DIR!= cd ${.CURDIR}/elf32 && ${PRINTOBJDIR}
Index: src/usr.bin/ldd/ldd.c
diff -u src/usr.bin/ldd/ldd.c:1.6 src/usr.bin/ldd/ldd.c:1.7
--- src/usr.bin/ldd/ldd.c:1.6 Wed May 20 16:20:01 2009
+++ src/usr.bin/ldd/ldd.c Thu Aug 20 19:17:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd.c,v 1.6 2009/05/20 16:20:01 christos Exp $ */
+/* $NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,14 +62,13 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.6 2009/05/20 16:20:01 christos Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $");
#endif /* not lint */
#include
#include
#include
-#include
#include
#include
#include
Index: src/usr.bin/ldd/ldd_elfxx.c
diff -u src/usr.bin/ldd/ldd_elfxx.c:1.2 src/usr.bin/ldd/ldd_elfxx.c:1.3
--- src/usr.bin/ldd/ldd_elfxx.c:1.2 Tue Feb 3 03:01:02 2009
+++ src/usr.bin/ldd/ldd_elfxx.c Thu Aug 20 19:17:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd_elfxx.c,v 1.2 2009/02/03 03:01:02 mrg Exp $ */
+/* $NetBSD: ldd_elfxx.c,v 1.3 2009/08/20 19:17:19 he Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,14 +62,13 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ldd_elfxx.c,v 1.2 2009/02/03 03:01:02 mrg Exp $");
+__RCSID("$NetBSD: ldd_elfxx.c,v 1.3 2009/08/20 19:17:19 he Exp $");
#endif /* not lint */
#include
#include
#include
-#include
#include
#include
#include
CVS commit: src/usr.bin/ldd
Module Name:src
Committed By: he
Date: Thu Aug 20 21:06:17 UTC 2009
Modified Files:
src/usr.bin/ldd: ldd.c
Log Message:
Don't try to call the (no longer defined) aout_ldd() function
if we're building for mips.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/ldd/ldd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/ldd.c
diff -u src/usr.bin/ldd/ldd.c:1.7 src/usr.bin/ldd/ldd.c:1.8
--- src/usr.bin/ldd/ldd.c:1.7 Thu Aug 20 19:17:19 2009
+++ src/usr.bin/ldd/ldd.c Thu Aug 20 21:06:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $ */
+/* $NetBSD: ldd.c,v 1.8 2009/08/20 21:06:17 he Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.8 2009/08/20 21:06:17 he Exp $");
#endif /* not lint */
#include
@@ -151,12 +151,15 @@
warn("%s", *argv);
continue;
}
- if (elf_ldd(fd, *argv, fmt1, fmt2) == -1 &&
+ if (elf_ldd(fd, *argv, fmt1, fmt2) == -1
/* Alpha never had 32 bit support. */
#if defined(_LP64) && !defined(__alpha__)
- elf32_ldd(fd, *argv, fmt1, fmt2) == -1 &&
+ && elf32_ldd(fd, *argv, fmt1, fmt2) == -1
#endif
- aout_ldd(fd, *argv, fmt1, fmt2) == -1)
+#if !defined(__mips__)
+ && aout_ldd(fd, *argv, fmt1, fmt2) == -1
+#endif
+ )
warnx("%s", error_message);
close(fd);
}
CVS commit: src/usr.bin/ldd
Module Name:src
Committed By: he
Date: Thu Aug 20 21:07:47 UTC 2009
Modified Files:
src/usr.bin/ldd: Makefile
Log Message:
Um, the test for mips should use MACHINE_CPU, not MACHINE_ARCH.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/ldd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/Makefile
diff -u src/usr.bin/ldd/Makefile:1.11 src/usr.bin/ldd/Makefile:1.12
--- src/usr.bin/ldd/Makefile:1.11 Thu Aug 20 19:17:19 2009
+++ src/usr.bin/ldd/Makefile Thu Aug 20 21:07:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/08/20 19:17:19 he Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/20 21:07:47 he Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
@@ -9,7 +9,7 @@
MAN= ldd.1
-.if (${MACHINE_ARCH} != "mips")
+.if (${MACHINE_CPU} != "mips")
SUBDIR= aout
LIB_AOUTDIR!= cd ${.CURDIR}/aout && ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_AOUTDIR}/libldd_aout.a
CVS commit: src/usr.sbin/lpr/lpr
Module Name:src
Committed By: he
Date: Thu Aug 20 21:25:59 UTC 2009
Modified Files:
src/usr.sbin/lpr/lpr: lpr.c
Log Message:
Remove what appears to be a spurious include of a.out.h.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/lpr/lpr/lpr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/lpr/lpr/lpr.c
diff -u src/usr.sbin/lpr/lpr/lpr.c:1.42 src/usr.sbin/lpr/lpr/lpr.c:1.43
--- src/usr.sbin/lpr/lpr/lpr.c:1.42 Sun Jan 18 09:57:26 2009
+++ src/usr.sbin/lpr/lpr/lpr.c Thu Aug 20 21:25:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lpr.c,v 1.42 2009/01/18 09:57:26 lukem Exp $ */
+/* $NetBSD: lpr.c,v 1.43 2009/08/20 21:25:59 he Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: lpr.c,v 1.42 2009/01/18 09:57:26 lukem Exp $");
+__RCSID("$NetBSD: lpr.c,v 1.43 2009/08/20 21:25:59 he Exp $");
#endif
#endif /* not lint */
@@ -59,7 +59,6 @@
#include
#include
-#include
#include
#include
#include
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: he
Date: Thu Aug 20 21:59:13 UTC 2009
Modified Files:
src/usr.sbin/mopd/common: Makefile
Log Message:
Define NOAOUT if we're building for mips.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mopd/common/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mopd/common/Makefile
diff -u src/usr.sbin/mopd/common/Makefile:1.13 src/usr.sbin/mopd/common/Makefile:1.14
--- src/usr.sbin/mopd/common/Makefile:1.13 Sat Oct 25 22:27:39 2008
+++ src/usr.sbin/mopd/common/Makefile Thu Aug 20 21:59:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/10/25 22:27:39 apb Exp $
+# $NetBSD: Makefile,v 1.14 2009/08/20 21:59:12 he Exp $
LIBISPRIVATE= yes
@@ -7,6 +7,12 @@
print.c put.c rc.c version.c
CLEANFILES= version.c
+.include
+
+.if ${MACHINE_CPU} == "mips"
+CFLAGS+= -DNOAOUT
+.endif
+
version.c: VERSION
${_MKTARGET_CREATE}
rm -f version.c; \
CVS commit: src
Module Name:src Committed By: he Date: Thu Aug 20 22:07:50 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi src/sys/sys: Makefile core.h exec_aout.h Added Files: src/sys/sys: aout_mids.h Log Message: Introduce , and include it from and . This contains the various a.out machine IDs moved out from exec_aout.h. The a.out machine IDs are not only used to identify a.out executable files, but also used to identify NetBSD core dumps, so should be accessible outside of exec_aout.h. OK'ed by matt@ To generate a diff of this commit: cvs rdiff -u -r1.1293 -r1.1294 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.120 -r1.121 src/sys/sys/Makefile cvs rdiff -u -r0 -r1.1 src/sys/sys/aout_mids.h cvs rdiff -u -r1.11 -r1.12 src/sys/sys/core.h cvs rdiff -u -r1.38 -r1.39 src/sys/sys/exec_aout.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1293 src/distrib/sets/lists/comp/mi:1.1294 --- src/distrib/sets/lists/comp/mi:1.1293 Sat Aug 15 16:21:04 2009 +++ src/distrib/sets/lists/comp/mi Thu Aug 20 22:07:49 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1293 2009/08/15 16:21:04 joerg Exp $ +# $NetBSD: mi,v 1.1294 2009/08/20 22:07:49 he Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1921,6 +1921,7 @@ ./usr/include/sys/agpio.h comp-c-include ./usr/include/sys/aio.hcomp-c-include ./usr/include/sys/ansi.h comp-c-include +./usr/include/sys/aout_mids.h comp-c-include ./usr/include/sys/ataio.h comp-c-include ./usr/include/sys/atomic.h comp-c-include ./usr/include/sys/audioio.h comp-c-include Index: src/sys/sys/Makefile diff -u src/sys/sys/Makefile:1.120 src/sys/sys/Makefile:1.121 --- src/sys/sys/Makefile:1.120 Sat Aug 15 09:43:59 2009 +++ src/sys/sys/Makefile Thu Aug 20 22:07:49 2009 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.120 2009/08/15 09:43:59 mbalmer Exp $ +# $NetBSD: Makefile,v 1.121 2009/08/20 22:07:49 he Exp $ .include INCSDIR= /usr/include/sys -INCS= acct.h agpio.h aio.h ansi.h ataio.h atomic.h audioio.h \ +INCS= acct.h agpio.h aio.h ansi.h aout_mids.h ataio.h atomic.h audioio.h \ bitops.h bootblock.h bswap.h buf.h \ callback.h callout.h cdefs.h cdefs_aout.h \ cdefs_elf.h cdio.h chio.h clockctl.h condvar.h conf.h core.h \ Index: src/sys/sys/core.h diff -u src/sys/sys/core.h:1.11 src/sys/sys/core.h:1.12 --- src/sys/sys/core.h:1.11 Mon Apr 28 20:24:10 2008 +++ src/sys/sys/core.h Thu Aug 20 22:07:49 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: core.h,v 1.11 2008/04/28 20:24:10 martin Exp $ */ +/* $NetBSD: core.h,v 1.12 2009/08/20 22:07:49 he Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -57,6 +57,8 @@ #define CORE_DATA 2 #define CORE_STACK 4 +#include + /* * A core file consists of a header followed by a number of segments. * Each segment is preceded by a `coreseg' structure giving the Index: src/sys/sys/exec_aout.h diff -u src/sys/sys/exec_aout.h:1.38 src/sys/sys/exec_aout.h:1.39 --- src/sys/sys/exec_aout.h:1.38 Mon Dec 26 18:41:36 2005 +++ src/sys/sys/exec_aout.h Thu Aug 20 22:07:49 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: exec_aout.h,v 1.38 2005/12/26 18:41:36 perry Exp $ */ +/* $NetBSD: exec_aout.h,v 1.39 2009/08/20 22:07:49 he Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -59,41 +59,7 @@ #define ZMAGIC 0413 /* demand load format */ #define QMAGIC 0314 /* "compact" demand load format; deprecated */ -/* - * a_mid - keep sorted in numerical order for sanity's sake - * ensure that: 0 < mid < 0x3ff - */ -#define MID_ZERO 0 /* unknown - implementation dependent */ -#define MID_SUN010 1 /* sun 68010/68020 binary */ -#define MID_SUN020 2 /* sun 68020-only binary */ -#define MID_PC386 100 /* 386 PC binary. (so quoth BFD) */ -#define MID_HP200 200 /* hp200 (68010) BSD binary */ -#define MID_I386 134 /* i386 BSD binary */ -#define MID_M68K 135 /* m68k BSD binary with 8K page sizes */ -#define MID_M68K4K 136 /* m68k BSD binary with 4K page sizes */ -#define MID_NS32532 137 /* ns32532 */ -#define MID_SPARC 138 /* sparc */ -#define MID_PMAX 139 /* pmax */ -#define MID_VAX1K 140 /* VAX 1K page size binaries */ -#define MID_ALPHA 141 /* Alpha BSD binary */ -#define MID_MIPS 142 /* big-endian MIPS */ -#define MID_ARM6 143 /* ARM6 */ -#define MID_M680002K 144 /* m68000 with 2K page sizes */ -#define MID_SH3 145 /* SH3 */ -#define MID_POWERPC 149 /* big-endian PowerPC */ -#define MID_VAX 150 /* VAX */ -/* 151 - MIPS1 */ -/* 152 - MIPS2 */ -#define MID_M88K 153 /* m88k BSD */ -#define MID_HPPA 154 /* HP PARISC */ -#define MID_SH5_64 155 /* LP64 SH5 */ -#define MID_SPARC64 156 /* LP64 sparc */ -#define MID_X86_64 157 /* AMD x86-64 */ -#define MID_SH5_32 158 /* ILP32 SH5 */ -#define MID_HP200 200 /* hp200 (68010) BSD binary */ -#define MID_HP300 300 /* hp300 (68020+68881) BSD binary */ -#define MID_HP
CVS commit: src/usr.sbin/mopd/mopcopy
Module Name:src
Committed By: he
Date: Thu Aug 20 22:26:19 UTC 2009
Modified Files:
src/usr.sbin/mopd/mopcopy: Makefile mopcopy.c
Log Message:
Use NOAOUT so that this builds without a.out support, and enable
that define if we're building for mips.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mopd/mopcopy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/mopd/mopcopy/mopcopy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mopd/mopcopy/Makefile
diff -u src/usr.sbin/mopd/mopcopy/Makefile:1.1 src/usr.sbin/mopd/mopcopy/Makefile:1.2
--- src/usr.sbin/mopd/mopcopy/Makefile:1.1 Thu Jun 6 23:01:00 2002
+++ src/usr.sbin/mopd/mopcopy/Makefile Thu Aug 20 22:26:19 2009
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2002/06/06 23:01:00 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/20 22:26:19 he Exp $
PROG= mopcopy
+.include
+.if ${MACHINE_CPU} == "mips"
+CFLAGS+= -DNOAOUT
+.endif
+
.include
Index: src/usr.sbin/mopd/mopcopy/mopcopy.c
diff -u src/usr.sbin/mopd/mopcopy/mopcopy.c:1.3 src/usr.sbin/mopd/mopcopy/mopcopy.c:1.4
--- src/usr.sbin/mopd/mopcopy/mopcopy.c:1.3 Tue Nov 5 05:06:05 2002
+++ src/usr.sbin/mopd/mopcopy/mopcopy.c Thu Aug 20 22:26:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mopcopy.c,v 1.3 2002/11/05 05:06:05 thorpej Exp $ */
+/* $NetBSD: mopcopy.c,v 1.4 2009/08/20 22:26:19 he Exp $ */
/* mopcopy - Convert a Unix format kernel into something that
* can be transfered via MOP.
@@ -49,19 +49,21 @@
#include
#ifndef lint
-__RCSID("$NetBSD: mopcopy.c,v 1.3 2002/11/05 05:06:05 thorpej Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.4 2009/08/20 22:26:19 he Exp $");
#endif
#include "os.h"
#include "common.h"
#include "mopdef.h"
#include "file.h"
+#if !defined(NOAOUT)
#if defined(__NetBSD__) || defined(__OpenBSD__)
#include
#endif
#if defined(__FreeBSD__)
#include
#endif
+#endif /* !NOAOUT */
#if defined(__bsdi__)
#include
#define NOAOUT
@@ -82,7 +84,9 @@
#endif /* NOELF */
u_char header[512]; /* The VAX header we generate is 1 block. */
+#if !defined(NOAOUT)
struct exec ex, ex_swap;
+#endif
int
main (int argc, char **argv)
CVS commit: src
Module Name:src
Committed By: he
Date: Fri Aug 21 08:42:02 UTC 2009
Modified Files:
src/include: nlist.h
src/lib/libc/gen: nlist_coff.c nlist_ecoff.c nlist_elf32.c
nlist_private.h
Log Message:
Introduce a new accessor macro N_NAME() to access the n_name field
in struct nlist, since it's accessed differently depending on
whether we do a.out or not. Use this macro as appropriate in the
nlist* functions.
Also replace some includes of with , to fix build
problem for mips.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/include/nlist.h
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/gen/nlist_coff.c
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/gen/nlist_ecoff.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/gen/nlist_elf32.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/gen/nlist_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/nlist.h
diff -u src/include/nlist.h:1.13 src/include/nlist.h:1.14
--- src/include/nlist.h:1.13 Sat Feb 26 21:16:35 2005
+++ src/include/nlist.h Fri Aug 21 08:42:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist.h,v 1.13 2005/02/26 21:16:35 dsl Exp $ */
+/* $NetBSD: nlist.h,v 1.14 2009/08/21 08:42:02 he Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -51,8 +51,10 @@
__aconst char *n_name; /* symbol name (in memory) */
long n_strx; /* file string table offset (on disk) */
} n_un;
+# define N_NAME(nlp) ((nlp)->n_un.n_name)
#else
const char *n_name; /* symbol name (in memory) */
+# define N_NAME(nlp) ((nlp)->n_name)
#endif
#define N_UNDF 0x00 /* undefined */
Index: src/lib/libc/gen/nlist_coff.c
diff -u src/lib/libc/gen/nlist_coff.c:1.7 src/lib/libc/gen/nlist_coff.c:1.8
--- src/lib/libc/gen/nlist_coff.c:1.7 Mon Feb 16 10:40:45 2009
+++ src/lib/libc/gen/nlist_coff.c Fri Aug 21 08:42:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_coff.c,v 1.7 2009/02/16 10:40:45 lukem Exp $ */
+/* $NetBSD: nlist_coff.c,v 1.8 2009/08/21 08:42:02 he Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_coff.c,v 1.7 2009/02/16 10:40:45 lukem Exp $");
+__RCSID("$NetBSD: nlist_coff.c,v 1.8 2009/08/21 08:42:02 he Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -50,7 +50,7 @@
#include
#include
#include
-#include /* for 'struct nlist' declaration */
+#include
#include "nlist_private.h"
#ifdef NLIST_COFF
@@ -151,7 +151,7 @@
for (i = 0; i < nesyms; i++) {
char *symtabname;
- char *nlistname;
+ const char *nlistname;
struct coff_extsym esym;
char name[10];
@@ -171,7 +171,7 @@
continue;
for (p = list; !ISLAST(p); p++) {
- nlistname = p->n_un.n_name;
+ nlistname = N_NAME(p);
if (!strcmp(symtabname, nlistname)) {
/*
* Translate (roughly) from COFF to nlist
Index: src/lib/libc/gen/nlist_ecoff.c
diff -u src/lib/libc/gen/nlist_ecoff.c:1.17 src/lib/libc/gen/nlist_ecoff.c:1.18
--- src/lib/libc/gen/nlist_ecoff.c:1.17 Mon Feb 16 10:40:45 2009
+++ src/lib/libc/gen/nlist_ecoff.c Fri Aug 21 08:42:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_ecoff.c,v 1.17 2009/02/16 10:40:45 lukem Exp $ */
+/* $NetBSD: nlist_ecoff.c,v 1.18 2009/08/21 08:42:02 he Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_ecoff.c,v 1.17 2009/02/16 10:40:45 lukem Exp $");
+__RCSID("$NetBSD: nlist_ecoff.c,v 1.18 2009/08/21 08:42:02 he Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -50,7 +50,7 @@
#include
#include
#include
-#include /* for 'struct nlist' declaration */
+#include
#include "nlist_private.h"
#ifdef NLIST_ECOFF
@@ -151,11 +151,11 @@
for (i = 0; i < nesyms; i++) {
for (p = list; !ISLAST(p); p++) {
- char *nlistname;
+ const char *nlistname;
char *symtabname;
/* This may be incorrect */
- nlistname = p->n_un.n_name;
+ nlistname = N_NAME(p);
if (*nlistname == '_')
nlistname++;
Index: src/lib/libc/gen/nlist_elf32.c
diff -u src/lib/libc/gen/nlist_elf32.c:1.30 src/lib/libc/gen/nlist_elf32.c:1.31
--- src/lib/libc/gen/nlist_elf32.c:1.30 Mon Feb 16 10:40:45 2009
+++ src/lib/libc/gen/nlist_elf32.c Fri Aug 21 08:42:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_elf32.c,v 1.30 2009/02/16 10:40:45 lukem Exp $ */
+/* $NetBSD: nlist_elf32.c,v 1.31 2009/08/21 08:42:02 he Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_elf32.c,v 1.30 2009/02/16 10:40:45 lukem Exp $");
+__RCSID("$NetBSD: nlist_elf32.c,v 1.31 2009/08/21 08:42:02 he Exp $");
#endif /* LIBC_SCCS and not lint */
/* If not included by nlist_elf64.c, ELFSIZE won't be defined. */
@@ -57,7 +57,7 @@
#include
#include
#include
-#include /* for 'struct nlist' decla
CVS commit: src/regress/include/okheaders
Module Name:src Committed By: he Date: Fri Aug 21 13:30:54 UTC 2009 Modified Files: src/regress/include/okheaders: symbolcheck.c Log Message: Don't try to include or on mips. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/regress/include/okheaders/symbolcheck.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/regress/include/okheaders/symbolcheck.c diff -u src/regress/include/okheaders/symbolcheck.c:1.28 src/regress/include/okheaders/symbolcheck.c:1.29 --- src/regress/include/okheaders/symbolcheck.c:1.28 Wed Nov 12 12:35:52 2008 +++ src/regress/include/okheaders/symbolcheck.c Fri Aug 21 13:30:54 2009 @@ -207,7 +207,9 @@ #include #include +#if !defined(__mips__) #include +#endif #include #include #include @@ -253,7 +255,9 @@ #include #include #include +#if !defined(__mips__) #include +#endif #include #include #include
CVS commit: src/rescue
Module Name:src
Committed By: he
Date: Fri Aug 21 15:16:46 UTC 2009
Modified Files:
src/rescue: Makefile
Added Files:
src/rescue: list.ldd.noaout
Log Message:
Add a new list.ldd.noaout, which is a copy of list.ldd but without
the a.out support.
Tweak Makefile so that the a.out support is not built for mips.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/rescue/Makefile
cvs rdiff -u -r0 -r1.1 src/rescue/list.ldd.noaout
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.22 src/rescue/Makefile:1.23
--- src/rescue/Makefile:1.22 Wed Jan 7 00:39:23 2009
+++ src/rescue/Makefile Fri Aug 21 15:16:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/01/07 00:39:23 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2009/08/21 15:16:45 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -35,11 +35,16 @@
CRUNCHENV+= MKKERBEROS=no # for ssh
.endif
+.if ${MACHINE_CPU} != "mips"
LISTS+= ${.CURDIR}/list.ldd
LDD_AOUTDIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/aout && ${PRINTOBJDIR}
+PARSELISTENV+= LDD_AOUTDIR=${LDD_AOUTDIR}
+.else
+LISTS+= ${.CURDIR}/list.ldd.noaout
+.endif
LDD_ELF32DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf32 && ${PRINTOBJDIR}
LDD_ELF64DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf64 && ${PRINTOBJDIR}
-PARSELISTENV+= LDD_AOUTDIR=${LDD_AOUTDIR} LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
+PARSELISTENV+= LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
# Specially built objects to override the behaviour of
# various library functions
Added files:
Index: src/rescue/list.ldd.noaout
diff -u /dev/null src/rescue/list.ldd.noaout:1.1
--- /dev/null Fri Aug 21 15:16:46 2009
+++ src/rescue/list.ldd.noaout Fri Aug 21 15:16:46 2009
@@ -0,0 +1,12 @@
+# $NetBSD: list.ldd.noaout,v 1.1 2009/08/21 15:16:46 he Exp $
+
+PROG ldd
+
+LIBS ${LDD_ELF32DIR}/libldd_elf32.a
+LIBS ${LDD_ELF64DIR}/libldd_elf64.a
+
+SPECIAL ldd keepsymbols _rtld_pagesz _rtld_error _rtld_trust
+SPECIAL ldd keepsymbols _rtld_default_paths _rtld_paths
+SPECIAL ldd keepsymbols _rtld_xforms _rtld_objmain
+SPECIAL ldd keepsymbols _rtld_objtail _rtld_objlist
+SPECIAL ldd keepsymbols print_needed main_local main_progname
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: he
Date: Fri Aug 21 21:12:02 UTC 2009
Modified Files:
src/sys/lib/libsa: Makefile
Log Message:
If we're on mips, don't build exec.c or loadfile_aout.c, since they
both deal with a.out format executables.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/lib/libsa/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/lib/libsa/Makefile
diff -u src/sys/lib/libsa/Makefile:1.68 src/sys/lib/libsa/Makefile:1.69
--- src/sys/lib/libsa/Makefile:1.68 Fri Mar 20 11:31:30 2009
+++ src/sys/lib/libsa/Makefile Fri Aug 21 21:12:02 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2009/03/20 11:31:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.69 2009/08/21 21:12:02 he Exp $
LIB= sa
NOPIC= # defined
@@ -18,14 +18,20 @@
.-include "${SA_EXTRADIR}/Makefile.inc"
.endif
+.include
+
.PATH.c: ${SADIR} ${.PARSEDIR}/../../../common/lib/libc/string
# stand routines
-SRCS+= alloc.c errno.c exit.c exec.c files.c \
+SRCS+= alloc.c errno.c exit.c files.c \
getfile.c gets.c globals.c \
panic.c printf.c qsort.c snprintf.c sprintf.c strerror.c \
subr_prf.c twiddle.c vsprintf.c checkpasswd.c
+.if (${MACHINE_CPU} != "mips")
+SRCS+= exec.c loadfile_aout.c
+.endif
+
# string routines
SRCS+= memcmp.c memcpy.c memmove.c memset.c strchr.c
SRCS+= bcopy.c bzero.c # Remove me eventually.
@@ -39,7 +45,7 @@
.endif
.if (${SA_USE_LOADFILE} == "yes")
-SRCS+= loadfile.c loadfile_aout.c loadfile_ecoff.c loadfile_elf32.c \
+SRCS+= loadfile.c loadfile_ecoff.c loadfile_elf32.c \
loadfile_elf64.c
.endif
CVS commit: src/sys/arch/mvme68k/stand/bootxx
Module Name:src Committed By: he Date: Sat Aug 22 10:02:21 UTC 2009 Modified Files: src/sys/arch/mvme68k/stand/bootxx: bootxx.c Log Message: This one needs , so include it explicitly. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvme68k/stand/bootxx/bootxx.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/mvme68k/stand/bootxx/bootxx.c diff -u src/sys/arch/mvme68k/stand/bootxx/bootxx.c:1.15 src/sys/arch/mvme68k/stand/bootxx/bootxx.c:1.16 --- src/sys/arch/mvme68k/stand/bootxx/bootxx.c:1.15 Mon Apr 28 20:23:29 2008 +++ src/sys/arch/mvme68k/stand/bootxx/bootxx.c Sat Aug 22 10:02:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bootxx.c,v 1.15 2008/04/28 20:23:29 martin Exp $ */ +/* $NetBSD: bootxx.c,v 1.16 2009/08/22 10:02:21 he Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -43,6 +43,7 @@ #include #include #include +#include #include #include
CVS commit: src/sys/arch/pmax/include
Module Name:src Committed By: he Date: Sat Aug 22 23:08:01 UTC 2009 Modified Files: src/sys/arch/pmax/include: loadfile_machdep.h Log Message: Remove BOOT_AOUT, since our mips ports no longer deal with a.out. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/pmax/include/loadfile_machdep.h 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/pmax/include/loadfile_machdep.h diff -u src/sys/arch/pmax/include/loadfile_machdep.h:1.6 src/sys/arch/pmax/include/loadfile_machdep.h:1.7 --- src/sys/arch/pmax/include/loadfile_machdep.h:1.6 Mon Apr 28 20:23:31 2008 +++ src/sys/arch/pmax/include/loadfile_machdep.h Sat Aug 22 23:08:01 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.h,v 1.6 2008/04/28 20:23:31 martin Exp $ */ +/* $NetBSD: loadfile_machdep.h,v 1.7 2009/08/22 23:08:01 he Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -32,7 +32,6 @@ #ifndef _PMAX_LOADFILE_MACHDEP_H_ #define _PMAX_LOADFILE_MACHDEP_H_ -#define BOOT_AOUT #define BOOT_ECOFF #define BOOT_ELF32
CVS commit: src/sys/arch/sgimips/include
Module Name:src Committed By: he Date: Sun Aug 23 08:32:23 UTC 2009 Modified Files: src/sys/arch/sgimips/include: loadfile_machdep.h Log Message: Remove BOOT_AOUT here as well, mips no longer deals with a.out. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/include/loadfile_machdep.h 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/sgimips/include/loadfile_machdep.h diff -u src/sys/arch/sgimips/include/loadfile_machdep.h:1.6 src/sys/arch/sgimips/include/loadfile_machdep.h:1.7 --- src/sys/arch/sgimips/include/loadfile_machdep.h:1.6 Mon Apr 28 20:23:34 2008 +++ src/sys/arch/sgimips/include/loadfile_machdep.h Sun Aug 23 08:32:22 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.h,v 1.6 2008/04/28 20:23:34 martin Exp $ */ +/* $NetBSD: loadfile_machdep.h,v 1.7 2009/08/23 08:32:22 he Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -32,7 +32,6 @@ #ifndef _SGIMIPS_LOADFILE_MACHDEP_H_ #define _SGIMIPS_LOADFILE_MACHDEP_H_ -#define BOOT_AOUT #define BOOT_ECOFF #define BOOT_ELF32
CVS commit: src/sys/arch/sparc/stand/bootxx
Module Name:src Committed By: he Date: Sun Aug 23 08:51:56 UTC 2009 Modified Files: src/sys/arch/sparc/stand/bootxx: bootxx.c Log Message: We need an explicit include of here as well. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/stand/bootxx/bootxx.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/sparc/stand/bootxx/bootxx.c diff -u src/sys/arch/sparc/stand/bootxx/bootxx.c:1.23 src/sys/arch/sparc/stand/bootxx/bootxx.c:1.24 --- src/sys/arch/sparc/stand/bootxx/bootxx.c:1.23 Mon Mar 23 13:47:32 2009 +++ src/sys/arch/sparc/stand/bootxx/bootxx.c Sun Aug 23 08:51:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bootxx.c,v 1.23 2009/03/23 13:47:32 tsutsui Exp $ */ +/* $NetBSD: bootxx.c,v 1.24 2009/08/23 08:51:56 he Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,6 +31,7 @@ #include #include +#include #include #include
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: he
Date: Tue Aug 25 14:10:54 UTC 2009
Modified Files:
src/sys/lib/libsa: Makefile
Log Message:
Uh, move loadfile_aout.c in under the check for ${SA_USE_LOADFILE}
again, so that it's not unconditionally compiled, fixing the previous.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/lib/libsa/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/lib/libsa/Makefile
diff -u src/sys/lib/libsa/Makefile:1.69 src/sys/lib/libsa/Makefile:1.70
--- src/sys/lib/libsa/Makefile:1.69 Fri Aug 21 21:12:02 2009
+++ src/sys/lib/libsa/Makefile Tue Aug 25 14:10:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2009/08/21 21:12:02 he Exp $
+# $NetBSD: Makefile,v 1.70 2009/08/25 14:10:54 he Exp $
LIB= sa
NOPIC= # defined
@@ -29,7 +29,7 @@
subr_prf.c twiddle.c vsprintf.c checkpasswd.c
.if (${MACHINE_CPU} != "mips")
-SRCS+= exec.c loadfile_aout.c
+SRCS+= exec.c
.endif
# string routines
@@ -47,6 +47,9 @@
.if (${SA_USE_LOADFILE} == "yes")
SRCS+= loadfile.c loadfile_ecoff.c loadfile_elf32.c \
loadfile_elf64.c
+.if (${MACHINE_CPU} != "mips")
+SRCS+= loadfile_aout.c
+.endif
.endif
.if (${SA_INCLUDE_NET} == "yes")
CVS commit: src/sys/rump/librump/rumpdev
Module Name:src Committed By: he Date: Fri Sep 4 08:57:00 UTC 2009 Modified Files: src/sys/rump/librump/rumpdev: devnodes.c Log Message: Both amiga and atari needs explicitly included in order for curlwp to be properly declared. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpdev/devnodes.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/librump/rumpdev/devnodes.c diff -u src/sys/rump/librump/rumpdev/devnodes.c:1.2 src/sys/rump/librump/rumpdev/devnodes.c:1.3 --- src/sys/rump/librump/rumpdev/devnodes.c:1.2 Wed Sep 2 16:55:07 2009 +++ src/sys/rump/librump/rumpdev/devnodes.c Fri Sep 4 08:57:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: devnodes.c,v 1.2 2009/09/02 16:55:07 pooka Exp $ */ +/* $NetBSD: devnodes.c,v 1.3 2009/09/04 08:57:00 he Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,12 +26,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: devnodes.c,v 1.2 2009/09/02 16:55:07 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: devnodes.c,v 1.3 2009/09/04 08:57:00 he Exp $"); #include #include #include #include +#include #include #include
CVS commit: src/sys/opencrypto
Module Name:src Committed By: he Date: Fri Sep 4 08:58:44 UTC 2009 Modified Files: src/sys/opencrypto: cryptodev.h Log Message: It is best to explicitly include if we're going to use kcondvar_t. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/opencrypto/cryptodev.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/opencrypto/cryptodev.h diff -u src/sys/opencrypto/cryptodev.h:1.16 src/sys/opencrypto/cryptodev.h:1.17 --- src/sys/opencrypto/cryptodev.h:1.16 Wed Mar 25 01:26:13 2009 +++ src/sys/opencrypto/cryptodev.h Fri Sep 4 08:58:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptodev.h,v 1.16 2009/03/25 01:26:13 darran Exp $ */ +/* $NetBSD: cryptodev.h,v 1.17 2009/09/04 08:58:44 he Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */ /* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */ @@ -86,6 +86,7 @@ #define _CRYPTO_CRYPTO_H_ #include +#include /* Some initial values */ #define CRYPTO_DRIVERS_INITIAL 4
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: he Date: Mon Sep 7 08:22:51 UTC 2009 Modified Files: src/distrib/sets/lists/tests: mi module.mi Log Message: Move ./usr/tests/modules/Atffile from tests/mi to tests/module.mi. This should get us building for evbppc again, which doesn't do modules. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/tests/module.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.46 src/distrib/sets/lists/tests/mi:1.47 --- src/distrib/sets/lists/tests/mi:1.46 Wed Jul 22 21:35:38 2009 +++ src/distrib/sets/lists/tests/mi Mon Sep 7 08:22:51 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.46 2009/07/22 21:35:38 joerg Exp $ +# $NetBSD: mi,v 1.47 2009/09/07 08:22:51 he Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -853,7 +853,6 @@ ./usr/tests/lib/libc/string/Atffile tests-lib-tests ./usr/tests/lib/libc/string/t_popcount tests-lib-tests ./usr/tests/modulestests-sys-tests -./usr/tests/modules/Atffile tests-sys-tests ./usr/tests/net tests-net-tests ./usr/tests/net/Atffiletests-net-tests ./usr/tests/net/systests-net-tests Index: src/distrib/sets/lists/tests/module.mi diff -u src/distrib/sets/lists/tests/module.mi:1.1 src/distrib/sets/lists/tests/module.mi:1.2 --- src/distrib/sets/lists/tests/module.mi:1.1 Sun Jan 18 12:49:07 2009 +++ src/distrib/sets/lists/tests/module.mi Mon Sep 7 08:22:51 2009 @@ -1,7 +1,8 @@ -# $NetBSD: module.mi,v 1.1 2009/01/18 12:49:07 he Exp $ +# $NetBSD: module.mi,v 1.2 2009/09/07 08:22:51 he Exp $ # # These are only made for ports doing modules. # +./usr/tests/modules/Atffile tests-sys-tests ./usr/tests/modules/k_helper tests-sys-tests ./usr/tests/modules/k_helper/k_helper.kmod tests-sys-tests ./usr/tests/modules/t_modctl tests-sys-tests
CVS commit: src/etc/mtree
Module Name:src
Committed By: he
Date: Tue Sep 8 09:57:32 UTC 2009
Modified Files:
src/etc/mtree: Makefile
Log Message:
Allow builds without X11 to succeed. The previous change when used
in this situation caused the contents of ${.CURDIR} to be cat'ed
into the generated NetBSD.dist mtree spec file, resulting in
${DESTDIR}/var/yp/binding/ being created, causing set list
check failure at the end of the build.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/etc/mtree/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.6 src/etc/mtree/Makefile:1.7
--- src/etc/mtree/Makefile:1.6 Mon Sep 7 19:34:30 2009
+++ src/etc/mtree/Makefile Tue Sep 8 09:57:32 2009
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2009/09/07 19:34:30 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/08 09:57:32 he Exp $
.include
.if ${MKX11} != "no"
. if ${X11FLAVOUR} == "Xorg"
-NETBSD_DIST_X11_FILE= NetBSD.dist.Xorg
+NETBSD_DIST_X11_FILE= ${.CURDIR}/NetBSD.dist.Xorg
. else
-NETBSD_DIST_X11_FILE= NetBSD.dist.XFree86
+NETBSD_DIST_X11_FILE= ${.CURDIR}/NetBSD.dist.XFree86
. endif
.else
NETBSD_DIST_X11_FILE=
.endif
NetBSD.dist: NetBSD.dist.base ${NETBSD_DIST_X11_FILE}
- ${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${.CURDIR}/${NETBSD_DIST_X11_FILE} > ${.TARGET}
+ ${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${NETBSD_DIST_X11_FILE} > ${.TARGET}
CONFIGFILES= NetBSD.dist special
FILESDIR= /etc/mtree
CVS commit: src/tools
Module Name:src
Committed By: he
Date: Mon Sep 14 13:44:05 UTC 2009
Modified Files:
src/tools: Makefile.disklabel
Log Message:
We need to install disklabel_rdb.h here as well, so that the
toolized disklabel for amiga (at least) can be allowed to build.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tools/Makefile.disklabel
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile.disklabel
diff -u src/tools/Makefile.disklabel:1.12 src/tools/Makefile.disklabel:1.13
--- src/tools/Makefile.disklabel:1.12 Sat Oct 25 22:15:28 2008
+++ src/tools/Makefile.disklabel Mon Sep 14 13:44:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.disklabel,v 1.12 2008/10/25 22:15:28 apb Exp $
+# $NetBSD: Makefile.disklabel,v 1.13 2009/09/14 13:44:05 he Exp $
# NOxxx definitions are copied from Makefile.host, and are
# required before .include . The include of bsd.own.mk
@@ -28,7 +28,8 @@
_INCS= disktab.h
_SYSINCS= bootblock.h \
- disklabel.h disklabel_acorn.h disklabel_gpt.h dkbad.h
+ disklabel.h disklabel_acorn.h disklabel_gpt.h disklabel_rdb.h \
+ dkbad.h
HOST_CPPFLAGS+= -I${TOOLDIR}/include
CVS commit: src/dist/tcpdump
Module Name:src
Committed By: he
Date: Mon Sep 14 15:18:15 UTC 2009
Modified Files:
src/dist/tcpdump: print-pfsync.c
Log Message:
Print an explicit 64-bit type with %PRIu64, not with %llu, so that
this builds on our LP64 ports as well.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/dist/tcpdump/print-pfsync.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/tcpdump/print-pfsync.c
diff -u src/dist/tcpdump/print-pfsync.c:1.1 src/dist/tcpdump/print-pfsync.c:1.2
--- src/dist/tcpdump/print-pfsync.c:1.1 Mon Sep 14 10:36:49 2009
+++ src/dist/tcpdump/print-pfsync.c Mon Sep 14 15:18:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-pfsync.c,v 1.1 2009/09/14 10:36:49 degroote Exp $ */
+/* $NetBSD: print-pfsync.c,v 1.2 2009/09/14 15:18:15 he Exp $ */
/* $OpenBSD: print-pfsync.c,v 1.30 2007/05/31 04:16:26 mcbride Exp $ */
/*
@@ -31,9 +31,9 @@
#ifndef lint
#if 0
static const char rcsid[] =
-"@(#) $Header: /cvsroot/src/dist/tcpdump/print-pfsync.c,v 1.1 2009/09/14 10:36:49 degroote Exp $";
+"@(#) $Header: /cvsroot/src/dist/tcpdump/print-pfsync.c,v 1.2 2009/09/14 15:18:15 he Exp $";
#else
-__RCSID("$NetBSD: print-pfsync.c,v 1.1 2009/09/14 10:36:49 degroote Exp $");
+__RCSID("$NetBSD: print-pfsync.c,v 1.2 2009/09/14 15:18:15 he Exp $");
#endif
#endif
@@ -211,7 +211,7 @@
case PFSYNC_ACT_TDB_UPD:
for (i = 1, t = (void *)((char *)hdr + PFSYNC_HDRLEN);
i <= hdr->count && i * sizeof(*t) <= len; i++, t++)
- printf("\n\tspi: %08x rpl: %u cur_bytes: %llu",
+ printf("\n\tspi: %08x rpl: %u cur_bytes: %" PRIu64,
htonl(t->spi), htonl(t->rpl),
be64toh(t->cur_bytes));
/* XXX add dst and sproto? */
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: he
Date: Mon Sep 14 15:12:21 UTC 2009
Modified Files:
src/sbin/ifconfig: Makefile.inc
Log Message:
Change from using ${.CURDIR} to ${NETBSDSRCDIR} because this file
may be included by different parts of the source tree, in particular
deep down in the distrib/ tree, where ../.. isn't sufficient to "climb"
up to the top of the tree. Fixes the build at least for our arc port.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sbin/ifconfig/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/Makefile.inc
diff -u src/sbin/ifconfig/Makefile.inc:1.4 src/sbin/ifconfig/Makefile.inc:1.5
--- src/sbin/ifconfig/Makefile.inc:1.4 Mon Sep 14 10:36:49 2009
+++ src/sbin/ifconfig/Makefile.inc Mon Sep 14 15:12:21 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/09/14 10:36:49 degroote Exp $
+# $NetBSD: Makefile.inc,v 1.5 2009/09/14 15:12:21 he Exp $
PROG= ifconfig
@@ -20,5 +20,5 @@
SRCS+= util.c
SRCS+= vlan.c
-CPPFLAGS+=-I ${.CURDIR}/../../sys/dist/pf/
+CPPFLAGS+=-I ${NETBSDSRCDIR}/sys/dist/pf/
SRCS+= pfsync.c
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: he
Date: Tue Sep 15 09:22:07 UTC 2009
Modified Files:
src/sbin/ifconfig: Makefile Makefile.inc
Log Message:
Move the addition of pfsync.c from Makefile.inc to Makefile,
so that this part doesn't get included in install media versions
of ifconfig, as per comments on source-changes@ from Izumi Tsutsui.
Also re-instate the use of ${.CURDIR} when setting up the include path.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sbin/ifconfig/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.43 src/sbin/ifconfig/Makefile:1.44
--- src/sbin/ifconfig/Makefile:1.43 Tue Jun 2 23:41:35 2009
+++ src/sbin/ifconfig/Makefile Tue Sep 15 09:22:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/06/02 23:41:35 pooka Exp $
+# $NetBSD: Makefile,v 1.44 2009/09/15 09:22:07 he Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -17,6 +17,9 @@
.include "Makefile.inc"
+CPPFLAGS+=-I ${.CURDIR}/../../sys/dist/pf/
+SRCS+= pfsync.c
+
.if ${MACHINE_ARCH} == "m68000"
# XXX workaround for gcc -O1 bug (PR bin/40036 and toolchain/40066)
COPTS.ifconfig.c+= -fno-loop-optimize
Index: src/sbin/ifconfig/Makefile.inc
diff -u src/sbin/ifconfig/Makefile.inc:1.5 src/sbin/ifconfig/Makefile.inc:1.6
--- src/sbin/ifconfig/Makefile.inc:1.5 Mon Sep 14 15:12:21 2009
+++ src/sbin/ifconfig/Makefile.inc Tue Sep 15 09:22:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2009/09/14 15:12:21 he Exp $
+# $NetBSD: Makefile.inc,v 1.6 2009/09/15 09:22:07 he Exp $
PROG= ifconfig
@@ -19,6 +19,3 @@
SRCS+= tunnel.c
SRCS+= util.c
SRCS+= vlan.c
-
-CPPFLAGS+=-I ${NETBSDSRCDIR}/sys/dist/pf/
-SRCS+= pfsync.c
CVS commit: src/distrib
Module Name:src
Committed By: he
Date: Thu Sep 24 21:04:46 UTC 2009
Modified Files:
src/distrib/acorn26/instkernel: Makefile
src/distrib/acorn32/ramdisk: Makefile
src/distrib/evbppc/ramdisk: Makefile
src/distrib/hp300/ramdisk: Makefile
src/distrib/hp700/ramdisk: Makefile
src/distrib/ibmnws/netboot/ramdisk: Makefile
src/distrib/macppc/floppies/ramdisk: Makefile
src/distrib/mipsco/ramdisk: Makefile
src/distrib/news68k/floppies/ramdisk: Makefile
src/distrib/newsmips/floppies/ramdisk: Makefile
src/distrib/ofppc/ramdisks/common: Makefile.ramdisk
src/distrib/prep/floppies/ramdisk: Makefile
src/distrib/sandpoint/ramdisk: Makefile
src/distrib/sun3/miniroot: Makefile
src/distrib/vax/ramdisk: Makefile
Log Message:
Replace references to local and now no-longer-existing termcap files
with references to ${DISTRIBB}/common/termcap. Hi, a...@!
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/acorn26/instkernel/Makefile
cvs rdiff -u -r1.20 -r1.21 src/distrib/acorn32/ramdisk/Makefile
cvs rdiff -u -r1.5 -r1.6 src/distrib/evbppc/ramdisk/Makefile
cvs rdiff -u -r1.27 -r1.28 src/distrib/hp300/ramdisk/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/hp700/ramdisk/Makefile
cvs rdiff -u -r1.6 -r1.7 src/distrib/ibmnws/netboot/ramdisk/Makefile
cvs rdiff -u -r1.35 -r1.36 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.17 -r1.18 src/distrib/mipsco/ramdisk/Makefile
cvs rdiff -u -r1.32 -r1.33 src/distrib/news68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.28 -r1.29 src/distrib/newsmips/floppies/ramdisk/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/ofppc/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.17 -r1.18 src/distrib/prep/floppies/ramdisk/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/sandpoint/ramdisk/Makefile
cvs rdiff -u -r1.41 -r1.42 src/distrib/sun3/miniroot/Makefile
cvs rdiff -u -r1.23 -r1.24 src/distrib/vax/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/acorn26/instkernel/Makefile
diff -u src/distrib/acorn26/instkernel/Makefile:1.12 src/distrib/acorn26/instkernel/Makefile:1.13
--- src/distrib/acorn26/instkernel/Makefile:1.12 Sun Sep 20 22:46:10 2009
+++ src/distrib/acorn26/instkernel/Makefile Thu Sep 24 21:04:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/09/20 22:46:10 abs Exp $
+# $NetBSD: Makefile,v 1.13 2009/09/24 21:04:45 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@
IMAGEENDIAN= le
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
- dot.profile termcap.src \
+ dot.profile ${DISTRIBDIR}/common/termcap \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
Index: src/distrib/acorn32/ramdisk/Makefile
diff -u src/distrib/acorn32/ramdisk/Makefile:1.20 src/distrib/acorn32/ramdisk/Makefile:1.21
--- src/distrib/acorn32/ramdisk/Makefile:1.20 Sun Sep 20 22:46:10 2009
+++ src/distrib/acorn32/ramdisk/Makefile Thu Sep 24 21:04:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/09/20 22:46:10 abs Exp $
+# $NetBSD: Makefile,v 1.21 2009/09/24 21:04:45 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@
IMAGEENDIAN= le
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
- dot.profile termcap.vt100 \
+ dot.profile ${DISTRIBDIR}/common/termcap \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
Index: src/distrib/evbppc/ramdisk/Makefile
diff -u src/distrib/evbppc/ramdisk/Makefile:1.5 src/distrib/evbppc/ramdisk/Makefile:1.6
--- src/distrib/evbppc/ramdisk/Makefile:1.5 Sun Sep 20 19:49:08 2009
+++ src/distrib/evbppc/ramdisk/Makefile Thu Sep 24 21:04:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/09/20 19:49:08 abs Exp $
+# $NetBSD: Makefile,v 1.6 2009/09/24 21:04:45 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
IMAGEDEPENDS= ${CRUNCHBIN} \
- dot.profile termcap.src \
+ dot.profile ${DISTRIBDIR}/common/termcap \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
Index: src/distrib/hp300/ramdisk/Makefile
diff -u src/distrib/hp300/ramdisk/Makefile:1.27 src/distrib/hp300/ramdisk/Makefile:1.28
--- src/distrib/hp300/ramdisk/Makefile:1.27 Sun Sep 20 19:49:08 2009
+++ src/distrib/hp300/ramdisk/Makefile Thu Sep 24 21:04:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/09/20 19:49:08 abs Exp $
+# $NetBSD: Makefile,v 1.28 2009/09/24 21:04:45 he Exp $
.include
CVS commit: src/sys/arch/sun68k/stand/libsa
Module Name:src
Committed By: he
Date: Fri Sep 25 11:19:35 UTC 2009
Modified Files:
src/sys/arch/sun68k/stand/libsa: Makefile.inc
Log Message:
Use .PATH.S instead of giving a source file with fully qualified path.
This should avoid the sun3 port contaminating its source tree during build
with .d and .o files corresponding to ctrlsp.S.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sun68k/stand/libsa/Makefile.inc
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/sun68k/stand/libsa/Makefile.inc
diff -u src/sys/arch/sun68k/stand/libsa/Makefile.inc:1.1 src/sys/arch/sun68k/stand/libsa/Makefile.inc:1.2
--- src/sys/arch/sun68k/stand/libsa/Makefile.inc:1.1 Fri Mar 20 11:42:25 2009
+++ src/sys/arch/sun68k/stand/libsa/Makefile.inc Fri Sep 25 11:19:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/03/20 11:42:25 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.2 2009/09/25 11:19:35 he Exp $
S!= cd ${SA_EXTRADIR}/../../../..; pwd
@@ -11,7 +11,8 @@
promboot.c promcons.c promdev.c putstr.c \
sun2.c sun3.c sun3x.c xxboot.c
-SRCS+= ${S}/arch/sun68k/sun68k/ctrlsp.S
+.PATH.S: ${S}/arch/sun68k/sun68k
+SRCS+= ctrlsp.S
# XXX libkern builds these only on m68000
.PATH.S: ${S}/../common/lib/libc/arch/m68k/gen
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src
Committed By: he
Date: Wed Dec 9 12:43:00 UTC 2009
Modified Files:
src/sys/arch/arm/s3c2xx0: sscom.c
Log Message:
Make this one build again.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/s3c2xx0/sscom.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/arm/s3c2xx0/sscom.c
diff -u src/sys/arch/arm/s3c2xx0/sscom.c:1.31 src/sys/arch/arm/s3c2xx0/sscom.c:1.32
--- src/sys/arch/arm/s3c2xx0/sscom.c:1.31 Sun Dec 6 21:35:05 2009
+++ src/sys/arch/arm/s3c2xx0/sscom.c Wed Dec 9 12:42:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom.c,v 1.31 2009/12/06 21:35:05 dyoung Exp $ */
+/* $NetBSD: sscom.c,v 1.32 2009/12/09 12:42:59 he Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -98,7 +98,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.31 2009/12/06 21:35:05 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.32 2009/12/09 12:42:59 he Exp $");
#include "opt_sscom.h"
#include "opt_ddb.h"
@@ -511,6 +511,8 @@
int
sscom_detach(device_t self, int flags)
{
+ struct sscom_softc *sc = device_private(self);
+
if (sc->sc_hwflags & (SSCOM_HW_CONSOLE|SSCOM_HW_KGDB))
return EBUSY;
@@ -520,7 +522,9 @@
int
sscom_activate(device_t self, enum devact act)
{
+#ifdef notyet
struct sscom_softc *sc = device_private(self);
+#endif
switch (act) {
case DVACT_DEACTIVATE:
CVS commit: src/distrib/sets
Module Name:src
Committed By: he
Date: Fri Dec 11 12:07:58 UTC 2009
Modified Files:
src/distrib/sets: sets.subr
Log Message:
Prefix mkvars.mk with ${rundir}/, so that the scripts from this
dir using sets.subr can be run from another directory, as is done
e.g. during "make release" via the mksums script.
OK'ed by uebayasi@
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.108 src/distrib/sets/sets.subr:1.109
--- src/distrib/sets/sets.subr:1.108 Thu Dec 10 15:51:24 2009
+++ src/distrib/sets/sets.subr Fri Dec 11 12:07:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.108 2009/12/10 15:51:24 uebayasi Exp $
+# $NetBSD: sets.subr,v 1.109 2009/12/11 12:07:58 he Exp $
#
#
@@ -118,13 +118,13 @@
IFS="
"
-for x in $( ${MAKE} -B -f mkvars.mk mkvars ); do
+for x in $( ${MAKE} -B -f ${rundir}/mkvars.mk mkvars ); do
eval export $x
done
IFS=$oIFS
-MKVARS="$( ${MAKE} -B -f mkvars.mk mkvars | sed -e 's,=.*,,' | xargs )"
+MKVARS="$( ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | sed -e 's,=.*,,' | xargs )"
if [ "$SETS_SUBR_DEBUG" = "dumpmkvars" ]; then
for v in $MKVARS; do
@@ -178,7 +178,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.108 2009/12/10 15:51:24 uebayasi Exp $
+# # $NetBSD: sets.subr,v 1.109 2009/12/11 12:07:58 he Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
CVS commit: src
Module Name:src
Committed By: he
Date: Fri Dec 11 15:22:33 UTC 2009
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: mi
src/etc: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/distrib/sets/lists/base: module.mi
Log Message:
Move the test for evbppc out of sets.subr and into bsd.own.mk, to
decide whether to make kernel modules: set MKKMOD to no for evbppc.
Use this in etc/Makefile to decide whether to do the "modules"
obsolete sets. Move the ./var/db/obsolete/modules entry from the
"mi" to the "module.mi" file set.
Fixes the build for evbppc.
Discussed with uebayasi@
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/distrib/sets/sets.subr
cvs rdiff -u -r1.847 -r1.848 src/distrib/sets/lists/base/mi
cvs rdiff -u -r0 -r1.13 src/distrib/sets/lists/base/module.mi
cvs rdiff -u -r1.375 -r1.376 src/etc/Makefile
cvs rdiff -u -r1.605 -r1.606 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.113 src/distrib/sets/sets.subr:1.114
--- src/distrib/sets/sets.subr:1.113 Fri Dec 11 13:30:11 2009
+++ src/distrib/sets/sets.subr Fri Dec 11 15:22:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.113 2009/12/11 13:30:11 uebayasi Exp $
+# $NetBSD: sets.subr,v 1.114 2009/12/11 15:22:33 he Exp $
#
#
@@ -140,8 +140,6 @@
module=yes
if [ "${MKKMOD}" = "no" ]; then
module=no # MODULEs are off.
-elif [ "${MACHINE}" = "evbppc" ]; then
- module=no # Turn off MODULEs for some ports.
fi
# Determine lib type. Do this first so stlib also gets set.
if [ "${OBJECT_FMT}" = "ELF" ]; then
@@ -178,7 +176,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.113 2009/12/11 13:30:11 uebayasi Exp $
+# # $NetBSD: sets.subr,v 1.114 2009/12/11 15:22:33 he Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.847 src/distrib/sets/lists/base/mi:1.848
--- src/distrib/sets/lists/base/mi:1.847 Sat Dec 5 20:11:01 2009
+++ src/distrib/sets/lists/base/mi Fri Dec 11 15:22:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.847 2009/12/05 20:11:01 pooka Exp $
+# $NetBSD: mi,v 1.848 2009/12/11 15:22:33 he Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4701,7 +4701,6 @@
./var/db/obsolete/gamesbase-sys-root
./var/db/obsolete/manbase-sys-root
./var/db/obsolete/miscbase-sys-root
-./var/db/obsolete/modules base-sys-root
./var/db/obsolete/testsbase-sys-root
./var/db/obsolete/textbase-sys-root
./var/db/postfixbase-postfix-root
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.375 src/etc/Makefile:1.376
--- src/etc/Makefile:1.375 Sat Dec 5 19:14:39 2009
+++ src/etc/Makefile Fri Dec 11 15:22:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.375 2009/12/05 19:14:39 pooka Exp $
+# $NetBSD: Makefile,v 1.376 2009/12/11 15:22:33 he Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -364,7 +364,10 @@
# Install var/db/obsolete set lists; this is performed by "make build"
#
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
-OBSOLETE.files= base comp etc games man misc modules tests text
+OBSOLETE.files= base comp etc games man misc tests text
+.if ${MKKMOD} != "no"
+OBSOLETE.files+= modules
+.endif
.if ${MKX11} != "no"
OBSOLETE.files+= xbase xcomp xetc xfont xserver
.endif
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.605 src/share/mk/bsd.own.mk:1.606
--- src/share/mk/bsd.own.mk:1.605 Fri Dec 11 08:52:37 2009
+++ src/share/mk/bsd.own.mk Fri Dec 11 15:22:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.605 2009/12/11 08:52:37 uebayasi Exp $
+# $NetBSD: bsd.own.mk,v 1.606 2009/12/11 15:22:33 he Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -697,6 +697,13 @@
.endfor
#
+# Exceptions to the above:
+#
+.if ${MACHINE} == "evbppc"
+MKKMOD= no
+.endif
+
+#
# MK* options which default to "no".
#
_MKVARS.no= \
Added files:
Index: src/distrib/sets/lists/base/module.mi
diff -u /dev/null src/distrib/sets/lists/base/module.mi:1.13
--- /dev/null Fri Dec 11 15:22:33 2009
+++ src/distrib/sets/lists/base/module.mi Fri Dec 11 15:22:33 2009
@@ -0,0 +1,2 @@
+# $NetBSD: module.mi,v 1.13 2009/12/11 15:22:33 he Exp $
+./var/db/obsolete/modules base-sys-root
CVS commit: src/tools
Module Name:src
Committed By: he
Date: Tue Dec 29 22:13:01 UTC 2009
Modified Files:
src/tools: Makefile
Log Message:
To unbreak the build, temporarily remove the build of libelf here,
since no other part of the build depends on this yet.
Suggested as a temporary workaround by thorpej@
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.132 src/tools/Makefile:1.133
--- src/tools/Makefile:1.132 Wed Dec 23 20:15:21 2009
+++ src/tools/Makefile Tue Dec 29 22:13:00 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2009/12/23 20:15:21 mrg Exp $
+# $NetBSD: Makefile,v 1.133 2009/12/29 22:13:00 he Exp $
.include
@@ -43,7 +43,6 @@
.WAIT awk \
.WAIT lex \
.WAIT pax \
- .WAIT libelf \
.WAIT ${TOOLCHAIN_BITS} \
asn1_compile atf-compile cat cksum compile_et config db \
file lint1 \
CVS commit: src/sys/arch/cobalt/include
Module Name:src Committed By: he Date: Wed Dec 30 18:39:03 UTC 2009 Modified Files: src/sys/arch/cobalt/include: bootinfo.h Log Message: Change prototype of lookup_bootinfo() so that it matches the implementation again. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/cobalt/include/bootinfo.h 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/cobalt/include/bootinfo.h diff -u src/sys/arch/cobalt/include/bootinfo.h:1.8 src/sys/arch/cobalt/include/bootinfo.h:1.9 --- src/sys/arch/cobalt/include/bootinfo.h:1.8 Thu Dec 17 15:29:47 2009 +++ src/sys/arch/cobalt/include/bootinfo.h Wed Dec 30 18:39:03 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bootinfo.h,v 1.8 2009/12/17 15:29:47 matt Exp $ */ +/* $NetBSD: bootinfo.h,v 1.9 2009/12/30 18:39:03 he Exp $ */ /* * Copyright (c) 1997, 2000-2004 @@ -75,7 +75,7 @@ }; #ifdef _KERNEL -void *lookup_bootinfo(int); +void *lookup_bootinfo(unsigned int); #endif #endif /* !_COBALT_BOOTINFO_H_ */
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: he
Date: Sat Jan 2 07:53:29 UTC 2010
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Remove a shadowed and unused local declaration so that this builds again.
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/arch/arm/arm32/pmap.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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.210 src/sys/arch/arm/arm32/pmap.c:1.211
--- src/sys/arch/arm/arm32/pmap.c:1.210 Fri Jan 1 02:32:28 2010
+++ src/sys/arch/arm/arm32/pmap.c Sat Jan 2 07:53:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.210 2010/01/01 02:32:28 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.211 2010/01/02 07:53:29 he Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
#include
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.210 2010/01/01 02:32:28 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211 2010/01/02 07:53:29 he Exp $");
#ifdef PMAP_DEBUG
@@ -2357,7 +2357,7 @@
static int
pmap_clean_page(struct pv_entry *pv, bool is_src)
{
- pmap_t pm, pm_to_clean = NULL;
+ pmap_t pm_to_clean = NULL;
struct pv_entry *npv;
u_int cache_needs_cleaning = 0;
u_int flags = 0;
CVS commit: src/distrib/sparc64/xminiroot
Module Name:src
Committed By: he
Date: Tue Jan 5 18:36:16 UTC 2010
Modified Files:
src/distrib/sparc64/xminiroot: Makefile
Log Message:
Bump the miniroot size from 8m to 9m, so that the contents fits again.
OK'ed by mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/sparc64/xminiroot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/xminiroot/Makefile
diff -u src/distrib/sparc64/xminiroot/Makefile:1.27 src/distrib/sparc64/xminiroot/Makefile:1.28
--- src/distrib/sparc64/xminiroot/Makefile:1.27 Fri Apr 3 22:36:35 2009
+++ src/distrib/sparc64/xminiroot/Makefile Tue Jan 5 18:36:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile,v 1.28 2010/01/05 18:36:16 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -7,7 +7,7 @@
.include "${.CURDIR}/../instfs/Makefile.instfs"
IMAGE= miniroot.fs
-IMAGESIZE= 8m
+IMAGESIZE= 9m
IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} \
${DESTDIR}/usr/mdec/bootblk
IMAGE_RELEASEDIR= installation/miniroot
CVS commit: src
Module Name:src
Committed By: he
Date: Wed Jan 13 14:24:58 UTC 2010
Modified Files:
src/distrib/acorn32/ramdisk: Makefile
src/sys/arch/acorn32/conf: INSTALL
Log Message:
Bump the ramdisk size so that the contents fits again.
OK'ed by reinoud@
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/acorn32/ramdisk/Makefile
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/acorn32/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/acorn32/ramdisk/Makefile
diff -u src/distrib/acorn32/ramdisk/Makefile:1.21 src/distrib/acorn32/ramdisk/Makefile:1.22
--- src/distrib/acorn32/ramdisk/Makefile:1.21 Thu Sep 24 21:04:45 2009
+++ src/distrib/acorn32/ramdisk/Makefile Wed Jan 13 14:24:58 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2009/09/24 21:04:45 he Exp $
+# $NetBSD: Makefile,v 1.22 2010/01/13 14:24:58 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 2000k
+IMAGESIZE= 2300k
MAKEFS_FLAGS= -f 15
WARNS= 1
Index: src/sys/arch/acorn32/conf/INSTALL
diff -u src/sys/arch/acorn32/conf/INSTALL:1.55 src/sys/arch/acorn32/conf/INSTALL:1.56
--- src/sys/arch/acorn32/conf/INSTALL:1.55 Sat Dec 5 20:11:03 2009
+++ src/sys/arch/acorn32/conf/INSTALL Wed Jan 13 14:24:58 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.55 2009/12/05 20:11:03 pooka Exp $
+# $NetBSD: INSTALL,v 1.56 2010/01/13 14:24:58 he Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.55 $"
+#ident "INSTALL-$Revision: 1.56 $"
# estimated number of users
maxusers 32
@@ -122,7 +122,7 @@
# Device options
options MEMORY_DISK_HOOKS # boottime setup of ramdisk
-options MEMORY_DISK_ROOT_SIZE=4100 # Size in blocks
+options MEMORY_DISK_ROOT_SIZE=4700 # Size in blocks
options MEMORY_DISK_IS_ROOT # use memory disk as root
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/distrib/sets
Module Name:src
Committed By: he
Date: Thu Jan 14 13:45:51 UTC 2010
Modified Files:
src/distrib/sets: sets.subr
Log Message:
In addition to setting module=no if ${MKKMOD} is "no", also
set kmod=no. This should get evbppc building correctly again.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.118 src/distrib/sets/sets.subr:1.119
--- src/distrib/sets/sets.subr:1.118 Mon Dec 21 15:37:25 2009
+++ src/distrib/sets/sets.subr Thu Jan 14 13:45:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.118 2009/12/21 15:37:25 uebayasi Exp $
+# $NetBSD: sets.subr,v 1.119 2010/01/14 13:45:51 he Exp $
#
#
@@ -134,6 +134,7 @@
module=yes
if [ "${MKKMOD}" = "no" ]; then
module=no # MODULEs are off.
+ kmod=no
fi
# Determine lib type. Do this first so stlib also gets set.
if [ "${OBJECT_FMT}" = "ELF" ]; then
@@ -167,7 +168,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.118 2009/12/21 15:37:25 uebayasi Exp $
+# # $NetBSD: sets.subr,v 1.119 2010/01/14 13:45:51 he Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
CVS commit: src/sys/kern
Module Name:src
Committed By: he
Date: Tue Jan 26 12:59:51 UTC 2010
Modified Files:
src/sys/kern: subr_prf.c
Log Message:
On a recursive panic(), don't try to take a dump, as that may very
well have triggered the recursive panic.
Fix the comment for panic() to reflect now-current reality: the code
was already changed never to sync() on panic(), now we avoid dumping
core on a recursive panic.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/kern/subr_prf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.137 src/sys/kern/subr_prf.c:1.138
--- src/sys/kern/subr_prf.c:1.137 Tue Nov 3 05:23:28 2009
+++ src/sys/kern/subr_prf.c Tue Jan 26 12:59:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.137 2009/11/03 05:23:28 dyoung Exp $ */
+/* $NetBSD: subr_prf.c,v 1.138 2010/01/26 12:59:50 he Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.137 2009/11/03 05:23:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.138 2010/01/26 12:59:50 he Exp $");
#include "opt_ddb.h"
#include "opt_ipkdb.h"
@@ -202,8 +202,7 @@
* panic: handle an unresolvable fatal error
*
* prints "panic: " and reboots. if called twice (i.e. recursive
- * call) we avoid trying to sync the disk and just reboot (to avoid
- * recursive panics).
+ * call) we avoid trying to dump and just reboot (to avoid recursive panics).
*/
void
@@ -246,8 +245,12 @@
}
bootopt = RB_AUTOBOOT | RB_NOSYNC;
- if (dumponpanic)
- bootopt |= RB_DUMP;
+ if (!doing_shutdown) {
+ if (dumponpanic)
+ bootopt |= RB_DUMP;
+ } else
+ printf("Skipping crash dump on recursive panic\n");
+
if (!panicstr)
panicstr = fmt;
doing_shutdown = 1;
CVS commit: src/lib/libterminfo
Module Name:src Committed By: he Date: Fri Feb 5 14:39:07 UTC 2010 Modified Files: src/lib/libterminfo: term.h term_private.h Log Message: More adaptation for ports with unsigned char as char. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/term.h cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/term_private.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libterminfo/term.h diff -u src/lib/libterminfo/term.h:1.2 src/lib/libterminfo/term.h:1.3 --- src/lib/libterminfo/term.h:1.2 Thu Feb 4 09:46:26 2010 +++ src/lib/libterminfo/term.h Fri Feb 5 14:39:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: term.h,v 1.2 2010/02/04 09:46:26 roy Exp $ */ +/* $NetBSD: term.h,v 1.3 2010/02/05 14:39:07 he Exp $ */ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -1454,7 +1454,7 @@ /* We need to expose these so that the macros work */ char *name; char *desc; - char *flags; + signed char *flags; short *nums; const char **strs; } TERMINAL; Index: src/lib/libterminfo/term_private.h diff -u src/lib/libterminfo/term_private.h:1.3 src/lib/libterminfo/term_private.h:1.4 --- src/lib/libterminfo/term_private.h:1.3 Fri Feb 5 12:31:56 2010 +++ src/lib/libterminfo/term_private.h Fri Feb 5 14:39:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: term_private.h,v 1.3 2010/02/05 12:31:56 roy Exp $ */ +/* $NetBSD: term_private.h,v 1.4 2010/02/05 14:39:07 he Exp $ */ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -84,7 +84,7 @@ /* We need to expose these so that the macros work */ char *name; char *desc; - char *flags; + signed char *flags; short *nums; const char **strs; /* Storage area for terminfo data */
CVS commit: src/usr.bin/tic
Module Name:src
Committed By: he
Date: Fri Feb 5 14:40:07 UTC 2010
Modified Files:
src/usr.bin/tic: tic.c
Log Message:
More adaptation for ports where char is unsigned char.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/tic/tic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tic/tic.c
diff -u src/usr.bin/tic/tic.c:1.2 src/usr.bin/tic/tic.c:1.3
--- src/usr.bin/tic/tic.c:1.2 Fri Feb 5 12:31:56 2010
+++ src/usr.bin/tic/tic.c Fri Feb 5 14:40:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tic.c,v 1.2 2010/02/05 12:31:56 roy Exp $ */
+/* $NetBSD: tic.c,v 1.3 2010/02/05 14:40:07 he Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#endif
#include
-__RCSID("$NetBSD: tic.c,v 1.2 2010/02/05 12:31:56 roy Exp $");
+__RCSID("$NetBSD: tic.c,v 1.3 2010/02/05 14:40:07 he Exp $");
#include
@@ -471,7 +471,8 @@
static int
process_entry(TBUF *buf)
{
- char *cap, *capstart, *p, *e, *name, *desc, *alias, flag;
+ char *cap, *capstart, *p, *e, *name, *desc, *alias;
+ signed char flag;
long num;
int slash;
ssize_t ind;
CVS commit: src
Module Name:src
Committed By: he
Date: Sat Feb 6 23:45:27 UTC 2010
Modified Files:
src/bin/sh: Makefile
src/games/atc: Makefile
src/games/battlestar: Makefile
src/games/boggle/boggle: Makefile
src/games/canfield/canfield: Makefile
src/games/cribbage: Makefile
src/games/gomoku: Makefile
src/games/hangman: Makefile
src/games/hunt/hunt: Makefile
src/games/mille: Makefile
src/games/phantasia: Makefile
src/games/rain: Makefile
src/games/robots: Makefile
src/games/rogue: Makefile
src/games/sail: Makefile
src/games/snake/snake: Makefile
src/games/worm: Makefile
src/games/worms: Makefile
src/usr.bin/nvi/build: Makefile
src/usr.bin/systat: Makefile
src/usr.bin/talk: Makefile
src/usr.sbin/altq/altqstat: Makefile
src/usr.sbin/ipf/ipfstat: Makefile
src/usr.sbin/isdn/isdnmonitor: Makefile
Log Message:
When using -lcurses, you also need -lterminfo.
This fixes the build for sun2, and also builds with LDSTATIC=-static,
since archive libraries don't record inter-library dependencies.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/bin/sh/Makefile
cvs rdiff -u -r1.28 -r1.29 src/games/atc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/battlestar/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/boggle/boggle/Makefile
cvs rdiff -u -r1.7 -r1.8 src/games/canfield/canfield/Makefile
cvs rdiff -u -r1.12 -r1.13 src/games/cribbage/Makefile
cvs rdiff -u -r1.4 -r1.5 src/games/gomoku/Makefile
cvs rdiff -u -r1.7 -r1.8 src/games/hangman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/games/hunt/hunt/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/mille/Makefile
cvs rdiff -u -r1.33 -r1.34 src/games/phantasia/Makefile
cvs rdiff -u -r1.10 -r1.11 src/games/rain/Makefile
cvs rdiff -u -r1.15 -r1.16 src/games/robots/Makefile
cvs rdiff -u -r1.16 -r1.17 src/games/rogue/Makefile
cvs rdiff -u -r1.16 -r1.17 src/games/sail/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/snake/snake/Makefile
cvs rdiff -u -r1.8 -r1.9 src/games/worm/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/worms/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/nvi/build/Makefile
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/systat/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/talk/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/altq/altqstat/Makefile
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/ipf/ipfstat/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/isdn/isdnmonitor/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/Makefile
diff -u src/bin/sh/Makefile:1.90 src/bin/sh/Makefile:1.91
--- src/bin/sh/Makefile:1.90 Wed Feb 3 15:34:37 2010
+++ src/bin/sh/Makefile Sat Feb 6 23:45:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2010/02/03 15:34:37 roy Exp $
+# $NetBSD: Makefile,v 1.91 2010/02/06 23:45:26 he Exp $
# @(#)Makefile 8.4 (Berkeley) 5/5/95
.include
@@ -15,8 +15,8 @@
DPSRCS+=${GENHDRS}
-LDADD+= -ll -ledit
-DPADD+= ${LIBL} ${LIBEDIT}
+LDADD+= -ll -ledit -lterminfo
+DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMINFO}
LFLAGS= -8 # 8-bit lex scanner for arithmetic
Index: src/games/atc/Makefile
diff -u src/games/atc/Makefile:1.28 src/games/atc/Makefile:1.29
--- src/games/atc/Makefile:1.28 Thu Oct 29 14:27:26 2009
+++ src/games/atc/Makefile Sat Feb 6 23:45:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/10/29 14:27:26 christos Exp $
+# $NetBSD: Makefile,v 1.29 2010/02/06 23:45:24 he Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include
@@ -9,8 +9,8 @@
main.c tunable.c update.c
YHEADER=1
MAN= atc.6
-LDADD= -ll -lm -lcurses
-DPADD= ${LIBL} ${LIBM} ${LIBCURSES}
+LDADD= -ll -lm -lcurses -lterminfo
+DPADD= ${LIBL} ${LIBM} ${LIBCURSES} ${LIBTERMINFO}
GAMES= Game_List Killer crossover default easy game_2 \
Atlantis OHare Tic-Tac-Toe airports box crosshatch game_3 \
game_4 novice two-corners
Index: src/games/battlestar/Makefile
diff -u src/games/battlestar/Makefile:1.9 src/games/battlestar/Makefile:1.10
--- src/games/battlestar/Makefile:1.9 Fri Oct 19 03:06:09 2001
+++ src/games/battlestar/Makefile Sat Feb 6 23:45:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/19 03:06:09 tv Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/06 23:45:24 he Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= battlestar
@@ -7,8 +7,8 @@
init.c cypher.c getcom.c parse.c room.c save.c fly.c misc.c \
globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
MAN= battlestar.6
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
HIDEGAME=hidegame
SETGIDGAME=yes
Index: src/games/boggle/boggle/Makefile
diff -u src/games/boggle/boggle/Makefile:1.9 src/games/boggle/boggle/Makefile:1.10
--- src/games/boggle/boggle/Makefile:1.9 Sat Feb 13 02:54:20 1999
+++ src/games/boggle/boggle/Makefile Sat Feb 6 23:45:25 2010
@@ -1,12 +1,
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: he
Date: Sun Feb 7 12:52:04 UTC 2010
Modified Files:
src/sys/arch/amiga/dev: atzsc.c
Log Message:
Remove a now-unused variable declaration.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amiga/dev/atzsc.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/amiga/dev/atzsc.c
diff -u src/sys/arch/amiga/dev/atzsc.c:1.40 src/sys/arch/amiga/dev/atzsc.c:1.41
--- src/sys/arch/amiga/dev/atzsc.c:1.40 Fri Feb 5 12:13:36 2010
+++ src/sys/arch/amiga/dev/atzsc.c Sun Feb 7 12:52:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atzsc.c,v 1.40 2010/02/05 12:13:36 phx Exp $ */
+/* $NetBSD: atzsc.c,v 1.41 2010/02/07 12:52:04 he Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atzsc.c,v 1.40 2010/02/05 12:13:36 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atzsc.c,v 1.41 2010/02/07 12:52:04 he Exp $");
#include
#include
@@ -228,7 +228,6 @@
atzsc_dmago(struct sbic_softc *dev, char *addr, int count, int flags)
{
volatile struct sdmac *sdp;
- vu_short istr;
sdp = dev->sc_cregs;
/*
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: he Date: Thu Oct 8 12:49:06 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Bump MAXDSIZ from 1536 to 1836. 1836 is 2048-128(MAXTSIZ)-64(MAXSSIZ). Gives us a fighting chance to build rust natively. OK'ed by skrll@ To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/arm/include/arm32/vmparam.h 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/arm/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.55 src/sys/arch/arm/include/arm32/vmparam.h:1.56 --- src/sys/arch/arm/include/arm32/vmparam.h:1.55 Sat Aug 29 06:49:53 2020 +++ src/sys/arch/arm/include/arm32/vmparam.h Thu Oct 8 12:49:06 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.55 2020/08/29 06:49:53 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.56 2020/10/08 12:49:06 he Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -70,7 +70,7 @@ #define DFLDSIZ (384*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (1536*1024*1024) /* max data size */ +#define MAXDSIZ (1856*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (4*1024*1024) /* initial stack size limit */
CVS commit: src/tests/lib/libm
Module Name:src Committed By: he Date: Mon Jul 24 18:13:36 UTC 2017 Modified Files: src/tests/lib/libm: t_fe_round.c Log Message: Swap around the two last args to the check for expected fegetround(), so the error message makes sense. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libm/t_fe_round.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/lib/libm/t_fe_round.c diff -u src/tests/lib/libm/t_fe_round.c:1.2 src/tests/lib/libm/t_fe_round.c:1.3 --- src/tests/lib/libm/t_fe_round.c:1.2 Tue Dec 20 06:07:38 2016 +++ src/tests/lib/libm/t_fe_round.c Mon Jul 24 18:13:36 2017 @@ -89,7 +89,7 @@ ATF_TC_BODY(fe_round, tc) (fegetround() == values[i].round_mode), "Didn't get the same rounding mode out!\n" "(index %d) fed in %d rounding mode, got %d out\n", - i, fegetround(), values[i].round_mode); + i, values[i].round_mode, fegetround()); } }
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: he
Date: Mon Jul 24 18:14:46 UTC 2017
Modified Files:
src/tests/lib/libm: t_fe_round.c
Log Message:
Add a test checking nearbyint(), using the same table as used by
the existing lrint() test.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libm/t_fe_round.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/lib/libm/t_fe_round.c
diff -u src/tests/lib/libm/t_fe_round.c:1.3 src/tests/lib/libm/t_fe_round.c:1.4
--- src/tests/lib/libm/t_fe_round.c:1.3 Mon Jul 24 18:13:36 2017
+++ src/tests/lib/libm/t_fe_round.c Mon Jul 24 18:14:46 2017
@@ -93,10 +93,40 @@ ATF_TC_BODY(fe_round, tc)
}
}
+ATF_TC(fe_nearbyint);
+ATF_TC_HEAD(fe_nearbyint, tc)
+{
+ atf_tc_set_md_var(tc, "descr","Checking IEEE 754 rounding modes using nearbyint");
+}
+
+ATF_TC_BODY(fe_nearbyint, tc)
+{
+ double received;
+
+ for (unsigned int i = 0; i < __arraycount(values); i++) {
+ fesetround(values[i].round_mode);
+
+ received = nearbyint(values[i].input);
+ ATF_CHECK_MSG(
+ (fabs(received - values[i].expected) < EPSILON),
+ "nearbyint rounding wrong, difference too large\n"
+ "input: %f (index %d): got %f, expected %ld\n",
+ values[i].input, i, received, values[i].expected);
+
+ /* Do we get the same rounding mode out? */
+ ATF_CHECK_MSG(
+ (fegetround() == values[i].round_mode),
+ "Didn't get the same rounding mode out!\n"
+ "(index %d) fed in %d rounding mode, got %d out\n",
+ i, values[i].round_mode, fegetround());
+ }
+}
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, fe_round);
+ ATF_TP_ADD_TC(tp, fe_nearbyint);
return atf_no_error();
}
@@ -109,15 +139,27 @@ ATF_TC_HEAD(t_nofe_round, tc)
"dummy test case - no fenv.h support");
}
-
ATF_TC_BODY(t_nofe_round, tc)
{
atf_tc_skip("no fenv.h support on this architecture");
}
+ATF_TC_HEAD(t_nofe_nearbyint, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "dummy test case - no fenv.h support");
+}
+
+ATF_TC_BODY(t_nofe_nearbyint, tc)
+{
+ atf_tc_skip("no fenv.h support on this architecture");
+}
+
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, t_nofe_round);
+ ATF_TP_ADD_TC(tp, t_nofe_nearbyint);
return atf_no_error();
}
CVS commit: src/lib/libm
Module Name:src
Committed By: he
Date: Wed Jul 26 09:42:12 UTC 2017
Modified Files:
src/lib/libm: Makefile
Log Message:
Add some blank lines to separate the different CPU archs,
for a minimal readability improvement.
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.191 src/lib/libm/Makefile:1.192
--- src/lib/libm/Makefile:1.191 Sat May 6 18:03:24 2017
+++ src/lib/libm/Makefile Wed Jul 26 09:42:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.191 2017/05/06 18:03:24 christos Exp $
+# $NetBSD: Makefile,v 1.192 2017/07/26 09:42:12 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -63,10 +63,12 @@ COMMON_SRCS+= fenv.c
COMMON_SRCS+= e_sqrtl.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_ARCH} == "alpha")
+
.PATH: ${.CURDIR}/arch/alpha
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
COMMON_SRCS+= fenv.c
COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
+
.elif (${LIBC_MACHINE_CPU} == "arm")
.PATH.c: ${.CURDIR}/arch/arm
.if ${MKSOFTFLOAT} == "no"
@@ -80,17 +82,21 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.if (${MKSOFTFLOAT} == "no")
.PATH.S: ${.CURDIR}/arch/arm
ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
+
.endif
.elif (${LIBC_MACHINE_ARCH} == "ia64")
.PATH: ${.CURDIR}/arch/ia64
COMMON_SRCS += fenv.c
+
.elif (${LIBC_MACHINE_ARCH} == "hppa")
.PATH.c: ${.CURDIR}/arch/hppa
COMMON_SRCS+= fenv.c s_nexttowardf.c s_nearbyint.c s_rintl.c
+
.elif (${LIBC_MACHINE_ARCH} == "sparc")
.PATH: ${.CURDIR}/arch/sparc
COMMON_SRCS+= fenv.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
+
.elif (${LIBC_MACHINE_ARCH} == "sparc64")
.PATH: ${.CURDIR}/arch/sparc64
COMMON_SRCS+= fenv.c
@@ -99,6 +105,7 @@ COMMON_SRCS+= s_nexttowardf.c s_nearbyin
COMMON_SRCS+= s_nexttoward.c
.endif
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
+
.elif ((${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64"))
# XXX consider making this LIBC_MACHINE_ARCH?
@@ -128,6 +135,7 @@ s_${f}.o s_${f}.pico s_${f}.po s_${f}.go
.if (${MACHINE_ARCH} == "i386")
SUBDIR=arch/i387
.endif
+
.elif (${LIBC_MACHINE_ARCH} == "m68k")
.if defined(M68060)
.PATH: ${.CURDIR}/arch/m68060
@@ -150,6 +158,7 @@ COMMON_SRCS += fenv.c
.endif
.endif
# end of m68k
+
.elif (${LIBC_MACHINE_ARCH} == "vax")
.PATH: ${.CURDIR}/arch/vax
@@ -160,6 +169,7 @@ COMMON_SRCS += fenv.c
# and emulation code isn't written yet.
ARCH_SRCS = n_scalbn.S
WARNS?=5
+
.elif (${LIBC_MACHINE_CPU} == "riscv")
.PATH: ${.CURDIR}/arch/riscv
@@ -172,22 +182,26 @@ ARCH_SRCS += s_fma.S s_fmaf.S
ARCH_SRCS += s_fmax.S s_fmaxf.S
ARCH_SRCS += s_fmin.S s_fminf.S
.endif
+
.elif (${LIBC_MACHINE_ARCH} == "powerpc")
.PATH: ${.CURDIR}/arch/powerpc
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS += fenv.c
.endif
+
.elif (${LIBC_MACHINE_CPU} == "mips")
.PATH: ${.CURDIR}/arch/mips
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS += fenv.c
.endif
+
.elif (${LIBC_MACHINE_CPU} == "sh3")
.PATH: ${.CURDIR}/arch/sh3
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS += fenv.c
.endif
.endif
+# End of long list of CPU tests
WARNS?=5
CVS commit: src/lib/libm
Module Name:src
Committed By: he
Date: Wed Jul 26 09:53:09 UTC 2017
Modified Files:
src/lib/libm: Makefile
Log Message:
Add s_nearbyint.c to alpha, ia64, riscv, mips, powerpc, and sh3 ports.
To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.192 src/lib/libm/Makefile:1.193
--- src/lib/libm/Makefile:1.192 Wed Jul 26 09:42:12 2017
+++ src/lib/libm/Makefile Wed Jul 26 09:53:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.192 2017/07/26 09:42:12 he Exp $
+# $NetBSD: Makefile,v 1.193 2017/07/26 09:53:09 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -62,11 +62,11 @@ COMMON_SRCS+= fenv.c
.endif
COMMON_SRCS+= e_sqrtl.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
-.elif (${LIBC_MACHINE_ARCH} == "alpha")
+.elif (${LIBC_MACHINE_ARCH} == "alpha")
.PATH: ${.CURDIR}/arch/alpha
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
-COMMON_SRCS+= fenv.c
+COMMON_SRCS+= fenv.c s_nearbyint.c
COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
.elif (${LIBC_MACHINE_CPU} == "arm")
@@ -82,11 +82,11 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.if (${MKSOFTFLOAT} == "no")
.PATH.S: ${.CURDIR}/arch/arm
ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
-
.endif
+
.elif (${LIBC_MACHINE_ARCH} == "ia64")
.PATH: ${.CURDIR}/arch/ia64
-COMMON_SRCS += fenv.c
+COMMON_SRCS += fenv.c s_nearbyint.c
.elif (${LIBC_MACHINE_ARCH} == "hppa")
.PATH.c: ${.CURDIR}/arch/hppa
@@ -154,7 +154,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S
e_log10.S e_remainder.S e_scalb.S e_sinh.S e_sqrt.S s_atan.S \
s_ceil.S s_copysign.S s_cos.S s_expm1.S s_finite.S s_floor.S \
s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
-COMMON_SRCS += fenv.c
+COMMON_SRCS += fenv.c s_nearbyint.c
.endif
.endif
# end of m68k
@@ -174,7 +174,7 @@ WARNS?=5
.PATH: ${.CURDIR}/arch/riscv
.if ${MKSOFTFLOAT} == "no"
-COMMON_SRCS += fenv.c
+COMMON_SRCS += fenv.c s_nearbyint.c
ARCH_SRCS = e_sqrt.S e_sqrtf.S
ARCH_SRCS += s_copysign.S s_copysignf.S
ARCH_SRCS += s_fabs.S s_fabsf.S
@@ -186,22 +186,22 @@ ARCH_SRCS += s_fmin.S s_fminf.S
.elif (${LIBC_MACHINE_ARCH} == "powerpc")
.PATH: ${.CURDIR}/arch/powerpc
.if ${MKSOFTFLOAT} == "no"
-COMMON_SRCS += fenv.c
+COMMON_SRCS += fenv.c s_nearbyint.c
.endif
.elif (${LIBC_MACHINE_CPU} == "mips")
.PATH: ${.CURDIR}/arch/mips
.if ${MKSOFTFLOAT} == "no"
-COMMON_SRCS += fenv.c
+COMMON_SRCS += fenv.c s_nearbyint.c
.endif
.elif (${LIBC_MACHINE_CPU} == "sh3")
.PATH: ${.CURDIR}/arch/sh3
.if ${MKSOFTFLOAT} == "no"
-COMMON_SRCS += fenv.c
+COMMON_SRCS += fenv.c s_nearbyint.c
.endif
.endif
-# End of long list of CPU tests
+# End of list of CPU tests
WARNS?=5
CVS commit: src/lib/libm
Module Name:src Committed By: he Date: Thu Jul 27 07:01:58 UTC 2017 Modified Files: src/lib/libm: Makefile Log Message: Non-softfloat m68k needs s_rintl.c. To generate a diff of this commit: cvs rdiff -u -r1.193 -r1.194 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/Makefile diff -u src/lib/libm/Makefile:1.193 src/lib/libm/Makefile:1.194 --- src/lib/libm/Makefile:1.193 Wed Jul 26 09:53:09 2017 +++ src/lib/libm/Makefile Thu Jul 27 07:01:58 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.193 2017/07/26 09:53:09 he Exp $ +# $NetBSD: Makefile,v 1.194 2017/07/27 07:01:58 he Exp $ # # @(#)Makefile 5.1beta 93/09/24 # @@ -154,7 +154,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S e_log10.S e_remainder.S e_scalb.S e_sinh.S e_sqrt.S s_atan.S \ s_ceil.S s_copysign.S s_cos.S s_expm1.S s_finite.S s_floor.S \ s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S -COMMON_SRCS += fenv.c s_nearbyint.c +COMMON_SRCS += fenv.c s_nearbyint.c s_rintl.c .endif .endif # end of m68k
CVS commit: src/lib/libm
Module Name:src
Committed By: he
Date: Thu Jul 27 10:03:10 UTC 2017
Modified Files:
src/lib/libm: Makefile
Log Message:
The sparc port needs s_nearbyint.c as well.
To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.194 src/lib/libm/Makefile:1.195
--- src/lib/libm/Makefile:1.194 Thu Jul 27 07:01:58 2017
+++ src/lib/libm/Makefile Thu Jul 27 10:03:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.194 2017/07/27 07:01:58 he Exp $
+# $NetBSD: Makefile,v 1.195 2017/07/27 10:03:10 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -94,7 +94,7 @@ COMMON_SRCS+= fenv.c s_nexttowardf.c s_n
.elif (${LIBC_MACHINE_ARCH} == "sparc")
.PATH: ${.CURDIR}/arch/sparc
-COMMON_SRCS+= fenv.c
+COMMON_SRCS+= fenv.c s_nearbyint.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_ARCH} == "sparc64")
CVS commit: src/external/gpl3/gcc.old/usr.bin/backend
Module Name:src
Committed By: he
Date: Thu Jul 27 16:05:16 UTC 2017
Modified Files:
src/external/gpl3/gcc.old/usr.bin/backend: Makefile
Log Message:
For alpha, generating alpha.d first needs pass-instances.def re-generated.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc.old/usr.bin/backend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc.old/usr.bin/backend/Makefile:1.6 src/external/gpl3/gcc.old/usr.bin/backend/Makefile:1.7
--- src/external/gpl3/gcc.old/usr.bin/backend/Makefile:1.6 Sun Jul 23 01:12:17 2017
+++ src/external/gpl3/gcc.old/usr.bin/backend/Makefile Thu Jul 27 16:05:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/07/23 01:12:17 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2017/07/27 16:05:15 he Exp $
LIBISPRIVATE= yes
@@ -445,6 +445,7 @@ final.o: target-hooks-def.h c-family/c-t
.if ${GCC_MACHINE_ARCH} == "alpha"
alpha.d alpha.o: tm-constrs.h tm_p.h insn-opinit.h target-hooks-def.h
+alpha.d: pass-instances.def
.endif
.if ${MACHINE_CPU} == "arm"
CVS commit: src/sys/arch/emips/emips
Module Name:src Committed By: he Date: Sun Jul 30 11:38:57 UTC 2017 Modified Files: src/sys/arch/emips/emips: machdep.c Log Message: Initialize iospace_size instead of iospace (will be overwritten) to 64k. Brings boot of emips on giano a bit closer, but now it's stuck (hangs). To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/emips/emips/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/emips/emips/machdep.c diff -u src/sys/arch/emips/emips/machdep.c:1.12 src/sys/arch/emips/emips/machdep.c:1.13 --- src/sys/arch/emips/emips/machdep.c:1.12 Thu Dec 22 14:47:54 2016 +++ src/sys/arch/emips/emips/machdep.c Sun Jul 30 11:38:57 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.12 2016/12/22 14:47:54 cherry Exp $ */ +/* $NetBSD: machdep.c,v 1.13 2017/07/30 11:38:57 he Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2016/12/22 14:47:54 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2017/07/30 11:38:57 he Exp $"); #include "opt_ddb.h" @@ -82,8 +82,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #endif -vaddr_t iospace = 64 * 1024; /* BUGBUG make it an option? */ -vsize_t iospace_size; +vaddr_t iospace; +vsize_t iospace_size = 64 * 1024; /* BUGBUG make it an option? */ #include "ksyms.h"
CVS commit: src/lib/libm
Module Name:src
Committed By: he
Date: Fri Aug 11 20:24:56 UTC 2017
Modified Files:
src/lib/libm: Makefile
Log Message:
Move s_nearbyint.c out of the cpu ifdefs and into COMMON_SRCS,
which is used everywhere except on vax. This is to simplify and
to ensure the function is included in the build, allowing us to
re-add the nearbyint() test.
To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.195 src/lib/libm/Makefile:1.196
--- src/lib/libm/Makefile:1.195 Thu Jul 27 10:03:10 2017
+++ src/lib/libm/Makefile Fri Aug 11 20:24:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2017/07/27 10:03:10 he Exp $
+# $NetBSD: Makefile,v 1.196 2017/08/11 20:24:56 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -66,7 +66,7 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_ARCH} == "alpha")
.PATH: ${.CURDIR}/arch/alpha
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
-COMMON_SRCS+= fenv.c s_nearbyint.c
+COMMON_SRCS+= fenv.c
COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
.elif (${LIBC_MACHINE_CPU} == "arm")
@@ -74,7 +74,7 @@ COPTS+= -mfloat-ieee -mieee-with-inexact
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS+= fenv.c
.endif
-COMMON_SRCS+= s_nexttowardf.c s_nearbyint.c s_rintl.c
+COMMON_SRCS+= s_nexttowardf.c s_rintl.c
.for f in fenv.c lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
COPTS.$f += -mfpu=vfp
.endfor
@@ -86,21 +86,21 @@ ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S l
.elif (${LIBC_MACHINE_ARCH} == "ia64")
.PATH: ${.CURDIR}/arch/ia64
-COMMON_SRCS += fenv.c s_nearbyint.c
+COMMON_SRCS += fenv.c
.elif (${LIBC_MACHINE_ARCH} == "hppa")
.PATH.c: ${.CURDIR}/arch/hppa
-COMMON_SRCS+= fenv.c s_nexttowardf.c s_nearbyint.c s_rintl.c
+COMMON_SRCS+= fenv.c s_nexttowardf.c s_rintl.c
.elif (${LIBC_MACHINE_ARCH} == "sparc")
.PATH: ${.CURDIR}/arch/sparc
-COMMON_SRCS+= fenv.c s_nearbyint.c
+COMMON_SRCS+= fenv.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_ARCH} == "sparc64")
.PATH: ${.CURDIR}/arch/sparc64
COMMON_SRCS+= fenv.c
-COMMON_SRCS+= s_nexttowardf.c s_nearbyint.c s_rintl.c
+COMMON_SRCS+= s_nexttowardf.c s_rintl.c
.ifndef _COMPAT_M32_MK_
COMMON_SRCS+= s_nexttoward.c
.endif
@@ -114,8 +114,7 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.endif
.PATH: ${.CURDIR}/arch/i387
-COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c \
- s_nearbyint.c s_rintl.c
+COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c s_rintl.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
@@ -154,7 +153,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S
e_log10.S e_remainder.S e_scalb.S e_sinh.S e_sqrt.S s_atan.S \
s_ceil.S s_copysign.S s_cos.S s_expm1.S s_finite.S s_floor.S \
s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
-COMMON_SRCS += fenv.c s_nearbyint.c s_rintl.c
+COMMON_SRCS += fenv.c s_rintl.c
.endif
.endif
# end of m68k
@@ -174,7 +173,7 @@ WARNS?=5
.PATH: ${.CURDIR}/arch/riscv
.if ${MKSOFTFLOAT} == "no"
-COMMON_SRCS += fenv.c s_nearbyint.c
+COMMON_SRCS += fenv.c
ARCH_SRCS = e_sqrt.S e_sqrtf.S
ARCH_SRCS += s_copysign.S s_copysignf.S
ARCH_SRCS += s_fabs.S s_fabsf.S
@@ -186,19 +185,19 @@ ARCH_SRCS += s_fmin.S s_fminf.S
.elif (${LIBC_MACHINE_ARCH} == "powerpc")
.PATH: ${.CURDIR}/arch/powerpc
.if ${MKSOFTFLOAT} == "no"
-COMMON_SRCS += fenv.c s_nearbyint.c
+COMMON_SRCS += fenv.c
.endif
.elif (${LIBC_MACHINE_CPU} == "mips")
.PATH: ${.CURDIR}/arch/mips
.if ${MKSOFTFLOAT} == "no"
-COMMON_SRCS += fenv.c s_nearbyint.c
+COMMON_SRCS += fenv.c
.endif
.elif (${LIBC_MACHINE_CPU} == "sh3")
.PATH: ${.CURDIR}/arch/sh3
.if ${MKSOFTFLOAT} == "no"
-COMMON_SRCS += fenv.c s_nearbyint.c
+COMMON_SRCS += fenv.c
.endif
.endif
# End of list of CPU tests
@@ -267,7 +266,7 @@ COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c
s_lrint.c s_lrintf.c s_lrintl.c \
s_lround.c s_lroundf.c s_lroundl.c \
s_log1pf.c s_logb.c s_logbf.c s_logbl.c \
- s_matherr.c s_modff.c s_modfl.c s_nextafter.c s_nextafterl.c \
+ s_matherr.c s_modff.c s_modfl.c s_nearbyint.c s_nextafter.c s_nextafterl.c \
s_nextafterf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
s_round.c s_roundf.c s_roundl.c s_scalbn.c \
s_scalbnf.c s_scalbnl.c s_signgam.c s_significand.c s_significandf.c s_sin.c \
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: he
Date: Fri Aug 11 20:31:58 UTC 2017
Modified Files:
src/tests/lib/libm: t_fe_round.c
Log Message:
Re-enable the test for nearbyint(), now that all ports (save vax,
which has a separate #if section here) should have nearbyint().
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/t_fe_round.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/lib/libm/t_fe_round.c
diff -u src/tests/lib/libm/t_fe_round.c:1.5 src/tests/lib/libm/t_fe_round.c:1.6
--- src/tests/lib/libm/t_fe_round.c:1.5 Tue Jul 25 21:26:56 2017
+++ src/tests/lib/libm/t_fe_round.c Fri Aug 11 20:31:58 2017
@@ -93,10 +93,40 @@ ATF_TC_BODY(fe_round, tc)
}
}
+ATF_TC(fe_nearbyint);
+ATF_TC_HEAD(fe_nearbyint, tc)
+{
+ atf_tc_set_md_var(tc, "descr","Checking IEEE 754 rounding modes using nearbyint");
+}
+
+ATF_TC_BODY(fe_nearbyint, tc)
+{
+ double received;
+
+ for (unsigned int i = 0; i < __arraycount(values); i++) {
+ fesetround(values[i].round_mode);
+
+ received = nearbyint(values[i].input);
+ ATF_CHECK_MSG(
+ (fabs(received - values[i].expected) < EPSILON),
+ "nearbyint rounding wrong, difference too large\n"
+ "input: %f (index %d): got %f, expected %ld\n",
+ values[i].input, i, received, values[i].expected);
+
+ /* Do we get the same rounding mode out? */
+ ATF_CHECK_MSG(
+ (fegetround() == values[i].round_mode),
+ "Didn't get the same rounding mode out!\n"
+ "(index %d) fed in %d rounding mode, got %d out\n",
+ i, values[i].round_mode, fegetround());
+ }
+}
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, fe_round);
+ ATF_TP_ADD_TC(tp, fe_nearbyint);
return atf_no_error();
}
@@ -115,9 +145,24 @@ ATF_TC_BODY(t_nofe_round, tc)
atf_tc_skip("no fenv.h support on this architecture");
}
+ATF_TC(t_nofe_nearbyint);
+
+ATF_TC_HEAD(t_nofe_nearbyint, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "dummy test case - no fenv.h support");
+}
+
+ATF_TC_BODY(t_nofe_nearbyint, tc)
+{
+ atf_tc_skip("no fenv.h support on this architecture");
+}
+
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, t_nofe_round);
+ ATF_TP_ADD_TC(tp, t_nofe_nearbyint);
return atf_no_error();
}
CVS commit: src/lib/libm/src
Module Name:src
Committed By: he
Date: Wed Aug 16 09:15:49 UTC 2017
Modified Files:
src/lib/libm/src: s_nextafter.c
Log Message:
On systems without __HAVE_LONG_DOUBLE, also alias nexttoward() and
nexttowardl() to nextafter().
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libm/src/s_nextafter.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/libm/src/s_nextafter.c
diff -u src/lib/libm/src/s_nextafter.c:1.14 src/lib/libm/src/s_nextafter.c:1.15
--- src/lib/libm/src/s_nextafter.c:1.14 Tue Mar 18 18:20:37 2014
+++ src/lib/libm/src/s_nextafter.c Wed Aug 16 09:15:48 2017
@@ -12,7 +12,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_nextafter.c,v 1.14 2014/03/18 18:20:37 riastradh Exp $");
+__RCSID("$NetBSD: s_nextafter.c,v 1.15 2017/08/16 09:15:48 he Exp $");
#endif
/* IEEE functions
@@ -27,6 +27,8 @@ __RCSID("$NetBSD: s_nextafter.c,v 1.14 2
#ifndef __HAVE_LONG_DOUBLE
__strong_alias(nextafterl, nextafter)
+__strong_alias(nexttoward, nextafter)
+__strong_alias(nexttowardl, nextafter)
#endif
double
CVS commit: src/lib/libm
Module Name:src Committed By: he Date: Wed Aug 16 09:18:24 UTC 2017 Modified Files: src/lib/libm: Makefile Log Message: In the non-softfloat m68k part, add s_nexttoward.c and s_nexttowardf.c, so that we get nexttoward() and nexttowardf() implemented here as well. To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/Makefile diff -u src/lib/libm/Makefile:1.197 src/lib/libm/Makefile:1.198 --- src/lib/libm/Makefile:1.197 Tue Aug 15 10:40:28 2017 +++ src/lib/libm/Makefile Wed Aug 16 09:18:24 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.197 2017/08/15 10:40:28 mlelstv Exp $ +# $NetBSD: Makefile,v 1.198 2017/08/16 09:18:24 he Exp $ # # @(#)Makefile 5.1beta 93/09/24 # @@ -153,7 +153,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S e_log10.S e_remainder.S e_scalb.S e_sinh.S e_sqrt.S s_atan.S \ s_ceil.S s_copysign.S s_cos.S s_expm1.S s_finite.S s_floor.S \ s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S -COMMON_SRCS += fenv.c s_rintl.c +COMMON_SRCS += fenv.c s_nexttoward.c s_nexttowardf.c s_rintl.c .endif .endif # end of m68k
CVS commit: src/lib/libm/src
Module Name:src
Committed By: he
Date: Wed Aug 16 11:22:52 UTC 2017
Modified Files:
src/lib/libm/src: s_nextafter.c
Log Message:
On second thought, don't introduce nexttowardl() since we don't have that
yet elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libm/src/s_nextafter.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/libm/src/s_nextafter.c
diff -u src/lib/libm/src/s_nextafter.c:1.15 src/lib/libm/src/s_nextafter.c:1.16
--- src/lib/libm/src/s_nextafter.c:1.15 Wed Aug 16 09:15:48 2017
+++ src/lib/libm/src/s_nextafter.c Wed Aug 16 11:22:52 2017
@@ -12,7 +12,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_nextafter.c,v 1.15 2017/08/16 09:15:48 he Exp $");
+__RCSID("$NetBSD: s_nextafter.c,v 1.16 2017/08/16 11:22:52 he Exp $");
#endif
/* IEEE functions
@@ -28,7 +28,6 @@ __RCSID("$NetBSD: s_nextafter.c,v 1.15 2
#ifndef __HAVE_LONG_DOUBLE
__strong_alias(nextafterl, nextafter)
__strong_alias(nexttoward, nextafter)
-__strong_alias(nexttowardl, nextafter)
#endif
double
CVS commit: src/lib/libm
Module Name:src
Committed By: he
Date: Thu Aug 17 09:06:21 UTC 2017
Modified Files:
src/lib/libm: Makefile
Log Message:
Move the inclusion of s_nexttowardf.c into a common test for
MKSOFTFLOAT=="no". This brings us nexttowardf() for sparc, at least.
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.199 src/lib/libm/Makefile:1.200
--- src/lib/libm/Makefile:1.199 Wed Aug 16 13:34:59 2017
+++ src/lib/libm/Makefile Thu Aug 17 09:06:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.199 2017/08/16 13:34:59 nisimura Exp $
+# $NetBSD: Makefile,v 1.200 2017/08/17 09:06:21 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -75,7 +75,7 @@ COPTS+= -mfloat-ieee -mieee-with-inexact
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS+= fenv.c
.endif
-COMMON_SRCS+= s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= s_rintl.c
.for f in fenv.c lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
COPTS.$f += -mfpu=vfp
.endfor
@@ -91,7 +91,7 @@ COMMON_SRCS += fenv.c
.elif (${LIBC_MACHINE_ARCH} == "hppa")
.PATH.c: ${.CURDIR}/arch/hppa
-COMMON_SRCS+= fenv.c s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= fenv.c s_rintl.c
.elif (${LIBC_MACHINE_ARCH} == "sparc")
.PATH: ${.CURDIR}/arch/sparc
@@ -101,7 +101,7 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_ARCH} == "sparc64")
.PATH: ${.CURDIR}/arch/sparc64
COMMON_SRCS+= fenv.c
-COMMON_SRCS+= s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= s_rintl.c
.ifndef _COMPAT_M32_MK_
COMMON_SRCS+= s_nexttoward.c
.endif
@@ -115,7 +115,7 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.endif
.PATH: ${.CURDIR}/arch/i387
-COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= fenv.c s_nexttoward.c s_rintl.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
@@ -154,7 +154,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S
e_log10.S e_remainder.S e_scalb.S e_sinh.S e_sqrt.S s_atan.S \
s_ceil.S s_copysign.S s_cos.S s_expm1.S s_finite.S s_floor.S \
s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
-COMMON_SRCS += fenv.c s_nexttoward.c s_nexttowardf.c s_rintl.c
+COMMON_SRCS += fenv.c s_nexttoward.c s_rintl.c
.endif
.endif
# end of m68k
@@ -194,7 +194,7 @@ COMMON_SRCS += fenv.c
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS += fenv.c
.endif
-COMMON_SRCS+= s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= s_rintl.c
.elif (${LIBC_MACHINE_CPU} == "sh3")
.PATH: ${.CURDIR}/arch/sh3
@@ -242,6 +242,10 @@ COMMON_SRCS += \
feupdateenv.c
.endif
+.if (${MKSOFTFLOAT} == "no")
+COMMON_SRCS+= s_nexttowardf.c
+.endif
+
LIB= m
COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c \
e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: he
Date: Thu Aug 17 09:14:28 UTC 2017
Modified Files:
src/tests/lib/libm: t_fe_round.c
Log Message:
Add test cases for nextafter() and nexttoward(). At the moment no
corner cases are tested, and the test cases are little more than a
verification that the functions are present in the implementation.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_fe_round.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/lib/libm/t_fe_round.c
diff -u src/tests/lib/libm/t_fe_round.c:1.6 src/tests/lib/libm/t_fe_round.c:1.7
--- src/tests/lib/libm/t_fe_round.c:1.6 Fri Aug 11 20:31:58 2017
+++ src/tests/lib/libm/t_fe_round.c Thu Aug 17 09:14:28 2017
@@ -122,11 +122,74 @@ ATF_TC_BODY(fe_nearbyint, tc)
}
}
+static const struct {
+ double input;
+ double toward;
+ double expected;
+} values2[] = {
+ { 10.0, 11.0, 10.0 },
+ { -5.0, -6.0, -5.0 },
+};
+
+ATF_TC(fe_nextafter);
+ATF_TC_HEAD(fe_nextafter, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checking IEEE 754 rounding using nextafter()");
+}
+
+ATF_TC_BODY(fe_nextafter, tc)
+{
+ double received;
+ int res;
+
+ for (unsigned int i = 0; i < __arraycount(values2); i++) {
+ received = nextafter(values2[i].input, values2[i].toward);
+ if (values2[i].input < values2[i].toward) {
+ res = (received > values2[i].input);
+ } else {
+ res = (received < values2[i].input);
+ }
+ ATF_CHECK_MSG(
+ res && (fabs(received - values2[i].expected) < EPSILON),
+ "nextafter() rounding wrong, difference too large\n"
+ "input: %f (index %d): got %f, expected %f, res %d\n",
+ values2[i].input, i, received, values2[i].expected, res);
+ }
+}
+
+ATF_TC(fe_nexttoward);
+ATF_TC_HEAD(fe_nexttoward, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checking IEEE 754 rounding using nexttoward()");
+}
+
+ATF_TC_BODY(fe_nexttoward, tc)
+{
+ double received;
+ int res;
+
+ for (unsigned int i = 0; i < __arraycount(values2); i++) {
+ received = nexttoward(values2[i].input, values2[i].toward);
+ if (values2[i].input < values2[i].toward) {
+ res = (received > values2[i].input);
+ } else {
+ res = (received < values2[i].input);
+ }
+ ATF_CHECK_MSG(
+ res && (fabs(received - values2[i].expected) < EPSILON),
+ "nexttoward() rounding wrong, difference too large\n"
+ "input: %f (index %d): got %f, expected %f, res %d\n",
+ values2[i].input, i, received, values2[i].expected, res);
+ }
+}
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, fe_round);
ATF_TP_ADD_TC(tp, fe_nearbyint);
+ ATF_TP_ADD_TC(tp, fe_nextafter);
+ ATF_TP_ADD_TC(tp, fe_nexttoward);
return atf_no_error();
}
@@ -139,7 +202,6 @@ ATF_TC_HEAD(t_nofe_round, tc)
"dummy test case - no fenv.h support");
}
-
ATF_TC_BODY(t_nofe_round, tc)
{
atf_tc_skip("no fenv.h support on this architecture");
@@ -158,11 +220,38 @@ ATF_TC_BODY(t_nofe_nearbyint, tc)
atf_tc_skip("no fenv.h support on this architecture");
}
+ATF_TC(t_nofe_nextafter);
+
+ATF_TC_HEAD(t_nofe_nextafter, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "dummy test case - no fenv.h support");
+}
+
+ATF_TC_BODY(t_nofe_nextafter, tc)
+{
+ atf_tc_skip("no fenv.h support on this architecture");
+}
+
+ATF_TC(t_nofe_nexttoward);
+
+ATF_TC_HEAD(t_nofe_nexttoward, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "dummy test case - no fenv.h support");
+}
+
+ATF_TC_BODY(t_nofe_nexttoward, tc)
+{
+ atf_tc_skip("no fenv.h support on this architecture");
+}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, t_nofe_round);
ATF_TP_ADD_TC(tp, t_nofe_nearbyint);
+ ATF_TP_ADD_TC(tp, t_nofe_nextafter);
+ ATF_TP_ADD_TC(tp, t_nofe_nexttoward);
return atf_no_error();
}
CVS commit: src/lib/libm
Module Name:src
Committed By: he
Date: Thu Aug 17 13:58:40 UTC 2017
Modified Files:
src/lib/libm: Makefile
Log Message:
Actually... s_nexttowardf.c appears to be usable on soft-float as well;
it was for arm earlier and briefly for all mips, so just move it into
COMMON_SRCS.
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.200 src/lib/libm/Makefile:1.201
--- src/lib/libm/Makefile:1.200 Thu Aug 17 09:06:21 2017
+++ src/lib/libm/Makefile Thu Aug 17 13:58:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.200 2017/08/17 09:06:21 he Exp $
+# $NetBSD: Makefile,v 1.201 2017/08/17 13:58:39 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -242,10 +242,6 @@ COMMON_SRCS += \
feupdateenv.c
.endif
-.if (${MKSOFTFLOAT} == "no")
-COMMON_SRCS+= s_nexttowardf.c
-.endif
-
LIB= m
COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c \
e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
@@ -273,7 +269,7 @@ COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c
s_lround.c s_lroundf.c s_lroundl.c \
s_log1pf.c s_logb.c s_logbf.c s_logbl.c \
s_matherr.c s_modff.c s_modfl.c s_nearbyint.c s_nextafter.c s_nextafterl.c \
- s_nextafterf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
+ s_nextafterf.c s_nexttowardf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
s_round.c s_roundf.c s_roundl.c s_scalbn.c \
s_scalbnf.c s_scalbnl.c s_signgam.c s_significand.c s_significandf.c s_sin.c \
s_sinf.c s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_tgammaf.c \
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: he
Date: Tue Sep 12 09:25:24 UTC 2017
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
Replicate fix from the old gcc.old: alpha.d needs pass-instances.def.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/external/gpl3/gcc/usr.bin/backend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.37 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.38
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.37 Mon Jun 26 17:38:10 2017
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Tue Sep 12 09:25:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2017/06/26 17:38:10 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2017/09/12 09:25:24 he Exp $
LIBISPRIVATE= yes
@@ -445,6 +445,7 @@ final.o: target-hooks-def.h c-family/c-t
.if ${GCC_MACHINE_ARCH} == "alpha"
alpha.d alpha.o: tm-constrs.h tm_p.h insn-opinit.h target-hooks-def.h
+alpha.d: pass-instances.def
.endif
.if ${MACHINE_CPU} == "arm"
CVS commit: src/external/bsd/bind/dist/lib/isc/unix
Module Name:src
Committed By: he
Date: Thu Oct 18 14:30:54 UTC 2018
Modified Files:
src/external/bsd/bind/dist/lib/isc/unix: socket.c
Log Message:
Apply suggested fix from https://gitlab.isc.org/isc-projects/bind9/issues/589.
This would on NetBSD prevent UDP replies > 1432 bytes in size
transported over IPv4, because an IPv6 control message is applied
on an IPv4 socket, which will subsequently be refused. Therefore,
apply that control mssage only on IPv6 sockets.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/dist/lib/isc/unix/socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/isc/unix/socket.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.23 src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.24
--- src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.23 Mon Aug 13 08:46:53 2018
+++ src/external/bsd/bind/dist/lib/isc/unix/socket.c Thu Oct 18 14:30:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.23 2018/08/13 08:46:53 christos Exp $ */
+/* $NetBSD: socket.c,v 1.24 2018/10/18 14:30:54 he Exp $ */
/*
* Copyright (C) 2004-2018 Internet Systems Consortium, Inc. ("ISC")
@@ -1548,7 +1548,8 @@ build_msghdr_send(isc__socket_t *sock, i
#if defined(IPV6_USE_MIN_MTU)
if ((sock->type == isc_sockettype_udp) &&
- ((dev->attributes & ISC_SOCKEVENTATTR_USEMINMTU) != 0))
+ ((dev->attributes & ISC_SOCKEVENTATTR_USEMINMTU) != 0) &&
+ (sock->pf == AF_INET6))
{
int use_min_mtu = 1; /* -1, 0, 1 */
CVS commit: src/external/bsd/unbound/dist/util
Module Name:src
Committed By: he
Date: Tue Dec 3 11:25:20 UTC 2019
Modified Files:
src/external/bsd/unbound/dist/util: netevent.c
Log Message:
Apply a fix from upstream:
https://github.com/NLnetLabs/unbound/pull/122
This should enable proper functioning of tcp-idle-timeout.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/unbound/dist/util/netevent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/unbound/dist/util/netevent.c
diff -u src/external/bsd/unbound/dist/util/netevent.c:1.1.1.4 src/external/bsd/unbound/dist/util/netevent.c:1.2
--- src/external/bsd/unbound/dist/util/netevent.c:1.1.1.4 Sat May 25 21:18:03 2019
+++ src/external/bsd/unbound/dist/util/netevent.c Tue Dec 3 11:25:19 2019
@@ -993,7 +993,7 @@ tcp_callback_writer(struct comm_point* c
tcp_req_info_handle_writedone(c->tcp_req_info);
} else {
comm_point_stop_listening(c);
- comm_point_start_listening(c, -1, -1);
+ comm_point_start_listening(c, -1, c->tcp_timeout_msec);
}
}
CVS commit: src/sys/arch/mvmeppc/stand/libsa
Module Name:src Committed By: he Date: Wed Jan 19 09:03:15 UTC 2011 Modified Files: src/sys/arch/mvmeppc/stand/libsa: bugsyscalls.S srt0.S Log Message: Prefix register names with %, apparently now required to build. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvmeppc/stand/libsa/srt0.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/mvmeppc/stand/libsa/bugsyscalls.S diff -u src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S:1.2 src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S:1.3 --- src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S:1.2 Mon Apr 28 20:23:30 2008 +++ src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S Wed Jan 19 09:03:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bugsyscalls.S,v 1.2 2008/04/28 20:23:30 martin Exp $ */ +/* $NetBSD: bugsyscalls.S,v 1.3 2011/01/19 09:03:15 he Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include -#define BSYS(num) addi r10,0,num ; sc +#define BSYS(num) addi %r10,0,num ; sc /* @@ -60,8 +60,8 @@ */ ENTRY(bugsys_instat) BSYS(0x0002) - li r4,0x8 - and r3,r3,r4 + li %r4,0x8 + and %r3,%r3,%r4 blr /* @@ -74,8 +74,8 @@ */ ENTRY(bugsys_dskrd) BSYS(0x0010) - li r4,0x8 - and r3,r3,r4 + li %r4,0x8 + and %r3,%r3,%r4 blr /* @@ -88,8 +88,8 @@ */ ENTRY(bugsys_dskwr) BSYS(0x0011) - li r4,0x8 - and r3,r3,r4 + li %r4,0x8 + and %r3,%r3,%r4 blr /* @@ -102,8 +102,8 @@ */ ENTRY(bugsys_netio) BSYS(0x001d) - li r4,0x8 - and r3,r3,r4 + li %r4,0x8 + and %r3,%r3,%r4 blr /* Index: src/sys/arch/mvmeppc/stand/libsa/srt0.S diff -u src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.3 src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.4 --- src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.3 Tue Mar 2 21:52:33 2010 +++ src/sys/arch/mvmeppc/stand/libsa/srt0.S Wed Jan 19 09:03:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.3 2010/03/02 21:52:33 matt Exp $ */ +/* $NetBSD: srt0.S,v 1.4 2011/01/19 09:03:15 he Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -46,122 +46,122 @@ * have to relocate ourselves to the appropriate place. * The firmware passes us the following registers: * - *r1 -> Temporary stack - *r3 -> Residual Data - *r4 -> The address we were loaded to - *r5 -> Zero + *%r1 -> Temporary stack + *%r3 -> Residual Data + *%r4 -> The address we were loaded to + *%r5 -> Zero * * 2) We were booted over the network in Non-PReP mode. In this case, * the load address is usually set using PPC-Bug's "niot" command, * but we won't depend on it so relocation may be required. The * firmware passes us the following registers: * - *r1 -> Temporary stack - *r3 -> CLUN of the network device we booted from - *r4 -> DLUN of the network device we booted from - *r5 -> Non-zero - *r6 -> Base address of network device - *r7 -> Execution address of loaded program - *r8 -> Address of IP-address data structure - *r9 -> Pointer to start of filename string - *r10 -> Pointer to end+1 of filename string - *r11 -> Pointer to start of argument string - *r12 -> Pointer to end+1 of argument string + *%r1 -> Temporary stack + *%r3 -> CLUN of the network device we booted from + *%r4 -> DLUN of the network device we booted from + *%r5 -> Non-zero + *%r6 -> Base address of network device + *%r7 -> Execution address of loaded program + *%r8 -> Address of IP-address data structure + *%r9 -> Pointer to start of filename string + *%r10 -> Pointer to end+1 of filename string + *%r11 -> Pointer to start of argument string + *%r12 -> Pointer to end+1 of argument string * * The obvious way to distinguish between the two boot modes is by - * checking the value of r5. + * checking the value of %r5. */ ENTRY(_start) bl 1f -1: xor r0,r0,r0 +1: xor %r0,%r0,%r0 /* First, switch off Instruction and Data caches. */ - mfspr r13,SPR_HID0 - LDCONST(r14, HID0_DCE|HID0_ICE) - andc r13,r13,r14 + mfspr %r13,SPR_HID0 + LDCONST(%r14, HID0_DCE|HID0_ICE) + andc %r13,%r13,%r14 sync - mtspr SPR_HID0,r13 + mtspr SPR_HID0,%r13 /* * All registers now available. Let's see if we need to relocate */ - LDCONST(r13,_C_LABEL(_start)) /* Where we'd like to be */ - LDCONST(r14,_C_LABEL(edata)) /* End of data section */ - LDCONST(r15,0x3) - add r14,r14,r15 - andc r14,r14,r15 /* Rounded up to the nearest 32-bits */ - sub r15,r14,r13 /* Our size, in bytes */ - mflr r16 /* Get address we were loaded to */ - subi r16,r16,0x4 /* Correct for branch */ - cmp cr0,r13,r16 /* Do we need to relocate? */ + LDCONST(%r13,_C_LABEL(_start)) /* Where we'd
CVS commit: src/sys/arch/evbsh3/evbsh3
Module Name:src Committed By: he Date: Wed Jan 19 09:36:33 UTC 2011 Modified Files: src/sys/arch/evbsh3/evbsh3: machdep.c Log Message: Need to define struct pcb. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/evbsh3/evbsh3/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/evbsh3/evbsh3/machdep.c diff -u src/sys/arch/evbsh3/evbsh3/machdep.c:1.72 src/sys/arch/evbsh3/evbsh3/machdep.c:1.73 --- src/sys/arch/evbsh3/evbsh3/machdep.c:1.72 Mon Dec 20 00:25:32 2010 +++ src/sys/arch/evbsh3/evbsh3/machdep.c Wed Jan 19 09:36:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.72 2010/12/20 00:25:32 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.73 2011/01/19 09:36:33 he Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2010/12/20 00:25:32 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.73 2011/01/19 09:36:33 he Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -95,6 +95,7 @@ #include #include +#include #ifdef DDB #include
CVS commit: src/sys/arch/mmeye/mmeye
Module Name:src Committed By: he Date: Wed Jan 19 10:19:07 UTC 2011 Modified Files: src/sys/arch/mmeye/mmeye: machdep.c Log Message: Need for struct pcb definition. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/mmeye/mmeye/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/mmeye/mmeye/machdep.c diff -u src/sys/arch/mmeye/mmeye/machdep.c:1.53 src/sys/arch/mmeye/mmeye/machdep.c:1.54 --- src/sys/arch/mmeye/mmeye/machdep.c:1.53 Mon Dec 20 00:25:39 2010 +++ src/sys/arch/mmeye/mmeye/machdep.c Wed Jan 19 10:19:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.53 2010/12/20 00:25:39 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.54 2011/01/19 10:19:07 he Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2010/12/20 00:25:39 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2011/01/19 10:19:07 he Exp $"); #include "opt_ddb.h" #include "opt_memsize.h" @@ -94,6 +94,7 @@ #include #include #include +#include #include
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: he Date: Wed Jan 19 21:07:18 UTC 2011 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi Log Message: Mark the set list entries for librumpfs_zfs and librumpkern_solaris with the "zfs" attribute -- these are not built for a substantial portion of our ports. To generate a diff of this commit: cvs rdiff -u -r1.569 -r1.570 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1573 -r1.1574 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.569 src/distrib/sets/lists/base/shl.mi:1.570 --- src/distrib/sets/lists/base/shl.mi:1.569 Tue Jan 18 22:21:22 2011 +++ src/distrib/sets/lists/base/shl.mi Wed Jan 19 21:07:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.569 2011/01/18 22:21:22 haad Exp $ +# $NetBSD: shl.mi,v 1.570 2011/01/19 21:07:13 he Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -534,18 +534,18 @@ ./usr/lib/librumpfs_union.so base-rump-shlib ./usr/lib/librumpfs_union.so.0 base-rump-shlib ./usr/lib/librumpfs_union.so.0.0 base-rump-shlib -./usr/lib/librumpfs_zfs.so base-rump-shlib -./usr/lib/librumpfs_zfs.so.0 base-rump-shlib -./usr/lib/librumpfs_zfs.so.0.0 base-rump-shlib +./usr/lib/librumpfs_zfs.so base-rump-shlib zfs +./usr/lib/librumpfs_zfs.so.0 base-rump-shlib zfs +./usr/lib/librumpfs_zfs.so.0.0 base-rump-shlib zfs ./usr/lib/librumpkern_crypto.so base-rump-shlib ./usr/lib/librumpkern_crypto.so.0 base-rump-shlib ./usr/lib/librumpkern_crypto.so.0.0 base-rump-shlib ./usr/lib/librumpkern_ksem.so base-rump-shlib ./usr/lib/librumpkern_ksem.so.0 base-rump-shlib ./usr/lib/librumpkern_ksem.so.0.0 base-rump-shlib -./usr/lib/librumpkern_solaris.so base-rump-shlib -./usr/lib/librumpkern_solaris.so.0 base-rump-shlib -./usr/lib/librumpkern_solaris.so.0.0 base-rump-shlib +./usr/lib/librumpkern_solaris.so base-rump-shlib zfs +./usr/lib/librumpkern_solaris.so.0 base-rump-shlib zfs +./usr/lib/librumpkern_solaris.so.0.0 base-rump-shlib zfs ./usr/lib/librumpkern_tty.so base-rump-shlib ./usr/lib/librumpkern_tty.so.0 base-rump-shlib ./usr/lib/librumpkern_tty.so.0.0 base-rump-shlib Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1573 src/distrib/sets/lists/comp/mi:1.1574 --- src/distrib/sets/lists/comp/mi:1.1573 Wed Jan 19 20:34:23 2011 +++ src/distrib/sets/lists/comp/mi Wed Jan 19 21:07:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1573 2011/01/19 20:34:23 bouyer Exp $ +# $NetBSD: mi,v 1.1574 2011/01/19 21:07:14 he Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2784,16 +2784,16 @@ ./usr/lib/librumpfs_union.a comp-c-lib ./usr/lib/librumpfs_union_g.a -unknown- debuglib ./usr/lib/librumpfs_union_p.a comp-c-proflib profile -./usr/lib/librumpfs_zfs.a comp-c-lib -./usr/lib/librumpfs_zfs_p.a comp-c-piclib profile +./usr/lib/librumpfs_zfs.a comp-c-lib zfs +./usr/lib/librumpfs_zfs_p.a comp-c-piclib profile,zfs ./usr/lib/librumpkern_crypto.a comp-c-lib ./usr/lib/librumpkern_crypto_g.a -unknown- debuglib ./usr/lib/librumpkern_crypto_p.a comp-c-proflib profile ./usr/lib/librumpkern_ksem.a comp-c-lib ./usr/lib/librumpkern_ksem_g.a -unknown- debuglib ./usr/lib/librumpkern_ksem_p.a comp-c-proflib profile -./usr/lib/librumpkern_solaris.a comp-c-lib -./usr/lib/librumpkern_solaris_p.a comp-c-proflib profile +./usr/lib/librumpkern_solaris.a comp-c-lib zfs +./usr/lib/librumpkern_solaris_p.a comp-c-proflib profile,zfs ./usr/lib/librumpkern_tty.a comp-c-lib ./usr/lib/librumpkern_tty_g.a -unknown- debuglib ./usr/lib/librumpkern_tty_p.a comp-c-proflib profile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.151 src/distrib/sets/lists/comp/shl.mi:1.152 --- src/distrib/sets/lists/comp/shl.mi:1.151 Tue Jan 18 22:21:22 2011 +++ src/distrib/sets/lists/comp/shl.mi Wed Jan 19 21:07:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.151 2011/01/18 22:21:22 haad Exp $ +# $NetBSD: shl.mi,v 1.152 2011/01/19 21:07:18 he Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -147,10 +147,10 @@ ./usr/lib/librumpfs_umap_pic.a comp-c-piclib ./usr/lib/librumpfs_umapfs_pic.a comp-obsolete obsolete ./usr/lib/librumpfs_union_pic.a comp-c-piclib -./usr/lib/librumpfs_zfs_pic.a comp-c-piclib +./usr/lib/librumpfs_zfs_pic.a comp-c-piclib zfs ./usr/lib/librumpkern_crypto_pic.a comp-c-piclib ./usr/lib/librumpkern_ksem_pic.a comp-c-piclib -./usr/lib/librumpkern_solaris_pic.a comp-c-piclib +./usr/lib/librumpkern_solaris_pic.a comp-c-piclib zfs ./usr/lib/librumpkern_
CVS commit: src/sys/compat/linux/arch/powerpc
Module Name:src Committed By: he Date: Thu Jan 20 11:59:25 UTC 2011 Modified Files: src/sys/compat/linux/arch/powerpc: linux_machdep.c Log Message: save_fpu_lwp() was renamed to fpu_save_lwp(), so follow suit. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/compat/linux/arch/powerpc/linux_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/compat/linux/arch/powerpc/linux_machdep.c diff -u src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.44 src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.45 --- src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.44 Tue Jan 18 01:13:03 2011 +++ src/sys/compat/linux/arch/powerpc/linux_machdep.c Thu Jan 20 11:59:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.44 2011/01/18 01:13:03 matt Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.45 2011/01/20 11:59:24 he Exp $ */ /*- * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.44 2011/01/18 01:13:03 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.45 2011/01/20 11:59:24 he Exp $"); #include #include @@ -181,7 +181,7 @@ memset(&frame, 0, sizeof(frame)); memcpy(&frame.lgp_regs, &linux_regs, sizeof(linux_regs)); - save_fpu_lwp(curlwp, FPU_SAVE); + fpu_save_lwp(curlwp, FPU_SAVE); memcpy(&frame.lfp_regs, curpcb->pcb_fpu.fpreg, sizeof(frame.lfp_regs)); /* @@ -319,7 +319,7 @@ /* * Make sure the fpu state is discarded */ - save_fpu_lwp(curlwp, FPU_DISCARD); + fpu_save_lwp(curlwp, FPU_DISCARD); memcpy(curpcb->pcb_fpu.fpreg, (void *)&sregs.lfp_regs, sizeof(curpcb->pcb_fpu.fpreg)); @@ -409,7 +409,7 @@ /* * Make sure the fpu state is discarded */ - save_fpu_lwp(curlwp, FPU_DISCARD); + fpu_save_lwp(curlwp, FPU_DISCARD); memcpy(curpcb->pcb_fpu.fpreg, (void *)&sregs.lfp_regs, sizeof(curpcb->pcb_fpu.fpreg));
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: he Date: Fri Jan 21 22:37:12 UTC 2011 Modified Files: src/sys/arch/algor/conf: P4032 Log Message: Bump SYMTAB_SPACE so that it fits again. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/algor/conf/P4032 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/algor/conf/P4032 diff -u src/sys/arch/algor/conf/P4032:1.54 src/sys/arch/algor/conf/P4032:1.55 --- src/sys/arch/algor/conf/P4032:1.54 Tue Nov 23 11:13:53 2010 +++ src/sys/arch/algor/conf/P4032 Fri Jan 21 22:37:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.54 2010/11/23 11:13:53 hannken Exp $ +# $NetBSD: P4032,v 1.55 2011/01/21 22:37:11 he Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "P4032-$Revision: 1.54 $" +#ident "P4032-$Revision: 1.55 $" maxusers 32 @@ -30,7 +30,7 @@ options DDB # kernel debugger makeoptions DEBUG="-g" #makeoptions DEBUGLIST="pattern1 pattern2 ..." -options SYMTAB_SPACE=34 +options SYMTAB_SPACE=35 # File systems file-system FFS # Fast file system
CVS commit: src/sys/uvm
Module Name:src
Committed By: he
Date: Sun Jan 23 21:29:52 UTC 2011
Modified Files:
src/sys/uvm: uvm_pglist.c
Log Message:
DEBUG does not imply DIAGNOSTIC; make sure we have a non-null
KASSERTMSG implementation (DIAGNOSTIC) so that the variable inside
the DEBUG section gets used.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/uvm/uvm_pglist.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/uvm/uvm_pglist.c
diff -u src/sys/uvm/uvm_pglist.c:1.55 src/sys/uvm/uvm_pglist.c:1.56
--- src/sys/uvm/uvm_pglist.c:1.55 Sat Jan 22 01:36:27 2011
+++ src/sys/uvm/uvm_pglist.c Sun Jan 23 21:29:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pglist.c,v 1.55 2011/01/22 01:36:27 matt Exp $ */
+/* $NetBSD: uvm_pglist.c,v 1.56 2011/01/23 21:29:52 he Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.55 2011/01/22 01:36:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.56 2011/01/23 21:29:52 he Exp $");
#include
#include
@@ -390,7 +390,7 @@
pg = &ps->pgs[try - ps->start];
continue;
}
-#ifdef DEBUG
+#if defined(DEBUG) && defined(DIAGNOSTIC)
{
int cidx = 0;
const int bank = vm_physseg_find(try, &cidx);
