CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: christos
Date: Thu Aug 20 07:50:08 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: readufs.h readufs_lfs.c
Log Message:
minimal changes to get this to compile.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/xxboot/readufs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/stand/xxboot/readufs_lfs.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/hppa/stand/xxboot/readufs.h
diff -u src/sys/arch/hppa/stand/xxboot/readufs.h:1.1 src/sys/arch/hppa/stand/xxboot/readufs.h:1.2
--- src/sys/arch/hppa/stand/xxboot/readufs.h:1.1 Mon Feb 24 02:23:43 2014
+++ src/sys/arch/hppa/stand/xxboot/readufs.h Thu Aug 20 03:50:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: readufs.h,v 1.2 2015/08/20 07:50:08 christos Exp $ */
/* from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp */
/*
@@ -23,8 +23,8 @@ union ufs_dinode {
struct ufs2_dinode di2;
#endif
#ifdef USE_LFS
- struct ulfs1_dinode dil1;
- struct ulfs2_dinode dil2;
+ struct lfs32_dinode dil32;
+ struct lfs64_dinode dil64;
#endif
};
Index: src/sys/arch/hppa/stand/xxboot/readufs_lfs.c
diff -u src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.2 src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.3
--- src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.2 Tue Jul 28 12:50:12 2015
+++ src/sys/arch/hppa/stand/xxboot/readufs_lfs.c Thu Aug 20 03:50:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.2 2015/07/28 16:50:12 christos Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.3 2015/08/20 07:50:08 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.8 2003/12/16 13:54:11 itohy Exp */
/*
@@ -20,7 +20,7 @@
#error LFS currently requires USE_UFS1
#endif
-static struct ulfs1_dinode ifile_dinode;
+static struct lfs32_dinode ifile_dinode;
#define fsi (*ufsinfo)
#define fsi_lfs fsi.fs_u.u_lfs
@@ -156,7 +156,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
struct ufs_info *ufsinfo = ufs_info;
daddr_t daddr;
char *buf = alloca(fsi.bsize);
- struct ulfs1_dinode *di, *diend;
+ struct lfs32_dinode *di, *diend;
int i;
/* Get fs block which contains the specified inode. */
@@ -173,7 +173,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
i = ino % fsi_lfs.ifpb;
daddr = (fsi_lfs.version == 1) ?
((IFILE_V1 *) buf + i)-if_daddr
- : ((IFILE *) buf + i)-if_daddr;
+ : ((IFILE32 *) buf + i)-if_daddr;
}
#ifdef DEBUG_WITH_STDIO
printf(LFS(%d): daddr: %d\n, ino, (int) daddr);
@@ -186,7 +186,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
RAW_READ(buf, daddr fsi.fsbtodb, fsi_lfs.ibsize);
/* Search for the inode. */
- di = (struct ulfs1_dinode *) buf;
+ di = (struct lfs32_dinode *) buf;
diend = di + fsi_lfs.inopb;
for ( ; di diend; di++)
@@ -210,7 +210,7 @@ found:
#endif
#endif
- dibuf-dil1 = *di;
+ dibuf-dil32 = *di;
return 0;
}
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: uebayasi Date: Thu Aug 20 08:51:01 UTC 2015 Modified Files: src/sys/arch/amd64/conf: kern.ldscript Log Message: Do =0 (zero-fill) only once. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amd64/conf/kern.ldscript 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/amd64/conf/kern.ldscript diff -u src/sys/arch/amd64/conf/kern.ldscript:1.11 src/sys/arch/amd64/conf/kern.ldscript:1.12 --- src/sys/arch/amd64/conf/kern.ldscript:1.11 Thu Aug 20 08:36:42 2015 +++ src/sys/arch/amd64/conf/kern.ldscript Thu Aug 20 08:51:01 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kern.ldscript,v 1.11 2015/08/20 08:36:42 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript,v 1.12 2015/08/20 08:51:01 uebayasi Exp $ */ OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64, elf64-x86-64) @@ -12,7 +12,7 @@ SECTIONS *(.text) *(.text.*) *(.stub) - } =0 + } _etext = . ; PROVIDE (etext = .) ;
CVS commit: src/sys/kern
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 08:27:09 UTC 2015
Modified Files:
src/sys/kern: kern_cpu.c kern_drvctl.c
Log Message:
Mark pseudo attach unused arg with __unused.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_drvctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.68 src/sys/kern/kern_cpu.c:1.69
--- src/sys/kern/kern_cpu.c:1.68 Tue Aug 18 13:46:20 2015
+++ src/sys/kern/kern_cpu.c Thu Aug 20 08:27:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.68 2015/08/18 13:46:20 uebayasi Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.69 2015/08/20 08:27:09 uebayasi Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v 1.68 2015/08/18 13:46:20 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v 1.69 2015/08/20 08:27:09 uebayasi Exp $);
#include opt_cpu_ucode.h
#include opt_compat_netbsd.h
@@ -94,7 +94,7 @@ CTASSERT(offsetof(struct cpu_info, ci_da
CTASSERT(offsetof(struct cpu_info, ci_data) != 0);
#endif
-void cpuctlattach(void);
+void cpuctlattach(int);
static void cpu_xc_online(struct cpu_info *);
static void cpu_xc_offline(struct cpu_info *);
@@ -204,7 +204,7 @@ mi_cpu_attach(struct cpu_info *ci)
}
void
-cpuctlattach(void)
+cpuctlattach(int dummy __unused)
{
KASSERT(cpu_infos != NULL);
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.37 src/sys/kern/kern_drvctl.c:1.38
--- src/sys/kern/kern_drvctl.c:1.37 Tue Aug 18 13:46:20 2015
+++ src/sys/kern/kern_drvctl.c Thu Aug 20 08:27:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.37 2015/08/18 13:46:20 uebayasi Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.38 2015/08/20 08:27:09 uebayasi Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_drvctl.c,v 1.37 2015/08/18 13:46:20 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_drvctl.c,v 1.38 2015/08/20 08:27:09 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -80,7 +80,7 @@ const struct cdevsw drvctl_cdevsw = {
.d_flag = D_OTHER
};
-void drvctlattach(void);
+void drvctlattach(int);
static int drvctl_read(struct file *, off_t *, struct uio *,
kauth_cred_t, int);
@@ -432,7 +432,7 @@ drvctl_close(struct file *fp)
}
void
-drvctlattach(void)
+drvctlattach(int arg __unused)
{
}
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 08:36:42 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript
Log Message:
Simplify this by splitting absolute relocation directives from other
relative, position-independent directives. Since all sections are
relocated in parallel, specifying the address of .text is sufficient.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/conf/kern.ldscript
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/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.10 src/sys/arch/amd64/conf/kern.ldscript:1.11
--- src/sys/arch/amd64/conf/kern.ldscript:1.10 Thu Aug 20 08:25:33 2015
+++ src/sys/arch/amd64/conf/kern.ldscript Thu Aug 20 08:36:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.10 2015/08/20 08:25:33 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.11 2015/08/20 08:36:42 uebayasi Exp $ */
OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
elf64-x86-64)
@@ -8,7 +8,6 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text) 0x0fff)
{
*(.text)
*(.text.*)
@@ -18,7 +17,6 @@ SECTIONS
PROVIDE (etext = .) ;
.rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
{
*(.rodata)
*(.rodata.*)
@@ -29,20 +27,17 @@ SECTIONS
. = ALIGN(0x10) + (. (0x10 - 1));
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -52,7 +47,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -67,3 +61,11 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text) 0x0fff)
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:48:25 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript kern.ldscript.2MB
src/sys/arch/cats/conf: ldscript.elf
src/sys/arch/epoc32/conf: ldscript.epoc32
src/sys/arch/netwinder/conf: kern.ldscript
src/sys/arch/zaurus/conf: ldscript.zaurus
Log Message:
Kill trailing whitespaces.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/conf/kern.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/conf/kern.ldscript.2MB
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/cats/conf/ldscript.elf
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/epoc32/conf/ldscript.epoc32
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/netwinder/conf/kern.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/conf/ldscript.zaurus
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/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.8 src/sys/arch/amd64/conf/kern.ldscript:1.9
--- src/sys/arch/amd64/conf/kern.ldscript:1.8 Sun Nov 2 17:58:14 2014
+++ src/sys/arch/amd64/conf/kern.ldscript Thu Aug 20 06:48:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.8 2014/11/02 17:58:14 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.9 2015/08/20 06:48:25 uebayasi Exp $ */
OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
elf64-x86-64)
@@ -23,7 +23,7 @@ SECTIONS
*(.rodata)
*(.rodata.*)
}
-
+
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
. = ALIGN(0x10) + (. (0x10 - 1));
Index: src/sys/arch/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.5 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.6
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.5 Sun Nov 2 17:58:14 2014
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB Thu Aug 20 06:48:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.2MB,v 1.5 2014/11/02 17:58:14 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.2MB,v 1.6 2015/08/20 06:48:25 uebayasi Exp $ */
OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
elf64-x86-64)
@@ -23,7 +23,7 @@ SECTIONS
*(.rodata)
*(.rodata.*)
}
-
+
/* Adjust the address for the data segment. We push the data segment
up to the next 2MB boundary so that we can map the text with large
pages. */
Index: src/sys/arch/cats/conf/ldscript.elf
diff -u src/sys/arch/cats/conf/ldscript.elf:1.2 src/sys/arch/cats/conf/ldscript.elf:1.3
--- src/sys/arch/cats/conf/ldscript.elf:1.2 Sun Dec 11 12:17:04 2005
+++ src/sys/arch/cats/conf/ldscript.elf Thu Aug 20 06:48:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.elf,v 1.2 2005/12/11 12:17:04 christos Exp $ */
+/* $NetBSD: ldscript.elf,v 1.3 2015/08/20 06:48:25 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
@@ -36,10 +36,10 @@ SECTIONS
*(.data)
*(.data.*)
}
- .sdata :
+ .sdata :
AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
-*(.sdata)
+*(.sdata)
*(.sdata.*)
}
_edata = .;
Index: src/sys/arch/epoc32/conf/ldscript.epoc32
diff -u src/sys/arch/epoc32/conf/ldscript.epoc32:1.2 src/sys/arch/epoc32/conf/ldscript.epoc32:1.3
--- src/sys/arch/epoc32/conf/ldscript.epoc32:1.2 Thu Jan 30 15:36:43 2014
+++ src/sys/arch/epoc32/conf/ldscript.epoc32 Thu Aug 20 06:48:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.epoc32,v 1.2 2014/01/30 15:36:43 matt Exp $ */
+/* $NetBSD: ldscript.epoc32,v 1.3 2015/08/20 06:48:25 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
@@ -40,10 +40,10 @@ SECTIONS
*(.data)
*(.data.*)
}
- .sdata :
+ .sdata :
AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
-*(.sdata)
+*(.sdata)
*(.sdata.*)
}
_edata = .;
Index: src/sys/arch/netwinder/conf/kern.ldscript
diff -u src/sys/arch/netwinder/conf/kern.ldscript:1.4 src/sys/arch/netwinder/conf/kern.ldscript:1.5
--- src/sys/arch/netwinder/conf/kern.ldscript:1.4 Thu Jan 30 15:36:44 2014
+++ src/sys/arch/netwinder/conf/kern.ldscript Thu Aug 20 06:48:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.4 2014/01/30 15:36:44 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.5 2015/08/20 06:48:25 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-littlearm, elf32-bigarm,
elf32-littlearm)
@@ -45,7 +45,7 @@ SECTIONS
.sdata :
AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
-*(.sdata)
+*(.sdata)
*(.sdata.*)
}
_edata = .;
Index: src/sys/arch/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.5 src/sys/arch/zaurus/conf/ldscript.zaurus:1.6
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.5 Thu Jan 30 15:36:44 2014
+++ src/sys/arch/zaurus/conf/ldscript.zaurus Thu Aug 20 06:48:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.zaurus,v 1.5 2014/01/30 15:36:44 matt Exp $ */
+/* $NetBSD:
CVS commit: src/share/misc
Module Name:src Committed By: dholland Date: Thu Aug 20 07:10:02 UTC 2015 Modified Files: src/share/misc: acronyms Log Message: +GMT (Robert Elz, PR 50157) To generate a diff of this commit: cvs rdiff -u -r1.237 -r1.238 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms diff -u src/share/misc/acronyms:1.237 src/share/misc/acronyms:1.238 --- src/share/misc/acronyms:1.237 Mon May 18 11:56:20 2015 +++ src/share/misc/acronyms Thu Aug 20 07:10:02 2015 @@ -1,4 +1,4 @@ -$NetBSD: acronyms,v 1.237 2015/05/18 11:56:20 pooka Exp $ +$NetBSD: acronyms,v 1.238 2015/08/20 07:10:02 dholland Exp $ 10Q thank you 10X thanks 1337 elite (leet) @@ -180,6 +180,7 @@ GLHF good luck, have fun GLINE global kill line GLWT good luck with that GM game master +GMT Greenwich mean time GMTA great minds think alike GOK God only knows GOWI get on with it
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:20:19 UTC 2015
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Use variables where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/cats/conf/Makefile.cats.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/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.33 src/sys/arch/cats/conf/Makefile.cats.inc:1.34
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.33 Wed Aug 19 04:53:03 2015
+++ src/sys/arch/cats/conf/Makefile.cats.inc Thu Aug 20 06:20:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.33 2015/08/19 04:53:03 uebayasi Exp $
+# $NetBSD: Makefile.cats.inc,v 1.34 2015/08/20 06:20:19 uebayasi Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -18,7 +18,7 @@ LOADADDRESS= 0xF020
KERNLDSCRIPT= ldscript
EXTRA_CLEAN+= ${KERNLDSCRIPT}
-ldscript: \
+${KERNLDSCRIPT}: \
${ARM}/conf/kern.ldscript.head \
${ARM}/conf/kern.ldscript.tail \
$S/conf/mkldscript.sh \
@@ -26,7 +26,7 @@ ldscript: \
( cat ${ARM}/conf/kern.ldscript.head ; \
OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
${SYSTEM_OBJ} ; \
- cat ${ARM}/conf/kern.ldscript.tail ) ldscript
+ cat ${ARM}/conf/kern.ldscript.tail ) $@
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout; \
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:21:26 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: Makefile.evbarm.inc
Log Message:
Clean up ${LINKSCRIPT} and ${KERNLDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/Makefile.evbarm.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/evbarm/conf/Makefile.evbarm.inc
diff -u src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.31 src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.32
--- src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.31 Sat Nov 15 14:55:02 2014
+++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc Thu Aug 20 06:21:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.evbarm.inc,v 1.31 2014/11/15 14:55:02 uebayasi Exp $
+# $NetBSD: Makefile.evbarm.inc,v 1.32 2015/08/20 06:21:26 uebayasi Exp $
#
# If this is a install kernel and the ramdisk image exists in the object
@@ -28,15 +28,21 @@ CPPFLAGS+=-DKERNEL_BASE_VOFFSET=(${KERN
. endif
.endif
-EXTRA_CLEAN+= ldscript tmp ${KERNELS:=.map}
+EXTRA_CLEAN+= ${KERNELS:=.map}
.if defined(KERNEL_BASE_PHYS)
LINKTEXT=
KERNLDSCRIPT= ldscript
-LINKSCRIPT= -T ldscript
+LINKSCRIPT= -T ${KERNLDSCRIPT}
+
+EXTRA_CLEAN+= ${KERNLDSCRIPT} tmp
# generate ldscript from common template
-ldscript: ${THISARM}/conf/ldscript.evbarm ${THISARM}/conf/Makefile.evbarm.inc Makefile ${BOARDMKFRAG}
+${KERNLDSCRIPT}: \
+${THISARM}/conf/ldscript.evbarm \
+${THISARM}/conf/Makefile.evbarm.inc \
+Makefile \
+${BOARDMKFRAG}
echo ${KERNELS}
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
CVS commit: src/sys/arch/aarch64/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:19:36 UTC 2015
Modified Files:
src/sys/arch/aarch64/conf: Makefile.aarch64
Log Message:
Use ${KERNLDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/conf/Makefile.aarch64
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/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.4 src/sys/arch/aarch64/conf/Makefile.aarch64:1.5
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.4 Sat Nov 15 14:25:10 2014
+++ src/sys/arch/aarch64/conf/Makefile.aarch64 Thu Aug 20 06:19:36 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.4 2014/11/15 14:25:10 uebayasi Exp $
+# $NetBSD: Makefile.aarch64,v 1.5 2015/08/20 06:19:36 uebayasi Exp $
# Makefile for NetBSD
#
@@ -58,11 +58,11 @@ locore.o: ${A64}/aarch64/locore.S assym.
##
## (5) link settings
##
-LDSCRIPT?= ${A64}/conf/kern.ldscript
+KERNLDSCRIPT?= ${A64}/conf/kern.ldscript
LOADADDRESS?= 0x
LINKFLAGS_NORMAL= -X
-.if ${LDSCRIPT} !=
-LINKSCRIPT= -T ${LDSCRIPT}
+.if ${KERNLDSCRIPT} !=
+LINKSCRIPT= -T ${KERNLDSCRIPT}
.endif
# Strip AArch64 mapping symbols from the kernel image, as they interfere
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 08:25:33 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript
Log Message:
Indent.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/conf/kern.ldscript
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/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.9 src/sys/arch/amd64/conf/kern.ldscript:1.10
--- src/sys/arch/amd64/conf/kern.ldscript:1.9 Thu Aug 20 06:48:25 2015
+++ src/sys/arch/amd64/conf/kern.ldscript Thu Aug 20 08:25:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.9 2015/08/20 06:48:25 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.10 2015/08/20 08:25:33 uebayasi Exp $ */
OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
elf64-x86-64)
@@ -6,60 +6,60 @@ OUTPUT_ARCH(i386:x86-64)
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- AT (ADDR(.text) 0x0fff)
- {
- *(.text)
- *(.text.*)
- *(.stub)
- } =0
- _etext = . ;
- PROVIDE (etext = .) ;
+ /* Read-only sections, merged into text segment: */
+ .text :
+ AT (ADDR(.text) 0x0fff)
+ {
+*(.text)
+*(.text.*)
+*(.stub)
+ } =0
+ _etext = . ;
+ PROVIDE (etext = .) ;
- .rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
- {
- *(.rodata)
- *(.rodata.*)
- }
+ .rodata :
+ AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
+ {
+*(.rodata)
+*(.rodata.*)
+ }
- /* Adjust the address for the data segment. We want to adjust up to
- the same address within the page on the next page up. */
- . = ALIGN(0x10) + (. (0x10 - 1));
- __data_start = . ;
- .data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
- {
- *(.data)
- }
+ /* Adjust the address for the data segment. We want to adjust up to
+ the same address within the page on the next page up. */
+ . = ALIGN(0x10) + (. (0x10 - 1));
+ __data_start = . ;
+ .data :
+ AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+ {
+*(.data)
+ }
- . = ALIGN(64); /* COHERENCY_UNIT */
- .data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
- {
- *(.data.cacheline_aligned)
- }
- . = ALIGN(64); /* COHERENCY_UNIT */
- .data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
- {
- *(.data.read_mostly)
- }
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.cacheline_aligned :
+ AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+ {
+*(.data.cacheline_aligned)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.read_mostly :
+ AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+ {
+*(.data.read_mostly)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
- _edata = . ;
- PROVIDE (edata = .) ;
- __bss_start = . ;
- .bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
- {
- *(.bss)
- *(.bss.*)
- *(COMMON)
- . = ALIGN(64 / 8);
- }
- . = ALIGN(64 / 8);
+ _edata = . ;
+ PROVIDE (edata = .) ;
+ __bss_start = . ;
+ .bss :
+ AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+ {
+*(.bss)
+*(.bss.*)
+*(COMMON)
+. = ALIGN(64 / 8);
+ }
+ . = ALIGN(64 / 8);
_end = . ;
PROVIDE (end = .) ;
.note.netbsd.ident :
CVS commit: src/sys/arch/evbsh3/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 09:46:03 UTC 2015
Modified Files:
src/sys/arch/evbsh3/conf: sh.x sh.x.ICE sh.x.RAM sh.x.ROM shl.x
shl.x.ICE shl.x.RAM shl.x.ROM
Log Message:
Indent.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbsh3/conf/sh.x \
src/sys/arch/evbsh3/conf/shl.x
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbsh3/conf/sh.x.ICE \
src/sys/arch/evbsh3/conf/sh.x.RAM src/sys/arch/evbsh3/conf/sh.x.ROM \
src/sys/arch/evbsh3/conf/shl.x.ICE src/sys/arch/evbsh3/conf/shl.x.RAM \
src/sys/arch/evbsh3/conf/shl.x.ROM
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/conf/sh.x
diff -u src/sys/arch/evbsh3/conf/sh.x:1.4 src/sys/arch/evbsh3/conf/sh.x:1.5
--- src/sys/arch/evbsh3/conf/sh.x:1.4 Thu Aug 20 07:13:07 2015
+++ src/sys/arch/evbsh3/conf/sh.x Thu Aug 20 09:46:03 2015
@@ -13,7 +13,7 @@ SECTIONS
{
*(.text)
*(.strings)
- _etext = . ;
+_etext = . ;
} ram
.tors :
AT (ROM + SIZEOF(.text))
@@ -29,19 +29,19 @@ SECTIONS
AT (ROM + SIZEOF(.text) + SIZEOF(.tors))
{
*(.data)
- _edata = . ;
+_edata = . ;
} ram
.bss :
AT (ROM + SIZEOF(.text) + SIZEOF(.tors) + SIZEOF(.data))
{
- _bss_start = . ;
+_bss_start = . ;
*(.bss)
*(COMMON)
- _end = . ;
+_end = . ;
} ram
.stack :
{
- _stack = . ;
+_stack = . ;
*(.stack)
} ram
.stab 0 (NOLOAD) :
Index: src/sys/arch/evbsh3/conf/shl.x
diff -u src/sys/arch/evbsh3/conf/shl.x:1.4 src/sys/arch/evbsh3/conf/shl.x:1.5
--- src/sys/arch/evbsh3/conf/shl.x:1.4 Thu Aug 20 07:13:07 2015
+++ src/sys/arch/evbsh3/conf/shl.x Thu Aug 20 09:46:03 2015
@@ -13,7 +13,7 @@ SECTIONS
{
*(.text)
*(.strings)
- _etext = . ;
+_etext = . ;
} ram
.tors :
AT (ROM + SIZEOF(.text))
@@ -29,19 +29,19 @@ SECTIONS
AT (ROM + SIZEOF(.text) + SIZEOF(.tors))
{
*(.data)
- _edata = . ;
+_edata = . ;
} ram
.bss :
AT (ROM + SIZEOF(.text) + SIZEOF(.tors) + SIZEOF(.data))
{
- _bss_start = . ;
+_bss_start = . ;
*(.bss)
*(COMMON)
- _end = . ;
+_end = . ;
} ram
.stack :
{
- _stack = . ;
+_stack = . ;
*(.stack)
} ram
.stab 0 (NOLOAD) :
Index: src/sys/arch/evbsh3/conf/sh.x.ICE
diff -u src/sys/arch/evbsh3/conf/sh.x.ICE:1.2 src/sys/arch/evbsh3/conf/sh.x.ICE:1.3
--- src/sys/arch/evbsh3/conf/sh.x.ICE:1.2 Tue Nov 20 12:56:26 2001
+++ src/sys/arch/evbsh3/conf/sh.x.ICE Thu Aug 20 09:46:03 2015
@@ -10,7 +10,7 @@ SECTIONS
{
*(.text)
*(.strings)
- _etext = . ;
+_etext = . ;
} ram
.tors :
{
@@ -24,18 +24,18 @@ SECTIONS
.data :
{
*(.data)
- _edata = . ;
+_edata = . ;
} ram
.bss :
{
- _bss_start = . ;
+_bss_start = . ;
*(.bss)
*(COMMON)
- _end = . ;
+_end = . ;
} ram
.stack :
{
- _stack = . ;
+_stack = . ;
*(.stack)
} ram
.stab 0 (NOLOAD) :
Index: src/sys/arch/evbsh3/conf/sh.x.RAM
diff -u src/sys/arch/evbsh3/conf/sh.x.RAM:1.2 src/sys/arch/evbsh3/conf/sh.x.RAM:1.3
--- src/sys/arch/evbsh3/conf/sh.x.RAM:1.2 Tue Nov 20 12:56:26 2001
+++ src/sys/arch/evbsh3/conf/sh.x.RAM Thu Aug 20 09:46:03 2015
@@ -10,7 +10,7 @@ SECTIONS
{
*(.text)
*(.strings)
- _etext = . ;
+_etext = . ;
} ram
.tors :
{
@@ -24,18 +24,18 @@ SECTIONS
.data :
{
*(.data)
- _edata = . ;
+_edata = . ;
} ram
.bss :
{
- _bss_start = . ;
+_bss_start = . ;
*(.bss)
*(COMMON)
- _end = . ;
+_end = . ;
} ram
.stack :
{
- _stack = . ;
+_stack = . ;
*(.stack)
} ram
.stab 0 (NOLOAD) :
Index: src/sys/arch/evbsh3/conf/sh.x.ROM
diff -u src/sys/arch/evbsh3/conf/sh.x.ROM:1.2 src/sys/arch/evbsh3/conf/sh.x.ROM:1.3
--- src/sys/arch/evbsh3/conf/sh.x.ROM:1.2 Tue Nov 20 12:56:26 2001
+++ src/sys/arch/evbsh3/conf/sh.x.ROM Thu Aug 20 09:46:03 2015
@@ -10,23 +10,23 @@ SECTIONS
{
*(.text)
*(.strings)
- _etext = . ;
+_etext = . ;
}
.data :
{
*(.data)
- _edata = . ;
+_edata = . ;
}
.bss 0x8c01 :
{
- _bss_start = . ;
+_bss_start = . ;
*(.bss)
*(COMMON)
- _end = . ;
+_end = . ;
}
.stack :
{
- _stack = . ;
+_stack = . ;
*(.stack)
}
}
Index: src/sys/arch/evbsh3/conf/shl.x.ICE
diff -u src/sys/arch/evbsh3/conf/shl.x.ICE:1.2 src/sys/arch/evbsh3/conf/shl.x.ICE:1.3
--- src/sys/arch/evbsh3/conf/shl.x.ICE:1.2 Tue Nov 20 12:56:26 2001
+++ src/sys/arch/evbsh3/conf/shl.x.ICE Thu Aug 20 09:46:03 2015
@@ -10,7 +10,7 @@ SECTIONS
{
*(.text)
*(.strings)
- _etext = . ;
+_etext = . ;
} ram
.tors :
{
@@ -24,18 +24,18 @@ SECTIONS
.data :
{
*(.data)
- _edata = . ;
+_edata = . ;
} ram
CVS commit: src/usr.bin/config
Module Name:src
Committed By: christos
Date: Thu Aug 20 09:44:24 UTC 2015
Modified Files:
src/usr.bin/config: defs.h mkheaders.c mkioconf.c
Log Message:
move driver attach declarations to ioconf.h
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/config/defs.h
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/config/mkheaders.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/config/mkioconf.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/config/defs.h
diff -u src/usr.bin/config/defs.h:1.64 src/usr.bin/config/defs.h:1.65
--- src/usr.bin/config/defs.h:1.64 Sun Nov 16 19:53:15 2014
+++ src/usr.bin/config/defs.h Thu Aug 20 05:44:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.64 2014/11/17 00:53:15 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.65 2015/08/20 09:44:24 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -107,7 +107,7 @@ extern const char *progname;
* The next two lines define the current version of the config(1) binary,
* and the minimum version of the configuration files it supports.
*/
-#define CONFIG_VERSION 20141030
+#define CONFIG_VERSION 20150820
#define CONFIG_MINVERSION 0
/*
Index: src/usr.bin/config/mkheaders.c
diff -u src/usr.bin/config/mkheaders.c:1.26 src/usr.bin/config/mkheaders.c:1.27
--- src/usr.bin/config/mkheaders.c:1.26 Thu Jan 22 15:01:22 2015
+++ src/usr.bin/config/mkheaders.c Thu Aug 20 05:44:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mkheaders.c,v 1.26 2015/01/22 20:01:22 christos Exp $ */
+/* $NetBSD: mkheaders.c,v 1.27 2015/08/20 09:44:24 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mkheaders.c,v 1.26 2015/01/22 20:01:22 christos Exp $);
+__RCSID($NetBSD: mkheaders.c,v 1.27 2015/08/20 09:44:24 christos Exp $);
#include sys/param.h
#include ctype.h
@@ -389,11 +389,19 @@ emitioconfh(void)
const char *tfname;
FILE *tfp;
struct devbase *d;
+ struct devi *i;
tfname = tmp_ioconf.h;
if ((tfp = fopen(tfname, w)) == NULL)
return (herr(open, tfname, NULL));
+fputs(\n/* pseudo-devices */\n, tfp);
+TAILQ_FOREACH(i, allpseudo, i_next) {
+fprintf(tfp, void %sattach(int);\n,
+i-i_base-d_name);
+}
+
+fputs(\n/* driver structs */\n, tfp);
TAILQ_FOREACH(d, allbases, d_next) {
if (!devbase_has_instances(d, WILD))
continue;
Index: src/usr.bin/config/mkioconf.c
diff -u src/usr.bin/config/mkioconf.c:1.28 src/usr.bin/config/mkioconf.c:1.29
--- src/usr.bin/config/mkioconf.c:1.28 Sat Nov 1 07:02:41 2014
+++ src/usr.bin/config/mkioconf.c Thu Aug 20 05:44:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mkioconf.c,v 1.28 2014/11/01 11:02:41 uebayasi Exp $ */
+/* $NetBSD: mkioconf.c,v 1.29 2015/08/20 09:44:24 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mkioconf.c,v 1.28 2014/11/01 11:02:41 uebayasi Exp $);
+__RCSID($NetBSD: mkioconf.c,v 1.29 2015/08/20 09:44:24 christos Exp $);
#include sys/param.h
#include err.h
@@ -92,6 +92,8 @@ mkioconf(void)
return (1);
}
+ fprintf(fp, #include \ioconf.h\\n);
+
emithdr(fp);
emitcfdrivers(fp);
emitexterns(fp);
@@ -476,10 +478,6 @@ emitpseudo(FILE *fp)
struct devbase *d;
fputs(\n/* pseudo-devices */\n, fp);
- TAILQ_FOREACH(i, allpseudo, i_next) {
- fprintf(fp, void %sattach(int);\n,
- i-i_base-d_name);
- }
fputs(\nconst struct pdevinit pdevinit[] = {\n, fp);
TAILQ_FOREACH(i, allpseudo, i_next) {
d = i-i_base;
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 09:34:54 UTC 2015
Modified Files:
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen
Log Message:
Simplify these by doing AT () relocation once.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/conf/kern.ldscript.Xen
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/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.12 src/sys/arch/i386/conf/kern.ldscript:1.13
--- src/sys/arch/i386/conf/kern.ldscript:1.12 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/i386/conf/kern.ldscript Thu Aug 20 09:34:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.12 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.13 2015/08/20 09:34:54 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-i386, elf32-i386,
elf32-i386)
@@ -8,17 +8,15 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text) 0x0fff)
{
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
.rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
{
*(.rodata)
*(.rodata.*)
@@ -29,19 +27,16 @@ SECTIONS
. = ALIGN(0x1000) + (. (0x1000 - 1));
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -50,7 +45,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -65,3 +59,11 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text) 0x0fff)
+ {
+*(.text)
+ } =0
+}
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.13 src/sys/arch/i386/conf/kern.ldscript.4MB:1.14
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.13 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Thu Aug 20 09:34:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.4MB,v 1.13 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.4MB,v 1.14 2015/08/20 09:34:54 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-i386, elf32-i386,
elf32-i386)
@@ -8,17 +8,15 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text) 0x0fff)
{
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
.rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
{
*(.rodata)
*(.rodata.*)
@@ -30,19 +28,16 @@ SECTIONS
. = ALIGN(0x40);
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -51,7 +46,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -66,3 +60,11 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text) 0x0fff)
+ {
+*(.text)
+ } =0
+}
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.7 src/sys/arch/i386/conf/kern.ldscript.Xen:1.8
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.7 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Thu Aug 20 09:34:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.7 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.8 2015/08/20 09:34:54 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-i386, elf32-i386,
elf32-i386)
@@ -11,7 +11,7 @@ SECTIONS
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
@@ -31,13 +31,11 @@ SECTIONS
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) -
CVS commit: src/sys/arch/netwinder/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:22:18 UTC 2015
Modified Files:
src/sys/arch/netwinder/conf: Makefile.netwinder.inc
Log Message:
Use ${KERNLDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/netwinder/conf/Makefile.netwinder.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/netwinder/conf/Makefile.netwinder.inc
diff -u src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.9 src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.10
--- src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.9 Sat Nov 15 14:03:37 2014
+++ src/sys/arch/netwinder/conf/Makefile.netwinder.inc Thu Aug 20 06:22:18 2015
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.netwinder.inc,v 1.9 2014/11/15 14:03:37 uebayasi Exp $
+# $NetBSD: Makefile.netwinder.inc,v 1.10 2015/08/20 06:22:18 uebayasi Exp $
CPPFLAGS+= -D${MACHINE}
SYSTEM_FIRST_OBJ= nwmmu.o
SYSTEM_FIRST_SFILE= ${THISARM}/${MACHINE}/nwmmu.S
-LINKSCRIPT= -T ${THISARM}/conf/kern.ldscript
+KERNLDSCRIPT= ${THISARM}/conf/kern.ldscript
+LINKSCRIPT= -T ${KERNLDSCRIPT}
CVS commit: src/sys/arch/hppa/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:21:54 UTC 2015
Modified Files:
src/sys/arch/hppa/conf: Makefile.hppa
Log Message:
Use ${KERNLDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/conf/Makefile.hppa
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/hppa/conf/Makefile.hppa
diff -u src/sys/arch/hppa/conf/Makefile.hppa:1.2 src/sys/arch/hppa/conf/Makefile.hppa:1.3
--- src/sys/arch/hppa/conf/Makefile.hppa:1.2 Sat Nov 15 12:20:06 2014
+++ src/sys/arch/hppa/conf/Makefile.hppa Thu Aug 20 06:21:54 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hppa,v 1.2 2014/11/15 12:20:06 uebayasi Exp $
+# $NetBSD: Makefile.hppa,v 1.3 2015/08/20 06:21:54 uebayasi Exp $
# Makefile for NetBSD
#
@@ -67,7 +67,8 @@ locore.o: ${HPPA}/hppa/locore.S
##
## (5) link settings
##
-LINKSCRIPT= -T ${HPPA}/conf/ld.script
+KERNLDSCRIPT= ${HPPA}/conf/ld.script
+LINKSCRIPT= -T ${KERNLDSCRIPT}
TEXTADDR?= 0020
LINKFLAGS_NORMAL= -X
EXTRA_LINKFLAGS= -Map $@.map
CVS commit: src/sys/arch/epoc32/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:21:02 UTC 2015
Modified Files:
src/sys/arch/epoc32/conf: Makefile.epoc32.inc
Log Message:
Clean up ${LINKSCRIPT} and ${KERNLDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/epoc32/conf/Makefile.epoc32.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/epoc32/conf/Makefile.epoc32.inc
diff -u src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.2 src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.3
--- src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.2 Sat Nov 15 14:25:22 2014
+++ src/sys/arch/epoc32/conf/Makefile.epoc32.inc Thu Aug 20 06:21:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.epoc32.inc,v 1.2 2014/11/15 14:25:22 uebayasi Exp $
+# $NetBSD: Makefile.epoc32.inc,v 1.3 2015/08/20 06:21:02 uebayasi Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -8,14 +8,16 @@ SYSTEM_FIRST_SFILE= ${THISARM}/epoc32/ep
KERNEL_BASE_VIRT= $(LOADADDRESS)
-LINKSCRIPT= -T ldscript
+KERNLDSCRIPT= ldscript
+LINKSCRIPT= -T ${KERNLDSCRIPT}
-EXTRA_CLEAN+= netbsd.map assym.d ldscript tmp
-
-netbsd: ldscript # XXX
+EXTRA_CLEAN+= netbsd.map assym.d ${KERNLDSCRIPT} tmp
# generate ldscript from common template
-ldscript: ${THISARM}/conf/ldscript.epoc32 ${THISARM}/conf/Makefile.epoc32.inc Makefile
+${KERNLDSCRIPT}: \
+${THISARM}/conf/ldscript.epoc32 \
+${THISARM}/conf/Makefile.epoc32.inc \
+Makefile
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
${THISARM}/conf/ldscript.epoc32 tmp mv tmp $@
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 07:13:07 UTC 2015
Modified Files:
src/sys/arch/evbsh3/conf: sh.x shl.x
src/sys/arch/mmeye/conf: sh.x
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbsh3/conf/sh.x \
src/sys/arch/evbsh3/conf/shl.x
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mmeye/conf/sh.x
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/conf/sh.x
diff -u src/sys/arch/evbsh3/conf/sh.x:1.3 src/sys/arch/evbsh3/conf/sh.x:1.4
--- src/sys/arch/evbsh3/conf/sh.x:1.3 Tue Nov 20 12:56:26 2001
+++ src/sys/arch/evbsh3/conf/sh.x Thu Aug 20 07:13:07 2015
@@ -16,7 +16,7 @@ SECTIONS
_etext = . ;
} ram
.tors :
- AT ( ROM + SIZEOF(.text))
+ AT (ROM + SIZEOF(.text))
{
___ctors = . ;
*(.ctors)
@@ -26,13 +26,13 @@ SECTIONS
___dtors_end = . ;
} ram
.data :
- AT ( ROM + SIZEOF(.text) + SIZEOF(.tors))
+ AT (ROM + SIZEOF(.text) + SIZEOF(.tors))
{
*(.data)
_edata = . ;
} ram
.bss :
- AT ( ROM + SIZEOF(.text) + SIZEOF(.tors) + SIZEOF(.data))
+ AT (ROM + SIZEOF(.text) + SIZEOF(.tors) + SIZEOF(.data))
{
_bss_start = . ;
*(.bss)
Index: src/sys/arch/evbsh3/conf/shl.x
diff -u src/sys/arch/evbsh3/conf/shl.x:1.3 src/sys/arch/evbsh3/conf/shl.x:1.4
--- src/sys/arch/evbsh3/conf/shl.x:1.3 Tue Nov 20 12:56:26 2001
+++ src/sys/arch/evbsh3/conf/shl.x Thu Aug 20 07:13:07 2015
@@ -16,7 +16,7 @@ SECTIONS
_etext = . ;
} ram
.tors :
- AT ( ROM + SIZEOF(.text))
+ AT (ROM + SIZEOF(.text))
{
___ctors = . ;
*(.ctors)
@@ -26,13 +26,13 @@ SECTIONS
___dtors_end = . ;
} ram
.data :
- AT ( ROM + SIZEOF(.text) + SIZEOF(.tors))
+ AT (ROM + SIZEOF(.text) + SIZEOF(.tors))
{
*(.data)
_edata = . ;
} ram
.bss :
- AT ( ROM + SIZEOF(.text) + SIZEOF(.tors) + SIZEOF(.data))
+ AT (ROM + SIZEOF(.text) + SIZEOF(.tors) + SIZEOF(.data))
{
_bss_start = . ;
*(.bss)
Index: src/sys/arch/mmeye/conf/sh.x
diff -u src/sys/arch/mmeye/conf/sh.x:1.3 src/sys/arch/mmeye/conf/sh.x:1.4
--- src/sys/arch/mmeye/conf/sh.x:1.3 Tue Nov 20 12:56:33 2001
+++ src/sys/arch/mmeye/conf/sh.x Thu Aug 20 07:13:07 2015
@@ -16,7 +16,7 @@ SECTIONS
_etext = . ;
} ram
.tors :
- AT ( ROM + SIZEOF(.text))
+ AT (ROM + SIZEOF(.text))
{
___ctors = . ;
*(.ctors)
@@ -26,13 +26,13 @@ SECTIONS
___dtors_end = . ;
} ram
.data :
- AT ( ROM + SIZEOF(.text) + SIZEOF(.tors))
+ AT (ROM + SIZEOF(.text) + SIZEOF(.tors))
{
*(.data)
_edata = . ;
} ram
.bss :
- AT ( ROM + SIZEOF(.text) + SIZEOF(.tors) + SIZEOF(.data))
+ AT (ROM + SIZEOF(.text) + SIZEOF(.tors) + SIZEOF(.data))
{
_bss_start = . ;
*(.bss)
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 08:53:31 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript.2MB kern.ldscript.Xen
Log Message:
Simplify these by relocating only .text.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/conf/kern.ldscript.2MB
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/kern.ldscript.Xen
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/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.7 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.8
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.7 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB Thu Aug 20 08:53:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.2MB,v 1.7 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.2MB,v 1.8 2015/08/20 08:53:31 uebayasi Exp $ */
OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
elf64-x86-64)
@@ -8,17 +8,15 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text))
{
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
.rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
{
*(.rodata)
*(.rodata.*)
@@ -30,19 +28,16 @@ SECTIONS
. = ALIGN(0x20);
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -51,7 +46,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -66,3 +60,11 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text))
+ {
+*(.text)
+ } =0
+}
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.6 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.7
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.6 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Thu Aug 20 08:53:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.6 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.7 2015/08/20 08:53:31 uebayasi Exp $ */
OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
elf64-x86-64)
@@ -8,13 +8,12 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text))
{
*(.text)
*(.text.*)
*(.stub)
*(.rodata)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
@@ -23,19 +22,16 @@ SECTIONS
. = ALIGN(0x10) + (. (0x10 - 1));
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -44,7 +40,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -59,3 +54,11 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 07:00:49 UTC 2015
Modified Files:
src/sys/arch/aarch64/conf: kern.ldscript
src/sys/arch/amd64/conf: kern.ldscript.2MB kern.ldscript.Xen
src/sys/arch/cats/conf: kern.ldscript ldscript.elf
src/sys/arch/epoc32/conf: ldscript.epoc32
src/sys/arch/evbarm/conf: ldscript.evbarm
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen stand.ldscript
src/sys/arch/ia64/conf: kern.ldscript
src/sys/arch/mips/conf: kern.ldscript stand.ldscript
src/sys/arch/mipsco/conf: stand.ldscript
src/sys/arch/netwinder/conf: kern.ldscript
src/sys/arch/powerpc/conf: kern-mb.ldscript kern.ldscript
kern64.ldscript
src/sys/arch/riscv/conf: kern.ldscript
src/sys/arch/shark/conf: kern.ldscript
src/sys/arch/sparc/conf: kern.ldscript
src/sys/arch/sparc64/conf: kern.ldscript kern32.ldscript
src/sys/arch/zaurus/conf: ldscript.zaurus
Log Message:
Indent with 2 spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/conf/kern.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/kern.ldscript.2MB
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/conf/kern.ldscript.Xen
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/cats/conf/kern.ldscript
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/cats/conf/ldscript.elf
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/conf/ldscript.epoc32
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/ldscript.evbarm
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/conf/kern.ldscript.Xen
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/conf/stand.ldscript
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/conf/kern.ldscript
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/conf/kern.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/conf/stand.ldscript
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mipsco/conf/stand.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/netwinder/conf/kern.ldscript
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/conf/kern-mb.ldscript \
src/sys/arch/powerpc/conf/kern64.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/conf/kern.ldscript
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/kern.ldscript
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/shark/conf/kern.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/conf/kern.ldscript
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/conf/kern.ldscript
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/conf/kern32.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/conf/ldscript.zaurus
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/aarch64/conf/kern.ldscript
diff -u src/sys/arch/aarch64/conf/kern.ldscript:1.1 src/sys/arch/aarch64/conf/kern.ldscript:1.2
--- src/sys/arch/aarch64/conf/kern.ldscript:1.1 Sun Aug 10 05:47:37 2014
+++ src/sys/arch/aarch64/conf/kern.ldscript Thu Aug 20 07:00:48 2015
@@ -55,15 +55,15 @@ SECTIONS
__bss_start__ = .;
.bss:
{
- *(.dynbss)
- *(.bss .bss.* .gnu.linkonce.b.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections.
- FIXME: Why do we need it? When there is no .bss section, we don't
- pad the .data section. */
- . = ALIGN(. != 0 ? 32 / 8 : 1);
+*(.dynbss)
+*(.bss .bss.* .gnu.linkonce.b.*)
+*(COMMON)
+/* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections.
+ FIXME: Why do we need it? When there is no .bss section, we don't
+ pad the .data section. */
+. = ALIGN(. != 0 ? 32 / 8 : 1);
}
_bss_end__ = . ; __bss_end__ = . ;
. = ALIGN(32 / 8);
Index: src/sys/arch/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.6 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.7
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.6 Thu Aug 20 06:48:25 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.2MB,v 1.6 2015/08/20 06:48:25 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.2MB,v 1.7 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
elf64-x86-64)
@@ -6,59 +6,59 @@ OUTPUT_ARCH(i386:x86-64)
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- AT (ADDR(.text))
- {
- *(.text)
- *(.text.*)
- *(.stub)
- } =0
- _etext = . ;
- PROVIDE (etext = .) ;
+ /* Read-only sections, merged into text segment: */
+ .text :
+ AT
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Thu Aug 20 09:44:53 UTC 2015 Modified Files: src/sys/conf: files Log Message: bump config version To generate a diff of this commit: cvs rdiff -u -r1.1133 -r1.1134 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1133 src/sys/conf/files:1.1134 --- src/sys/conf/files:1.1133 Tue Aug 18 05:43:38 2015 +++ src/sys/conf/files Thu Aug 20 05:44:53 2015 @@ -1,7 +1,7 @@ -# $NetBSD: files,v 1.1133 2015/08/18 09:43:38 uebayasi Exp $ +# $NetBSD: files,v 1.1134 2015/08/20 09:44:53 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 -version 20141030 +version 20150820 # # device classes
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Aug 20 09:45:45 UTC 2015
Modified Files:
src/sys/kern: kern_cpu.c kern_drvctl.c kern_ksyms.c tty_ptm.c tty_pty.c
Log Message:
include ioconf.h instead of locally declaring the prototype of the attach
function
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.38 -r1.39 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.76 -r1.77 src/sys/kern/kern_ksyms.c
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.141 -r1.142 src/sys/kern/tty_pty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.69 src/sys/kern/kern_cpu.c:1.70
--- src/sys/kern/kern_cpu.c:1.69 Thu Aug 20 04:27:09 2015
+++ src/sys/kern/kern_cpu.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.69 2015/08/20 08:27:09 uebayasi Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.70 2015/08/20 09:45:45 christos Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v 1.69 2015/08/20 08:27:09 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v 1.70 2015/08/20 09:45:45 christos Exp $);
#include opt_cpu_ucode.h
#include opt_compat_netbsd.h
@@ -83,6 +83,8 @@ __KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v
#include uvm/uvm_extern.h
+#include ioconf.h
+
/*
* If the port has stated that cpu_data is the first thing in cpu_info,
* verify that the claim is true. This will prevent them from getting out
@@ -94,8 +96,6 @@ CTASSERT(offsetof(struct cpu_info, ci_da
CTASSERT(offsetof(struct cpu_info, ci_data) != 0);
#endif
-void cpuctlattach(int);
-
static void cpu_xc_online(struct cpu_info *);
static void cpu_xc_offline(struct cpu_info *);
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.38 src/sys/kern/kern_drvctl.c:1.39
--- src/sys/kern/kern_drvctl.c:1.38 Thu Aug 20 04:27:09 2015
+++ src/sys/kern/kern_drvctl.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.38 2015/08/20 08:27:09 uebayasi Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.39 2015/08/20 09:45:45 christos Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_drvctl.c,v 1.38 2015/08/20 08:27:09 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_drvctl.c,v 1.39 2015/08/20 09:45:45 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -48,6 +48,8 @@ __KERNEL_RCSID(0, $NetBSD: kern_drvctl.
#include sys/kauth.h
#include sys/lwp.h
+#include ioconf.h
+
struct drvctl_event {
TAILQ_ENTRY(drvctl_event) dce_link;
prop_dictionary_t dce_event;
@@ -80,8 +82,6 @@ const struct cdevsw drvctl_cdevsw = {
.d_flag = D_OTHER
};
-void drvctlattach(int);
-
static int drvctl_read(struct file *, off_t *, struct uio *,
kauth_cred_t, int);
static int drvctl_write(struct file *, off_t *, struct uio *,
Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.76 src/sys/kern/kern_ksyms.c:1.77
--- src/sys/kern/kern_ksyms.c:1.76 Tue May 19 22:45:20 2015
+++ src/sys/kern/kern_ksyms.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ksyms.c,v 1.76 2015/05/20 02:45:20 matt Exp $ */
+/* $NetBSD: kern_ksyms.c,v 1.77 2015/08/20 09:45:45 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_ksyms.c,v 1.76 2015/05/20 02:45:20 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_ksyms.c,v 1.77 2015/08/20 09:45:45 christos Exp $);
#if defined(_KERNEL) defined(_KERNEL_OPT)
#include opt_ddb.h
@@ -95,6 +95,7 @@ __KERNEL_RCSID(0, $NetBSD: kern_ksyms.c
#endif
#include ksyms.h
+#include ioconf.h
#define KSYMS_MAX_ID 65536
#ifdef KDTRACE_HOOKS
@@ -110,7 +111,6 @@ static bool ksyms_loaded;
static kmutex_t ksyms_lock __cacheline_aligned;
static struct ksyms_symtab kernel_symtab;
-void ksymsattach(int);
static void ksyms_hdr_init(void *);
static void ksyms_sizes_calc(void);
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.35 src/sys/kern/tty_ptm.c:1.36
--- src/sys/kern/tty_ptm.c:1.35 Wed Oct 15 11:00:03 2014
+++ src/sys/kern/tty_ptm.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.35 2014/10/15 15:00:03 christos Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.36 2015/08/20 09:45:45 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty_ptm.c,v 1.35 2014/10/15 15:00:03 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty_ptm.c,v 1.36 2015/08/20 09:45:45 christos Exp $);
#include opt_compat_netbsd.h
#include opt_ptm.h
@@ -58,6 +58,8 @@ __KERNEL_RCSID(0, $NetBSD: tty_ptm.c,v
#include compat/sys/ttycom.h
#endif /* COMPAT_60 */
+#include
CVS commit: src
Module Name:src
Committed By: joerg
Date: Thu Aug 20 10:06:21 UTC 2015
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/bsd/libc++: prepare-import.sh
src/external/bsd/libc++/include: Makefile
Log Message:
Update set list and build glue for libc++ r245539.
To generate a diff of this commit:
cvs rdiff -u -r1.1983 -r1.1984 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libc++/prepare-import.sh
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libc++/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1983 src/distrib/sets/lists/comp/mi:1.1984
--- src/distrib/sets/lists/comp/mi:1.1983 Mon Aug 17 22:20:39 2015
+++ src/distrib/sets/lists/comp/mi Thu Aug 20 10:06:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1983 2015/08/17 22:20:39 mrg Exp $
+# $NetBSD: mi,v 1.1984 2015/08/20 10:06:20 joerg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -218,7 +218,8 @@
./usr/include/c++/__std_stream comp-cxx-include libcxx
./usr/include/c++/__tree comp-cxx-include libcxx
./usr/include/c++/__tuple comp-cxx-include libcxx
-./usr/include/c++/__tuple_03 comp-cxx-include libcxx
+./usr/include/c++/__tuple_03 comp-obsolete obsolete
+./usr/include/c++/__undef___deallocate comp-cxx-include libcxx
./usr/include/c++/__undef_min_max comp-cxx-include libcxx
./usr/include/c++/algorithm comp-cxx-include libcxx
./usr/include/c++/arraycomp-cxx-include libcxx
@@ -258,9 +259,15 @@
./usr/include/c++/dynarray comp-obsolete obsolete
./usr/include/c++/exception comp-cxx-include libcxx
./usr/include/c++/experimental/__config comp-cxx-include libcxx
+./usr/include/c++/experimental/algorithm comp-cxx-include libcxx
+./usr/include/c++/experimental/chrono comp-cxx-include libcxx
./usr/include/c++/experimental/dynarray comp-cxx-include libcxx
./usr/include/c++/experimental/optional comp-cxx-include libcxx
+./usr/include/c++/experimental/ratio comp-cxx-include libcxx
./usr/include/c++/experimental/string_view comp-cxx-include libcxx
+./usr/include/c++/experimental/system_error comp-cxx-include libcxx
+./usr/include/c++/experimental/tuple comp-cxx-include libcxx
+./usr/include/c++/experimental/type_traits comp-cxx-include libcxx
./usr/include/c++/experimental/utility comp-cxx-include libcxx
./usr/include/c++/ext/__hash comp-cxx-include libcxx
./usr/include/c++/ext/hash_map comp-cxx-include libcxx
Index: src/external/bsd/libc++/prepare-import.sh
diff -u src/external/bsd/libc++/prepare-import.sh:1.2 src/external/bsd/libc++/prepare-import.sh:1.3
--- src/external/bsd/libc++/prepare-import.sh:1.2 Thu May 15 23:59:12 2014
+++ src/external/bsd/libc++/prepare-import.sh Thu Aug 20 10:06:21 2015
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.2 2014/05/15 23:59:12 joerg Exp $
+# $NetBSD: prepare-import.sh,v 1.3 2015/08/20 10:06:21 joerg Exp $
#
# Checkout libc++ and libcxxrt in the corresponding subdirectories of
# dist. Run this script and check for additional files and
@@ -9,7 +9,7 @@ set -e
cd dist/libcxx
rm -rf .svn cmake Makefile CMakeLists.txt lib src/support www .arcconfig
-rm -rf include/support */CMakeLists.txt
+rm -rf include/support */CMakeLists.txt .gitignore
cd ../libcxxrt
rm -rf .git CMakeLists.txt */CMakeLists.txt src/doxygen_config
Index: src/external/bsd/libc++/include/Makefile
diff -u src/external/bsd/libc++/include/Makefile:1.6 src/external/bsd/libc++/include/Makefile:1.7
--- src/external/bsd/libc++/include/Makefile:1.6 Sat Aug 9 19:06:49 2014
+++ src/external/bsd/libc++/include/Makefile Thu Aug 20 10:06:21 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/08/09 19:06:49 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/20 10:06:21 joerg Exp $
.include bsd.init.mk
@@ -20,7 +20,7 @@ INCS= __bit_reference \
__std_stream \
__tree \
__tuple \
- __tuple_03 \
+ __undef___deallocate \
__undef_min_max \
algorithm \
array \
@@ -109,9 +109,15 @@ INCS+= ext/__hash \
ext/hash_map \
ext/hash_set
INCS+= experimental/__config \
+ experimental/algorithm \
+ experimental/chrono \
experimental/dynarray \
experimental/optional \
+ experimental/ratio \
experimental/string_view \
+ experimental/system_error \
+ experimental/tuple \
+ experimental/type_traits \
experimental/utility
cxxabi.h: ${LIBCXXRT_SRCDIR}/src/cxxabi.h
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 03:42:29 UTC 2015
Modified Files:
src/sys/arch/cats/conf: ldscript.elf
Log Message:
Simplify this by deciding load address at one place.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cats/conf/ldscript.elf
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/conf/ldscript.elf
diff -u src/sys/arch/cats/conf/ldscript.elf:1.4 src/sys/arch/cats/conf/ldscript.elf:1.5
--- src/sys/arch/cats/conf/ldscript.elf:1.4 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/cats/conf/ldscript.elf Fri Aug 21 03:42:29 2015
@@ -1,28 +1,24 @@
-/* $NetBSD: ldscript.elf,v 1.4 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: ldscript.elf,v 1.5 2015/08/21 03:42:29 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
- KERNEL_BASE_phys = 0xF000;
- KERNEL_BASE_virt = 0xF000;
-
/* Kernel start: */
- .start (KERNEL_BASE_phys) :
+ .start :
{
*(.start)
- } =0
+ }
/* Read-only sections, merged into text segment: */
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
+ .text :
{
*(.text)
*(.text.*)
*(.stub)
*(.glue_7t) *(.glue_7)
*(.rodata) *(.rodata.*)
- } =0
+ }
PROVIDE (__etext = .);
PROVIDE (_etext = .);
PROVIDE (etext = .);
@@ -30,14 +26,12 @@ SECTIONS
boundary. */
. = ALIGN(0x8000);
.data:
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
__data_start = . ;
*(.data)
*(.data.*)
}
.sdata :
- AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
*(.sdata)
*(.sdata.*)
@@ -73,3 +67,19 @@ SECTIONS
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
}
+SECTIONS
+{
+ KERNEL_BASE_phys = 0xF000;
+ KERNEL_BASE_virt = 0xF000;
+
+ .start (KERNEL_BASE_phys) :
+ {
+*(.start)
+ } =0
+
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch/epoc32/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 04:00:48 UTC 2015
Modified Files:
src/sys/arch/epoc32/conf: ldscript.epoc32
Log Message:
Simplify this by deciding load address at one place.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/epoc32/conf/ldscript.epoc32
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/epoc32/conf/ldscript.epoc32
diff -u src/sys/arch/epoc32/conf/ldscript.epoc32:1.4 src/sys/arch/epoc32/conf/ldscript.epoc32:1.5
--- src/sys/arch/epoc32/conf/ldscript.epoc32:1.4 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/epoc32/conf/ldscript.epoc32 Fri Aug 21 04:00:48 2015
@@ -1,28 +1,24 @@
-/* $NetBSD: ldscript.epoc32,v 1.4 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: ldscript.epoc32,v 1.5 2015/08/21 04:00:48 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
- KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
- KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
/* Kernel start: */
- .start (KERNEL_BASE_phys) :
+ .start :
{
*(.start)
- } =0
+ }
/* Read-only sections, merged into text segment: */
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
+ .text :
{
*(.text)
*(.text.*)
*(.stub)
*(.glue_7t) *(.glue_7)
*(.rodata) *(.rodata.*)
- } =0
+ }
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
PROVIDE (__exidx_start = .);
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
@@ -34,14 +30,12 @@ SECTIONS
boundary. */
. = ALIGN(0x8000);
.data:
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
__data_start = . ;
*(.data)
*(.data.*)
}
.sdata :
- AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
*(.sdata)
*(.sdata.*)
@@ -81,3 +75,19 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+ KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
+ .start (KERNEL_BASE_phys) :
+ {
+*(.start)
+ } =0
+
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch/netwinder/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 04:13:23 UTC 2015
Modified Files:
src/sys/arch/netwinder/conf: kern.ldscript
Log Message:
Simplify this by deciding load address at one place.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/netwinder/conf/kern.ldscript
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/netwinder/conf/kern.ldscript
diff -u src/sys/arch/netwinder/conf/kern.ldscript:1.6 src/sys/arch/netwinder/conf/kern.ldscript:1.7
--- src/sys/arch/netwinder/conf/kern.ldscript:1.6 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/netwinder/conf/kern.ldscript Fri Aug 21 04:13:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.6 2015/08/20 07:00:49 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.7 2015/08/21 04:13:23 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-littlearm, elf32-bigarm,
elf32-littlearm)
@@ -6,25 +6,21 @@ OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
- KERNEL_BASE_phys = 0xc000;
- KERNEL_BASE_virt = 0xf000c000;
-
/* Kernel start: */
- .start (KERNEL_BASE_phys) :
+ .start :
{
*(.start)
- } =0
+ }
/* Read-only sections, merged into text segment: */
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
+ .text :
{
*(.text)
*(.text.*)
*(.stub)
*(.glue_7t) *(.glue_7)
*(.rodata) *(.rodata.*)
- } =0
+ }
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
PROVIDE (__exidx_start = .);
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
@@ -36,14 +32,12 @@ SECTIONS
boundary. */
. = ALIGN(0x8000);
.data:
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
__data_start = . ;
*(.data)
*(.data.*)
}
.sdata :
- AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
*(.sdata)
*(.sdata.*)
@@ -79,3 +73,19 @@ SECTIONS
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
}
+SECTIONS
+{
+ KERNEL_BASE_phys = 0xc000;
+ KERNEL_BASE_virt = 0xf000c000;
+
+ .start (KERNEL_BASE_phys) :
+ {
+*(.start)
+ } =0
+
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 04:27:54 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: ldscript.evbarm
Log Message:
Simplify this by deciding load address at one place.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/ldscript.evbarm
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/conf/ldscript.evbarm
diff -u src/sys/arch/evbarm/conf/ldscript.evbarm:1.9 src/sys/arch/evbarm/conf/ldscript.evbarm:1.10
--- src/sys/arch/evbarm/conf/ldscript.evbarm:1.9 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/evbarm/conf/ldscript.evbarm Fri Aug 21 04:27:54 2015
@@ -1,28 +1,24 @@
-/* $NetBSD: ldscript.evbarm,v 1.9 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: ldscript.evbarm,v 1.10 2015/08/21 04:27:54 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
- KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
- KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
/* Kernel start: */
- .start (KERNEL_BASE_phys) :
+ .start :
{
*(.start)
- } =0
+ }
/* Read-only sections, merged into text segment: */
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
+ .text :
{
*(.text)
*(.text.*)
*(.stub)
*(.glue_7t) *(.glue_7)
*(.rodata) *(.rodata.*)
- } =0
+ }
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
PROVIDE (__exidx_start = .);
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
@@ -34,14 +30,12 @@ SECTIONS
boundary. */
. = ALIGN(0x1);
.data:
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
__data_start = . ;
*(.data)
*(.data.*)
}
.sdata :
- AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
*(.sdata)
*(.sdata.*)
@@ -52,7 +46,6 @@ SECTIONS
__bss_start = .;
__bss_start__ = .;
.sbss :
- AT (LOADADDR(.sdata) + (ADDR(.sbss) - ADDR(.sdata)))
{
PROVIDE (__sbss_start = .);
PROVIDE (___sbss_start = .);
@@ -64,7 +57,6 @@ SECTIONS
PROVIDE (___sbss_end = .);
}
.bss :
- AT (LOADADDR(.sbss) + (ADDR(.bss) - ADDR(.sbss)))
{
*(.dynbss)
*(.bss)
@@ -80,3 +72,19 @@ SECTIONS
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
}
+SECTIONS
+{
+ KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+ KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
+ .start (KERNEL_BASE_phys) :
+ {
+*(.start)
+ } =0
+
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: mlelstv
Date: Thu Aug 20 23:08:33 UTC 2015
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
when scanning for disklabels, close block device only when this was
the first open. The device driver doesn't do reference counting.
This is still subject to race conditions.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.79 src/sys/dev/dkwedge/dk.c:1.80
--- src/sys/dev/dkwedge/dk.c:1.79 Fri Jan 2 01:14:22 2015
+++ src/sys/dev/dkwedge/dk.c Thu Aug 20 23:08:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.79 2015/01/02 01:14:22 christos Exp $ */
+/* $NetBSD: dk.c,v 1.80 2015/08/20 23:08:33 mlelstv Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.79 2015/01/02 01:14:22 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.80 2015/08/20 23:08:33 mlelstv Exp $);
#ifdef _KERNEL_OPT
#include opt_dkwedge.h
@@ -944,7 +944,7 @@ dkwedge_read(struct disk *pdk, struct vn
void *tbuf, size_t len)
{
buf_t *bp;
- int error;
+ int error, isopen;
/*
* The kernel cannot read from a character device vnode
@@ -964,6 +964,12 @@ dkwedge_read(struct disk *pdk, struct vn
bp-b_cylinder = 0;
bp-b_error = 0;
+ /*
+ * XXX Only the last user of a block device can close it.
+ * There is no reference counting in the driver.
+ */
+ isopen = pdk-dk_bopenmask (1 DISKPART(bp-b_dev));
+
error = bdev_open(bp-b_dev, FREAD, S_IFBLK, curlwp);
if (error)
return error;
@@ -972,7 +978,8 @@ dkwedge_read(struct disk *pdk, struct vn
error = biowait(bp);
putiobuf(bp);
- bdev_close(bp-b_dev, FREAD, S_IFBLK, curlwp);
+ if (!isopen)
+ bdev_close(bp-b_dev, FREAD, S_IFBLK, curlwp);
return error;
}
CVS commit: src/share/man/man4
Module Name:src Committed By: pgoyette Date: Thu Aug 20 10:42:09 UTC 2015 Modified Files: src/share/man/man4: options.4 sem.4 Log Message: P1003_1B_SEMAPHORE is no longer optional To generate a diff of this commit: cvs rdiff -u -r1.447 -r1.448 src/share/man/man4/options.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/sem.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.447 src/share/man/man4/options.4:1.448 --- src/share/man/man4/options.4:1.447 Fri Aug 7 07:34:56 2015 +++ src/share/man/man4/options.4 Thu Aug 20 10:42:09 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.447 2015/08/07 07:34:56 maxv Exp $ +.\ $NetBSD: options.4,v 1.448 2015/08/20 10:42:09 pgoyette Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -495,11 +495,6 @@ Beware - if this option is on, the kerne unknown ELF binaries as if they were .Nx binaries. -.It Cd options P1003_1B_SEMAPHORE -Includes kernel support for the standard C library -.Pq libc -functions that implement semaphores as specified in -.St -p1003.1-96 . .El .Ss Debugging Options .Bl -ohang Index: src/share/man/man4/sem.4 diff -u src/share/man/man4/sem.4:1.4 src/share/man/man4/sem.4:1.5 --- src/share/man/man4/sem.4:1.4 Fri Mar 1 18:39:52 2013 +++ src/share/man/man4/sem.4 Thu Aug 20 10:42:09 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: sem.4,v 1.4 2013/03/01 18:39:52 joerg Exp $ +.\ $NetBSD: sem.4,v 1.5 2015/08/20 10:42:09 pgoyette Exp $ .\ .\ Copyright (c) 2002 Tim J. Robbins .\ All rights reserved. @@ -33,10 +33,7 @@ .Nm sem .Nd POSIX semaphores .Sh SYNOPSIS -To link into the kernel: -.Bd -ragged -offset indent -.Cd options P1003_1B_SEMAPHORE -.Ed +The POSIX semaphore code is included by default in all kernels. .Sh DESCRIPTION The .Nm @@ -58,4 +55,7 @@ semaphores. The .Nm facility appeared as a kernel option in -.Nx 2.0 . +.Nx 2.0 +and became non-optional in +.Nx 7.0 . +
CVS commit: src/sys/arch/i386/stand/boot
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 11:39:28 UTC 2015
Modified Files:
src/sys/arch/i386/stand/boot: Makefile.boot
Log Message:
${PROG} depends on ${LDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/i386/stand/boot/Makefile.boot
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/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.66 src/sys/arch/i386/stand/boot/Makefile.boot:1.67
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.66 Mon Apr 14 15:05:19 2014
+++ src/sys/arch/i386/stand/boot/Makefile.boot Thu Aug 20 11:39:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.66 2014/04/14 15:05:19 uebayasi Exp $
+# $NetBSD: Makefile.boot,v 1.67 2015/08/20 11:39:28 uebayasi Exp $
S= ${.CURDIR}/../../../../..
@@ -132,7 +132,7 @@ vers.c: ${VERSIONFILE} ${SOURCES} ${LIBL
# Anything that calls 'real_to_prot' must have a %pc 0x1.
# We link the program, find the callers (all in libi386), then
# explicitly pull in the required objects before any other library code.
-${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/../Makefile.boot
+${PROG}: ${OBJS} ${LIBLIST} ${LDSCRIPT} ${.CURDIR}/../Makefile.boot
${_MKTARGET_LINK}
bb=$$( ${CC} -o ${PROG}.sym ${LDFLAGS} -Wl,-Ttext,0 -Wl,-cref \
${OBJS} ${LIBLIST} | ( \
CVS commit: src/sys/arch/i386/stand/bootxx
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 11:38:27 UTC 2015
Modified Files:
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
Log Message:
${PROG} depends on ${LDSCRIPT}.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
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/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.48 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.49
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.48 Wed Jan 15 22:25:22 2014
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Thu Aug 20 11:38:27 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.48 2014/01/15 22:25:22 joerg Exp $
+# $NetBSD: Makefile.bootxx,v 1.49 2015/08/20 11:38:27 uebayasi Exp $
S= ${.CURDIR}/../../../../..
@@ -120,7 +120,7 @@ LIBLIST= ${LIBI386} ${LIBSA} ${LIBKERN}
CLEANFILES+= ${PROG}.sym ${PROG}.map
-${PROG}: ${OBJS} ${LIBLIST}
+${PROG}: ${OBJS} ${LIBLIST} ${LDSCRIPT}
${_MKTARGET_LINK}
${CC} -o ${PROG}.sym ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} \
-T ${LDSCRIPT} -Wl,-Map,${PROG}.map -Wl,-cref ${OBJS} ${LIBLIST}
CVS commit: src/sys/rump/dev/lib/libraidframe
Module Name:src
Committed By: christos
Date: Thu Aug 20 11:58:26 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libraidframe: Makefile
Log Message:
put back bsd.init.mk
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libraidframe/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/rump/dev/lib/libraidframe/Makefile
diff -u src/sys/rump/dev/lib/libraidframe/Makefile:1.7 src/sys/rump/dev/lib/libraidframe/Makefile:1.8
--- src/sys/rump/dev/lib/libraidframe/Makefile:1.7 Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libraidframe/Makefile Thu Aug 20 07:58:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/08/20 11:51:12 christos Exp $
+# $NetBSD: Makefile,v 1.8 2015/08/20 11:58:26 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev/raidframe
@@ -23,6 +23,8 @@ SRCS= rf_acctrace.c rf_alloclist.c rf_
SRCS+= raidframe_component.c
+.include bsd.init.mk
+
.if !empty(RUMP_NBCOMPAT:M50)
SRCS+= rf_compat50.c
.endif
CVS commit: src/sys/dev/gpio
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 12:09:22 UTC 2015
Modified Files:
src/sys/dev/gpio: files.gpio gpiosim.c
Log Message:
Use needs-count for # of pseudo instances; suggested by cube@.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/gpio/files.gpio
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/gpio/gpiosim.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/gpio/files.gpio
diff -u src/sys/dev/gpio/files.gpio:1.12 src/sys/dev/gpio/files.gpio:1.13
--- src/sys/dev/gpio/files.gpio:1.12 Sat May 30 15:35:51 2015
+++ src/sys/dev/gpio/files.gpio Thu Aug 20 12:09:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.gpio,v 1.12 2015/05/30 15:35:51 jmcneill Exp $
+# $NetBSD: files.gpio,v 1.13 2015/08/20 12:09:22 uebayasi Exp $
define gpio {[offset = -1], [mask = 0], [flag = 0]}
@@ -8,7 +8,7 @@ file dev/gpio/gpio.cgpio needs-flag
# GPIO simulator
defpseudodev gpiosim: gpiobus
-file dev/gpio/gpiosim.c gpiosim
+file dev/gpio/gpiosim.c gpiosim needs-count
# I2C bus bit-banging
device gpioiic: i2cbus, i2c_bitbang
Index: src/sys/dev/gpio/gpiosim.c
diff -u src/sys/dev/gpio/gpiosim.c:1.16 src/sys/dev/gpio/gpiosim.c:1.17
--- src/sys/dev/gpio/gpiosim.c:1.16 Tue Feb 25 18:30:09 2014
+++ src/sys/dev/gpio/gpiosim.c Thu Aug 20 12:09:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiosim.c,v 1.16 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: gpiosim.c,v 1.17 2015/08/20 12:09:22 uebayasi Exp $ */
/* $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $ */
/*
@@ -30,6 +30,8 @@
#include sys/ioccom.h
#include dev/gpio/gpiovar.h
+#include gpiosim.h
+
#define GPIOSIM_NPINS 64
struct gpiosim_softc {
@@ -64,7 +66,7 @@ gpiosim_match(device_t parent, cfdata_t
}
void
-gpiosimattach(int num)
+gpiosimattach(int num __unused)
{
cfdata_t cf;
int n, err;
@@ -73,7 +75,7 @@ gpiosimattach(int num)
if (err)
printf(%s: unable to register cfattach\n, gpiosim_cd.cd_name);
- for (n = 0; n num; n++) {
+ for (n = 0; n NGPIOSIM; n++) {
cf = malloc(sizeof(*cf), M_DEVBUF, M_WAITOK);
cf-cf_name = gpiosim;
cf-cf_atname = gpiosim;
CVS commit: src/sys/net
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 11:18:53 UTC 2015
Modified Files:
src/sys/net: if_ppp.c if_ppp.h if_sl.c
Log Message:
Honor pseudo attach decl generated by config(1).
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/net/if_ppp.c
cvs rdiff -u -r1.25 -r1.26 src/sys/net/if_ppp.h
cvs rdiff -u -r1.119 -r1.120 src/sys/net/if_sl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.147 src/sys/net/if_ppp.c:1.148
--- src/sys/net/if_ppp.c:1.147 Mon Apr 20 10:19:54 2015
+++ src/sys/net/if_ppp.c Thu Aug 20 11:18:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.147 2015/04/20 10:19:54 roy Exp $ */
+/* $NetBSD: if_ppp.c,v 1.148 2015/08/20 11:18:53 uebayasi Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ppp.c,v 1.147 2015/04/20 10:19:54 roy Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ppp.c,v 1.148 2015/08/20 11:18:53 uebayasi Exp $);
#include ppp.h
@@ -165,6 +165,8 @@ __KERNEL_RCSID(0, $NetBSD: if_ppp.c,v 1
#include net/ppp-comp.h
#endif
+#include ioconf.h
+
static int pppsioctl(struct ifnet *, u_long, void *);
static void ppp_requeue(struct ppp_softc *);
static void ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd);
@@ -224,7 +226,7 @@ static void ppp_compressor_rele(struct c
* Called from boot code to establish ppp interfaces.
*/
void
-pppattach(void)
+pppattach(int n __unused)
{
extern struct linesw ppp_disc;
Index: src/sys/net/if_ppp.h
diff -u src/sys/net/if_ppp.h:1.25 src/sys/net/if_ppp.h:1.26
--- src/sys/net/if_ppp.h:1.25 Sat Nov 29 23:15:20 2008
+++ src/sys/net/if_ppp.h Thu Aug 20 11:18:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.h,v 1.25 2008/11/29 23:15:20 cube Exp $ */
+/* $NetBSD: if_ppp.h,v 1.26 2015/08/20 11:18:53 uebayasi Exp $ */
/* Id: if_ppp.h,v 1.16 1997/04/30 05:46:04 paulus Exp */
/*
@@ -172,8 +172,6 @@ struct ppp_rawin {
#endif
#if defined(_KERNEL) || defined(KERNEL)
-void pppattach(void);
-
struct compressor;
int ppp_register_compressor(struct compressor *, size_t);
int ppp_unregister_compressor(struct compressor *, size_t);
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.119 src/sys/net/if_sl.c:1.120
--- src/sys/net/if_sl.c:1.119 Thu Jun 5 23:48:16 2014
+++ src/sys/net/if_sl.c Thu Aug 20 11:18:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sl.c,v 1.119 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: if_sl.c,v 1.120 2015/08/20 11:18:53 uebayasi Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_sl.c,v 1.119 2014/06/05 23:48:16 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_sl.c,v 1.120 2015/08/20 11:18:53 uebayasi Exp $);
#include opt_inet.h
@@ -105,6 +105,8 @@ __KERNEL_RCSID(0, $NetBSD: if_sl.c,v 1.
#include sys/time.h
#include net/bpf.h
+#include ioconf.h
+
/*
* SLMAX is a hard limit on input packet size. To simplify the code
* and improve performance, we require that packets fit in an mbuf
@@ -211,10 +213,8 @@ static struct linesw slip_disc = {
.l_poll = ttyerrpoll
};
-void slattach(void);
-
void
-slattach(void)
+slattach(int n __unused)
{
if (ttyldisc_attach(slip_disc) != 0)
CVS commit: src/lib/librump
Module Name:src Committed By: christos Date: Thu Aug 20 11:28:02 UTC 2015 Added Files: src/lib/librump: ioconf.h Log Message: XXX: hack to fix the build To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/lib/librump/ioconf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/lib/librump/ioconf.h diff -u /dev/null src/lib/librump/ioconf.h:1.1 --- /dev/null Thu Aug 20 07:28:02 2015 +++ src/lib/librump/ioconf.h Thu Aug 20 07:28:02 2015 @@ -0,0 +1 @@ +void ksymsattach(int);
CVS commit: src/sys/rump/dev/lib
Module Name:src
Committed By: christos
Date: Thu Aug 20 11:51:12 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libcgd: Makefile
src/sys/rump/dev/lib/libdm: Makefile
src/sys/rump/dev/lib/libfss: Makefile
src/sys/rump/dev/lib/libnetsmb: Makefile netsmb_component.c
src/sys/rump/dev/lib/libopencrypto: Makefile opencrypto_component.c
src/sys/rump/dev/lib/libraidframe: Makefile raidframe_component.c
src/sys/rump/dev/lib/librnd: Makefile rnd_component.c
src/sys/rump/dev/lib/libvnd: Makefile
Added Files:
src/sys/rump/dev/lib/libcgd: CGD.ioconf
src/sys/rump/dev/lib/libdm: DM.ioconf
src/sys/rump/dev/lib/libfss: FSS.ioconf
src/sys/rump/dev/lib/libnetsmb: NETSMB.ioconf
src/sys/rump/dev/lib/libopencrypto: OPENCRYPTO.ioconf
src/sys/rump/dev/lib/libraidframe: RAIDFRAME.ioconf
src/sys/rump/dev/lib/librnd: RND.ioconf
src/sys/rump/dev/lib/libvnd: VND.ioconf
Log Message:
use ioconf files for pseudo-device attach prototypes
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libcgd/CGD.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libcgd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libdm/DM.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libdm/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libfss/FSS.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libfss/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libnetsmb/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libopencrypto/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf
cvs rdiff -u -r1.2 -r1.3 \
src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libraidframe/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/dev/lib/libraidframe/raidframe_component.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/librnd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/librnd/RND.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/librnd/rnd_component.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libvnd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvnd/VND.ioconf
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/dev/lib/libcgd/Makefile
diff -u src/sys/rump/dev/lib/libcgd/Makefile:1.4 src/sys/rump/dev/lib/libcgd/Makefile:1.5
--- src/sys/rump/dev/lib/libcgd/Makefile:1.4 Wed Mar 12 21:50:51 2014
+++ src/sys/rump/dev/lib/libcgd/Makefile Thu Aug 20 07:51:12 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/03/13 01:50:51 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/20 11:51:12 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev
LIB= rumpdev_cgd
-
+IOCONF= CGD.ioconf
SRCS= cgd.c cgd_crypto.c
SRCS+= cgd_component.c
Index: src/sys/rump/dev/lib/libdm/Makefile
diff -u src/sys/rump/dev/lib/libdm/Makefile:1.4 src/sys/rump/dev/lib/libdm/Makefile:1.5
--- src/sys/rump/dev/lib/libdm/Makefile:1.4 Wed Mar 12 21:54:22 2014
+++ src/sys/rump/dev/lib/libdm/Makefile Thu Aug 20 07:51:12 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/03/13 01:54:22 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/20 11:51:12 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev/dm
LIB= rumpdev_dm
-
+IOCONF= DM.ioconf
SRCS= device-mapper.c dm_dev.c dm_ioctl.c dm_pdev.c dm_table.c dm_target.c \
dm_target_linear.c dm_target_stripe.c
Index: src/sys/rump/dev/lib/libfss/Makefile
diff -u src/sys/rump/dev/lib/libfss/Makefile:1.2 src/sys/rump/dev/lib/libfss/Makefile:1.3
--- src/sys/rump/dev/lib/libfss/Makefile:1.2 Wed Mar 12 21:59:05 2014
+++ src/sys/rump/dev/lib/libfss/Makefile Thu Aug 20 07:51:12 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 01:59:05 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/20 11:51:12 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev
LIB= rumpdev_fss
-
+IOCONF= FSS.ioconf
SRCS= fss.c
SRCS+= fss_component.c
Index: src/sys/rump/dev/lib/libnetsmb/Makefile
diff -u src/sys/rump/dev/lib/libnetsmb/Makefile:1.5 src/sys/rump/dev/lib/libnetsmb/Makefile:1.6
--- src/sys/rump/dev/lib/libnetsmb/Makefile:1.5 Sat Nov 15 13:49:04 2014
+++ src/sys/rump/dev/lib/libnetsmb/Makefile Thu Aug 20 07:51:12 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2014/11/15 18:49:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2015/08/20 11:51:12 christos Exp $
#
.PATH: ${.CURDIR}/../../../../netsmb
LIB= rumpdev_netsmb
-
+IOCONF= NETSMB.ioconf
SRCS= iconv.c smb_conn.c smb_crypt.c smb_dev.c smb_iod.c smb_rq.c \
smb_smb.c smb_subr.c smb_trantcp.c smb_usr.c subr_mchain.c
@@ -14,7 +14,7 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
CVS commit: src/sys/rump/net/lib
Module Name:src
Committed By: christos
Date: Thu Aug 20 12:20:10 UTC 2015
Modified Files:
src/sys/rump/net/lib/libagr: Makefile
src/sys/rump/net/lib/libbridge: Makefile
src/sys/rump/net/lib/libnet: Makefile
src/sys/rump/net/lib/libnetmpls: Makefile netmpls_component.c
src/sys/rump/net/lib/libnpf: Makefile
src/sys/rump/net/lib/libtap: Makefile tap_component.c
Added Files:
src/sys/rump/net/lib/libagr: AGR.ioconf
src/sys/rump/net/lib/libbridge: BRIDGE.ioconf
src/sys/rump/net/lib/libnet: NET.ioconf
src/sys/rump/net/lib/libnetmpls: NETMPLS.ioconf
src/sys/rump/net/lib/libnpf: NPF.ioconf
src/sys/rump/net/lib/libtap: TAP.ioconf
Log Message:
add ioconf files for pseudo device attach prototypes
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libagr/AGR.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libagr/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libbridge/BRIDGE.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libbridge/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnet/NET.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetmpls/Makefile \
src/sys/rump/net/lib/libnetmpls/netmpls_component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/net/lib/libnpf/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnpf/NPF.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libtap/Makefile \
src/sys/rump/net/lib/libtap/tap_component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libtap/TAP.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libagr/Makefile
diff -u src/sys/rump/net/lib/libagr/Makefile:1.2 src/sys/rump/net/lib/libagr/Makefile:1.3
--- src/sys/rump/net/lib/libagr/Makefile:1.2 Wed Mar 12 22:07:03 2014
+++ src/sys/rump/net/lib/libagr/Makefile Thu Aug 20 08:20:09 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 02:07:03 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
#
.PATH: ${.CURDIR}/../../../../net/agr
LIB= rumpnet_agr
-
+IOCONF= AGR.ioconf
SRCS= if_agr.c if_agrsoftc.c if_agrsubr.c if_agrtimer.c if_agrmonitor.c \
if_agrether.c if_agrether_hash.c ieee8023ad_marker.c ieee8023ad_lacp.c \
ieee8023ad_lacp_select.c ieee8023ad_lacp_timer.c \
Index: src/sys/rump/net/lib/libbridge/Makefile
diff -u src/sys/rump/net/lib/libbridge/Makefile:1.2 src/sys/rump/net/lib/libbridge/Makefile:1.3
--- src/sys/rump/net/lib/libbridge/Makefile:1.2 Wed Mar 12 22:08:24 2014
+++ src/sys/rump/net/lib/libbridge/Makefile Thu Aug 20 08:20:09 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 02:08:24 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
#
.PATH: ${.CURDIR}/../../../../net
LIB= rumpnet_bridge
-
+IOCONF= BRIDGE.ioconf
SRCS= if_bridge.c bridgestp.c
SRCS+= bridge_component.c
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.23 src/sys/rump/net/lib/libnet/Makefile:1.24
--- src/sys/rump/net/lib/libnet/Makefile:1.23 Thu Apr 23 10:49:26 2015
+++ src/sys/rump/net/lib/libnet/Makefile Thu Aug 20 08:20:09 2015
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.23 2015/04/23 14:49:26 pooka Exp $
+# $NetBSD: Makefile,v 1.24 2015/08/20 12:20:09 christos Exp $
#
-.include bsd.init.mk
.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common
LIB= rumpnet_net
-
+IOCONF= NET.ioconf
# iffy stuff
SRCS= if.c if_loop.c route.c rtsock.c raw_usrreq.c \
raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c
SRCS+= if_43.c pfil.c
SRCS+= net_component.c
+.include bsd.init.mk
+
.if !empty(RUMP_NBCOMPAT:M50)
SRCS+= rtsock_50.c uipc_syscalls_50.c
.endif
Index: src/sys/rump/net/lib/libnetmpls/Makefile
diff -u src/sys/rump/net/lib/libnetmpls/Makefile:1.2 src/sys/rump/net/lib/libnetmpls/Makefile:1.3
--- src/sys/rump/net/lib/libnetmpls/Makefile:1.2 Wed Mar 12 22:05:29 2014
+++ src/sys/rump/net/lib/libnetmpls/Makefile Thu Aug 20 08:20:09 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 02:05:29 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
#
.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../netmpls
LIB= rumpnet_netmpls
-
+IOCONF= NETMPLS.ioconf
SRCS= mpls_ttl.c if_mpls.c
SRCS+= netmpls_component.c
Index: src/sys/rump/net/lib/libnetmpls/netmpls_component.c
diff -u src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.2 src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.3
--- src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.2 Fri Aug 22 07:34:28 2014
+++ src/sys/rump/net/lib/libnetmpls/netmpls_component.c Thu Aug 20 08:20:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netmpls_component.c,v 1.2 2014/08/22 11:34:28 pooka
CVS commit: src/sys/modules/gpiosim
Module Name:src Committed By: uebayasi Date: Thu Aug 20 12:28:43 UTC 2015 Added Files: src/sys/modules/gpiosim: gpiosim.h Log Message: Now gpiosim needs this for NGPIOSIM. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/gpiosim/gpiosim.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/modules/gpiosim/gpiosim.h diff -u /dev/null src/sys/modules/gpiosim/gpiosim.h:1.1 --- /dev/null Thu Aug 20 12:28:43 2015 +++ src/sys/modules/gpiosim/gpiosim.h Thu Aug 20 12:28:43 2015 @@ -0,0 +1,2 @@ +/* $NetBSD: gpiosim.h,v 1.1 2015/08/20 12:28:43 uebayasi Exp $ */ +#define NGPIOSIM 1
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: christos
Date: Thu Aug 20 12:04:30 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Added Files:
src/sys/rump/librump/rumpkern: KERN.ioconf
Log Message:
generate ioconf.h for pseudo-device attach prototype
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/KERN.ioconf
cvs rdiff -u -r1.160 -r1.161 src/sys/rump/librump/rumpkern/Makefile.rumpkern
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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.160 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.161
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.160 Wed Jun 17 07:46:34 2015
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Thu Aug 20 08:04:30 2015
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.rumpkern,v 1.160 2015/06/17 11:46:34 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.161 2015/08/20 12:04:30 christos Exp $
#
+IOCONF=KERN.ioconf
.include ${RUMPTOP}/Makefile.rump
.include bsd.own.mk
LIB= rump
-
MAN= rump.3 rump_lwproc.3
.PATH: ${RUMPTOP}/librump/rumpkern\
Added files:
Index: src/sys/rump/librump/rumpkern/KERN.ioconf
diff -u /dev/null src/sys/rump/librump/rumpkern/KERN.ioconf:1.1
--- /dev/null Thu Aug 20 08:04:30 2015
+++ src/sys/rump/librump/rumpkern/KERN.ioconf Thu Aug 20 08:04:30 2015
@@ -0,0 +1,7 @@
+# $NetBSD: KERN.ioconf,v 1.1 2015/08/20 12:04:30 christos Exp $
+
+ioconf kern
+
+include conf/files
+
+pseudo-device ksyms
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Aug 20 11:05:06 UTC 2015 Modified Files: src/share/man/man4: options.4 sem.4 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.448 -r1.449 src/share/man/man4/options.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/sem.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.448 src/share/man/man4/options.4:1.449 --- src/share/man/man4/options.4:1.448 Thu Aug 20 10:42:09 2015 +++ src/share/man/man4/options.4 Thu Aug 20 11:05:06 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.448 2015/08/20 10:42:09 pgoyette Exp $ +.\ $NetBSD: options.4,v 1.449 2015/08/20 11:05:06 wiz Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd August 7, 2015 +.Dd August 20, 2015 .Dt OPTIONS 4 .Os .Sh NAME Index: src/share/man/man4/sem.4 diff -u src/share/man/man4/sem.4:1.5 src/share/man/man4/sem.4:1.6 --- src/share/man/man4/sem.4:1.5 Thu Aug 20 10:42:09 2015 +++ src/share/man/man4/sem.4 Thu Aug 20 11:05:06 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: sem.4,v 1.5 2015/08/20 10:42:09 pgoyette Exp $ +.\ $NetBSD: sem.4,v 1.6 2015/08/20 11:05:06 wiz Exp $ .\ .\ Copyright (c) 2002 Tim J. Robbins .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ From: FreeBSD: src/share/man/man4/sem.4,v 1.2 2003/06/02 11:19:23 ru .\ -.Dd March 1, 2013 +.Dd August 20, 2015 .Dt SEM 4 .Os .Sh NAME @@ -58,4 +58,3 @@ facility appeared as a kernel option in .Nx 2.0 and became non-optional in .Nx 7.0 . -
CVS commit: src/sys/modules
Module Name:src
Committed By: christos
Date: Thu Aug 20 11:05:02 UTC 2015
Modified Files:
src/sys/modules/accf_dataready: Makefile
src/sys/modules/accf_httpready: Makefile
src/sys/modules/ccd: Makefile
src/sys/modules/cgd: Makefile
src/sys/modules/coda: Makefile
src/sys/modules/coda5: Makefile
src/sys/modules/crypto: Makefile
src/sys/modules/dm: Makefile
src/sys/modules/filemon: Makefile
src/sys/modules/fss: Makefile
src/sys/modules/gpiosim: Makefile
src/sys/modules/iscsi: Makefile
src/sys/modules/nandemulator: Makefile
src/sys/modules/npf: Makefile
src/sys/modules/opencrypto: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/swcrypto: Makefile
src/sys/modules/tprof: Makefile
src/sys/modules/vcoda: Makefile
src/sys/modules/vnd: Makefile
Added Files:
src/sys/modules/accf_dataready: accf_data.ioconf
src/sys/modules/accf_httpready: accf_http.ioconf
src/sys/modules/ccd: ccd.ioconf
src/sys/modules/cgd: cgd.ioconf
src/sys/modules/coda: coda.ioconf
src/sys/modules/coda5: coda5.ioconf
src/sys/modules/crypto: crypto.ioconf
src/sys/modules/dm: dm.ioconf
src/sys/modules/filemon: filemon.ioconf
src/sys/modules/fss: fss.ioconf
src/sys/modules/iscsi: iscsi.ioconf
src/sys/modules/nandemulator: nandemulator.ioconf
src/sys/modules/npf: npf.ioconf
src/sys/modules/opencrypto: opencrypto.ioconf
src/sys/modules/pf: pf.ioconf
src/sys/modules/swcrypto: swcrypto.ioconf
src/sys/modules/tprof: tprof.ioconf
src/sys/modules/vcoda: vcoda.ioconf
src/sys/modules/vnd: vnd.ioconf
Log Message:
Add ioconf entries to the pseudo-devices.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/accf_dataready/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/accf_dataready/accf_data.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/accf_httpready/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/accf_httpready/accf_http.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/ccd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/ccd/ccd.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/cgd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/cgd/cgd.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/coda/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/coda/coda.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/coda5/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/coda5/coda5.ioconf
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/crypto/Makefile
cvs rdiff -u -r0 -r1.3 src/sys/modules/crypto/crypto.ioconf
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dm/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/dm/dm.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/filemon/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/filemon/filemon.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/fss/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/fss/fss.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/gpiosim/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/iscsi/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/iscsi/iscsi.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/nandemulator/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/nandemulator/nandemulator.ioconf
cvs rdiff -u -r1.17 -r1.18 src/sys/modules/npf/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/npf/npf.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/opencrypto/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/opencrypto/opencrypto.ioconf
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/pf/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/pf/pf.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/swcrypto/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/swcrypto/swcrypto.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/tprof/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/tprof/tprof.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/vcoda/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/vcoda/vcoda.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/vnd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/vnd/vnd.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/accf_dataready/Makefile
diff -u src/sys/modules/accf_dataready/Makefile:1.1 src/sys/modules/accf_dataready/Makefile:1.2
--- src/sys/modules/accf_dataready/Makefile:1.1 Thu Nov 20 04:58:45 2008
+++ src/sys/modules/accf_dataready/Makefile Thu Aug 20 07:05:00 2015
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2008/11/20 09:58:45 ad Exp $
+# $NetBSD: Makefile,v 1.2 2015/08/20 11:05:00 christos Exp $
.include ../Makefile.inc
.PATH: ${S}/netinet
KMOD= accf_dataready
+IOCONF= accf_data.ioconf
SRCS= accf_data.c
.include bsd.kmodule.mk
Index: src/sys/modules/accf_httpready/Makefile
diff -u src/sys/modules/accf_httpready/Makefile:1.1
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Thu Aug 20 11:05:39 UTC 2015 Modified Files: src/lib/libc/gen: sysconf.3 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/lib/libc/gen/sysconf.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/sysconf.3 diff -u src/lib/libc/gen/sysconf.3:1.43 src/lib/libc/gen/sysconf.3:1.44 --- src/lib/libc/gen/sysconf.3:1.43 Thu Aug 20 10:44:44 2015 +++ src/lib/libc/gen/sysconf.3 Thu Aug 20 11:05:39 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysconf.3,v 1.43 2015/08/20 10:44:44 pgoyette Exp $ +.\ $NetBSD: sysconf.3,v 1.44 2015/08/20 11:05:39 wiz Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)sysconf.3 8.3 (Berkeley) 4/19/94 .\ -.Dd November 2, 2012 +.Dd August 20, 2015 .Dt SYSCONF 3 .Os .Sh NAME
CVS commit: src/sys/rump/kern/lib/libtty
Module Name:src
Committed By: christos
Date: Thu Aug 20 11:59:16 UTC 2015
Modified Files:
src/sys/rump/kern/lib/libtty: Makefile tty_component.c
Added Files:
src/sys/rump/kern/lib/libtty: TTY.ioconf
Log Message:
use ioconf.h for pseudo-device attach prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/kern/lib/libtty/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libtty/TTY.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/kern/lib/libtty/tty_component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/kern/lib/libtty/Makefile
diff -u src/sys/rump/kern/lib/libtty/Makefile:1.5 src/sys/rump/kern/lib/libtty/Makefile:1.6
--- src/sys/rump/kern/lib/libtty/Makefile:1.5 Thu Apr 23 10:49:26 2015
+++ src/sys/rump/kern/lib/libtty/Makefile Thu Aug 20 07:59:16 2015
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2015/04/23 14:49:26 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2015/08/20 11:59:16 christos Exp $
#
-.include bsd.init.mk
-
.PATH: ${.CURDIR}/../../../../kern \
${.CURDIR}/../../../../compat/common
LIB= rumpkern_tty
-
+IOCONF= TTY.ioconf
SRCS= tty.c tty_bsdpty.c tty_conf.c tty_ptm.c tty_pty.c tty_tty.c tty_subr.c
+.include bsd.init.mk
+
.if !empty(RUMP_NBCOMPAT:M60)
SRCS+= tty_60.c
.endif
Index: src/sys/rump/kern/lib/libtty/tty_component.c
diff -u src/sys/rump/kern/lib/libtty/tty_component.c:1.1 src/sys/rump/kern/lib/libtty/tty_component.c:1.2
--- src/sys/rump/kern/lib/libtty/tty_component.c:1.1 Wed Mar 12 22:02:30 2014
+++ src/sys/rump/kern/lib/libtty/tty_component.c Thu Aug 20 07:59:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_component.c,v 1.1 2014/03/13 02:02:30 pooka Exp $ */
+/* $NetBSD: tty_component.c,v 1.2 2015/08/20 11:59:16 christos Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty_component.c,v 1.1 2014/03/13 02:02:30 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty_component.c,v 1.2 2015/08/20 11:59:16 christos Exp $);
#include sys/param.h
#include sys/conf.h
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, $NetBSD: tty_componen
#include rump_private.h
#include rump_vfs_private.h
-void ptyattach(int);
+#include ioconf.h
RUMP_COMPONENT(RUMP_COMPONENT_KERN_VFS)
{
Added files:
Index: src/sys/rump/kern/lib/libtty/TTY.ioconf
diff -u /dev/null src/sys/rump/kern/lib/libtty/TTY.ioconf:1.1
--- /dev/null Thu Aug 20 07:59:16 2015
+++ src/sys/rump/kern/lib/libtty/TTY.ioconf Thu Aug 20 07:59:16 2015
@@ -0,0 +1,7 @@
+# $NetBSD: TTY.ioconf,v 1.1 2015/08/20 11:59:16 christos Exp $
+
+ioconf tty
+
+include conf/files
+
+pseudo-device pty
CVS commit: src/lib/libc/gen
Module Name:src Committed By: pgoyette Date: Thu Aug 20 10:44:44 UTC 2015 Modified Files: src/lib/libc/gen: sysconf.3 Log Message: P1003_1B_SEMAPHORE is no longer optional To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/lib/libc/gen/sysconf.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/sysconf.3 diff -u src/lib/libc/gen/sysconf.3:1.42 src/lib/libc/gen/sysconf.3:1.43 --- src/lib/libc/gen/sysconf.3:1.42 Sat Nov 3 00:52:41 2012 +++ src/lib/libc/gen/sysconf.3 Thu Aug 20 10:44:44 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysconf.3,v 1.42 2012/11/03 00:52:41 wiz Exp $ +.\ $NetBSD: sysconf.3,v 1.43 2015/08/20 10:44:44 pgoyette Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -149,12 +149,6 @@ and its Semaphores option to which the system attempts to conform, otherwise \-1. -.Pp -Availability of the -Semaphores -option depends on the -.Li P1003_1B_SEMAPHORE -kernel option. .It Li _SC_SHELL Return 1 if .Tn POSIX
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 11:42:57 UTC 2015
Modified Files:
src/sys/arch/i386/conf: stand.ldscript
Log Message:
Do AT () relocation once.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/stand.ldscript
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/i386/conf/stand.ldscript
diff -u src/sys/arch/i386/conf/stand.ldscript:1.2 src/sys/arch/i386/conf/stand.ldscript:1.3
--- src/sys/arch/i386/conf/stand.ldscript:1.2 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/i386/conf/stand.ldscript Thu Aug 20 11:42:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.2 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: stand.ldscript,v 1.3 2015/08/20 11:42:56 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-i386, elf32-i386,
elf32-i386)
@@ -8,17 +8,15 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text) 0x0fff)
{
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
.rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
{
*(.rodata)
*(.rodata.*)
@@ -26,17 +24,14 @@ SECTIONS
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -44,7 +39,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -62,3 +56,11 @@ SECTIONS
*(.note.netbsd.ident)
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text) 0x0fff)
+ {
+*(.text)
+ } =0
+}
CVS commit: src/lib/librump
Module Name:src Committed By: christos Date: Thu Aug 20 12:24:04 UTC 2015 Added Files: src/lib/librump: KERN.ioconf Removed Files: src/lib/librump: ioconf.h Log Message: Generate ioconf.h automatically. XXX: still dup of KERN.ioconf here To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/lib/librump/KERN.ioconf cvs rdiff -u -r1.1 -r0 src/lib/librump/ioconf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/lib/librump/KERN.ioconf diff -u /dev/null src/lib/librump/KERN.ioconf:1.1 --- /dev/null Thu Aug 20 08:24:04 2015 +++ src/lib/librump/KERN.ioconf Thu Aug 20 08:24:04 2015 @@ -0,0 +1,7 @@ +# $NetBSD: KERN.ioconf,v 1.1 2015/08/20 12:24:04 christos Exp $ + +ioconf kern + +include conf/files + +pseudo-device ksyms
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 02:35:52 UTC 2015
Modified Files:
src/sys/arch/ia64/conf: kern.ldscript
src/sys/arch/mips/conf: kern.ldscript
src/sys/arch/powerpc/conf: kern-mb.ldscript kern.ldscript
kern64.ldscript
src/sys/arch/riscv/conf: kern.ldscript
src/sys/arch/sparc/conf: kern.ldscript
src/sys/arch/sparc64/conf: kern.ldscript kern32.ldscript
Log Message:
I bet setting search-directory for ld.so is useless in any kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/conf/kern.ldscript
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/conf/kern.ldscript
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/conf/kern-mb.ldscript \
src/sys/arch/powerpc/conf/kern64.ldscript
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/conf/kern.ldscript
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/conf/kern.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/conf/kern.ldscript
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc64/conf/kern.ldscript
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/conf/kern32.ldscript
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/ia64/conf/kern.ldscript
diff -u src/sys/arch/ia64/conf/kern.ldscript:1.2 src/sys/arch/ia64/conf/kern.ldscript:1.3
--- src/sys/arch/ia64/conf/kern.ldscript:1.2 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/ia64/conf/kern.ldscript Fri Aug 21 02:35:52 2015
@@ -2,7 +2,6 @@
OUTPUT_FORMAT(elf64-ia64-little, elf64-ia64-little, elf64-ia64-little)
OUTPUT_ARCH(ia64)
ENTRY(start)
-SEARCH_DIR(/usr/lib);
kernel_text = 0xe400;
SECTIONS
{
Index: src/sys/arch/mips/conf/kern.ldscript
diff -u src/sys/arch/mips/conf/kern.ldscript:1.8 src/sys/arch/mips/conf/kern.ldscript:1.9
--- src/sys/arch/mips/conf/kern.ldscript:1.8 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/mips/conf/kern.ldscript Fri Aug 21 02:35:52 2015
@@ -1,9 +1,8 @@
-/* $NetBSD: kern.ldscript,v 1.8 2015/08/20 07:00:49 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.9 2015/08/21 02:35:52 uebayasi Exp $ */
/* ldscript for NetBSD/mips kernels and LKMs */
OUTPUT_ARCH(mips)
ENTRY(_start)
-SEARCH_DIR(/lib);
/* Do we need any of these?
__DYNAMIC = 0;*/
_DYNAMIC_LINK = 0;
Index: src/sys/arch/powerpc/conf/kern-mb.ldscript
diff -u src/sys/arch/powerpc/conf/kern-mb.ldscript:1.2 src/sys/arch/powerpc/conf/kern-mb.ldscript:1.3
--- src/sys/arch/powerpc/conf/kern-mb.ldscript:1.2 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/powerpc/conf/kern-mb.ldscript Fri Aug 21 02:35:52 2015
@@ -1,9 +1,8 @@
-/* $NetBSD: kern-mb.ldscript,v 1.2 2015/08/20 07:00:49 uebayasi Exp $ */
+/* $NetBSD: kern-mb.ldscript,v 1.3 2015/08/21 02:35:52 uebayasi Exp $ */
/* ldscript for NetBSD/powerpc kernels and LKMs */
OUTPUT_ARCH(powerpc)
ENTRY(_start)
-SEARCH_DIR(/lib);
/* Do we need any of these?
__DYNAMIC = 0;*/
_DYNAMIC_LINK = 0;
Index: src/sys/arch/powerpc/conf/kern64.ldscript
diff -u src/sys/arch/powerpc/conf/kern64.ldscript:1.2 src/sys/arch/powerpc/conf/kern64.ldscript:1.3
--- src/sys/arch/powerpc/conf/kern64.ldscript:1.2 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/powerpc/conf/kern64.ldscript Fri Aug 21 02:35:52 2015
@@ -3,7 +3,6 @@ OUTPUT_FORMAT(elf64-powerpc, elf64-po
elf64-powerpc)
OUTPUT_ARCH(powerpc:common64)
ENTRY(_start)
-SEARCH_DIR(/lib);
SECTIONS
{
/* Read-only sections, merged into text segment. Assumes the
Index: src/sys/arch/powerpc/conf/kern.ldscript
diff -u src/sys/arch/powerpc/conf/kern.ldscript:1.7 src/sys/arch/powerpc/conf/kern.ldscript:1.8
--- src/sys/arch/powerpc/conf/kern.ldscript:1.7 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/powerpc/conf/kern.ldscript Fri Aug 21 02:35:52 2015
@@ -1,11 +1,10 @@
-/* $NetBSD: kern.ldscript,v 1.7 2015/08/20 07:00:49 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.8 2015/08/21 02:35:52 uebayasi Exp $ */
/* ldscript for NetBSD/powerpc kernels and LKMs, based on elf32ppc.x */
OUTPUT_FORMAT(elf32-powerpc, elf32-powerpc,
elf32-powerpc)
OUTPUT_ARCH(powerpc:common)
ENTRY(_start)
-SEARCH_DIR(/lib);
/* Do we need any of these?
__DYNAMIC = 0;*/
_DYNAMIC_LINK = 0;
Index: src/sys/arch/riscv/conf/kern.ldscript
diff -u src/sys/arch/riscv/conf/kern.ldscript:1.2 src/sys/arch/riscv/conf/kern.ldscript:1.3
--- src/sys/arch/riscv/conf/kern.ldscript:1.2 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/riscv/conf/kern.ldscript Fri Aug 21 02:35:52 2015
@@ -2,7 +2,6 @@
OUTPUT_FORMAT(elf64-littleriscv)
OUTPUT_ARCH(riscv)
ENTRY(_start)
-SEARCH_DIR(/lib);
SECTIONS
{
/* Read-only sections, merged into text segment: */
Index: src/sys/arch/sparc/conf/kern.ldscript
diff -u src/sys/arch/sparc/conf/kern.ldscript:1.6 src/sys/arch/sparc/conf/kern.ldscript:1.7
--- src/sys/arch/sparc/conf/kern.ldscript:1.6 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/sparc/conf/kern.ldscript Fri Aug 21 02:35:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v
CVS commit: src/sys
Module Name:src Committed By: uebayasi Date: Fri Aug 21 02:18:18 UTC 2015 Modified Files: src/sys/conf: files src/sys/kern: files.kern Added Files: src/sys/dev: files.dev Log Message: Move dev/ definitions out of files.kern. To generate a diff of this commit: cvs rdiff -u -r1.1134 -r1.1135 src/sys/conf/files cvs rdiff -u -r0 -r1.1 src/sys/dev/files.dev cvs rdiff -u -r1.7 -r1.8 src/sys/kern/files.kern Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1134 src/sys/conf/files:1.1135 --- src/sys/conf/files:1.1134 Thu Aug 20 09:44:53 2015 +++ src/sys/conf/files Fri Aug 21 02:18:18 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1134 2015/08/20 09:44:53 christos Exp $ +# $NetBSD: files,v 1.1135 2015/08/21 02:18:18 uebayasi Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20150820 @@ -1493,6 +1493,8 @@ include secmodel/files.secmodel include kern/files.kern +include dev/files.dev + include net/files.net # Game adapter (joystick) Index: src/sys/kern/files.kern diff -u src/sys/kern/files.kern:1.7 src/sys/kern/files.kern:1.8 --- src/sys/kern/files.kern:1.7 Mon Aug 17 06:16:03 2015 +++ src/sys/kern/files.kern Fri Aug 21 02:18:18 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.kern,v 1.7 2015/08/17 06:16:03 knakahara Exp $ +# $NetBSD: files.kern,v 1.8 2015/08/21 02:18:18 uebayasi Exp $ # # kernel sources @@ -9,30 +9,6 @@ file compat/common/compat_mod.c compat_n file compat/common/compat_sysv_mod.c (compat_netbsd | compat_netbsd32) (sysvshm | sysvsem | sysvmsg) file conf/debugsyms.c kern -file dev/bio.c bio needs-flag -file dev/ccd.c ccd -file dev/cgd.c cgd -file dev/cgd_crypto.c cgd -file dev/clock_subr.c kern # XXX -file dev/clockctl.c clockctl -file dev/dksubr.c cgd | xbd | ccd | raid | dm | ld -file dev/dkwedge/dk.c kern # XXX -file dev/dkwedge/dkwedge_apple.c dkwedge_method_apple -file dev/dkwedge/dkwedge_bsdlabel.c dkwedge_method_bsdlabel -file dev/dkwedge/dkwedge_gpt.c dkwedge_method_gpt -file dev/dkwedge/dkwedge_mbr.c dkwedge_method_mbr -file dev/firmload.c firmload -file dev/fss.c fss -file dev/keylock.c keylock -file dev/lockstat.c lockstat needs-flag -file dev/md.c md -file dev/mm.c kern # XXX -file dev/nullcons_subr.c nullcons needs-flag -file dev/radio.c radio needs-flag -file dev/rndpseudo.c rnd needs-flag -file dev/sequencer.c sequencer needs-flag -file dev/video.c video needs-flag -file dev/vnd.c vnd file kern/bufq_disksort.c bufq_disksort file kern/bufq_fcfs.c bufq_fcfs file kern/bufq_priocscan.c bufq_priocscan Added files: Index: src/sys/dev/files.dev diff -u /dev/null src/sys/dev/files.dev:1.1 --- /dev/null Fri Aug 21 02:18:18 2015 +++ src/sys/dev/files.dev Fri Aug 21 02:18:18 2015 @@ -0,0 +1,26 @@ +# $NetBSD: files.dev,v 1.1 2015/08/21 02:18:18 uebayasi Exp $ + +file dev/bio.c bio needs-flag +file dev/ccd.c ccd +file dev/cgd.c cgd +file dev/cgd_crypto.c cgd +file dev/clock_subr.c kern # XXX +file dev/clockctl.c clockctl +file dev/dksubr.c cgd | xbd | ccd | raid | dm | ld +file dev/dkwedge/dk.c kern # XXX +file dev/dkwedge/dkwedge_apple.c dkwedge_method_apple +file dev/dkwedge/dkwedge_bsdlabel.c dkwedge_method_bsdlabel +file dev/dkwedge/dkwedge_gpt.c dkwedge_method_gpt +file dev/dkwedge/dkwedge_mbr.c dkwedge_method_mbr +file dev/firmload.c firmload +file dev/fss.c fss +file dev/keylock.c keylock +file dev/lockstat.c lockstat needs-flag +file dev/md.c md +file dev/mm.c kern # XXX +file dev/nullcons_subr.c nullcons needs-flag +file dev/radio.c radio needs-flag +file dev/rndpseudo.c rnd needs-flag +file dev/sequencer.c sequencer needs-flag +file dev/video.c video needs-flag +file dev/vnd.c vnd
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Fri Aug 21 02:32:25 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.netbsd Log Message: - sort - add a bunch of missing release To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/calendar/calendars/calendar.netbsd 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/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.32 src/usr.bin/calendar/calendars/calendar.netbsd:1.33 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.32 Fri May 30 19:01:52 2014 +++ src/usr.bin/calendar/calendars/calendar.netbsd Fri Aug 21 02:32:24 2015 @@ -15,6 +15,7 @@ 02/13 NetBSD/alpha port started, 1995 02/18 NetBSD/newsmips port started, 1998 02/20 NetBSD/hpcarm port started, 2001 +02/24 NetBSD/hp700 port renamed NetBSD/hppa, 2014 02/27 NetBSD/mvmeppc, port started, 2002 02/29 NetBSD/prep port started, 2000 03/01 NetBSD 1.6.2 released, 2004 @@ -76,6 +77,8 @@ 09/09 NetBSD/pc532 port started, 1993 09/13 NetBSD 1.5.2 released, 2001 09/14 NetBSD 1.6 released, 2002 +09/22 NetBSD 6.0.6 released, 2014 +09/22 NetBSD 6.1.5 released, 2014 09/25 NetBSD/hpcmips port started, 1999 09/28 NetBSD 5.1.3 released, 2013 09/28 NetBSD 5.2.1 released, 2013 @@ -97,6 +100,8 @@ 11/02 NetBSD 2.1 released, 2005 11/04 NetBSD 3.0.2 released, 2006 11/04 NetBSD 3.1 released, 2006 +11/15 NetBSD 5.1.5 released, 2014 +11/15 NetBSD 5.2.3 released, 2014 11/17 pkgsrc/FreeBSD support added, 2002 11/18 NetBSD/acorn32 port started, 2001 11/19 NetBSD 5.1 released, 2010 @@ -107,6 +112,7 @@ 12/02 pkgsrc/IRIX support added, 2002 12/03 pkgsrc/AIX support added, 2003 12/03 pkgsrc/BSDI support added, 2003 +12/03 NetBSD 5.2 released, 2012 12/06 NetBSD 1.5 released, 2000 12/09 NetBSD 2.0 released, 2004 12/09 NetBSD/news68k port started, 1999 @@ -115,5 +121,5 @@ 12/19 NetBSD 4.0 released, 2007 12/23 NetBSD 1.3.3 released, 1998 12/23 NetBSD 3.0 released, 2005 +12/26 NetBSD 6.0.1 released, 2012 12/29 NetBSD/ews4800mips port started, 2005 -02/24 NetBSD/hp700 port renamed NetBSD/hppa, 2014
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Fri Aug 21 01:52:09 UTC 2015 Modified Files: src/sys/arch/acorn32/conf: INSTALL NC src/sys/arch/algor/conf: P4032 P5064 P6032 src/sys/arch/alpha/conf: INSTALL RAWHIDE src/sys/arch/amiga/conf: INSTALL MDINSTALL src/sys/arch/arc/conf: ARCTIC M403 MIMORI PICA RPC44 src/sys/arch/cats/conf: INSTALL src/sys/arch/cobalt/conf: INSTALL src/sys/arch/emips/conf: RAMDISK src/sys/arch/evbarm/conf: DNS323 GEMINI_SLAVE HAWK IMX23_OLINUXINO OSK5912 src/sys/arch/evbppc/conf: VIRTEX_DFC VIRTEX_GSRD1 VIRTEX_GSRD2 src/sys/arch/hpcmips/conf: LCARD LROUTER MPC303 NULLCONF TX3912 TX3922 VR41XX src/sys/arch/hpcsh/conf: DEBUG HPW650PA src/sys/arch/i386/conf: GENERIC_PS2TINY INSTALL_FLOPPY NET4501 src/sys/arch/ia64/conf: GENERIC src/sys/arch/mac68k/conf: INSTALL src/sys/arch/macppc/conf: POWERMAC src/sys/arch/mvmeppc/conf: GENERIC src/sys/arch/news68k/conf: NEWS1200 src/sys/arch/newsmips/conf: DEJIKO WAPIKO src/sys/arch/next68k/conf: SLAB src/sys/arch/playstation2/conf: AGATE DEBUG src/sys/arch/shark/conf: INSTALL OFWGENCFG src/sys/arch/sparc/conf: TADPOLE3GX src/sys/arch/sparc64/conf: NONPLUS64 src/sys/arch/sun2/conf: DISKLESS VME Log Message: Add `pseudo-device ksyms' where `options DDB' is used, because config(1)/config(5) can't handle module dependency correctly at this moment. (This is another proof that shared file definition (`file xxx.c a|b') is a bad idea.) To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/acorn32/conf/INSTALL cvs rdiff -u -r1.65 -r1.66 src/sys/arch/acorn32/conf/NC cvs rdiff -u -r1.72 -r1.73 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.82 -r1.83 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.73 -r1.74 src/sys/arch/algor/conf/P6032 cvs rdiff -u -r1.108 -r1.109 src/sys/arch/alpha/conf/INSTALL cvs rdiff -u -r1.39 -r1.40 src/sys/arch/alpha/conf/RAWHIDE cvs rdiff -u -r1.125 -r1.126 src/sys/arch/amiga/conf/INSTALL cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/conf/MDINSTALL cvs rdiff -u -r1.68 -r1.69 src/sys/arch/arc/conf/ARCTIC cvs rdiff -u -r1.64 -r1.65 src/sys/arch/arc/conf/M403 cvs rdiff -u -r1.69 -r1.70 src/sys/arch/arc/conf/MIMORI cvs rdiff -u -r1.81 -r1.82 src/sys/arch/arc/conf/PICA cvs rdiff -u -r1.50 -r1.51 src/sys/arch/arc/conf/RPC44 cvs rdiff -u -r1.95 -r1.96 src/sys/arch/cats/conf/INSTALL cvs rdiff -u -r1.58 -r1.59 src/sys/arch/cobalt/conf/INSTALL cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/conf/RAMDISK cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/DNS323 cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/GEMINI_SLAVE cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/HAWK cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/IMX23_OLINUXINO cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/OSK5912 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbppc/conf/VIRTEX_DFC cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbppc/conf/VIRTEX_GSRD1 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbppc/conf/VIRTEX_GSRD2 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/conf/LCARD cvs rdiff -u -r1.54 -r1.55 src/sys/arch/hpcmips/conf/LROUTER cvs rdiff -u -r1.67 -r1.68 src/sys/arch/hpcmips/conf/MPC303 cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hpcmips/conf/NULLCONF cvs rdiff -u -r1.86 -r1.87 src/sys/arch/hpcmips/conf/TX3912 cvs rdiff -u -r1.100 -r1.101 src/sys/arch/hpcmips/conf/TX3922 cvs rdiff -u -r1.63 -r1.64 src/sys/arch/hpcmips/conf/VR41XX cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcsh/conf/DEBUG cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hpcsh/conf/HPW650PA cvs rdiff -u -r1.74 -r1.75 src/sys/arch/i386/conf/GENERIC_PS2TINY cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.88 -r1.89 src/sys/arch/i386/conf/NET4501 cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/conf/GENERIC cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mac68k/conf/INSTALL cvs rdiff -u -r1.65 -r1.66 src/sys/arch/macppc/conf/POWERMAC cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mvmeppc/conf/GENERIC cvs rdiff -u -r1.63 -r1.64 src/sys/arch/news68k/conf/NEWS1200 cvs rdiff -u -r1.32 -r1.33 src/sys/arch/newsmips/conf/DEJIKO cvs rdiff -u -r1.46 -r1.47 src/sys/arch/newsmips/conf/WAPIKO cvs rdiff -u -r1.54 -r1.55 src/sys/arch/next68k/conf/SLAB cvs rdiff -u -r1.12 -r1.13 src/sys/arch/playstation2/conf/AGATE cvs rdiff -u -r1.19 -r1.20 src/sys/arch/playstation2/conf/DEBUG cvs rdiff -u -r1.57 -r1.58 src/sys/arch/shark/conf/INSTALL cvs rdiff -u -r1.45 -r1.46 src/sys/arch/shark/conf/OFWGENCFG cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sparc/conf/TADPOLE3GX cvs rdiff -u -r1.44 -r1.45 src/sys/arch/sparc64/conf/NONPLUS64 cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sun2/conf/DISKLESS cvs rdiff -u -r1.48 -r1.49 src/sys/arch/sun2/conf/VME Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index:
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 02:02:00 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: largepages.inc
src/sys/arch/i386/conf: largepages.inc
Log Message:
${KERN_LDSCRIPT} - ${KERNLDSCRIPT}
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/conf/largepages.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/conf/largepages.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/amd64/conf/largepages.inc
diff -u src/sys/arch/amd64/conf/largepages.inc:1.3 src/sys/arch/amd64/conf/largepages.inc:1.4
--- src/sys/arch/amd64/conf/largepages.inc:1.3 Mon Jan 7 08:30:03 2008
+++ src/sys/arch/amd64/conf/largepages.inc Fri Aug 21 02:02:00 2015
@@ -1,7 +1,7 @@
-# $NetBSD: largepages.inc,v 1.3 2008/01/07 08:30:03 martti Exp $
+# $NetBSD: largepages.inc,v 1.4 2015/08/21 02:02:00 uebayasi Exp $
#
# Options to create a kernel suitable for mapping with large
# pages.
#
-makeoptions KERN_LDSCRIPT=kern.ldscript.2MB
+makeoptions KERNLDSCRIPT=kern.ldscript.2MB
Index: src/sys/arch/i386/conf/largepages.inc
diff -u src/sys/arch/i386/conf/largepages.inc:1.3 src/sys/arch/i386/conf/largepages.inc:1.4
--- src/sys/arch/i386/conf/largepages.inc:1.3 Mon Jan 7 08:39:07 2008
+++ src/sys/arch/i386/conf/largepages.inc Fri Aug 21 02:02:00 2015
@@ -1,7 +1,7 @@
-# $NetBSD: largepages.inc,v 1.3 2008/01/07 08:39:07 martti Exp $
+# $NetBSD: largepages.inc,v 1.4 2015/08/21 02:02:00 uebayasi Exp $
#
# Options to create a kernel suitable for mapping with large
# pages.
#
-makeoptions KERN_LDSCRIPT=kern.ldscript.4MB
+makeoptions KERNLDSCRIPT=kern.ldscript.4MB
CVS commit: src/external/gpl3/gdb/dist/readline
Module Name:src Committed By: christos Date: Thu Aug 20 17:25:50 UTC 2015 Modified Files: src/external/gpl3/gdb/dist/readline: util.c Log Message: use snprintf and cast to long. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/gpl3/gdb/dist/readline/util.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/gpl3/gdb/dist/readline/util.c diff -u src/external/gpl3/gdb/dist/readline/util.c:1.1.1.3 src/external/gpl3/gdb/dist/readline/util.c:1.2 --- src/external/gpl3/gdb/dist/readline/util.c:1.1.1.3 Sun Jun 22 19:40:08 2014 +++ src/external/gpl3/gdb/dist/readline/util.c Thu Aug 20 13:25:50 2015 @@ -507,7 +507,7 @@ _rl_tropen () if (_rl_tracefp) fclose (_rl_tracefp); - sprintf (fnbuf, /var/tmp/rltrace.%ld, getpid()); + snprintf (fnbuf, sizeof(fnbuf), /var/tmp/rltrace.%ld, (long)getpid()); unlink(fnbuf); _rl_tracefp = fopen (fnbuf, w+); return _rl_tracefp != 0;
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: riz Date: Thu Aug 20 18:25:09 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: GENERIC.common Log Message: options FFS_EI, and options IPSEC for GENERIC.common . No objections when raised on port-arm, and only affects those boards including this file. Tested on BPI and ODROID-C1 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/GENERIC.common 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/conf/GENERIC.common diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.9 src/sys/arch/evbarm/conf/GENERIC.common:1.10 --- src/sys/arch/evbarm/conf/GENERIC.common:1.9 Fri Aug 7 13:53:28 2015 +++ src/sys/arch/evbarm/conf/GENERIC.common Thu Aug 20 18:25:09 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.common,v 1.9 2015/08/07 13:53:28 maxv Exp $ +# $NetBSD: GENERIC.common,v 1.10 2015/08/20 18:25:09 riz Exp $ # # GENERIC evbarm kernel config (template) # @@ -27,7 +27,7 @@ no pseudo-device vcoda # File system options #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independent support +options FFS_EI # FFS Endian Independent support #options NFSSERVER options WAPBL # File system journaling support #options FFS_NO_SNAPSHOT # No FFS snapshot support @@ -37,7 +37,7 @@ options WAPBL # File system journaling #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 -#options IPSEC # IP security +options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast
CVS commit: src/sys/rump/dev/lib/libnetsmb
Module Name:src
Committed By: christos
Date: Thu Aug 20 14:27:15 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libnetsmb: Makefile
Log Message:
XXX: there must be a better way to do this.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libnetsmb/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/rump/dev/lib/libnetsmb/Makefile
diff -u src/sys/rump/dev/lib/libnetsmb/Makefile:1.6 src/sys/rump/dev/lib/libnetsmb/Makefile:1.7
--- src/sys/rump/dev/lib/libnetsmb/Makefile:1.6 Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libnetsmb/Makefile Thu Aug 20 10:27:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/08/20 11:51:12 christos Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/20 14:27:15 christos Exp $
#
.PATH: ${.CURDIR}/../../../../netsmb
@@ -14,7 +14,7 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
#CPPFLAGS+= -DSMB_SOCKET_DEBUG -DSMB_IOD_DEBUG
SRCS+= netsmb_iconv.c
-#RUMPCOMP_USER_SRCS= netsmb_user.c
+RUMPCOMP_USER_SRCS= netsmb_user.c
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys
Module Name:src Committed By: christos Date: Thu Aug 20 14:40:19 UTC 2015 Modified Files: src/sys/arch/amiga/dev: view.c src/sys/arch/atari/dev: view.c src/sys/arch/i386/isa: cmos.c src/sys/arch/luna68k/dev: siotty.c src/sys/arch/mac68k/dev: grf_compat.c ite_compat.c src/sys/arch/x68k/dev: opmbell.c src/sys/arch/xen/xen: xenevt.c src/sys/coda: coda_psdev.c src/sys/dev: bio.c ccd.c cgd.c fss.c kttcp.c lockstat.c md.c rndpseudo.c sequencer.c vnd.c src/sys/dev/ata: ata_raid.c src/sys/dev/bluetooth: bcsp.c btuart.c src/sys/dev/dm: device-mapper.c src/sys/dev/dmover: dmover_io.c swdmover.c src/sys/dev/filemon: filemon.c src/sys/dev/gpio: gpiosim.c src/sys/dev/hpc: biconsdev.c src/sys/dev/ir: irframe_tty.c src/sys/dev/isa: weasel_isa.c src/sys/dev/iscsi: iscsi_main.c src/sys/dev/nand: nandemulator.c src/sys/dev/raidframe: rf_netbsdkintf.c src/sys/dev/tprof: tprof.c src/sys/dev/wscons: wsmux.c src/sys/dev/wsfont: wsfontdev.c src/sys/dist/pf/net: if_pflog.c if_pfsync.c pf_ioctl.c src/sys/net: if_bridge.c if_etherip.c if_faith.c if_gif.c if_gre.c if_mpls.c if_pppoe.c if_spppsubr.c if_stf.c if_tap.c if_tun.c if_vlan.c src/sys/net/agr: if_agr.c src/sys/net/npf: npf.c src/sys/netinet: accf_data.c accf_http.c ip_carp.c src/sys/netsmb: smb_dev.c src/sys/opencrypto: cryptodev.c cryptosoft.c Log Message: include ioconf.h to get the 'void driverattach(int count);' prototype. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/dev/view.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/atari/dev/view.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/isa/cmos.c cvs rdiff -u -r1.42 -r1.43 src/sys/arch/luna68k/dev/siotty.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mac68k/dev/grf_compat.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mac68k/dev/ite_compat.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x68k/dev/opmbell.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/xen/xen/xenevt.c cvs rdiff -u -r1.55 -r1.56 src/sys/coda/coda_psdev.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/bio.c cvs rdiff -u -r1.164 -r1.165 src/sys/dev/ccd.c cvs rdiff -u -r1.101 -r1.102 src/sys/dev/cgd.c cvs rdiff -u -r1.92 -r1.93 src/sys/dev/fss.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/kttcp.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/lockstat.c cvs rdiff -u -r1.74 -r1.75 src/sys/dev/md.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/rndpseudo.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/sequencer.c cvs rdiff -u -r1.247 -r1.248 src/sys/dev/vnd.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ata/ata_raid.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/bluetooth/bcsp.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/bluetooth/btuart.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/dm/device-mapper.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/dmover/dmover_io.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/dmover/swdmover.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/filemon/filemon.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/gpio/gpiosim.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/hpc/biconsdev.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/ir/irframe_tty.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/weasel_isa.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/iscsi/iscsi_main.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/nand/nandemulator.c cvs rdiff -u -r1.324 -r1.325 src/sys/dev/raidframe/rf_netbsdkintf.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/tprof/tprof.c cvs rdiff -u -r1.58 -r1.59 src/sys/dev/wscons/wsmux.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/wsfont/wsfontdev.c cvs rdiff -u -r1.18 -r1.19 src/sys/dist/pf/net/if_pflog.c cvs rdiff -u -r1.10 -r1.11 src/sys/dist/pf/net/if_pfsync.c cvs rdiff -u -r1.50 -r1.51 src/sys/dist/pf/net/pf_ioctl.c cvs rdiff -u -r1.100 -r1.101 src/sys/net/if_bridge.c cvs rdiff -u -r1.35 -r1.36 src/sys/net/if_etherip.c cvs rdiff -u -r1.50 -r1.51 src/sys/net/if_faith.c cvs rdiff -u -r1.86 -r1.87 src/sys/net/if_gif.c cvs rdiff -u -r1.165 -r1.166 src/sys/net/if_gre.c cvs rdiff -u -r1.17 -r1.18 src/sys/net/if_mpls.c cvs rdiff -u -r1.102 -r1.103 src/sys/net/if_pppoe.c cvs rdiff -u -r1.134 -r1.135 src/sys/net/if_spppsubr.c cvs rdiff -u -r1.80 -r1.81 src/sys/net/if_stf.c cvs rdiff -u -r1.81 -r1.82 src/sys/net/if_tap.c src/sys/net/if_vlan.c cvs rdiff -u -r1.121 -r1.122 src/sys/net/if_tun.c cvs rdiff -u -r1.31 -r1.32 src/sys/net/agr/if_agr.c cvs rdiff -u -r1.22 -r1.23 src/sys/net/npf/npf.c cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/accf_data.c cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/accf_http.c cvs rdiff -u -r1.60 -r1.61 src/sys/netinet/ip_carp.c cvs rdiff -u -r1.43 -r1.44 src/sys/netsmb/smb_dev.c cvs rdiff -u -r1.83 -r1.84 src/sys/opencrypto/cryptodev.c cvs rdiff -u -r1.46 -r1.47 src/sys/opencrypto/cryptosoft.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files:
CVS commit: src/sys/modules/gpiosim
Module Name:src Committed By: uebayasi Date: Thu Aug 20 12:31:50 UTC 2015 Added Files: src/sys/modules/gpiosim: gpiosim.conf Log Message: ioconf glue for gpiosim module. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/gpiosim/gpiosim.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/modules/gpiosim/gpiosim.conf diff -u /dev/null src/sys/modules/gpiosim/gpiosim.conf:1.1 --- /dev/null Thu Aug 20 12:31:50 2015 +++ src/sys/modules/gpiosim/gpiosim.conf Thu Aug 20 12:31:50 2015 @@ -0,0 +1,8 @@ +# $NetBSD: gpiosim.conf,v 1.1 2015/08/20 12:31:50 uebayasi Exp $ + +ioconf gpiosim + +include conf/files + +pseudo-root gpio* +pseudo-device gpiosim 1
CVS commit: src/sys/arch/zaurus/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 03:36:32 UTC 2015
Modified Files:
src/sys/arch/zaurus/conf: ldscript.zaurus
Log Message:
Simplify this by deciding load address at one place.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/conf/ldscript.zaurus
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/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.7 src/sys/arch/zaurus/conf/ldscript.zaurus:1.8
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.7 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/zaurus/conf/ldscript.zaurus Fri Aug 21 03:36:32 2015
@@ -1,28 +1,24 @@
-/* $NetBSD: ldscript.zaurus,v 1.7 2015/08/20 07:00:49 uebayasi Exp $ */
+/* $NetBSD: ldscript.zaurus,v 1.8 2015/08/21 03:36:32 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
- KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
- KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
/* Kernel start: */
- .start (KERNEL_BASE_phys) :
+ .start :
{
*(.start)
- } =0
+ }
/* Read-only sections, merged into text segment: */
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
+ .text :
{
*(.text)
*(.text.*)
*(.stub)
*(.glue_7t) *(.glue_7)
*(.rodata) *(.rodata.*)
- } =0
+ }
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
PROVIDE (__exidx_start = .);
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
@@ -34,14 +30,12 @@ SECTIONS
boundary. */
. = ALIGN(0x8000);
.data:
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
__data_start = . ;
*(.data)
*(.data.*)
}
.sdata :
- AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
*(.sdata)
*(.sdata.*)
@@ -87,3 +81,19 @@ SECTIONS
*(.rela.eh_frame)
}
}
+SECTIONS
+{
+ KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+ KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
+ .start (KERNEL_BASE_phys) :
+ {
+*(.start)
+ } =0
+
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: joerg Date: Thu Aug 20 20:08:05 UTC 2015 Modified Files: src/lib/libc/stdlib: reallocarr.c Log Message: Fix portability. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/stdlib/reallocarr.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/stdlib/reallocarr.c diff -u src/lib/libc/stdlib/reallocarr.c:1.3 src/lib/libc/stdlib/reallocarr.c:1.4 --- src/lib/libc/stdlib/reallocarr.c:1.3 Tue Jul 28 17:13:34 2015 +++ src/lib/libc/stdlib/reallocarr.c Thu Aug 20 20:08:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: reallocarr.c,v 1.3 2015/07/28 17:13:34 kamil Exp $ */ +/* $NetBSD: reallocarr.c,v 1.4 2015/08/20 20:08:04 joerg Exp $ */ /*- * Copyright (c) 2015 Joerg Sonnenberger jo...@netbsd.org. @@ -34,7 +34,7 @@ #endif #include sys/cdefs.h -__RCSID($NetBSD: reallocarr.c,v 1.3 2015/07/28 17:13:34 kamil Exp $); +__RCSID($NetBSD: reallocarr.c,v 1.4 2015/08/20 20:08:04 joerg Exp $); #include namespace.h #include errno.h @@ -50,7 +50,7 @@ __weak_alias(reallocarr, _reallocarr) #endif #endif -#define SQRT_SIZE_MAX (1UL (sizeof(size_t) 2)) +#define SQRT_SIZE_MAX (((size_t)1) (sizeof(size_t) * CHAR_BIT / 2)) #if !HAVE_REALLOCARR int
CVS commit: src/sys/external/bsd
Module Name:src
Committed By: skrll
Date: Thu Aug 20 21:41:12 UTC 2015
Modified Files:
src/sys/external/bsd/common/include/linux: kernel.h
src/sys/external/bsd/drm2/dist/drm/radeon: atombios_encoders.c
radeon_legacy_encoders.c
src/sys/external/bsd/drm2/drm: files.drmkms
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
Tweak IS_ENABLED to allow CONFIG_FOO values.
No functional change to drm2.
LGTM from riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/common/include/linux/kernel.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/linux/kernel.h
diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.7 src/sys/external/bsd/common/include/linux/kernel.h:1.8
--- src/sys/external/bsd/common/include/linux/kernel.h:1.7 Mon Apr 20 15:22:18 2015
+++ src/sys/external/bsd/common/include/linux/kernel.h Thu Aug 20 21:41:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.7 2015/04/20 15:22:18 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.8 2015/08/20 21:41:12 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#define oops_in_progress (panicstr != NULL)
-#define IS_ENABLED(option) 0 /* XXX Hmm... */
+#define IS_ENABLED(option) (option)
#define __printf __printflike
#define __user
Index: src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c Thu Aug 20 21:41:12 2015
@@ -133,7 +133,7 @@ atombios_set_backlight_level(struct rade
}
}
-#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
+#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) || IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
static u8 radeon_atom_bl_level(struct backlight_device *bd)
{
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c:1.1.1.1 Wed Jul 16 19:35:28 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c Thu Aug 20 21:41:12 2015
@@ -310,7 +310,7 @@ radeon_legacy_set_backlight_level(struct
radeon_legacy_lvds_update(radeon_encoder-base, dpms_mode);
}
-#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
+#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) || IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
static uint8_t radeon_legacy_lvds_level(struct backlight_device *bd)
{
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.11 src/sys/external/bsd/drm2/drm/files.drmkms:1.12
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.11 Thu Mar 5 17:50:41 2015
+++ src/sys/external/bsd/drm2/drm/files.drmkms Thu Aug 20 21:41:12 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.11 2015/03/05 17:50:41 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.12 2015/08/20 21:41:12 skrll Exp $
include external/bsd/drm2/linux/files.drmkms_linux
@@ -26,6 +26,10 @@ makeoptions drmkms CWARNFLAGS.drm_edi
# XXX Should probably be in a header file. opt_drmkms.h?
makeoptions drmkms CPPFLAGS+=-D__KERNEL__
+makeoptions drmkms CPPFLAGS+=-DCONFIG_FB=0
+makeoptions drmkms CPPFLAGS+=-DCONFIG_BACKLIGHT_CLASS_DEVICE=0
+makeoptions drmkms CPPFLAGS+=-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0
+
file external/bsd/drm2/dist/drm/drm_auth.c drmkms
file external/bsd/drm2/dist/drm/drm_buffer.c drmkms
file external/bsd/drm2/dist/drm/drm_bufs.c drmkms
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.10 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.11
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.10 Thu Mar 5 17:50:41 2015
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Thu Aug 20 21:41:12 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.10 2015/03/05 17:50:41 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.11 2015/08/20 21:41:12 skrll Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -17,7 +17,8 @@
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:53:11 UTC 2015
Modified Files:
src/sys/arch/dreamcast/conf: shl.x
src/sys/arch/hpcsh/conf: shl-elf.x
Log Message:
Kill trailing blank lines.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/dreamcast/conf/shl.x
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcsh/conf/shl-elf.x
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/dreamcast/conf/shl.x
diff -u src/sys/arch/dreamcast/conf/shl.x:1.7 src/sys/arch/dreamcast/conf/shl.x:1.8
--- src/sys/arch/dreamcast/conf/shl.x:1.7 Thu Apr 25 17:02:41 2002
+++ src/sys/arch/dreamcast/conf/shl.x Thu Aug 20 06:53:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: shl.x,v 1.7 2002/04/25 17:02:41 uch Exp $ */
+/* $NetBSD: shl.x,v 1.8 2015/08/20 06:53:11 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-shl-nbsd)
OUTPUT_ARCH(sh)
@@ -76,4 +76,3 @@ SECTIONS
.debug_varnames 0 : { *(.debug_varnames) }
/* These must appear regardless of . */
}
-
Index: src/sys/arch/hpcsh/conf/shl-elf.x
diff -u src/sys/arch/hpcsh/conf/shl-elf.x:1.7 src/sys/arch/hpcsh/conf/shl-elf.x:1.8
--- src/sys/arch/hpcsh/conf/shl-elf.x:1.7 Tue Apr 15 16:29:12 2003
+++ src/sys/arch/hpcsh/conf/shl-elf.x Thu Aug 20 06:53:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: shl-elf.x,v 1.7 2003/04/15 16:29:12 uwe Exp $ */
+/* $NetBSD: shl-elf.x,v 1.8 2015/08/20 06:53:11 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-shl-nbsd)
OUTPUT_ARCH(sh)
@@ -77,4 +77,3 @@ SECTIONS
.debug_varnames 0 : { *(.debug_varnames) }
/* These must appear regardless of . */
}
-
CVS commit: src/common/lib/libprop
Module Name:src Committed By: phx Date: Thu Aug 20 15:55:09 UTC 2015 Modified Files: src/common/lib/libprop: prop_send_ioctl.3 Log Message: Fixed typo: propertly - property. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/common/lib/libprop/prop_send_ioctl.3 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/libprop/prop_send_ioctl.3 diff -u src/common/lib/libprop/prop_send_ioctl.3:1.8 src/common/lib/libprop/prop_send_ioctl.3:1.9 --- src/common/lib/libprop/prop_send_ioctl.3:1.8 Tue Sep 27 11:12:49 2011 +++ src/common/lib/libprop/prop_send_ioctl.3 Thu Aug 20 15:55:09 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: prop_send_ioctl.3,v 1.8 2011/09/27 11:12:49 jym Exp $ +.\ $NetBSD: prop_send_ioctl.3,v 1.9 2015/08/20 15:55:09 phx Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -36,7 +36,7 @@ .Nm prop_dictionary_send_ioctl , .Nm prop_dictionary_recv_ioctl , .Nm prop_dictionary_sendrecv_ioctl -.Nd Send and receive propertly lists to and from the kernel using ioctl +.Nd Send and receive property lists to and from the kernel using ioctl .Sh SYNOPSIS .In prop/proplib.h .Ft int
CVS commit: src/lib/libc/arch/arm
Module Name:src
Committed By: pooka
Date: Thu Aug 20 16:13:41 UTC 2015
Modified Files:
src/lib/libc/arch/arm: Makefile.inc
Log Message:
In rumprun mode on ARM, don't build syscall or signal code into libc.
(like on x86)
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/arch/arm/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/lib/libc/arch/arm/Makefile.inc
diff -u src/lib/libc/arch/arm/Makefile.inc:1.27 src/lib/libc/arch/arm/Makefile.inc:1.28
--- src/lib/libc/arch/arm/Makefile.inc:1.27 Wed Jan 29 23:37:18 2014
+++ src/lib/libc/arch/arm/Makefile.inc Thu Aug 20 16:13:40 2015
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.27 2014/01/29 23:37:18 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.28 2015/08/20 16:13:40 pooka Exp $
.include bsd.own.mk
+.if ${RUMPRUN} != yes
SRCS+= __aeabi_read_tp.S __sigaction14_sigtramp.c __sigtramp2.S
+.endif
.if empty(LIBC_MACHINE_ARCH:Mearmv7*)
AFLAGS+= -marm
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: kamil
Date: Thu Aug 20 22:27:49 UTC 2015
Modified Files:
src/lib/libc/stdlib: reallocarr.c
Log Message:
Minor alterations to reallocarr(3)
Add comment about division.
Mark error branches with __predict_false().
Reduce one branch with the OR trick.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/stdlib/reallocarr.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/stdlib/reallocarr.c
diff -u src/lib/libc/stdlib/reallocarr.c:1.4 src/lib/libc/stdlib/reallocarr.c:1.5
--- src/lib/libc/stdlib/reallocarr.c:1.4 Thu Aug 20 20:08:04 2015
+++ src/lib/libc/stdlib/reallocarr.c Thu Aug 20 22:27:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: reallocarr.c,v 1.4 2015/08/20 20:08:04 joerg Exp $ */
+/* $NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $ */
/*-
* Copyright (c) 2015 Joerg Sonnenberger jo...@netbsd.org.
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: reallocarr.c,v 1.4 2015/08/20 20:08:04 joerg Exp $);
+__RCSID($NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $);
#include namespace.h
#include errno.h
@@ -70,14 +70,20 @@ reallocarr(void *ptr, size_t number, siz
return 0;
}
- if ((number = SQRT_SIZE_MAX || size = SQRT_SIZE_MAX)
- number SIZE_MAX / size) {
+ /*
+ * Try to avoid division here.
+ *
+ * It isn't possible to overflow during multiplication if neither
+ * operand uses any of the most significant half of the bits.
+ */
+ if (__predict_false((number|size) = SQRT_SIZE_MAX
+ number SIZE_MAX / size)) {
errno = saved_errno;
return EOVERFLOW;
}
nptr = realloc(optr, number * size);
- if (nptr == NULL) {
+ if (__predict_false(nptr == NULL)) {
result = errno;
} else {
result = 0;
