CVS commit: src/share/man/man3
Module Name:src Committed By: dholland Date: Tue Aug 30 05:12:00 UTC 2016 Modified Files: src/share/man/man3: rbtree.3 Log Message: Use only "function" for the comparison functions, not both that and "operator". Noted by riastradh. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man3/rbtree.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/rbtree.3 diff -u src/share/man/man3/rbtree.3:1.11 src/share/man/man3/rbtree.3:1.12 --- src/share/man/man3/rbtree.3:1.11 Mon Aug 29 03:50:05 2016 +++ src/share/man/man3/rbtree.3 Tue Aug 30 05:12:00 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: rbtree.3,v 1.11 2016/08/29 03:50:05 dholland Exp $ +.\" $NetBSD: rbtree.3,v 1.12 2016/08/30 05:12:00 dholland Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -81,7 +81,7 @@ The maximum height of a red-black tree i A red-black tree. .It Vt typedef signed int \ (* rbto_compare_nodes_fn)(void *context, const void *node1, const void *node2); -The node-comparison operator. +The node-comparison function. Defines an ordering on nodes. Returns a negative value if the first node .Ar node1 @@ -98,7 +98,7 @@ and the second node are identical according to the ordering. .It Vt typedef signed int \ (* rbto_compare_key_fn)(void *context, const void *node, const void *key); -The node-key comparison operator. +The node-key comparison function. Defines the order of nodes and keys. Returns a negative value if the node .Ar node @@ -114,8 +114,8 @@ is identical to the key .Ar key according to the ordering. .It Vt rb_tree_ops_t -Defines the operator for comparing two nodes in the same tree, -the operator for comparing a node in the tree with a key, +Defines the function for comparing two nodes in the same tree, +the function for comparing a node in the tree with a key, the offset of member .Vt rb_node_t within the node type, @@ -146,7 +146,7 @@ member.) .It Fn rb_tree_init "rbt" "ops" Initialize the red-black tree .Fa rbt . -Let the comparison operators given by +Let the comparison functions given by .Fa ops define the order of nodes in the tree for the purposes of insertion, search, and iteration.
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common
Module Name:src
Committed By: mrg
Date: Tue Aug 30 04:04:07 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
apply some more -Wno-error=discarded-qualifiers
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.25 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.26
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.25 Fri Aug 19 19:10:54 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Tue Aug 30 04:04:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/08/19 19:10:54 mrg Exp $
+# $NetBSD: Makefile,v 1.26 2016/08/30 04:04:07 mrg Exp $
.include
@@ -125,6 +125,9 @@ CPPFLAGS.xf86AutoConfig.c= -DPROJECTROOT
-DIDRIVERS='"${IDRIVERS}"'
COPTS.xf86sbusBus.c= -Wno-error=incompatible-pointer-types
+.if ${HAVE_GCC:U0} > 48
+COPTS.xf86Configure.c= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
.include
.include
CVS commit: src/lib/csu/arch/sh3
Module Name:src
Committed By: uwe
Date: Mon Aug 29 21:27:03 UTC 2016
Modified Files:
src/lib/csu/arch/sh3: crt0.S
Log Message:
___start is __dso_hidden, so use CALL_DATUM_LOCAL and drop the PIC
prologue from __start.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/csu/arch/sh3/crt0.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/sh3/crt0.S
diff -u src/lib/csu/arch/sh3/crt0.S:1.5 src/lib/csu/arch/sh3/crt0.S:1.6
--- src/lib/csu/arch/sh3/crt0.S:1.5 Sun Aug 28 13:50:25 2016
+++ src/lib/csu/arch/sh3/crt0.S Mon Aug 29 21:27:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.S,v 1.5 2016/08/28 13:50:25 christos Exp $ */
+/* $NetBSD: crt0.S,v 1.6 2016/08/29 21:27:03 uwe Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -37,7 +37,7 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.5 2016/08/28 13:50:25 christos Exp $")
+RCSID("$NetBSD: crt0.S,v 1.6 2016/08/29 21:27:03 uwe Exp $")
STRONG_ALIAS(_start,__start)
@@ -49,7 +49,6 @@ STRONG_ALIAS(_start,__start)
* proper registers.
*/
_ENTRY(__start)
- PIC_PROLOGUE_NOSAVE(.L_got)
mov.l .L___start, r0
mov r7, r4 ! void (*cleanup)(void)
mov r8, r5 ! const Obj_Entry *obj
@@ -57,7 +56,5 @@ _ENTRY(__start)
mov r9, r6 ! struct ps_strings *ps_strings
.p2align 2
-.L_got:
- PIC_GOT_DATUM
.L___start:
- CALL_DATUM(___start, 1b)
+ CALL_DATUM_LOCAL(___start, 1b)
CVS commit: src/libexec/ld.elf_so/arch/sparc64
Module Name:src
Committed By: martin
Date: Mon Aug 29 16:00:10 UTC 2016
Modified Files:
src/libexec/ld.elf_so/arch/sparc64: mdreloc.c
Log Message:
Despite the 10 in the name, the OLO10 relocation targets a 13 bit field,
the offset (O) providing the additional data.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.58 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.59
--- src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.58 Mon Jun 20 08:12:25 2016
+++ src/libexec/ld.elf_so/arch/sparc64/mdreloc.c Mon Aug 29 16:00:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.58 2016/06/20 08:12:25 martin Exp $ */
+/* $NetBSD: mdreloc.c,v 1.59 2016/08/29 16:00:10 martin Exp $ */
/*-
* Copyright (c) 2000 Eduardo Horvath.
@@ -32,7 +32,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.58 2016/06/20 08:12:25 martin Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.59 2016/08/29 16:00:10 martin Exp $");
#endif /* not lint */
#include
@@ -175,7 +175,7 @@ static const long reloc_target_bitmask[]
_BM(22), _BM(10), /* _HIPLT22, LOPLT10 */
_BM(32), _BM(22), _BM(10), /* _PCPLT32, _PCPLT22, _PCPLT10 */
_BM(10), _BM(11), -1, /* _10, _11, _64 */
- _BM(10), _BM(22), /* _OLO10, _HH22 */
+ _BM(13), _BM(22), /* _OLO10, _HH22 */
_BM(10), _BM(22), /* _HM10, _LM22 */
_BM(22), _BM(10), _BM(22), /* _PC_HH22, _PC_HM10, _PC_LM22 */
_BM(16), _BM(19), /* _WDISP16, _WDISP19 */
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Mon Aug 29 15:57:07 UTC 2016 Modified Files: src/sys/arch/sparc64/sparc64: kobj_machdep.c Log Message: The target of the OLO10 relocation is the simd13 field of the instruction, so use a 13 bit target mask. Fixes PR kern/51436 (I broke this myself in rev 1.4) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/sparc64/kobj_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/sparc64/sparc64/kobj_machdep.c diff -u src/sys/arch/sparc64/sparc64/kobj_machdep.c:1.5 src/sys/arch/sparc64/sparc64/kobj_machdep.c:1.6 --- src/sys/arch/sparc64/sparc64/kobj_machdep.c:1.5 Sat Feb 1 11:19:04 2014 +++ src/sys/arch/sparc64/sparc64/kobj_machdep.c Mon Aug 29 15:57:07 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: kobj_machdep.c,v 1.5 2014/02/01 11:19:04 nakayama Exp $ */ +/* $NetBSD: kobj_machdep.c,v 1.6 2016/08/29 15:57:07 martin Exp $ */ /*- * Copyright (c) 2001 Jake Burkholder. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.5 2014/02/01 11:19:04 nakayama Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.6 2016/08/29 15:57:07 martin Exp $"); #define ELFSIZE ARCH_ELFSIZE @@ -164,7 +164,7 @@ static const long reloc_target_bitmask[] _BM(22), _BM(10), /* _HIPLT22, LOPLT10 */ _BM(32), _BM(22), _BM(10), /* _PCPLT32, _PCPLT22, _PCPLT10 */ _BM(10), _BM(11), -1, /* _10, _11, _64 */ - _BM(10), _BM(22), /* _OLO10, _HH22 */ + _BM(13), _BM(22), /* _OLO10, _HH22 */ _BM(10), _BM(22), /* _HM10, _LM22 */ _BM(22), _BM(10), _BM(22), /* _PC_HH22, _PC_HM10, _PC_LM22 */ _BM(16), _BM(19), /* _WDISP16, _WDISP19 */
