Re: CVS commit: src/sys/arch/arm/include
On Wed, 29 Jan 2014, Matt Thomas wrote:
Modified Files:
src/sys/arch/arm/include: int_fmtio.h int_mwgwtypes.h
Log Message:
Make {,u}int{8,16,32} be of type int.
I think you mean:
Make {,u}int_fast{8,16,32} be of type int.
--apb (Alan Barrett)
Re: CVS commit: src/sys/arch/arm/include
On Jan 29, 2014, at 12:25 PM, Alan Barrett a...@cequrux.com wrote:
On Wed, 29 Jan 2014, Matt Thomas wrote:
Modified Files:
src/sys/arch/arm/include: int_fmtio.h int_mwgwtypes.h
Log Message:
Make {,u}int{8,16,32} be of type int.
I think you mean:
Make {,u}int_fast{8,16,32} be of type int.
i do
re: CVS commit: src/sys/arch/i386/include
In article 20140128065536.gg1...@apb-laptoy.apb.alt.za, Alan Barrett a...@cequrux.com wrote: On Mon, 27 Jan 2014, Christos Zoulas wrote: Modified Files: src/sys/arch/i386/include: vmparam.h Log Message: Cut down MAXDSIZE from 3G to 2.5G otherwise bottomup allocation ends up supplying an out of bounds hint for sigcode (c001e000 bf00). Makes a.out binaries work again. Will this make malloc fail 0.5GB earlier than before? The data size limits on i386 are already annoyingly small, and I would prefer not to make them smaller. Please could you find a way to penalise only a.out programs. I don't think it could allocate 3G before either. I think that the data segment would smash into the stack then. I can test though to verify. it probably doesn't matter since most of the memory you'll end up using for a large process with be counted against RLIMIT_AS not RLIMIT_DATA, with modern malloc(3). .mrg.
re: CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/i915drm
Module Name: src Committed By: riastradh Date: Wed Jan 29 19:47:09 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c Log Message: Defer i915drm_attach_framebuffer until interrupts are running. The i915 code initialization relies on counting hardclock ticks for a delay (ugh). Not an issue for modules, but it will matter when we build drm2 into the kernel proper. not sure why this is a problem generally. there have been defer for interrupts primatives in our kernel for almost 2 deacdes now. .mrg.
re: CVS commit: [riastradh-drm2] src/sys
Module Name: src Committed By: riastradh Date: Wed Jan 29 19:47:38 UTC 2014 Modified Files: src/sys/conf [riastradh-drm2]: files src/sys/dev/pci [riastradh-drm2]: files.pci src/sys/dev/wsfb [riastradh-drm2]: files.wsfb src/sys/external/bsd/drm2/conf [riastradh-drm2]: files.drm2 src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c drm_module.c drm_vm.c src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_module.c i915_pci.c src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: kgdb.h src/sys/modules/drm2 [riastradh-drm2]: Makefile drm.ioconf src/sys/modules/i915drm2 [riastradh-drm2]: Makefile i915drm.ioconf Log Message: First draft of in-kernel drm2 attachment. The drm2 `drm' device is now called `drmkms' (likewise `i915drmkms', c.) so that it can coexist with the old drm code to reduce diffs from HEAD. (Can't call a device `drm2'.) there's probably a way to do this -- see how the current drm code used to co-exist with the previous drm code (from sys/dev/drm). you couldn't build them into the same kernel, but they were able to share the name 'drm' and the major number. .mrg.
CVS commit: src/sys/miscfs/genfs
Module Name:src
Committed By: hannken
Date: Wed Jan 29 08:27:04 UTC 2014
Modified Files:
src/sys/miscfs/genfs: layer_subr.c layer_vnops.c
Log Message:
Allow layer_node_create() with unlocked lower node and change
layer_bypass() to enter nodes from creation operations unlocked.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/miscfs/genfs/layer_subr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/miscfs/genfs/layer_vnops.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/miscfs/genfs/layer_subr.c
diff -u src/sys/miscfs/genfs/layer_subr.c:1.32 src/sys/miscfs/genfs/layer_subr.c:1.33
--- src/sys/miscfs/genfs/layer_subr.c:1.32 Sun Jun 12 03:35:58 2011
+++ src/sys/miscfs/genfs/layer_subr.c Wed Jan 29 08:27:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_subr.c,v 1.32 2011/06/12 03:35:58 rmind Exp $ */
+/* $NetBSD: layer_subr.c,v 1.33 2014/01/29 08:27:04 hannken Exp $ */
/*
* Copyright (c) 1999 National Aeronautics Space Administration
@@ -69,7 +69,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: layer_subr.c,v 1.32 2011/06/12 03:35:58 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: layer_subr.c,v 1.33 2014/01/29 08:27:04 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -260,8 +260,6 @@ layer_node_create(struct mount *mp, stru
struct vnode *aliasvp;
struct layer_mount *lmp = MOUNTTOLAYERMOUNT(mp);
- KASSERT(VOP_ISLOCKED(lowervp));
-
mutex_enter(lmp-layerm_hashlock);
aliasvp = layer_node_find(mp, lowervp);
if (aliasvp != NULL) {
Index: src/sys/miscfs/genfs/layer_vnops.c
diff -u src/sys/miscfs/genfs/layer_vnops.c:1.52 src/sys/miscfs/genfs/layer_vnops.c:1.53
--- src/sys/miscfs/genfs/layer_vnops.c:1.52 Thu Jan 23 10:13:57 2014
+++ src/sys/miscfs/genfs/layer_vnops.c Wed Jan 29 08:27:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_vnops.c,v 1.52 2014/01/23 10:13:57 hannken Exp $ */
+/* $NetBSD: layer_vnops.c,v 1.53 2014/01/29 08:27:04 hannken Exp $ */
/*
* Copyright (c) 1999 National Aeronautics Space Administration
@@ -170,7 +170,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: layer_vnops.c,v 1.52 2014/01/23 10:13:57 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: layer_vnops.c,v 1.53 2014/01/29 08:27:04 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -321,10 +321,7 @@ layer_bypass(void *v)
* as a lookup on . would generate a locking error.
* So all the calls which get us here have a unlocked vpp. :-)
*/
- /* XXX: lock node until lookup returns unlocked nodes. */
- vn_lock(**vppp, LK_EXCLUSIVE | LK_RETRY);
error = layer_node_create(mp, **vppp, *vppp);
- VOP_UNLOCK(**vppp);
if (error) {
vrele(**vppp);
**vppp = NULL;
CVS commit: src/common/lib/libc/arch/m68k/atomic
Module Name:src Committed By: martin Date: Wed Jan 29 10:20:11 UTC 2014 Modified Files: src/common/lib/libc/arch/m68k/atomic: Makefile.inc atomic_cas_68000.S Log Message: Provide _atomic_cas_8_up and _atomic_cas_16_up as assembler functions To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/arch/m68k/atomic/Makefile.inc cvs rdiff -u -r1.5 -r1.6 \ src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/m68k/atomic/Makefile.inc diff -u src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.10 src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.11 --- src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.10 Thu Jul 18 19:49:00 2013 +++ src/common/lib/libc/arch/m68k/atomic/Makefile.inc Wed Jan 29 10:20:11 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2013/07/18 19:49:00 matt Exp $ +# $NetBSD: Makefile.inc,v 1.11 2014/01/29 10:20:11 martin Exp $ # # Note: The atomic operations here in these assembly files are atomic @@ -35,7 +35,8 @@ SRCS+= atomic_init_cas.c SRCS+= atomic_init_testset.c SRCS+= atomic_cas_68000.S -CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP +CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP -D__HAVE_ASM_ATOMIC_CAS_16_UP \ + -D__HAVE_ASM_ATOMIC_CAS_8_UP .endif .endif Index: src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S diff -u src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.5 src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.6 --- src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.5 Tue Jul 16 23:24:18 2013 +++ src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S Wed Jan 29 10:20:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_cas_68000.S,v 1.5 2013/07/16 23:24:18 matt Exp $ */ +/* $NetBSD: atomic_cas_68000.S,v 1.6 2014/01/29 10:20:11 martin Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -47,3 +47,32 @@ RAS_START_ASM_HIDDEN(_atomic_cas) RAS_END_ASM_HIDDEN(_atomic_cas) 1: rts END(_atomic_cas_up) + +ENTRY(_atomic_cas_16_up) + .hidden _C_LABEL(_atomic_cas_16_up) + + movl 4(%sp), %a0 /* Fetch ptr */ + +RAS_START_ASM_HIDDEN(_atomic_cas_16) + movw (%a0), %d0 /* d0 = *ptr */ + cmpw 8(%sp), %d0 /* Same as old? */ + jne 1f /* Nope */ + movw 12(%sp), (%a0) /* *ptr = new */ +RAS_END_ASM_HIDDEN(_atomic_cas_16) +1: rts +END(_atomic_cas_16_up) + + +ENTRY(_atomic_cas_8_up) + .hidden _C_LABEL(_atomic_cas_8_up) + + movl 4(%sp), %a0 /* Fetch ptr */ + +RAS_START_ASM_HIDDEN(_atomic_cas_8) + movb (%a0), %d0 /* d0 = *ptr */ + cmpb 8(%sp), %d0 /* Same as old? */ + jne 1f /* Nope */ + movb 12(%sp), (%a0) /* *ptr = new */ +RAS_END_ASM_HIDDEN(_atomic_cas_8) +1: rts +END(_atomic_cas_8_up)
CVS commit: src/common/lib/libc/arch/hppa/atomic
Module Name:src Committed By: skrll Date: Wed Jan 29 11:03:04 UTC 2014 Modified Files: src/common/lib/libc/arch/hppa/atomic: Makefile.inc atomic_cas_up.S Log Message: Provide _atomic_cas_8_up and _atomic_cas_16_up functions To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/hppa/atomic/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/hppa/atomic/Makefile.inc diff -u src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.8 src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.9 --- src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.8 Mon Jan 17 07:29:17 2011 +++ src/common/lib/libc/arch/hppa/atomic/Makefile.inc Wed Jan 29 11:03:04 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.8 2011/01/17 07:29:17 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.9 2014/01/29 11:03:04 skrll Exp $ .if defined(LIB) @@ -17,7 +17,8 @@ SRCS+= atomic_add_32_cas.c atomic_add_32 SRCS+= atomic_init_testset.c SRCS+= atomic_cas_up.S CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP - +CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_16_UP +CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_8_UP . endif .endif Index: src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S diff -u src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.2 src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.3 --- src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.2 Sun Jan 16 12:07:26 2011 +++ src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S Wed Jan 29 11:03:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_cas_up.S,v 1.2 2011/01/16 12:07:26 skrll Exp $ */ +/* $NetBSD: atomic_cas_up.S,v 1.3 2014/01/29 11:03:04 skrll Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -44,3 +44,27 @@ RAS_END_ASM_HIDDEN(_atomic_cas) bv,n %r0(%rp) EXIT(_atomic_cas_up) + +LEAF_ENTRY_NOPROFILE(_atomic_cas_16_up) + .hidden _C_LABEL(_atomic_cas_16_up) + +RAS_START_ASM_HIDDEN(_atomic_cas_16) + ldh 0(%arg0),%ret0 + comb,,n %arg1, %ret0, 1f + sth %arg2, 0(%arg0) +RAS_END_ASM_HIDDEN(_atomic_cas_16) +1: + bv,n %r0(%rp) +EXIT(_atomic_cas_16_up) + +LEAF_ENTRY_NOPROFILE(_atomic_cas_8_up) + .hidden _C_LABEL(_atomic_cas_8_up) + +RAS_START_ASM_HIDDEN(_atomic_cas_8) + ldb 0(%arg0),%ret0 + comb,,n %arg1, %ret0, 1f + stb %arg2, 0(%arg0) +RAS_END_ASM_HIDDEN(_atomic_cas_8) +1: + bv,n %r0(%rp) +EXIT(_atomic_cas_8_up)
CVS commit: src/common/lib/libc/arch/hppa/atomic
Module Name:src Committed By: skrll Date: Wed Jan 29 11:34:25 UTC 2014 Modified Files: src/common/lib/libc/arch/hppa/atomic: atomic_cas_up.S Log Message: Copyright To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S diff -u src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.3 src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.4 --- src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.3 Wed Jan 29 11:03:04 2014 +++ src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S Wed Jan 29 11:34:25 2014 @@ -1,7 +1,7 @@ -/* $NetBSD: atomic_cas_up.S,v 1.3 2014/01/29 11:03:04 skrll Exp $ */ +/* $NetBSD: atomic_cas_up.S,v 1.4 2014/01/29 11:34:25 skrll Exp $ */ /*- - * Copyright (c) 2008 The NetBSD Foundation, Inc. + * Copyright (c) 2008, 2014 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: skrll
Date: Wed Jan 29 12:56:28 UTC 2014
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Remove harmful whitespace. Now the /var/shm check can succeed quietly.
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.162 src/usr.sbin/postinstall/postinstall:1.163
--- src/usr.sbin/postinstall/postinstall:1.162 Fri Jan 17 19:06:57 2014
+++ src/usr.sbin/postinstall/postinstall Wed Jan 29 12:56:28 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.162 2014/01/17 19:06:57 martin Exp $
+# $NetBSD: postinstall,v 1.163 2014/01/29 12:56:28 skrll Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1872,7 +1872,7 @@ do_varshm()
[ -f ${DEST_DIR}/etc/fstab ] || return 0
if ${GREP} -w /var/shm ${DEST_DIR}/etc/fstab /dev/null 21;
then
- failed = 0;
+ failed=0;
else
if [ ${op} = check ]; then
failed=1
CVS commit: src/common/lib/libc/arch/sparc/atomic
Module Name:src
Committed By: martin
Date: Wed Jan 29 13:06:36 UTC 2014
Modified Files:
src/common/lib/libc/arch/sparc/atomic: Makefile.inc atomic_cas_up.S
Log Message:
Provide _atomic_cas_{16,8}_up
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/common/lib/libc/arch/sparc/atomic/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/common/lib/libc/arch/sparc/atomic/atomic_cas_up.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/sparc/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.15 src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.16
--- src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.15 Wed Nov 28 21:39:59 2012
+++ src/common/lib/libc/arch/sparc/atomic/Makefile.inc Wed Jan 29 13:06:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2012/11/28 21:39:59 martin Exp $
+# $NetBSD: Makefile.inc,v 1.16 2014/01/29 13:06:36 martin Exp $
.include bsd.own.mk
@@ -29,7 +29,8 @@ SRCS+= atomic_cas.S
. endif
. if (${LIB} == c || ${LIB} == pthread)
-CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
+CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP -D__HAVE_ASM_ATOMIC_CAS_16_UP \
+ -D__HAVE_ASM_ATOMIC_CAS_8_UP
SRCS+= atomic_init_testset.c atomic_cas_up.S
. endif
Index: src/common/lib/libc/arch/sparc/atomic/atomic_cas_up.S
diff -u src/common/lib/libc/arch/sparc/atomic/atomic_cas_up.S:1.1 src/common/lib/libc/arch/sparc/atomic/atomic_cas_up.S:1.2
--- src/common/lib/libc/arch/sparc/atomic/atomic_cas_up.S:1.1 Wed Nov 28 21:39:59 2012
+++ src/common/lib/libc/arch/sparc/atomic/atomic_cas_up.S Wed Jan 29 13:06:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_up.S,v 1.1 2012/11/28 21:39:59 martin Exp $ */
+/* $NetBSD: atomic_cas_up.S,v 1.2 2014/01/29 13:06:36 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -43,3 +43,27 @@ RAS_END_ASM_HIDDEN(_atomic_cas)
retl
mov %o3, %o0 ! return old value
+ENTRY(_atomic_cas_16_up)
+ .hidden _C_LABEL(_atomic_cas_16_up)
+RAS_START_ASM_HIDDEN(_atomic_cas_16)
+ lduh [%o0], %o3 ! get old value
+ cmp %o1, %o3 ! old == new?
+ beq,a 1f! yes, do the store
+ sth %o2, [%o0] ! (in the delay slot)
+RAS_END_ASM_HIDDEN(_atomic_cas_16)
+1:
+ retl
+ mov %o3, %o0 ! return old value
+
+ENTRY(_atomic_cas_8_up)
+ .hidden _C_LABEL(_atomic_cas_8_up)
+RAS_START_ASM_HIDDEN(_atomic_cas_8)
+ ldub [%o0], %o3 ! get old value
+ cmp %o1, %o3 ! old == new?
+ beq,a 1f! yes, do the store
+ stb %o2, [%o0] ! (in the delay slot)
+RAS_END_ASM_HIDDEN(_atomic_cas_8)
+1:
+ retl
+ mov %o3, %o0 ! return old value
+
CVS import: src/sys/external/bsd/compiler_rt/dist
Module Name:src Committed By: joerg Date: Wed Jan 29 14:21:49 UTC 2014 Update of /cvsroot/src/sys/external/bsd/compiler_rt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3229 Log Message: Fix builtin shadowing in PowerPC specific code. Implement clzdi/clzsi for ARM. Status: Vendor Tag: LLVM Release Tags: compiler-rt-200397 U src/sys/external/bsd/compiler_rt/dist/CREDITS.TXT U src/sys/external/bsd/compiler_rt/dist/README.txt U src/sys/external/bsd/compiler_rt/dist/LICENSE.TXT U src/sys/external/bsd/compiler_rt/dist/lib/subsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/udivmoddi4.c U src/sys/external/bsd/compiler_rt/dist/lib/negdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/mulsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatunsidf.c U src/sys/external/bsd/compiler_rt/dist/lib/cmpdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/moddi3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunsdfti.c U src/sys/external/bsd/compiler_rt/dist/lib/popcountsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/adddf3.c U src/sys/external/bsd/compiler_rt/dist/lib/negti2.c U src/sys/external/bsd/compiler_rt/dist/lib/udivmodti4.c U src/sys/external/bsd/compiler_rt/dist/lib/absvdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/cmpti2.c U src/sys/external/bsd/compiler_rt/dist/lib/modti3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunssfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/clzsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/absvti2.c U src/sys/external/bsd/compiler_rt/dist/lib/ctzsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/comparedf2.c U src/sys/external/bsd/compiler_rt/dist/lib/floatundixf.c U src/sys/external/bsd/compiler_rt/dist/lib/int_lib.h U src/sys/external/bsd/compiler_rt/dist/lib/udivsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/divsc3.c U src/sys/external/bsd/compiler_rt/dist/lib/mulosi4.c U src/sys/external/bsd/compiler_rt/dist/lib/fixsfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/enable_execute_stack.c U src/sys/external/bsd/compiler_rt/dist/lib/floatuntixf.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunsxfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/powidf2.c U src/sys/external/bsd/compiler_rt/dist/lib/floatsidf.c U src/sys/external/bsd/compiler_rt/dist/lib/fixsfti.c U src/sys/external/bsd/compiler_rt/dist/lib/ffsdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/negvsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/floatundisf.c U src/sys/external/bsd/compiler_rt/dist/lib/subvdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/umodsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/muldc3.c U src/sys/external/bsd/compiler_rt/dist/lib/trampoline_setup.c U src/sys/external/bsd/compiler_rt/dist/lib/powitf2.c U src/sys/external/bsd/compiler_rt/dist/lib/ffsti2.c U src/sys/external/bsd/compiler_rt/dist/lib/addvsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/powixf2.c U src/sys/external/bsd/compiler_rt/dist/lib/divsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatuntisf.c U src/sys/external/bsd/compiler_rt/dist/lib/subvti3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixxfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/mulvsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/paritydi2.c U src/sys/external/bsd/compiler_rt/dist/lib/int_math.h U src/sys/external/bsd/compiler_rt/dist/lib/mulxc3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatdixf.c U src/sys/external/bsd/compiler_rt/dist/lib/fixxfti.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunssfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/divmoddi4.c U src/sys/external/bsd/compiler_rt/dist/lib/negsf2.c U src/sys/external/bsd/compiler_rt/dist/lib/subdf3.c U src/sys/external/bsd/compiler_rt/dist/lib/parityti2.c U src/sys/external/bsd/compiler_rt/dist/lib/muldf3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixdfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/ashrdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/floattixf.c U src/sys/external/bsd/compiler_rt/dist/lib/fp_lib.h U src/sys/external/bsd/compiler_rt/dist/lib/divsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunssfti.c U src/sys/external/bsd/compiler_rt/dist/lib/popcountdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/lshrdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatdisf.c U src/sys/external/bsd/compiler_rt/dist/lib/extendsfdf2.c U src/sys/external/bsd/compiler_rt/dist/lib/ashrti3.c U src/sys/external/bsd/compiler_rt/dist/lib/int_types.h U src/sys/external/bsd/compiler_rt/dist/lib/popcountti2.c U src/sys/external/bsd/compiler_rt/dist/lib/clzdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunsxfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/udivmodsi4.c U src/sys/external/bsd/compiler_rt/dist/lib/lshrti3.c U src/sys/external/bsd/compiler_rt/dist/lib/gcc_personality_v0.c U src/sys/external/bsd/compiler_rt/dist/lib/floattisf.c U src/sys/external/bsd/compiler_rt/dist/lib/muldi3.c U src/sys/external/bsd/compiler_rt/dist/lib/modsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatundidf.c U
CVS commit: src/common/lib/libc/atomic
Module Name:src
Committed By: martin
Date: Wed Jan 29 14:44:32 UTC 2014
Modified Files:
src/common/lib/libc/atomic: atomic_init_testset.c
Log Message:
Fix copypasto
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/atomic/atomic_init_testset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/atomic/atomic_init_testset.c
diff -u src/common/lib/libc/atomic/atomic_init_testset.c:1.10 src/common/lib/libc/atomic/atomic_init_testset.c:1.11
--- src/common/lib/libc/atomic/atomic_init_testset.c:1.10 Mon Jan 27 18:03:44 2014
+++ src/common/lib/libc/atomic/atomic_init_testset.c Wed Jan 29 14:44:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_init_testset.c,v 1.10 2014/01/27 18:03:44 matt Exp $ */
+/* $NetBSD: atomic_init_testset.c,v 1.11 2014/01/29 14:44:32 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: atomic_init_testset.c,v 1.10 2014/01/27 18:03:44 matt Exp $);
+__RCSID($NetBSD: atomic_init_testset.c,v 1.11 2014/01/29 14:44:32 martin Exp $);
#include atomic_op_namespace.h
@@ -119,9 +119,9 @@ _atomic_cas_up_16(volatile uint16_t *ptr
}
#endif
-#ifndef __HAVE_ASM_ATOMIC_CAS_UP
+#ifndef __HAVE_ASM_ATOMIC_CAS_8_UP
static uint8_t
-_atomic_cas_up(volatile uint8_t *ptr, uint8_t old, uint8_t new)
+_atomic_cas_8_up(volatile uint8_t *ptr, uint8_t old, uint8_t new)
{
uint8_t ret;
CVS commit: src/common/lib/libc/atomic
Module Name:src
Committed By: martin
Date: Wed Jan 29 14:49:35 UTC 2014
Modified Files:
src/common/lib/libc/atomic: atomic_init_testset.c
Log Message:
Fix a few more copypastos - now it actually builds.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/common/lib/libc/atomic/atomic_init_testset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/atomic/atomic_init_testset.c
diff -u src/common/lib/libc/atomic/atomic_init_testset.c:1.11 src/common/lib/libc/atomic/atomic_init_testset.c:1.12
--- src/common/lib/libc/atomic/atomic_init_testset.c:1.11 Wed Jan 29 14:44:32 2014
+++ src/common/lib/libc/atomic/atomic_init_testset.c Wed Jan 29 14:49:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_init_testset.c,v 1.11 2014/01/29 14:44:32 martin Exp $ */
+/* $NetBSD: atomic_init_testset.c,v 1.12 2014/01/29 14:49:35 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: atomic_init_testset.c,v 1.11 2014/01/29 14:44:32 martin Exp $);
+__RCSID($NetBSD: atomic_init_testset.c,v 1.12 2014/01/29 14:49:35 martin Exp $);
#include atomic_op_namespace.h
@@ -103,7 +103,7 @@ _atomic_cas_up(volatile uint32_t *ptr, u
#ifndef __HAVE_ASM_ATOMIC_CAS_16_UP
static uint16_t
-_atomic_cas_up_16(volatile uint16_t *ptr, uint16_t old, uint16_t new)
+_atomic_cas_16_up(volatile uint16_t *ptr, uint16_t old, uint16_t new)
{
uint16_t ret;
@@ -131,7 +131,7 @@ _atomic_cas_8_up(volatile uint8_t *ptr,
return ret;
}
*ptr = new;
- RAS_END(_atomic_cas_16);
+ RAS_END(_atomic_cas_8);
return ret;
}
CVS commit: src/common/lib/libc/atomic
Module Name:src
Committed By: joerg
Date: Wed Jan 29 15:59:12 UTC 2014
Modified Files:
src/common/lib/libc/atomic: atomic_add_32_cas.c atomic_and_32_cas.c
atomic_or_32_cas.c
Log Message:
Fix up the remaining __sync_* functions to build with Clang on ARM.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/atomic/atomic_add_32_cas.c
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/atomic/atomic_and_32_cas.c \
src/common/lib/libc/atomic/atomic_or_32_cas.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/atomic/atomic_add_32_cas.c
diff -u src/common/lib/libc/atomic/atomic_add_32_cas.c:1.6 src/common/lib/libc/atomic/atomic_add_32_cas.c:1.7
--- src/common/lib/libc/atomic/atomic_add_32_cas.c:1.6 Mon Jan 27 18:29:47 2014
+++ src/common/lib/libc/atomic/atomic_add_32_cas.c Wed Jan 29 15:59:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_add_32_cas.c,v 1.6 2014/01/27 18:29:47 matt Exp $ */
+/* $NetBSD: atomic_add_32_cas.c,v 1.7 2014/01/29 15:59:11 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -33,10 +33,11 @@
#include sys/atomic.h
-uint32_t __sync_fetch_and_add_4(volatile uint32_t *, int32_t);
+uint32_t fetch_and_add_4(volatile uint32_t *, uint32_t, ...)
+asm(__sync_fetch_and_add_4);
uint32_t
-__sync_fetch_and_add_4(volatile uint32_t *addr, int32_t val)
+fetch_and_add_4(volatile uint32_t *addr, uint32_t val, ...)
{
uint32_t old, new;
@@ -50,7 +51,7 @@ __sync_fetch_and_add_4(volatile uint32_t
void
atomic_add_32(volatile uint32_t *addr, int32_t val)
{
- (void) __sync_fetch_and_add_4(addr, val);
+ (void) fetch_and_add_4(addr, val);
}
#undef atomic_add_32
Index: src/common/lib/libc/atomic/atomic_and_32_cas.c
diff -u src/common/lib/libc/atomic/atomic_and_32_cas.c:1.7 src/common/lib/libc/atomic/atomic_and_32_cas.c:1.8
--- src/common/lib/libc/atomic/atomic_and_32_cas.c:1.7 Mon Jan 27 18:36:52 2014
+++ src/common/lib/libc/atomic/atomic_and_32_cas.c Wed Jan 29 15:59:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_and_32_cas.c,v 1.7 2014/01/27 18:36:52 matt Exp $ */
+/* $NetBSD: atomic_and_32_cas.c,v 1.8 2014/01/29 15:59:11 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -33,10 +33,11 @@
#include sys/atomic.h
-uint32_t __sync_fetch_and_and_4(volatile uint32_t *, uint32_t);
+uint32_t fetch_and_and_4(volatile uint32_t *, uint32_t, ...)
+asm(__sync_fetch_and_and_4);
uint32_t
-__sync_fetch_and_and_4(volatile uint32_t *addr, uint32_t val)
+fetch_and_and_4(volatile uint32_t *addr, uint32_t val, ...)
{
uint32_t old, new;
@@ -50,7 +51,7 @@ __sync_fetch_and_and_4(volatile uint32_t
void
atomic_and_32(volatile uint32_t *addr, uint32_t val)
{
- (void) __sync_fetch_and_and_4(addr, val);
+ (void) fetch_and_and_4(addr, val);
}
#undef atomic_and_32
Index: src/common/lib/libc/atomic/atomic_or_32_cas.c
diff -u src/common/lib/libc/atomic/atomic_or_32_cas.c:1.7 src/common/lib/libc/atomic/atomic_or_32_cas.c:1.8
--- src/common/lib/libc/atomic/atomic_or_32_cas.c:1.7 Mon Jan 27 18:36:52 2014
+++ src/common/lib/libc/atomic/atomic_or_32_cas.c Wed Jan 29 15:59:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_or_32_cas.c,v 1.7 2014/01/27 18:36:52 matt Exp $ */
+/* $NetBSD: atomic_or_32_cas.c,v 1.8 2014/01/29 15:59:11 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -33,10 +33,11 @@
#include sys/atomic.h
-uint32_t __sync_fetch_and_or_4(volatile uint32_t *, uint32_t);
+uint32_t fetch_and_or_4(volatile uint32_t *, uint32_t, ...)
+asm(__sync_fetch_and_or_4);
uint32_t
-__sync_fetch_and_or_4(volatile uint32_t *addr, uint32_t val)
+fetch_and_or_4(volatile uint32_t *addr, uint32_t val, ...)
{
uint32_t old, new;
@@ -50,7 +51,7 @@ __sync_fetch_and_or_4(volatile uint32_t
void
atomic_or_32(volatile uint32_t *addr, uint32_t val)
{
- (void) __sync_fetch_and_or_4(addr, val);
+ (void) fetch_and_or_4(addr, val);
}
#undef atomic_or_32
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Wed Jan 29 18:42:14 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: emul.c rump.c
Log Message:
lwp0 needs l_proc set for panic-cpu_reboot to dump core the right way
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.283 -r1.284 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.161 src/sys/rump/librump/rumpkern/emul.c:1.162
--- src/sys/rump/librump/rumpkern/emul.c:1.161 Fri Jan 17 01:32:53 2014
+++ src/sys/rump/librump/rumpkern/emul.c Wed Jan 29 18:42:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.161 2014/01/17 01:32:53 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.162 2014/01/29 18:42:14 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.161 2014/01/17 01:32:53 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.162 2014/01/29 18:42:14 pooka Exp $);
#include sys/param.h
#include sys/null.h
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, $NetBSD: emul.c,v 1.1
#include sys/device.h
#include sys/queue.h
#include sys/file.h
+#include sys/filedesc.h
#include sys/cpu.h
#include sys/kmem.h
#include sys/poll.h
@@ -73,7 +74,11 @@ int physmem = PHYSMEM;
int nkmempages = PHYSMEM/2; /* from le chapeau */
#undef PHYSMEM
-struct lwp lwp0;
+struct lwp lwp0 = {
+ .l_lid = 1,
+ .l_proc = proc0,
+ .l_fd = filedesc0,
+};
struct vnode *rootvp;
dev_t rootdev = NODEV;
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.283 src/sys/rump/librump/rumpkern/rump.c:1.284
--- src/sys/rump/librump/rumpkern/rump.c:1.283 Fri Jan 17 02:05:54 2014
+++ src/sys/rump/librump/rumpkern/rump.c Wed Jan 29 18:42:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.283 2014/01/17 02:05:54 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.284 2014/01/29 18:42:14 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.283 2014/01/17 02:05:54 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.284 2014/01/29 18:42:14 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -271,9 +271,7 @@ rump_init(void)
/* init minimal lwp/cpu context */
l = lwp0;
- l-l_lid = 1;
l-l_cpu = l-l_target_cpu = rump_cpu;
- l-l_fd = filedesc0;
/* lwp0 isn't created like other threads, so notify hypervisor here */
rumpuser_curlwpop(RUMPUSER_LWP_CREATE, l);
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: matt
Date: Wed Jan 29 18:45:21 UTC 2014
Modified Files:
src/sys/arch/arm/arm: syscall.c undefined.c
src/sys/arch/arm/arm32: fault.c
src/sys/arch/arm/include: locore.h
Log Message:
Add read_insn and read_thumb_insn inlines to hide the endianness of
instructions and use them as appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arm/arm/syscall.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/arm/arm/undefined.c
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/arm/arm32/fault.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/include/locore.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/syscall.c
diff -u src/sys/arch/arm/arm/syscall.c:1.58 src/sys/arch/arm/arm/syscall.c:1.59
--- src/sys/arch/arm/arm/syscall.c:1.58 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/syscall.c Wed Jan 29 18:45:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.58 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: syscall.c,v 1.59 2014/01/29 18:45:21 matt Exp $ */
/*-
* Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.58 2013/08/18 06:28:18 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.59 2014/01/29 18:45:21 matt Exp $);
#include sys/cpu.h
#include sys/device.h
@@ -148,14 +148,10 @@ swi_handler(trapframe_t *tf)
else
#endif
{
- /* XXX fuword? */
#ifdef __PROG32
- insn = *(uint32_t *)(tf-tf_pc - INSN_SIZE);
-#if defined(__ARMEB__) defined(_ARM_ARCH_7)
- insn = le32toh(insn); /* BE armv7 insn are in LE */
-#endif
+ insn = read_insn(tf-tf_pc - INSN_SIZE, true);
#else
- insn = *(uint32_t *)((tf-tf_r15 R15_PC) - INSN_SIZE);
+ insn = read_insn((tf-tf_r15 R15_PC) - INSN_SIZE, true);
#endif
}
Index: src/sys/arch/arm/arm/undefined.c
diff -u src/sys/arch/arm/arm/undefined.c:1.50 src/sys/arch/arm/arm/undefined.c:1.51
--- src/sys/arch/arm/arm/undefined.c:1.50 Sun Aug 18 08:08:15 2013
+++ src/sys/arch/arm/arm/undefined.c Wed Jan 29 18:45:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.c,v 1.50 2013/08/18 08:08:15 matt Exp $ */
+/* $NetBSD: undefined.c,v 1.51 2014/01/29 18:45:21 matt Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -54,7 +54,7 @@
#include sys/kgdb.h
#endif
-__KERNEL_RCSID(0, $NetBSD: undefined.c,v 1.50 2013/08/18 08:08:15 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: undefined.c,v 1.51 2014/01/29 18:45:21 matt Exp $);
#include sys/kmem.h
#include sys/queue.h
@@ -303,17 +303,10 @@ undefinedinstruction(trapframe_t *frame)
#ifdef THUMB_CODE
if (frame-tf_spsr PSR_T_bit) {
- const uint16_t * const pc = (const uint16_t *)(fault_pc ~1);
- fault_instruction = pc[0];
-#if defined(__ARMEB__) defined(_ARM_ARCH_7)
- fault_instruction = le16toh(fault_instruction);
-#endif
+ fault_instruction = read_thumb_insn(fault_pc, user);
if (fault_instruction = 0xe000) {
- uint16_t tmp = pc[1];
-#if defined(__ARMEB__) defined(_ARM_ARCH_7)
- tmp = le16toh(tmp);
-#endif
- fault_instruction = (fault_instruction 16) | tmp;
+ fault_instruction = (fault_instruction 16)
+ | read_thumb_insn(fault_pc + 2, user);
}
}
else
@@ -342,11 +335,7 @@ undefinedinstruction(trapframe_t *frame)
* the kernel is screwed up in which case it does
* not really matter does it ?
*/
-
- fault_instruction = *(const uint32_t *)fault_pc;
-#if defined(__ARMEB__) defined(_ARM_ARCH_7)
- fault_instruction = le32toh(fault_instruction);
-#endif
+ fault_instruction = read_insn(fault_pc, user);
}
/* Update vmmeter statistics */
Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.92 src/sys/arch/arm/arm32/fault.c:1.93
--- src/sys/arch/arm/arm32/fault.c:1.92 Sat Jan 11 17:32:20 2014
+++ src/sys/arch/arm/arm32/fault.c Wed Jan 29 18:45:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.92 2014/01/11 17:32:20 matt Exp $ */
+/* $NetBSD: fault.c,v 1.93 2014/01/29 18:45:21 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
#include opt_kgdb.h
#include sys/types.h
-__KERNEL_RCSID(0, $NetBSD: fault.c,v 1.92 2014/01/11 17:32:20 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: fault.c,v 1.93 2014/01/29 18:45:21 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -168,8 +168,23 @@ static const struct data_abort data_abor
#endif
static inline void
-call_trapsignal(struct lwp *l, ksiginfo_t *ksi)
+call_trapsignal(struct lwp *l, const struct trapframe *tf, ksiginfo_t *ksi)
{
+ if (l-l_proc-p_pid == 1 || cpu_printfataltraps) {
+ printf(%d.%d(%s): trap: signo=%d code=%d addr=%p trap=%#x\n,
+ l-l_proc-p_pid, l-l_lid, l-l_proc-p_comm,
+ ksi-ksi_signo, ksi-ksi_code, ksi-ksi_addr,
+ ksi-ksi_trap);
+ printf(r0=%08x r1=%08x r2=%08x r3=%08x\n,
+ tf-tf_r0, tf-tf_r1, tf-tf_r2, tf-tf_r3);
+ printf(r4=%08x r5=%08x r6=%08x r7=%08x\n,
+ tf-tf_r4,
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Wed Jan 29 18:51:37 UTC 2014
Modified Files:
src/sys/arch/arm/include: int_fmtio.h int_mwgwtypes.h
Log Message:
Make {,u}int{8,16,32} be of type int.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/int_fmtio.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/include/int_mwgwtypes.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/int_fmtio.h
diff -u src/sys/arch/arm/include/int_fmtio.h:1.6 src/sys/arch/arm/include/int_fmtio.h:1.7
--- src/sys/arch/arm/include/int_fmtio.h:1.6 Wed Jan 29 01:40:35 2014
+++ src/sys/arch/arm/include/int_fmtio.h Wed Jan 29 18:51:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.6 2014/01/29 01:40:35 matt Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.7 2014/01/29 18:51:37 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,15 +46,9 @@
#define PRIdLEAST16 d /* int_least16_t */
#define PRIdLEAST32 d /* int_least32_t */
#define PRIdLEAST64 lld /* int_least64_t */
-#ifdef _LP64
-#define PRIdFAST8 ld /* int_fast8_t */
-#define PRIdFAST16 ld /* int_fast16_t */
-#define PRIdFAST32 ld /* int_fast32_t */
-#else
#define PRIdFAST8 d /* int_fast8_t */
#define PRIdFAST16 d /* int_fast16_t */
#define PRIdFAST32 d /* int_fast32_t */
-#endif
#define PRIdFAST64 lld /* int_fast64_t */
#define PRIdMAX lld /* intmax_t */
#define PRIdPTR ld /* intptr_t */
@@ -67,15 +61,9 @@
#define PRIiLEAST16 i /* int_least16_t */
#define PRIiLEAST32 i /* int_least32_t */
#define PRIiLEAST64 lli /* int_least64_t */
-#ifdef _LP64
-#define PRIiFAST8 li /* int_fast8_t */
-#define PRIiFAST16 li /* int_fast16_t */
-#define PRIiFAST32 li /* int_fast32_t */
-#else
#define PRIiFAST8 i /* int_fast8_t */
#define PRIiFAST16 i /* int_fast16_t */
#define PRIiFAST32 i /* int_fast32_t */
-#endif
#define PRIiFAST64 lli /* int_fast64_t */
#define PRIiMAX lli /* intmax_t */
#define PRIiPTR li /* intptr_t */
@@ -90,15 +78,9 @@
#define PRIoLEAST16 o /* uint_least16_t */
#define PRIoLEAST32 o /* uint_least32_t */
#define PRIoLEAST64 llo /* uint_least64_t */
-#ifdef _LP64
-#define PRIoFAST8 lo /* uint_fast8_t */
-#define PRIoFAST16 lo /* uint_fast16_t */
-#define PRIoFAST32 lo /* uint_fast32_t */
-#else
#define PRIoFAST8 o /* uint_fast8_t */
#define PRIoFAST16 o /* uint_fast16_t */
#define PRIoFAST32 o /* uint_fast32_t */
-#endif
#define PRIoFAST64 llo /* uint_fast64_t */
#define PRIoMAX llo /* uintmax_t */
#define PRIoPTR lo /* uintptr_t */
@@ -111,15 +93,9 @@
#define PRIuLEAST16 u /* uint_least16_t */
#define PRIuLEAST32 u /* uint_least32_t */
#define PRIuLEAST64 llu /* uint_least64_t */
-#ifdef _LP64
-#define PRIuFAST8 lu /* uint_fast8_t */
-#define PRIuFAST16 lu /* uint_fast16_t */
-#define PRIuFAST32 lu /* uint_fast32_t */
-#else
#define PRIuFAST8 u /* uint_fast8_t */
#define PRIuFAST16 u /* uint_fast16_t */
#define PRIuFAST32 u /* uint_fast32_t */
-#endif
#define PRIuFAST64 llu /* uint_fast64_t */
#define PRIuMAX llu /* uintmax_t */
#define PRIuPTR lu /* uintptr_t */
@@ -132,15 +108,9 @@
#define PRIxLEAST16 x /* uint_least16_t */
#define PRIxLEAST32 x /* uint_least32_t */
#define PRIxLEAST64 llx /* uint_least64_t */
-#ifdef _LP64
-#define PRIxFAST8 lx /* uint_fast8_t */
-#define PRIxFAST16 lx /* uint_fast16_t */
-#define PRIxFAST32 lx /* uint_fast32_t */
-#else
#define PRIxFAST8 x /* uint_fast8_t */
#define PRIxFAST16 x /* uint_fast16_t */
#define PRIxFAST32 x /* uint_fast32_t */
-#endif
#define PRIxFAST64 llx /* uint_fast64_t */
#define PRIxMAX llx /* uintmax_t */
#define PRIxPTR lx /* uintptr_t */
@@ -153,15 +123,9 @@
#define PRIXLEAST16 X /* uint_least16_t */
#define PRIXLEAST32 X /* uint_least32_t */
#define PRIXLEAST64 llX /* uint_least64_t */
-#ifdef _LP64
-#define PRIXFAST8 lX /* uint_fast8_t */
-#define PRIXFAST16 lX /* uint_fast16_t */
-#define PRIXFAST32 lX /* uint_fast32_t */
-#else
#define PRIXFAST8 X /* uint_fast8_t */
#define PRIXFAST16 X /* uint_fast16_t */
#define PRIXFAST32 X /* uint_fast32_t */
-#endif
#define PRIXFAST64 llX /* uint_fast64_t */
#define PRIXMAX llX /* uintmax_t */
#define PRIXPTR lX /* uintptr_t */
@@ -176,15 +140,9 @@
#define SCNdLEAST16 hd /* int_least16_t */
#define SCNdLEAST32 d /* int_least32_t */
#define SCNdLEAST64 lld /* int_least64_t */
-#ifdef _LP64
-#define SCNdFAST8 ld /* int_fast8_t */
-#define SCNdFAST16 ld /* int_fast16_t */
-#define SCNdFAST32 ld /* int_fast32_t */
-#else
#define SCNdFAST8 d /* int_fast8_t */
#define SCNdFAST16 d /* int_fast16_t */
#define SCNdFAST32 d /* int_fast32_t */
-#endif
#define SCNdFAST64 lld /* int_fast64_t */
#define SCNdMAX lld /* intmax_t */
#define SCNdPTR ld /* intptr_t */
@@ -197,15 +155,9 @@
#define SCNiLEAST16 hi /* int_least16_t */
#define SCNiLEAST32 i /* int_least32_t */
#define SCNiLEAST64 lli
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Wed Jan 29 19:00:08 UTC 2014 Modified Files: src/sys/arch/arm/include: elf_machdep.h Log Message: Remove AArch64 stuff. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/include/elf_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/elf_machdep.h diff -u src/sys/arch/arm/include/elf_machdep.h:1.14 src/sys/arch/arm/include/elf_machdep.h:1.15 --- src/sys/arch/arm/include/elf_machdep.h:1.14 Tue Oct 29 00:45:00 2013 +++ src/sys/arch/arm/include/elf_machdep.h Wed Jan 29 19:00:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: elf_machdep.h,v 1.14 2013/10/29 00:45:00 matt Exp $ */ +/* $NetBSD: elf_machdep.h,v 1.15 2014/01/29 19:00:08 matt Exp $ */ #ifndef _ARM_ELF_MACHDEP_H_ #define _ARM_ELF_MACHDEP_H_ @@ -127,133 +127,6 @@ #define R_ARM_RPC24 254 #define R_ARM_RBASE 255 -#define R_AARCH64_ABS64 257 /* S + A */ -#define R_AARCH64_ABS32 258 /* S + A */ -#define R_AARCH64_ABS16 259 /* S + A */ -#define R_AARCH64_PREL64 260 /* S + A - P */ -#define R_AARCH64_PREL32 261 /* S + A - P */ -#define R_AARCH64_PREL16 262 /* S + A - P */ -#define R_AARCH64_MOVW_UABS_G0 263 /* S + A [bits 0..15] */ -#define R_AARCH64_MOVW_UABS_G0_NC 264 /* S + A [bits 0..15] */ -#define R_AARCH64_MOVW_UABS_G1 265 /* S + A [bits 16..31] */ -#define R_AARCH64_MOVW_UABS_G1_NC 266 /* S + A [bits 16..31] */ -#define R_AARCH64_MOVW_UABS_G2 267 /* S + A [bits 32..47] */ -#define R_AARCH64_MOVW_UABS_G2_NC 268 /* S + A [bits 32..47] */ -#define R_AARCH64_MOVW_UABS_G3 269 /* S + A [bits 48..63] */ -#define R_AARCH64_MOVW_SABS_G0 270 /* S + A [bits 0..15] */ -#define R_AARCH64_MOVW_SABS_G1 271 /* S + A [bits 16..31] */ -#define R_AARCH64_MOVW_SABS_G2 272 /* S + A [bits 32..47] */ -#define R_AARCH64_LD_PREL_LO19 273 /* S + A - P */ -#define R_AARCH64_ADR_PREL_LO21 274 /* S + A - P */ -#define R_AARCH64_ADR_PREL_PG_HI21 275 /* Page(S + A) - Page(P) */ -#define R_AARCH64_ADR_PREL_PG_HI21_NC 276 /* Page(S + A) - Page(P) */ -#define R_AARCH64_ADR_ABS_LO21_NC 277 /* S + A */ -#define R_AARCH64_LDST8_ABS_LO12_NC 278 /* S + A */ -#define R_AARCH_TSTBR14 279 /* S + A - P */ -#define R_AARCH_CONDBR19 281 /* S + A - P */ -#define R_AARCH_JUMP26 282 /* S + A - P */ -#define R_AARCH_CALL26 283 /* S + A - P */ -#define R_AARCH_LDST16_ABS_LO12_NC 284 /* S + A */ -#define R_AARCH_LDST32_ABS_LO12_NC 285 /* S + A */ -#define R_AARCH_LDST64_ABS_LO12_NC 286 /* S + A */ -#define R_AARCH64_MOVW_PREL_G0 287 /* S + A - P */ -#define R_AARCH64_MOVW_PREL_G0_NC 288 /* S + A - P */ -#define R_AARCH64_MOVW_PREL_G1 289 /* S + A - P */ -#define R_AARCH64_MOVW_PREL_G1_NC 290 /* S + A - P */ -#define R_AARCH64_MOVW_PREL_G2 291 /* S + A - P */ -#define R_AARCH64_MOVW_PREL_G2_NC 292 /* S + A - P */ -#define R_AARCH64_MOVW_PREL_G3 293 /* S + A - P */ - -#define R_AARCH64_LDST128_ABS_LO12_NC 299 /* S + A */ -#define R_AARCH64_MOVW_GOTOFF_G0 300 /* G(GDAT(S + A)) - GOT */ -#define R_AARCH64_MOVW_GOTOFF_G0_NC 301 /* G(GDAT(S + A)) - GOT */ -#define R_AARCH64_MOVW_GOTOFF_G1 302 /* G(GDAT(S + A)) - GOT */ -#define R_AARCH64_MOVW_GOTOFF_G1_NC 303 /* G(GDAT(S + A)) - GOT */ -#define R_AARCH64_MOVW_GOTOFF_G2 304 /* G(GDAT(S + A)) - GOT */ -#define R_AARCH64_MOVW_GOTOFF_G2_NC 305 /* G(GDAT(S + A)) - GOT */ -#define R_AARCH64_MOVW_GOTOFF_G3 306 /* G(GDAT(S + A)) - GOT */ -#define R_AARCH64_GOTREL64 307 /* S + A - GOT */ -#define R_AARCH64_GOTREL32 308 /* S + A - GOT */ -#define R_AARCH64_GOT_LD_PREL19 309 /* G(GDAT(S + A)) - P */ -#define R_AARCH64_LD64_GOTOFF_LO15 310 /* G(GDAT(S + A)) - GOT */ -#define R_AARCH64_ADR_GOT_PAGE 311 /* Page(G(GDAT(S + A))) - Page(GOT) */ -#define R_AARCH64_LD64_GOT_LO12_NC 312 /* G(GDAT(S + A)) */ -#define R_AARCH64_LD64_GOTPAGE_LO15 313 /* G(GDAT(S + A)) - Page(GOT) */ - -#define R_AARCH64_TLSGD_ADR_PREL21 512 /* G(GTLSIDX(S,A)) - P */ -#define R_AARCH64_TLSGD_ADR_PAGE21 513 /* Page(G(GTLSIDX(S,A))) - Page(P) */ -#define R_AARCH64_TLSGD_ADD_LO12_NC 514 /* G(GTLSIDX(S,A)) */ -#define R_AARCH64_TLSGD_MOVW_G1 515 /* G(GTLSIDX(S,A)) - GOT */ -#define R_AARCH64_TLSGD_MOVW_G0_NV 516 /* G(GTLSIDX(S,A)) - GOT */ -#define R_AARCH64_TLSLD_ADR_PREL21 517 /* G(GLDM(S,A)) - P */ -#define R_AARCH64_TLSLD_ADR_PAGE21 518 /* Page(G(GLDM(S))) - Page(P) */ -#define R_AARCH64_TLSLD_ADD_LO12_NC 519 /* G(GLDM(S)) */ -#define R_AARCH64_TLSLD_MOVW_G1 520 /* G(GLDM(S)) - GOT */ -#define R_AARCH64_TLSLD_MOVW_G0_NC 521 /* G(GLDM(S)) - GOT */ -#define R_AARCH64_TLSLD_LD_PREL21 522 /* G(GLDM(S)) - P */ -#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523 /* DTPREL(S+A) */ -#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524 /* DTPREL(S+A) */ -#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525 /* DTPREL(S+A) */ -#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526 /* DTPREL(S+A) */ -#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 528 /* DTPREL(S+A) */ -#define
CVS commit: [riastradh-drm2] src/sys
Module Name:src
Committed By: riastradh
Date: Wed Jan 29 19:47:38 UTC 2014
Modified Files:
src/sys/conf [riastradh-drm2]: files
src/sys/dev/pci [riastradh-drm2]: files.pci
src/sys/dev/wsfb [riastradh-drm2]: files.wsfb
src/sys/external/bsd/drm2/conf [riastradh-drm2]: files.drm2
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c drm_module.c
drm_vm.c
src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_module.c
i915_pci.c
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: kgdb.h
src/sys/modules/drm2 [riastradh-drm2]: Makefile drm.ioconf
src/sys/modules/i915drm2 [riastradh-drm2]: Makefile i915drm.ioconf
Log Message:
First draft of in-kernel drm2 attachment.
The drm2 `drm' device is now called `drmkms' (likewise `i915drmkms',
c.) so that it can coexist with the old drm code to reduce diffs
from HEAD. (Can't call a device `drm2'.)
To generate a diff of this commit:
cvs rdiff -u -r1.1077.2.2 -r1.1077.2.3 src/sys/conf/files
cvs rdiff -u -r1.364.6.1 -r1.364.6.2 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.7 -r1.7.30.1 src/sys/dev/wsfb/files.wsfb
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/external/bsd/drm2/conf/files.drm2
cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/external/bsd/drm2/drm/drm_vm.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 \
src/sys/external/bsd/drm2/i915drm/i915_module.c
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 \
src/sys/external/bsd/drm2/i915drm/i915_pci.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/sys/external/bsd/drm2/include/linux/kgdb.h
cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/sys/modules/drm2/Makefile
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/drm2/drm.ioconf
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/modules/i915drm2/Makefile
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/i915drm2/i915drm.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/conf/files
diff -u src/sys/conf/files:1.1077.2.2 src/sys/conf/files:1.1077.2.3
--- src/sys/conf/files:1.1077.2.2 Sun Sep 8 15:33:06 2013
+++ src/sys/conf/files Wed Jan 29 19:47:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1077.2.2 2013/09/08 15:33:06 riastradh Exp $
+# $NetBSD: files,v 1.1077.2.3 2014/01/29 19:47:38 riastradh Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1093,9 +1093,11 @@ device smsh: arp, ether, ifnet, mii
file dev/ic/lan9118.c smsh
# DRM - Direct Rendering Infrastructure: dev/drm
+# This is the old DRM; new DRM is in dev/pci/files.pci (XXX for now).
define drm {}
-#include external/bsd/drm/conf/files.drm
-#include dev/drm/files.drm
+include external/bsd/drm/conf/files.drm
+include dev/drm/files.drm
+
# Definitions for wscons
# device attributes: display, display with emulator, keyboard, and mouse
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.364.6.1 src/sys/dev/pci/files.pci:1.364.6.2
--- src/sys/dev/pci/files.pci:1.364.6.1 Tue Jul 23 21:07:35 2013
+++ src/sys/dev/pci/files.pci Wed Jan 29 19:47:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.364.6.1 2013/07/23 21:07:35 riastradh Exp $
+# $NetBSD: files.pci,v 1.364.6.2 2014/01/29 19:47:38 riastradh Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -1129,3 +1129,7 @@ defflag opt_tdvfb.h TDVFB_CONSOLE
device tdvfb: wsemuldisplaydev, rasops16, rasops32, vcons, videomode
attach tdvfb at pci
file dev/pci/tdvfb.c tdvfb
+
+# DRMKMS, DRM2 with kernel mode-switching, PCI-only for now.
+define drmkms
+include external/bsd/drm2/conf/files.drm2
Index: src/sys/dev/wsfb/files.wsfb
diff -u src/sys/dev/wsfb/files.wsfb:1.7 src/sys/dev/wsfb/files.wsfb:1.7.30.1
--- src/sys/dev/wsfb/files.wsfb:1.7 Tue Aug 31 02:49:17 2010
+++ src/sys/dev/wsfb/files.wsfb Wed Jan 29 19:47:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfb,v 1.7 2010/08/31 02:49:17 macallan Exp $
+# $NetBSD: files.wsfb,v 1.7.30.1 2014/01/29 19:47:38 riastradh Exp $
#
# wsdisplay framebuffer drivers
@@ -9,6 +9,7 @@ defflag opt_wsfb.h WSFB_FAKE_VGA_FB # al
defflag opt_wsfb.h WSFB_ALLOW_OTHERS # allow to mmap() foreign ranges
# a generic framebuffer console
-device genfb: wsemuldisplaydev, rasops1, rasops2, rasops8, rasops15, rasops16, rasops24, rasops32, vcons, drm
-file dev/wsfb/genfb.c genfb needs-flag
+define genfbbase: rasops1, rasops2, rasops8, rasops15, rasops16, rasops24, rasops32, vcons
+device genfb: genfbbase, wsemuldisplaydev, drm
+file dev/wsfb/genfb.c genfbbase needs-flag
defflag opt_genfb.h GENFB_DEBUG GENFB_SHADOWFB
Index: src/sys/external/bsd/drm2/conf/files.drm2
diff -u src/sys/external/bsd/drm2/conf/files.drm2:1.1.2.5 src/sys/external/bsd/drm2/conf/files.drm2:1.1.2.6
---
CVS commit: [riastradh-drm2] src/sys/arch/amd64/conf
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:46:51 UTC 2014 Modified Files: src/sys/arch/amd64/conf [riastradh-drm2]: NO_DRM Log Message: Include genfb in NO_DRM kernel rather than modularizing. Modularizing required a bunch of hacks (wscons/genfb/c. is not ready for modules) and failed to pull in rasops dependencies, so rasops never worked correctly. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/conf/NO_DRM 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/NO_DRM diff -u src/sys/arch/amd64/conf/NO_DRM:1.1.2.1 src/sys/arch/amd64/conf/NO_DRM:1.1.2.2 --- src/sys/arch/amd64/conf/NO_DRM:1.1.2.1 Wed Jul 24 03:53:14 2013 +++ src/sys/arch/amd64/conf/NO_DRM Wed Jan 29 19:46:51 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NO_DRM,v 1.1.2.1 2013/07/24 03:53:14 riastradh Exp $ +# $NetBSD: NO_DRM,v 1.1.2.2 2014/01/29 19:46:51 riastradh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1.2.1 $ +#ident GENERIC-$Revision: 1.1.2.2 $ maxusers 64 # estimated number of users @@ -376,7 +376,7 @@ pms* at pckbc? # PS/2 mouse for wsmous options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads #vga* at pci? dev ? function ? -#genfb* at pci? dev ? function ? +genfb* at pci? dev ? function ? options VCONS_DRAW_INTR #wsdisplay* at vga? console ? wsdisplay* at wsemuldisplaydev?
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:47:09 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c Log Message: Defer i915drm_attach_framebuffer until interrupts are running. The i915 code initialization relies on counting hardclock ticks for a delay (ugh). Not an issue for modules, but it will matter when we build drm2 into the kernel proper. To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 \ src/sys/external/bsd/drm2/i915drm/i915_pci.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/external/bsd/drm2/i915drm/i915_pci.c diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.9 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.10 --- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.9 Wed Jan 22 14:58:39 2014 +++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Wed Jan 29 19:47:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_pci.c,v 1.1.2.9 2014/01/22 14:58:39 riastradh Exp $ */ +/* $NetBSD: i915_pci.c,v 1.1.2.10 2014/01/29 19:47:09 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.1.2.9 2014/01/22 14:58:39 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.1.2.10 2014/01/29 19:47:09 riastradh Exp $); #include sys/types.h #include sys/systm.h @@ -154,7 +154,8 @@ i915drm_attach(device_t parent, device_t /* Attach the drm driver. */ drm_config_found(self, i915_drm_driver, flags, sc-sc_drm_dev); - i915drm_attach_framebuffer(self); + /* Attach a framebuffer, but not until interrupts work. */ + config_interrupts(self, i915drm_attach_framebuffer); } static int
CVS commit: [riastradh-drm2] src/sys/conf
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:47:54 UTC 2014 Modified Files: src/sys/conf [riastradh-drm2]: majors Log Message: Give drmkms its own device major so it doesn't compete with old drm. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.66.6.1 src/sys/conf/majors 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/majors diff -u src/sys/conf/majors:1.66 src/sys/conf/majors:1.66.6.1 --- src/sys/conf/majors:1.66 Mon Apr 22 16:49:14 2013 +++ src/sys/conf/majors Wed Jan 29 19:47:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.66 2013/04/22 16:49:14 rkujawa Exp $ +# $NetBSD: majors,v 1.66.6.1 2014/01/29 19:47:54 riastradh Exp $ # # Device majors for Machine-Independent drivers. # @@ -54,3 +54,4 @@ device-major mfi char 205 mfi device-major seeprom char 206 seeprom device-major dtracechar 207 dtrace device-major spiflash char 208 block 208 spiflash +device-major drmkmschar 209drmkms
CVS commit: [riastradh-drm2] src/sys/dev/wsfb
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:48:45 UTC 2014 Modified Files: src/sys/dev/wsfb [riastradh-drm2]: genfb.c Log Message: Make genfb replay the msgbuf only if it's becoming the console. To generate a diff of this commit: cvs rdiff -u -r1.50.8.1 -r1.50.8.2 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.50.8.1 src/sys/dev/wsfb/genfb.c:1.50.8.2 --- src/sys/dev/wsfb/genfb.c:1.50.8.1 Wed Jan 29 19:48:29 2014 +++ src/sys/dev/wsfb/genfb.c Wed Jan 29 19:48:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.50.8.1 2014/01/29 19:48:29 riastradh Exp $ */ +/* $NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.50.8.1 2014/01/29 19:48:29 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $); #include sys/param.h #include sys/systm.h @@ -317,7 +317,8 @@ genfb_attach(struct genfb_softc *sc, str } #else genfb_init_palette(sc); - vcons_replay_msgbuf(sc-sc_console_screen); + if (console) + vcons_replay_msgbuf(sc-sc_console_screen); #endif if (genfb_softc == NULL)
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:48:14 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c Log Message: Make i915drm_match return 6 to beat genfb_pci no matter what. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 \ src/sys/external/bsd/drm2/i915drm/i915_pci.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/external/bsd/drm2/i915drm/i915_pci.c diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.11 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.12 --- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.11 Wed Jan 29 19:47:38 2014 +++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Wed Jan 29 19:48:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_pci.c,v 1.1.2.11 2014/01/29 19:47:38 riastradh Exp $ */ +/* $NetBSD: i915_pci.c,v 1.1.2.12 2014/01/29 19:48:14 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.1.2.11 2014/01/29 19:47:38 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.1.2.12 2014/01/29 19:48:14 riastradh Exp $); #include sys/types.h #ifndef _MODULE @@ -139,7 +139,10 @@ i915drm_match(device_t parent, cfdata_t return 0; #endif - return (i915drm_pci_lookup(pa) != NULL); + if (i915drm_pci_lookup(pa) == NULL) + return 0; + + return 6; /* XXX Beat genfb_pci... */ } static void
CVS commit: [riastradh-drm2] src/sys/dev/wsfb
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:48:29 UTC 2014 Modified Files: src/sys/dev/wsfb [riastradh-drm2]: genfb.c Log Message: Make genfb_attach configure the wsemuldisplaydev attribute. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.50 src/sys/dev/wsfb/genfb.c:1.50.8.1 --- src/sys/dev/wsfb/genfb.c:1.50 Thu Jan 10 22:06:59 2013 +++ src/sys/dev/wsfb/genfb.c Wed Jan 29 19:48:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $ */ +/* $NetBSD: genfb.c,v 1.50.8.1 2014/01/29 19:48:29 riastradh Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.50.8.1 2014/01/29 19:48:29 riastradh Exp $); #include sys/param.h #include sys/systm.h @@ -333,7 +333,8 @@ genfb_attach(struct genfb_softc *sc, str SCREEN_DISABLE_DRAWING(sc-sc_console_screen); #endif - config_found(sc-sc_dev, aa, wsemuldisplaydevprint); + config_found_ia(sc-sc_dev, wsemuldisplaydev, aa, + wsemuldisplaydevprint); return 0; }
CVS commit: [riastradh-drm2] src/sys/dev
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:52:12 UTC 2014 Modified Files: src/sys/dev/wscons [riastradh-drm2]: wsdisplay_vconsvar.h src/sys/dev/wsfb [riastradh-drm2]: genfb.c genfbvar.h Log Message: Make genfb a little friendlier to modules. This is not enough to make it actually work as a module itself, but it's enough to make the i915drm module use genfb. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/wscons/wsdisplay_vconsvar.h cvs rdiff -u -r1.50.8.2 -r1.50.8.3 src/sys/dev/wsfb/genfb.c cvs rdiff -u -r1.21 -r1.21.24.1 src/sys/dev/wsfb/genfbvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/wscons/wsdisplay_vconsvar.h diff -u src/sys/dev/wscons/wsdisplay_vconsvar.h:1.22 src/sys/dev/wscons/wsdisplay_vconsvar.h:1.22.8.1 --- src/sys/dev/wscons/wsdisplay_vconsvar.h:1.22 Sun Jan 27 03:59:09 2013 +++ src/sys/dev/wscons/wsdisplay_vconsvar.h Wed Jan 29 19:52:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay_vconsvar.h,v 1.22 2013/01/27 03:59:09 macallan Exp $ */ +/* $NetBSD: wsdisplay_vconsvar.h,v 1.22.8.1 2014/01/29 19:52:11 riastradh Exp $ */ /*- * Copyright (c) 2005, 2006 Michael Lorenz @@ -29,8 +29,10 @@ #ifndef _WSDISPLAY_VCONS_H_ #define _WSDISPLAY_VCONS_H_ +#ifdef _KERNEL_OPT #include opt_wsdisplay_compat.h #include opt_vcons.h +#endif struct vcons_data; Index: src/sys/dev/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.50.8.2 src/sys/dev/wsfb/genfb.c:1.50.8.3 --- src/sys/dev/wsfb/genfb.c:1.50.8.2 Wed Jan 29 19:48:45 2014 +++ src/sys/dev/wsfb/genfb.c Wed Jan 29 19:52:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $ */ +/* $NetBSD: genfb.c,v 1.50.8.3 2014/01/29 19:52:11 riastradh Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.50.8.3 2014/01/29 19:52:11 riastradh Exp $); #include sys/param.h #include sys/systm.h @@ -55,8 +55,10 @@ __KERNEL_RCSID(0, $NetBSD: genfb.c,v 1. AB_VERBOSE | AB_DEBUG) ) #endif +#ifdef _KERNEL_OPT #include opt_genfb.h #include opt_wsfb.h +#endif #ifdef GENFB_DEBUG #define GPRINTF panic Index: src/sys/dev/wsfb/genfbvar.h diff -u src/sys/dev/wsfb/genfbvar.h:1.21 src/sys/dev/wsfb/genfbvar.h:1.21.24.1 --- src/sys/dev/wsfb/genfbvar.h:1.21 Wed Jul 13 22:47:29 2011 +++ src/sys/dev/wsfb/genfbvar.h Wed Jan 29 19:52:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: genfbvar.h,v 1.21 2011/07/13 22:47:29 macallan Exp $ */ +/* $NetBSD: genfbvar.h,v 1.21.24.1 2014/01/29 19:52:12 riastradh Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,12 +27,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfbvar.h,v 1.21 2011/07/13 22:47:29 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: genfbvar.h,v 1.21.24.1 2014/01/29 19:52:12 riastradh Exp $); #ifndef GENFBVAR_H #define GENFBVAR_H +#ifdef _KERNEL_OPT #include opt_splash.h +#endif #include sys/param.h #include sys/buf.h @@ -46,7 +48,9 @@ __KERNEL_RCSID(0, $NetBSD: genfbvar.h,v #include dev/rasops/rasops.h #include dev/wscons/wsdisplay_vconsvar.h +#ifdef _KERNEL_OPT #include opt_genfb.h +#endif #ifdef SPLASHSCREEN #define GENFB_DISABLE_TEXT
CVS commit: src/lib/csu/common
Module Name:src
Committed By: bouyer
Date: Wed Jan 29 20:57:49 UTC 2014
Modified Files:
src/lib/csu/common: crtbegin.c
Log Message:
Also make sure the __CTOR_LIST__ is just aligned to a pointer boundary.
By default, mips N32 will aligned to a 64-bit boundary not 32-bit
which causes an extra NULL entry to be added.
Fix segfault on exit several people have noticed on mips N32,
caused by a jr to a NULL address.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/csu/common/crtbegin.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/csu/common/crtbegin.c
diff -u src/lib/csu/common/crtbegin.c:1.7 src/lib/csu/common/crtbegin.c:1.8
--- src/lib/csu/common/crtbegin.c:1.7 Wed Dec 11 06:55:24 2013
+++ src/lib/csu/common/crtbegin.c Wed Jan 29 20:57:49 2014
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: crtbegin.c,v 1.7 2013/12/11 06:55:24 matt Exp $);
+__RCSID($NetBSD: crtbegin.c,v 1.8 2014/01/29 20:57:49 bouyer Exp $);
#include crtbegin.h
@@ -98,7 +98,7 @@ __do_global_ctors_aux(void)
#if !defined(__ARM_EABI__) || defined(SHARED)
#if !defined(HAVE_INITFINI_ARRAY)
-__dso_hidden const fptr_t __DTOR_LIST__[] __section(.dtors) = {
+__dso_hidden const fptr_t __aligned(sizeof(void *)) __DTOR_LIST__[] __section(.dtors) = {
(fptr_t) -1,
};
__dso_hidden extern const fptr_t __DTOR_LIST_END__[];
CVS commit: src/common/lib/libc/arch/arm/gen
Module Name:src
Committed By: joerg
Date: Wed Jan 29 22:29:43 UTC 2014
Modified Files:
src/common/lib/libc/arch/arm/gen: __aeabi_idiv0.c __aeabi_ldiv0.c
Log Message:
Kernel and standalone code uses panic() for broken code.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/gen/__aeabi_idiv0.c \
src/common/lib/libc/arch/arm/gen/__aeabi_ldiv0.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/gen/__aeabi_idiv0.c
diff -u src/common/lib/libc/arch/arm/gen/__aeabi_idiv0.c:1.2 src/common/lib/libc/arch/arm/gen/__aeabi_idiv0.c:1.3
--- src/common/lib/libc/arch/arm/gen/__aeabi_idiv0.c:1.2 Wed May 8 05:13:56 2013
+++ src/common/lib/libc/arch/arm/gen/__aeabi_idiv0.c Wed Jan 29 22:29:43 2014
@@ -29,9 +29,11 @@
#include sys/cdefs.h
-__RCSID($NetBSD: __aeabi_idiv0.c,v 1.2 2013/05/08 05:13:56 matt Exp $);
+__RCSID($NetBSD: __aeabi_idiv0.c,v 1.3 2014/01/29 22:29:43 joerg Exp $);
-#if !defined(_KERNEL) !defined(_STANDALONE)
+#if defined(_KERNEL) || defined(_STANDALONE)
+#include sys/systm.h
+#else
#include string.h
#include unistd.h
#include sys/types.h
@@ -44,7 +46,9 @@ __RCSID($NetBSD: __aeabi_idiv0.c,v 1.2
int
__aeabi_idiv0(int result)
{
-#if !defined(_KERNEL) || !defined(_STANDALONE)
+#if defined(_KERNEL) || defined(_STANDALONE)
+ panic(divide by 0);
+#else
siginfo_t info;
memset(info, 0, sizeof info);
Index: src/common/lib/libc/arch/arm/gen/__aeabi_ldiv0.c
diff -u src/common/lib/libc/arch/arm/gen/__aeabi_ldiv0.c:1.2 src/common/lib/libc/arch/arm/gen/__aeabi_ldiv0.c:1.3
--- src/common/lib/libc/arch/arm/gen/__aeabi_ldiv0.c:1.2 Wed May 8 05:13:56 2013
+++ src/common/lib/libc/arch/arm/gen/__aeabi_ldiv0.c Wed Jan 29 22:29:43 2014
@@ -29,9 +29,11 @@
#include sys/cdefs.h
-__RCSID($NetBSD: __aeabi_ldiv0.c,v 1.2 2013/05/08 05:13:56 matt Exp $);
+__RCSID($NetBSD: __aeabi_ldiv0.c,v 1.3 2014/01/29 22:29:43 joerg Exp $);
-#if !defined(_KERNEL) !defined(_STANDALONE)
+#if defined(_KERNEL) || defined(_STANDALONE)
+#include sys/systm.h
+#else
#include string.h
#include unistd.h
#include sys/types.h
@@ -44,7 +46,9 @@ __RCSID($NetBSD: __aeabi_ldiv0.c,v 1.2
long long
__aeabi_ldiv0(long long result)
{
-#if !defined(_KERNEL) !defined(_STANDALONE)
+#if defined(_KERNEL) || defined(_STANDALONE)
+ panic(divide by 0);
+#else
siginfo_t info;
memset(info, 0, sizeof info);
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: joerg
Date: Wed Jan 29 22:30:24 UTC 2014
Modified Files:
src/sys/lib/libkern: Makefile.compiler-rt
Log Message:
For ARM EABI, includ divide-by-0 trap handlers.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libkern/Makefile.compiler-rt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.compiler-rt
diff -u src/sys/lib/libkern/Makefile.compiler-rt:1.2 src/sys/lib/libkern/Makefile.compiler-rt:1.3
--- src/sys/lib/libkern/Makefile.compiler-rt:1.2 Fri Jan 17 00:49:55 2014
+++ src/sys/lib/libkern/Makefile.compiler-rt Wed Jan 29 22:30:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.compiler-rt,v 1.2 2014/01/17 00:49:55 joerg Exp $
+# $NetBSD: Makefile.compiler-rt,v 1.3 2014/01/29 22:30:24 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -86,7 +86,9 @@ GENERIC_SRCS+= \
aeabi_idivmod.S \
aeabi_ldivmod.S \
aeabi_uidivmod.S \
- aeabi_uldivmod.S
+ aeabi_uldivmod.S \
+ __aeabi_idiv0.c \
+ __aeabi_ldiv0.c
. endif
.endif
CVS commit: src/distrib/sets
Module Name:src
Committed By: joerg
Date: Wed Jan 29 22:35:53 UTC 2014
Modified Files:
src/distrib/sets: sets.subr
Log Message:
Update for libgcc-libgcc_eh change.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.159 src/distrib/sets/sets.subr:1.160
--- src/distrib/sets/sets.subr:1.159 Tue Jan 28 02:54:02 2014
+++ src/distrib/sets/sets.subr Wed Jan 29 22:35:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.159 2014/01/28 02:54:02 matt Exp $
+# $NetBSD: sets.subr,v 1.160 2014/01/29 22:35:52 joerg Exp $
#
#
@@ -179,7 +179,7 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.159 2014/01/28 02:54:02 matt Exp $
+# # $NetBSD: sets.subr,v 1.160 2014/01/29 22:35:52 joerg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -229,7 +229,7 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# ldap ${MKLDAP} != no
# lint ${MKLINT} != no
# libcxx ${MKLIBCXX} != no
-# libgcc ${HAVE_LIBGCC_EH} != no
+# libgcc_eh ${HAVE_LIBGCC_EH} != no
# libstdcxx ${MKLIBSTDCXX} != no
# lld ${MKLLD} != no
# lldb ${MKLLDB} != no
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Wed Jan 29 22:38:18 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Long double support builds for PPC now.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/compiler_rt/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/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.13 src/lib/libc/compiler_rt/Makefile.inc:1.14
--- src/lib/libc/compiler_rt/Makefile.inc:1.13 Sat Jan 18 21:27:11 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Wed Jan 29 22:38:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2014/01/18 21:27:11 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.14 2014/01/29 22:38:18 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -166,7 +166,6 @@ GENERIC_SRCS+= \
GCDAProfiling.c \
PGOProfiling.c
-.if ${HAVE_LIBGCC} == no
.if ${MACHINE_ARCH} == powerpc
GENERIC_SRCS+= \
fixtfdi.c \
@@ -178,7 +177,6 @@ GENERIC_SRCS+= \
gcc_qmul.c \
gcc_qsub.c
.endif
-.endif
.if ${MACHINE_CPU} == arm
.if !empty(LIBC_MACHINE_ARCH:Mearm*)
CVS commit: src/external/gpl3/binutils/dist/ld
Module Name:src
Committed By: matt
Date: Wed Jan 29 22:39:47 UTC 2014
Modified Files:
src/external/gpl3/binutils/dist/ld: configure.tgt
Log Message:
Add missing emulations for armelf{,b}_nbsd
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/binutils/dist/ld/configure.tgt
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/binutils/dist/ld/configure.tgt
diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.12 src/external/gpl3/binutils/dist/ld/configure.tgt:1.13
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.12 Fri Nov 29 23:01:54 2013
+++ src/external/gpl3/binutils/dist/ld/configure.tgt Wed Jan 29 22:39:47 2014
@@ -66,10 +66,10 @@ arm-*-freebsd* | arm-*-kfreebsd*-gnu)
targ_extra_emuls=armelf ;;
arm*eb-*-netbsdelf*-*eabi*)
targ_emul=armelfb_nbsd_eabi;
- targ_extra_emuls=armelf_nbsd_eabi armelf armnbsd ;;
+ targ_extra_emuls=armelf_nbsd_eabi armelf_nbsd armelfb_bsd armelf armnbsd ;;
arm*-*-netbsdelf*-*eabi*)
targ_emul=armelf_nbsd_eabi;
- targ_extra_emuls=armelfb_nbsd_eabi armelf armnbsd ;;
+ targ_extra_emuls=armelfb_nbsd_eabi armelf_nbsd armelfb_bsd armelf armnbsd ;;
arm*eb-*-netbsdelf*) targ_emul=armelfb_nbsd;
targ_extra_emuls=armelf_nbsd armelf armnbsd ;;
arm-*-netbsdelf*) targ_emul=armelf_nbsd;
CVS commit: src/external/gpl3/binutils/dist/ld
Module Name:src Committed By: matt Date: Wed Jan 29 23:16:14 UTC 2014 Modified Files: src/external/gpl3/binutils/dist/ld: configure.tgt Log Message: Fix typo bsd - nbsd To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/binutils/dist/ld/configure.tgt 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/binutils/dist/ld/configure.tgt diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.13 src/external/gpl3/binutils/dist/ld/configure.tgt:1.14 --- src/external/gpl3/binutils/dist/ld/configure.tgt:1.13 Wed Jan 29 22:39:47 2014 +++ src/external/gpl3/binutils/dist/ld/configure.tgt Wed Jan 29 23:16:14 2014 @@ -66,10 +66,10 @@ arm-*-freebsd* | arm-*-kfreebsd*-gnu) targ_extra_emuls=armelf ;; arm*eb-*-netbsdelf*-*eabi*) targ_emul=armelfb_nbsd_eabi; - targ_extra_emuls=armelf_nbsd_eabi armelf_nbsd armelfb_bsd armelf armnbsd ;; + targ_extra_emuls=armelf_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armnbsd ;; arm*-*-netbsdelf*-*eabi*) targ_emul=armelf_nbsd_eabi; - targ_extra_emuls=armelfb_nbsd_eabi armelf_nbsd armelfb_bsd armelf armnbsd ;; + targ_extra_emuls=armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armnbsd ;; arm*eb-*-netbsdelf*) targ_emul=armelfb_nbsd; targ_extra_emuls=armelf_nbsd armelf armnbsd ;; arm-*-netbsdelf*) targ_emul=armelf_nbsd;
CVS commit: src/tools/binutils
Module Name:src
Committed By: joerg
Date: Wed Jan 29 23:35:13 UTC 2014
Modified Files:
src/tools/binutils: Makefile
Log Message:
For the tools build, always use the Bison-created m68 asm parser.
Fixes build on Linux, where the glibc guards trip up the
must-be-included-first check in config.h.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tools/binutils/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.22 src/tools/binutils/Makefile:1.23
--- src/tools/binutils/Makefile:1.22 Sun Apr 15 08:37:32 2012
+++ src/tools/binutils/Makefile Wed Jan 29 23:35:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/04/15 08:37:32 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2014/01/29 23:35:13 joerg Exp $
.include bsd.own.mk
@@ -16,6 +16,13 @@ CONFIGURE_ARGS= --target=${MACHINE_GNU_P
--disable-werror \
${BRANDING}
+${.OBJDIR}/build/gas/m68k-parse.c: ${GNUHOSTDIST}/gas/m68k-parse.c
+ @mkdir build 2/dev/null || true
+ @mkdir build/gas 2/dev/null || true
+ cat ${GNUHOSTDIST}/gas/m68k-parse.c ${.TARGET}
+
+.configure_done: ${.OBJDIR}/build/gas/m68k-parse.c
+
MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
ALL_TARGET= all-binutils all-gas all-ld
CVS commit: src
Module Name:src
Committed By: joerg
Date: Wed Jan 29 23:37:18 UTC 2014
Modified Files:
src/common/lib/libc: Makefile.inc
src/lib/libc: Makefile
src/lib/libc/arch/arm: Makefile.inc
src/lib/libc/arch/arm/gen: Makefile.inc
src/lib/libm: Makefile
src/sys/lib/libkern: Makefile.libkern
src/sys/lib/libkern/arch/arm: Makefile.inc
Removed Files:
src/common/lib/libc/arch/arm/gen: divide.S divsi3.S modsi3.S udivsi3.S
umodsi3.S
src/sys/lib/libkern/arch/arm: clzsi2.S
Log Message:
Include compiler-rt in libc, libm and libkern.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/common/lib/libc/Makefile.inc
cvs rdiff -u -r1.4 -r0 src/common/lib/libc/arch/arm/gen/divide.S \
src/common/lib/libc/arch/arm/gen/modsi3.S \
src/common/lib/libc/arch/arm/gen/umodsi3.S
cvs rdiff -u -r1.13 -r0 src/common/lib/libc/arch/arm/gen/divsi3.S
cvs rdiff -u -r1.9 -r0 src/common/lib/libc/arch/arm/gen/udivsi3.S
cvs rdiff -u -r1.163 -r1.164 src/lib/libc/Makefile
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/arch/arm/Makefile.inc
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/arch/arm/gen/Makefile.inc
cvs rdiff -u -r1.153 -r1.154 src/lib/libm/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libkern/arch/arm/Makefile.inc
cvs rdiff -u -r1.6 -r0 src/sys/lib/libkern/arch/arm/clzsi2.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/Makefile.inc
diff -u src/common/lib/libc/Makefile.inc:1.14 src/common/lib/libc/Makefile.inc:1.15
--- src/common/lib/libc/Makefile.inc:1.14 Thu Jan 16 11:43:49 2014
+++ src/common/lib/libc/Makefile.inc Wed Jan 29 23:37:18 2014
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.14 2014/01/16 11:43:49 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.15 2014/01/29 23:37:18 joerg Exp $
.include bsd.own.mk
COMMON_DIR:=${.PARSEDIR}
COMMON_CODEDIRS=atomic gen gmon inet md net stdlib string sys
COMMON_CODEDIRS+=hash/sha1 hash/sha2 hash/rmd160 hash/murmurhash
-.if ${HAVE_LIBGCC} != no
-COMMON_CODEDIRS+=quad
-.endif
.if defined(COMMON_MACHINE_ARCH) !empty(COMMON_MACHINE_ARCH) \
exists(${COMMON_DIR}/arch/${COMMON_MACHINE_ARCH})
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.163 src/lib/libc/Makefile:1.164
--- src/lib/libc/Makefile:1.163 Sun Jan 19 11:36:45 2014
+++ src/lib/libc/Makefile Wed Jan 29 23:37:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2014/01/19 11:36:45 apb Exp $
+# $NetBSD: Makefile,v 1.164 2014/01/29 23:37:18 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -63,9 +63,7 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include ${.CURDIR}/db/Makefile.inc
.include ${.CURDIR}/citrus/Makefile.inc
.include ${.CURDIR}/compat-43/Makefile.inc
-.if ${HAVE_LIBGCC} == no
.include ${.CURDIR}/compiler_rt/Makefile.inc
-.endif
.include ${.CURDIR}/dlfcn/Makefile.inc
.include ${.CURDIR}/gdtoa/Makefile.inc
.include ${.CURDIR}/gen/Makefile.inc
@@ -80,9 +78,6 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include ${.CURDIR}/net/Makefile.inc
.include ${.CURDIR}/nameser/Makefile.inc
.include ${.CURDIR}/nls/Makefile.inc
-.if ${HAVE_LIBGCC} != no ${MACHINE_ARCH} != alpha ${ARCHSUBDIR} != sparc64
-.include ${.CURDIR}/quad/Makefile.inc
-.endif
.if (${USE_LIBTRE} == yes)
.include ${NETBSDSRCDIR}/external/bsd/tre/Makefile.inc
.else
Index: src/lib/libc/arch/arm/Makefile.inc
diff -u src/lib/libc/arch/arm/Makefile.inc:1.26 src/lib/libc/arch/arm/Makefile.inc:1.27
--- src/lib/libc/arch/arm/Makefile.inc:1.26 Fri Jan 17 22:19:46 2014
+++ src/lib/libc/arch/arm/Makefile.inc Wed Jan 29 23:37:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2014/01/17 22:19:46 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.27 2014/01/29 23:37:18 joerg Exp $
.include bsd.own.mk
@@ -11,10 +11,6 @@ AFLAGS+= -marm
CPPFLAGS += -I.
.if !empty(LIBC_MACHINE_ARCH:Mearm*)
-SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S
-SRCS+= __aeabi_lcmp.c __aeabi_ulcmp.c
-SRCS+= fixunsgen_ieee754.c fixunssfsi_ieee754.c
-SRCS+= fixunsgen64_ieee754.c fixunsdfsi_ieee754.c
SRCS+= arm_initfini.c
.endif
@@ -24,7 +20,7 @@ CPPFLAGS += -DSOFTFLOAT
# for earm, use the 64-bit softfloat
.if ${LIBC_MACHINE_ARCH} == arm || ${LIBC_MACHINE_ARCH} == armeb
SOFTFLOAT_BITS=32
-#SRCS+= floatunsidf_ieee754.c floatunsisf_ieee754.c
+SRCS+= floatunsidf_ieee754.c floatunsisf_ieee754.c
.endif
.include softfloat/Makefile.inc
Index: src/lib/libc/arch/arm/gen/Makefile.inc
diff -u src/lib/libc/arch/arm/gen/Makefile.inc:1.27 src/lib/libc/arch/arm/gen/Makefile.inc:1.28
--- src/lib/libc/arch/arm/gen/Makefile.inc:1.27 Fri Jan 17 22:19:46 2014
+++ src/lib/libc/arch/arm/gen/Makefile.inc Wed Jan 29 23:37:18 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.27 2014/01/17 22:19:46 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.28 2014/01/29 23:37:18 joerg
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Wed Jan 29 23:47:35 UTC 2014 Modified Files: src/sys/arch/arm/include: int_types.h Log Message: Deal with the case when __UINTN_TYPE__ is defined as well __INTN_TYPE__ is defined. We make the assumption that if the former is defined, the latter is also defined. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/int_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/int_types.h diff -u src/sys/arch/arm/include/int_types.h:1.11 src/sys/arch/arm/include/int_types.h:1.12 --- src/sys/arch/arm/include/int_types.h:1.11 Wed Jan 29 01:40:35 2014 +++ src/sys/arch/arm/include/int_types.h Wed Jan 29 23:47:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.11 2014/01/29 01:40:35 matt Exp $ */ +/* $NetBSD: int_types.h,v 1.12 2014/01/29 23:47:35 matt Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -40,37 +40,52 @@ /* 7.18.1.1 Exact-width integer types */ +#ifndef __UINT8_TYPE__ +# define __UINT8_TYPE__ unsigned char +#endif #ifndef __INT8_TYPE__ -# define __INT8_TYPE__ char +# define __INT8_TYPE__ signed char +#endif +#ifndef __UINT16_TYPE__ +# ifndef __INT16_TYPE__ +# define __INT16_TYPE__ short int +# endif +# define __UINT16_TYPE__ unsigned __INT16_TYPE__ #endif -#ifndef __INT16_TYPE__ -# define __INT16_TYPE__ short int +#ifndef __UINT32_TYPE__ +# ifndef __INT32_TYPE__ +# define __INT32_TYPE__ int +# endif +# define __UINT32_TYPE__ unsigned __INT32_TYPE__ #endif -#ifndef __INT32_TYPE__ -# define __INT32_TYPE__ int +#ifndef __UINT64_TYPE__ +# ifndef __INT64_TYPE__ +# define __INT64_TYPE__ long long int +# endif +# define __UINT64_TYPE__ unsigned __INT64_TYPE__ #endif -#ifndef __INT64_TYPE__ -# define __INT64_TYPE__ long long int -#endif - -typedef signed __INT8_TYPE__ __int8_t; -typedef unsigned __INT8_TYPE__ __uint8_t; -typedef signed __INT16_TYPE__ __int16_t; -typedef unsigned __INT16_TYPE__ __uint16_t; -typedef signed __INT32_TYPE__ __int32_t; -typedef unsigned __INT32_TYPE__ __uint32_t; -typedef signed __INT64_TYPE__ __int64_t; -typedef unsigned __INT64_TYPE__ __uint64_t; + +typedef __INT8_TYPE__ __int8_t; +typedef __UINT8_TYPE__ __uint8_t; +typedef __INT16_TYPE__ __int16_t; +typedef __UINT16_TYPE__ __uint16_t; +typedef __INT32_TYPE__ __int32_t; +typedef __UINT32_TYPE__ __uint32_t; +typedef __INT64_TYPE__ __int64_t; +typedef __UINT64_TYPE__ __uint64_t; #define __BIT_TYPES_DEFINED__ /* 7.18.1.4 Integer types capable of holding object pointers */ -#ifndef __INTPTR_TYPE__ -# define __INTPTR_TYPE__ long int +#ifndef __UINTPTR_TYPE__ +# ifndef __INTPTR_TYPE__ +# define __INTPTR_TYPE__ long int +# endif +# define __UINTPTR_TYPE__ unsigned __INTPTR_TYPE__ #endif -typedef signed __INTPTR_TYPE__ __intptr_t; -typedef unsigned __INTPTR_TYPE__ __uintptr_t; +typedef __INTPTR_TYPE__ __intptr_t; +typedef __UINTPTR_TYPE__ __uintptr_t; #endif /* !_ARM_INT_TYPES_H_ */
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: matt
Date: Thu Jan 30 00:07:35 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: mk.cubie
Log Message:
For BE kernels, pass --be8 to the linker
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.cubie
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/mk.cubie
diff -u src/sys/arch/evbarm/conf/mk.cubie:1.2 src/sys/arch/evbarm/conf/mk.cubie:1.3
--- src/sys/arch/evbarm/conf/mk.cubie:1.2 Fri Sep 6 22:56:47 2013
+++ src/sys/arch/evbarm/conf/mk.cubie Thu Jan 30 00:07:35 2014
@@ -1,6 +1,10 @@
-# $NetBSD: mk.cubie,v 1.2 2013/09/06 22:56:47 matt Exp $
+# $NetBSD: mk.cubie,v 1.3 2014/01/30 00:07:35 matt Exp $
CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
+.if !empty(MACHINE_ARCH:M*eb)
+EXTRA_LINKFLAGS+= --be8
+.endif
+
SYSTEM_FIRST_OBJ= cubie_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/cubie/cubie_start.S
CVS commit: src/sys/arch/evbarm/cubie
Module Name:src Committed By: matt Date: Thu Jan 30 00:08:46 UTC 2014 Modified Files: src/sys/arch/evbarm/cubie: cubie_machdep.c Log Message: Print uboot_args using PRIxPTR To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/cubie/cubie_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/cubie/cubie_machdep.c diff -u src/sys/arch/evbarm/cubie/cubie_machdep.c:1.9 src/sys/arch/evbarm/cubie/cubie_machdep.c:1.10 --- src/sys/arch/evbarm/cubie/cubie_machdep.c:1.9 Thu Jan 23 19:26:55 2014 +++ src/sys/arch/evbarm/cubie/cubie_machdep.c Thu Jan 30 00:08:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cubie_machdep.c,v 1.9 2014/01/23 19:26:55 matt Exp $ */ +/* $NetBSD: cubie_machdep.c,v 1.10 2014/01/30 00:08:46 matt Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.9 2014/01/23 19:26:55 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.10 2014/01/30 00:08:46 matt Exp $); #include opt_machdep.h #include opt_ddb.h @@ -306,7 +306,7 @@ initarm(void *arg) consinit(); #ifdef VERBOSE_INIT_ARM - printf(\nuboot arg = %#x, %#x, %#x, %#x\n, + printf(\nuboot arg = %#PRIxPTR, %#PRIxPTR, %#PRIxPTR, %#PRIxPTR\n, uboot_args[0], uboot_args[1], uboot_args[2], uboot_args[3]); #endif
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src
Committed By: matt
Date: Thu Jan 30 01:06:11 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-elf.h
Log Message:
Make {,U}INTPTR_TYPE long
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.5 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.6
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.5 Mon Feb 4 18:41:18 2013
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h Thu Jan 30 01:06:11 2014
@@ -93,6 +93,12 @@
#undef PTRDIFF_TYPE
#define PTRDIFF_TYPE long int
+#undef INTPTR_TYPE
+#define INTPTR_TYPE PTRDIFF_TYPE
+
+#undef UINTPTR_TYPE
+#define UINTPTR_TYPE SIZE_TYPE
+
/* We don't have any limit on the length as out debugger is GDB. */
#undef DBX_CONTIN_LENGTH
CVS commit: src/libexec/httpd
Module Name:src
Committed By: mrg
Date: Thu Jan 30 02:51:41 UTC 2014
Modified Files:
src/libexec/httpd: bozohttpd.c
Log Message:
move a variable into the scope of its use, where the assignment
has already validated the pointers used. fixes a bug reported
in private email from dogcow@.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/libexec/httpd/bozohttpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.45 src/libexec/httpd/bozohttpd.c:1.46
--- src/libexec/httpd/bozohttpd.c:1.45 Thu Jan 2 08:21:38 2014
+++ src/libexec/httpd/bozohttpd.c Thu Jan 30 02:51:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.45 2014/01/02 08:21:38 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.46 2014/01/30 02:51:41 mrg Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -1853,7 +1853,6 @@ bozo_http_error(bozohttpd_t *httpd, int
const char *reason = http_errors_long(code);
const char *proto = (request request-hr_proto) ?
request-hr_proto : httpd-consts.http_11;
- const char *hostname = BOZOHOST(httpd, request);
int size;
debug((httpd, DEBUG_FAT, bozo_http_error %d: %s, code, msg));
@@ -1873,6 +1872,7 @@ bozo_http_error(bozohttpd_t *httpd, int
if (request request-hr_file) {
char *file = NULL;
+ const char *hostname = BOZOHOST(httpd, request);
/* bozo_escape_html() failure here is just too bad. */
file = bozo_escape_html(NULL, request-hr_file);
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Thu Jan 30 06:38:00 UTC 2014
Modified Files:
src/sys/arch/arm/include: locore.h
Log Message:
ldrht is v6t2 or later so use ldrt and extract the right halfword.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/locore.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/locore.h
diff -u src/sys/arch/arm/include/locore.h:1.8 src/sys/arch/arm/include/locore.h:1.9
--- src/sys/arch/arm/include/locore.h:1.8 Wed Jan 29 18:45:20 2014
+++ src/sys/arch/arm/include/locore.h Thu Jan 30 06:38:00 2014
@@ -197,7 +197,16 @@ read_thumb_insn(vaddr_t va, bool user_p)
va = ~1;
uint32_t insn;
if (user_p) {
+#ifdef _ARM_ARCH_T2
__asm __volatile(ldrht %0, [%1] : =r(insn) : r(va));
+#else
+ __asm __volatile(ldrt %0, [%1] : =r(insn) : r(va ~3));
+#ifdef __ARMEB__
+ insn = (uint16_t) (insn (((va ^ 2) 2) 3));
+#else
+ insn = (uint16_t) (insn ((va 2) 3));
+#endif
+#endif
} else {
insn = *(const uint16_t *)va;
}
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Thu Jan 30 06:39:16 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_swap.S Log Message: switch to unified syntax To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/atomic/atomic_swap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/atomic/atomic_swap.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.8 src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.9 --- src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.8 Fri Nov 8 22:42:52 2013 +++ src/common/lib/libc/arch/arm/atomic/atomic_swap.S Thu Jan 30 06:39:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_swap.S,v 1.8 2013/11/08 22:42:52 matt Exp $ */ +/* $NetBSD: atomic_swap.S,v 1.9 2014/01/30 06:39:16 matt Exp $ */ /*- * Copyright (c) 2007,2012 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ ENTRY_NP(_atomic_swap_32) #else swp r0, r1, [ip] cmp r0, r1 - movnes r3, #0 + movsne r3, #0 cmpne r3, #0 #endif bne 1b
CVS commit: src
Module Name:src
Committed By: wiz
Date: Thu Jan 30 06:49:16 UTC 2014
Modified Files:
src/distrib/sets/lists/comp: mi
src/lib/libz: Makefile
Added Files:
src/lib/libz: zlib.pc
Log Message:
Install a pkg-config file for zlib.
To generate a diff of this commit:
cvs rdiff -u -r1.1876 -r1.1877 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.21 -r1.22 src/lib/libz/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libz/zlib.pc
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.1876 src/distrib/sets/lists/comp/mi:1.1877
--- src/distrib/sets/lists/comp/mi:1.1876 Sun Jan 26 21:33:54 2014
+++ src/distrib/sets/lists/comp/mi Thu Jan 30 06:49:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1876 2014/01/26 21:33:54 joerg Exp $
+# $NetBSD: mi,v 1.1877 2014/01/30 06:49:16 wiz Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -3959,6 +3959,7 @@
./usr/lib/pkgconfig/lutok.pc comp-crypto-lib kyua,share
./usr/lib/pkgconfig/openssl.pc comp-crypto-lib crypto,share
./usr/lib/pkgconfig/sqlite3.pc comp-c-lib
+./usr/lib/pkgconfig/zlib.pc comp-c-lib
./usr/libdata/ldscripts/kmodule comp-util-share binutils,kmod
./usr/libdata/lint/llib-larchive.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lasn1.ln comp-krb5-lintlib lint,kerberos
Index: src/lib/libz/Makefile
diff -u src/lib/libz/Makefile:1.21 src/lib/libz/Makefile:1.22
--- src/lib/libz/Makefile:1.21 Wed Mar 21 10:08:31 2012
+++ src/lib/libz/Makefile Thu Jan 30 06:49:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/03/21 10:08:31 matt Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/30 06:49:16 wiz Exp $
WARNS= 3
@@ -22,6 +22,12 @@ CLEANFILES+= minigzip
INCS= zconf.h zlib.h
INCSDIR= /usr/include
+FILES+= zlib.pc
+FILESOWN_zlib.pc= ${BINOWN}
+FILESGRP_zlib.pc= ${BINGRP}
+FILESMODE_zlib.pc= ${NONBINMODE}
+FILESDIR_zlib.pc= /usr/lib/pkgconfig
+
.include bsd.lib.mk
test: minigzip
Added files:
Index: src/lib/libz/zlib.pc
diff -u /dev/null src/lib/libz/zlib.pc:1.1
--- /dev/null Thu Jan 30 06:49:16 2014
+++ src/lib/libz/zlib.pc Thu Jan 30 06:49:16 2014
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+sharedlibdir=${libdir}
+includedir=${prefix}/include
+
+Name: zlib
+Description: zlib compression library
+Version: 1.2.3
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
CVS commit: src/sys/miscfs/genfs
Module Name:src Committed By: hannken Date: Wed Jan 29 08:27:04 UTC 2014 Modified Files: src/sys/miscfs/genfs: layer_subr.c layer_vnops.c Log Message: Allow layer_node_create() with unlocked lower node and change layer_bypass() to enter nodes from creation operations unlocked. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/miscfs/genfs/layer_subr.c cvs rdiff -u -r1.52 -r1.53 src/sys/miscfs/genfs/layer_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/m68k/atomic
Module Name:src Committed By: martin Date: Wed Jan 29 10:20:11 UTC 2014 Modified Files: src/common/lib/libc/arch/m68k/atomic: Makefile.inc atomic_cas_68000.S Log Message: Provide _atomic_cas_8_up and _atomic_cas_16_up as assembler functions To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/arch/m68k/atomic/Makefile.inc cvs rdiff -u -r1.5 -r1.6 \ src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/hppa/atomic
Module Name:src Committed By: skrll Date: Wed Jan 29 11:03:04 UTC 2014 Modified Files: src/common/lib/libc/arch/hppa/atomic: Makefile.inc atomic_cas_up.S Log Message: Provide _atomic_cas_8_up and _atomic_cas_16_up functions To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/hppa/atomic/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/hppa/atomic
Module Name:src Committed By: skrll Date: Wed Jan 29 11:34:25 UTC 2014 Modified Files: src/common/lib/libc/arch/hppa/atomic: atomic_cas_up.S Log Message: Copyright To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: skrll Date: Wed Jan 29 12:56:28 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Remove harmful whitespace. Now the /var/shm check can succeed quietly. To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/sparc/atomic
Module Name:src
Committed By: martin
Date: Wed Jan 29 13:06:36 UTC 2014
Modified Files:
src/common/lib/libc/arch/sparc/atomic: Makefile.inc atomic_cas_up.S
Log Message:
Provide _atomic_cas_{16,8}_up
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/common/lib/libc/arch/sparc/atomic/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/common/lib/libc/arch/sparc/atomic/atomic_cas_up.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS import: src/sys/external/bsd/compiler_rt/dist
Module Name:src Committed By: joerg Date: Wed Jan 29 14:21:49 UTC 2014 Update of /cvsroot/src/sys/external/bsd/compiler_rt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3229 Log Message: Fix builtin shadowing in PowerPC specific code. Implement clzdi/clzsi for ARM. Status: Vendor Tag: LLVM Release Tags: compiler-rt-200397 U src/sys/external/bsd/compiler_rt/dist/CREDITS.TXT U src/sys/external/bsd/compiler_rt/dist/README.txt U src/sys/external/bsd/compiler_rt/dist/LICENSE.TXT U src/sys/external/bsd/compiler_rt/dist/lib/subsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/udivmoddi4.c U src/sys/external/bsd/compiler_rt/dist/lib/negdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/mulsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatunsidf.c U src/sys/external/bsd/compiler_rt/dist/lib/cmpdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/moddi3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunsdfti.c U src/sys/external/bsd/compiler_rt/dist/lib/popcountsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/adddf3.c U src/sys/external/bsd/compiler_rt/dist/lib/negti2.c U src/sys/external/bsd/compiler_rt/dist/lib/udivmodti4.c U src/sys/external/bsd/compiler_rt/dist/lib/absvdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/cmpti2.c U src/sys/external/bsd/compiler_rt/dist/lib/modti3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunssfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/clzsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/absvti2.c U src/sys/external/bsd/compiler_rt/dist/lib/ctzsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/comparedf2.c U src/sys/external/bsd/compiler_rt/dist/lib/floatundixf.c U src/sys/external/bsd/compiler_rt/dist/lib/int_lib.h U src/sys/external/bsd/compiler_rt/dist/lib/udivsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/divsc3.c U src/sys/external/bsd/compiler_rt/dist/lib/mulosi4.c U src/sys/external/bsd/compiler_rt/dist/lib/fixsfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/enable_execute_stack.c U src/sys/external/bsd/compiler_rt/dist/lib/floatuntixf.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunsxfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/powidf2.c U src/sys/external/bsd/compiler_rt/dist/lib/floatsidf.c U src/sys/external/bsd/compiler_rt/dist/lib/fixsfti.c U src/sys/external/bsd/compiler_rt/dist/lib/ffsdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/negvsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/floatundisf.c U src/sys/external/bsd/compiler_rt/dist/lib/subvdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/umodsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/muldc3.c U src/sys/external/bsd/compiler_rt/dist/lib/trampoline_setup.c U src/sys/external/bsd/compiler_rt/dist/lib/powitf2.c U src/sys/external/bsd/compiler_rt/dist/lib/ffsti2.c U src/sys/external/bsd/compiler_rt/dist/lib/addvsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/powixf2.c U src/sys/external/bsd/compiler_rt/dist/lib/divsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatuntisf.c U src/sys/external/bsd/compiler_rt/dist/lib/subvti3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixxfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/mulvsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/paritydi2.c U src/sys/external/bsd/compiler_rt/dist/lib/int_math.h U src/sys/external/bsd/compiler_rt/dist/lib/mulxc3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatdixf.c U src/sys/external/bsd/compiler_rt/dist/lib/fixxfti.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunssfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/divmoddi4.c U src/sys/external/bsd/compiler_rt/dist/lib/negsf2.c U src/sys/external/bsd/compiler_rt/dist/lib/subdf3.c U src/sys/external/bsd/compiler_rt/dist/lib/parityti2.c U src/sys/external/bsd/compiler_rt/dist/lib/muldf3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixdfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/ashrdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/floattixf.c U src/sys/external/bsd/compiler_rt/dist/lib/fp_lib.h U src/sys/external/bsd/compiler_rt/dist/lib/divsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunssfti.c U src/sys/external/bsd/compiler_rt/dist/lib/popcountdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/lshrdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatdisf.c U src/sys/external/bsd/compiler_rt/dist/lib/extendsfdf2.c U src/sys/external/bsd/compiler_rt/dist/lib/ashrti3.c U src/sys/external/bsd/compiler_rt/dist/lib/int_types.h U src/sys/external/bsd/compiler_rt/dist/lib/popcountti2.c U src/sys/external/bsd/compiler_rt/dist/lib/clzdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/fixunsxfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/udivmodsi4.c U src/sys/external/bsd/compiler_rt/dist/lib/lshrti3.c U src/sys/external/bsd/compiler_rt/dist/lib/gcc_personality_v0.c U src/sys/external/bsd/compiler_rt/dist/lib/floattisf.c U src/sys/external/bsd/compiler_rt/dist/lib/muldi3.c U src/sys/external/bsd/compiler_rt/dist/lib/modsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/floatundidf.c U
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: martin Date: Wed Jan 29 14:44:32 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_init_testset.c Log Message: Fix copypasto To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/atomic/atomic_init_testset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: martin Date: Wed Jan 29 14:49:35 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_init_testset.c Log Message: Fix a few more copypastos - now it actually builds. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/common/lib/libc/atomic/atomic_init_testset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: joerg Date: Wed Jan 29 15:59:12 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_add_32_cas.c atomic_and_32_cas.c atomic_or_32_cas.c Log Message: Fix up the remaining __sync_* functions to build with Clang on ARM. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/atomic/atomic_add_32_cas.c cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/atomic/atomic_and_32_cas.c \ src/common/lib/libc/atomic/atomic_or_32_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Wed Jan 29 18:42:14 UTC 2014 Modified Files: src/sys/rump/librump/rumpkern: emul.c rump.c Log Message: lwp0 needs l_proc set for panic-cpu_reboot to dump core the right way To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/rump/librump/rumpkern/emul.c cvs rdiff -u -r1.283 -r1.284 src/sys/rump/librump/rumpkern/rump.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm
Module Name:src Committed By: matt Date: Wed Jan 29 18:45:21 UTC 2014 Modified Files: src/sys/arch/arm/arm: syscall.c undefined.c src/sys/arch/arm/arm32: fault.c src/sys/arch/arm/include: locore.h Log Message: Add read_insn and read_thumb_insn inlines to hide the endianness of instructions and use them as appropriate. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arm/arm/syscall.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/arm/arm/undefined.c cvs rdiff -u -r1.92 -r1.93 src/sys/arch/arm/arm32/fault.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/include/locore.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Wed Jan 29 18:51:37 UTC 2014
Modified Files:
src/sys/arch/arm/include: int_fmtio.h int_mwgwtypes.h
Log Message:
Make {,u}int{8,16,32} be of type int.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/int_fmtio.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/include/int_mwgwtypes.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Wed Jan 29 19:00:08 UTC 2014 Modified Files: src/sys/arch/arm/include: elf_machdep.h Log Message: Remove AArch64 stuff. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/include/elf_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:47:09 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c Log Message: Defer i915drm_attach_framebuffer until interrupts are running. The i915 code initialization relies on counting hardclock ticks for a delay (ugh). Not an issue for modules, but it will matter when we build drm2 into the kernel proper. To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 \ src/sys/external/bsd/drm2/i915drm/i915_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [riastradh-drm2] src/sys/arch/amd64/conf
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:46:51 UTC 2014 Modified Files: src/sys/arch/amd64/conf [riastradh-drm2]: NO_DRM Log Message: Include genfb in NO_DRM kernel rather than modularizing. Modularizing required a bunch of hacks (wscons/genfb/c. is not ready for modules) and failed to pull in rasops dependencies, so rasops never worked correctly. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/conf/NO_DRM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [riastradh-drm2] src/sys/dev/wsfb
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:48:45 UTC 2014 Modified Files: src/sys/dev/wsfb [riastradh-drm2]: genfb.c Log Message: Make genfb replay the msgbuf only if it's becoming the console. To generate a diff of this commit: cvs rdiff -u -r1.50.8.1 -r1.50.8.2 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [riastradh-drm2] src/sys/dev/wsfb
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:48:29 UTC 2014 Modified Files: src/sys/dev/wsfb [riastradh-drm2]: genfb.c Log Message: Make genfb_attach configure the wsemuldisplaydev attribute. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:48:14 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c Log Message: Make i915drm_match return 6 to beat genfb_pci no matter what. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 \ src/sys/external/bsd/drm2/i915drm/i915_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [riastradh-drm2] src/sys
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:47:38 UTC 2014 Modified Files: src/sys/conf [riastradh-drm2]: files src/sys/dev/pci [riastradh-drm2]: files.pci src/sys/dev/wsfb [riastradh-drm2]: files.wsfb src/sys/external/bsd/drm2/conf [riastradh-drm2]: files.drm2 src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c drm_module.c drm_vm.c src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_module.c i915_pci.c src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: kgdb.h src/sys/modules/drm2 [riastradh-drm2]: Makefile drm.ioconf src/sys/modules/i915drm2 [riastradh-drm2]: Makefile i915drm.ioconf Log Message: First draft of in-kernel drm2 attachment. The drm2 `drm' device is now called `drmkms' (likewise `i915drmkms', c.) so that it can coexist with the old drm code to reduce diffs from HEAD. (Can't call a device `drm2'.) To generate a diff of this commit: cvs rdiff -u -r1.1077.2.2 -r1.1077.2.3 src/sys/conf/files cvs rdiff -u -r1.364.6.1 -r1.364.6.2 src/sys/dev/pci/files.pci cvs rdiff -u -r1.7 -r1.7.30.1 src/sys/dev/wsfb/files.wsfb cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/external/bsd/drm2/conf/files.drm2 cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/sys/external/bsd/drm2/drm/drm_drv.c cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/external/bsd/drm2/drm/drm_module.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/external/bsd/drm2/drm/drm_vm.c cvs rdiff -u -r1.1.2.7 -r1.1.2.8 \ src/sys/external/bsd/drm2/i915drm/i915_module.c cvs rdiff -u -r1.1.2.10 -r1.1.2.11 \ src/sys/external/bsd/drm2/i915drm/i915_pci.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/sys/external/bsd/drm2/include/linux/kgdb.h cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/sys/modules/drm2/Makefile cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/drm2/drm.ioconf cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/modules/i915drm2/Makefile cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/i915drm2/i915drm.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [riastradh-drm2] src/sys/conf
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:47:54 UTC 2014 Modified Files: src/sys/conf [riastradh-drm2]: majors Log Message: Give drmkms its own device major so it doesn't compete with old drm. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.66.6.1 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [riastradh-drm2] src/sys/dev
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:52:12 UTC 2014 Modified Files: src/sys/dev/wscons [riastradh-drm2]: wsdisplay_vconsvar.h src/sys/dev/wsfb [riastradh-drm2]: genfb.c genfbvar.h Log Message: Make genfb a little friendlier to modules. This is not enough to make it actually work as a module itself, but it's enough to make the i915drm module use genfb. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/wscons/wsdisplay_vconsvar.h cvs rdiff -u -r1.50.8.2 -r1.50.8.3 src/sys/dev/wsfb/genfb.c cvs rdiff -u -r1.21 -r1.21.24.1 src/sys/dev/wsfb/genfbvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: bouyer Date: Wed Jan 29 20:13:04 UTC 2014 Modified Files: src/sys/ufs/ufs: ufs_quota2.c Log Message: Patch from Edgar Fu� on tech-kern: set grace time if lowering the limit cause the user/group to now be overquota. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/ufs/ufs/ufs_quota2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/csu/common
Module Name:src Committed By: bouyer Date: Wed Jan 29 20:57:49 UTC 2014 Modified Files: src/lib/csu/common: crtbegin.c Log Message: Also make sure the __CTOR_LIST__ is just aligned to a pointer boundary. By default, mips N32 will aligned to a 64-bit boundary not 32-bit which causes an extra NULL entry to be added. Fix segfault on exit several people have noticed on mips N32, caused by a jr to a NULL address. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/csu/common/crtbegin.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/gen
Module Name:src Committed By: joerg Date: Wed Jan 29 22:29:43 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/gen: __aeabi_idiv0.c __aeabi_ldiv0.c Log Message: Kernel and standalone code uses panic() for broken code. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/gen/__aeabi_idiv0.c \ src/common/lib/libc/arch/arm/gen/__aeabi_ldiv0.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libkern
Module Name:src Committed By: joerg Date: Wed Jan 29 22:30:24 UTC 2014 Modified Files: src/sys/lib/libkern: Makefile.compiler-rt Log Message: For ARM EABI, includ divide-by-0 trap handlers. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libkern/Makefile.compiler-rt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src Committed By: joerg Date: Wed Jan 29 22:35:53 UTC 2014 Modified Files: src/distrib/sets: sets.subr Log Message: Update for libgcc-libgcc_eh change. To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/compiler_rt
Module Name:src Committed By: joerg Date: Wed Jan 29 22:38:18 UTC 2014 Modified Files: src/lib/libc/compiler_rt: Makefile.inc Log Message: Long double support builds for PPC now. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/compiler_rt/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/ld
Module Name:src
Committed By: matt
Date: Wed Jan 29 22:39:47 UTC 2014
Modified Files:
src/external/gpl3/binutils/dist/ld: configure.tgt
Log Message:
Add missing emulations for armelf{,b}_nbsd
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/binutils/dist/ld/configure.tgt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/ld
Module Name:src Committed By: matt Date: Wed Jan 29 23:16:14 UTC 2014 Modified Files: src/external/gpl3/binutils/dist/ld: configure.tgt Log Message: Fix typo bsd - nbsd To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/binutils/dist/ld/configure.tgt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/binutils
Module Name:src Committed By: joerg Date: Wed Jan 29 23:35:13 UTC 2014 Modified Files: src/tools/binutils: Makefile Log Message: For the tools build, always use the Bison-created m68 asm parser. Fixes build on Linux, where the glibc guards trip up the must-be-included-first check in config.h. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/tools/binutils/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Wed Jan 29 23:37:18 UTC 2014 Modified Files: src/common/lib/libc: Makefile.inc src/lib/libc: Makefile src/lib/libc/arch/arm: Makefile.inc src/lib/libc/arch/arm/gen: Makefile.inc src/lib/libm: Makefile src/sys/lib/libkern: Makefile.libkern src/sys/lib/libkern/arch/arm: Makefile.inc Removed Files: src/common/lib/libc/arch/arm/gen: divide.S divsi3.S modsi3.S udivsi3.S umodsi3.S src/sys/lib/libkern/arch/arm: clzsi2.S Log Message: Include compiler-rt in libc, libm and libkern. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/common/lib/libc/Makefile.inc cvs rdiff -u -r1.4 -r0 src/common/lib/libc/arch/arm/gen/divide.S \ src/common/lib/libc/arch/arm/gen/modsi3.S \ src/common/lib/libc/arch/arm/gen/umodsi3.S cvs rdiff -u -r1.13 -r0 src/common/lib/libc/arch/arm/gen/divsi3.S cvs rdiff -u -r1.9 -r0 src/common/lib/libc/arch/arm/gen/udivsi3.S cvs rdiff -u -r1.163 -r1.164 src/lib/libc/Makefile cvs rdiff -u -r1.26 -r1.27 src/lib/libc/arch/arm/Makefile.inc cvs rdiff -u -r1.27 -r1.28 src/lib/libc/arch/arm/gen/Makefile.inc cvs rdiff -u -r1.153 -r1.154 src/lib/libm/Makefile cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libkern/Makefile.libkern cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libkern/arch/arm/Makefile.inc cvs rdiff -u -r1.6 -r0 src/sys/lib/libkern/arch/arm/clzsi2.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Wed Jan 29 23:47:35 UTC 2014 Modified Files: src/sys/arch/arm/include: int_types.h Log Message: Deal with the case when __UINTN_TYPE__ is defined as well __INTN_TYPE__ is defined. We make the assumption that if the former is defined, the latter is also defined. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/int_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Thu Jan 30 00:07:35 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: mk.cubie Log Message: For BE kernels, pass --be8 to the linker To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.cubie Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/cubie
Module Name:src Committed By: matt Date: Thu Jan 30 00:08:46 UTC 2014 Modified Files: src/sys/arch/evbarm/cubie: cubie_machdep.c Log Message: Print uboot_args using PRIxPTR To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/cubie/cubie_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src
Committed By: matt
Date: Thu Jan 30 01:06:11 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-elf.h
Log Message:
Make {,U}INTPTR_TYPE long
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Jan 30 02:51:41 UTC 2014 Modified Files: src/libexec/httpd: bozohttpd.c Log Message: move a variable into the scope of its use, where the assignment has already validated the pointers used. fixes a bug reported in private email from dogcow@. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Thu Jan 30 06:38:00 UTC 2014 Modified Files: src/sys/arch/arm/include: locore.h Log Message: ldrht is v6t2 or later so use ldrt and extract the right halfword. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/locore.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Thu Jan 30 06:39:16 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_swap.S Log Message: switch to unified syntax To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/atomic/atomic_swap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: wiz Date: Thu Jan 30 06:49:16 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi src/lib/libz: Makefile Added Files: src/lib/libz: zlib.pc Log Message: Install a pkg-config file for zlib. To generate a diff of this commit: cvs rdiff -u -r1.1876 -r1.1877 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.21 -r1.22 src/lib/libz/Makefile cvs rdiff -u -r0 -r1.1 src/lib/libz/zlib.pc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
