CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Wed Feb 26 10:50:23 UTC 2014
Added Files:
src/external/gpl3/gcc: gcc2gcc.old
Log Message:
script to copy gcc to gcc.old, ready for importing.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/gcc2gcc.old
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/gpl3/gcc/gcc2gcc.old
diff -u /dev/null src/external/gpl3/gcc/gcc2gcc.old:1.1
--- /dev/null Wed Feb 26 10:50:23 2014
+++ src/external/gpl3/gcc/gcc2gcc.old Wed Feb 26 10:50:23 2014
@@ -0,0 +1,63 @@
+#! /bin/sh
+#
+# $NetBSD: gcc2gcc.old,v 1.1 2014/02/26 10:50:23 mrg Exp $
+
+# run it like eg:
+#
+# % ./gcc2gcc.old /usr/src/external/gpl3/gcc /home/import/gcc
+
+doit=echo
+doit=
+
+progname=$(basename $0)
+
+usage() {
+ echo Usage: $progname src/external/gpl3/gcc copy-to-dir 12
+ edho Note that copy-to-dir must not exist. 12
+ exit 1
+}
+
+#set -x
+set -e
+
+srcdir=$1
+destdir=$2
+
+if [ -z $srcdir -o -z $destdir ]; then
+ usage
+fi
+
+if [ ! -d $srcdir ]; then
+ echo srcdir '$srcdir' is not a directory 12
+ usage
+fi
+if [ -e $destdir ]; then
+ echo destdir '$destdir' is something 12
+ ls -ld $destdir
+ usage
+fi
+
+# Assumes that ../gcc/. == .
+cd $srcdir/..
+if [ ! -d gcc ]; then
+ echo $srcdir/../gcc doesn't exist. 12
+ usage
+fi
+
+echo Copying files to $destdir...
+$doit pax -rwpp gcc $destdir
+
+
+# clean the copy
+echo Cleaning CVS turds and ChangeLogs
+$doit find $destdir -name .CVS -exec rm -rf {} +
+$doit find $destdir -name CVS -exec rm -rf {} +
+$doit find $destdir -name ChangeLog* -exec rm -f {} +
+$doit rm -f $destdir/gcc2netbsd $destdir/gcc2gcc.old
+
+date=$(date +%Y%m%M-%H%M)
+echo GCC copied to gcc.old. use these commands to import:
+echo cd $destdir/gcc
+echo cvs import src/external/gpl3/gcc.old NetBSD src-external-gpl3-gcc-$date
+
+exit 0
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: martin Date: Wed Feb 26 11:00:40 UTC 2014 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Include param.h here - userland expects VM_* defines to work with just this include, but PAGE_SIZE relies on PGSHIFT now, which is not defined here. Matt: please rearrange/cleanup differently if you prefer (but test build src/tests/lib/libc/sys/t_mlock for example.) To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/include/arm32/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.31 src/sys/arch/arm/include/arm32/vmparam.h:1.32 --- src/sys/arch/arm/include/arm32/vmparam.h:1.31 Wed Feb 26 01:55:02 2014 +++ src/sys/arch/arm/include/arm32/vmparam.h Wed Feb 26 11:00:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.31 2014/02/26 01:55:02 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.32 2014/02/26 11:00:40 martin Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -45,6 +45,7 @@ */ #include arm/arm32/pte.h /* pt_entry_t */ +#include arm/arm32/param.h /* PGSHIFT for PAGE_SIZE */ #define USRSTACK VM_MAXUSER_ADDRESS
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Wed Feb 26 13:50:29 UTC 2014
Modified Files:
src/lib/libedit: eln.c
Log Message:
Add missing EL_REFRESH
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libedit/eln.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/libedit/eln.c
diff -u src/lib/libedit/eln.c:1.14 src/lib/libedit/eln.c:1.15
--- src/lib/libedit/eln.c:1.14 Sun Mar 11 17:15:25 2012
+++ src/lib/libedit/eln.c Wed Feb 26 08:50:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: eln.c,v 1.14 2012/03/11 21:15:25 christos Exp $ */
+/* $NetBSD: eln.c,v 1.15 2014/02/26 13:50:29 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include config.h
#if !defined(lint) !defined(SCCSID)
-__RCSID($NetBSD: eln.c,v 1.14 2012/03/11 21:15:25 christos Exp $);
+__RCSID($NetBSD: eln.c,v 1.15 2014/02/26 13:50:29 christos Exp $);
#endif /* not lint not SCCSID */
#include histedit.h
@@ -125,6 +125,15 @@ el_set(EditLine *el, int op, ...)
break;
}
+ case EL_PROMPT_ESC:
+ case EL_RPROMPT_ESC: {
+ el_pfunc_t p = va_arg(ap, el_pfunc_t);
+ int c = va_arg(ap, int);
+
+ ret = prompt_set(el, p, c, op, 0);
+ break;
+ }
+
case EL_TERMINAL: /* const char * */
ret = el_wset(el, op, va_arg(ap, char *));
break;
@@ -220,27 +229,31 @@ el_set(EditLine *el, int op, ...)
el-el_flags |= NARROW_HISTORY;
break;
}
+
/* XXX: do we need to change el_rfunc_t? */
case EL_GETCFN: /* el_rfunc_t */
ret = el_wset(el, op, va_arg(ap, el_rfunc_t));
el-el_flags |= NARROW_READ;
break;
+
case EL_CLIENTDATA: /* void * */
ret = el_wset(el, op, va_arg(ap, void *));
break;
+
case EL_SETFP: { /* int, FILE * */
int what = va_arg(ap, int);
FILE *fp = va_arg(ap, FILE *);
ret = el_wset(el, op, what, fp);
break;
}
- case EL_PROMPT_ESC: /* el_pfunc_t, char */
- case EL_RPROMPT_ESC: {
- el_pfunc_t p = va_arg(ap, el_pfunc_t);
- char c = (char)va_arg(ap, int);
- ret = prompt_set(el, p, c, op, 0);
+
+ case EL_REFRESH:
+ re_clear_display(el);
+ re_refresh(el);
+ terminal__flush(el);
+ ret = 0;
break;
- }
+
default:
ret = -1;
break;
CVS commit: src/lib/csu/common
Module Name:src Committed By: martin Date: Wed Feb 26 14:54:51 UTC 2014 Modified Files: src/lib/csu/common: compident.S Log Message: Make the .note section mergable and set proper item length. XXX seems to be impossible to do that with gas w/o causing a (bogus) warning - but the resulting object file is fine. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/csu/common/compident.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/common/compident.S diff -u src/lib/csu/common/compident.S:1.1 src/lib/csu/common/compident.S:1.2 --- src/lib/csu/common/compident.S:1.1 Thu Nov 14 12:19:34 2013 +++ src/lib/csu/common/compident.S Wed Feb 26 14:54:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: compident.S,v 1.1 2013/11/14 12:19:34 martin Exp $ */ +/* $NetBSD: compident.S,v 1.2 2014/02/26 14:54:50 martin Exp $ */ /*- * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ #include sysident_assym.h - .section .note.netbsd.mcmodel, a + .section .note.netbsd.mcmodel,aM,@note,3*4+CONTENTLENGTH+ELF_NOTE_MCMODEL_NAMESZ+1 .p2align 2 .long ELF_NOTE_MCMODEL_NAMESZ
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64
Module Name:src Committed By: christos Date: Wed Feb 26 15:35:05 UTC 2014 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64: Makefile.inc Log Message: powerpc64 support. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc diff -u src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc:1.3 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc:1.4 --- src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc:1.3 Tue Dec 3 19:49:18 2013 +++ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc Wed Feb 26 10:35:05 2014 @@ -1,131 +1,134 @@ -# $NetBSD: Makefile.inc,v 1.3 2013/12/04 00:49:18 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.4 2014/02/26 15:35:05 christos Exp $ SRCS+= \ - random.c \ - divrem_2.c \ - toom_interpolate_7pts.c \ - sbpi1_divappr_q.c \ - random2.c \ - mu_bdiv_q.c \ - toom32_mul.c \ - toom44_mul.c \ - toom8h_mul.c \ - toom2_sqr.c \ - zero.c \ - mod_1_4.c \ - gcdext.c \ - binvert.c \ - mu_div_q.c \ - invertappr.c \ - dump.c \ - mu_divappr_q.c \ - dcpi1_div_qr.c \ - redc_1_sec.c \ - toom6_sqr.c \ - divrem_1.c \ - mod_1.c \ - divexact.c \ - powlo.c \ - mul.c \ - set_str.c \ - toom42_mul.c \ - toom_interpolate_6pts.c \ - dcpi1_divappr_q.c \ - toom_eval_dgr3_pm2.c \ - mod_1_3.c \ - toom_couple_handling.c \ add.c \ - toom_interpolate_12pts.c \ - perfsqr.c \ - toom53_mul.c \ - toom_eval_pm2exp.c \ - mu_div_qr.c \ - toom_interpolate_16pts.c \ - mod_34lsub1.c \ - bdiv_q.c \ - toom22_mul.c \ - toom4_sqr.c \ - div_q.c \ - jacbase.c \ - gcdext_subdiv_step.c \ - mullo_n.c \ - toom33_mul.c \ - toom_eval_dgr3_pm1.c \ - mod_1_2.c \ - sub_1.c \ - trialdiv.c \ add_1.c \ - sqr_basecase.c \ - toom_interpolate_5pts.c \ - sbpi1_bdiv_q.c \ - pre_mod_1.c \ - hgcd.c \ bdiv_dbm1c.c \ - sqrtrem.c \ + bdiv_q.c \ bdiv_q_1.c \ + bdiv_qr.c \ + binvert.c \ + cmp.c \ + dcpi1_bdiv_q.c \ + dcpi1_bdiv_qr.c \ + dcpi1_div_q.c \ + dcpi1_div_qr.c \ + dcpi1_divappr_q.c \ + div_q.c \ + div_qr_2n_pi1.c \ + dive_1.c \ + diveby3.c \ + divexact.c \ + divis.c \ + divrem.c \ + divrem_1.c \ + divrem_2.c \ + dump.c \ + fib2_ui.c \ + gcd.c \ + gcd_1.c \ + gcd_subdiv_step.c \ + gcdext.c \ gcdext_1.c \ - toom63_mul.c \ - mul_basecase.c \ - toom8_sqr.c \ - neg.c \ gcdext_lehmer.c \ - divis.c \ - dcpi1_div_q.c \ - subcnd_n.c \ - toom_eval_pm2.c \ - hgcd2.c \ - toom62_mul.c \ - sbpi1_bdiv_qr.c \ - scan1.c \ - pre_divrem_1.c \ - perfpow.c \ + get_d.c \ get_str.c \ + hgcd.c \ + hgcd2.c \ + hgcd_appr.c \ + hgcd_matrix.c \ + hgcd_reduce.c \ + hgcd_step.c \ + invert.c \ + invertappr.c \ + jacbase.c \ + lshiftc.c \ + matrix22_mul.c \ + matrix22_mul1_inverse_vector.c \ + mod_1.c \ + mod_1_1.c \ + mod_1_2.c \ + mod_1_3.c \ + mod_1_4.c \ + mod_34lsub1.c \ + mode1o.c \ + mu_bdiv_q.c \ + mu_bdiv_qr.c \ + mu_div_q.c \ + mu_div_qr.c \ + mu_divappr_q.c \ + mul.c \ + mul_basecase.c \ + mul_fft.c \ + mul_n.c \ mullo_basecase.c \ + mullo_n.c \ mulmod_bnm1.c \ - tdiv_qr.c \ - toom43_mul.c \ - mod_1_1.c \ - matrix22_mul.c \ + neg.c \ + nussbaumer_mul.c \ + perfpow.c \ + perfsqr.c \ + pow_1.c \ + powlo.c \ + powm.c \ powm_sec.c \ - divrem.c \ - gcd_1.c \ - dcpi1_bdiv_qr.c \ - mul_n.c \ + pre_divrem_1.c \ + pre_mod_1.c \ + random.c \ + random2.c \ + redc_1.c \ redc_2.c \ - toom6h_mul.c \ - mul_fft.c \ - sqrmod_bnm1.c \ - powm.c \ - rootrem.c \ - mode1o.c \ - toom_interpolate_8pts.c \ + redc_n.c \ remove.c \ - lshiftc.c \ - dive_1.c \ - cmp.c \ - toom_eval_pm1.c \ - scan0.c \ - gcd_subdiv_step.c \ + rootrem.c \ + sbpi1_bdiv_q.c \ + sbpi1_bdiv_qr.c \ + sbpi1_div_q.c \ sbpi1_div_qr.c \ - invert.c \ - sub.c \ - toom_eval_pm2rexp.c \ - dcpi1_bdiv_q.c \ - redc_1.c \ + sbpi1_divappr_q.c \ + scan0.c \ + scan1.c \ + set_str.c \ sqr.c \ - nussbaumer_mul.c \ - mu_bdiv_qr.c \ - pow_1.c \ - gcd_lehmer.c \ - get_d.c \ - toom52_mul.c \ - sbpi1_div_q.c \ - diveby3.c \ - fib2_ui.c \ - bdiv_qr.c \ + sqr_basecase.c \ + sqrmod_bnm1.c \ + sqrtrem.c \ + sub.c \ + sub_1.c \ + subcnd_n.c \ + tdiv_qr.c \ + toom22_mul.c \ + toom2_sqr.c \ + toom32_mul.c \ + toom33_mul.c \ toom3_sqr.c \ - gcd.c \ - redc_n.c \ + toom42_mul.c \ + toom43_mul.c \ + toom44_mul.c \ + toom4_sqr.c \ + toom52_mul.c \ + toom53_mul.c \ + toom62_mul.c \ + toom63_mul.c \ + toom6_sqr.c \ + toom6h_mul.c \ + toom8_sqr.c \ + toom8h_mul.c \ + toom_couple_handling.c \ + toom_eval_dgr3_pm1.c \ + toom_eval_dgr3_pm2.c \ + toom_eval_pm1.c \ + toom_eval_pm2.c \ + toom_eval_pm2exp.c \ + toom_eval_pm2rexp.c \ + toom_interpolate_12pts.c \ + toom_interpolate_16pts.c \ + toom_interpolate_5pts.c \ + toom_interpolate_6pts.c \ + toom_interpolate_7pts.c \ + toom_interpolate_8pts.c \ + trialdiv.c \ + zero.c \ C_SRCS_LIST= \ hamdist.c mpn/generic/popham.c \ @@ -133,7 +136,7
CVS commit: src/sys/uvm
Module Name:src
Committed By: matt
Date: Wed Feb 26 16:11:59 UTC 2014
Modified Files:
src/sys/uvm: uvm_meter.c uvm_param.h
Log Message:
Add vm.min_address and vm.max_address which return VM_MIN_ADDRESS and
VM_MAXUSER_ADDRESS.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/uvm/uvm_meter.c
cvs rdiff -u -r1.33 -r1.34 src/sys/uvm/uvm_param.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/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.61 src/sys/uvm/uvm_meter.c:1.62
--- src/sys/uvm/uvm_meter.c:1.61 Tue Feb 25 18:30:13 2014
+++ src/sys/uvm/uvm_meter.c Wed Feb 26 16:11:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.61 2014/02/25 18:30:13 pooka Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.62 2014/02/26 16:11:59 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.61 2014/02/25 18:30:13 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.62 2014/02/26 16:11:59 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -268,6 +268,18 @@ SYSCTL_SETUP(sysctl_vm_setup, sysctl vm
SYSCTL_DESCR(Whether try to zero pages in idle loop),
NULL, 0, vm_page_zero_enable, 0,
CTL_VM, CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
+ CTLTYPE_LONG, minaddress,
+ SYSCTL_DESCR(Minimum user address),
+ NULL, VM_MINADDRESS, NULL, 0,
+ CTL_VM, VM_MINADDRESS, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
+ CTLTYPE_LONG, maxaddress,
+ SYSCTL_DESCR(Maximum user address),
+ NULL, VM_MAXUSER_ADDRESS, NULL, 0,
+ CTL_VM, VM_MAXADDRESS, CTL_EOL);
uvmpdpol_sysctlsetup();
}
Index: src/sys/uvm/uvm_param.h
diff -u src/sys/uvm/uvm_param.h:1.33 src/sys/uvm/uvm_param.h:1.34
--- src/sys/uvm/uvm_param.h:1.33 Sat Jan 25 15:17:17 2014
+++ src/sys/uvm/uvm_param.h Wed Feb 26 16:11:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_param.h,v 1.33 2014/01/25 15:17:17 christos Exp $ */
+/* $NetBSD: uvm_param.h,v 1.34 2014/02/26 16:11:59 matt Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -175,8 +175,10 @@ extern const int *const uvmexp_pageshift
#define VM_ANONMAX 11
#define VM_EXECMAX 12
#define VM_FILEMAX 13
+#define VM_MINADDRESS 14
+#define VM_MAXADDRESS 15
-#define VM_MAXID 14 /* number of valid vm ids */
+#define VM_MAXID 16 /* number of valid vm ids */
#define CTL_VM_NAMES { \
{ 0, 0 }, \
@@ -193,6 +195,8 @@ extern const int *const uvmexp_pageshift
{ anonmax, CTLTYPE_INT }, \
{ execmax, CTLTYPE_INT }, \
{ filemax, CTLTYPE_INT }, \
+ { minaddress, CTLTYPE_LONG }, \
+ { maxaddress, CTLTYPE_LONG }, \
}
#ifndef ASSEMBLER
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: martin Date: Wed Feb 26 16:16:18 UTC 2014 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Revert previous - will fix userland with new sysctls for VM_MIN_ADDRESS/ VM_MAXADDESS. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/include/arm32/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.32 src/sys/arch/arm/include/arm32/vmparam.h:1.33 --- src/sys/arch/arm/include/arm32/vmparam.h:1.32 Wed Feb 26 11:00:40 2014 +++ src/sys/arch/arm/include/arm32/vmparam.h Wed Feb 26 16:16:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.32 2014/02/26 11:00:40 martin Exp $ */ +/* $NetBSD: vmparam.h,v 1.33 2014/02/26 16:16:18 martin Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -45,7 +45,6 @@ */ #include arm/arm32/pte.h /* pt_entry_t */ -#include arm/arm32/param.h /* PGSHIFT for PAGE_SIZE */ #define USRSTACK VM_MAXUSER_ADDRESS
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Wed Feb 26 17:35:21 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Don't do ref/mod emulation for KENTRY pages.
l2pte_minidata - l2pte_minidata_p
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/arch/arm/arm32/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/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.267 src/sys/arch/arm/arm32/pmap.c:1.268
--- src/sys/arch/arm/arm32/pmap.c:1.267 Wed Feb 26 02:07:58 2014
+++ src/sys/arch/arm/arm32/pmap.c Wed Feb 26 17:35:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.267 2014/02/26 02:07:58 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.268 2014/02/26 17:35:21 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -209,7 +209,7 @@
#include arm/locore.h
#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.267 2014/02/26 02:07:58 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.268 2014/02/26 17:35:21 matt Exp $);
#ifdef PMAP_DEBUG
@@ -601,6 +601,8 @@ struct pv_entry {
#define PV_BEEN_EXECD(f) (((f) (PVF_REF | PVF_EXEC)) == (PVF_REF | PVF_EXEC))
#endif
#define PV_IS_EXEC_P(f) (((f) PVF_EXEC) != 0)
+#define PV_IS_KENTRY_P(f) (((f) PVF_KENTRY) != 0)
+#define PV_IS_WRITE_P(f) (((f) PVF_WRITE) != 0)
/*
* Macro to determine if a mapping might be resident in the
@@ -879,11 +881,12 @@ pmap_enter_pv(struct vm_page_md *md, pad
* Insert unmanaged entries, writeable first, at the head of
* the pv list.
*/
- if (__predict_true((flags PVF_KENTRY) == 0)) {
- while (*pvp != NULL (*pvp)-pv_flags PVF_KENTRY)
+ if (__predict_true(!PV_IS_KENTRY_P(flags))) {
+ while (*pvp != NULL PV_IS_KENTRY_P((*pvp)-pv_flags))
pvp = SLIST_NEXT(*pvp, pv_link);
- } else if ((flags PVF_WRITE) == 0) {
- while (*pvp != NULL (*pvp)-pv_flags PVF_WRITE)
+ }
+ if (!PV_IS_WRITE_P(flags)) {
+ while (*pvp != NULL PV_IS_WRITE_P((*pvp)-pv_flags))
pvp = SLIST_NEXT(*pvp, pv_link);
}
#endif
@@ -1067,8 +1070,8 @@ pmap_modify_pv(struct vm_page_md *md, pa
struct pv_entry *npv;
u_int flags, oflags;
- KASSERT((clr_mask PVF_KENTRY) == 0);
- KASSERT((set_mask PVF_KENTRY) == 0);
+ KASSERT(!PV_IS_KENTRY_P(clr_mask));
+ KASSERT(!PV_IS_KENTRY_P(set_mask));
if ((npv = pmap_find_pv(md, pm, va)) == NULL)
return (0);
@@ -2175,7 +2178,7 @@ pmap_clearbit(struct vm_page_md *md, pad
/*
* Kernel entries are unmanaged and as such not to be changed.
*/
- if (oflags PVF_KENTRY)
+ if (PV_IS_KENTRY_P(oflags))
continue;
pv-pv_flags = ~maskbits;
@@ -2623,7 +2626,7 @@ pmap_page_remove(struct vm_page_md *md,
* Move it back on the list and advance the end-of-list
* pointer.
*/
- if (pv-pv_flags PVF_KENTRY) {
+ if (PV_IS_KENTRY_P(pv-pv_flags)) {
*pvp = pv;
pvp = SLIST_NEXT(pv, pv_link);
pv = npv;
@@ -3280,7 +3283,7 @@ pmap_kremove_pg(struct vm_page *pg, vadd
pv = pmap_remove_pv(md, pa, pmap_kernel(), va);
KASSERT(pv);
- KASSERT(pv-pv_flags PVF_KENTRY);
+ KASSERT(PV_IS_KENTRY_P(pv-pv_flags));
/*
* If we are removing a writeable mapping to a cached exec page,
@@ -3880,7 +3883,7 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va,
#endif
pv = pmap_find_pv(md, pm, va);
- if (pv == NULL) {
+ if (pv == NULL || PV_IS_KENTRY_P(pv-pv_flags)) {
goto out;
}
@@ -3940,7 +3943,7 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va,
#endif
pv = pmap_find_pv(md, pm, va);
- if (pv == NULL) {
+ if (pv == NULL || PV_IS_KENTRY_P(pv-pv_flags)) {
goto out;
}
@@ -6436,7 +6439,7 @@ pmap_uarea(vaddr_t va)
while (va next_bucket) {
const pt_entry_t opte = *ptep;
- if (!l2pte_minidata(opte)) {
+ if (!l2pte_minidata_p(opte)) {
cpu_dcache_wbinv_range(va, PAGE_SIZE);
cpu_tlb_flushD_SE(va);
l2pte_set(ptep, opte ~L2_B, opte);
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: martin Date: Wed Feb 26 19:41:46 UTC 2014 Modified Files: src/sys/arch/arm/marvell: mvsoctmr.c Log Message: Initialize mvsoctmr_freq earlier (in mvsoctmr_attach) to avoid division by zero in calculation of the watchdog parameters. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/marvell/mvsoctmr.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/mvsoctmr.c diff -u src/sys/arch/arm/marvell/mvsoctmr.c:1.11 src/sys/arch/arm/marvell/mvsoctmr.c:1.12 --- src/sys/arch/arm/marvell/mvsoctmr.c:1.11 Mon Feb 17 05:25:32 2014 +++ src/sys/arch/arm/marvell/mvsoctmr.c Wed Feb 26 19:41:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoctmr.c,v 1.11 2014/02/17 05:25:32 kiyohara Exp $ */ +/* $NetBSD: mvsoctmr.c,v 1.12 2014/02/26 19:41:46 martin Exp $ */ /* * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mvsoctmr.c,v 1.11 2014/02/17 05:25:32 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: mvsoctmr.c,v 1.12 2014/02/26 19:41:46 martin Exp $); #include opt_ddb.h #include opt_mvsoc.h @@ -185,6 +185,14 @@ mvsoctmr_attach(device_t parent, device_ db_trap_callback = mvsoctmr_wdog_ddb_trap; #endif + if (sc-sc_flags TMR_FLAGS_25MHZ) + /* We set global timer and counter to 25 MHz mode */ + mvsoctmr_freq = 2500; + else if (sc-sc_flags TMR_FLAGS_SYSCLK) + mvsoctmr_freq = mvSysclk; + else + mvsoctmr_freq = mvTclk; + sc-sc_wdog.smw_name = device_xname(self); sc-sc_wdog.smw_cookie = sc; sc-sc_wdog.smw_setmode = mvsoctmr_wdog_setmode; @@ -248,14 +256,6 @@ cpu_initclocks(void) if (sc == NULL) panic(cpu_initclocks: mvsoctmr not found); - if (sc-sc_flags TMR_FLAGS_25MHZ) - /* We set global timer and counter to 25 MHz mode */ - mvsoctmr_freq = 2500; - else if (sc-sc_flags TMR_FLAGS_SYSCLK) - mvsoctmr_freq = mvSysclk; - else - mvsoctmr_freq = mvTclk; - mvsoctmr_timecounter.tc_priv = sc; mvsoctmr_timecounter.tc_frequency = mvsoctmr_freq;
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Wed Feb 26 19:59:49 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Only track kenter_pa'ed pages if arm_cache_prefer_mask is non-zero.
To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 src/sys/arch/arm/arm32/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/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.268 src/sys/arch/arm/arm32/pmap.c:1.269
--- src/sys/arch/arm/arm32/pmap.c:1.268 Wed Feb 26 17:35:21 2014
+++ src/sys/arch/arm/arm32/pmap.c Wed Feb 26 19:59:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.268 2014/02/26 17:35:21 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.269 2014/02/26 19:59:49 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -209,7 +209,7 @@
#include arm/locore.h
#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.268 2014/02/26 17:35:21 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.269 2014/02/26 19:59:49 matt Exp $);
#ifdef PMAP_DEBUG
@@ -3346,7 +3346,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
#ifdef DIAGNOSTIC
struct vm_page_md *omd = VM_PAGE_TO_MD(opg);
#endif
- if (opg) {
+ if (opg arm_cache_prefer_mask != 0) {
KASSERT(opg != pg);
KASSERT((omd-pvh_attrs PVF_KMPAGE) == 0);
KASSERT((flags PMAP_KMPAGE) == 0);
@@ -3406,7 +3406,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
#endif
pmap_kmpages++;
#ifdef PMAP_CACHE_VIPT
- } else {
+ } else if (arm_cache_prefer_mask != 0) {
if (pv == NULL) {
pv = pool_get(pmap_pv_pool, PR_NOWAIT);
KASSERT(pv != NULL);
@@ -3473,7 +3473,7 @@ pmap_kremove(vaddr_t va, vsize_t len)
#endif
pmap_kmpages--;
#ifdef PMAP_CACHE_VIPT
-} else {
+} else if (arm_cache_prefer_mask != 0) {
pool_put(pmap_pv_pool,
pmap_kremove_pg(opg, va));
#endif
CVS commit: src/sys/uvm
Module Name:src Committed By: martin Date: Wed Feb 26 20:33:53 UTC 2014 Modified Files: src/sys/uvm: uvm_meter.c Log Message: Fix copy pasto To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/uvm/uvm_meter.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/uvm/uvm_meter.c diff -u src/sys/uvm/uvm_meter.c:1.62 src/sys/uvm/uvm_meter.c:1.63 --- src/sys/uvm/uvm_meter.c:1.62 Wed Feb 26 16:11:59 2014 +++ src/sys/uvm/uvm_meter.c Wed Feb 26 20:33:53 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_meter.c,v 1.62 2014/02/26 16:11:59 matt Exp $ */ +/* $NetBSD: uvm_meter.c,v 1.63 2014/02/26 20:33:53 martin Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.62 2014/02/26 16:11:59 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.63 2014/02/26 20:33:53 martin Exp $); #include sys/param.h #include sys/systm.h @@ -272,13 +272,13 @@ SYSCTL_SETUP(sysctl_vm_setup, sysctl vm CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE, CTLTYPE_LONG, minaddress, SYSCTL_DESCR(Minimum user address), - NULL, VM_MINADDRESS, NULL, 0, + NULL, VM_MIN_ADDRESS, NULL, 0, CTL_VM, VM_MINADDRESS, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE, CTLTYPE_LONG, maxaddress, SYSCTL_DESCR(Maximum user address), - NULL, VM_MAXUSER_ADDRESS, NULL, 0, + NULL, VM_MAX_ADDRESS, NULL, 0, CTL_VM, VM_MAXADDRESS, CTL_EOL); uvmpdpol_sysctlsetup();
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: martin
Date: Wed Feb 26 20:49:27 UTC 2014
Modified Files:
src/tests/lib/libc/sys: t_mlock.c
Log Message:
Remove hardcoded VM_MIN_ADDRESS and instead query current value via
sysctl vm.minaddress.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_mlock.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/sys/t_mlock.c
diff -u src/tests/lib/libc/sys/t_mlock.c:1.4 src/tests/lib/libc/sys/t_mlock.c:1.5
--- src/tests/lib/libc/sys/t_mlock.c:1.4 Sat Sep 8 12:25:05 2012
+++ src/tests/lib/libc/sys/t_mlock.c Wed Feb 26 20:49:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mlock.c,v 1.4 2012/09/08 12:25:05 martin Exp $ */
+/* $NetBSD: t_mlock.c,v 1.5 2014/02/26 20:49:26 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,13 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_mlock.c,v 1.4 2012/09/08 12:25:05 martin Exp $);
+__RCSID($NetBSD: t_mlock.c,v 1.5 2014/02/26 20:49:26 martin Exp $);
#include sys/mman.h
#include sys/resource.h
+#include sys/sysctl.h
#include sys/wait.h
-#define _KMEMUSER
-#include machine/vmparam.h
#include errno.h
#include atf-c.h
@@ -80,13 +79,16 @@ ATF_TC_HEAD(mlock_err, tc)
ATF_TC_BODY(mlock_err, tc)
{
+ unsigned long vmin = 0;
+ size_t len = sizeof(vmin);
void *invalid_ptr;
int null_errno = ENOMEM; /* error expected for NULL */
-#ifdef VM_MIN_ADDRESS
- if ((uintptr_t)VM_MIN_ADDRESS 0)
+ if (sysctlbyname(vm.minaddress, vmin, len, NULL, 0) != 0)
+ atf_tc_fail(failed to read vm.minaddress);
+
+ if (vmin 0)
null_errno = EINVAL; /* NULL is not inside user VM */
-#endif
errno = 0;
ATF_REQUIRE_ERRNO(null_errno, mlock(NULL, page) == -1);
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Wed Feb 26 21:18:14 UTC 2014
Modified Files:
src/external/gpl3/gcc: gcc2gcc.old
Log Message:
fix a typo (from cegger)
fix the date call (from tn)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/gcc2gcc.old
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/gcc2gcc.old
diff -u src/external/gpl3/gcc/gcc2gcc.old:1.1 src/external/gpl3/gcc/gcc2gcc.old:1.2
--- src/external/gpl3/gcc/gcc2gcc.old:1.1 Wed Feb 26 10:50:23 2014
+++ src/external/gpl3/gcc/gcc2gcc.old Wed Feb 26 21:18:14 2014
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: gcc2gcc.old,v 1.1 2014/02/26 10:50:23 mrg Exp $
+# $NetBSD: gcc2gcc.old,v 1.2 2014/02/26 21:18:14 mrg Exp $
# run it like eg:
#
@@ -13,7 +13,7 @@ progname=$(basename $0)
usage() {
echo Usage: $progname src/external/gpl3/gcc copy-to-dir 12
- edho Note that copy-to-dir must not exist. 12
+ echo Note that copy-to-dir must not exist. 12
exit 1
}
@@ -55,7 +55,7 @@ $doit find $destdir -name CVS -exec rm
$doit find $destdir -name ChangeLog* -exec rm -f {} +
$doit rm -f $destdir/gcc2netbsd $destdir/gcc2gcc.old
-date=$(date +%Y%m%M-%H%M)
+date=$(date +%Y%m%d-%H%M)
echo GCC copied to gcc.old. use these commands to import:
echo cd $destdir/gcc
echo cvs import src/external/gpl3/gcc.old NetBSD src-external-gpl3-gcc-$date
CVS commit: src/sys/arch/macppc/stand/ofwboot
Module Name:src Committed By: macallan Date: Wed Feb 26 21:42:40 UTC 2014 Modified Files: src/sys/arch/macppc/stand/ofwboot: Locore.c Log Message: support 601, from scole_mail To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/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/macppc/stand/ofwboot/Locore.c diff -u src/sys/arch/macppc/stand/ofwboot/Locore.c:1.24 src/sys/arch/macppc/stand/ofwboot/Locore.c:1.25 --- src/sys/arch/macppc/stand/ofwboot/Locore.c:1.24 Sun Jul 17 20:54:43 2011 +++ src/sys/arch/macppc/stand/ofwboot/Locore.c Wed Feb 26 21:42:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: Locore.c,v 1.24 2011/07/17 20:54:43 joerg Exp $ */ +/* $NetBSD: Locore.c,v 1.25 2014/02/26 21:42:40 macallan Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -69,6 +69,12 @@ __asm( mtmsr %r0 \n isync \n \n +\n /* test for 601 */ + mfspr %r0,287 \n /* mfpvbr %r0 PVR = 287 */ + srwi%r0,%r0,0x10 \n + cmpi0,1,%r0,0x02 \n /* 601 CPU = 0x0001 */ + blt 1f \n /* skip over non-601 BAT setup */ + /*non PPC 601 BATs*/ mtibatu 0,%r0 \n mtibatu 1,%r0 \n mtibatu 2,%r0 \n @@ -84,7 +90,41 @@ __asm( li %r9,0x1ffe \n /* BATU(0, BAT_BL_256M, BAT_Vs) */ mtibatu 0,%r9 \n mtdbatu 0,%r9 \n - isync \n + b 2f \n + + /* PPC 601 BATs*/ +1: mtibatu 0,%r0 \n + mtibatu 1,%r0 \n + mtibatu 2,%r0 \n + mtibatu 3,%r0 \n + \n + li %r9,0x7f\n + mtibatl 0,%r9 \n + li %r9,0x1a\n + mtibatu 0,%r9 \n +\n + lis %r9,0x80 \n + addi %r9,%r9,0x7f \n + mtibatl 1,%r9 \n + lis %r9,0x80 \n + addi %r9,%r9,0x1a \n + mtibatu 1,%r9 \n +\n + lis %r9,0x100 \n + addi %r9,%r9,0x7f \n + mtibatl 2,%r9 \n + lis %r9,0x100 \n + addi %r9,%r9,0x1a \n + mtibatu 2,%r9 \n +\n + lis %r9,0x180 \n + addi %r9,%r9,0x7f \n + mtibatl 3,%r9 \n + lis %r9,0x180 \n + addi %r9,%r9,0x1a \n + mtibatu 3,%r9 \n +\n +2: isync \n \n mtmsr %r8 \n isync \n
CVS commit: src/external/gpl3/gcc.old
Module Name:src Committed By: mrg Date: Wed Feb 26 22:04:17 UTC 2014 Removed Files: src/external/gpl3/gcc.old: difz Log Message: oops, did not mean to commit this. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gcc.old/difz Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/lib/libobjc
Module Name:src
Committed By: mrg
Date: Wed Feb 26 22:27:10 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libobjc: Makefile
Log Message:
oops, avoid re-setting DIST to something that might be wrong now.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libobjc/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/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.8 src/external/gpl3/gcc/lib/libobjc/Makefile:1.9
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.8 Wed Feb 26 09:54:33 2014
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Wed Feb 26 22:27:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/02/26 09:54:33 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/26 22:27:10 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -29,7 +29,6 @@ EXTRA_FAKEHEADERS=
LIBGCCOBJ!=cd ${.CURDIR}/../libgcc/libgcc ${PRINTOBJDIR}
DIST= ${GCCDIST}
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
GCCARCH= ${GCC_SUBDIR}/usr.bin/gcc/arch/${GCC_MACHINE_ARCH}
LIBOBJCARCH= ${GCC_SUBDIR}/lib/libobjc/arch/${GCC_MACHINE_ARCH}
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Wed Feb 26 22:29:40 UTC 2014
Modified Files:
src/external/gpl3/gcc: gcc2gcc.old
Log Message:
delete 'difz' as well, in case i've left it.
XXX: consider running 'cvs up -dPA -I\! -I.CVS -ICVS' first?
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/gcc2gcc.old
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/gcc2gcc.old
diff -u src/external/gpl3/gcc/gcc2gcc.old:1.2 src/external/gpl3/gcc/gcc2gcc.old:1.3
--- src/external/gpl3/gcc/gcc2gcc.old:1.2 Wed Feb 26 21:18:14 2014
+++ src/external/gpl3/gcc/gcc2gcc.old Wed Feb 26 22:29:40 2014
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: gcc2gcc.old,v 1.2 2014/02/26 21:18:14 mrg Exp $
+# $NetBSD: gcc2gcc.old,v 1.3 2014/02/26 22:29:40 mrg Exp $
# run it like eg:
#
@@ -53,7 +53,7 @@ echo Cleaning CVS turds and ChangeLogs
$doit find $destdir -name .CVS -exec rm -rf {} +
$doit find $destdir -name CVS -exec rm -rf {} +
$doit find $destdir -name ChangeLog* -exec rm -f {} +
-$doit rm -f $destdir/gcc2netbsd $destdir/gcc2gcc.old
+$doit rm -f $destdir/gcc2netbsd $destdir/gcc2gcc.old $destdir/difz
date=$(date +%Y%m%d-%H%M)
echo GCC copied to gcc.old. use these commands to import:
CVS import: src/sys/external/bsd/compiler_rt/dist
Module Name:src Committed By: joerg Date: Wed Feb 26 22:31:35 UTC 2014 Update of /cvsroot/src/sys/external/bsd/compiler_rt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2847 Log Message: Import compiler-rt r202303. Extend 128bit support to all LP64 platforms. Status: Vendor Tag: LLVM Release Tags: compiler-rt-202303 U src/sys/external/bsd/compiler_rt/dist/README.txt U src/sys/external/bsd/compiler_rt/dist/LICENSE.TXT U src/sys/external/bsd/compiler_rt/dist/CREDITS.TXT U src/sys/external/bsd/compiler_rt/dist/lib/profile/GCDAProfiling.c U src/sys/external/bsd/compiler_rt/dist/lib/profile/PGOProfiling.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/int_lib.h N src/sys/external/bsd/compiler_rt/dist/lib/builtins/udivsi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsc3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfdi.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/mulosi4.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/enable_execute_stack.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatuntixf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfsi.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/clear_cache.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/powidf2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatsidf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfti.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/negvsi2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/ffsdi2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatundisf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/subvdi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/umodsi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/muldc3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/trampoline_setup.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/powitf2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/addvsi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/ffsti2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/powixf2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsf3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatuntisf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/subvti3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixxfdi.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/mulvsi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/paritydi2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/int_math.h N src/sys/external/bsd/compiler_rt/dist/lib/builtins/mulxc3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatdixf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixxfti.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunssfdi.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/divmoddi4.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/negsf2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/subdf3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/parityti2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/muldf3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixdfsi.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashrdi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floattixf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunssfti.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/popcountdi2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/lshrdi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatdisf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/extendsfdf2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashrti3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/int_types.h N src/sys/external/bsd/compiler_rt/dist/lib/builtins/popcountti2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzdi2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfdi.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/udivmodsi4.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/lshrti3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floattisf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/muldi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/modsi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/ctzdi2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatundidf.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/addsf3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzti2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfti.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/udivdi3.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/absvsi2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/divdc3.c N
CVS commit: src
Module Name:src
Committed By: joerg
Date: Wed Feb 26 22:37:56 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
src/lib/libm/compiler_rt: Makefile.inc
src/sys/external/bsd/compiler_rt: prepare-import.sh
src/sys/lib/libkern: Makefile.compiler-rt
Log Message:
Update compiler-rt glue for the new source layout.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/compiler_rt/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/compiler_rt/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/compiler_rt/prepare-import.sh
cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libkern/Makefile.compiler-rt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.14 src/lib/libc/compiler_rt/Makefile.inc:1.15
--- src/lib/libc/compiler_rt/Makefile.inc:1.14 Wed Jan 29 22:38:18 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Wed Feb 26 22:37:56 2014
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile.inc,v 1.14 2014/01/29 22:38:18 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.15 2014/02/26 22:37:56 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
.if ${MACHINE_ARCH} == powerpc
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
.else
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_CPU}
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_ARCH}
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
.endif
.PATH: ${COMPILER_RT_CPU_DIR}
.PATH: ${COMPILER_RT_ARCH_DIR}
-.PATH: ${COMPILER_RT_SRCDIR}/lib
+.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins
.PATH: ${COMPILER_RT_SRCDIR}/lib/profile
# Complex support needs parts of libm
Index: src/lib/libm/compiler_rt/Makefile.inc
diff -u src/lib/libm/compiler_rt/Makefile.inc:1.4 src/lib/libm/compiler_rt/Makefile.inc:1.5
--- src/lib/libm/compiler_rt/Makefile.inc:1.4 Mon Feb 3 13:30:10 2014
+++ src/lib/libm/compiler_rt/Makefile.inc Wed Feb 26 22:37:56 2014
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile.inc,v 1.4 2014/02/03 13:30:10 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/02/26 22:37:56 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
.if ${MACHINE_ARCH} == powerpc
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
.else
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_CPU}
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_ARCH}
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
.endif
.PATH: ${COMPILER_RT_CPU_DIR}
.PATH: ${COMPILER_RT_ARCH_DIR}
-.PATH: ${COMPILER_RT_SRCDIR}/lib
+.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins
# Needs scaling support
GENERIC_SRCS+= \
Index: src/sys/external/bsd/compiler_rt/prepare-import.sh
diff -u src/sys/external/bsd/compiler_rt/prepare-import.sh:1.2 src/sys/external/bsd/compiler_rt/prepare-import.sh:1.3
--- src/sys/external/bsd/compiler_rt/prepare-import.sh:1.2 Wed Jan 15 21:07:19 2014
+++ src/sys/external/bsd/compiler_rt/prepare-import.sh Wed Feb 26 22:37:56 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.2 2014/01/15 21:07:19 joerg Exp $
+# $NetBSD: prepare-import.sh,v 1.3 2014/02/26 22:37:56 joerg Exp $
#
# Checkout compiler_rt into dist.
# Run this script and check for additional files and directories to prune,
@@ -9,9 +9,11 @@ set -e
cd dist
rm -rf .svn
-rm -rf BlocksRuntime SDKs cmake include make www
+rm -rf SDKs cmake include make third_party unittests www
rm -f .arcconfig .gitignore CMakeLists.txt Makefile
-rm -rf lib/asan lib/dfsan lib/interception lib/lsan lib/msan lib/msandr
-rm -rf lib/sanitizer_common lib/tsan lib/ubsan
-rm -f lib/*/Makefile.mk lib/Makefile.mk lib/CMakeLists.txt
-rm -f lib/apple_versioning.c lib/lit.common.* lib/profile/CMakeLists.txt
+rm -rf lib/BlocksRuntime lib/asan lib/dfsan lib/interception lib/lsan
+rm -rf lib/msan lib/msandr lib/sanitizer_common lib/tsan lib/ubsan
+rm -rf test/BlocksRuntime test/asan test/dfsan test/lit.* test/lsan test/msan test/sanitizer_common test/tsan test/ubsan
+rm -f lib/*/*/Makefile.mk lib/*/Makefile.mk */Makefile.mk
+rm -f lib/*/CMakeLists.txt */CMakeLists.txt
+rm -f lib/builtins/apple_versioning.c lib/lit.common.*
Index: src/sys/lib/libkern/Makefile.compiler-rt
diff -u src/sys/lib/libkern/Makefile.compiler-rt:1.3 src/sys/lib/libkern/Makefile.compiler-rt:1.4
---
CVS commit: src/sys/external/bsd/compiler_rt/dist/lib
Module Name:src Committed By: joerg Date: Wed Feb 26 22:40:09 UTC 2014 Removed Files: src/sys/external/bsd/compiler_rt/dist/lib: absvdi2.c absvsi2.c absvti2.c adddf3.c addsf3.c addvdi3.c addvsi3.c addvti3.c ashldi3.c ashlti3.c ashrdi3.c ashrti3.c assembly.h atomic.c clear_cache.c clzdi2.c clzsi2.c clzti2.c cmpdi2.c cmpti2.c comparedf2.c comparesf2.c ctzdi2.c ctzsi2.c ctzti2.c divdc3.c divdf3.c divdi3.c divmoddi4.c divmodsi4.c divsc3.c divsf3.c divsi3.c divti3.c divxc3.c enable_execute_stack.c eprintf.c extendsfdf2.c ffsdi2.c ffsti2.c fixdfdi.c fixdfsi.c fixdfti.c fixsfdi.c fixsfsi.c fixsfti.c fixunsdfdi.c fixunsdfsi.c fixunsdfti.c fixunssfdi.c fixunssfsi.c fixunssfti.c fixunsxfdi.c fixunsxfsi.c fixunsxfti.c fixxfdi.c fixxfti.c floatdidf.c floatdisf.c floatdixf.c floatsidf.c floatsisf.c floattidf.c floattisf.c floattixf.c floatundidf.c floatundisf.c floatundixf.c floatunsidf.c floatunsisf.c floatuntidf.c floatuntisf.c floatuntixf.c fp_lib.h gcc_personality_v0.c int_endianness.h int_lib.h int_math.h int_types.h int_util.c int_util.h lshrdi3.c lshrti3.c moddi3.c modsi3.c modti3.c muldc3.c muldf3.c muldi3.c mulodi4.c mulosi4.c muloti4.c mulsc3.c mulsf3.c multi3.c mulvdi3.c mulvsi3.c mulvti3.c mulxc3.c negdf2.c negdi2.c negsf2.c negti2.c negvdi2.c negvsi2.c negvti2.c paritydi2.c paritysi2.c parityti2.c popcountdi2.c popcountsi2.c popcountti2.c powidf2.c powisf2.c powitf2.c powixf2.c subdf3.c subsf3.c subvdi3.c subvsi3.c subvti3.c svn-commit.tmp trampoline_setup.c truncdfsf2.c ucmpdi2.c ucmpti2.c udivdi3.c udivmoddi4.c udivmodsi4.c udivmodti4.c udivsi3.c udivti3.c umoddi3.c umodsi3.c umodti3.c src/sys/external/bsd/compiler_rt/dist/lib/arm: adddf3vfp.S addsf3vfp.S aeabi_dcmp.S aeabi_fcmp.S aeabi_idivmod.S aeabi_ldivmod.S aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S aeabi_uidivmod.S aeabi_uldivmod.S bswapdi2.S bswapsi2.S clzdi2.S clzsi2.S comparesf2.S divdf3vfp.S divmodsi4.S divsf3vfp.S divsi3.S eqdf2vfp.S eqsf2vfp.S extendsfdf2vfp.S fixdfsivfp.S fixsfsivfp.S fixunsdfsivfp.S fixunssfsivfp.S floatsidfvfp.S floatsisfvfp.S floatunssidfvfp.S floatunssisfvfp.S gedf2vfp.S gesf2vfp.S gtdf2vfp.S gtsf2vfp.S ledf2vfp.S lesf2vfp.S ltdf2vfp.S ltsf2vfp.S modsi3.S muldf3vfp.S mulsf3vfp.S nedf2vfp.S negdf2vfp.S negsf2vfp.S nesf2vfp.S restore_vfp_d8_d15_regs.S save_vfp_d8_d15_regs.S softfloat-alias.list subdf3vfp.S subsf3vfp.S switch16.S switch32.S switch8.S switchu8.S sync_synchronize.S truncdfsf2vfp.S udivmodsi4.S udivsi3.S umodsi3.S unorddf2vfp.S unordsf2vfp.S src/sys/external/bsd/compiler_rt/dist/lib/i386: ashldi3.S ashrdi3.S divdi3.S floatdidf.S floatdisf.S floatdixf.S floatundidf.S floatundisf.S floatundixf.S lshrdi3.S moddi3.S muldi3.S udivdi3.S umoddi3.S src/sys/external/bsd/compiler_rt/dist/lib/lsan: CMakeLists.txt lsan.cc lsan.h lsan_allocator.cc lsan_allocator.h lsan_common.cc lsan_common.h lsan_common_linux.cc lsan_interceptors.cc lsan_thread.cc lsan_thread.h src/sys/external/bsd/compiler_rt/dist/lib/lsan/lit_tests: CMakeLists.txt lit.common.cfg src/sys/external/bsd/compiler_rt/dist/lib/lsan/lit_tests/AsanConfig: lit.cfg lit.site.cfg.in src/sys/external/bsd/compiler_rt/dist/lib/lsan/lit_tests/LsanConfig: lit.cfg lit.site.cfg.in src/sys/external/bsd/compiler_rt/dist/lib/lsan/lit_tests/TestCases: disabler.cc disabler_in_tsd_destructor.cc ignore_object.cc ignore_object_errors.cc large_allocation_leak.cc link_turned_off.cc stale_stack_leak.cc suppressions_default.cc suppressions_file.cc suppressions_file.cc.supp use_globals_initialized.cc use_globals_uninitialized.cc use_registers.cc use_stacks.cc use_stacks_threaded.cc use_tls_dynamic.cc use_tls_pthread_specific_dynamic.cc use_tls_pthread_specific_static.cc use_tls_static.cc use_unaligned.cc src/sys/external/bsd/compiler_rt/dist/lib/lsan/lit_tests/TestCases/SharedLibs: huge_tls_lib_so.cc lit.local.cfg src/sys/external/bsd/compiler_rt/dist/lib/lsan/lit_tests/Unit: lit.site.cfg.in src/sys/external/bsd/compiler_rt/dist/lib/lsan/tests: CMakeLists.txt lsan_dummy_unittest.cc lsan_testlib.cc src/sys/external/bsd/compiler_rt/dist/lib/ppc: DD.h divtc3.c fixtfdi.c fixunstfdi.c floatditf.c floatunditf.c gcc_qadd.c gcc_qdiv.c gcc_qmul.c gcc_qsub.c
CVS commit: src/usr.bin/w
Module Name:src
Committed By: joerg
Date: Thu Feb 27 00:49:46 UTC 2014
Modified Files:
src/usr.bin/w: w.c
Log Message:
struct member can't be null, if the pointer itself is valid.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/w/w.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/w/w.c
diff -u src/usr.bin/w/w.c:1.78 src/usr.bin/w/w.c:1.79
--- src/usr.bin/w/w.c:1.78 Wed Feb 19 20:42:14 2014
+++ src/usr.bin/w/w.c Thu Feb 27 00:49:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: w.c,v 1.78 2014/02/19 20:42:14 dsl Exp $ */
+/* $NetBSD: w.c,v 1.79 2014/02/27 00:49:46 joerg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)w.c 8.6 (Berkeley) 6/30/94;
#else
-__RCSID($NetBSD: w.c,v 1.78 2014/02/19 20:42:14 dsl Exp $);
+__RCSID($NetBSD: w.c,v 1.79 2014/02/27 00:49:46 joerg Exp $);
#endif
#endif /* not lint */
@@ -426,14 +426,10 @@ pr_args(struct kinfo_proc2 *kp)
left = argwidth;
argv = kvm_getargv2(kd, kp, (argwidth 0) ? 0 : argwidth);
if (argv == 0) {
- if (kp-p_comm == 0) {
- goto nothing;
- } else {
- fmt_putc('(', left);
- fmt_puts((char *)kp-p_comm, left);
- fmt_putc(')', left);
- return;
- }
+ fmt_putc('(', left);
+ fmt_puts((char *)kp-p_comm, left);
+ fmt_putc(')', left);
+ return;
}
while (*argv) {
fmt_puts(*argv, left);
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: joerg Date: Thu Feb 27 00:59:50 UTC 2014 Modified Files: src/tests/lib/libc/sys: t_msgctl.c t_msgget.c Log Message: Use an abs wide enough to cover the types involved. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/sys/t_msgctl.c cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_msgget.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/sys/t_msgctl.c diff -u src/tests/lib/libc/sys/t_msgctl.c:1.3 src/tests/lib/libc/sys/t_msgctl.c:1.4 --- src/tests/lib/libc/sys/t_msgctl.c:1.3 Fri Nov 11 05:06:01 2011 +++ src/tests/lib/libc/sys/t_msgctl.c Thu Feb 27 00:59:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: t_msgctl.c,v 1.3 2011/11/11 05:06:01 jruoho Exp $ */ +/* $NetBSD: t_msgctl.c,v 1.4 2014/02/27 00:59:50 joerg Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: t_msgctl.c,v 1.3 2011/11/11 05:06:01 jruoho Exp $); +__RCSID($NetBSD: t_msgctl.c,v 1.4 2014/02/27 00:59:50 joerg Exp $); #include sys/msg.h #include sys/stat.h @@ -316,7 +316,7 @@ ATF_TC_BODY(msgctl_time, tc) (void)msgsnd(id, msg, sizeof(struct msg), IPC_NOWAIT); (void)msgctl(id, IPC_STAT, msgds); - if (abs(t - msgds.msg_stime) 1) + if (llabs(t - msgds.msg_stime) 1) atf_tc_fail(time of last msgsnd(2) was not updated); if (msgds.msg_rtime != 0) @@ -328,7 +328,7 @@ ATF_TC_BODY(msgctl_time, tc) (void)msgrcv(id, msg, sizeof(struct msg), MSG_MTYPE_1, IPC_NOWAIT); (void)msgctl(id, IPC_STAT, msgds); - if (abs(t - msgds.msg_rtime) 1) + if (llabs(t - msgds.msg_rtime) 1) atf_tc_fail(time of last msgrcv(2) was not updated); /* Index: src/tests/lib/libc/sys/t_msgget.c diff -u src/tests/lib/libc/sys/t_msgget.c:1.1 src/tests/lib/libc/sys/t_msgget.c:1.2 --- src/tests/lib/libc/sys/t_msgget.c:1.1 Sat Nov 5 07:45:41 2011 +++ src/tests/lib/libc/sys/t_msgget.c Thu Feb 27 00:59:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: t_msgget.c,v 1.1 2011/11/05 07:45:41 jruoho Exp $ */ +/* $NetBSD: t_msgget.c,v 1.2 2014/02/27 00:59:50 joerg Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: t_msgget.c,v 1.1 2011/11/05 07:45:41 jruoho Exp $); +__RCSID($NetBSD: t_msgget.c,v 1.2 2014/02/27 00:59:50 joerg Exp $); #include sys/msg.h #include sys/stat.h @@ -178,7 +178,7 @@ ATF_TC_BODY(msgget_init, tc) ATF_CHECK(msgds.msg_perm.cgid == gid); ATF_CHECK(msgds.msg_perm.mode == 0600); - if (abs(t - msgds.msg_ctime) 5) + if (llabs(t - msgds.msg_ctime) 5) atf_tc_fail(msgget(2) initialized current time incorrectly); ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
CVS commit: src/tools/compat
Module Name:src Committed By: matt Date: Thu Feb 27 01:07:52 UTC 2014 Modified Files: src/tools/compat: nl_types.h Log Message: To build elftosb with clang++, it needs more than nl_types.h provides. XXX to workaround with, if compiling on __NetBSD__ just include the real nl_types.h To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/compat/nl_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/nl_types.h diff -u src/tools/compat/nl_types.h:1.1 src/tools/compat/nl_types.h:1.2 --- src/tools/compat/nl_types.h:1.1 Tue Jan 29 10:20:32 2002 +++ src/tools/compat/nl_types.h Thu Feb 27 01:07:52 2014 @@ -1,5 +1,5 @@ -/* $NetBSD: nl_types.h,v 1.1 2002/01/29 10:20:32 tv Exp $ */ +/* $NetBSD: nl_types.h,v 1.2 2014/02/27 01:07:52 matt Exp $ */ -#ifdef _NLS_PRIVATE +#if defined(_NLS_PRIVATE) || defined(__NetBSD__) #include ../../include/nl_types.h #endif
CVS commit: src/usr.bin/getaddrinfo
Module Name:src
Committed By: ginsbach
Date: Thu Feb 27 01:17:13 UTC 2014
Modified Files:
src/usr.bin/getaddrinfo: tables.awk
Log Message:
AF_MAX isn't an address family so don't include it in the generated table.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/getaddrinfo/tables.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/getaddrinfo/tables.awk
diff -u src/usr.bin/getaddrinfo/tables.awk:1.1 src/usr.bin/getaddrinfo/tables.awk:1.2
--- src/usr.bin/getaddrinfo/tables.awk:1.1 Mon Sep 30 06:19:22 2013
+++ src/usr.bin/getaddrinfo/tables.awk Thu Feb 27 01:17:13 2014
@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
-# $NetBSD: tables.awk,v 1.1 2013/09/30 06:19:22 riastradh Exp $
+# $NetBSD: tables.awk,v 1.2 2014/02/27 01:17:13 ginsbach Exp $
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,7 +38,7 @@ BEGIN {
next
}
-$2 ~ /^AF_[A-Z0-9_]*$/ {
+($2 ~ /^AF_[A-Z0-9_]*$/) ($2 != AF_MAX) {
afs[n_afs++] = substr($2, 4)
}
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: joerg
Date: Thu Feb 27 01:30:18 UTC 2014
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_htable.c
Log Message:
A member of a non-null struct pointer can't be null.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/ipf/netinet/ip_htable.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/ip_htable.c
diff -u src/sys/external/bsd/ipf/netinet/ip_htable.c:1.4 src/sys/external/bsd/ipf/netinet/ip_htable.c:1.5
--- src/sys/external/bsd/ipf/netinet/ip_htable.c:1.4 Sat Sep 14 11:41:45 2013
+++ src/sys/external/bsd/ipf/netinet/ip_htable.c Thu Feb 27 01:30:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_htable.c,v 1.4 2013/09/14 11:41:45 martin Exp $ */
+/* $NetBSD: ip_htable.c,v 1.5 2014/02/27 01:30:18 joerg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -60,7 +60,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_htable.c,v 1.4 2013/09/14 11:41:45 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_htable.c,v 1.5 2014/02/27 01:30:18 joerg Exp $);
#else
static const char rcsid[] = @(#)Id: ip_htable.c,v 1.1.1.2 2012/07/22 13:45:19 darrenr Exp;
#endif
@@ -625,8 +625,7 @@ ipf_htent_remove(ipf_main_softc_t *softc
switch (iph-iph_type ~IPHASH_ANON)
{
case IPHASH_GROUPMAP :
- if (ipe-ipe_group != NULL)
- ipf_group_del(softc, ipe-ipe_ptr, NULL);
+ ipf_group_del(softc, ipe-ipe_ptr, NULL);
break;
default :
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: joerg
Date: Thu Feb 27 01:30:42 UTC 2014
Modified Files:
src/sys/dev/pci: if_ti.c
Log Message:
Remove impossible checks.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/pci/if_ti.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ti.c
diff -u src/sys/dev/pci/if_ti.c:1.91 src/sys/dev/pci/if_ti.c:1.92
--- src/sys/dev/pci/if_ti.c:1.91 Sat Oct 27 17:18:34 2012
+++ src/sys/dev/pci/if_ti.c Thu Feb 27 01:30:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.91 2012/10/27 17:18:34 chs Exp $ */
+/* $NetBSD: if_ti.c,v 1.92 2014/02/27 01:30:42 joerg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ti.c,v 1.91 2012/10/27 17:18:34 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ti.c,v 1.92 2014/02/27 01:30:42 joerg Exp $);
#include opt_inet.h
@@ -484,9 +484,6 @@ ti_handle_events(struct ti_softc *sc)
{
struct ti_event_desc *e;
- if (sc-ti_rdata-ti_event_ring == NULL)
- return;
-
while (sc-ti_ev_saved_considx != sc-ti_ev_prodidx.ti_idx) {
e = sc-ti_rdata-ti_event_ring[sc-ti_ev_saved_considx];
switch (TI_EVENT_EVENT(e)) {
@@ -1010,9 +1007,6 @@ ti_free_tx_ring(struct ti_softc *sc)
int i;
struct txdmamap_pool_entry *dma;
- if (sc-ti_rdata-ti_tx_ring == NULL)
- return;
-
for (i = 0; i TI_TX_RING_CNT; i++) {
if (sc-ti_cdata.ti_tx_chain[i] != NULL) {
m_freem(sc-ti_cdata.ti_tx_chain[i]);
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src
Committed By: joerg
Date: Thu Feb 27 01:31:09 UTC 2014
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5212: ar5212_reset.c
Log Message:
abs on unsigned values is a nop.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/isc/atheros_hal/dist/ar5212/ar5212_reset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5212/ar5212_reset.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5212/ar5212_reset.c:1.4 src/sys/external/isc/atheros_hal/dist/ar5212/ar5212_reset.c:1.5
--- src/sys/external/isc/atheros_hal/dist/ar5212/ar5212_reset.c:1.4 Mon Mar 7 11:25:43 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5212/ar5212_reset.c Thu Feb 27 01:31:09 2014
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5212_reset.c,v 1.4 2011/03/07 11:25:43 cegger Exp $
+ * $Id: ar5212_reset.c,v 1.5 2014/02/27 01:31:09 joerg Exp $
*/
#include opt_ah.h
@@ -2510,7 +2510,7 @@ ar5212GetLowerUpperValues(uint16_t v, ui
* If value is close to the current value of the list
* then target is not between values, it is one of the values
*/
- if (abs(lp[0] * EEP_SCALE - target) EEP_DELTA) {
+ if (lp[0] * EEP_SCALE - target EEP_DELTA) {
*vlo = *vhi = lp[0];
return;
}
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: joerg
Date: Thu Feb 27 01:40:07 UTC 2014
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_nat.c
Log Message:
Checking the return value of an allocator works better, when looking at
the stored pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/ipf/netinet/ip_nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/ip_nat.c
diff -u src/sys/external/bsd/ipf/netinet/ip_nat.c:1.10 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.11
--- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.10 Sat Sep 14 11:51:47 2013
+++ src/sys/external/bsd/ipf/netinet/ip_nat.c Thu Feb 27 01:40:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat.c,v 1.10 2013/09/14 11:51:47 martin Exp $ */
+/* $NetBSD: ip_nat.c,v 1.11 2014/02/27 01:40:07 joerg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -113,7 +113,7 @@ extern struct ifnet vpnif;
#if !defined(lint)
#if defined(__NetBSD__)
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_nat.c,v 1.10 2013/09/14 11:51:47 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_nat.c,v 1.11 2014/02/27 01:40:07 joerg Exp $);
#else
static const char sccsid[] = @(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed;
static const char rcsid[] = @(#)Id: ip_nat.c,v 1.1.1.2 2012/07/22 13:45:27 darrenr Exp;
@@ -7904,13 +7904,13 @@ ipf_nat_rehash(ipf_main_softc_t *softc,
* the outbound lookup table and the hash chain length for each.
*/
KMALLOCS(newtab[0], nat_t **, newsize * sizeof(nat_t *));
- if (newtab == NULL) {
+ if (newtab[0] == NULL) {
error = 60063;
goto badrehash;
}
KMALLOCS(newtab[1], nat_t **, newsize * sizeof(nat_t *));
- if (newtab == NULL) {
+ if (newtab[1] == NULL) {
error = 60064;
goto badrehash;
}
CVS commit: src/lib/csu/sh3_elf
Module Name:src Committed By: uwe Date: Thu Feb 27 02:14:27 UTC 2014 Removed Files: src/lib/csu/sh3_elf: Makefile crt0.c dot_init.h Log Message: G/c old unused sh3 csu. Requested by joerg@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/lib/csu/sh3_elf/Makefile cvs rdiff -u -r1.12 -r0 src/lib/csu/sh3_elf/crt0.c cvs rdiff -u -r1.7 -r0 src/lib/csu/sh3_elf/dot_init.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/imx
Module Name:src Committed By: hkenken Date: Thu Feb 27 03:09:58 UTC 2014 Modified Files: src/sys/arch/arm/imx: imx51_tzicreg.h Log Message: fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx51_tzicreg.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/imx/imx51_tzicreg.h diff -u src/sys/arch/arm/imx/imx51_tzicreg.h:1.1 src/sys/arch/arm/imx/imx51_tzicreg.h:1.2 --- src/sys/arch/arm/imx/imx51_tzicreg.h:1.1 Sat Nov 13 07:11:03 2010 +++ src/sys/arch/arm/imx/imx51_tzicreg.h Thu Feb 27 03:09:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: imx51_tzicreg.h,v 1.1 2010/11/13 07:11:03 bsh Exp $ */ +/* $NetBSD: imx51_tzicreg.h,v 1.2 2014/02/27 03:09:57 hkenken Exp $ */ /* * Copyright (c) 2010 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #ifndef _ARM_IMX_IMX51_TZICREG_H_ -#define _ARM_IMX_IMX51_TZICRREG_H_ +#define _ARM_IMX_IMX51_TZICREG_H_ #include sys/cdefs.h @@ -50,4 +50,4 @@ #define TZIC_SWINT 0x0f00 #define TZIC_INTNUM 128 -#endif /* _ARM_IMX_IMX51_TZICRREG_H_ */ +#endif /* _ARM_IMX_IMX51_TZICREG_H_ */
CVS commit: src/external/gpl3/gcc/lib/libsupc++
Module Name:src
Committed By: mrg
Date: Thu Feb 27 07:35:04 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libsupc++: Makefile.common
Log Message:
fix another dated DIST.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libsupc++/Makefile.common
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/libsupc++/Makefile.common
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.4 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.5
--- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.4 Fri Aug 23 05:02:46 2013
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Thu Feb 27 07:35:04 2014
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.4 2013/08/23 05:02:46 matt Exp $
+# $NetBSD: Makefile.common,v 1.5 2014/02/27 07:35:04 mrg Exp $
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
