CVS commit: src/external/lgpl3/gmp/dist/mpn
Module Name:src
Committed By: mrg
Date: Fri Nov 29 08:02:28 UTC 2013
Modified Files:
src/external/lgpl3/gmp/dist/mpn/arm: aorscnd_n.asm aorslsh1_n.asm
bdiv_dbm1c.asm com.asm copyd.asm copyi.asm logops_n.asm lshift.asm
lshiftc.asm mod_34lsub1.asm mode1o.asm rsh1aors_n.asm rshift.asm
udiv.asm
src/external/lgpl3/gmp/dist/mpn/generic: get_d.c
Log Message:
port forward our changes:
- allow working on thumb-missing platforms
- fix some minor issues
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm \
src/external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm \
src/external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm \
src/external/lgpl3/gmp/dist/mpn/arm/com.asm \
src/external/lgpl3/gmp/dist/mpn/arm/logops_n.asm \
src/external/lgpl3/gmp/dist/mpn/arm/lshift.asm \
src/external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm \
src/external/lgpl3/gmp/dist/mpn/arm/mod_34lsub1.asm \
src/external/lgpl3/gmp/dist/mpn/arm/mode1o.asm \
src/external/lgpl3/gmp/dist/mpn/arm/rsh1aors_n.asm \
src/external/lgpl3/gmp/dist/mpn/arm/rshift.asm
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/lgpl3/gmp/dist/mpn/arm/copyd.asm \
src/external/lgpl3/gmp/dist/mpn/arm/copyi.asm
cvs rdiff -u -r1.3 -r1.4 src/external/lgpl3/gmp/dist/mpn/arm/udiv.asm
cvs rdiff -u -r1.3 -r1.4 src/external/lgpl3/gmp/dist/mpn/generic/get_d.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm
diff -u src/external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm:1.2
--- src/external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm:1.1.1.1 Fri Nov 29 07:49:48 2013
+++ src/external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm Fri Nov 29 08:02:28 2013
@@ -117,5 +117,8 @@ L(top): ldm vp!, {r4,r5,r6,r7}
L(end): RETVAL
pop {r4-r11}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
Index: src/external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm
diff -u src/external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm:1.2
--- src/external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm:1.1.1.1 Fri Nov 29 07:49:48 2013
+++ src/external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm Fri Nov 29 08:02:28 2013
@@ -151,5 +151,8 @@ L(rt1): mov r14, r12
REVCY(r12)
L(rt0): RETVAL( r14)
pop {r4-r10r11, r14}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
Index: src/external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm
diff -u src/external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm:1.2
--- src/external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm:1.1.1.1 Fri Nov 29 07:49:48 2013
+++ src/external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm Fri Nov 29 08:02:28 2013
@@ -97,5 +97,8 @@ L(wd1): subs r5, r5, r8
str r5, [qp]
sbc r0, r5, r12
pop {r4, r5, r6, r7, r8}
- bx lr
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
EPILOGUE()
Index: src/external/lgpl3/gmp/dist/mpn/arm/com.asm
diff -u src/external/lgpl3/gmp/dist/mpn/arm/com.asm:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/arm/com.asm:1.2
--- src/external/lgpl3/gmp/dist/mpn/arm/com.asm:1.1.1.1 Fri Nov 29 07:49:48 2013
+++ src/external/lgpl3/gmp/dist/mpn/arm/com.asm Fri Nov 29 08:02:28 2013
@@ -59,5 +59,9 @@ L(top): ldmia up!, { r3, r8, r9, r12 } C
bne L(top)
ldmfd sp!, { r7, r8, r9 } C restore regs from stack
-L(rtn): bx lr
+L(rtn):
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
EPILOGUE()
Index: src/external/lgpl3/gmp/dist/mpn/arm/logops_n.asm
diff -u src/external/lgpl3/gmp/dist/mpn/arm/logops_n.asm:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/arm/logops_n.asm:1.2
--- src/external/lgpl3/gmp/dist/mpn/arm/logops_n.asm:1.1.1.1 Fri Nov 29 07:49:48 2013
+++ src/external/lgpl3/gmp/dist/mpn/arm/logops_n.asm Fri Nov 29 08:02:28 2013
@@ -123,5 +123,8 @@ L(mid): sub n, n, #4
pop { r4, r5, r6, r7 } C popping r8-r10 here strangely fails
L(rtn): pop { r8, r9, r10 }
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
Index: src/external/lgpl3/gmp/dist/mpn/arm/lshift.asm
diff -u src/external/lgpl3/gmp/dist/mpn/arm/lshift.asm:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/arm/lshift.asm:1.2
--- src/external/lgpl3/gmp/dist/mpn/arm/lshift.asm:1.1.1.1 Fri Nov 29 07:49:48 2013
+++ src/external/lgpl3/gmp/dist/mpn/arm/lshift.asm Fri Nov 29 08:02:28 2013
@@ -72,5 +72,8 @@ L(end): orr r7, r7, r6, lsr tnc
L(1): str r7, [rp, #-4]
lsr r0, r4, tnc
pop {r4, r6, r7, r8}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
Index: src/external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm
diff -u src/external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm:1.2
--- src/external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm:1.1.1.1 Fri Nov 29 07:49:48 2013
++
CVS commit: src/external/lgpl3/gmp/lib/libgmp
Module Name:src Committed By: mrg Date: Fri Nov 29 08:03:43 UTC 2013 Modified Files: src/external/lgpl3/gmp/lib/libgmp: Makefile src/external/lgpl3/gmp/lib/libgmp/arch/alpha: Makefile.inc config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/arm: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/armeb: Makefile.inc src/external/lgpl3/gmp/lib/libgmp/arch/coldfire: Makefile.inc config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/earm: Makefile.inc src/external/lgpl3/gmp/lib/libgmp/arch/earmeb: Makefile.inc src/external/lgpl3/gmp/lib/libgmp/arch/earmhf: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/earmhfeb: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/hppa: Makefile.inc config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/i386: Makefile.inc config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/ia64: config.m4 src/external/lgpl3/gmp/lib/libgmp/arch/m68000: Makefile.inc config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/m68k: Makefile.inc config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipseb: Makefile.inc config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipsel: Makefile.inc config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/powerpc: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb: Makefile.inc config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3el: Makefile.inc config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sparc: Makefile.inc config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sparc64: Makefile.inc config.h gmp-mparam.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/vax: Makefile.inc config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/x86_64: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h Removed Files: src/external/lgpl3/gmp/lib/libgmp/arch/alpha: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/arm: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/coldfire: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/earmhf: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/earmhfeb: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/hppa: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/i386: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/m68000: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/m68k: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipseb: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipsel: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/powerpc: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3el: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/sparc: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/sparc64: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/vax: mp.h src/external/lgpl3/gmp/lib/libgmp/arch/x86_64: mp.h Log Message: updates for GMP 5.1.3, and new build files for most platforms. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/lgpl3/gmp/lib/libgmp/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc \ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/gmp.h cvs rdiff -u -r1.1 -r0 src/external/lgpl3/gmp/lib/libgmp/arch/alpha/mp.h cvs rdiff -u -r1.4 -r1.5 \ src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/arm/config.h cvs rdiff -u -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/arm/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/arm/gmp-mparam.h \ src/external/lgpl3/gmp/lib/libgmp/arch/arm/gmp.h cvs rdiff -u -r1.1 -r0 src/external/lgpl3/gmp/lib/libgmp/arch/arm/mp.h cvs rdiff -u -r1.4 -r1.5 \ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/coldfire/Makefile.inc \ src/external/lgpl3/gmp/lib/libgmp/arch/coldfire/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/coldfire/gmp.h cvs rdiff -u -r1.1 -r0 src/external/lgpl3/gmp/lib/libgmp/arch/coldfire/mp.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc cvs rdiff -u -
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Fri Nov 29 08:49:26 UTC 2013 Modified Files: src/doc: CHANGES Log Message: note MPC, MPFR, and GMP updates. To generate a diff of this commit: cvs rdiff -u -r1.1862 -r1.1863 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1862 src/doc/CHANGES:1.1863 --- src/doc/CHANGES:1.1862 Fri Nov 22 16:26:52 2013 +++ src/doc/CHANGES Fri Nov 29 08:49:26 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1862 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1863 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -305,3 +305,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0: zless(1): Added via lastest version of zmore(1) from OpenBSD [pettai 20131112] nvi(1): Upgrade to the latest git source [christos 20131122] + MPC: Updated to MPC 1.0.1. [mrg 20131128] + MPFR: Updated to MPFR 3.1.2. [mrg 20131128] + GMP: Updated to GMP 5.1.3. [mrg 20131129]
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Fri Nov 29 08:53:14 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: note GMP 5.1.3 is in tree. To generate a diff of this commit: cvs rdiff -u -r1.1069 -r1.1070 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1069 src/doc/3RDPARTY:1.1070 --- src/doc/3RDPARTY:1.1069 Fri Nov 29 01:52:58 2013 +++ src/doc/3RDPARTY Fri Nov 29 08:53:14 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1069 2013/11/29 01:52:58 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1070 2013/11/29 08:53:14 mrg Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1381,7 +1381,7 @@ Location: external/lgpl3/mpfr/dist Notes: Package: GNU MP -Version: 5.0.2 +Version: 5.1.3 Current Vers: 5.1.3 Maintainer: http://gmplib.org/mailman/listinfo/gmp-devel Archive Site: http://gmplib.org/
CVS commit: src/doc
Module Name:src Committed By: aymeric Date: Fri Nov 29 09:17:38 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: Update nvi status: . add Sven as upstream maintainer . remove myself as responsible . update Location To generate a diff of this commit: cvs rdiff -u -r1.1070 -r1.1071 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1070 src/doc/3RDPARTY:1.1071 --- src/doc/3RDPARTY:1.1070 Fri Nov 29 08:53:14 2013 +++ src/doc/3RDPARTY Fri Nov 29 09:17:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1070 2013/11/29 08:53:14 mrg Exp $ +# $NetBSD: 3RDPARTY,v 1.1071 2013/11/29 09:17:38 aymeric Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -841,13 +841,13 @@ See /usr/src/dist/ntp/ntp2netbsd for upd Package: nvi Version: 1.81.6, HEAD as of 2013-11-20 Current Vers: 1.81.6 -Maintainer: Keith Bostic +Maintainer: Sven Verdoolaege , Keith Bostic Archive Site: git://repo.or.cz/nvi.git, ftp://ftp.bostic.com/pub/ Home Page: https://repo.or.cz/w/nvi.git http://www.bostic.com/vi/ Mailing List: -Responsible: aymeric, christos +Responsible: christos License: BSD (3/4-clause) -Location: dist/nvi +Location: external/bsd/nvi/dist Notes: We have lots of local fixes.
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch
Module Name:src Committed By: mrg Date: Fri Nov 29 13:26:16 UTC 2013 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/armeb: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/earm: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/earmeb: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/earmhf: config.h config.m4 src/external/lgpl3/gmp/lib/libgmp/arch/earmhfeb: config.h config.m4 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb: config.h config.m4 src/external/lgpl3/gmp/lib/libgmp/arch/mips64el: config.h config.m4 gmp.h Log Message: clean up __GMP_CC, GMP_MPARAM_H_SUGGEST and CONFIG_TOP_SRCDIR. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/gmp.h cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/earm/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/earm/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/earm/gmp.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/earmeb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/earmeb/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/earmeb/gmp.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhf/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhf/config.m4 cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhfeb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhfeb/config.m4 cvs rdiff -u -r1.3 -r1.4 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/config.m4 cvs rdiff -u -r1.3 -r1.4 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/config.m4 cvs rdiff -u -r1.4 -r1.5 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.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/lgpl3/gmp/lib/libgmp/arch/armeb/config.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.h:1.3 src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.h:1.4 --- src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.h:1.3 Fri Nov 29 08:54:48 2013 +++ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.h Fri Nov 29 13:26:16 2013 @@ -27,7 +27,7 @@ along with the GNU MP Library. If not, /* The gmp-mparam.h file (a string) the tune program should suggest updating. */ -#define GMP_MPARAM_H_SUGGEST "/usr/src7/external/lgpl3/gmp/dist/mpn/arm/gmp-mparam.h" +#define GMP_MPARAM_H_SUGGEST "./mpn/arm/gmp-mparam.h" /* Define to 1 if you have the `alarm' function. */ #define HAVE_ALARM 1 Index: src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.m4 diff -u src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.m4:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.m4:1.3 --- src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.m4:1.2 Fri Nov 29 08:54:48 2013 +++ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.m4 Fri Nov 29 13:26:16 2013 @@ -1,7 +1,6 @@ dnl config.m4. Generated automatically by configure. changequote(<,>) ifdef(<__CONFIG_M4_INCLUDED__>,,< -define(,<`/usr/src7/external/lgpl3/gmp/dist'>) define(,0) define(,<`no'>) define(,) Index: src/external/lgpl3/gmp/lib/libgmp/arch/armeb/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/armeb/gmp.h:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/armeb/gmp.h:1.3 --- src/external/lgpl3/gmp/lib/libgmp/arch/armeb/gmp.h:1.2 Fri Nov 29 08:54:48 2013 +++ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/gmp.h Fri Nov 29 13:26:16 2013 @@ -2218,7 +2218,7 @@ enum }; /* Define CC and CFLAGS which were used to build this version of GMP */ -#define __GMP_CC "/var/obj/evbarm/usr/src6/tooldir.NetBSD-6.0_STABLE-amd64/bin/armeb--netbsdelf-gcc --sysroot=/var/obj/evbarm/usr/src6/destdir.evbarm -L/var/obj/evbarm/usr/src6/destdir.evbarm/lib -L/var/obj/evbarm/usr/src6/destdir.evbarm/usr/lib -B/var/obj/evbarm/usr/src6/destdir.evbarm/usr/lib/ -I/var/obj/evbarm/usr/src7/external/lgpl3/gmp/.native/gcc/include -std=gnu99" +#define __GMP_CC "gcc -std=gnu99" #define __GMP_CFLAGS "-marm -O2 -pedantic -fomit-frame-pointer" /* Major version number is the value of __GNU_MP__ too, above and in mp.h. */ Index: src/external/lgpl3/gmp/lib/libgmp/arch/earm/config.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/earm/config.h:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/earm/config.h:1.3 --- src/external/lgpl3/gmp/lib/libgmp/arch/earm/config.h:1.2 Fri Nov 29 08:54:48 2013 +++ src/external/lgpl3/gmp/lib/libgmp/arch/earm/config.h Fri Nov 29 13:26:16 2013 @@ -27,7 +27,7 @@ along with the GNU MP Library. If not, /* The gmp-mparam.h file (a string) the tune program should suggest u
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Fri Nov 29 13:33:00 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: Add entry for LLVM, including note about CVS ACL. To generate a diff of this commit: cvs rdiff -u -r1.1071 -r1.1072 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1071 src/doc/3RDPARTY:1.1072 --- src/doc/3RDPARTY:1.1071 Fri Nov 29 09:17:38 2013 +++ src/doc/3RDPARTY Fri Nov 29 13:33:00 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1071 2013/11/29 09:17:38 aymeric Exp $ +# $NetBSD: 3RDPARTY,v 1.1072 2013/11/29 13:33:00 joerg Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -662,6 +662,18 @@ Notes: man pages are in doxygen/man/man3. Remove the extra man pages that are .so'ing only. Copy the rest to man. +Package: llvm +Version: 3.4rc1 (r195771) +Current Vers.: 3.4rc1 +Maintainer: llvm...@cs.uiuc.edu +Home Page: http://llvm.org +Responsible: joerg +License: BSD/MIT +Location: external/bsd/llvm/dist +Notes: +A CVS ACL is in place for the location to prevent unintentioned commits. +All changes should come via import from upstream SVN. + Package: lvm2tools Version: 2.02.56 Current Vers: 2.02.56
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Fri Nov 29 13:36:42 UTC 2013 Modified Files: src/doc: CHANGES Log Message: Long double related changes. To generate a diff of this commit: cvs rdiff -u -r1.1863 -r1.1864 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1863 src/doc/CHANGES:1.1864 --- src/doc/CHANGES:1.1863 Fri Nov 29 08:49:26 2013 +++ src/doc/CHANGES Fri Nov 29 13:36:42 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1863 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1864 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -302,8 +302,12 @@ Changes from NetBSD 6.0 to NetBSD 7.0: x68k: Support upto 1008 MB extended memory that is found on the XM6i emulator. [tsutsui 20131027] OpenSSH: Imported 6.4 [christos 20131108] + x86: Default rounding mode of the x87 changed to long double precision. + [joerg 2013] zless(1): Added via lastest version of zmore(1) from OpenBSD [pettai 20131112] + libm: Added basic long double support for elementary functions. + Most transcendent functions are stubbed out. [joerg 20131119] nvi(1): Upgrade to the latest git source [christos 20131122] MPC: Updated to MPC 1.0.1. [mrg 20131128] MPFR: Updated to MPFR 3.1.2. [mrg 20131128]
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/sh3el
Module Name:src Committed By: mrg Date: Fri Nov 29 13:48:15 UTC 2013 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/sh3el: gmp.h Log Message: fix definition of __GMP_CC. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.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/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.h:1.3 src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.h:1.4 --- src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.h:1.3 Fri Nov 29 08:03:42 2013 +++ src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.h Fri Nov 29 13:48:15 2013 @@ -2218,7 +2218,7 @@ enum }; /* Define CC and CFLAGS which were used to build this version of GMP */ -#define "gcc -std=gnu99" +#define __GMP_CC "gcc -std=gnu99" #define __GMP_CFLAGS "-O2 -pedantic" /* Major version number is the value of __GNU_MP__ too, above and in mp.h. */
CVS commit: src/external/lgpl3/gmp/lib/libgmp
Module Name:src
Committed By: martin
Date: Fri Nov 29 14:51:36 UTC 2013
Modified Files:
src/external/lgpl3/gmp/lib/libgmp: Makefile
Log Message:
Make warnings non-fatal on sparc64.
Warings reported upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/lgpl3/gmp/lib/libgmp/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/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.18 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.19
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.18 Fri Nov 29 08:03:41 2013
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Fri Nov 29 14:51:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/11/29 08:03:41 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2013/11/29 14:51:36 martin Exp $
.include
@@ -240,5 +240,8 @@ COPTS += -Wno-stack-protector
.if !empty(GMP_MACHINE_ARCH:M*arm*)
COPTS += -marm
.endif
+.if ${GMP_MACHINE_ARCH} == "sparc64"
+NOGCCERROR=yes
+.endif
CWARNFLAGS.clang+= -Wno-unused-value -Wno-tautological-compare
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Fri Nov 29 14:58:55 UTC 2013
Modified Files:
src/sys/kern: vfs_vnode.c
Log Message:
Change vrelel() to mark the vnode as changing after it has aquired
the vnode lock but before it calls VOP_INACTIVE().
Should fix the race between layer_node_find() trying to vget(, LK_NOWAIT)
a locked vnode when vrelel() marked it as changing and wants its lock.
PR kern/48411 (repeatable SMP crashes in amd64-current)
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/vfs_vnode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.26 src/sys/kern/vfs_vnode.c:1.27
--- src/sys/kern/vfs_vnode.c:1.26 Sat Nov 23 13:46:22 2013
+++ src/sys/kern/vfs_vnode.c Fri Nov 29 14:58:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.26 2013/11/23 13:46:22 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.27 2013/11/29 14:58:55 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.26 2013/11/23 13:46:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.27 2013/11/29 14:58:55 hannken Exp $");
#define _VFS_VNODE_PRIVATE
@@ -606,10 +606,6 @@ vrelel(vnode_t *vp, int flags)
}
KASSERT((vp->v_iflag & VI_XLOCK) == 0);
- if ((flags & VRELEL_CHANGING_SET) == 0) {
- KASSERT((vp->v_iflag & VI_CHANGING) == 0);
- vp->v_iflag |= VI_CHANGING;
- }
#ifdef DIAGNOSTIC
if ((vp->v_type == VBLK || vp->v_type == VCHR) &&
@@ -654,13 +650,14 @@ vrelel(vnode_t *vp, int flags)
*/
if (__predict_false(vtryrele(vp))) {
VOP_UNLOCK(vp);
-KASSERT((vp->v_iflag & VI_CHANGING) != 0);
-vp->v_iflag &= ~VI_CHANGING;
-cv_broadcast(&vp->v_cv);
+if ((flags & VRELEL_CHANGING_SET) != 0) {
+ KASSERT((vp->v_iflag & VI_CHANGING) != 0);
+ vp->v_iflag &= ~VI_CHANGING;
+ cv_broadcast(&vp->v_cv);
+}
mutex_exit(vp->v_interlock);
return;
}
- mutex_exit(vp->v_interlock);
defer = false;
} else if ((vp->v_iflag & VI_LAYER) != 0) {
/*
@@ -675,10 +672,10 @@ vrelel(vnode_t *vp, int flags)
error = vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT);
if (error != 0) {
defer = true;
-mutex_enter(vp->v_interlock);
} else {
defer = false;
}
+ mutex_enter(vp->v_interlock);
}
if (defer) {
@@ -687,18 +684,26 @@ vrelel(vnode_t *vp, int flags)
* clean it here. We donate it our last reference.
*/
KASSERT(mutex_owned(vp->v_interlock));
- KASSERT((vp->v_iflag & VI_CHANGING) != 0);
- vp->v_iflag &= ~VI_CHANGING;
+ if ((flags & VRELEL_CHANGING_SET) != 0) {
+KASSERT((vp->v_iflag & VI_CHANGING) != 0);
+vp->v_iflag &= ~VI_CHANGING;
+cv_broadcast(&vp->v_cv);
+ }
mutex_enter(&vrele_lock);
TAILQ_INSERT_TAIL(&vrele_list, vp, v_freelist);
if (++vrele_pending > (desiredvnodes >> 8))
cv_signal(&vrele_cv);
mutex_exit(&vrele_lock);
- cv_broadcast(&vp->v_cv);
mutex_exit(vp->v_interlock);
return;
}
+ if ((flags & VRELEL_CHANGING_SET) == 0) {
+ KASSERT((vp->v_iflag & VI_CHANGING) == 0);
+ vp->v_iflag |= VI_CHANGING;
+ }
+ mutex_exit(vp->v_interlock);
+
/*
* The vnode can gain another reference while being
* deactivated. If VOP_INACTIVE() indicates that
@@ -739,6 +744,11 @@ vrelel(vnode_t *vp, int flags)
vclean(vp);
}
KASSERT(vp->v_usecount > 0);
+ } else { /* vnode was already clean */
+ if ((flags & VRELEL_CHANGING_SET) == 0) {
+ KASSERT((vp->v_iflag & VI_CHANGING) == 0);
+ vp->v_iflag |= VI_CHANGING;
+ }
}
if (atomic_dec_uint_nv(&vp->v_usecount) != 0) {
CVS commit: src/external/bsd/nvi/dist/ip
Module Name:src
Committed By: christos
Date: Fri Nov 29 15:24:08 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/ip: ip_read.c
Log Message:
remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/ip/ip_read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/ip/ip_read.c
diff -u src/external/bsd/nvi/dist/ip/ip_read.c:1.5 src/external/bsd/nvi/dist/ip/ip_read.c:1.6
--- src/external/bsd/nvi/dist/ip/ip_read.c:1.5 Wed Nov 27 15:44:56 2013
+++ src/external/bsd/nvi/dist/ip/ip_read.c Fri Nov 29 10:24:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_read.c,v 1.5 2013/11/27 20:44:56 christos Exp $ */
+/* $NetBSD: ip_read.c,v 1.6 2013/11/29 15:24:08 christos Exp $ */
/*-
* Copyright (c) 1996
* Keith Bostic. All rights reserved.
@@ -207,7 +207,6 @@ ip_wevent(WIN *wp, SCR *sp, EVENT *evp,
static input_t
ip_read(SCR *sp, IP_PRIVATE *ipp, struct timeval *tp, int termread, int *nr)
{
- struct timeval poll;
GS *gp;
fd_set rdfd;
input_t rval;
@@ -228,8 +227,6 @@ ip_read(SCR *sp, IP_PRIVATE *ipp, struct
*a map sequence. If input exists, we fall into #2.
*/
FD_ZERO(&rdfd);
- poll.tv_sec = 0;
- poll.tv_usec = 0;
if (tp != NULL) {
FD_SET(fd, &rdfd);
switch (select(fd + 1, &rdfd, NULL, NULL, tp)) {
CVS commit: src/external/bsd/nvi/dist/common
Module Name:src
Committed By: christos
Date: Fri Nov 29 16:36:11 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/common: log1.c trace.c
Log Message:
fix compilation of log debugging
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/dist/common/log1.c \
src/external/bsd/nvi/dist/common/trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/common/log1.c
diff -u src/external/bsd/nvi/dist/common/log1.c:1.2 src/external/bsd/nvi/dist/common/log1.c:1.3
--- src/external/bsd/nvi/dist/common/log1.c:1.2 Fri Nov 22 10:52:05 2013
+++ src/external/bsd/nvi/dist/common/log1.c Fri Nov 29 11:36:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: log1.c,v 1.2 2013/11/22 15:52:05 christos Exp $ */
+/* $NetBSD: log1.c,v 1.3 2013/11/29 16:36:11 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -66,8 +66,8 @@ static const char sccsid[] = "Id: log.c,
static int log_cursor1 __P((SCR *, int));
static void log_err __P((SCR *, const char *, int));
-#if defined(DEBUG) && 0
-static void log_trace __P((SCR *, char *, db_recno_t, u_char *));
+#if defined(LOGDEBUG) && defined(TRACE)
+static void log_trace __P((SCR *, const char *, db_recno_t, u_char *));
#endif
/* Try and restart the log on failure, i.e. if we run out of memory. */
@@ -214,8 +214,8 @@ log_cursor1(SCR *sp, int type)
if (ep->log->put(ep->log, &key, &data, 0) == -1)
LOG_ERR;
-#if defined(DEBUG) && 0
- vtrace(sp, "%lu: %s: %u/%u\n", ep->l_cur,
+#if defined(LOGDEBUG) && defined(TRACE)
+ vtrace("%lu: %s: %u/%u\n", ep->l_cur,
type == LOG_CURSOR_INIT ? "log_cursor_init" : "log_cursor_end",
sp->lno, sp->cno);
#endif
@@ -310,30 +310,30 @@ log_line(SCR *sp, db_recno_t lno, u_int
if (ep->log->put(ep->log, &key, &data, 0) == -1)
LOG_ERR;
-#if defined(DEBUG) && 0
+#if defined(LOGDEBUG) && defined(TRACE)
switch (action) {
case LOG_LINE_APPEND_F:
- vtrace(sp, "%u: log_line: append_f: %lu {%u}\n",
+ vtrace("%u: log_line: append_f: %lu {%u}\n",
ep->l_cur, lno, len);
break;
case LOG_LINE_APPEND_B:
- vtrace(sp, "%u: log_line: append_b: %lu {%u}\n",
+ vtrace("%u: log_line: append_b: %lu {%u}\n",
ep->l_cur, lno, len);
break;
case LOG_LINE_DELETE_F:
- vtrace(sp, "%lu: log_line: delete_f: %lu {%u}\n",
+ vtrace("%lu: log_line: delete_f: %lu {%u}\n",
ep->l_cur, lno, len);
break;
case LOG_LINE_DELETE_B:
- vtrace(sp, "%lu: log_line: delete_b: %lu {%u}\n",
+ vtrace("%lu: log_line: delete_b: %lu {%u}\n",
ep->l_cur, lno, len);
break;
case LOG_LINE_RESET_F:
- vtrace(sp, "%lu: log_line: reset_f: %lu {%u}\n",
+ vtrace("%lu: log_line: reset_f: %lu {%u}\n",
ep->l_cur, lno, len);
break;
case LOG_LINE_RESET_B:
- vtrace(sp, "%lu: log_line: reset_b: %lu {%u}\n",
+ vtrace("%lu: log_line: reset_b: %lu {%u}\n",
ep->l_cur, lno, len);
break;
}
@@ -385,8 +385,8 @@ log_mark(SCR *sp, LMARK *lmp)
if (ep->log->put(ep->log, &key, &data, 0) == -1)
LOG_ERR;
-#if defined(DEBUG) && 0
- vtrace(sp, "%lu: mark %c: %lu/%u\n",
+#if defined(LOGDEBUG) && defined(TRACE)
+ vtrace("%lu: mark %c: %lu/%u\n",
ep->l_cur, lmp->name, lmp->lno, lmp->cno);
#endif
/* Reset high water mark. */
@@ -438,7 +438,7 @@ log_backward(SCR *sp, MARK *rp)
--ep->l_cur;
if (ep->log->get(ep->log, &key, &data, 0))
LOG_ERR;
-#if defined(DEBUG) && 0
+#if defined(LOGDEBUG) && defined(TRACE)
log_trace(sp, "log_backward", ep->l_cur, data.data);
#endif
switch (*(p = (u_char *)data.data)) {
@@ -547,7 +547,7 @@ log_setline(SCR *sp)
--ep->l_cur;
if (ep->log->get(ep->log, &key, &data, 0))
LOG_ERR;
-#if defined(DEBUG) && 0
+#if defined(LOGDEBUG) && defined(TRACE)
log_trace(sp, "log_setline", ep->l_cur, data.data);
#endif
switch (*(p = (u_char *)data.data)) {
@@ -642,7 +642,7 @@ log_forward(SCR *sp, MARK *rp)
++ep->l_cur;
if (ep->log->get(ep->log, &key, &data, 0))
LOG_ERR;
-#if defined(DEBUG) && 0
+#if defined(LOGDEBUG) && defined(TRACE)
log_trace(sp, "log_forward", ep->l_cur, data.data);
#endif
switch (*(p = (u_char *)data.data)) {
@@ -721,11 +721,11 @@ log_err(SCR *sp, const char *file, int l
msgq(sp, M_ERR, "267|Log restarted");
}
-#if defined(DEBUG) && 0
+#if defined(LOGDEBUG) && defined(TRACE)
static void
log_trace(sp, msg, rno, p)
SCR *sp;
- char *msg;
+ const char *msg;
db_recno_t rno;
u_char *p;
{
@@ -736,40 +736,39 @@ log_trace(sp, msg, rno, p)
switch (*p) {
case LOG_CURSOR_INIT:
memmove(&m, p + sizeof(u_char), sizeof(MARK));
- vtrace(sp, "%lu: %s: C_INIT: %u/%u\n", rno, msg, m.lno, m.cno);
+ vtrace("%lu: %s: C_INIT: %u/%u\n", rno, msg, m.lno, m.cno);
break;
case LOG_CURSOR_END:
memmove(&m, p + sizeof(u_char), sizeof(MARK));
- vtrace(sp, "%lu: %s: C_END: %u/%u\n", rno, msg, m.lno, m.cno);
+ vt
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: christos
Date: Fri Nov 29 16:37:36 UTC 2013
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
fix tracing.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/usr.bin/nvi/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/bsd/nvi/usr.bin/nvi/Makefile
diff -u src/external/bsd/nvi/usr.bin/nvi/Makefile:1.1 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.2
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.1 Fri Nov 22 11:00:45 2013
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Fri Nov 29 11:37:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/22 16:00:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/11/29 16:37:35 christos Exp $
.include
@@ -8,6 +8,7 @@ CWARNFLAGS.clang+= -Wno-uninitialized -W
CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. -DGTAGS -DUSE_BUNDLED_DB
#DBG=-g
+#CPPFLAGS+=-DLOGDEBUG -DTRACE
#CWARNFLAGS+=-Wno-parentheses -Wno-unused -Wno-missing-prototypes
#.if defined(HAVE_GCC)
@@ -30,7 +31,7 @@ SRCS= api.c cl_bsd.c cl_funcs.c cl_main.
ex_write.c ex_yank.c ex_z.c exf.c getc.c gs.c \
ip_funcs.c ip_read.c ip_screen.c ip_term.c \
ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c \
- key.c log1.c \
+ key.c log1.c trace.c \
main.c mark.c msg.c nothread.c options.c options_f.c put.c recover.c \
screen.c search.c seq.c util.c v_at.c v_ch.c v_cmd.c v_delete.c \
v_event.c v_ex.c v_increment.c v_init.c v_itxt.c v_left.c v_mark.c \
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Nov 29 18:20:40 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: rcs-5.9.2 is out. To generate a diff of this commit: cvs rdiff -u -r1.1072 -r1.1073 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1072 src/doc/3RDPARTY:1.1073 --- src/doc/3RDPARTY:1.1072 Fri Nov 29 13:33:00 2013 +++ src/doc/3RDPARTY Fri Nov 29 18:20:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1072 2013/11/29 13:33:00 joerg Exp $ +# $NetBSD: 3RDPARTY,v 1.1073 2013/11/29 18:20:40 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1096,7 +1096,7 @@ using the version found in 2.4.1. Package: rcs Version: 5.7 -Current Vers: 5.9.1 +Current Vers: 5.9.2 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/rcs/ Mailing List: bug-gnu-ut...@gnu.org
CVS commit: src/external/bsd/nvi/dist/common
Module Name:src
Committed By: christos
Date: Fri Nov 29 21:57:31 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/common: vi_db1.c
Log Message:
make the debugging code work again.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/common/vi_db1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/common/vi_db1.c
diff -u src/external/bsd/nvi/dist/common/vi_db1.c:1.3 src/external/bsd/nvi/dist/common/vi_db1.c:1.4
--- src/external/bsd/nvi/dist/common/vi_db1.c:1.3 Mon Nov 25 17:43:46 2013
+++ src/external/bsd/nvi/dist/common/vi_db1.c Fri Nov 29 16:57:31 2013
@@ -120,30 +120,30 @@ db_get(SCR *sp, db_recno_t lno, u_int32_
l1 = TAILQ_FIRST(&sp->tiq)->lno;
l2 = TAILQ_LAST(&sp->tiq, _texth)->lno;
if (l1 <= lno && l2 >= lno) {
-#if defined(DEBUG) && 0
- vtrace(sp,
+#if defined(DBDEBUG) && defined(TRACE)
+ vtrace(
"retrieve TEXT buffer line %lu\n", (u_long)lno);
-#endif
- for (tp = TAILQ_FIRST(&sp->tiq);
- tp->lno != lno; tp = TAILQ_NEXT(tp, q));
- if (lenp != NULL)
-*lenp = tp->len;
- if (pp != NULL)
-*pp = tp->lb;
- return (0);
- }
- /*
- * Adjust the line number for the number of lines used
- * by the text input buffers.
- */
- if (lno > l2)
- lno -= l2 - l1;
- }
+#endif
+ for (tp = TAILQ_FIRST(&sp->tiq);
+tp->lno != lno; tp = TAILQ_NEXT(tp, q));
+ if (lenp != NULL)
+*lenp = tp->len;
+ if (pp != NULL)
+*pp = tp->lb;
+ return (0);
+ }
+ /*
+ * Adjust the line number for the number of lines used
+ * by the text input buffers.
+ */
+ if (lno > l2)
+ lno -= l2 - l1;
+ }
- /* Look-aside into the cache, and see if the line we want is there. */
- if (lno == sp->c_lno) {
-#if defined(DEBUG) && 0
- vtrace(sp, "retrieve cached line %lu\n", (u_long)lno);
+ /* Look-aside into the cache, and see if the line we want is there. */
+ if (lno == sp->c_lno) {
+#if defined(DBDEBUG) && defined(TRACE)
+ vtrace("retrieve cached line %lu\n", (u_long)lno);
#endif
if (lenp != NULL)
*lenp = sp->c_len;
@@ -198,8 +198,8 @@ err3: if (lenp != NULL)
sp->c_lno = lno;
sp->c_len = wlen;
-#if defined(DEBUG) && 0
- vtrace(sp, "retrieve DB line %lu\n", (u_long)lno);
+#if defined(DBDEBUG) && defined(TRACE)
+ vtrace("retrieve DB line %lu\n", (u_long)lno);
#endif
if (lenp != NULL)
*lenp = wlen;
@@ -220,8 +220,8 @@ db_delete(SCR *sp, db_recno_t lno)
DBT key;
EXF *ep;
-#if defined(DEBUG) && 0
- vtrace(sp, "delete line %lu\n", (u_long)lno);
+#if defined(DBDEBUG) && defined(TRACE)
+ vtrace("delete line %lu\n", (u_long)lno);
#endif
/* Check for no underlying file. */
if ((ep = sp->ep) == NULL) {
@@ -285,8 +285,8 @@ db_append(SCR *sp, int update, db_recno_
size_t flen;
int rval;
-#if defined(DEBUG) && 0
- vtrace(sp, "append to %lu: len %u {%.*s}\n", lno, len, MIN(len, 20), p);
+#if defined(DBDEBUG) && defined(TRACE)
+ vtrace("append to %lu: len %u {%.*s}\n", lno, len, MIN(len, 20), p);
#endif
/* Check for no underlying file. */
if ((ep = sp->ep) == NULL) {
@@ -360,8 +360,8 @@ db_insert(SCR *sp, db_recno_t lno, CHAR_
size_t flen;
int rval;
-#if defined(DEBUG) && 0
- vtrace(sp, "insert before %lu: len %lu {%.*s}\n",
+#if defined(DBDEBUG) && defined(TRACE)
+ vtrace("insert before %lu: len %lu {%.*s}\n",
(u_long)lno, (u_long)len, MIN(len, 20), p);
#endif
/* Check for no underlying file. */
@@ -426,8 +426,8 @@ db_set(SCR *sp, db_recno_t lno, CHAR_T *
const char *fp;
size_t flen;
-#if defined(DEBUG) && 0
- vtrace(sp, "replace line %lu: len %lu {%.*s}\n",
+#if defined(DBDEBUG) && defined(TRACE)
+ vtrace("replace line %lu: len %lu {%.*s}\n",
(u_long)lno, (u_long)len, MIN(len, 20), p);
#endif
/* Check for no underlying file. */
CVS commit: src/lib/libm/src
Module Name:src
Committed By: joerg
Date: Fri Nov 29 22:16:10 UTC 2013
Modified Files:
src/lib/libm/src: s_fabs.c s_fabsl.c s_fmax.c s_fmaxl.c s_fmin.c
s_fminl.c
Log Message:
Use normal style for checking for long double support. Add missing
aliases for fminl and fmaxl, fabsl is here just for symmetry.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libm/src/s_fabs.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/s_fabsl.c src/lib/libm/src/s_fmax.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_fmaxl.c \
src/lib/libm/src/s_fminl.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_fmin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_fabs.c
diff -u src/lib/libm/src/s_fabs.c:1.10 src/lib/libm/src/s_fabs.c:1.11
--- src/lib/libm/src/s_fabs.c:1.10 Sun May 26 22:01:55 2002
+++ src/lib/libm/src/s_fabs.c Fri Nov 29 22:16:10 2013
@@ -12,7 +12,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_fabs.c,v 1.10 2002/05/26 22:01:55 wiz Exp $");
+__RCSID("$NetBSD: s_fabs.c,v 1.11 2013/11/29 22:16:10 joerg Exp $");
#endif
/*
@@ -22,6 +22,10 @@ __RCSID("$NetBSD: s_fabs.c,v 1.10 2002/0
#include "math.h"
#include "math_private.h"
+#ifndef __HAVE_LONG_DOUBLE
+__strong_alias(fabsl, fabs)
+#endif
+
double
fabs(double x)
{
Index: src/lib/libm/src/s_fabsl.c
diff -u src/lib/libm/src/s_fabsl.c:1.2 src/lib/libm/src/s_fabsl.c:1.3
--- src/lib/libm/src/s_fabsl.c:1.2 Fri Sep 17 20:39:39 2010
+++ src/lib/libm/src/s_fabsl.c Fri Nov 29 22:16:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: s_fabsl.c,v 1.2 2010/09/17 20:39:39 christos Exp $ */
+/* $NetBSD: s_fabsl.c,v 1.3 2013/11/29 22:16:10 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: s_fabsl.c,v 1.2 2010/09/17 20:39:39 christos Exp $");
+__RCSID("$NetBSD: s_fabsl.c,v 1.3 2013/11/29 22:16:10 joerg Exp $");
#include
#include
@@ -35,7 +35,7 @@ __RCSID("$NetBSD: s_fabsl.c,v 1.2 2010/0
* fabsl(long double x)
* This function returns the absolute value of its argumetn x, |x|.
*/
-#ifdef EXT_EXP_INFNAN
+#ifdef __HAVE_LONG_DOUBLE
long double
fabsl(long double x)
{
Index: src/lib/libm/src/s_fmax.c
diff -u src/lib/libm/src/s_fmax.c:1.2 src/lib/libm/src/s_fmax.c:1.3
--- src/lib/libm/src/s_fmax.c:1.2 Mon Mar 8 01:05:20 2010
+++ src/lib/libm/src/s_fmax.c Fri Nov 29 22:16:10 2013
@@ -25,7 +25,7 @@
*/
#include
-__RCSID("$NetBSD: s_fmax.c,v 1.2 2010/03/08 01:05:20 snj Exp $");
+__RCSID("$NetBSD: s_fmax.c,v 1.3 2013/11/29 22:16:10 joerg Exp $");
#ifdef notdef
__FBSDID("$FreeBSD: src/lib/msun/src/s_fmax.c,v 1.1 2004/06/30 07:04:01 das Exp $");
#endif
@@ -34,6 +34,10 @@ __FBSDID("$FreeBSD: src/lib/msun/src/s_f
#include
+#ifndef __HAVE_LONG_DOUBLE
+__strong_alias(fmaxl, fmax)
+#endif
+
double
fmax(double x, double y)
{
Index: src/lib/libm/src/s_fmaxl.c
diff -u src/lib/libm/src/s_fmaxl.c:1.3 src/lib/libm/src/s_fmaxl.c:1.4
--- src/lib/libm/src/s_fmaxl.c:1.3 Mon Jul 4 11:46:41 2011
+++ src/lib/libm/src/s_fmaxl.c Fri Nov 29 22:16:10 2013
@@ -25,7 +25,7 @@
*/
#include
-__RCSID("$NetBSD: s_fmaxl.c,v 1.3 2011/07/04 11:46:41 mrg Exp $");
+__RCSID("$NetBSD: s_fmaxl.c,v 1.4 2013/11/29 22:16:10 joerg Exp $");
#ifdef notdef
__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
#endif
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD: src/lib/msun/src/s_f
#include
#include
-#ifdef EXT_EXP_INFNAN
+#ifdef __HAVE_LONG_DOUBLE
long double
fmaxl(long double x, long double y)
{
Index: src/lib/libm/src/s_fminl.c
diff -u src/lib/libm/src/s_fminl.c:1.3 src/lib/libm/src/s_fminl.c:1.4
--- src/lib/libm/src/s_fminl.c:1.3 Mon Jul 4 11:46:41 2011
+++ src/lib/libm/src/s_fminl.c Fri Nov 29 22:16:10 2013
@@ -25,7 +25,7 @@
*/
#include
-__RCSID("$NetBSD: s_fminl.c,v 1.3 2011/07/04 11:46:41 mrg Exp $");
+__RCSID("$NetBSD: s_fminl.c,v 1.4 2013/11/29 22:16:10 joerg Exp $");
#ifdef notdef
__FBSDID("$FreeBSD: src/lib/msun/src/s_fminl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
#endif
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD: src/lib/msun/src/s_f
#include
#include
-#ifdef EXT_EXP_INFNAN
+#ifdef __HAVE_LONG_DOUBLE
long double
fminl(long double x, long double y)
{
Index: src/lib/libm/src/s_fmin.c
diff -u src/lib/libm/src/s_fmin.c:1.1 src/lib/libm/src/s_fmin.c:1.2
--- src/lib/libm/src/s_fmin.c:1.1 Sun Oct 4 22:04:30 2009
+++ src/lib/libm/src/s_fmin.c Fri Nov 29 22:16:10 2013
@@ -25,7 +25,7 @@
*/
#include
-__RCSID("$NetBSD: s_fmin.c,v 1.1 2009/10/04 22:04:30 christos Exp $");
+__RCSID("$NetBSD: s_fmin.c,v 1.2 2013/11/29 22:16:10 joerg Exp $");
#ifdef notdef
__FBSDID("$FreeBSD: src/lib/msun/src/s_fmin.c,v 1.1 2004/06/30 07:04:01 das Exp $");
#endif
@@ -34,6 +34,10 @@ __FBSDID("$FreeBSD: src/lib/msun/src/s_f
#include
+#ifndef __HAVE_LONG_DOUBLE
+__strong_al
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: joerg
Date: Fri Nov 29 22:15:26 UTC 2013
Modified Files:
src/lib/libc/gen: fabs_ieee754.c
Log Message:
Add fabsl alias if necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/fabs_ieee754.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/fabs_ieee754.c
diff -u src/lib/libc/gen/fabs_ieee754.c:1.2 src/lib/libc/gen/fabs_ieee754.c:1.3
--- src/lib/libc/gen/fabs_ieee754.c:1.2 Fri Sep 10 16:32:35 2010
+++ src/lib/libc/gen/fabs_ieee754.c Fri Nov 29 22:15:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fabs_ieee754.c,v 1.2 2010/09/10 16:32:35 matt Exp $ */
+/* $NetBSD: fabs_ieee754.c,v 1.3 2013/11/29 22:15:26 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fabs_ieee754.c,v 1.2 2010/09/10 16:32:35 matt Exp $");
+__RCSID("$NetBSD: fabs_ieee754.c,v 1.3 2013/11/29 22:15:26 joerg Exp $");
#endif
#include
@@ -41,6 +41,10 @@ __RCSID("$NetBSD: fabs_ieee754.c,v 1.2 2
* 7.12.3.6 fabs - return the absolute value of the argument
* IEEE 754 double-precision version
*/
+#ifndef __HAVE_LONG_DOUBLE
+__strong_alias(fabsl, fabs)
+#endif
+
double
fabs(double x)
{
CVS commit: src/external/bsd/nvi
Module Name:src
Committed By: christos
Date: Fri Nov 29 22:56:19 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/common: dbinternal.h vi_db.c vi_db.h
src/external/bsd/nvi/usr.bin/nvi: Makefile config.h port.h
Added Files:
src/external/bsd/nvi/dist/common: db1.c
Log Message:
Bring back the compatibility db3->db1 code from the old vi.
This is selected with -DUSE_DB1 in the Makefile. By default
use use the db1 specific code from the current nvi which is
enabled using -DUSE_BUNDLED_DB. Unfortunately recovery seems
to be broken for both.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/nvi/dist/common/db1.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/dist/common/dbinternal.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/common/vi_db.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/dist/common/vi_db.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/usr.bin/nvi/Makefile \
src/external/bsd/nvi/usr.bin/nvi/config.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/usr.bin/nvi/port.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/bsd/nvi/dist/common/dbinternal.h
diff -u src/external/bsd/nvi/dist/common/dbinternal.h:1.1 src/external/bsd/nvi/dist/common/dbinternal.h:1.2
--- src/external/bsd/nvi/dist/common/dbinternal.h:1.1 Fri Nov 22 10:52:05 2013
+++ src/external/bsd/nvi/dist/common/dbinternal.h Fri Nov 29 17:56:19 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: dbinternal.h,v 1.1 2013/11/22 15:52:05 christos Exp $ */
-#ifndef db_env_create
+/* $NetBSD: dbinternal.h,v 1.2 2013/11/29 22:56:19 christos Exp $ */
+#if !defined(db_env_create) || defined(USE_DB1)
int db_env_create(DB_ENV **, u_int32_t);
#endif
int db_create(DB **, DB_ENV *, u_int32_t);
Index: src/external/bsd/nvi/dist/common/vi_db.c
diff -u src/external/bsd/nvi/dist/common/vi_db.c:1.4 src/external/bsd/nvi/dist/common/vi_db.c:1.5
--- src/external/bsd/nvi/dist/common/vi_db.c:1.4 Wed Nov 27 22:14:28 2013
+++ src/external/bsd/nvi/dist/common/vi_db.c Fri Nov 29 17:56:19 2013
@@ -23,11 +23,14 @@ static const char sccsid[] = "Id: db.c,v
#include
#include
#include
+#include
+#include
#include "common.h"
+#include "dbinternal.h"
#include "../vi/vi.h"
-static int append __P((SCR*, db_recno_t, CHAR_T*, size_t, lnop_t, int));
+static int append __P((SCR*, db_recno_t, const CHAR_T*, size_t, lnop_t, int));
/*
* db_eget --
@@ -87,7 +90,7 @@ db_get(SCR *sp, db_recno_t lno, u_int32_
EXF *ep;
TEXT *tp;
db_recno_t l1, l2;
- CHAR_T *wp;
+ const CHAR_T *wp;
size_t wlen;
size_t nlen;
@@ -275,12 +278,12 @@ db_delete(SCR *sp, db_recno_t lno)
*line
*/
static int
-append(SCR *sp, db_recno_t lno, CHAR_T *p, size_t len, lnop_t op, int update)
+append(SCR *sp, db_recno_t lno, const CHAR_T *p, size_t len, lnop_t op, int update)
{
DBT data, key;
DBC *dbcp_put;
EXF *ep;
- char *fp;
+ const char *fp;
size_t flen;
int rval;
@@ -312,7 +315,7 @@ append(SCR *sp, db_recno_t lno, CHAR_T *
if ((sp->db_error = dbcp_put->c_get(dbcp_put, &key, &data, DB_SET)) != 0)
goto err2;
- data.data = fp;
+ data.data = __UNCONST(fp);
data.size = flen;
if ((sp->db_error = dbcp_put->c_put(dbcp_put, &key, &data, DB_AFTER)) != 0) {
err2:
@@ -329,7 +332,7 @@ err2:
if (sp->db_error != DB_NOTFOUND)
goto err2;
- data.data = fp;
+ data.data = __UNCONST(fp);
data.size = flen;
if ((sp->db_error = ep->db->put(ep->db, NULL, &key, &data, DB_APPEND)) != 0) {
goto err2;
@@ -337,7 +340,7 @@ err2:
} else {
key.data = &lno;
key.size = sizeof(lno);
- data.data = fp;
+ data.data = __UNCONST(fp);
data.size = flen;
if ((sp->db_error = dbcp_put->c_put(dbcp_put, &key, &data, DB_BEFORE)) != 0) {
goto err2;
@@ -419,7 +422,7 @@ db_set(SCR *sp, db_recno_t lno, CHAR_T *
{
DBT data, key;
EXF *ep;
- char *fp;
+ const char *fp;
size_t flen;
#if defined(DEBUG) && 0
@@ -446,7 +449,7 @@ db_set(SCR *sp, db_recno_t lno, CHAR_T *
key.data = &lno;
key.size = sizeof(lno);
memset(&data, 0, sizeof(data));
- data.data = fp;
+ data.data = __UNCONST(fp);
data.size = flen;
if ((sp->db_error = ep->db->put(ep->db, NULL, &key, &data, 0)) != 0) {
msgq(sp, M_DBERR, "006|unable to store line %lu", (u_long)lno);
@@ -514,7 +517,7 @@ db_last(SCR *sp, db_recno_t *lnop)
DBC *dbcp;
EXF *ep;
db_recno_t lno;
- CHAR_T *wp;
+ const CHAR_T *wp;
size_t wlen;
/* Check for no underlying file. */
@@ -530,8 +533,8 @@ db_last(SCR *sp, db_recno_t *lnop)
if (ep->c_nlines != OOBLNO) {
*lnop = ep->c_nlines;
if (F_ISSET(sp, SC_TINPUT))
- *lnop += TAILQ_LAST&sp->tiq, _texth)->lno -
- TAILQ_FIRST&sp->tiq)->lno;
+ *lnop += TAILQ_LAST(&sp->tiq, _texth)->lno -
+ TAILQ_FIRST(&sp->tiq)->lno;
return (0);
}
@@ -648,6 +651,8 @@ update_cache(SCR *sp, lnop_t op, db_recn
if (lno == scrp->c_lno)
scrp->c_lno = OOBLNO;
CVS commit: src/usr.sbin/tpctl
Module Name:src
Committed By: joerg
Date: Fri Nov 29 23:01:06 UTC 2013
Modified Files:
src/usr.sbin/tpctl: main.c
Log Message:
Mark usage as dead.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/tpctl/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/tpctl/main.c
diff -u src/usr.sbin/tpctl/main.c:1.5 src/usr.sbin/tpctl/main.c:1.6
--- src/usr.sbin/tpctl/main.c:1.5 Tue Apr 28 10:57:24 2009
+++ src/usr.sbin/tpctl/main.c Fri Nov 29 23:01:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 2009/04/28 10:57:24 nonaka Exp $ */
+/* $NetBSD: main.c,v 1.6 2013/11/29 23:01:05 joerg Exp $ */
/*-
* Copyright (c) 2002 TAKEMRUA Shin
@@ -49,7 +49,7 @@
#ifndef lint
#include
-__RCSID("$NetBSD: main.c,v 1.5 2009/04/28 10:57:24 nonaka Exp $");
+__RCSID("$NetBSD: main.c,v 1.6 2013/11/29 23:01:05 joerg Exp $");
#endif /* not lint */
void load_data(const char *, struct tpctl_data *);
@@ -62,7 +62,7 @@ int opt_verbose;
int opt_noupdate;
int opt_forceupdate;
-static void
+static __dead void
usage(void)
{
CVS commit: src/lib/csu/common
Module Name:src
Committed By: joerg
Date: Fri Nov 29 23:00:49 UTC 2013
Modified Files:
src/lib/csu/common: crtbegin.c
Log Message:
Include crtbegin.h first to make it possible to build with the stricter
attribute consistency checks in clang.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/lib/csu/common/crtbegin.c:1.6
--- src/lib/csu/common/crtbegin.c:1.5 Mon Aug 26 14:20:53 2013
+++ src/lib/csu/common/crtbegin.c Fri Nov 29 23:00:48 2013
@@ -27,7 +27,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: crtbegin.c,v 1.5 2013/08/26 14:20:53 matt Exp $");
+__RCSID("$NetBSD: crtbegin.c,v 1.6 2013/11/29 23:00:48 joerg Exp $");
+
+#include "crtbegin.h"
typedef void (*fptr_t)(void);
@@ -131,5 +133,3 @@ __do_global_dtors_aux(void)
#endif
}
#endif /* !__ARM_EABI__ || SHARED */
-
-#include "crtbegin.h"
CVS commit: src/external/gpl3/binutils/dist/ld
Module Name:src
Committed By: joerg
Date: Fri Nov 29 23:01:54 UTC 2013
Modified Files:
src/external/gpl3/binutils/dist/ld: configure.tgt
src/external/gpl3/binutils/dist/ld/emulparams: armelf_nbsd.sh
armelf_nbsd_eabi.sh
src/external/gpl3/binutils/dist/ld/emultempl: elf32.em
Log Message:
Allow gnueabi to be matched for the relevant cases as well.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/dist/ld/configure.tgt
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/binutils/dist/ld/emultempl/elf32.em
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.11 src/external/gpl3/binutils/dist/ld/configure.tgt:1.12
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.11 Sun Sep 29 14:03:31 2013
+++ src/external/gpl3/binutils/dist/ld/configure.tgt Fri Nov 29 23:01:54 2013
@@ -64,10 +64,10 @@ arm-*-coff) targ_emul=armcoff ;;
arm-*-freebsd* | arm-*-kfreebsd*-gnu)
targ_emul=armelf_fbsd
targ_extra_emuls="armelf" ;;
-arm*eb-*-netbsdelf*-eabi*)
+arm*eb-*-netbsdelf*-*eabi*)
targ_emul=armelfb_nbsd_eabi;
targ_extra_emuls="armelf_nbsd_eabi armelf armnbsd" ;;
-arm*-*-netbsdelf*-eabi*)
+arm*-*-netbsdelf*-*eabi*)
targ_emul=armelf_nbsd_eabi;
targ_extra_emuls="armelfb_nbsd_eabi armelf armnbsd" ;;
arm*eb-*-netbsdelf*) targ_emul=armelfb_nbsd;
Index: src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh:1.3 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh:1.4
--- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh:1.3 Mon Aug 13 02:52:34 2012
+++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh Fri Nov 29 23:01:54 2013
@@ -8,7 +8,7 @@ unset STACK_ADDR
unset EMBEDDED
case "$target" in
- arm*-*-netbsdelf*-eabi*)
+ arm*-*-netbsdelf*-*eabi*)
LIB_PATH='=/usr/lib/oabi'
;;
esac
Index: src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.2 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.3
--- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.2 Mon Aug 13 02:52:34 2012
+++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh Fri Nov 29 23:01:54 2013
@@ -10,7 +10,7 @@ OTHER_READONLY_SECTIONS="
unset LIB_PATH
case "$target" in
- arm*-*-netbsdelf*-eabi*)
+ arm*-*-netbsdelf*-*eabi*)
;;
arm*-*-netbsdelf*)
LIB_PATH='=/usr/lib/eabi'
Index: src/external/gpl3/binutils/dist/ld/emultempl/elf32.em
diff -u src/external/gpl3/binutils/dist/ld/emultempl/elf32.em:1.9 src/external/gpl3/binutils/dist/ld/emultempl/elf32.em:1.10
--- src/external/gpl3/binutils/dist/ld/emultempl/elf32.em:1.9 Thu Nov 14 01:12:14 2013
+++ src/external/gpl3/binutils/dist/ld/emultempl/elf32.em Fri Nov 29 23:01:54 2013
@@ -72,6 +72,9 @@ EOF
if [ "x${USE_LIBPATH}" = xyes ] ; then
case ${target} in
+*-*-netbsd*)
+;;
+
*-*-linux-* | *-*-k*bsd*-* | *-*-gnu*)
fragment <
CVS commit: src/external/bsd/elftosb/dist
Module Name:src
Committed By: joerg
Date: Fri Nov 29 23:02:26 UTC 2013
Modified Files:
src/external/bsd/elftosb/dist/common: Logging.cpp
src/external/bsd/elftosb/dist/elftosb2: ElftosbAST.cpp elftosb.cpp
src/external/bsd/elftosb/dist/keygen: keygen.cpp
src/external/bsd/elftosb/dist/sbtool: sbtool.cpp
Log Message:
Fix format string use.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/dist/common/Logging.cpp
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp \
src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/dist/keygen/keygen.cpp
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/dist/sbtool/sbtool.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/elftosb/dist/common/Logging.cpp
diff -u src/external/bsd/elftosb/dist/common/Logging.cpp:1.1 src/external/bsd/elftosb/dist/common/Logging.cpp:1.2
--- src/external/bsd/elftosb/dist/common/Logging.cpp:1.1 Thu Nov 15 19:49:13 2012
+++ src/external/bsd/elftosb/dist/common/Logging.cpp Fri Nov 29 23:02:26 2013
@@ -86,6 +86,6 @@ void Log::log(Logger::log_level_t level,
void StdoutLogger::_log(const char * msg)
{
- printf(msg);
+ printf("%s", msg);
}
Index: src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp
diff -u src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp:1.1 src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp:1.2
--- src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp:1.1 Thu Nov 15 19:49:14 2012
+++ src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp Fri Nov 29 23:02:26 2013
@@ -1201,7 +1201,7 @@ void SectionMatchListASTNode::printTree(
}
printIndent(indent+1);
- printf("source: ", m_source->c_str());
+ printf("source: ");
if (m_source)
{
printf("%s\n", m_source->c_str());
@@ -1283,7 +1283,7 @@ void SymbolASTNode::printTree(int indent
printf("%s(", nodeName().c_str());
if (source)
{
- printf(source);
+ printf("%s", source);
}
else
{
@@ -1292,7 +1292,7 @@ void SymbolASTNode::printTree(int indent
printf(":");
if (symbol)
{
- printf(symbol);
+ printf("%s", symbol);
}
else
{
Index: src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp
diff -u src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp:1.1 src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp:1.2
--- src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp:1.1 Thu Nov 15 19:49:14 2012
+++ src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp Fri Nov 29 23:02:26 2013
@@ -317,7 +317,7 @@ public:
void printUsage(Options & options)
{
options.usage(std::cout, "files...");
- printf(k_usageText, k_toolName);
+ printf("%s", k_usageText);
}
/*!
Index: src/external/bsd/elftosb/dist/keygen/keygen.cpp
diff -u src/external/bsd/elftosb/dist/keygen/keygen.cpp:1.1 src/external/bsd/elftosb/dist/keygen/keygen.cpp:1.2
--- src/external/bsd/elftosb/dist/keygen/keygen.cpp:1.1 Thu Nov 15 19:49:14 2012
+++ src/external/bsd/elftosb/dist/keygen/keygen.cpp Fri Nov 29 23:02:26 2013
@@ -177,7 +177,7 @@ public:
void printUsage(Options & options)
{
options.usage(std::cout, "key-files...");
- printf(k_usageText, k_toolName);
+ printf("%s", k_usageText);
}
/*!
Index: src/external/bsd/elftosb/dist/sbtool/sbtool.cpp
diff -u src/external/bsd/elftosb/dist/sbtool/sbtool.cpp:1.1 src/external/bsd/elftosb/dist/sbtool/sbtool.cpp:1.2
--- src/external/bsd/elftosb/dist/sbtool/sbtool.cpp:1.1 Thu Nov 15 19:49:14 2012
+++ src/external/bsd/elftosb/dist/sbtool/sbtool.cpp Fri Nov 29 23:02:26 2013
@@ -212,7 +212,7 @@ public:
void printUsage(Options & options)
{
options.usage(std::cout, "sb-file");
- printf(k_usageText, k_toolName);
+ printf("%s", k_usageText);
}
/*!
CVS commit: src/external/bsd/elftosb
Module Name:src
Committed By: joerg
Date: Fri Nov 29 23:02:49 UTC 2013
Modified Files:
src/external/bsd/elftosb: Makefile.inc
Log Message:
Shut up a bunch of (valid) warnings from Clang.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/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/external/bsd/elftosb/Makefile.inc
diff -u src/external/bsd/elftosb/Makefile.inc:1.1 src/external/bsd/elftosb/Makefile.inc:1.2
--- src/external/bsd/elftosb/Makefile.inc:1.1 Thu Nov 15 19:49:12 2012
+++ src/external/bsd/elftosb/Makefile.inc Fri Nov 29 23:02:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2012/11/15 19:49:12 jkunz Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/11/29 23:02:49 joerg Exp $
.include
@@ -18,6 +18,9 @@ CPPFLAGS+= -I${DIST}/elftosb2
CPPFLAGS+= -DLinux
CWARNFLAGS+= -Wno-multichar
+CWARNFLAGS.clang+= -Wno-switch -Wno-error=delete-non-virtual-dtor \
+ -Wno-bitwise-op-parentheses -Wno-parentheses \
+ -Wno-tautological-compare
LIBISCXX= yes
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: wiz Date: Fri Nov 29 23:58:23 UTC 2013 Modified Files: src/usr.sbin/makemandb: apropos.1 makemandb.8 Log Message: Wording improvements from Abhinav Upadhyay To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/makemandb/apropos.1 cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/makemandb/makemandb.8 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/makemandb/apropos.1 diff -u src/usr.sbin/makemandb/apropos.1:1.13 src/usr.sbin/makemandb/apropos.1:1.14 --- src/usr.sbin/makemandb/apropos.1:1.13 Tue Apr 2 18:35:28 2013 +++ src/usr.sbin/makemandb/apropos.1 Fri Nov 29 23:58:23 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: apropos.1,v 1.13 2013/04/02 18:35:28 wiz Exp $ +.\" $NetBSD: apropos.1,v 1.14 2013/11/29 23:58:23 wiz Exp $ .\" .\" Copyright (c) 2011 Abhinav Upadhyay .\" All rights reserved. @@ -29,7 +29,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 2, 2013 +.Dd November 22, 2013 .Dt APROPOS 1 .Os .Sh NAME @@ -47,14 +47,13 @@ The .Nm utility performs a full text search over the complete content of all man pages. It uses the FTS engine of Sqlite to perform the search. -The database is created with the help of +The database is created with the help of the .Xr makemandb 8 utility. .Pp This implementation of the .Nm -utility is more sophisticated than the classical version of -.Nm . +utility is more sophisticated than the classical version. Like modern search applications, it uses advanced techniques like stemming and term weighting to rank the matching results in decreasing order of relevance. Index: src/usr.sbin/makemandb/makemandb.8 diff -u src/usr.sbin/makemandb/makemandb.8:1.6 src/usr.sbin/makemandb/makemandb.8:1.7 --- src/usr.sbin/makemandb/makemandb.8:1.6 Sat Oct 6 15:33:59 2012 +++ src/usr.sbin/makemandb/makemandb.8 Fri Nov 29 23:58:23 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: makemandb.8,v 1.6 2012/10/06 15:33:59 wiz Exp $ +.\" $NetBSD: makemandb.8,v 1.7 2013/11/29 23:58:23 wiz Exp $ .\" .\" Copyright (c) 2011 Abhinav Upadhyay .\" All rights reserved. @@ -29,12 +29,13 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 5, 2012 +.Dd November 23, 2013 .Dt MAKEMANDB 8 .Os .Sh NAME .Nm makemandb -.Nd parse the manual pages and build a search index over them +.Nd parse the manual pages and build a search index for +.Xr apropos 1 .Sh SYNOPSIS .Nm .Op Fl floQqv @@ -44,8 +45,8 @@ The .Nm utility traverses the directories containing man pages, parses the manual pages with the help of libmandoc and builds an Sqlite database -.Pa man.db -to support full text searches. +to support full text searches by +.Xr apropos 1 . It obtains the list of directories to traverse using the .Fl Ar path and
