CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: skrll Date: Fri Apr 17 07:15:03 UTC 2015 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_swap.S Log Message: Use the right register in previous. Spotted by matt@ To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 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.12 src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.13 --- src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.12 Fri Apr 17 07:03:40 2015 +++ src/common/lib/libc/arch/arm/atomic/atomic_swap.S Fri Apr 17 07:15:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_swap.S,v 1.12 2015/04/17 07:03:40 skrll Exp $ */ +/* $NetBSD: atomic_swap.S,v 1.13 2015/04/17 07:15:02 skrll Exp $ */ /*- * Copyright (c) 2007,2012 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ ENTRY_NP(__sync_lock_release_4) #ifdef _ARM_ARCH_7 dmb #else - mcr p15, 0, r3, c7, c10, 5 /* data memory barrier */ + mcr p15, 0, r1, c7, c10, 5 /* data memory barrier */ #endif strb r1, [r0] RET @@ -131,7 +131,7 @@ ENTRY_NP(__sync_lock_release_1) #ifdef _ARM_ARCH_7 dmb #else - mcr p15, 0, r3, c7, c10, 5 /* data memory barrier */ + mcr p15, 0, r1, c7, c10, 5 /* data memory barrier */ #endif strb r1, [r0] RET
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: skrll Date: Fri Apr 17 07:03:40 UTC 2015 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_swap.S Log Message: ARM ARM D7.3.2 - ensure all previous accesses are observed before the lock is cleared To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 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.11 src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.12 --- src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.11 Sat Jun 28 20:18:55 2014 +++ src/common/lib/libc/arch/arm/atomic/atomic_swap.S Fri Apr 17 07:03:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_swap.S,v 1.11 2014/06/28 20:18:55 joerg Exp $ */ +/* $NetBSD: atomic_swap.S,v 1.12 2015/04/17 07:03:40 skrll Exp $ */ /*- * Copyright (c) 2007,2012 The NetBSD Foundation, Inc. @@ -87,6 +87,11 @@ STRONG_ALIAS(_atomic_swap_ptr,_atomic_sw #if (!defined(_KERNEL) || defined(_RUMPKERNEL)) !defined(_STANDALONE) ENTRY_NP(__sync_lock_release_4) mov r1, #0 +#ifdef _ARM_ARCH_7 + dmb +#else + mcr p15, 0, r3, c7, c10, 5 /* data memory barrier */ +#endif strb r1, [r0] RET END(__sync_lock_release_4) @@ -123,6 +128,11 @@ STRONG_ALIAS(_atomic_swap_uchar,_atomic_ #if (!defined(_KERNEL) || defined(_RUMPKERNEL)) !defined(_STANDALONE) ENTRY_NP(__sync_lock_release_1) mov r1, #0 +#ifdef _ARM_ARCH_7 + dmb +#else + mcr p15, 0, r3, c7, c10, 5 /* data memory barrier */ +#endif strb r1, [r0] RET END(__sync_lock_release_1)
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: msaitoh Date: Fri Apr 17 08:46:26 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket 696. To generate a diff of this commit: cvs rdiff -u -r1.1.2.256 -r1.1.2.257 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.256 src/doc/CHANGES-7.0:1.1.2.257 --- src/doc/CHANGES-7.0:1.1.2.256 Thu Apr 16 09:30:35 2015 +++ src/doc/CHANGES-7.0 Fri Apr 17 08:46:25 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.256 2015/04/16 09:30:35 msaitoh Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.257 2015/04/17 08:46:25 msaitoh Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19708,3 +19708,9 @@ sys/arch/arm/omap/am335x_prcm.c 1.8 dmesg spam when running estd. [jmcneill, ticket #695] +sys/arch/arm/omap/if_cpsw.c 1.12 +sys/arch/arm/omap/if_cpswreg.h 1.5 + + Disable flow control with CPSW_SS FLOW_CONTROL register (cherry-picked + from FreeBSD driver). Resolves device timeout / watchdog issues. + [jmcneill, ticket #696]
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Fri Apr 17 09:35:06 UTC 2015 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: Ticket 1288. To generate a diff of this commit: cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/doc/CHANGES-6.1.6 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-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.38 src/doc/CHANGES-6.1.6:1.1.2.39 --- src/doc/CHANGES-6.1.6:1.1.2.38 Thu Apr 16 13:40:30 2015 +++ src/doc/CHANGES-6.1.6 Fri Apr 17 09:35:06 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.38 2015/04/16 13:40:30 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.39 2015/04/17 09:35:06 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -5697,3 +5697,8 @@ sys/arch/sparc/stand/ofwboot/Locore.c 1 Fix kernel loading failures from partitions started from over first 4GB of disks on sparc64. [nakayama, ticket #1285] + +libexec/ld.elf_so/rtld.c 1.176 + + lib/49813: Release mutex on error. + [joerg, ticket #1288]
CVS commit: [netbsd-6-1] src/libexec/ld.elf_so
Module Name:src
Committed By: msaitoh
Date: Fri Apr 17 09:31:55 UTC 2015
Modified Files:
src/libexec/ld.elf_so [netbsd-6-1]: rtld.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1288):
libexec/ld.elf_so/rtld.c: revision 1.176
lib/49813: Release mutex on error.
To generate a diff of this commit:
cvs rdiff -u -r1.155.2.1 -r1.155.2.1.2.1 src/libexec/ld.elf_so/rtld.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/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.155.2.1 src/libexec/ld.elf_so/rtld.c:1.155.2.1.2.1
--- src/libexec/ld.elf_so/rtld.c:1.155.2.1 Wed Oct 17 22:36:59 2012
+++ src/libexec/ld.elf_so/rtld.c Fri Apr 17 09:31:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $ */
+/* $NetBSD: rtld.c,v 1.155.2.1.2.1 2015/04/17 09:31:55 msaitoh Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $);
+__RCSID($NetBSD: rtld.c,v 1.155.2.1.2.1 2015/04/17 09:31:55 msaitoh Exp $);
#endif /* not lint */
#include sys/param.h
@@ -1219,7 +1219,7 @@ dladdr(const void *addr, Dl_info *info)
obj = _rtld_obj_from_addr(addr);
if (obj == NULL) {
_rtld_error(No shared object contains address);
- lookup_mutex_enter();
+ lookup_mutex_exit();
return 0;
}
info-dli_fname = obj-path;
CVS commit: [netbsd-6-0] src/libexec/ld.elf_so
Module Name:src
Committed By: msaitoh
Date: Fri Apr 17 09:33:01 UTC 2015
Modified Files:
src/libexec/ld.elf_so [netbsd-6-0]: rtld.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1288):
libexec/ld.elf_so/rtld.c: revision 1.176
lib/49813: Release mutex on error.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.155.6.1 src/libexec/ld.elf_so/rtld.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/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.155 src/libexec/ld.elf_so/rtld.c:1.155.6.1
--- src/libexec/ld.elf_so/rtld.c:1.155 Fri Nov 25 21:27:15 2011
+++ src/libexec/ld.elf_so/rtld.c Fri Apr 17 09:33:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.155 2011/11/25 21:27:15 joerg Exp $ */
+/* $NetBSD: rtld.c,v 1.155.6.1 2015/04/17 09:33:01 msaitoh Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rtld.c,v 1.155 2011/11/25 21:27:15 joerg Exp $);
+__RCSID($NetBSD: rtld.c,v 1.155.6.1 2015/04/17 09:33:01 msaitoh Exp $);
#endif /* not lint */
#include sys/param.h
@@ -1219,7 +1219,7 @@ dladdr(const void *addr, Dl_info *info)
obj = _rtld_obj_from_addr(addr);
if (obj == NULL) {
_rtld_error(No shared object contains address);
- lookup_mutex_enter();
+ lookup_mutex_exit();
return 0;
}
info-dli_fname = obj-path;
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: pgoyette Date: Fri Apr 17 09:50:00 UTC 2015 Modified Files: src/distrib/sets/lists/debug: mi Log Message: Add missing debug entry for bozohttpd To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.110 src/distrib/sets/lists/debug/mi:1.111 --- src/distrib/sets/lists/debug/mi:1.110 Thu Apr 9 17:56:30 2015 +++ src/distrib/sets/lists/debug/mi Fri Apr 17 09:50:00 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.110 2015/04/09 17:56:30 christos Exp $ +# $NetBSD: mi,v 1.111 2015/04/17 09:50:00 pgoyette Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -895,6 +895,7 @@ ./usr/libdata/debug/usr/libexec/atf-format.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/atf-killpg.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/atrun.debug comp-cron-debug debug +./usr/libdata/debug/usr/libexec/bozohttpd.debug comp-netutil-debug debug ./usr/libdata/debug/usr/libexec/cc1.debug comp-c-debug gcccmds,debug ./usr/libdata/debug/usr/libexec/cc1obj.debug comp-objc-debug gcccmds,debug ./usr/libdata/debug/usr/libexec/cc1plus.debug comp-cxx-debug gcccmds,debug
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: pgoyette Date: Fri Apr 17 10:00:02 UTC 2015 Modified Files: src/distrib/sets/lists/debug: mi Log Message: And mark the original httpd.debug as obsolete. Hello, mrg ... To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.111 src/distrib/sets/lists/debug/mi:1.112 --- src/distrib/sets/lists/debug/mi:1.111 Fri Apr 17 09:50:00 2015 +++ src/distrib/sets/lists/debug/mi Fri Apr 17 10:00:02 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.111 2015/04/17 09:50:00 pgoyette Exp $ +# $NetBSD: mi,v 1.112 2015/04/17 10:00:02 pgoyette Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -914,7 +914,7 @@ ./usr/libdata/debug/usr/libexec/getNAME.debug comp-man-debug !makemandb,debug ./usr/libdata/debug/usr/libexec/getty.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/libexec/hpropd.debug comp-krb5-debug kerberos,debug -./usr/libdata/debug/usr/libexec/httpd.debug comp-netutil-debug debug +./usr/libdata/debug/usr/libexec/httpd.debug comp-netutil-debug obsolete ./usr/libdata/debug/usr/libexec/identd.debug comp-netutil-debug debug ./usr/libdata/debug/usr/libexec/ipropd-master.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/libexec/ipropd-slave.debug comp-krb5-debug kerberos,debug
CVS commit: [netbsd-7] src/sys/arch/arm/omap
Module Name:src Committed By: msaitoh Date: Fri Apr 17 08:44:54 UTC 2015 Modified Files: src/sys/arch/arm/omap [netbsd-7]: if_cpsw.c if_cpswreg.h Log Message: Pull up following revision(s) (requested by jmcneill in ticket #696): sys/arch/arm/omap/if_cpsw.c: revision 1.12 sys/arch/arm/omap/if_cpswreg.h: revision 1.5 Disable flow control with CPSW_SS FLOW_CONTROL register (cherry-picked from FreeBSD driver). Resolves device timeout / watchdog issues for me. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/omap/if_cpsw.c cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/arch/arm/omap/if_cpswreg.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/omap/if_cpsw.c diff -u src/sys/arch/arm/omap/if_cpsw.c:1.6 src/sys/arch/arm/omap/if_cpsw.c:1.6.2.1 --- src/sys/arch/arm/omap/if_cpsw.c:1.6 Wed Apr 9 20:52:14 2014 +++ src/sys/arch/arm/omap/if_cpsw.c Fri Apr 17 08:44:54 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cpsw.c,v 1.6 2014/04/09 20:52:14 hans Exp $ */ +/* $NetBSD: if_cpsw.c,v 1.6.2.1 2015/04/17 08:44:54 msaitoh Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -53,7 +53,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: if_cpsw.c,v 1.6 2014/04/09 20:52:14 hans Exp $); +__KERNEL_RCSID(1, $NetBSD: if_cpsw.c,v 1.6.2.1 2015/04/17 08:44:54 msaitoh Exp $); #include sys/param.h #include sys/bus.h @@ -891,6 +891,9 @@ cpsw_init(struct ifnet *ifp) } sc-sc_rxhead = 0; + /* turn off flow control */ + cpsw_write_4(sc, CPSW_SS_FLOW_CONTROL, 0); + /* align layer 3 header to 32-bit */ cpsw_write_4(sc, CPSW_CPDMA_RX_BUFFER_OFFSET, ETHER_ALIGN); Index: src/sys/arch/arm/omap/if_cpswreg.h diff -u src/sys/arch/arm/omap/if_cpswreg.h:1.2 src/sys/arch/arm/omap/if_cpswreg.h:1.2.4.1 --- src/sys/arch/arm/omap/if_cpswreg.h:1.2 Wed Feb 26 03:58:33 2014 +++ src/sys/arch/arm/omap/if_cpswreg.h Fri Apr 17 08:44:54 2015 @@ -34,6 +34,7 @@ #define CPSW_SS_SOFT_RESET (CPSW_SS_OFFSET + 0x08) #define CPSW_SS_STAT_PORT_EN (CPSW_SS_OFFSET + 0x0C) #define CPSW_SS_PTYPE (CPSW_SS_OFFSET + 0x10) +#define CPSW_SS_FLOW_CONTROL (CPSW_SS_OFFSET + 0x24) #define CPSW_SS_RGMII_CTL (CPSW_SS_OFFSET + 0x88) #define CPSW_PORT_OFFSET 0x0100
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Fri Apr 17 09:39:59 UTC 2015 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: Ticket 1288. To generate a diff of this commit: cvs rdiff -u -r1.1.2.39 -r1.1.2.40 src/doc/CHANGES-6.0.7 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-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.39 src/doc/CHANGES-6.0.7:1.1.2.40 --- src/doc/CHANGES-6.0.7:1.1.2.39 Thu Apr 16 13:40:55 2015 +++ src/doc/CHANGES-6.0.7 Fri Apr 17 09:39:58 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.39 2015/04/16 13:40:55 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.40 2015/04/17 09:39:58 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -5977,3 +5977,8 @@ sys/arch/sparc/stand/ofwboot/Locore.c 1 Fix kernel loading failures from partitions started from over first 4GB of disks on sparc64. [nakayama, ticket #1285] + +libexec/ld.elf_so/rtld.c 1.176 + + lib/49813: Release mutex on error. + [joerg, ticket #1288]
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: msaitoh Date: Fri Apr 17 09:47:19 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket 700. To generate a diff of this commit: cvs rdiff -u -r1.1.2.257 -r1.1.2.258 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.257 src/doc/CHANGES-7.0:1.1.2.258 --- src/doc/CHANGES-7.0:1.1.2.257 Fri Apr 17 08:46:25 2015 +++ src/doc/CHANGES-7.0 Fri Apr 17 09:47:18 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.257 2015/04/17 08:46:25 msaitoh Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.258 2015/04/17 09:47:18 msaitoh Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19714,3 +19714,9 @@ sys/arch/arm/omap/if_cpswreg.h 1.5 Disable flow control with CPSW_SS FLOW_CONTROL register (cherry-picked from FreeBSD driver). Resolves device timeout / watchdog issues. [jmcneill, ticket #696] + +sys/dev/i2c/files.i2c1.58 + + Fix break build on evbppc which was caused by ticket 672. + dsrtc depends on sysmon_envsys. + [nonaka, ticket #700]
CVS commit: src/share/man/man8
Module Name:src Committed By: wiz Date: Fri Apr 17 11:27:38 UTC 2015 Modified Files: src/share/man/man8: wizd.8 Log Message: More markup. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man8/wizd.8 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/man8/wizd.8 diff -u src/share/man/man8/wizd.8:1.9 src/share/man/man8/wizd.8:1.10 --- src/share/man/man8/wizd.8:1.9 Mon Mar 30 16:57:40 2015 +++ src/share/man/man8/wizd.8 Fri Apr 17 11:27:37 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: wizd.8,v 1.9 2015/03/30 16:57:40 dholland Exp $ +.\ $NetBSD: wizd.8,v 1.10 2015/04/17 11:27:37 wiz Exp $ .\ .\ Copyright (c) 2003, 2014 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -52,7 +52,7 @@ as obsolete and therefore get automatica .Nm responds to the following signals: .Bl -tag -width SIGWIZD -.It Aq w...@netbsd.org +.It Aq Mt w...@netbsd.org Examine a man page for errors. The man page and particular errors in question may be specified in standard internet mail format. @@ -62,7 +62,7 @@ standard internet mail format. additionally sometimes delivers the following signals to other committer processes: .Bl -tag -width SIGWIZD -.It SIGWIZD +.It Dv SIGWIZD An error was detected in a man page. .El .Sh SEE ALSO
CVS commit: src/external/gpl3/gcc/dist/libgcc/config/ia64
Module Name:src
Committed By: martin
Date: Fri Apr 17 12:29:00 UTC 2015
Modified Files:
src/external/gpl3/gcc/dist/libgcc/config/ia64: unwind-ia64.c
Log Message:
Add missing cast
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c
diff -u src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.2 src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.3
--- src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.2 Mon Mar 24 21:26:01 2014
+++ src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c Fri Apr 17 12:29:00 2015
@@ -1718,7 +1718,7 @@ _Unwind_SetIP (struct _Unwind_Context *c
_Unwind_Ptr
_Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
{
- return context-lsda;
+ return (_Unwind_Ptr)context-lsda;
}
_Unwind_Ptr
CVS commit: src/external/gpl3/gcc/dist/libgcc/config/ia64
Module Name:src
Committed By: martin
Date: Fri Apr 17 12:29:49 UTC 2015
Modified Files:
src/external/gpl3/gcc/dist/libgcc/config/ia64: unwind-ia64.c
Log Message:
Add evil hack to help mknative untill we finish userland
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c
diff -u src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.3 src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.4
--- src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.3 Fri Apr 17 12:29:00 2015
+++ src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c Fri Apr 17 12:29:49 2015
@@ -2445,6 +2445,16 @@ uw_identify_context (struct _Unwind_Cont
return _Unwind_GetIP (context);
}
+#ifdef __NetBSD__
+/* dummy for bootstrapping purposes */
+struct unw_table_entry *
+_Unwind_FindTableEntry (void *pc, unw_word *segment_base,
+ unw_word *gp, struct unw_table_entry *ent)
+{
+ return NULL;
+}
+#endif
+
#include unwind.inc
#if defined (USE_GAS_SYMVER) defined (SHARED) defined (USE_LIBUNWIND_EXCEPTIONS)
CVS commit: src/doc
Module Name:src
Committed By: martin
Date: Fri Apr 17 12:40:17 UTC 2015
Modified Files:
src/doc: HACKS
Log Message:
Note ia64/gcc hack for mknative
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/doc/HACKS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.156 src/doc/HACKS:1.157
--- src/doc/HACKS:1.156 Mon Mar 30 05:30:08 2015
+++ src/doc/HACKS Fri Apr 17 12:40:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.156 2015/03/30 05:30:08 matt Exp $
+# $NetBSD: HACKS,v 1.157 2015/04/17 12:40:17 martin Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -928,6 +928,16 @@ port ia64
{standard input}:22978: Warning: This is the location of the conflicting usage
kcah
+ hack libgcc unwind dummy function
+ cdate Fri Apr 17 14:31:03 CEST 2015
+ who martin
+ file src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c: 1.4
+ descr
+ Add an empty _Unwind_FindTableEntry() implementation.
+ In the end we will use our libc stuff, and this should
+ go away again.
+ kcah
+
port x68k
hack compiler error with gcc 4.5.x
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Apr 17 12:43:16 UTC 2015
Modified Files:
src/sys/rump/include/machine: pmap.h
src/sys/rump/librump/rumpkern: rump_private.h vm.c
src/sys/rump/librump/rumpkern/arch/generic: rump_generic_pmap.c
src/sys/rump/librump/rumpkern/arch/x86: rump_x86_pmap.c
Log Message:
Give the kernel/local pmaps actual storage.
That way friendly neighborhood macros won't go scribbling
in the wrong places.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/include/machine/pmap.h
cvs rdiff -u -r1.89 -r1.90 src/sys/rump/librump/rumpkern/rump_private.h
cvs rdiff -u -r1.163 -r1.164 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/rump/librump/rumpkern/arch/generic/rump_generic_pmap.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/rump/librump/rumpkern/arch/x86/rump_x86_pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/machine/pmap.h
diff -u src/sys/rump/include/machine/pmap.h:1.6 src/sys/rump/include/machine/pmap.h:1.7
--- src/sys/rump/include/machine/pmap.h:1.6 Thu Jun 17 08:19:32 2010
+++ src/sys/rump/include/machine/pmap.h Fri Apr 17 12:43:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.6 2010/06/17 08:19:32 pooka Exp $ */
+/* $NetBSD: pmap.h,v 1.7 2015/04/17 12:43:15 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -28,6 +28,10 @@
#ifndef _SYS_RUMP_PMAP_H_
#define _SYS_RUMP_PMAP_H_
+struct pmap {
+ int vac_me_not_at_all;
+};
+
#define pmap_update(v)
#define pmap_is_modified(a) (true)
#define pmap_is_referenced(a) (true)
Index: src/sys/rump/librump/rumpkern/rump_private.h
diff -u src/sys/rump/librump/rumpkern/rump_private.h:1.89 src/sys/rump/librump/rumpkern/rump_private.h:1.90
--- src/sys/rump/librump/rumpkern/rump_private.h:1.89 Fri Apr 3 16:46:39 2015
+++ src/sys/rump/librump/rumpkern/rump_private.h Fri Apr 17 12:43:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_private.h,v 1.89 2015/04/03 16:46:39 pooka Exp $ */
+/* $NetBSD: rump_private.h,v 1.90 2015/04/17 12:43:16 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -118,10 +118,9 @@ do { \
extern unsigned long rump_physmemlimit;
extern struct vmspace *rump_vmspace_local;
+extern struct pmap rump_pmap_local;
#define RUMP_LOCALPROC_P(p) \
(p-p_vmspace == vmspace_kernel() || p-p_vmspace == rump_vmspace_local)
-#define RUMP_PMAP_KERNEL ((struct pmap *const)-1)
-#define RUMP_PMAP_LOCAL ((struct pmap *)-2)
void rump_component_load(const struct rump_component *);
void rump_component_init(enum rump_component_type);
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.163 src/sys/rump/librump/rumpkern/vm.c:1.164
--- src/sys/rump/librump/rumpkern/vm.c:1.163 Fri Apr 3 16:46:39 2015
+++ src/sys/rump/librump/rumpkern/vm.c Fri Apr 17 12:43:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.163 2015/04/03 16:46:39 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.164 2015/04/17 12:43:16 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.163 2015/04/03 16:46:39 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.164 2015/04/17 12:43:16 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -88,6 +88,10 @@ struct vm_map *kernel_map = kernel_map_
static struct vm_map module_map_store;
extern struct vm_map *module_map;
+static struct pmap pmap_kernel;
+struct pmap rump_pmap_local;
+struct pmap *const kernel_pmap_ptr = pmap_kernel;
+
vmem_t *kmem_arena;
vmem_t *kmem_va_arena;
@@ -395,7 +399,7 @@ uvm_init(void)
/* create vmspace used by local clients */
rump_vmspace_local = kmem_zalloc(sizeof(*rump_vmspace_local), KM_SLEEP);
- uvmspace_init(rump_vmspace_local, RUMP_PMAP_LOCAL, 0, 0, false);
+ uvmspace_init(rump_vmspace_local, rump_pmap_local, 0, 0, false);
}
void
Index: src/sys/rump/librump/rumpkern/arch/generic/rump_generic_pmap.c
diff -u src/sys/rump/librump/rumpkern/arch/generic/rump_generic_pmap.c:1.3 src/sys/rump/librump/rumpkern/arch/generic/rump_generic_pmap.c:1.4
--- src/sys/rump/librump/rumpkern/arch/generic/rump_generic_pmap.c:1.3 Fri Apr 3 16:46:39 2015
+++ src/sys/rump/librump/rumpkern/arch/generic/rump_generic_pmap.c Fri Apr 17 12:43:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_generic_pmap.c,v 1.3 2015/04/03 16:46:39 pooka Exp $ */
+/* $NetBSD: rump_generic_pmap.c,v 1.4 2015/04/17 12:43:16 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_generic_pmap.c,v 1.3 2015/04/03 16:46:39 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_generic_pmap.c,v 1.4 2015/04/17 12:43:16 pooka Exp $);
#include sys/param.h
@@ -39,8 +39,6 @@ __KERNEL_RCSID(0, $NetBSD: rump_generic
*
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Fri Apr 17 12:46:33 UTC 2015 Modified Files: src/sys/rump/librump/rumpkern: vm.c Log Message: g/c rump_vmmap No recollection what it was used for; didn't seem to be used even when it was originally added 5th August 2007. To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/sys/rump/librump/rumpkern/vm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpkern/vm.c diff -u src/sys/rump/librump/rumpkern/vm.c:1.164 src/sys/rump/librump/rumpkern/vm.c:1.165 --- src/sys/rump/librump/rumpkern/vm.c:1.164 Fri Apr 17 12:43:16 2015 +++ src/sys/rump/librump/rumpkern/vm.c Fri Apr 17 12:46:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vm.c,v 1.164 2015/04/17 12:43:16 pooka Exp $ */ +/* $NetBSD: vm.c,v 1.165 2015/04/17 12:46:33 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.164 2015/04/17 12:43:16 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.165 2015/04/17 12:46:33 pooka Exp $); #include sys/param.h #include sys/atomic.h @@ -80,8 +80,6 @@ const int * const uvmexp_pagemask = uvm const int * const uvmexp_pageshift = uvmexp.pageshift; #endif -struct vm_map rump_vmmap; - static struct vm_map kernel_map_store; struct vm_map *kernel_map = kernel_map_store;
CVS commit: src/lib/libc/arch/ia64/gen
Module Name:src
Committed By: martin
Date: Fri Apr 17 12:51:05 UTC 2015
Modified Files:
src/lib/libc/arch/ia64/gen: Makefile.inc
Added Files:
src/lib/libc/arch/ia64/gen: _lwp.c _setjmp.S setjmp.S sigsetjmp.S
Log Message:
Add set/longjmp and friends (nearly verbatim from FreeBSD).
Add a dummy _lwp_makecontext() function (enough to make autoconfigury
happy and gcc mknative work)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/ia64/gen/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/ia64/gen/_lwp.c \
src/lib/libc/arch/ia64/gen/_setjmp.S src/lib/libc/arch/ia64/gen/setjmp.S \
src/lib/libc/arch/ia64/gen/sigsetjmp.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/libc/arch/ia64/gen/Makefile.inc
diff -u src/lib/libc/arch/ia64/gen/Makefile.inc:1.5 src/lib/libc/arch/ia64/gen/Makefile.inc:1.6
--- src/lib/libc/arch/ia64/gen/Makefile.inc:1.5 Thu Dec 27 10:41:18 2012
+++ src/lib/libc/arch/ia64/gen/Makefile.inc Fri Apr 17 12:51:05 2015
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.5 2012/12/27 10:41:18 martin Exp $
+# $NetBSD: Makefile.inc,v 1.6 2015/04/17 12:51:05 martin Exp $
+SRCS+= _lwp.c
SRCS+= bswap16.c bswap32.c bswap64.c
-
-SRCS+= flt_rounds.c fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c
+SRCS+= setjmp.S _setjmp.S sigsetjmp.S
+SRCS+= flt_rounds.c fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c
SRCS+= isinff_ieee754.c isinfd_ieee754.c
SRCS+= isnanf_ieee754.c isnand_ieee754.c
SRCS+= fpclassifyf_ieee754.c fpclassifyd_ieee754.c
Added files:
Index: src/lib/libc/arch/ia64/gen/_lwp.c
diff -u /dev/null src/lib/libc/arch/ia64/gen/_lwp.c:1.1
--- /dev/null Fri Apr 17 12:51:05 2015
+++ src/lib/libc/arch/ia64/gen/_lwp.c Fri Apr 17 12:51:05 2015
@@ -0,0 +1,68 @@
+/* $NetBSD: _lwp.c,v 1.1 2015/04/17 12:51:05 martin Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nathan J. Williams.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+#if defined(LIBC_SCCS) !defined(lint)
+__RCSID($NetBSD: _lwp.c,v 1.1 2015/04/17 12:51:05 martin Exp $);
+#endif /* LIBC_SCCS and not lint */
+
+#include namespace.h
+#include sys/types.h
+#include ucontext.h
+#include lwp.h
+#include stdlib.h
+
+void
+_lwp_makecontext(ucontext_t *u, void (*start)(void *),
+void *arg, void *private, caddr_t stack_base, size_t stack_size)
+{
+#if 0
+ __greg_t *gr;
+
+ getcontext(u);
+ gr = u-uc_mcontext.__gregs;
+
+ u-uc_link = NULL;
+
+ u-uc_stack.ss_sp = stack_base;
+ u-uc_stack.ss_size = stack_size;
+
+ gr[_REG_PC] = (unsigned long)start;
+ gr[_REG_T12] = (unsigned long) start;
+ gr[_REG_RA] = (unsigned long) _lwp_exit;
+ gr[_REG_A0] = (unsigned long) arg;
+ gr[_REG_SP] = ((unsigned long) (stack_base + stack_size)) ~0x7;
+ gr[_REG_S6] = 0;
+ gr[_REG_UNIQUE] = (unsigned long)private;
+
+ u-uc_flags |= _UC_TLSBASE;
+#endif
+}
Index: src/lib/libc/arch/ia64/gen/_setjmp.S
diff -u /dev/null src/lib/libc/arch/ia64/gen/_setjmp.S:1.1
--- /dev/null Fri Apr 17 12:51:05 2015
+++ src/lib/libc/arch/ia64/gen/_setjmp.S Fri Apr 17 12:51:05 2015
@@ -0,0 +1,308 @@
+//
+// Copyright (c) 1999, 2000
+// Intel Corporation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// 1. Redistributions of source code must retain the above copyright
+//notice, this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Fri Apr 17 13:02:54 UTC 2015 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: set the local clients' comm to rumplocal instead of system To generate a diff of this commit: cvs rdiff -u -r1.317 -r1.318 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/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.317 src/sys/rump/librump/rumpkern/rump.c:1.318 --- src/sys/rump/librump/rumpkern/rump.c:1.317 Mon Apr 13 16:46:33 2015 +++ src/sys/rump/librump/rumpkern/rump.c Fri Apr 17 13:02:54 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.317 2015/04/13 16:46:33 riastradh Exp $ */ +/* $NetBSD: rump.c,v 1.318 2015/04/17 13:02:54 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.317 2015/04/13 16:46:33 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.318 2015/04/17 13:02:54 pooka Exp $); #include sys/systm.h #define ELFSIZE ARCH_ELFSIZE @@ -492,6 +492,7 @@ rump_init(void) mutex_exit(proc_lock); if (initproc == NULL) panic(where in the world is initproc?); + strlcpy(initproc-p_comm, rumplocal, sizeof(initproc-p_comm)); rump_component_init(RUMP_COMPONENT_POSTINIT);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Fri Apr 17 13:03:38 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: lwproc.c
Log Message:
Don't share file descriptors between proc0 and local clients.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/rump/librump/rumpkern/lwproc.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/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.33 src/sys/rump/librump/rumpkern/lwproc.c:1.34
--- src/sys/rump/librump/rumpkern/lwproc.c:1.33 Fri Apr 3 16:40:55 2015
+++ src/sys/rump/librump/rumpkern/lwproc.c Fri Apr 17 13:03:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lwproc.c,v 1.33 2015/04/03 16:40:55 pooka Exp $ */
+/* $NetBSD: lwproc.c,v 1.34 2015/04/17 13:03:38 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#define RUMP__CURLWP_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.33 2015/04/03 16:40:55 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.34 2015/04/17 13:03:38 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -327,7 +327,7 @@ rump__lwproc_alloclwp(struct proc *p)
bool newproc = false;
if (p == NULL) {
- p = lwproc_newproc(proc0, rump_vmspace_local, 0);
+ p = lwproc_newproc(proc0, rump_vmspace_local, RUMP_RFCFDG);
newproc = true;
}
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Apr 17 13:04:19 UTC 2015 Modified Files: src/sys/rump: listsrcdirs Log Message: include sockstat in list of utilities To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/rump/listsrcdirs 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/listsrcdirs diff -u src/sys/rump/listsrcdirs:1.29 src/sys/rump/listsrcdirs:1.30 --- src/sys/rump/listsrcdirs:1.29 Sat Mar 7 22:00:07 2015 +++ src/sys/rump/listsrcdirs Fri Apr 17 13:04:19 2015 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: listsrcdirs,v 1.29 2015/03/07 22:00:07 justin Exp $ +# $NetBSD: listsrcdirs,v 1.30 2015/04/17 13:04:19 pooka Exp $ # # @@ -106,7 +106,7 @@ lsrc usr /sbin/ mount_ext2fs mount_ffs lsrc usr /sbin/ newfs newfs_ext2fs newfs_msdos lsrc usr /sbin/ ping ping6 raidctl reboot lsrc usr /sbin/ rndctl route setkey sysctl umount -lsrc usr /usr.bin/ kdump ktrace +lsrc usr /usr.bin/ kdump ktrace sockstat lsrc usr /usr.sbin/ arp dumpfs mdconfig ndp npf pcictl lsrc usr /usr.sbin/ rtadvd vnconfig wlanctl lsrc usr /external/bsd/ libelf libpcap tcpdump wpa
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: martin
Date: Fri Apr 17 12:41:47 UTC 2015
Modified Files:
src/external/gpl3/gcc/lib/crtstuff/arch: ia64.mk
src/external/gpl3/gcc/lib/libasan: Makefile
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64: backtrace-supported.h
config.h
src/external/gpl3/gcc/lib/libgcc/arch/ia64: defs.mk
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/ia64: gcov-iov.h
src/external/gpl3/gcc/lib/libiberty: defs.mk
src/external/gpl3/gcc/lib/libiberty/arch/ia64: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: c++config.h gstdint.h
src/external/gpl3/gcc/usr.bin/gcc: Makefile
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64: auto-host.h bversion.h
configargs.h defs.mk plugin-version.h
Log Message:
Results of an mknative run for ia64
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/crtstuff/arch/ia64.mk
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h \
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/config.h
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/arch/ia64/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/ia64/gcov-iov.h
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libiberty/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libiberty/arch/ia64/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++config.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/gcc/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/bversion.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/configargs.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/defs.mk \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/plugin-version.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/lib/crtstuff/arch/ia64.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/ia64.mk:1.2 src/external/gpl3/gcc/lib/crtstuff/arch/ia64.mk:1.3
--- src/external/gpl3/gcc/lib/crtstuff/arch/ia64.mk:1.2 Sun Mar 9 21:02:44 2014
+++ src/external/gpl3/gcc/lib/crtstuff/arch/ia64.mk Fri Apr 17 12:41:46 2015
@@ -1,5 +1,5 @@
# This file is automatically generated. DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.78 2014/03/02 04:58:20 mrg Exp
+# Generated from: NetBSD: mknative-gcc,v 1.81 2015/01/31 08:50:01 mrg Exp
# Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp
#
G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I${GNUHOSTDIST}/gcc/../libbacktrace
Index: src/external/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.9 src/external/gpl3/gcc/lib/libasan/Makefile:1.10
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.9 Mon Dec 22 21:15:48 2014
+++ src/external/gpl3/gcc/lib/libasan/Makefile Fri Apr 17 12:41:46 2015
@@ -56,4 +56,12 @@ CPPFLAGS.sanitizer_netbsd.cc+=-I${GCCDIS
LIBDPLIBS+=stdc++ ${.CURDIR}/../libstdc++-v3
LIBDPLIBS+=pthread ${.CURDIR}/../../../../../lib/libpthread
+.if ${MACHINE_ARCH} == vax
+COPTS.asan_allocator2.cc += -O1
+COPTS.sanitizer_mac.cc += -O1
+COPTS.sanitizer_netbsd.cc += -O1
+COPTS.sanitizer_printf.cc += -O1
+COPTS.sanitizer_stackdepot.cc += -O1
+.endif
+
.include bsd.lib.mk
Index: src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h:1.1 src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h:1.2
--- src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h:1.1 Sun Mar 9 21:02:44 2014
+++ src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h Fri Apr 17 12:41:47 2015
@@ -1,5 +1,5 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.78 2014/03/02 04:58:20 mrg Exp */
+/* Generated from: NetBSD: mknative-gcc,v 1.81 2015/01/31 08:50:01 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */
/* backtrace-supported.h.in -- Whether stack backtrace is supported.
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE. */
should work, 0 if it will not. Libraries may #include this to make
other arrangements. */
-#define BACKTRACE_SUPPORTED 0
+#define BACKTRACE_SUPPORTED 1
/* BACKTRACE_USES_MALLOC will be #define'd as 1 if the backtrace
library will
CVS commit: src/lib/libpthread/arch/ia64
Module Name:src
Committed By: martin
Date: Fri Apr 17 13:14:19 UTC 2015
Added Files:
src/lib/libpthread/arch/ia64: pthread_md.h
Log Message:
Dummy ia64 support
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/lib/libpthread/arch/ia64/pthread_md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/lib/libpthread/arch/ia64/pthread_md.h
diff -u /dev/null src/lib/libpthread/arch/ia64/pthread_md.h:1.1
--- /dev/null Fri Apr 17 13:14:19 2015
+++ src/lib/libpthread/arch/ia64/pthread_md.h Fri Apr 17 13:14:19 2015
@@ -0,0 +1,45 @@
+/* $NetBSD: pthread_md.h,v 1.1 2015/04/17 13:14:19 martin Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nathan J. Williams.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LIB_PTHREAD_IA64_MD_H
+#define _LIB_PTHREAD_IA64_MD_H
+
+// #define PTHREAD__ASM_RASOPS
+
+static inline unsigned long
+pthread__sp(void)
+{
+ return 0;
+}
+
+#define pthread__uc_sp(ucp) ((ucp)-uc_mcontext.__gregs[_REG_SP])
+
+#endif /* _LIB_PTHREAD_IA64_MD_H */
CVS commit: [netbsd-5-1] src/sys/arch/sparc/stand/ofwboot
Module Name:src
Committed By: msaitoh
Date: Fri Apr 17 10:51:28 UTC 2015
Modified Files:
src/sys/arch/sparc/stand/ofwboot [netbsd-5-1]: Locore.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1958):
sys/arch/sparc/stand/ofwboot/Locore.c: revision 1.14
Fix kernel loading failures from partitions started from over first
4GB of disks on sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.40.1 src/sys/arch/sparc/stand/ofwboot/Locore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/ofwboot/Locore.c
diff -u src/sys/arch/sparc/stand/ofwboot/Locore.c:1.10 src/sys/arch/sparc/stand/ofwboot/Locore.c:1.10.40.1
--- src/sys/arch/sparc/stand/ofwboot/Locore.c:1.10 Wed Oct 17 19:57:16 2007
+++ src/sys/arch/sparc/stand/ofwboot/Locore.c Fri Apr 17 10:51:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: Locore.c,v 1.10 2007/10/17 19:57:16 garbled Exp $ */
+/* $NetBSD: Locore.c,v 1.10.40.1 2015/04/17 10:51:28 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -311,8 +311,8 @@ OF_seek(int handle, u_quad_t pos)
args.nargs = 3;
args.nreturns = 1;
args.handle = HDL2CELL(handle);
- args.poshi = HDL2CELL(pos 32);
- args.poslo = HDL2CELL(pos);
+ args.poshi = HDQ2CELL_HI(pos);
+ args.poslo = HDQ2CELL_LO(pos);
if (openfirmware(args) == -1) {
return -1;
}
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: hsuenaga
Date: Fri Apr 17 13:39:02 UTC 2015
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
don't call L2 maintance function if L2 cache is disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/arm/arm/cpufunc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.152 src/sys/arch/arm/arm/cpufunc.c:1.153
--- src/sys/arch/arm/arm/cpufunc.c:1.152 Wed Apr 15 10:52:18 2015
+++ src/sys/arch/arm/arm/cpufunc.c Fri Apr 17 13:39:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.152 2015/04/15 10:52:18 hsuenaga Exp $ */
+/* $NetBSD: cpufunc.c,v 1.153 2015/04/17 13:39:01 hsuenaga Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.152 2015/04/15 10:52:18 hsuenaga Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.153 2015/04/17 13:39:01 hsuenaga Exp $);
#include opt_compat_netbsd.h
#include opt_cpuoptions.h
@@ -1381,7 +1381,9 @@ struct cpu_functions pj4bv7_cpufuncs = {
.cf_dcache_inv_range = armv7_dcache_inv_range,
.cf_dcache_wb_range = armv7_dcache_wb_range,
-#if !defined(AURORA_IO_CACHE_COHERENCY) defined(ARMADAXP)
+#if defined(L2CACHE_ENABLE) \
+!defined(AURORA_IO_CACHE_COHERENCY) \
+defined(ARMADAXP)
.cf_sdcache_wbinv_range = armadaxp_sdcache_wbinv_range,
.cf_sdcache_inv_range = armadaxp_sdcache_inv_range,
.cf_sdcache_wb_range = armadaxp_sdcache_wb_range,
CVS commit: src/lib/libkvm
Module Name:src Committed By: martin Date: Fri Apr 17 13:16:01 UTC 2015 Added Files: src/lib/libkvm: kvm_ia64.c Log Message: Dummy support for ia64 To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/lib/libkvm/kvm_ia64.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files:
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: hsuenaga Date: Fri Apr 17 13:43:55 UTC 2015 Modified Files: src/sys/arch/arm/marvell: armadaxp.c Log Message: sync L2 cache on the tail of region. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/marvell/armadaxp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/marvell/armadaxp.c diff -u src/sys/arch/arm/marvell/armadaxp.c:1.10 src/sys/arch/arm/marvell/armadaxp.c:1.11 --- src/sys/arch/arm/marvell/armadaxp.c:1.10 Wed Apr 15 12:11:31 2015 +++ src/sys/arch/arm/marvell/armadaxp.c Fri Apr 17 13:43:55 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: armadaxp.c,v 1.10 2015/04/15 12:11:31 hsuenaga Exp $ */ +/* $NetBSD: armadaxp.c,v 1.11 2015/04/17 13:43:55 hsuenaga Exp $ */ /*** Copyright (C) Marvell International Ltd. and its affiliates @@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI ***/ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: armadaxp.c,v 1.10 2015/04/15 12:11:31 hsuenaga Exp $); +__KERNEL_RCSID(0, $NetBSD: armadaxp.c,v 1.11 2015/04/17 13:43:55 hsuenaga Exp $); #define _INTR_PRIVATE @@ -503,7 +503,7 @@ armadaxp_sdcache_inv_range(vaddr_t va, p paddr_t pa_base, pa_end; pa_base = pa ~0x1f; - pa_end = (pa_base + sz) ~0x1f; + pa_end = (pa_base + sz + 0x20) ~0x1f; L2_WRITE(ARMADAXP_L2_RANGE_BASE, pa_base); L2_WRITE(ARMADAXP_L2_INV_RANGE, pa_end); } @@ -514,7 +514,7 @@ armadaxp_sdcache_wb_range(vaddr_t va, pa paddr_t pa_base, pa_end; pa_base = pa ~0x1f; - pa_end = (pa_base + sz) ~0x1f; + pa_end = (pa_base + sz + 0x20) ~0x1f; L2_WRITE(ARMADAXP_L2_RANGE_BASE, pa_base); L2_WRITE(ARMADAXP_L2_WB_RANGE, pa_end); L2_WRITE(ARMADAXP_L2_SYNC, 0); @@ -527,7 +527,7 @@ armadaxp_sdcache_wbinv_range(vaddr_t va, paddr_t pa_base, pa_end; pa_base = pa ~0x1f; - pa_end = (pa_base + sz) ~0x1f; + pa_end = (pa_base + sz + 0x20) ~0x1f; L2_WRITE(ARMADAXP_L2_RANGE_BASE, pa_base); L2_WRITE(ARMADAXP_L2_WBINV_RANGE, pa_end); L2_WRITE(ARMADAXP_L2_SYNC, 0);
CVS commit: [netbsd-6] src
Module Name:src Committed By: msaitoh Date: Fri Apr 17 10:24:09 UTC 2015 Modified Files: src/lib/libutil [netbsd-6]: parsedate.3 parsedate.y src/tests/lib/libutil [netbsd-6]: t_parsedate.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #1291): tests/lib/libutil/t_parsedate.c: revision 1.4-1.13 lib/libutil/parsedate.y: revision 1.14-1.20 lib/libutil/parsedate.3: revision 1.11-1.14 Distinguish between a non-error result of (time_t)-1 and an error result. Modernise the test code inside #ifdef TEST. add rcsid fix timezone bugs in rev.1.11 and rev.1.13. PR/47916. Some years don't need the maybe add 1900 or 2000 adjustment that was designed for handling two-digit abbreviated years. For example, 1/2/70 still refers to the year 1970, as before, but 70-01-02 now refers to the year 70. * Add a new yyHaveFullYear member to struct dateinfo, to record whether or not the year needs to be adjusted. * Code that parses years sets yyHaveFullYear=1 if they know that the year should not be adjusted (as is the case for ISO 8601 dates), or if they perform their own adjustment (as is the case for CVS timestamps). * Move the year adjustment code into a new function, AdjustYear, instead of inline in Convert(). * Make Convert() assume the year doesn't need to be adjusted, and make Convert's callers first call AdjustYear() if appropriate. A time like HH:MM:SS.sss says nothing about whether DST is on or off. Add a new non-terminal time_numericzone for a time with a numeric timezone. Move some productions from time to time_numericzone. Increment yyHaveZone when encountering one of these. Previously, input of the form HH:MM:SS + would not have set the yyhaveZone flag. Improved handling of local times. * A magic value USE_LOCAL_TIME (defined as 9) may be passed as the Timezone to Convert(), instructing it to use mktime() to work in the local time zone, instead of using mktime_z to work in UTC (and then adding the specified timezone offset). * Some old code is removed now that there's no need to find the local timezone offset. * Allow either one or both of the now and zone arguments to parsedate() to be NULL, treating them independently. Previously, if either one was NULL, the other was ignored. * If the zone argument is specified, then the current date is calculated in the specified zone, not in local time. Also add some disabled debug code. This should fix PR lib/47916. Fix capitalization and typo, from Bug Hunting. Document that errno may be used to distinguish between a non-error result of -1 and an error. Document that years in ISO 8601 dates are taken literally. 69-09-10 is in the year 69, not 2069. The tzoff argument is in minutes (behind/west of UTC), not seconds. While here, also say that time = NULL and tzoff = NULL are independent. The code doesn't yet implement that, but it will soon. mention the PR# in the description like everyone else. To be on the safe side, use the category/number notation when referring to PRs (otherwise third-party sed-scripts might miss the references). Also remove white-space. * Test that parsedate(@0, ...) returns (time_t)0 regardless of timezone. * Test that parsedate(@-1, NULL, NULL) returns (time_t)-1 without setting errno. Test parsedate(@-2,...) (should return -2 and not set errno); and parsedate(@junk,...) (should return -1 and set errno). We were already testing @-1. Add local parsecheck() function and use it for several tests. Instead of just checking that parsedate(3) does not return an error, also pass the result through localtime_r(3) or gmtime_r(3) and check the year/month/day/hour/minute/second fields in the resulting struct tm. Add comments for some non-obvious cases. Also add a test with year=70, which is documented to be treated as 1970. Adapt to a recent change in parsedate(). 9/10/69 still refers to 2069, and 9/10/70 still refers to 1970, but 69-09-10 and 70-09-10 now refer to the years 69 and 70. Add tests for PR lib/47916. Some of these fail. When tests fail, print all args, notjust the date string. 2013-07-09 was in British Summer TIme, so use tzoff=-60, not 0. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.8.1 src/lib/libutil/parsedate.3 cvs rdiff -u -r1.11.2.1 -r1.11.2.2 src/lib/libutil/parsedate.y cvs rdiff -u -r1.3 -r1.3.2.1 src/tests/lib/libutil/t_parsedate.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/libutil/parsedate.3 diff -u src/lib/libutil/parsedate.3:1.10 src/lib/libutil/parsedate.3:1.10.8.1 --- src/lib/libutil/parsedate.3:1.10 Wed Dec 22 09:12:28 2010 +++ src/lib/libutil/parsedate.3 Fri Apr 17 10:24:09 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: parsedate.3,v 1.10 2010/12/22 09:12:28 wiz Exp $ +.\ $NetBSD: parsedate.3,v 1.10.8.1 2015/04/17 10:24:09 msaitoh Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Fri Apr 17 10:51:58 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1958. To generate a diff of this commit: cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-5.3 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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.108 src/doc/CHANGES-5.3:1.1.2.109 --- src/doc/CHANGES-5.3:1.1.2.108 Thu Apr 16 06:35:27 2015 +++ src/doc/CHANGES-5.3 Fri Apr 17 10:51:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.108 2015/04/16 06:35:27 snj Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.109 2015/04/17 10:51:57 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -3812,3 +3812,8 @@ lib/libc/stdio/gettemp.c 1.16 via patc an absolute path. [msaitoh, ticket #1955] +sys/arch/sparc/stand/ofwboot/Locore.c 1.14 + + Fix kernel loading failures from partitions started from over first + 4GB of disks on sparc64. + [nakayama, ticket #1958]
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Fri Apr 17 10:52:38 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Ticket 1958. To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-5.1.6 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-5.1.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.22 src/doc/CHANGES-5.1.6:1.1.2.23 --- src/doc/CHANGES-5.1.6:1.1.2.22 Thu Mar 19 18:13:25 2015 +++ src/doc/CHANGES-5.1.6 Fri Apr 17 10:52:38 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.22 2015/03/19 18:13:25 riz Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.23 2015/04/17 10:52:38 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -2584,3 +2584,8 @@ crypto/dist/openssl/dist/ssl/s2_srvr.c 1 X509_to_X509_REQ NULL pointer deref (CVE-2015-0288) [spz, ticket #1954] +sys/arch/sparc/stand/ofwboot/Locore.c 1.14 + + Fix kernel loading failures from partitions started from over first + 4GB of disks on sparc64. + [nakayama, ticket #1958]
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Fri Apr 17 10:52:21 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Ticket 1958. To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-5.2.4 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-5.2.4 diff -u src/doc/CHANGES-5.2.4:1.1.2.23 src/doc/CHANGES-5.2.4:1.1.2.24 --- src/doc/CHANGES-5.2.4:1.1.2.23 Thu Mar 19 18:14:01 2015 +++ src/doc/CHANGES-5.2.4 Fri Apr 17 10:52:21 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.23 2015/03/19 18:14:01 riz Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.24 2015/04/17 10:52:21 msaitoh Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -2584,3 +2584,8 @@ crypto/dist/openssl/dist/ssl/s2_srvr.c 1 X509_to_X509_REQ NULL pointer deref (CVE-2015-0288) [spz, ticket #1954] +sys/arch/sparc/stand/ofwboot/Locore.c 1.14 + + Fix kernel loading failures from partitions started from over first + 4GB of disks on sparc64. + [nakayama, ticket #1958]
CVS commit: [netbsd-5] src/sys/arch/sparc/stand/ofwboot
Module Name:src
Committed By: msaitoh
Date: Fri Apr 17 10:49:16 UTC 2015
Modified Files:
src/sys/arch/sparc/stand/ofwboot [netbsd-5]: Locore.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1958):
sys/arch/sparc/stand/ofwboot/Locore.c: revision 1.14
Fix kernel loading failures from partitions started from over first
4GB of disks on sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.30.1 src/sys/arch/sparc/stand/ofwboot/Locore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/ofwboot/Locore.c
diff -u src/sys/arch/sparc/stand/ofwboot/Locore.c:1.10 src/sys/arch/sparc/stand/ofwboot/Locore.c:1.10.30.1
--- src/sys/arch/sparc/stand/ofwboot/Locore.c:1.10 Wed Oct 17 19:57:16 2007
+++ src/sys/arch/sparc/stand/ofwboot/Locore.c Fri Apr 17 10:49:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: Locore.c,v 1.10 2007/10/17 19:57:16 garbled Exp $ */
+/* $NetBSD: Locore.c,v 1.10.30.1 2015/04/17 10:49:16 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -311,8 +311,8 @@ OF_seek(int handle, u_quad_t pos)
args.nargs = 3;
args.nreturns = 1;
args.handle = HDL2CELL(handle);
- args.poshi = HDL2CELL(pos 32);
- args.poslo = HDL2CELL(pos);
+ args.poshi = HDQ2CELL_HI(pos);
+ args.poslo = HDQ2CELL_LO(pos);
if (openfirmware(args) == -1) {
return -1;
}
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Fri Apr 17 15:02:50 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux: mm.h
Log Message:
Remove broken drm2 vm_mmap stub. Can't possibly have ever worked.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/mm.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/external/bsd/drm2/include/linux/mm.h
diff -u src/sys/external/bsd/drm2/include/linux/mm.h:1.4 src/sys/external/bsd/drm2/include/linux/mm.h:1.5
--- src/sys/external/bsd/drm2/include/linux/mm.h:1.4 Sun Dec 14 23:48:58 2014
+++ src/sys/external/bsd/drm2/include/linux/mm.h Fri Apr 17 15:02:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.h,v 1.4 2014/12/14 23:48:58 chs Exp $ */
+/* $NetBSD: mm.h,v 1.5 2015/04/17 15:02:50 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,18 +32,12 @@
#ifndef _LINUX_MM_H_
#define _LINUX_MM_H_
-#include sys/kauth.h
-#include sys/file.h
-#include sys/mman.h
-#include sys/proc.h
-#include sys/vnode.h
-
-#include miscfs/specfs/specdev.h
-
#include uvm/uvm_extern.h
#include asm/page.h
+struct file;
+
/* XXX Ugh bletch! Whattakludge! Linux's sense is reversed... */
#undef PAGE_MASK
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -67,52 +61,13 @@ si_meminfo(struct sysinfo *si)
/* XXX Fill in more as needed. */
}
-/*
- * ###
- * ### XXX THIS NEEDS SERIOUS SCRUTINY XXX ###
- * ###
- */
-
-/*
- * XXX unsigned long is a loser but will probably work accidentally.
- * XXX struct file might not map quite right between Linux and NetBSD.
- * XXX This is large enough it should take its own file.
- */
-
static inline unsigned long
-vm_mmap(struct file *file, unsigned long base, unsigned long size,
-unsigned long prot, unsigned long flags, unsigned long token)
+vm_mmap(struct file *file __unused, unsigned long base __unused,
+unsigned long size __unused, unsigned long prot __unused,
+unsigned long flags __unused, unsigned long token __unused)
{
- struct vnode *vp;
- void *addr;
- int error;
-
- /*
- * Cargo-culted from sys_mmap. Various conditions kasserted
- * rather than checked for expedience and safey.
- */
-
- KASSERT(base == 0);
- KASSERT(prot == (PROT_READ | PROT_WRITE));
- KASSERT(flags == MAP_SHARED);
-
- KASSERT(file-f_type == DTYPE_VNODE);
- vp = file-f_data;
-
- KASSERT(vp-v_type == VCHR);
- KASSERT((file-f_flag (FREAD | FWRITE)) == (FREAD | FWRITE));
-
- /* XXX pax_mprotect? pax_aslr? */
-
- addr = NULL;
- error = uvm_mmap_dev(curproc, addr, size, vp-v_rdev, (off_t)base);
- if (error)
- goto out;
-
- KASSERT((uintptr_t)addr = -1024UL); /* XXX Kludgerosity! */
-out: /* XXX errno NetBSD-Linux (kludgerific) */
- return (error? (-error) : (unsigned long)addr);
+ return -ENODEV;
}
#endif /* _LINUX_MM_H_ */
CVS commit: src/tests/lib/libc/time
Module Name:src
Committed By: ginsbach
Date: Fri Apr 17 15:13:47 UTC 2015
Modified Files:
src/tests/lib/libc/time: t_strptime.c
Log Message:
Add more detail to test descriptions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/time/t_strptime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/time/t_strptime.c
diff -u src/tests/lib/libc/time/t_strptime.c:1.1 src/tests/lib/libc/time/t_strptime.c:1.2
--- src/tests/lib/libc/time/t_strptime.c:1.1 Thu Jan 13 00:14:10 2011
+++ src/tests/lib/libc/time/t_strptime.c Fri Apr 17 15:13:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strptime.c,v 1.1 2011/01/13 00:14:10 pgoyette Exp $ */
+/* $NetBSD: t_strptime.c,v 1.2 2015/04/17 15:13:47 ginsbach Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.);
-__RCSID($NetBSD: t_strptime.c,v 1.1 2011/01/13 00:14:10 pgoyette Exp $);
+__RCSID($NetBSD: t_strptime.c,v 1.2 2015/04/17 15:13:47 ginsbach Exp $);
#include time.h
@@ -126,7 +126,8 @@ ATF_TC(day);
ATF_TC_HEAD(day, tc)
{
- atf_tc_set_md_var(tc, descr, Checks strptime(3): day names);
+ atf_tc_set_md_var(tc, descr,
+ Checks strptime(3) day name conversions [aA]);
}
ATF_TC_BODY(day, tc)
@@ -178,7 +179,8 @@ ATF_TC(month);
ATF_TC_HEAD(month, tc)
{
- atf_tc_set_md_var(tc, descr, Checks strptime(3): month names);
+ atf_tc_set_md_var(tc, descr,
+ Checks strptime(3) month name conversions [bB]);
}
ATF_TC_BODY(month, tc)
CVS commit: src/external/public-domain/xz
Module Name:src Committed By: christos Date: Fri Apr 17 18:49:23 UTC 2015 Modified Files: src/external/public-domain/xz: prepare-import.sh src/external/public-domain/xz/bin/xz: Makefile src/external/public-domain/xz/dist: configure.ac src/external/public-domain/xz/dist/src/liblzma/check: check.h src/external/public-domain/xz/include: config.h src/external/public-domain/xz/lib: Makefile shlib_version Removed Files: src/external/public-domain/xz/dist/doc/examples: xz_pipe_comp.c xz_pipe_decomp.c src/external/public-domain/xz/dist/src/liblzma/api/lzma: lzma.h src/external/public-domain/xz/dist/src/liblzma/common: stream_encoder.h Log Message: adjust for 5.2.1 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/xz/prepare-import.sh cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/bin/xz/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/xz/dist/configure.ac cvs rdiff -u -r1.1.1.1 -r0 \ src/external/public-domain/xz/dist/doc/examples/xz_pipe_comp.c \ src/external/public-domain/xz/dist/doc/examples/xz_pipe_decomp.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/public-domain/xz/dist/src/liblzma/api/lzma/lzma.h cvs rdiff -u -r1.2 -r1.3 \ src/external/public-domain/xz/dist/src/liblzma/check/check.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/public-domain/xz/dist/src/liblzma/common/stream_encoder.h cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/include/config.h cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/xz/lib/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/prepare-import.sh diff -u src/external/public-domain/xz/prepare-import.sh:1.3 src/external/public-domain/xz/prepare-import.sh:1.4 --- src/external/public-domain/xz/prepare-import.sh:1.3 Mon May 28 13:28:53 2012 +++ src/external/public-domain/xz/prepare-import.sh Fri Apr 17 14:49:23 2015 @@ -1,11 +1,11 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.3 2012/05/28 17:28:53 jdc Exp $ +# $NetBSD: prepare-import.sh,v 1.4 2015/04/17 18:49:23 christos Exp $ set -e rm -rf dist tmp -tar xzf xz-5.0.3.tar.gz -mv xz-5.0.3 dist +tar xzf xz-5.2.1.tar.gz +mv xz-5.2.1 dist cd dist # Binary files derived from distribution files Index: src/external/public-domain/xz/bin/xz/Makefile diff -u src/external/public-domain/xz/bin/xz/Makefile:1.1 src/external/public-domain/xz/bin/xz/Makefile:1.2 --- src/external/public-domain/xz/bin/xz/Makefile:1.1 Wed Aug 3 23:38:06 2011 +++ src/external/public-domain/xz/bin/xz/Makefile Fri Apr 17 14:49:23 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/08/04 03:38:06 matt Exp $ +# $NetBSD: Makefile,v 1.2 2015/04/17 18:49:23 christos Exp $ PROG= xz BINDIR= /usr/bin @@ -6,7 +6,7 @@ SRCS= args.c coder.c file_io.c hardware. message.c options.c signals.c suffix.c util.c \ tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \ tuklib_mbstr_fw.c tuklib_mbstr_width.c \ - tuklib_physmem.c tuklib_progname.c + tuklib_physmem.c tuklib_progname.c mytime.c USETBL= yes Index: src/external/public-domain/xz/dist/configure.ac diff -u src/external/public-domain/xz/dist/configure.ac:1.3 src/external/public-domain/xz/dist/configure.ac:1.4 --- src/external/public-domain/xz/dist/configure.ac:1.3 Tue Feb 28 09:22:21 2012 +++ src/external/public-domain/xz/dist/configure.ac Fri Apr 17 14:49:23 2015 @@ -25,11 +25,156 @@ AC_CONFIG_AUX_DIR([../../gnu/dist/autoco AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS +# We do some special things on Windows (32-bit or 64-bit) builds. +case $host_os in + mingw* | cygwin*) is_w32=yes ;; + *)is_w32=no ;; +esac +AM_CONDITIONAL([COND_W32], [test $is_w32 = yes]) + +# We need to use $EXEEXT with $(LN_S) when creating symlinks to +# executables. Cygwin is an exception to this, since it is recommended +# that symlinks don't have the .exe suffix. To make this work, we +# define LN_EXEEXT. +case $host_os in + cygwin) LN_EXEEXT= ;; + *) LN_EXEEXT='$(EXEEXT)' ;; +esac +AC_SUBST([LN_EXEEXT]) + +echo +echo Configure options: +AM_CFLAGS= + + +# +# Debugging # +# + +AC_MSG_CHECKING([if debugging code should be compiled]) +AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Enable debugging code.]), + [], enable_debug=no) +if test x$enable_debug = xyes; then + AC_MSG_RESULT([yes]) +else + AC_DEFINE([NDEBUG], [1], [Define to 1 to disable debugging code.]) + AC_MSG_RESULT([no]) +fi + + ### # Filters # ### -m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc]) +m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc])dnl +m4_define([SIMPLE_FILTERS], [x86,powerpc,ia64,arm,armthumb,sparc]) +m4_define([LZ_FILTERS],
CVS commit: src/sys/arch/arm
Module Name:src Committed By: matt Date: Fri Apr 17 17:28:34 UTC 2015 Modified Files: src/sys/arch/arm/arm: ast.c src/sys/arch/arm/include/arm32: frame.h Log Message: Put the clearing of ci_astpending back in frame.h while interrupts are disabled. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/arm/ast.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/include/arm32/frame.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/ast.c diff -u src/sys/arch/arm/arm/ast.c:1.27 src/sys/arch/arm/arm/ast.c:1.28 --- src/sys/arch/arm/arm/ast.c:1.27 Tue Apr 14 22:36:53 2015 +++ src/sys/arch/arm/arm/ast.c Fri Apr 17 17:28:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ast.c,v 1.27 2015/04/14 22:36:53 jmcneill Exp $ */ +/* $NetBSD: ast.c,v 1.28 2015/04/17 17:28:33 matt Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ast.c,v 1.27 2015/04/14 22:36:53 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: ast.c,v 1.28 2015/04/17 17:28:33 matt Exp $); #include opt_ddb.h @@ -131,11 +131,6 @@ ast(struct trapframe *tf) ci-ci_data.cpu_ntrap++; KDASSERT(ci-ci_cpl == IPL_NONE); -#ifdef __HAVE_PREEMPTION - atomic_and_uint(ci-ci_astpending, ~__BIT(0)); -#else - ci-ci_astpending = 0; -#endif const int want_resched = ci-ci_want_resched; #ifdef __HAVE_PREEMPTION kpreempt_enable(); Index: src/sys/arch/arm/include/arm32/frame.h diff -u src/sys/arch/arm/include/arm32/frame.h:1.41 src/sys/arch/arm/include/arm32/frame.h:1.42 --- src/sys/arch/arm/include/arm32/frame.h:1.41 Wed Apr 8 18:10:08 2015 +++ src/sys/arch/arm/include/arm32/frame.h Fri Apr 17 17:28:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: frame.h,v 1.41 2015/04/08 18:10:08 matt Exp $ */ +/* $NetBSD: frame.h,v 1.42 2015/04/17 17:28:33 matt Exp $ */ /* * Copyright (c) 1994-1997 Mark Brinicombe. @@ -150,6 +150,28 @@ void validate_trapframe(trapframe_t *, i msr cpsr_c, ra /* Restore interrupts */ #endif +#ifdef __HAVE_PREEMPTION +#define DO_CLEAR_ASTPENDING \ + mvn r1, #1 /* complement of 1 */ ;\ + add r0, r4, #CI_ASTPENDING /* address of astpending */ ;\ + bl _C_LABEL(atomic_and_uint) /* clear AST */ +#else +#define DO_CLEAR_ASTPENDING \ + mov r0, #0 ;\ + str r0, [r4, #CI_ASTPENDING] /* clear AST */ +#endif + +#define DO_PENDING_AST(lbl) ;\ +1: ldr r1, [r4, #CI_ASTPENDING] /* Pending AST? */ ;\ + tst r1, #0x0001 ;\ + beq lbl /* Nope. Just bail */ ;\ + DO_CLEAR_ASTPENDING ;\ + CPSIE_I(r5, r5) /* Restore interrupts */ ;\ + mov r0, sp ;\ + bl _C_LABEL(ast) /* ast(frame) */ ;\ + CPSID_I(r0, r5) /* Disable interrupts */ ;\ + b 1b /* test again */ + /* * AST_ALIGNMENT_FAULT_LOCALS and ENABLE_ALIGNMENT_FAULTS * These are used in order to support dynamic enabling/disabling of @@ -199,10 +221,8 @@ void validate_trapframe(trapframe_t *, i CPSID_I(r1, r5) /* Disable interrupts */ ;\ cmp r7, #(PSR_USR32_MODE) /* Returning to USR mode? */ ;\ bne 3f /* Nope, get out now */ ;\ -1: ldr r1, [r4, #CI_ASTPENDING] /* Pending AST? */ ;\ - tst r1, #0x0001 ;\ - bne 2f /* Yup. Go deal with it */ ;\ - ldr r1, [r4, #CI_CURLWP] /* get curlwp from cpu_info */ ;\ + DO_PENDING_AST(2f) /* Pending AST? */ ;\ +2: ldr r1, [r4, #CI_CURLWP] /* get curlwp from cpu_info */ ;\ ldr r0, [r1, #L_MD_FLAGS] /* get md_flags from lwp */ ;\ tst r0, #MDLWP_NOALIGNFLT ;\ beq 3f /* Keep AFLTs enabled */ ;\ @@ -210,14 +230,7 @@ void validate_trapframe(trapframe_t *, i ldr r2, .Laflt_cpufuncs ;\ mov r0, #-1 ;\ bic r1, r1, #CPU_CONTROL_AFLT_ENABLE /* Disable AFLTs */ ;\ - adr lr, 3f ;\ - B_CF_CONTROL(r2) /* Set new CTRL reg value */ ;\ - /* NOTREACHED */ \ -2: CPSIE_I(r5, r5) /* Restore interrupts */ ;\ - mov r0, sp ;\ - bl _C_LABEL(ast) /* ast(frame) */ ;\ - CPSID_I(r0, r5) /* Disable interrupts */ ;\ - b 1b /* Back around again */ ;\ + BL_CF_CONTROL(r2) /* Set new CTRL reg value */ ;\ 3: /* done */ #else /* !EXEC_AOUT */ @@ -235,14 +248,7 @@ void validate_trapframe(trapframe_t *, i CPSID_I(r1, r5) /* Disable interrupts */ ;\ cmp r7, #(PSR_USR32_MODE) ;\ bne 2f /* Nope, get out now */ ;\ -1: ldr r1, [r4, #CI_ASTPENDING] /* Pending AST? */ ;\ - tst r1, #0x0001 ;\ - beq 2f /* Nope. Just bail */ ;\ - CPSIE_I(r5, r5) /* Restore interrupts */ ;\ - mov r0, sp ;\ - bl _C_LABEL(ast) /* ast(frame) */ ;\ - CPSID_I(r0, r5) /* Disable interrupts */ ;\ - b 1b ;\ + DO_PENDING_AST(2f) /* Pending AST? */ ;\ 2: /* done */ #endif /* EXEC_AOUT */
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Apr 17 18:50:36 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: update xz To generate a diff of this commit: cvs rdiff -u -r1.1219 -r1.1220 src/doc/3RDPARTY cvs rdiff -u -r1.2068 -r1.2069 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1219 src/doc/3RDPARTY:1.1220 --- src/doc/3RDPARTY:1.1219 Mon Apr 13 13:25:52 2015 +++ src/doc/3RDPARTY Fri Apr 17 14:50:36 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1219 2015/04/13 17:25:52 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1220 2015/04/17 18:50:36 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1437,8 +1437,8 @@ Location: external/zlib/pigz/dist Notes: Package: xz -Version: 5.0.0 -Current Vers: 5.0.5 (stable) / 5.1.3alpha (devel) +Version: 5.2.1 +Current Vers: 5.2.1 Maintainer: Lasse Collin lasse.col...@tukanni.org Archive Site: http://tukaani.org/xz/ Home Page: http://tukaani.org/xz/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2068 src/doc/CHANGES:1.2069 --- src/doc/CHANGES:1.2068 Tue Apr 14 15:41:38 2015 +++ src/doc/CHANGES Fri Apr 17 14:50:36 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2068 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2069 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -155,3 +155,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: evbarm: add a driver for EDMA controller on AM335x SoC. Add DMA support to the sdhc controllers on AM335x SoC. Enable DMA for sdhc0 and sdhc1 on BEAGLEBONE [bouyer 20150414] + xz(1): Import of XZ 5.2.1. [christos 20150417]
CVS import: src/external/public-domain/xz/dist
Module Name:src Committed By: christos Date: Fri Apr 17 18:24:58 UTC 2015 Update of /cvsroot/src/external/public-domain/xz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4240 Log Message: Date: 2015-02-26 16:53:44 +0200 Bump version and soname for 5.2.1. Date: 2015-02-26 13:01:09 +0200 Update NEWS for 5.2.1. Date: 2015-02-22 19:38:48 +0200 xz: Use pipe2() if available. Date: 2015-02-21 23:40:26 +0200 liblzma: Fix a compression-ratio regression in LZMA1/2 in fast mode. The bug was added in the commit f48fce093b07aeda95c18850f5e086d9f2383380 and thus affected 5.1.4beta and 5.2.0. Luckily the bug cannot cause data corruption or other nasty things. Date: 2015-02-21 23:00:19 +0200 xz: Fix the fcntl() usage when creating a pipe for the self-pipe trick. Now it reads the old flags instead of blindly setting O_NONBLOCK. The old code may have worked correctly, but this is better. Date: 2015-02-10 15:29:34 +0200 Update THANKS. Date: 2015-02-10 15:28:30 +0200 tuklib_cpucores: Use cpuset_getaffinity() on FreeBSD if available. In FreeBSD, cpuset_getaffinity() is the preferred way to get the number of available cores. Thanks to Rui Paulo for the patch. I edited it slightly, but hopefully I didn't break anything. Date: 2015-02-09 22:08:37 +0200 xzdiff: Make the mktemp usage compatible with FreeBSD's mktemp. Thanks to Rui Paulo for the fix. Date: 2015-02-03 21:45:53 +0200 Add a few casts to tuklib_integer.h to silence possible warnings. I heard that Visual Studio 2013 gave warnings without the casts. Thanks to Gabi Davar. Date: 2015-01-26 21:24:39 +0200 liblzma: Set LZMA_MEMCMPLEN_EXTRA depending on the compare method. Date: 2015-01-26 20:40:16 +0200 Update THANKS. Date: 2015-01-26 20:39:28 +0200 liblzma: Silence harmless Valgrind errors. Thanks to Torsten Rupp for reporting this. I had forgotten to run Valgrind before the 5.2.0 release. Date: 2015-01-09 21:50:19 +0200 xz: Fix comments. Date: 2015-01-09 21:35:06 +0200 Update THANKS. Date: 2015-01-09 21:34:06 +0200 xz: Don't fail if stdout doesn't support O_NONBLOCK. This is similar to the case with stdin. Thanks to Brad Smith for the bug report and testing on OpenBSD. Date: 2015-01-07 19:18:20 +0200 xz: Fix a memory leak in DOS-specific code. Date: 2015-01-07 19:08:06 +0200 xz: Don't fail if stdin doesn't support O_NONBLOCK. It's a problem at least on OpenBSD which doesn't support O_NONBLOCK on e.g. /dev/null. I'm not surprised if it's a problem on other OSes too since this behavior is allowed in POSIX-1.2008. The code relying on this behavior was committed in June 2013 and included in 5.1.3alpha released on 2013-10-26. Clearly the development releases only get limited testing. Date: 2015-01-06 20:30:15 +0200 Tests: Don't hide unexpected error messages in test_files.sh. Hiding them makes no sense since normally there's no error when testing the good files. With bad files errors are expected and then it makes sense to keep the messages hidden. Date: 2014-12-30 11:17:16 +0200 Update Solaris notes in INSTALL. Mention the possible make check failure on Solaris in the Solaris-specific section of INSTALL. It was already in section 4.5 but it is better mention it in the OS-specific section too. Date: 2014-12-26 12:00:05 +0200 Build: POSIX shell isn't required if scripts are disabled. Date: 2014-12-21 20:48:37 +0200 DOS: Update Makefile. Date: 2014-12-21 19:50:38 +0200 Windows: Fix bin_i486 to bin_i686 in build.bash. Date: 2014-12-21 18:58:44 +0200 Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c. Date: 2014-12-21 18:56:44 +0200 Docs: Update docs/examples/00_README.txt. Date: 2014-12-21 18:11:17 +0200 Bump version and soname for 5.2.0. I know that soname != app version, but I skip AGE=1 in -version-info to make the soname match the liblzma version anyway. It doesn't hurt anything as long as it doesn't conflict with library versioning rules. Date: 2014-12-21 18:05:03 +0200 Avoid variable-length arrays in the debug programs. Date: 2014-12-21 18:01:45 +0200 Build: Include 04_compress_easy_mt.c in the tarball. Date: 2014-12-21 18:00:38 +0200 Fix build when --disable-threads is used. Date: 2014-12-21 15:56:15 +0100 po/fr: improve wording for help for --lzma1/--lzma2. Date: 2014-12-21 15:55:48 +0100 po/fr: missing line in translation of --extreme. Date: 2014-12-21 14:32:33 +0200 Update NEWS for 5.2.0. Date: 2014-12-21 14:32:22 +0200 Update NEWS for 5.0.8. Date: 2014-12-21 14:07:54 +0200 xz: Fix a comment. Date: 2014-12-20 20:43:14 +0200 Update
CVS commit: src/sys/arch
Module Name:src
Committed By: jmcneill
Date: Fri Apr 17 18:36:15 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_sdhc.c
src/sys/arch/evbarm/conf: ODROID-C1
Log Message:
port number is required
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/amlogic_sdhc.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/ODROID-C1
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/amlogic/amlogic_sdhc.c
diff -u src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.3 src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.4
--- src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.3 Mon Mar 16 21:37:35 2015
+++ src/sys/arch/arm/amlogic/amlogic_sdhc.c Fri Apr 17 18:36:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_sdhc.c,v 1.3 2015/03/16 21:37:35 jmcneill Exp $ */
+/* $NetBSD: amlogic_sdhc.c,v 1.4 2015/04/17 18:36:15 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_sdhc.c,v 1.3 2015/03/16 21:37:35 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_sdhc.c,v 1.4 2015/04/17 18:36:15 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -110,6 +110,12 @@ static struct sdmmc_chip_functions amlog
static int
amlogic_sdhc_match(device_t parent, cfdata_t cf, void *aux)
{
+ struct amlogicio_attach_args * const aio = aux;
+ const struct amlogic_locators * const loc = aio-aio_loc;
+
+ if (loc-loc_port == AMLOGICIOCF_PORT_DEFAULT)
+ return 0;
+
return 1;
}
Index: src/sys/arch/evbarm/conf/ODROID-C1
diff -u src/sys/arch/evbarm/conf/ODROID-C1:1.16 src/sys/arch/evbarm/conf/ODROID-C1:1.17
--- src/sys/arch/evbarm/conf/ODROID-C1:1.16 Fri Apr 3 23:25:07 2015
+++ src/sys/arch/evbarm/conf/ODROID-C1 Fri Apr 17 18:36:15 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: ODROID-C1,v 1.16 2015/04/03 23:25:07 jmcneill Exp $
+# $NetBSD: ODROID-C1,v 1.17 2015/04/17 18:36:15 jmcneill Exp $
#
# Hardkernel ODROID-C1 (Amlogic S805) based SBC (Single Board Computer)
#
@@ -59,7 +59,7 @@ amlogicrng0 at amlogicio0
amlogicrtc0 at amlogicio0
# SDHC controller
-amlogicsdhc0 at amlogicio0
+amlogicsdhc0 at amlogicio0 port 1
sdmmc* at amlogicsdhc?
ld* at sdmmc?
CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: christos
Date: Fri Apr 17 20:12:45 UTC 2015
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
there is no more lzma/lzma.h; it has been renamed to lzma/lzma12.h
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/lib/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/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.4 src/external/public-domain/xz/lib/Makefile:1.5
--- src/external/public-domain/xz/lib/Makefile:1.4 Fri Apr 17 14:49:23 2015
+++ src/external/public-domain/xz/lib/Makefile Fri Apr 17 16:12:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/17 18:49:23 christos Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/17 20:12:45 christos Exp $
LIB= lzma
USE_SHLIBDIR= yes
@@ -6,22 +6,12 @@ NOLINT= yes
.include bsd.init.mk
-# There are two different lzma.h files.
-# Copy public version to distinguish them.
-pub-lzma.h: ${XZSRCDIR}/src/liblzma/api/lzma.h
- ${_MKTARGET_CREATE}
- rm -f ${.TARGET}
- ${TOOL_CAT} ${XZSRCDIR}/src/liblzma/api/lzma.h ${.TARGET}
-CLEANFILES+= pub-lzma.h
-INCS= pub-lzma.h
-INCSDIR_pub-lzma.h= /usr/include
-INCSNAME_pub-lzma.h= lzma.h
-
-.PATH: ${XZSRCDIR}/src/liblzma/api/lzma
+.PATH: ${XZSRCDIR}/src/liblzma/api ${XZSRCDIR}/src/liblzma/api/lzma
INCS+= base.h bcj.h block.h check.h container.h delta.h \
- filter.h hardware.h index.h index_hash.h lzma.h stream_flags.h \
- version.h vli.h
+ filter.h hardware.h index.h index_hash.h lzma.h lzma12.h \
+ stream_flags.h version.h vli.h
+INCSDIR_lzma.h= /usr/include
INCSDIR= /usr/include/lzma
LDFLAGS+= -Wl,-z,defs
CVS commit: src/sys/modules/arch/arm/arm-lpae
Module Name:src
Committed By: matt
Date: Fri Apr 17 20:13:51 UTC 2015
Added Files:
src/sys/modules/arch/arm/arm-lpae: Makefile bsd.arm-lpae.mk
Log Message:
Latent support for ARM_HAS_LPAE.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/arm/arm-lpae/Makefile \
src/sys/modules/arch/arm/arm-lpae/bsd.arm-lpae.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/arch/arm/arm-lpae/Makefile
diff -u /dev/null src/sys/modules/arch/arm/arm-lpae/Makefile:1.1
--- /dev/null Fri Apr 17 20:13:51 2015
+++ src/sys/modules/arch/arm/arm-lpae/Makefile Fri Apr 17 20:13:51 2015
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2015/04/17 20:13:51 matt Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.arm-lpae.mk
+
+.include ../../compatsubdir.mk
Index: src/sys/modules/arch/arm/arm-lpae/bsd.arm-lpae.mk
diff -u /dev/null src/sys/modules/arch/arm/arm-lpae/bsd.arm-lpae.mk:1.1
--- /dev/null Fri Apr 17 20:13:51 2015
+++ src/sys/modules/arch/arm/arm-lpae/bsd.arm-lpae.mk Fri Apr 17 20:13:51 2015
@@ -0,0 +1,11 @@
+# $NetBSD: bsd.arm-lpae.mk,v 1.1 2015/04/17 20:13:51 matt Exp $
+
+.ifndef _BSD_ARM_LPAE_MK_
+_BSD_ARM_LPAE_MK_=1
+
+KMODULEARCHDIR:= arm-lpae
+
+# gcc emits bad code with these options
+CPPFLAGS+= -DARM_HAS_LPAE
+
+.endif # _BSD_ARM_LPAE_MK_
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Fri Apr 17 19:35:26 UTC 2015 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi Log Message: bump liblzma To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.262 -r1.263 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.250 -r1.251 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.735 -r1.736 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/debug/ad.riscv cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.21 src/distrib/sets/lists/base/ad.aarch64:1.22 --- src/distrib/sets/lists/base/ad.aarch64:1.21 Fri Apr 3 20:00:41 2015 +++ src/distrib/sets/lists/base/ad.aarch64 Fri Apr 17 15:35:25 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.21 2015/04/04 00:00:41 christos Exp $ +# $NetBSD: ad.aarch64,v 1.22 2015/04/17 19:35:25 christos Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -213,8 +213,8 @@ ./usr/lib/eabi/liblwres.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi/liblzf.so.1 base-compat-shlib compat,pic ./usr/lib/eabi/liblzf.so.1.0 base-compat-shlib compat,pic -./usr/lib/eabi/liblzma.so.1 base-compat-shlib compat,pic -./usr/lib/eabi/liblzma.so.1.1 base-compat-shlib compat,pic +./usr/lib/eabi/liblzma.so.2 base-compat-shlib compat,pic +./usr/lib/eabi/liblzma.so.2.0 base-compat-shlib compat,pic ./usr/lib/eabi/libm.so.0base-compat-shlib compat,pic ./usr/lib/eabi/libm.so.0.11 base-compat-shlib compat,pic ./usr/lib/eabi/libmagic.so.5 base-compat-shlib compat,pic @@ -531,8 +531,8 @@ ./usr/lib/eabihf/liblwres.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabihf/liblzf.so.1 base-compat-shlib compat,pic ./usr/lib/eabihf/liblzf.so.1.0 base-compat-shlib compat,pic -./usr/lib/eabihf/liblzma.so.1 base-compat-shlib compat,pic -./usr/lib/eabihf/liblzma.so.1.1 base-compat-shlib compat,pic +./usr/lib/eabihf/liblzma.so.2 base-compat-shlib compat,pic +./usr/lib/eabihf/liblzma.so.2.0 base-compat-shlib compat,pic ./usr/lib/eabihf/libm.so.0base-compat-shlib compat,pic ./usr/lib/eabihf/libm.so.0.11 base-compat-shlib compat,pic ./usr/lib/eabihf/libmagic.so.5 base-compat-shlib compat,pic @@ -847,8 +847,8 @@ ./usr/lib/oabi/liblwres.so.8.1 base-compat-shlib compat,pic ./usr/lib/oabi/liblzf.so.1 base-compat-shlib compat,pic ./usr/lib/oabi/liblzf.so.1.0 base-compat-shlib compat,pic -./usr/lib/oabi/liblzma.so.1 base-compat-shlib compat,pic -./usr/lib/oabi/liblzma.so.1.1 base-compat-shlib compat,pic +./usr/lib/oabi/liblzma.so.2 base-compat-shlib compat,pic +./usr/lib/oabi/liblzma.so.2.0 base-compat-shlib compat,pic ./usr/lib/oabi/libm.so.0 base-compat-shlib compat,pic ./usr/lib/oabi/libm.so.0.11 base-compat-shlib compat,pic ./usr/lib/oabi/libmagic.so.5 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.arm diff -u src/distrib/sets/lists/base/ad.arm:1.72 src/distrib/sets/lists/base/ad.arm:1.73 --- src/distrib/sets/lists/base/ad.arm:1.72 Fri Apr 3 20:00:41 2015 +++ src/distrib/sets/lists/base/ad.arm Fri Apr 17 15:35:25 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.72 2015/04/04 00:00:41 christos Exp $ +# $NetBSD: ad.arm,v 1.73 2015/04/17 19:35:25 christos Exp $ ./lib/oabi base-compat-shlib compat ./lib/oabi/npf base-npf-shlib compat ./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic @@ -207,8 +207,8 @@ ./usr/lib/oabi/liblwres.so.8.1 base-compat-shlib compat,pic ./usr/lib/oabi/liblzf.so.1 base-compat-shlib compat,pic ./usr/lib/oabi/liblzf.so.1.0 base-compat-shlib compat,pic -./usr/lib/oabi/liblzma.so.1 base-compat-shlib compat,pic -./usr/lib/oabi/liblzma.so.1.1 base-compat-shlib compat,pic +./usr/lib/oabi/liblzma.so.2 base-compat-shlib compat,pic
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Fri Apr 17 20:14:28 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi Log Message: lzma filters file has been renamed. To generate a diff of this commit: cvs rdiff -u -r1.1952 -r1.1953 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1952 src/distrib/sets/lists/comp/mi:1.1953 --- src/distrib/sets/lists/comp/mi:1.1952 Mon Apr 13 17:55:52 2015 +++ src/distrib/sets/lists/comp/mi Fri Apr 17 16:14:27 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1952 2015/04/13 21:55:52 riastradh Exp $ +# $NetBSD: mi,v 1.1953 2015/04/17 20:14:27 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2503,7 +2503,8 @@ ./usr/include/lzma/hardware.h comp-c-include ./usr/include/lzma/index.h comp-c-include ./usr/include/lzma/index_hash.h comp-c-include -./usr/include/lzma/lzma.h comp-c-include +./usr/include/lzma/lzma.h comp-obsolete obsolete +./usr/include/lzma/lzma12.h comp-c-include ./usr/include/lzma/stream_flags.h comp-c-include ./usr/include/lzma/version.h comp-c-include ./usr/include/lzma/vli.h comp-c-include
CVS commit: src/lib
Module Name:src
Committed By: mrg
Date: Fri Apr 17 22:17:23 UTC 2015
Modified Files:
src/lib: Makefile
Log Message:
xz/lib depends upon pthread so move it to the 1st dependancy point.
libarchive/lib depends upon xz, so move to the 2nd.
To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.220 src/lib/Makefile:1.221
--- src/lib/Makefile:1.220 Sun Jan 25 15:47:36 2015
+++ src/lib/Makefile Fri Apr 17 22:17:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.220 2015/01/25 15:47:36 christos Exp $
+# $NetBSD: Makefile,v 1.221 2015/04/17 22:17:23 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -67,7 +67,6 @@ SUBDIR+= libbpfjit
SUBDIR+= ../external/mit/expat/lib
SUBDIR+= ../external/public-domain/sqlite/lib
-SUBDIR+= ../external/public-domain/xz/lib
SUBDIR+= ../gnu/lib/libmalloc
@@ -91,6 +90,8 @@ SUBDIR+= ../external/lgpl3/mpc/lib/libmp
# 1st library dependency barrier
SUBDIR+= .WAIT
+SUBDIR+= ../external/public-domain/xz/lib # depends on libpthread
+
.if (${MKCRYPTO} != no)
SUBDIR+= ../crypto/external/bsd/netpgp/libmj
SUBDIR+= ../crypto/external/bsd/netpgp/lib/verify # depends on libz
@@ -126,8 +127,6 @@ SUBDIR+= ../external/bsd/file/lib # depe
SUBDIR+= ../external/bsd/iscsi/lib # depends on libpthread
.endif
-SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
-
.if (${MKLVM} != no)
SUBDIR+= ../external/gpl2/lvm2/lib # depends on libprop
.endif
@@ -152,6 +151,8 @@ SUBDIR+= ${SANITIZER_DIR}
# 2nd library dependency barrier
SUBDIR+= .WAIT
+SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
+
.if (${MKNPF} != no)
SUBDIR+= npf # depends on libnpf
.endif
CVS commit: xsrc/xfree/xc/lib/X11
Module Name:xsrc
Committed By: mrg
Date: Sat Apr 18 03:35:40 UTC 2015
Modified Files:
xsrc/xfree/xc/lib/X11: Xlibint.h
Log Message:
fix CVE-2013-7439: Buffer overflow in MakeBigReq macro in libX11 prior to 1.6
port the fixes in libX11 1.6 back to xfree tree from:
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=39547d600a13713e15429f49768e54c3173c828d
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/xfree/xc/lib/X11/Xlibint.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/lib/X11/Xlibint.h
diff -u xsrc/xfree/xc/lib/X11/Xlibint.h:1.1.1.7 xsrc/xfree/xc/lib/X11/Xlibint.h:1.2
--- xsrc/xfree/xc/lib/X11/Xlibint.h:1.1.1.7 Fri Mar 18 13:04:29 2005
+++ xsrc/xfree/xc/lib/X11/Xlibint.h Sat Apr 18 03:35:40 2015
@@ -528,6 +528,14 @@ extern LockInfoPtr _Xglobal_lock;
#endif
#ifdef WORD64
+/*
+ * MakeBigReq sets the CARD16 req-length to 0 and inserts a new CARD32
+ * length, after req-length, before the data in the request. The new length
+ * includes the n extra 32-bit words.
+ *
+ * Do not use MakeBigReq if there is no data already in the request.
+ * req-length must already be = 2.
+ */
#define MakeBigReq(req,n) \
{ \
char _BRdat[4]; \
@@ -546,7 +554,7 @@ extern LockInfoPtr _Xglobal_lock;
CARD32 _BRlen = req-length - 1; \
req-length = 0; \
_BRdat = ((CARD32 *)req)[_BRlen]; \
-memmove(((char *)req) + 8, ((char *)req) + 4, _BRlen 2); \
+memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) 2); \
((CARD32 *)req)[1] = _BRlen + n + 2; \
Data32(dpy, _BRdat, 4); \
}
@@ -557,13 +565,20 @@ extern LockInfoPtr _Xglobal_lock;
CARD32 _BRlen = req-length - 1; \
req-length = 0; \
_BRdat = ((CARD32 *)req)[_BRlen]; \
-memmove(((char *)req) + 8, ((char *)req) + 4, _BRlen 2); \
+memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) 2); \
((CARD32 *)req)[1] = _BRlen + n + 2; \
Data32(dpy, _BRdat, 4); \
}
#endif
#endif
+/*
+ * SetReqLen increases the count of 32-bit words in the request by n,
+ * or by badlen if n is too large.
+ *
+ * Do not use SetReqLen if req does not already have data after the
+ * xReq header. req-length must already be = 2.
+ */
#define SetReqLen(req,n,badlen) \
if ((req-length + n) (unsigned)65535) { \
if (dpy-bigreq_size) { \
