CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src
Committed By: ozaki-r
Date: Sun Mar 16 06:51:43 UTC 2014
Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile
Log Message:
Use MACHINE_CPU instead of MACHINE_ARCH with pattern matching
Include bsd.own.mk to use MACHINE_CPU.
Advised by matt@
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/lib/libdtrace/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/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.8 src/external/cddl/osnet/lib/libdtrace/Makefile:1.9
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.8 Sun Mar 16 05:11:19 2014
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Sun Mar 16 06:51:43 2014
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/03/16 05:11:19 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/16 06:51:43 ozaki-r Exp $
# $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
+.include bsd.own.mk
+
.include ../../Makefile.inc
LIB= dtrace
@@ -86,7 +88,7 @@ COPTS.dt_subr.c += -Wno-stack-protector
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
.elif ${MACHINE_ARCH} == sparc64
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
-.elif !empty(MACHINE_ARCH:M*arm*)
+.elif ${MACHINE_CPU} == arm
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
.PATH: ${.CURDIR}/../../dist/lib/libdtrace/arm
SRCS+= dt_isadep.c
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Sun Mar 16 07:57:25 UTC 2014
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
Remove the 'prot' argument from elf_load_psection(). It is not used
outside, and can be declared locally. Clearer.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/kern/exec_elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.63 src/sys/kern/exec_elf.c:1.64
--- src/sys/kern/exec_elf.c:1.63 Thu Mar 6 09:30:37 2014
+++ src/sys/kern/exec_elf.c Sun Mar 16 07:57:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.63 2014/03/06 09:30:37 matt Exp $ */
+/* $NetBSD: exec_elf.c,v 1.64 2014/03/16 07:57:25 maxv Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.63 2014/03/06 09:30:37 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.64 2014/03/16 07:57:25 maxv Exp $);
#ifdef _KERNEL_OPT
#include opt_pax.h
@@ -103,7 +103,7 @@ elf_load_file(struct lwp *, struct exec_
struct exec_vmcmd_set *, u_long *, Elf_Addr *);
static void
elf_load_psection(struct exec_vmcmd_set *, struct vnode *, const Elf_Phdr *,
-Elf_Addr *, u_long *, int *, int);
+Elf_Addr *, u_long *, int);
int netbsd_elf_signature(struct lwp *, struct exec_package *, Elf_Ehdr *);
int netbsd_elf_probe(struct lwp *, struct exec_package *, void *, char *,
@@ -317,10 +317,11 @@ elf_check_header(Elf_Ehdr *eh)
*/
static void
elf_load_psection(struct exec_vmcmd_set *vcset, struct vnode *vp,
-const Elf_Phdr *ph, Elf_Addr *addr, u_long *size, int *prot, int flags)
+const Elf_Phdr *ph, Elf_Addr *addr, u_long *size, int flags)
{
u_long msize, psize, rm, rf;
long diff, offset;
+ int vmprot = 0;
/*
* If the user specified an address, then we load there.
@@ -342,9 +343,9 @@ elf_load_psection(struct exec_vmcmd_set
} else
diff = 0;
- *prot |= (ph-p_flags PF_R) ? VM_PROT_READ : 0;
- *prot |= (ph-p_flags PF_W) ? VM_PROT_WRITE : 0;
- *prot |= (ph-p_flags PF_X) ? VM_PROT_EXECUTE : 0;
+ vmprot |= (ph-p_flags PF_R) ? VM_PROT_READ : 0;
+ vmprot |= (ph-p_flags PF_W) ? VM_PROT_WRITE : 0;
+ vmprot |= (ph-p_flags PF_X) ? VM_PROT_EXECUTE : 0;
/*
* Adjust everything so it all starts on a page boundary.
@@ -372,12 +373,12 @@ elf_load_psection(struct exec_vmcmd_set
if (psize 0) {
NEW_VMCMD2(vcset, ph-p_align PAGE_SIZE ?
vmcmd_map_readvn : vmcmd_map_pagedvn, psize, *addr, vp,
- offset, *prot, flags);
+ offset, vmprot, flags);
flags = VMCMD_RELATIVE;
}
if (psize *size) {
NEW_VMCMD2(vcset, vmcmd_map_readvn, *size - psize,
- *addr + psize, vp, offset + psize, *prot, flags);
+ *addr + psize, vp, offset + psize, vmprot, flags);
}
/*
@@ -389,7 +390,7 @@ elf_load_psection(struct exec_vmcmd_set
if (rm != rf) {
NEW_VMCMD2(vcset, vmcmd_map_zero, rm - rf, rf, NULLVP,
- 0, *prot, flags VMCMD_RELATIVE);
+ 0, vmprot, flags VMCMD_RELATIVE);
*size = msize;
}
}
@@ -556,7 +557,6 @@ elf_load_file(struct lwp *l, struct exec
switch (ph[i].p_type) {
case PT_LOAD: {
u_long size;
- int prot = 0;
int flags;
if (base_ph == NULL) {
@@ -596,7 +596,7 @@ elf_load_file(struct lwp *l, struct exec
}
last_ph = ph[i];
elf_load_psection(vcset, vp, ph[i], addr,
- size, prot, flags);
+ size, flags);
/*
* If entry is within this psection then this
* must contain the .text section. *entryoff is
@@ -749,12 +749,11 @@ exec_elf_makecmds(struct lwp *l, struct
for (i = 0; i eh-e_phnum; i++) {
Elf_Addr addr = ELFDEFNNAME(NO_ADDR);
u_long size = 0;
- int prot = 0;
switch (ph[i].p_type) {
case PT_LOAD:
elf_load_psection(epp-ep_vmcmds, epp-ep_vp,
- ph[i], addr, size, prot, VMCMD_FIXED);
+ ph[i], addr, size, VMCMD_FIXED);
/*
* Consider this as text segment, if it is executable.
CVS import: xsrc/external/mit/glproto/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 08:44:53 UTC 2014 Update of /cvsroot/xsrc/external/mit/glproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9963 Log Message: initial import of glproto-1.4.17 Status: Vendor Tag: xorg Release Tags: glproto-1-4-17 U xsrc/external/mit/glproto/dist/configure U xsrc/external/mit/glproto/dist/glxmd.h U xsrc/external/mit/glproto/dist/ChangeLog U xsrc/external/mit/glproto/dist/README U xsrc/external/mit/glproto/dist/glxtokens.h U xsrc/external/mit/glproto/dist/missing U xsrc/external/mit/glproto/dist/glproto.pc.in U xsrc/external/mit/glproto/dist/config.guess U xsrc/external/mit/glproto/dist/Makefile.am U xsrc/external/mit/glproto/dist/glxint.h U xsrc/external/mit/glproto/dist/glxproto.h U xsrc/external/mit/glproto/dist/COPYING U xsrc/external/mit/glproto/dist/aclocal.m4 U xsrc/external/mit/glproto/dist/INSTALL U xsrc/external/mit/glproto/dist/configure.ac N xsrc/external/mit/glproto/dist/compile U xsrc/external/mit/glproto/dist/config.sub U xsrc/external/mit/glproto/dist/Makefile.in U xsrc/external/mit/glproto/dist/glcore.h U xsrc/external/mit/glproto/dist/install-sh No conflicts created by this import
CVS import: xsrc/external/mit/presentproto/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 08:44:54 UTC 2014 Update of /cvsroot/xsrc/external/mit/presentproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28169 Log Message: initial import of presentproto-1.0 Status: Vendor Tag: xorg Release Tags: presentproto-1-0 N xsrc/external/mit/presentproto/dist/presentproto.txt N xsrc/external/mit/presentproto/dist/configure N xsrc/external/mit/presentproto/dist/ChangeLog N xsrc/external/mit/presentproto/dist/missing N xsrc/external/mit/presentproto/dist/presentproto.h N xsrc/external/mit/presentproto/dist/config.guess N xsrc/external/mit/presentproto/dist/presentproto.pc.in N xsrc/external/mit/presentproto/dist/Makefile.am N xsrc/external/mit/presentproto/dist/aclocal.m4 N xsrc/external/mit/presentproto/dist/INSTALL N xsrc/external/mit/presentproto/dist/presenttokens.h N xsrc/external/mit/presentproto/dist/configure.ac N xsrc/external/mit/presentproto/dist/config.sub N xsrc/external/mit/presentproto/dist/Makefile.in N xsrc/external/mit/presentproto/dist/install-sh No conflicts created by this import
CVS import: xsrc/external/mit/videoproto/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 08:44:55 UTC 2014 Update of /cvsroot/xsrc/external/mit/videoproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24570 Log Message: initial import of videoproto-2.3.2 Status: Vendor Tag: xorg Release Tags: videoproto-2-3-2 U xsrc/external/mit/videoproto/dist/config.sub U xsrc/external/mit/videoproto/dist/XvMC.h U xsrc/external/mit/videoproto/dist/xv-protocol-v2.txt U xsrc/external/mit/videoproto/dist/videoproto.pc.in U xsrc/external/mit/videoproto/dist/Makefile.am U xsrc/external/mit/videoproto/dist/vldXvMC.h U xsrc/external/mit/videoproto/dist/configure.ac U xsrc/external/mit/videoproto/dist/INSTALL U xsrc/external/mit/videoproto/dist/Makefile.in U xsrc/external/mit/videoproto/dist/XvMCproto.h U xsrc/external/mit/videoproto/dist/configure U xsrc/external/mit/videoproto/dist/missing U xsrc/external/mit/videoproto/dist/config.guess U xsrc/external/mit/videoproto/dist/install-sh U xsrc/external/mit/videoproto/dist/Xv.h U xsrc/external/mit/videoproto/dist/aclocal.m4 U xsrc/external/mit/videoproto/dist/ChangeLog U xsrc/external/mit/videoproto/dist/README N xsrc/external/mit/videoproto/dist/compile U xsrc/external/mit/videoproto/dist/COPYING U xsrc/external/mit/videoproto/dist/Xvproto.h No conflicts created by this import
CVS import: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 08:44:59 UTC 2014 Update of /cvsroot/xsrc/external/mit/xproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12271 Log Message: initial import of xproto-7.0.25 Status: Vendor Tag: xorg Release Tags: xproto-7-0-25 U xsrc/external/mit/xproto/dist/Xfuncproto.h.in U xsrc/external/mit/xproto/dist/Makefile.am U xsrc/external/mit/xproto/dist/Xarch.h U xsrc/external/mit/xproto/dist/Xatom.h U xsrc/external/mit/xproto/dist/xproto.pc.in U xsrc/external/mit/xproto/dist/INSTALL U xsrc/external/mit/xproto/dist/Xos_r.h U xsrc/external/mit/xproto/dist/install-sh U xsrc/external/mit/xproto/dist/Xw32defs.h U xsrc/external/mit/xproto/dist/Xthreads.h U xsrc/external/mit/xproto/dist/configure.ac U xsrc/external/mit/xproto/dist/aclocal.m4 U xsrc/external/mit/xproto/dist/Xdefs.h U xsrc/external/mit/xproto/dist/XF86keysym.h U xsrc/external/mit/xproto/dist/Makefile.in U xsrc/external/mit/xproto/dist/docbook.am U xsrc/external/mit/xproto/dist/configure U xsrc/external/mit/xproto/dist/Xfuncs.h U xsrc/external/mit/xproto/dist/ap_keysym.h U xsrc/external/mit/xproto/dist/ChangeLog U xsrc/external/mit/xproto/dist/keysym.h U xsrc/external/mit/xproto/dist/HPkeysym.h U xsrc/external/mit/xproto/dist/X.h U xsrc/external/mit/xproto/dist/keysymdef.h U xsrc/external/mit/xproto/dist/XWDFile.h U xsrc/external/mit/xproto/dist/AUTHORS N xsrc/external/mit/xproto/dist/compile U xsrc/external/mit/xproto/dist/Xprotostr.h U xsrc/external/mit/xproto/dist/config.sub U xsrc/external/mit/xproto/dist/do-not-use-config.h.in U xsrc/external/mit/xproto/dist/DECkeysym.h U xsrc/external/mit/xproto/dist/COPYING U xsrc/external/mit/xproto/dist/Sunkeysym.h U xsrc/external/mit/xproto/dist/Xwinsock.h U xsrc/external/mit/xproto/dist/Xproto.h U xsrc/external/mit/xproto/dist/Xmd.h U xsrc/external/mit/xproto/dist/config.guess U xsrc/external/mit/xproto/dist/missing U xsrc/external/mit/xproto/dist/Xwindows.h U xsrc/external/mit/xproto/dist/Xpoll.h.in U xsrc/external/mit/xproto/dist/Xos.h U xsrc/external/mit/xproto/dist/Xosdefs.h U xsrc/external/mit/xproto/dist/Xalloca.h U xsrc/external/mit/xproto/dist/README U xsrc/external/mit/xproto/dist/specs/x11protocol.xml U xsrc/external/mit/xproto/dist/specs/sect1-9.xml U xsrc/external/mit/xproto/dist/specs/glossary.xml U xsrc/external/mit/xproto/dist/specs/encoding.xml U xsrc/external/mit/xproto/dist/specs/keysyms.xml U xsrc/external/mit/xproto/dist/specs/Makefile.in U xsrc/external/mit/xproto/dist/specs/Makefile.am U xsrc/external/mit/xproto/dist/specs/SIAddresses/localuser.txt U xsrc/external/mit/xproto/dist/specs/SIAddresses/Makefile.am U xsrc/external/mit/xproto/dist/specs/SIAddresses/IPv6.txt U xsrc/external/mit/xproto/dist/specs/SIAddresses/Makefile.in U xsrc/external/mit/xproto/dist/specs/SIAddresses/hostname.txt U xsrc/external/mit/xproto/dist/specs/SIAddresses/README No conflicts created by this import
CVS import: xsrc/external/mit/xextproto/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 08:44:58 UTC 2014 Update of /cvsroot/xsrc/external/mit/xextproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5214 Log Message: initial import of xextproto-7.3.0 Status: Vendor Tag: xorg Release Tags: xextproto-7-3-0 U xsrc/external/mit/xextproto/dist/multibufproto.h U xsrc/external/mit/xextproto/dist/agproto.h U xsrc/external/mit/xextproto/dist/dbe.h U xsrc/external/mit/xextproto/dist/mitmiscconst.h U xsrc/external/mit/xextproto/dist/multibufconst.h U xsrc/external/mit/xextproto/dist/configure U xsrc/external/mit/xextproto/dist/shmproto.h U xsrc/external/mit/xextproto/dist/README U xsrc/external/mit/xextproto/dist/ChangeLog U xsrc/external/mit/xextproto/dist/missing U xsrc/external/mit/xextproto/dist/ag.h U xsrc/external/mit/xextproto/dist/dpmsproto.h U xsrc/external/mit/xextproto/dist/docbook.am U xsrc/external/mit/xextproto/dist/xtestext1proto.h U xsrc/external/mit/xextproto/dist/shmstr.h U xsrc/external/mit/xextproto/dist/dpmsconst.h U xsrc/external/mit/xextproto/dist/cup.h U xsrc/external/mit/xextproto/dist/xtestconst.h U xsrc/external/mit/xextproto/dist/config.guess U xsrc/external/mit/xextproto/dist/EVI.h U xsrc/external/mit/xextproto/dist/cupproto.h U xsrc/external/mit/xextproto/dist/securproto.h U xsrc/external/mit/xextproto/dist/syncconst.h U xsrc/external/mit/xextproto/dist/mitmiscproto.h U xsrc/external/mit/xextproto/dist/syncproto.h U xsrc/external/mit/xextproto/dist/Makefile.am U xsrc/external/mit/xextproto/dist/xextproto.pc.in U xsrc/external/mit/xextproto/dist/COPYING U xsrc/external/mit/xextproto/dist/shapeproto.h U xsrc/external/mit/xextproto/dist/xtestproto.h U xsrc/external/mit/xextproto/dist/ge.h U xsrc/external/mit/xextproto/dist/shm.h U xsrc/external/mit/xextproto/dist/syncstr.h U xsrc/external/mit/xextproto/dist/aclocal.m4 U xsrc/external/mit/xextproto/dist/xtestext1const.h U xsrc/external/mit/xextproto/dist/INSTALL U xsrc/external/mit/xextproto/dist/geproto.h U xsrc/external/mit/xextproto/dist/configure.ac U xsrc/external/mit/xextproto/dist/shapeconst.h U xsrc/external/mit/xextproto/dist/lbx.h U xsrc/external/mit/xextproto/dist/dbeproto.h N xsrc/external/mit/xextproto/dist/compile U xsrc/external/mit/xextproto/dist/shapestr.h U xsrc/external/mit/xextproto/dist/EVIproto.h U xsrc/external/mit/xextproto/dist/lbxproto.h U xsrc/external/mit/xextproto/dist/config.sub U xsrc/external/mit/xextproto/dist/secur.h U xsrc/external/mit/xextproto/dist/Makefile.in U xsrc/external/mit/xextproto/dist/install-sh U xsrc/external/mit/xextproto/dist/specs/appgrp.xml U xsrc/external/mit/xextproto/dist/specs/lbx.xml U xsrc/external/mit/xextproto/dist/specs/security.xml U xsrc/external/mit/xextproto/dist/specs/Makefile.am U xsrc/external/mit/xextproto/dist/specs/sync.xml U xsrc/external/mit/xextproto/dist/specs/shm.xml U xsrc/external/mit/xextproto/dist/specs/dpms.xml U xsrc/external/mit/xextproto/dist/specs/shape.xml U xsrc/external/mit/xextproto/dist/specs/geproto.xml U xsrc/external/mit/xextproto/dist/specs/multibuf.xml U xsrc/external/mit/xextproto/dist/specs/dbe.xml U xsrc/external/mit/xextproto/dist/specs/appendix.xml U xsrc/external/mit/xextproto/dist/specs/tog-cup.xml U xsrc/external/mit/xextproto/dist/specs/evi.xml U xsrc/external/mit/xextproto/dist/specs/Makefile.in U xsrc/external/mit/xextproto/dist/specs/xtest.xml No conflicts created by this import
CVS import: xsrc/external/mit/xcb-proto/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 08:44:57 UTC 2014 Update of /cvsroot/xsrc/external/mit/xcb-proto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24494 Log Message: initial import of xcb-proto-1.10 Status: Vendor Tag: xorg Release Tags: xcb-proto-1-10 U xsrc/external/mit/xcb-proto/dist/Makefile.am U xsrc/external/mit/xcb-proto/dist/missing U xsrc/external/mit/xcb-proto/dist/xcb-proto.pc.in U xsrc/external/mit/xcb-proto/dist/configure U xsrc/external/mit/xcb-proto/dist/Makefile.in U xsrc/external/mit/xcb-proto/dist/NEWS U xsrc/external/mit/xcb-proto/dist/install-sh U xsrc/external/mit/xcb-proto/dist/TODO U xsrc/external/mit/xcb-proto/dist/autogen.sh U xsrc/external/mit/xcb-proto/dist/INSTALL U xsrc/external/mit/xcb-proto/dist/COPYING U xsrc/external/mit/xcb-proto/dist/README U xsrc/external/mit/xcb-proto/dist/py-compile U xsrc/external/mit/xcb-proto/dist/configure.ac U xsrc/external/mit/xcb-proto/dist/aclocal.m4 U xsrc/external/mit/xcb-proto/dist/src/screensaver.xml U xsrc/external/mit/xcb-proto/dist/src/xfixes.xml U xsrc/external/mit/xcb-proto/dist/src/xvmc.xml U xsrc/external/mit/xcb-proto/dist/src/Makefile.am U xsrc/external/mit/xcb-proto/dist/src/glx.xml U xsrc/external/mit/xcb-proto/dist/src/xc_misc.xml U xsrc/external/mit/xcb-proto/dist/src/xinput.xml U xsrc/external/mit/xcb-proto/dist/src/xinerama.xml U xsrc/external/mit/xcb-proto/dist/src/dpms.xml U xsrc/external/mit/xcb-proto/dist/src/shm.xml U xsrc/external/mit/xcb-proto/dist/src/xv.xml N xsrc/external/mit/xcb-proto/dist/src/dri3.xml U xsrc/external/mit/xcb-proto/dist/src/composite.xml U xsrc/external/mit/xcb-proto/dist/src/xprint.xml U xsrc/external/mit/xcb-proto/dist/src/res.xml U xsrc/external/mit/xcb-proto/dist/src/xevie.xml U xsrc/external/mit/xcb-proto/dist/src/xcb.xsd U xsrc/external/mit/xcb-proto/dist/src/dri2.xml U xsrc/external/mit/xcb-proto/dist/src/sync.xml U xsrc/external/mit/xcb-proto/dist/src/xf86vidmode.xml U xsrc/external/mit/xcb-proto/dist/src/xselinux.xml U xsrc/external/mit/xcb-proto/dist/src/Makefile.in U xsrc/external/mit/xcb-proto/dist/src/render.xml U xsrc/external/mit/xcb-proto/dist/src/shape.xml U xsrc/external/mit/xcb-proto/dist/src/damage.xml U xsrc/external/mit/xcb-proto/dist/src/xproto.xml U xsrc/external/mit/xcb-proto/dist/src/bigreq.xml U xsrc/external/mit/xcb-proto/dist/src/randr.xml U xsrc/external/mit/xcb-proto/dist/src/ge.xml N xsrc/external/mit/xcb-proto/dist/src/present.xml U xsrc/external/mit/xcb-proto/dist/src/xkb.xml U xsrc/external/mit/xcb-proto/dist/src/xtest.xml U xsrc/external/mit/xcb-proto/dist/src/record.xml U xsrc/external/mit/xcb-proto/dist/src/xf86dri.xml U xsrc/external/mit/xcb-proto/dist/xcbgen/matcher.py U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.am U xsrc/external/mit/xcb-proto/dist/xcbgen/xtypes.py U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.in U xsrc/external/mit/xcb-proto/dist/xcbgen/error.py U xsrc/external/mit/xcb-proto/dist/xcbgen/state.py U xsrc/external/mit/xcb-proto/dist/xcbgen/__init__.py U xsrc/external/mit/xcb-proto/dist/xcbgen/expr.py U xsrc/external/mit/xcb-proto/dist/doc/xml-xcb.txt No conflicts created by this import
CVS import: xsrc/external/mit/dri3proto/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 08:45:00 UTC 2014 Update of /cvsroot/xsrc/external/mit/dri3proto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11210 Log Message: initial import of dri3proto-1.0 Status: Vendor Tag: xorg Release Tags: dri3proto-1-0 N xsrc/external/mit/dri3proto/dist/dri3proto.pc.in N xsrc/external/mit/dri3proto/dist/configure N xsrc/external/mit/dri3proto/dist/ChangeLog N xsrc/external/mit/dri3proto/dist/missing N xsrc/external/mit/dri3proto/dist/config.guess N xsrc/external/mit/dri3proto/dist/Makefile.am N xsrc/external/mit/dri3proto/dist/dri3proto.txt N xsrc/external/mit/dri3proto/dist/aclocal.m4 N xsrc/external/mit/dri3proto/dist/INSTALL N xsrc/external/mit/dri3proto/dist/configure.ac N xsrc/external/mit/dri3proto/dist/dri3proto.h N xsrc/external/mit/dri3proto/dist/config.sub N xsrc/external/mit/dri3proto/dist/Makefile.in N xsrc/external/mit/dri3proto/dist/install-sh No conflicts created by this import
CVS commit: src/tests/lib/csu/arch/ia64
Module Name:src Committed By: cherry Date: Sun Mar 16 09:20:05 UTC 2014 Added Files: src/tests/lib/csu/arch/ia64: h_initfini_align.S Log Message: Add stack align test stub for ia64 native csu To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/ia64/h_initfini_align.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/tests/lib/csu/arch/ia64/h_initfini_align.S diff -u /dev/null src/tests/lib/csu/arch/ia64/h_initfini_align.S:1.1 --- /dev/null Sun Mar 16 09:20:05 2014 +++ src/tests/lib/csu/arch/ia64/h_initfini_align.S Sun Mar 16 09:20:05 2014 @@ -0,0 +1,37 @@ +/* $NetBSD: h_initfini_align.S,v 1.1 2014/03/16 09:20:05 cherry Exp $ */ + +#include machine/asm.h + +RCSID($NetBSD: h_initfini_align.S,v 1.1 2014/03/16 09:20:05 cherry Exp $) + +ENTRY(check_stack_alignment, 0) + .prologue + .regstk 0, 2, 0, 0 + + alloc loc0 = ar.pfs, 0, 2, 0, 0 + + .body + mov ret0 = 1 + ;; + + /* ar.bspstore has an 8-byte alignment requirement */ + mov loc1 = ar.bsp + ;; + + and loc1 = 7, loc1 + ;; + + cmp.eq p1, p0 = 0, loc1 + (p0) mov ret0 = 0 + ;; + + /* sp has a 16-byte alignment requirement */ + (p1) mov loc1 = sp + ;; + (p1) and loc1 = 15, loc1 + ;; + + (p1) cmp.eq p1, p0 = 0, loc1 + (p0) mov ret0 = 0 + + br.ret.sptk.few rp
CVS commit: src/tests/lib/csu/arch/ia64
Module Name:src Committed By: cherry Date: Sun Mar 16 09:27:04 UTC 2014 Modified Files: src/tests/lib/csu/arch/ia64: h_initfini_align.S Log Message: Fix comment: ar.bsp is the RSE backing store base pointer, not ar.bspstore To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/csu/arch/ia64/h_initfini_align.S 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/csu/arch/ia64/h_initfini_align.S diff -u src/tests/lib/csu/arch/ia64/h_initfini_align.S:1.1 src/tests/lib/csu/arch/ia64/h_initfini_align.S:1.2 --- src/tests/lib/csu/arch/ia64/h_initfini_align.S:1.1 Sun Mar 16 09:20:05 2014 +++ src/tests/lib/csu/arch/ia64/h_initfini_align.S Sun Mar 16 09:27:04 2014 @@ -1,8 +1,8 @@ -/* $NetBSD: h_initfini_align.S,v 1.1 2014/03/16 09:20:05 cherry Exp $ */ +/* $NetBSD: h_initfini_align.S,v 1.2 2014/03/16 09:27:04 cherry Exp $ */ #include machine/asm.h -RCSID($NetBSD: h_initfini_align.S,v 1.1 2014/03/16 09:20:05 cherry Exp $) +RCSID($NetBSD: h_initfini_align.S,v 1.2 2014/03/16 09:27:04 cherry Exp $) ENTRY(check_stack_alignment, 0) .prologue @@ -14,7 +14,7 @@ ENTRY(check_stack_alignment, 0) mov ret0 = 1 ;; - /* ar.bspstore has an 8-byte alignment requirement */ + /* ar.bsp has an 8-byte alignment requirement */ mov loc1 = ar.bsp ;;
CVS commit: src/share/man/man4
Module Name:src Committed By: martin Date: Sun Mar 16 09:28:43 UTC 2014 Modified Files: src/share/man/man4: Makefile Added Files: src/share/man/man4: umcs.4 Log Message: Add umcs(4) To generate a diff of this commit: cvs rdiff -u -r1.609 -r1.610 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/umcs.4 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/man4/Makefile diff -u src/share/man/man4/Makefile:1.609 src/share/man/man4/Makefile:1.610 --- src/share/man/man4/Makefile:1.609 Mon Mar 3 02:03:31 2014 +++ src/share/man/man4/Makefile Sun Mar 16 09:28:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.609 2014/03/03 02:03:31 ozaki-r Exp $ +# $NetBSD: Makefile,v 1.610 2014/03/16 09:28:43 martin Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -74,7 +74,7 @@ MAN+= atu.4 aubtfwl.4 aue.4 axe.4 axen.4 slhci.4 stuirda.4 u3g.4 uatp.4 uaudio.4 uberry.4 ubsa.4 ubt.4 uchcom.4 \ ucom.4 ucycom.4 udav.4 udsbr.4 uftdi.4 ugen.4 ugensa.4 uhci.4 uhid.4 \ uhidev.4 uhmodem.4 uhso.4 uipaq.4 uirda.4 ukbd.4 ukyopon.4 ulpt.4 \ - umass.4 umct.4 umidi.4 umodem.4 ums.4 upgt.4 upl.4 uplcom.4 \ + umass.4 umcs.4 umct.4 umidi.4 umodem.4 ums.4 upgt.4 upl.4 uplcom.4 \ urio.4 url.4 urndis.4 urtw.4 urtwn.4 \ usb.4 uscanner.4 uslsa.4 usmsc.4 usscanner.4 \ ustir.4 uthum.4 utoppy.4 uts.4 uvideo.4 uvisor.4 uvscom.4 uyap.4 \ Added files: Index: src/share/man/man4/umcs.4 diff -u /dev/null src/share/man/man4/umcs.4:1.1 --- /dev/null Sun Mar 16 09:28:43 2014 +++ src/share/man/man4/umcs.4 Sun Mar 16 09:28:43 2014 @@ -0,0 +1,75 @@ +.\ $NetBSD: umcs.4,v 1.1 2014/03/16 09:28:43 martin Exp $ +.\ +.\ Copyright (c) 2014 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Martin Husemann. +.\ +.\ 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. +.\ +.Dd March 16, 2014 +.Dt UMCS 4 +.Os +.Sh NAME +.Nm umcs +.Nd USB multiport serial adapters driver +.Sh SYNOPSIS +.Cd umcs* at uhub? +.Cd ucom* at umcs? +.Sh HARDWARE +The +.Nm +driver supports a wide variety of hardware based on the +MosChip 7810, 7820, 7840 chipsets and clones thereof. +Devices range from single port to eight port (implemented as a +USB hub and two +.Nm umcs +four port instances behind it). +.Pp +Examples of hardware known to work with this driver are: +.Pp +.Bl -tag -width Dv -offset indent -compact +.It LOGILINK AU0033 +.El +.Sh DESCRIPTION +The +.Nm +driver attaches the MosChip multiport chipset with individual port +drivers via +.Xr ucom 4 , +which makes it behave like a +.Xr tty 4 . +.Sh SEE ALSO +.Xr tty 4 , +.Xr ucom 4 , +.Xr usb 4 +.Sh HISTORY +The +.Nm +driver +appeared in +.Nx 7 . +.Pp +It superseeded the +.Xr moscom 4 +driver.
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: martin Date: Sun Mar 16 09:28:58 UTC 2014 Modified Files: src/distrib/sets/lists/man: mi Log Message: Add umcs(4) To generate a diff of this commit: cvs rdiff -u -r1.1463 -r1.1464 src/distrib/sets/lists/man/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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1463 src/distrib/sets/lists/man/mi:1.1464 --- src/distrib/sets/lists/man/mi:1.1463 Mon Mar 3 18:27:20 2014 +++ src/distrib/sets/lists/man/mi Sun Mar 16 09:28:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1463 2014/03/03 18:27:20 pooka Exp $ +# $NetBSD: mi,v 1.1464 2014/03/16 09:28:58 martin Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1800,6 +1800,7 @@ ./usr/share/man/cat4/ukyopon.0 man-sys-catman .cat ./usr/share/man/cat4/ulpt.0 man-sys-catman .cat ./usr/share/man/cat4/umass.0 man-sys-catman .cat +./usr/share/man/cat4/umcs.0 man-sys-catman .cat ./usr/share/man/cat4/umct.0 man-sys-catman .cat ./usr/share/man/cat4/umidi.0 man-sys-catman .cat ./usr/share/man/cat4/umodem.0 man-sys-catman .cat @@ -4756,6 +4757,7 @@ ./usr/share/man/html4/ukyopon.html man-sys-htmlman html ./usr/share/man/html4/ulpt.html man-sys-htmlman html ./usr/share/man/html4/umass.html man-sys-htmlman html +./usr/share/man/html4/umcs.html man-sys-htmlman html ./usr/share/man/html4/umct.html man-sys-htmlman html ./usr/share/man/html4/umidi.html man-sys-htmlman html ./usr/share/man/html4/umodem.html man-sys-htmlman html @@ -7634,6 +7636,7 @@ ./usr/share/man/man4/ukyopon.4 man-sys-man .man ./usr/share/man/man4/ulpt.4 man-sys-man .man ./usr/share/man/man4/umass.4 man-sys-man .man +./usr/share/man/man4/umcs.4 man-sys-man .man ./usr/share/man/man4/umct.4 man-sys-man .man ./usr/share/man/man4/umidi.4 man-sys-man .man ./usr/share/man/man4/umodem.4 man-sys-man .man
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: martin Date: Sun Mar 16 09:35:05 UTC 2014 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add umcs(4) To generate a diff of this commit: cvs rdiff -u -r1.367 -r1.368 src/sys/arch/i386/conf/ALL 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/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.367 src/sys/arch/i386/conf/ALL:1.368 --- src/sys/arch/i386/conf/ALL:1.367 Sun Jan 26 19:16:16 2014 +++ src/sys/arch/i386/conf/ALL Sun Mar 16 09:35:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.367 2014/01/26 19:16:16 dsl Exp $ +# $NetBSD: ALL,v 1.368 2014/03/16 09:35:05 martin Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include arch/i386/conf/std.i386 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.367 $ +#ident ALL-$Revision: 1.368 $ maxusers 64 # estimated number of users @@ -1342,6 +1342,9 @@ ucom* at uark? portno ? moscom* at uhub? port ? ucom* at moscom? portno ? +umcs* at uhub? port ? # Moschip MCS7xxx serial adapter +ucom* at umcs? portno ? + uhmodem* at uhub? ucom* at uhmodem? portno ?
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Mar 16 09:37:47 UTC 2014 Modified Files: src/share/man/man4: umcs.4 Log Message: Spelling, whitespace. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/umcs.4 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/man4/umcs.4 diff -u src/share/man/man4/umcs.4:1.1 src/share/man/man4/umcs.4:1.2 --- src/share/man/man4/umcs.4:1.1 Sun Mar 16 09:28:43 2014 +++ src/share/man/man4/umcs.4 Sun Mar 16 09:37:47 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: umcs.4,v 1.1 2014/03/16 09:28:43 martin Exp $ +.\ $NetBSD: umcs.4,v 1.2 2014/03/16 09:37:47 wiz Exp $ .\ .\ Copyright (c) 2014 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -35,7 +35,7 @@ .Nd USB multiport serial adapters driver .Sh SYNOPSIS .Cd umcs* at uhub? -.Cd ucom* at umcs? +.Cd ucom* at umcs? .Sh HARDWARE The .Nm @@ -55,7 +55,7 @@ Examples of hardware known to work with The .Nm driver attaches the MosChip multiport chipset with individual port -drivers via +drivers via .Xr ucom 4 , which makes it behave like a .Xr tty 4 . @@ -70,6 +70,6 @@ driver appeared in .Nx 7 . .Pp -It superseeded the +It superseded the .Xr moscom 4 driver.
CVS commit: src/lib/libm/noieee_src
Module Name:src
Committed By: martin
Date: Sun Mar 16 09:51:39 UTC 2014
Modified Files:
src/lib/libm/noieee_src: n_floor.c
Log Message:
Provide all missing variants of trunc/floor/ceil.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/noieee_src/n_floor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/noieee_src/n_floor.c
diff -u src/lib/libm/noieee_src/n_floor.c:1.7 src/lib/libm/noieee_src/n_floor.c:1.8
--- src/lib/libm/noieee_src/n_floor.c:1.7 Thu Dec 9 22:52:59 2010
+++ src/lib/libm/noieee_src/n_floor.c Sun Mar 16 09:51:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: n_floor.c,v 1.7 2010/12/09 22:52:59 abs Exp $ */
+/* $NetBSD: n_floor.c,v 1.8 2014/03/16 09:51:39 martin Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -45,6 +45,12 @@ ic(L, 4503599627370496.0E0, 52, 1.0)
#define L vccast(L)
#endif
+#ifdef __weak_alias
+__weak_alias(ceill, ceil);
+__weak_alias(floorl, floor);
+__weak_alias(truncl, trunc);
+#endif
+
/*
* floor(x) := the largest integer no larger than x;
* ceil(x) := -floor(-x), for all real x.
@@ -216,3 +222,15 @@ llrintf(float x)
t = x + s;/* x+s rounded to integer */
return (t - s);
}
+
+double
+trunc(double x)
+{
+ return x 0 ? ceil(x) : floor(x);
+}
+
+float
+truncf(float x)
+{
+ return x 0 ? ceilf(x) : floorf(x);
+}
CVS commit: src/lib/libm/noieee_src
Module Name:src
Committed By: martin
Date: Sun Mar 16 10:02:27 UTC 2014
Modified Files:
src/lib/libm/noieee_src: n_round.c
Log Message:
Add roundl()
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/noieee_src/n_round.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/noieee_src/n_round.c
diff -u src/lib/libm/noieee_src/n_round.c:1.1 src/lib/libm/noieee_src/n_round.c:1.2
--- src/lib/libm/noieee_src/n_round.c:1.1 Tue Jan 17 13:16:08 2006
+++ src/lib/libm/noieee_src/n_round.c Sun Mar 16 10:02:27 2014
@@ -26,7 +26,7 @@
#include sys/cdefs.h
#if defined(LIBM_SCCS) !defined(lint)
-__RCSID($NetBSD: n_round.c,v 1.1 2006/01/17 13:16:08 is Exp $);
+__RCSID($NetBSD: n_round.c,v 1.2 2014/03/16 10:02:27 martin Exp $);
#if 0
__FBSDID($FreeBSD: src/lib/msun/src/s_round.c,v 1.1 2004/06/07 08:05:36 das Exp $);
#endif
@@ -34,6 +34,10 @@ __FBSDID($FreeBSD: src/lib/msun/src/s_r
#include math.h
+#ifdef __weak_alias
+__weak_alias(roundl, round);
+#endif
+
double
round(double x)
{
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sun Mar 16 10:06:40 UTC 2014
Modified Files:
src/sys/dev/usb: umcs.c
Log Message:
Use C99 initializers
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/umcs.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/usb/umcs.c
diff -u src/sys/dev/usb/umcs.c:1.1 src/sys/dev/usb/umcs.c:1.2
--- src/sys/dev/usb/umcs.c:1.1 Sun Mar 16 09:34:45 2014
+++ src/sys/dev/usb/umcs.c Sun Mar 16 10:06:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.c,v 1.1 2014/03/16 09:34:45 martin Exp $ */
+/* $NetBSD: umcs.c,v 1.2 2014/03/16 10:06:40 martin Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
/*-
@@ -41,7 +41,7 @@
*
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umcs.c,v 1.1 2014/03/16 09:34:45 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: umcs.c,v 1.2 2014/03/16 10:06:40 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -125,12 +125,11 @@ static int umcs7840_port_open(void *sc,
static void umcs7840_port_close(void *sc, int portno);
struct ucom_methods umcs7840_methods = {
- umcs7840_get_status,
- umcs7840_set,
- umcs7840_param,
- NULL,
- umcs7840_port_open,
- umcs7840_port_close,
+ .ucom_get_status = umcs7840_get_status,
+ .ucom_set = umcs7840_set,
+ .ucom_param = umcs7840_param,
+ .ucom_open = umcs7840_port_open,
+ .ucom_close = umcs7840_port_close,
};
static const struct usb_devno umcs7840_devs[] = {
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: njoly Date: Sun Mar 16 10:16:15 UTC 2014 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: When trying to extend a file, don't wait until the underlying memory allocation succeed. Return ENOSPC upon failure. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/rump/librump/rumpvfs/rumpfs.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/rumpvfs/rumpfs.c diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.125 src/sys/rump/librump/rumpvfs/rumpfs.c:1.126 --- src/sys/rump/librump/rumpvfs/rumpfs.c:1.125 Mon Feb 24 11:43:33 2014 +++ src/sys/rump/librump/rumpvfs/rumpfs.c Sun Mar 16 10:16:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfs.c,v 1.125 2014/02/24 11:43:33 pooka Exp $ */ +/* $NetBSD: rumpfs.c,v 1.126 2014/03/16 10:16:15 njoly Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.125 2014/02/24 11:43:33 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.126 2014/03/16 10:16:15 njoly Exp $); #include sys/param.h #include sys/atomic.h @@ -971,7 +971,9 @@ rump_vop_setattr(void *v) size_t copylen, newlen; newlen = vap-va_size; - newdata = rump_hypermalloc(newlen, 0, true, rumpfs); + newdata = rump_hypermalloc(newlen, 0, false, rumpfs); + if (newdata == NULL) + return ENOSPC; copylen = MIN(rn-rn_dlen, newlen); memset(newdata, 0, newlen); @@ -1465,7 +1467,9 @@ rump_vop_write(void *v) oldlen = rn-rn_dlen; olddata = rn-rn_data; - rn-rn_data = rump_hypermalloc(newlen, 0, true, rumpfs); + rn-rn_data = rump_hypermalloc(newlen, 0, false, rumpfs); + if (rn-rn_data == NULL) + return ENOSPC; rn-rn_dlen = newlen; memset(rn-rn_data, 0, newlen); memcpy(rn-rn_data, olddata, oldlen);
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: njoly
Date: Sun Mar 16 10:23:59 UTC 2014
Modified Files:
src/lib/librumpuser: rumpuser.c
Log Message:
Do not use uninitialized pointer if posix_memalign() fails.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/lib/librumpuser/rumpuser.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/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.57 src/lib/librumpuser/rumpuser.c:1.58
--- src/lib/librumpuser/rumpuser.c:1.57 Thu Feb 20 00:44:20 2014
+++ src/lib/librumpuser/rumpuser.c Sun Mar 16 10:23:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.57 2014/02/20 00:44:20 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.58 2014/03/16 10:23:59 njoly Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.57 2014/02/20 00:44:20 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.58 2014/03/16 10:23:59 njoly Exp $);
#endif /* !lint */
#include sys/ioctl.h
@@ -217,7 +217,7 @@ rumpuser_getfileinfo(const char *path, u
int
rumpuser_malloc(size_t howmuch, int alignment, void **memp)
{
- void *mem;
+ void *mem = NULL;
int rv;
if (alignment == 0)
CVS commit: src/tests/fs/common
Module Name:src
Committed By: njoly
Date: Sun Mar 16 10:28:03 UTC 2014
Modified Files:
src/tests/fs/common: fstest_rumpfs.c
Log Message:
Retrict rumpfs to the provided size, like other filesystems.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/common/fstest_rumpfs.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/fs/common/fstest_rumpfs.c
diff -u src/tests/fs/common/fstest_rumpfs.c:1.1 src/tests/fs/common/fstest_rumpfs.c:1.2
--- src/tests/fs/common/fstest_rumpfs.c:1.1 Thu Nov 11 17:39:29 2010
+++ src/tests/fs/common/fstest_rumpfs.c Sun Mar 16 10:28:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fstest_rumpfs.c,v 1.1 2010/11/11 17:39:29 pooka Exp $ */
+/* $NetBSD: fstest_rumpfs.c,v 1.2 2014/03/16 10:28:03 njoly Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -47,6 +47,13 @@ int
rumpfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
off_t size, void *fspriv)
{
+ char tmp[64];
+ int res;
+
+ snprintf(tmp, sizeof(tmp), %PRId64, size);
+ res = setenv(RUMP_MEMLIMIT, tmp, 0);
+ if (res == -1)
+ return res;
return rump_init();
}
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src Committed By: reinoud Date: Sun Mar 16 11:36:26 UTC 2014 Modified Files: src/sys/arch/arm/s3c2xx0: sscom.c Log Message: Exclude sscom_init() prototype definition when its not declared later To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/s3c2xx0/sscom.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/s3c2xx0/sscom.c diff -u src/sys/arch/arm/s3c2xx0/sscom.c:1.42 src/sys/arch/arm/s3c2xx0/sscom.c:1.43 --- src/sys/arch/arm/s3c2xx0/sscom.c:1.42 Sun Mar 16 05:20:23 2014 +++ src/sys/arch/arm/s3c2xx0/sscom.c Sun Mar 16 11:36:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sscom.c,v 1.42 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: sscom.c,v 1.43 2014/03/16 11:36:26 reinoud Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -98,7 +98,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sscom.c,v 1.42 2014/03/16 05:20:23 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: sscom.c,v 1.43 2014/03/16 11:36:26 reinoud Exp $); #include opt_sscom.h #include opt_ddb.h @@ -186,8 +186,10 @@ static int sscom_to_tiocm(struct sscom_s static void sscom_iflush(struct sscom_softc *); static int sscomhwiflow(struct tty *tp, int block); +#if defined(KGDB) || defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE) static int sscom_init(bus_space_tag_t, const struct sscom_uart_info *, int, int, tcflag_t, bus_space_handle_t *); +#endif extern struct cfdriver sscom_cd;
CVS commit: src/lib/csu/arch/vax
Module Name:src Committed By: joerg Date: Sun Mar 16 11:41:30 UTC 2014 Modified Files: src/lib/csu/arch/vax: crtbegin.S Log Message: __do_global_ctors_aux and __do_global_ctors_aux must be used locally, so mark them as hidden. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/csu/arch/vax/crtbegin.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/arch/vax/crtbegin.S diff -u src/lib/csu/arch/vax/crtbegin.S:1.6 src/lib/csu/arch/vax/crtbegin.S:1.7 --- src/lib/csu/arch/vax/crtbegin.S:1.6 Wed Jul 10 23:30:45 2013 +++ src/lib/csu/arch/vax/crtbegin.S Sun Mar 16 11:41:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: crtbegin.S,v 1.6 2013/07/10 23:30:45 matt Exp $ */ +/* $NetBSD: crtbegin.S,v 1.7 2014/03/16 11:41:30 joerg Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. @@ -30,7 +30,7 @@ #include vax/asm.h -RCSID($NetBSD: crtbegin.S,v 1.6 2013/07/10 23:30:45 matt Exp $) +RCSID($NetBSD: crtbegin.S,v 1.7 2014/03/16 11:41:30 joerg Exp $) .section .ctors, aw, @progbits .p2align 2 @@ -80,6 +80,8 @@ __dso_handle: * needed. */ + .hidden __do_global_dtors_aux + _ENTRY(__do_global_dtors_aux, 0x0100) /* save r8 */ tstb __finished /* done this already? */ bneq 4f @@ -128,6 +130,8 @@ END(__do_global_dtors_aux) .weak __register_frame_info .weak _Jv_RegisterClasses + .hidden __do_global_ctors_aux + _ENTRY(__do_global_ctors_aux, 0x0800) tstb __initialized bneq 4f
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src Committed By: reinoud Date: Sun Mar 16 12:26:58 UTC 2014 Modified Files: src/sys/arch/arm/s3c2xx0: sscom.c Log Message: Remove unneeded dependencies To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arm/s3c2xx0/sscom.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/s3c2xx0/sscom.c diff -u src/sys/arch/arm/s3c2xx0/sscom.c:1.43 src/sys/arch/arm/s3c2xx0/sscom.c:1.44 --- src/sys/arch/arm/s3c2xx0/sscom.c:1.43 Sun Mar 16 11:36:26 2014 +++ src/sys/arch/arm/s3c2xx0/sscom.c Sun Mar 16 12:26:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sscom.c,v 1.43 2014/03/16 11:36:26 reinoud Exp $ */ +/* $NetBSD: sscom.c,v 1.44 2014/03/16 12:26:58 reinoud Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -98,7 +98,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sscom.c,v 1.43 2014/03/16 11:36:26 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: sscom.c,v 1.44 2014/03/16 12:26:58 reinoud Exp $); #include opt_sscom.h #include opt_ddb.h @@ -145,12 +145,6 @@ __KERNEL_RCSID(0, $NetBSD: sscom.c,v 1. #include sys/mutex.h #include arm/s3c2xx0/s3c2xx0reg.h -#include arm/s3c2xx0/s3c2xx0var.h -#if defined(SSCOM_S3C2410) || defined(SSCOM_S3C2400) || defined(SSCOM_S3C2440) -#include arm/s3c2xx0/s3c24x0reg.h -#elif defined(SSCOM_S3C2800) -#include arm/s3c2xx0/s3c2800reg.h -#endif #include arm/s3c2xx0/sscom_var.h #include dev/cons.h
CVS commit: src/gnu/dist/gcc4/gcc/config
Module Name:src
Committed By: joerg
Date: Sun Mar 16 13:33:14 UTC 2014
Modified Files:
src/gnu/dist/gcc4/gcc/config: netbsd-elf.h
Log Message:
Link with --eh-frame-hdr.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/gnu/dist/gcc4/gcc/config/netbsd-elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/gcc/config/netbsd-elf.h
diff -u src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.3 src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.4
--- src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.3 Mon Aug 12 21:22:18 2013
+++ src/gnu/dist/gcc4/gcc/config/netbsd-elf.h Sun Mar 16 13:33:14 2014
@@ -81,7 +81,7 @@ Boston, MA 02110-1301, USA. */
Target-specific code must provide the %(netbsd_entry_point) spec. */
#define NETBSD_LINK_SPEC_ELF \
- %{assert*} %{R*} %{rpath*} \
+ --eh-frame-hdr %{assert*} %{R*} %{rpath*} \
%{shared:-shared} \
%{symbolic:-Bsymbolic} \
%{!shared: \
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Sun Mar 16 13:34:33 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
libunwind supports PowerPC.
To generate a diff of this commit:
cvs rdiff -u -r1.786 -r1.787 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.786 src/share/mk/bsd.own.mk:1.787
--- src/share/mk/bsd.own.mk:1.786 Wed Mar 12 01:49:58 2014
+++ src/share/mk/bsd.own.mk Sun Mar 16 13:34:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.786 2014/03/12 01:49:58 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.787 2014/03/16 13:34:33 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -99,6 +99,7 @@ HAVE_LIBGCC?= yes
.endif
_LIBC_UNWIND_SUPPORT.i386= yes
+_LIBC_UNWIND_SUPPORT.powerpc= yes
_LIBC_UNWIND_SUPPORT.x86_64= yes
.if ${MKLLVM:Uno} == yes ${_LIBC_UNWIND_SUPPORT.${MACHINE_ARCH}:Uno} == yes
HAVE_LIBGCC_EH?= no
CVS commit: src
Module Name:src
Committed By: joerg
Date: Sun Mar 16 13:37:37 UTC 2014
Modified Files:
src/distrib/vax/ramdisk: Makefile
src/sys/arch/vax/conf: INSTALL
Log Message:
Bump INSTALL ramdisk size slightly to allow building with DBG=-g.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/vax/ramdisk/Makefile
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/vax/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/ramdisk/Makefile
diff -u src/distrib/vax/ramdisk/Makefile:1.33 src/distrib/vax/ramdisk/Makefile:1.34
--- src/distrib/vax/ramdisk/Makefile:1.33 Fri Jan 24 12:19:10 2014
+++ src/distrib/vax/ramdisk/Makefile Sun Mar 16 13:37:37 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2014/01/24 12:19:10 martin Exp $
+# $NetBSD: Makefile,v 1.34 2014/03/16 13:37:37 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 1760k
+IMAGESIZE= 2000k
MAKEFS_FLAGS= -f 15
WARNS= 1
Index: src/sys/arch/vax/conf/INSTALL
diff -u src/sys/arch/vax/conf/INSTALL:1.67 src/sys/arch/vax/conf/INSTALL:1.68
--- src/sys/arch/vax/conf/INSTALL:1.67 Sat Nov 9 21:32:55 2013
+++ src/sys/arch/vax/conf/INSTALL Sun Mar 16 13:37:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.67 2013/11/09 21:32:55 christos Exp $
+# $NetBSD: INSTALL,v 1.68 2014/03/16 13:37:36 joerg Exp $
#
# INSTALL kernel; all supported devices but nothing fancy.
#
@@ -33,7 +33,7 @@ maxusers 8
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=4000 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=4100 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# Kernel compiled-in symbolic debugger system call tracer
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Sun Mar 16 14:02:06 UTC 2014
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Allow RUMP_LDSCRIPT itself to be used to specify which ldscript to use.
HAVE_SUN_LD will be deprecated in the future.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/rump/Makefile.rump
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.92 src/sys/rump/Makefile.rump:1.93
--- src/sys/rump/Makefile.rump:1.92 Sat Mar 15 15:15:26 2014
+++ src/sys/rump/Makefile.rump Sun Mar 16 14:02:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.92 2014/03/15 15:15:26 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.93 2014/03/16 14:02:06 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -39,15 +39,17 @@ CPPFLAGS+= -I${RUMPTOP}/../arch
CPPFLAGS+= -I${RUMPTOP}/..
.endif
-RUMP_LDSCRIPT?=yes
+RUMP_LDSCRIPT?= GNU
.if ${RUMP_LDSCRIPT} != no
# my ld or yours?
-.ifdef HAVE_SUN_LD
+.if ${RUMP_LDSCRIPT} == sun || defined(HAVE_SUN_LD)
LDFLAGS+= -Wl,-M ${RUMPTOP}/ldscript_sun.rump
SRCS+= linksyms_sun.c
.PATH: ${RUMPTOP}
-.else
+.elif ${RUMP_LDSCRIPT} == GNU
LDFLAGS+= -Wl,-T,${RUMPTOP}/ldscript.rump
+.else
+.error Unknown ldscript ${RUMP_LDSCRIPT}
.endif
.endif
CVS commit: src/sys/rump/kern/lib/libsys_sunos
Module Name:src
Committed By: pooka
Date: Sun Mar 16 14:14:40 UTC 2014
Modified Files:
src/sys/rump/kern/lib/libsys_sunos: Makefile
Log Message:
fix tyop
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/kern/lib/libsys_sunos/Makefile
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/kern/lib/libsys_sunos/Makefile
diff -u src/sys/rump/kern/lib/libsys_sunos/Makefile:1.2 src/sys/rump/kern/lib/libsys_sunos/Makefile:1.3
--- src/sys/rump/kern/lib/libsys_sunos/Makefile:1.2 Thu Mar 13 02:04:14 2014
+++ src/sys/rump/kern/lib/libsys_sunos/Makefile Sun Mar 16 14:14:40 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 02:04:14 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/16 14:14:40 pooka Exp $
#
LIB= rumpkern_sys_sunos
SRCS= rump_sunos_compat.c rump_sunos_sysent.c
-SRCS+ sys_sunos_component.c
+SRCS+= sys_sunos_component.c
# XXX
CPPFLAGS+= -I${.CURDIR} -I${RUMPTOP}/librump/rumpkern
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Sun Mar 16 14:33:22 UTC 2014 Added Files: src/sys/rump: README.compileopts Log Message: document compile-time options for rump kernels To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/rump/README.compileopts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/rump/README.compileopts diff -u /dev/null src/sys/rump/README.compileopts:1.1 --- /dev/null Sun Mar 16 14:33:22 2014 +++ src/sys/rump/README.compileopts Sun Mar 16 14:33:22 2014 @@ -0,0 +1,87 @@ + $NetBSD: README.compileopts,v 1.1 2014/03/16 14:33:22 pooka Exp $ + +This file describes compile-time options for rump kernels. Additionally, +NetBSD build options will have an effect. See src/share/mk/bsd.README +for a desciption of NetBSD build options. + + +RUMP_DIAGNOSTIC + +values: yes|no +defval: yes +effect: Iff yes, build with -DDIAGNOSTIC. + + +RUMP_DEBUG + +values: defined / not defined +effect: Iff defined, build with -DDEBUG. + + +RUMP_LOCKDEBUG + +values: defined / not defined +effect: Iff defined, build with -DLOCKDEBUG. + + +RUMP_KTRACE + +values: yes|no +defval: yes +effect: Iff yes, build with -DKTRACE. + + +RUMP_LOCKS_UP + +values: yes|no +defval: no +effect: If yes, build rump kernel with uniprocess-optimized locking. + An implication of this is that RUMP_NCPU==1 is required at + runtime. If no, build with multiprocessor-capable locking. + + +RUMP_UNREAL_ALLOCATORS + +values: yes|no +defval: no +effect: If yes, build version of kmem_alloc, pool and pool_cache + that directly relegate allocation to a hypercall. If no, + build the regular NetBSD memory allocators which use + page-sized memory allocation hypercalls. + + +RUMP_VIRTIF + +values: yes|no +defval: yes +effect: Iff yes, build the virt(4) network interface. Turning this + off may be necessary on systems that lack the necessary headers, + e.g. musl libc based Linux. + + + + + +The rest of the options described in this file are not intended to be +set by users, but by the package building rump kernels. + + +RUMP_KERNEL_IS_LIBC + +values: defined / not defined +effect: Iff defined, export normal system call symbols from libc. + For example, without this option rump_sys_open() is exported. + With this option, both open() and rump_sys_open() are exported. + This option is meant for building systems where a rump kernel + is the only operating system like component. + + +RUMP_LDSCRIPT + +values: no/GNU/sun +defval: GNU +effect: Select the linker script to be used for linking rump kernel shared + library components. + no - do not use a linker script + GNU - use a linker script for GNU ld 2.18 and later + sun - use a linker script for the Solaris linker
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Sun Mar 16 14:47:47 UTC 2014 Modified Files: src/sys/rump: README.compileopts Log Message: note that it's a good idea to do a clean build if an option is changed To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/README.compileopts 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/README.compileopts diff -u src/sys/rump/README.compileopts:1.1 src/sys/rump/README.compileopts:1.2 --- src/sys/rump/README.compileopts:1.1 Sun Mar 16 14:33:22 2014 +++ src/sys/rump/README.compileopts Sun Mar 16 14:47:47 2014 @@ -1,9 +1,11 @@ - $NetBSD: README.compileopts,v 1.1 2014/03/16 14:33:22 pooka Exp $ + $NetBSD: README.compileopts,v 1.2 2014/03/16 14:47:47 pooka Exp $ This file describes compile-time options for rump kernels. Additionally, NetBSD build options will have an effect. See src/share/mk/bsd.README for a desciption of NetBSD build options. +Note: after changing an option, do a clean build. + RUMP_DIAGNOSTIC
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Sun Mar 16 15:30:05 UTC 2014
Modified Files:
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: lwproc.c rump_curlwp.h
rump_curlwp___thread.h rump_curlwp_hypercall.h
Log Message:
remove unnecesary verbosity: s/RUMP_CURLWP_MODEL/RUMP_CURLWP/
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.27 -r1.28 src/sys/rump/librump/rumpkern/lwproc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/rump_curlwp.h \
src/sys/rump/librump/rumpkern/rump_curlwp___thread.h \
src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.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/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.109 src/sys/rump/include/rump/rumpuser.h:1.110
--- src/sys/rump/include/rump/rumpuser.h:1.109 Sat Mar 15 15:15:26 2014
+++ src/sys/rump/include/rump/rumpuser.h Sun Mar 16 15:30:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.109 2014/03/15 15:15:26 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.110 2014/03/16 15:30:05 pooka Exp $ */
/*
* Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved.
@@ -175,14 +175,14 @@ int rumpuser_thread_create(void *(*f)(v
void rumpuser_thread_exit(void) __dead;
int rumpuser_thread_join(void *);
-#if defined(LIBRUMPUSER) || defined(RUMP_CURLWP_PRIVATE)
+#if defined(LIBRUMPUSER) || defined(RUMP__CURLWP_PRIVATE)
enum rumplwpop {
RUMPUSER_LWP_CREATE, RUMPUSER_LWP_DESTROY,
RUMPUSER_LWP_SET, RUMPUSER_LWP_CLEAR
};
void rumpuser_curlwpop(int, struct lwp *);
struct lwp *rumpuser_curlwp(void);
-#endif /* LIBRUMPUSER || RUMP_CURLWP_PRIVATE */
+#endif /* LIBRUMPUSER || RUMP__CURLWP_PRIVATE */
struct rumpuser_mtx;
#define RUMPUSER_MTX_SPIN 0x01
Index: src/sys/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.27 src/sys/rump/librump/rumpkern/lwproc.c:1.28
--- src/sys/rump/librump/rumpkern/lwproc.c:1.27 Sat Mar 15 15:15:27 2014
+++ src/sys/rump/librump/rumpkern/lwproc.c Sun Mar 16 15:30:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lwproc.c,v 1.27 2014/03/15 15:15:27 pooka Exp $ */
+/* $NetBSD: lwproc.c,v 1.28 2014/03/16 15:30:05 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -25,10 +25,10 @@
* SUCH DAMAGE.
*/
-#define RUMP_CURLWP_PRIVATE
+#define RUMP__CURLWP_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.27 2014/03/15 15:15:27 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.28 2014/03/16 15:30:05 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
Index: src/sys/rump/librump/rumpkern/rump_curlwp.h
diff -u src/sys/rump/librump/rumpkern/rump_curlwp.h:1.1 src/sys/rump/librump/rumpkern/rump_curlwp.h:1.2
--- src/sys/rump/librump/rumpkern/rump_curlwp.h:1.1 Sat Mar 15 15:15:27 2014
+++ src/sys/rump/librump/rumpkern/rump_curlwp.h Sun Mar 16 15:30:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_curlwp.h,v 1.1 2014/03/15 15:15:27 pooka Exp $ */
+/* $NetBSD: rump_curlwp.h,v 1.2 2014/03/16 15:30:05 pooka Exp $ */
/*-
* Copyright (c) 2014 Antti Kantee. All Rights Reserved.
@@ -31,22 +31,22 @@
struct lwp *rump_lwproc_curlwp_hypercall(void);
/* hattrick numbers to avoid someone accidentally using 1 as the value */
-#define RUMP_CURLWP_MODEL_HYPERCALL 10501
-#define RUMP_CURLWP_MODEL___THREAD 20502
-#define RUMP_CURLWP_MODEL_REGISTER 30503
-#define RUMP_CURLWP_MODEL_DEFAULT RUMP_CURLWP_MODEL_HYPERCALL
+#define RUMP_CURLWP_HYPERCALL 10501
+#define RUMP_CURLWP___THREAD 20502
+#define RUMP_CURLWP_REGISTER 30503
+#define RUMP_CURLWP_DEFAULT RUMP_CURLWP_HYPERCALL
-#ifndef RUMP_CURLWP_MODEL
-#define RUMP_CURLWP_MODEL RUMP_CURLWP_MODEL_DEFAULT
+#ifndef RUMP_CURLWP
+#define RUMP_CURLWP RUMP_CURLWP_DEFAULT
#endif
/* provides rump_curlwp_fast() */
-#if RUMP_CURLWP_MODEL == RUMP_CURLWP_MODEL_HYPERCALL
+#if RUMP_CURLWP == RUMP_CURLWP_HYPERCALL
#include rump_curlwp_hypercall.h
-#elif RUMP_CURLWP_MODEL == RUMP_CURLWP_MODEL___THREAD
+#elif RUMP_CURLWP == RUMP_CURLWP___THREAD
#include rump_curlwp___thread.h
-#elif RUMP_CURLWP_MODEL == RUMP_CURLWP_MODEL_REGISTER
-#error RUMP_CURLWP_MODEL_REGISTER not yet implemented
+#elif RUMP_CURLWP == RUMP_CURLWP_REGISTER
+#error RUMP_CURLWP_REGISTER not yet implemented
#else
#error unknown RUMP_CURLWP
#endif
Index: src/sys/rump/librump/rumpkern/rump_curlwp___thread.h
diff -u src/sys/rump/librump/rumpkern/rump_curlwp___thread.h:1.1 src/sys/rump/librump/rumpkern/rump_curlwp___thread.h:1.2
--- src/sys/rump/librump/rumpkern/rump_curlwp___thread.h:1.1 Sat Mar 15 15:15:27 2014
+++ src/sys/rump/librump/rumpkern/rump_curlwp___thread.h Sun Mar 16 15:30:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_curlwp___thread.h,v 1.1 2014/03/15 15:15:27 pooka Exp $ */
+/* $NetBSD:
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Sun Mar 16 15:31:03 UTC 2014
Modified Files:
src/sys/rump: Makefile.rump README.compileopts
Log Message:
Introduce RUMP_CURLWP compile option to select curlwp scheme.
Default is still hypercall.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/README.compileopts
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.93 src/sys/rump/Makefile.rump:1.94
--- src/sys/rump/Makefile.rump:1.93 Sun Mar 16 14:02:06 2014
+++ src/sys/rump/Makefile.rump Sun Mar 16 15:31:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.93 2014/03/16 14:02:06 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.94 2014/03/16 15:31:03 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -53,6 +53,18 @@ LDFLAGS+= -Wl,-T,${RUMPTOP}/ldscript.rum
.endif
.endif
+.if defined(RUMP_CURLWP)
+.if ${RUMP_CURLWP} == hypercall
+CPPFLAGS+= -DRUMP_CURLWP=RUMP_CURLWP_HYPERCALL
+.elif ${RUMP_CURLWP} == __thread
+CPPFLAGS+= -DRUMP_CURLWP=RUMP_CURLWP___THREAD
+.elif ${RUMP_CURLWP} == register
+CPPFLAGS+= -DRUMP_CURLWP=RUMP_CURLWP_REGISTER
+.else
+.error Unsupported curlwp scheme: ${RUMP_CURLWP}
+.endif
+.endif
+
RUMP_DIAGNOSTIC?=yes
.if ${RUMP_DIAGNOSTIC} == yes
CPPFLAGS+= -DDIAGNOSTIC
Index: src/sys/rump/README.compileopts
diff -u src/sys/rump/README.compileopts:1.2 src/sys/rump/README.compileopts:1.3
--- src/sys/rump/README.compileopts:1.2 Sun Mar 16 14:47:47 2014
+++ src/sys/rump/README.compileopts Sun Mar 16 15:31:03 2014
@@ -1,4 +1,4 @@
- $NetBSD: README.compileopts,v 1.2 2014/03/16 14:47:47 pooka Exp $
+ $NetBSD: README.compileopts,v 1.3 2014/03/16 15:31:03 pooka Exp $
This file describes compile-time options for rump kernels. Additionally,
NetBSD build options will have an effect. See src/share/mk/bsd.README
@@ -61,6 +61,20 @@ effect: Iff yes, build the virt(4) net
e.g. musl libc based Linux.
+RUMP_CURLWP
+
+values: hypercall/__thread/register or undefined
+defval: undefined
+effect: Control how curlwp is obtained in a rump kernel. This is
+ a very frequently accessed thread-local variable, and optimizing
+ access has a significant performance impact. Note that all
+ options are not available on hosts/machine architectures.
+ undefined - use default implementation (currently hypercall)
+ hypercall - use a hypercall to fetch the value
+ __thread- use the __thread feature to fetch value via TLS
+ register- use a dedicated register (implies -ffixed)
+
+
CVS commit: src/sys/arch
Module Name:src Committed By: jakllsch Date: Sun Mar 16 18:04:57 UTC 2014 Modified Files: src/sys/arch/amd64/conf: XEN3_DOMU src/sys/arch/i386/conf: XEN3_DOMU Log Message: Disable xpci(4) PCI passthrough in XEN3_DOMU kernels by popular demand. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.51 src/sys/arch/amd64/conf/XEN3_DOMU:1.52 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.51 Sat Mar 15 13:50:01 2014 +++ src/sys/arch/amd64/conf/XEN3_DOMU Sun Mar 16 18:04:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.51 2014/03/15 13:50:01 jakllsch Exp $ +# $NetBSD: XEN3_DOMU,v 1.52 2014/03/16 18:04:56 jakllsch Exp $ include arch/amd64/conf/std.xen @@ -167,8 +167,8 @@ balloon* at xenbus? # Xen balloon devic xencons* at hypervisor? # Xen virtual console # PCI pass-through support: -xpci* at xenbus ? #Xen3 PCI front end driver -pci* at xpci ? +#xpci* at xenbus ? #Xen3 PCI front end driver +#pci* at xpci ? # you then need to add your PCI devices drivers below. cinclude arch/amd64/conf/GENERIC.local Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.56 src/sys/arch/i386/conf/XEN3_DOMU:1.57 --- src/sys/arch/i386/conf/XEN3_DOMU:1.56 Sun Jan 26 19:16:16 2014 +++ src/sys/arch/i386/conf/XEN3_DOMU Sun Mar 16 18:04:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.56 2014/01/26 19:16:16 dsl Exp $ +# $NetBSD: XEN3_DOMU,v 1.57 2014/03/16 18:04:56 jakllsch Exp $ include arch/xen/conf/std.xen @@ -258,6 +258,6 @@ options PAX_MPROTECT=0 # PaX mprotect( options PAX_ASLR=0 # PaX Address Space Layout Randomization # PCI pass-through support: -xpci* at xenbus ? #Xen3 PCI front end driver -pci* at xpci ? +#xpci* at xenbus ? #Xen3 PCI front end driver +#pci* at xpci ? # you then need to add your PCI devices drivers below.
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: dsl
Date: Sun Mar 16 18:42:21 UTC 2014
Modified Files:
src/tests/lib/libm: t_libm.h
Log Message:
Check that the result isn't equaly to the expected value before checking
the absolute size of the error term.
If the expected result is +/-infinity it should compare equal, but the
result of the subtract may not be zero.
Also print the result and error values in fp hex to make it easier to
see how may lsb bits are incorrect.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libm/t_libm.h
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/libm/t_libm.h
diff -u src/tests/lib/libm/t_libm.h:1.3 src/tests/lib/libm/t_libm.h:1.4
--- src/tests/lib/libm/t_libm.h:1.3 Fri Mar 7 12:46:47 2014
+++ src/tests/lib/libm/t_libm.h Sun Mar 16 18:42:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_libm.h,v 1.3 2014/03/07 12:46:47 martin Exp $ */
+/* $NetBSD: t_libm.h,v 1.4 2014/03/16 18:42:21 dsl Exp $ */
/*
* Check result of fn(arg) is correct within the bounds.
@@ -7,10 +7,10 @@
#define T_LIBM_CHECK(subtest, fn, arg, expect, epsilon) do { \
double r = fn(arg); \
double e = fabs(r - expect); \
- if (e epsilon) \
+ if (r != expect e epsilon) \
atf_tc_fail_nonfatal( \
- subtest %u: #fn (%g) is %g not %g (error %g %g), \
- subtest, arg, r, expect, e, epsilon); \
+ subtest %u: #fn (%g) is %g (%.13a) not %g (%.13a), error %g (%.6a) %g, \
+ subtest, arg, r, r, expect, expect, e, e, epsilon); \
} while (0)
/* Check that the result of fn(arg) is NaN */
CVS import: xsrc/external/mit/libSM/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:19:55 UTC 2014 Update of /cvsroot/xsrc/external/mit/libSM/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8191 Log Message: initial import of libSM-1.2.2 Status: Vendor Tag: xorg Release Tags: libSM-1-2-2 U xsrc/external/mit/libSM/dist/depcomp U xsrc/external/mit/libSM/dist/docbook.am U xsrc/external/mit/libSM/dist/COPYING U xsrc/external/mit/libSM/dist/sm.pc.in U xsrc/external/mit/libSM/dist/AUTHORS N xsrc/external/mit/libSM/dist/compile U xsrc/external/mit/libSM/dist/ltmain.sh U xsrc/external/mit/libSM/dist/config.h.in U xsrc/external/mit/libSM/dist/INSTALL U xsrc/external/mit/libSM/dist/install-sh U xsrc/external/mit/libSM/dist/missing U xsrc/external/mit/libSM/dist/config.guess U xsrc/external/mit/libSM/dist/aclocal.m4 U xsrc/external/mit/libSM/dist/configure.ac U xsrc/external/mit/libSM/dist/Makefile.am U xsrc/external/mit/libSM/dist/README U xsrc/external/mit/libSM/dist/ChangeLog U xsrc/external/mit/libSM/dist/config.sub U xsrc/external/mit/libSM/dist/Makefile.in U xsrc/external/mit/libSM/dist/configure U xsrc/external/mit/libSM/dist/include/X11/SM/SMproto.h U xsrc/external/mit/libSM/dist/include/X11/SM/SMlib.h U xsrc/external/mit/libSM/dist/include/X11/SM/SM.h U xsrc/external/mit/libSM/dist/src/Makefile.am U xsrc/external/mit/libSM/dist/src/sm_genid.c U xsrc/external/mit/libSM/dist/src/Makefile.in U xsrc/external/mit/libSM/dist/src/sm_auth.c U xsrc/external/mit/libSM/dist/src/sm_manager.c U xsrc/external/mit/libSM/dist/src/SMlibint.h U xsrc/external/mit/libSM/dist/src/sm_client.c U xsrc/external/mit/libSM/dist/src/sm_misc.c U xsrc/external/mit/libSM/dist/src/sm_error.c U xsrc/external/mit/libSM/dist/src/sm_process.c U xsrc/external/mit/libSM/dist/doc/SMlib.xml U xsrc/external/mit/libSM/dist/doc/xsmp.xml U xsrc/external/mit/libSM/dist/doc/Makefile.am U xsrc/external/mit/libSM/dist/doc/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/libXaw/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:19:57 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXaw/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12446 Log Message: initial import of libXaw-1.0.12 Status: Vendor Tag: xorg Release Tags: libXaw-1-0-12 U xsrc/external/mit/libXaw/dist/autogen.sh U xsrc/external/mit/libXaw/dist/xaw7.pc.in U xsrc/external/mit/libXaw/dist/configure.ac U xsrc/external/mit/libXaw/dist/xaw6.pc.in U xsrc/external/mit/libXaw/dist/Makefile.am U xsrc/external/mit/libXaw/dist/README U xsrc/external/mit/libXaw/dist/configure U xsrc/external/mit/libXaw/dist/config.sub U xsrc/external/mit/libXaw/dist/INSTALL U xsrc/external/mit/libXaw/dist/Makefile.in U xsrc/external/mit/libXaw/dist/ChangeLog U xsrc/external/mit/libXaw/dist/depcomp U xsrc/external/mit/libXaw/dist/docbook.am U xsrc/external/mit/libXaw/dist/missing U xsrc/external/mit/libXaw/dist/config.h.in U xsrc/external/mit/libXaw/dist/compile U xsrc/external/mit/libXaw/dist/install-sh U xsrc/external/mit/libXaw/dist/COPYING U xsrc/external/mit/libXaw/dist/aclocal.m4 U xsrc/external/mit/libXaw/dist/ltmain.sh U xsrc/external/mit/libXaw/dist/config.guess U xsrc/external/mit/libXaw/dist/specs/AsciiText.xml U xsrc/external/mit/libXaw/dist/specs/SmeLine.xml U xsrc/external/mit/libXaw/dist/specs/Simple.xml U xsrc/external/mit/libXaw/dist/specs/TPage_Credits.xml U xsrc/external/mit/libXaw/dist/specs/TextCustom.xml U xsrc/external/mit/libXaw/dist/specs/Panner.xml U xsrc/external/mit/libXaw/dist/specs/SimpleMenu.xml U xsrc/external/mit/libXaw/dist/specs/Dialog.xml U xsrc/external/mit/libXaw/dist/specs/TextActions_text_widget_actions.xml U xsrc/external/mit/libXaw/dist/specs/CH2.xml U xsrc/external/mit/libXaw/dist/specs/Toggle.xml U xsrc/external/mit/libXaw/dist/specs/Grip.xml U xsrc/external/mit/libXaw/dist/specs/CH5.xml U xsrc/external/mit/libXaw/dist/specs/Tree.xml U xsrc/external/mit/libXaw/dist/specs/Template.xml U xsrc/external/mit/libXaw/dist/specs/SmeBSB.xml U xsrc/external/mit/libXaw/dist/specs/Paned.xml U xsrc/external/mit/libXaw/dist/specs/CH7.xml U xsrc/external/mit/libXaw/dist/specs/CH4.xml U xsrc/external/mit/libXaw/dist/specs/Template_private_header_file.xml U xsrc/external/mit/libXaw/dist/specs/CH3.xml U xsrc/external/mit/libXaw/dist/specs/TextSource.xml U xsrc/external/mit/libXaw/dist/specs/List.xml U xsrc/external/mit/libXaw/dist/specs/StripChart.xml U xsrc/external/mit/libXaw/dist/specs/MenuButton.xml U xsrc/external/mit/libXaw/dist/specs/libXaw.xml U xsrc/external/mit/libXaw/dist/specs/Template_widget_source_file.xml U xsrc/external/mit/libXaw/dist/specs/TextActions.xml U xsrc/external/mit/libXaw/dist/specs/Makefile.am U xsrc/external/mit/libXaw/dist/specs/Porthole.xml U xsrc/external/mit/libXaw/dist/specs/Repeater.xml U xsrc/external/mit/libXaw/dist/specs/AsciiSource.xml U xsrc/external/mit/libXaw/dist/specs/Label.xml U xsrc/external/mit/libXaw/dist/specs/Template_public_header_file.xml U xsrc/external/mit/libXaw/dist/specs/Text.xml U xsrc/external/mit/libXaw/dist/specs/Form.xml U xsrc/external/mit/libXaw/dist/specs/CH6.xml U xsrc/external/mit/libXaw/dist/specs/CH1.xml U xsrc/external/mit/libXaw/dist/specs/Sme.xml U xsrc/external/mit/libXaw/dist/specs/AsciiSink.xml U xsrc/external/mit/libXaw/dist/specs/Box.xml U xsrc/external/mit/libXaw/dist/specs/Scrollbar.xml U xsrc/external/mit/libXaw/dist/specs/TextSink.xml U xsrc/external/mit/libXaw/dist/specs/TextFuncs.xml U xsrc/external/mit/libXaw/dist/specs/Command.xml U xsrc/external/mit/libXaw/dist/specs/Viewport.xml U xsrc/external/mit/libXaw/dist/specs/Makefile.in U xsrc/external/mit/libXaw/dist/specs/TextActions_default_translation_bindings.xml U xsrc/external/mit/libXaw/dist/man/Makefile.am U xsrc/external/mit/libXaw/dist/man/Makefile.in U xsrc/external/mit/libXaw/dist/man/Xaw.man U xsrc/external/mit/libXaw/dist/src/DisplayList.c U xsrc/external/mit/libXaw/dist/src/TextSink.c U xsrc/external/mit/libXaw/dist/src/Panner.c U xsrc/external/mit/libXaw/dist/src/XawI18n.c U xsrc/external/mit/libXaw/dist/src/Converters.c U xsrc/external/mit/libXaw/dist/src/Paned.c U xsrc/external/mit/libXaw/dist/src/TextSrc.c U xsrc/external/mit/libXaw/dist/src/Tree.c U xsrc/external/mit/libXaw/dist/src/StripChart.c U xsrc/external/mit/libXaw/dist/src/Box.c U xsrc/external/mit/libXaw/dist/src/SimpleMenu.c U xsrc/external/mit/libXaw/dist/src/AsciiSrc.c U xsrc/external/mit/libXaw/dist/src/MenuButton.c U xsrc/external/mit/libXaw/dist/src/Grip.c U xsrc/external/mit/libXaw/dist/src/Label.c U xsrc/external/mit/libXaw/dist/src/Scrollbar.c U xsrc/external/mit/libXaw/dist/src/Porthole.c U xsrc/external/mit/libXaw/dist/src/TextAction.c U xsrc/external/mit/libXaw/dist/src/Repeater.c U xsrc/external/mit/libXaw/dist/src/XawIm.c U xsrc/external/mit/libXaw/dist/src/SmeBSB.c U xsrc/external/mit/libXaw/dist/src/Sme.c U xsrc/external/mit/libXaw/dist/src/Dialog.c U xsrc/external/mit/libXaw/dist/src/Form.c U xsrc/external/mit/libXaw/dist/src/TextPop.c U
CVS import: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:19:59 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17515 Log Message: initial import of libXfont-1.4.7 Status: Vendor Tag: xorg Release Tags: libXfont-1-4-7 U xsrc/external/mit/libXfont/dist/configure U xsrc/external/mit/libXfont/dist/depcomp U xsrc/external/mit/libXfont/dist/xfont.pc.in U xsrc/external/mit/libXfont/dist/config.h.in U xsrc/external/mit/libXfont/dist/missing U xsrc/external/mit/libXfont/dist/ChangeLog U xsrc/external/mit/libXfont/dist/configure.ac U xsrc/external/mit/libXfont/dist/COPYING U xsrc/external/mit/libXfont/dist/config.sub U xsrc/external/mit/libXfont/dist/README U xsrc/external/mit/libXfont/dist/devbook.am N xsrc/external/mit/libXfont/dist/compile U xsrc/external/mit/libXfont/dist/AUTHORS U xsrc/external/mit/libXfont/dist/Makefile.in U xsrc/external/mit/libXfont/dist/ltmain.sh U xsrc/external/mit/libXfont/dist/Makefile.am U xsrc/external/mit/libXfont/dist/config.guess U xsrc/external/mit/libXfont/dist/INSTALL U xsrc/external/mit/libXfont/dist/install-sh U xsrc/external/mit/libXfont/dist/aclocal.m4 U xsrc/external/mit/libXfont/dist/src/Makefile.am U xsrc/external/mit/libXfont/dist/src/dummy.c U xsrc/external/mit/libXfont/dist/src/Makefile.in U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.am U xsrc/external/mit/libXfont/dist/src/builtins/dir.c U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in U xsrc/external/mit/libXfont/dist/src/builtins/fpe.c U xsrc/external/mit/libXfont/dist/src/builtins/fonts.c U xsrc/external/mit/libXfont/dist/src/builtins/builtin.h U xsrc/external/mit/libXfont/dist/src/builtins/render.c U xsrc/external/mit/libXfont/dist/src/builtins/buildfont U xsrc/external/mit/libXfont/dist/src/builtins/file.c U xsrc/external/mit/libXfont/dist/src/fc/fslibos.h U xsrc/external/mit/libXfont/dist/src/fc/fserve.c U xsrc/external/mit/libXfont/dist/src/fc/Makefile.am U xsrc/external/mit/libXfont/dist/src/fc/fsio.c U xsrc/external/mit/libXfont/dist/src/fc/Makefile.in U xsrc/external/mit/libXfont/dist/src/fc/fstrans.c U xsrc/external/mit/libXfont/dist/src/fc/fserve.h U xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c U xsrc/external/mit/libXfont/dist/src/fc/fservestr.h U xsrc/external/mit/libXfont/dist/src/fc/fsio.h U xsrc/external/mit/libXfont/dist/src/bitmap/bitmaputil.c U xsrc/external/mit/libXfont/dist/src/bitmap/pcfwrite.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmap.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in U xsrc/external/mit/libXfont/dist/src/bitmap/bitmapfunc.c U xsrc/external/mit/libXfont/dist/src/bitmap/bdfutils.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.am U xsrc/external/mit/libXfont/dist/src/bitmap/snfstr.h U xsrc/external/mit/libXfont/dist/src/bitmap/fontink.c U xsrc/external/mit/libXfont/dist/src/bitmap/snfread.c C xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitscale.c U xsrc/external/mit/libXfont/dist/src/stubs/getdefptsize.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.am U xsrc/external/mit/libXfont/dist/src/stubs/stubs.h U xsrc/external/mit/libXfont/dist/src/stubs/gettime.c U xsrc/external/mit/libXfont/dist/src/stubs/regfpefunc.c U xsrc/external/mit/libXfont/dist/src/stubs/getnewfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/findoldfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/rmfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in U xsrc/external/mit/libXfont/dist/src/stubs/cauthgen.c U xsrc/external/mit/libXfont/dist/src/stubs/getcres.c U xsrc/external/mit/libXfont/dist/src/stubs/csignal.c U xsrc/external/mit/libXfont/dist/src/stubs/setfntauth.c U xsrc/external/mit/libXfont/dist/src/stubs/errorf.c U xsrc/external/mit/libXfont/dist/src/stubs/delfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/initfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/fatalerror.c U xsrc/external/mit/libXfont/dist/src/stubs/servclient.c U xsrc/external/mit/libXfont/dist/src/stubs/stfntcfnt.c U xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/gunzip.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontencc.c U xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontdir.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontscale.c U xsrc/external/mit/libXfont/dist/src/fontfile/bufio.c U xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.am U xsrc/external/mit/libXfont/dist/src/fontfile/register.c C xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c U xsrc/external/mit/libXfont/dist/src/fontfile/defaults.c U xsrc/external/mit/libXfont/dist/src/fontfile/bitsource.c U xsrc/external/mit/libXfont/dist/src/fontfile/catalogue.c U
CVS import: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:20:01 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25668 Log Message: initial import of libXi-1.7.2 Status: Vendor Tag: xorg Release Tags: libXi-1-7-2 U xsrc/external/mit/libXi/dist/Makefile.in U xsrc/external/mit/libXi/dist/COPYING U xsrc/external/mit/libXi/dist/missing U xsrc/external/mit/libXi/dist/ChangeLog U xsrc/external/mit/libXi/dist/README U xsrc/external/mit/libXi/dist/install-sh U xsrc/external/mit/libXi/dist/xi.pc.in U xsrc/external/mit/libXi/dist/docbook.am U xsrc/external/mit/libXi/dist/Makefile.am U xsrc/external/mit/libXi/dist/config.sub U xsrc/external/mit/libXi/dist/configure U xsrc/external/mit/libXi/dist/config.guess U xsrc/external/mit/libXi/dist/aclocal.m4 U xsrc/external/mit/libXi/dist/configure.ac U xsrc/external/mit/libXi/dist/depcomp U xsrc/external/mit/libXi/dist/ltmain.sh U xsrc/external/mit/libXi/dist/INSTALL U xsrc/external/mit/libXi/dist/specs/encoding.xml U xsrc/external/mit/libXi/dist/specs/Makefile.in U xsrc/external/mit/libXi/dist/specs/library.xml U xsrc/external/mit/libXi/dist/specs/inputlib.xml U xsrc/external/mit/libXi/dist/specs/Makefile.am U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h U xsrc/external/mit/libXi/dist/man/XGetExtensionVersion.man U xsrc/external/mit/libXi/dist/man/XGetDeviceFocus.man U xsrc/external/mit/libXi/dist/man/XGetSelectedExtensionEvents.man U xsrc/external/mit/libXi/dist/man/XGetDeviceMotionEvents.man U xsrc/external/mit/libXi/dist/man/XSetDeviceButtonMapping.man U xsrc/external/mit/libXi/dist/man/XDeviceTimeCoord.man U xsrc/external/mit/libXi/dist/man/XCloseDevice.man U xsrc/external/mit/libXi/dist/man/XListInputDevices.txt U xsrc/external/mit/libXi/dist/man/XIChangeHierarchy.man U xsrc/external/mit/libXi/dist/man/XISelectEvents.man U xsrc/external/mit/libXi/dist/man/XDeviceBell.man U xsrc/external/mit/libXi/dist/man/XGetFeedbackControl.man U xsrc/external/mit/libXi/dist/man/XIQueryVersion.txt U xsrc/external/mit/libXi/dist/man/XDeviceBell.txt U xsrc/external/mit/libXi/dist/man/XIGrabFocusIn.man U xsrc/external/mit/libXi/dist/man/Makefile.in U xsrc/external/mit/libXi/dist/man/XChangeDeviceProperty.man U xsrc/external/mit/libXi/dist/man/XQueryDeviceState.man U xsrc/external/mit/libXi/dist/man/XIChangeProperty.man U xsrc/external/mit/libXi/dist/man/XSetDeviceModifierMapping.man U xsrc/external/mit/libXi/dist/man/XUngrabDeviceButton.man U xsrc/external/mit/libXi/dist/man/XSetDeviceFocus.man U xsrc/external/mit/libXi/dist/man/XGetDeviceControl.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceKey.txt U xsrc/external/mit/libXi/dist/man/XIGetFocus.man U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man U xsrc/external/mit/libXi/dist/man/XSetDeviceValuators.txt U xsrc/external/mit/libXi/dist/man/XGetFeedbackControl.txt U xsrc/external/mit/libXi/dist/man/XChangeKeyboardDevice.txt U xsrc/external/mit/libXi/dist/man/XIBarrierReleasePointer.txt U xsrc/external/mit/libXi/dist/man/XIListProperties.txt U xsrc/external/mit/libXi/dist/man/XIWarpPointer.man U xsrc/external/mit/libXi/dist/man/XGetDeviceProperty.txt U xsrc/external/mit/libXi/dist/man/XAllowDeviceEvents.txt U xsrc/external/mit/libXi/dist/man/XISetFocus.man U xsrc/external/mit/libXi/dist/man/XISetClientPointer.txt U xsrc/external/mit/libXi/dist/man/XGetDeviceProperty.man U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man U xsrc/external/mit/libXi/dist/man/XSetDeviceMode.txt U xsrc/external/mit/libXi/dist/man/XSetDeviceButtonMapping.txt U xsrc/external/mit/libXi/dist/man/XIGrabDevice.txt U xsrc/external/mit/libXi/dist/man/XISetFocus.txt U xsrc/external/mit/libXi/dist/man/XChangeDeviceControl.man U xsrc/external/mit/libXi/dist/man/XQueryDeviceState.txt U xsrc/external/mit/libXi/dist/man/XIBarrierReleasePointers.man U xsrc/external/mit/libXi/dist/man/XIWarpPointer.txt U xsrc/external/mit/libXi/dist/man/XIUngrabKeycode.man U xsrc/external/mit/libXi/dist/man/XIGrabTouchBegin.man U xsrc/external/mit/libXi/dist/man/XSendExtensionEvent.txt U xsrc/external/mit/libXi/dist/man/XChangeFeedbackControl.man U xsrc/external/mit/libXi/dist/man/XIQueryDevice.man U xsrc/external/mit/libXi/dist/man/XIQueryVersion.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.txt U xsrc/external/mit/libXi/dist/man/XIUngrabFocusIn.man U xsrc/external/mit/libXi/dist/man/XIChangeProperty.txt U xsrc/external/mit/libXi/dist/man/XChangePointerDevice.txt U xsrc/external/mit/libXi/dist/man/XOpenDevice.txt U xsrc/external/mit/libXi/dist/man/XSetDeviceMode.man U xsrc/external/mit/libXi/dist/man/XIQueryDevice.txt U xsrc/external/mit/libXi/dist/man/XAllowDeviceEvents.man U xsrc/external/mit/libXi/dist/man/XIUngrabTouchBegin.man U xsrc/external/mit/libXi/dist/man/XChangeDeviceKeyMapping.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.man U
CVS import: xsrc/external/mit/libXmu/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:20:03 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXmu/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18064 Log Message: initial import of libXmu-1.1.2 Status: Vendor Tag: xorg Release Tags: libXmu-1-1-2 U xsrc/external/mit/libXmu/dist/COPYING U xsrc/external/mit/libXmu/dist/install-sh U xsrc/external/mit/libXmu/dist/Makefile.in U xsrc/external/mit/libXmu/dist/configure.ac N xsrc/external/mit/libXmu/dist/compile U xsrc/external/mit/libXmu/dist/aclocal.m4 U xsrc/external/mit/libXmu/dist/configure U xsrc/external/mit/libXmu/dist/docbook.am U xsrc/external/mit/libXmu/dist/ChangeLog U xsrc/external/mit/libXmu/dist/README U xsrc/external/mit/libXmu/dist/depcomp U xsrc/external/mit/libXmu/dist/missing U xsrc/external/mit/libXmu/dist/Makefile.am U xsrc/external/mit/libXmu/dist/xmu.pc.in U xsrc/external/mit/libXmu/dist/xmuu.pc.in U xsrc/external/mit/libXmu/dist/config.h.in U xsrc/external/mit/libXmu/dist/config.sub U xsrc/external/mit/libXmu/dist/INSTALL U xsrc/external/mit/libXmu/dist/config.guess U xsrc/external/mit/libXmu/dist/ltmain.sh U xsrc/external/mit/libXmu/dist/include/Makefile.in U xsrc/external/mit/libXmu/dist/include/Makefile.am U xsrc/external/mit/libXmu/dist/include/X11/Xmu/EditresP.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/ExtAgent.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Xmu.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Drawing.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Lookup.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CharSet.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Misc.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Editres.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/WidgetNode.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/SysUtil.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/StdSel.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/WinUtil.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Xct.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Initer.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/StdCmap.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CurUtil.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CloseHook.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Converters.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CvtCache.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Error.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Atoms.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/WhitePoint.h U xsrc/external/mit/libXmu/dist/include/X11/Xmu/DisplayQue.h U xsrc/external/mit/libXmu/dist/doc/xlogo.svg U xsrc/external/mit/libXmu/dist/doc/Makefile.in U xsrc/external/mit/libXmu/dist/doc/Xmu.xml U xsrc/external/mit/libXmu/dist/doc/Makefile.am U xsrc/external/mit/libXmu/dist/src/LookupCmap.c U xsrc/external/mit/libXmu/dist/src/CvtStdSel.c U xsrc/external/mit/libXmu/dist/src/ScrOfWin.c U xsrc/external/mit/libXmu/dist/src/DrawLogo.c C xsrc/external/mit/libXmu/dist/src/StrToGrav.c U xsrc/external/mit/libXmu/dist/src/StrToBmap.c U xsrc/external/mit/libXmu/dist/src/CloseHook.c U xsrc/external/mit/libXmu/dist/src/DrRndRect.c U xsrc/external/mit/libXmu/dist/src/Lower.c U xsrc/external/mit/libXmu/dist/src/StrToBS.c U xsrc/external/mit/libXmu/dist/src/DisplayQue.c U xsrc/external/mit/libXmu/dist/src/LocBitmap.c U xsrc/external/mit/libXmu/dist/src/StrToJust.c U xsrc/external/mit/libXmu/dist/src/VisCmap.c U xsrc/external/mit/libXmu/dist/src/RdBitF.c U xsrc/external/mit/libXmu/dist/src/DefErrMsg.c U xsrc/external/mit/libXmu/dist/src/CmapAlloc.c U xsrc/external/mit/libXmu/dist/src/CvtCache.c U xsrc/external/mit/libXmu/dist/src/Distinct.c U xsrc/external/mit/libXmu/dist/src/GrayPixmap.c U xsrc/external/mit/libXmu/dist/src/Initer.c U xsrc/external/mit/libXmu/dist/src/CursorName.c U xsrc/external/mit/libXmu/dist/src/ExtAgent.c U xsrc/external/mit/libXmu/dist/src/StrToLong.c U xsrc/external/mit/libXmu/dist/src/StrToShap.c U xsrc/external/mit/libXmu/dist/src/Xct.c U xsrc/external/mit/libXmu/dist/src/AllCmap.c U xsrc/external/mit/libXmu/dist/src/Makefile.in U xsrc/external/mit/libXmu/dist/src/UpdMapHint.c U xsrc/external/mit/libXmu/dist/src/ShapeWidg.c U xsrc/external/mit/libXmu/dist/src/Clip.c U xsrc/external/mit/libXmu/dist/src/WidgetNode.c U xsrc/external/mit/libXmu/dist/src/CrPixFBit.c U xsrc/external/mit/libXmu/dist/src/StrToCurs.c U xsrc/external/mit/libXmu/dist/src/sharedlib.c U xsrc/external/mit/libXmu/dist/src/DelCmap.c U xsrc/external/mit/libXmu/dist/src/EditresCom.c U xsrc/external/mit/libXmu/dist/src/ClientWin.c U xsrc/external/mit/libXmu/dist/src/CrCmap.c U xsrc/external/mit/libXmu/dist/src/GetHost.c U xsrc/external/mit/libXmu/dist/src/Makefile.am U xsrc/external/mit/libXmu/dist/src/StrToWidg.c U xsrc/external/mit/libXmu/dist/src/Lookup.c U xsrc/external/mit/libXmu/dist/src/StdCmap.c U xsrc/external/mit/libXmu/dist/src/Atoms.c U xsrc/external/mit/libXmu/dist/src/StrToOrnt.c U xsrc/external/mit/libXmu/dist/src/FToCback.c 1
CVS import: xsrc/external/mit/libXpm/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:20:05 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXpm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18595 Log Message: initial import of libXpm-3.5.11 Status: Vendor Tag: xorg Release Tags: libXpm-3-5-11 U xsrc/external/mit/libXpm/dist/INSTALL U xsrc/external/mit/libXpm/dist/Makefile.in U xsrc/external/mit/libXpm/dist/ChangeLog U xsrc/external/mit/libXpm/dist/config.sub U xsrc/external/mit/libXpm/dist/configure U xsrc/external/mit/libXpm/dist/README U xsrc/external/mit/libXpm/dist/Makefile.am U xsrc/external/mit/libXpm/dist/config.guess U xsrc/external/mit/libXpm/dist/COPYRIGHT U xsrc/external/mit/libXpm/dist/aclocal.m4 U xsrc/external/mit/libXpm/dist/configure.ac U xsrc/external/mit/libXpm/dist/ltmain.sh U xsrc/external/mit/libXpm/dist/install-sh N xsrc/external/mit/libXpm/dist/compile U xsrc/external/mit/libXpm/dist/AUTHORS U xsrc/external/mit/libXpm/dist/COPYING U xsrc/external/mit/libXpm/dist/missing U xsrc/external/mit/libXpm/dist/config.h.in U xsrc/external/mit/libXpm/dist/xpm.pc.in U xsrc/external/mit/libXpm/dist/depcomp U xsrc/external/mit/libXpm/dist/src/CrBufFrI.c U xsrc/external/mit/libXpm/dist/src/CrPFrDat.c U xsrc/external/mit/libXpm/dist/src/rgbtab.h U xsrc/external/mit/libXpm/dist/src/RdFToBuf.c U xsrc/external/mit/libXpm/dist/src/hashtab.c U xsrc/external/mit/libXpm/dist/src/CrIFrBuf.c U xsrc/external/mit/libXpm/dist/src/CrIFrP.c U xsrc/external/mit/libXpm/dist/src/XpmI.h U xsrc/external/mit/libXpm/dist/src/amigax.c U xsrc/external/mit/libXpm/dist/src/RdFToP.c U xsrc/external/mit/libXpm/dist/src/WrFFrDat.c U xsrc/external/mit/libXpm/dist/src/data.c U xsrc/external/mit/libXpm/dist/src/WrFFrP.c U xsrc/external/mit/libXpm/dist/src/misc.c U xsrc/external/mit/libXpm/dist/src/Info.c U xsrc/external/mit/libXpm/dist/src/CrDatFrP.c U xsrc/external/mit/libXpm/dist/src/Image.c U xsrc/external/mit/libXpm/dist/src/simx.h U xsrc/external/mit/libXpm/dist/src/CrBufFrP.c U xsrc/external/mit/libXpm/dist/src/WrFFrBuf.c U xsrc/external/mit/libXpm/dist/src/amigax.h U xsrc/external/mit/libXpm/dist/src/Makefile.in U xsrc/external/mit/libXpm/dist/src/CrPFrI.c U xsrc/external/mit/libXpm/dist/src/parse.c U xsrc/external/mit/libXpm/dist/src/RdFToI.c U xsrc/external/mit/libXpm/dist/src/CrPFrBuf.c U xsrc/external/mit/libXpm/dist/src/create.c U xsrc/external/mit/libXpm/dist/src/RdFToDat.c U xsrc/external/mit/libXpm/dist/src/WrFFrI.c U xsrc/external/mit/libXpm/dist/src/simx.c U xsrc/external/mit/libXpm/dist/src/CrDatFrI.c U xsrc/external/mit/libXpm/dist/src/CrIFrDat.c U xsrc/external/mit/libXpm/dist/src/Attrib.c U xsrc/external/mit/libXpm/dist/src/Makefile.am U xsrc/external/mit/libXpm/dist/src/scan.c U xsrc/external/mit/libXpm/dist/src/rgb.c U xsrc/external/mit/libXpm/dist/cxpm/Makefile.am U xsrc/external/mit/libXpm/dist/cxpm/cxpm.c U xsrc/external/mit/libXpm/dist/cxpm/Makefile.in U xsrc/external/mit/libXpm/dist/sxpm/plaid_ext.xpm U xsrc/external/mit/libXpm/dist/sxpm/Makefile.am U xsrc/external/mit/libXpm/dist/sxpm/plaid.xpm U xsrc/external/mit/libXpm/dist/sxpm/Makefile.in U xsrc/external/mit/libXpm/dist/sxpm/plaid_mask.xpm U xsrc/external/mit/libXpm/dist/sxpm/sxpm.c U xsrc/external/mit/libXpm/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libXpm/dist/include/Makefile.am U xsrc/external/mit/libXpm/dist/include/Makefile.in U xsrc/external/mit/libXpm/dist/include/X11/xpm.h U xsrc/external/mit/libXpm/dist/doc/README.MSW U xsrc/external/mit/libXpm/dist/doc/FAQ.html U xsrc/external/mit/libXpm/dist/doc/README.AMIGA U xsrc/external/mit/libXpm/dist/doc/Makefile.am U xsrc/external/mit/libXpm/dist/doc/README.html U xsrc/external/mit/libXpm/dist/doc/xpm.PS.gz U xsrc/external/mit/libXpm/dist/doc/Makefile.in U xsrc/external/mit/libXpm/dist/man/Makefile.in U xsrc/external/mit/libXpm/dist/man/cxpm.man U xsrc/external/mit/libXpm/dist/man/Makefile.am U xsrc/external/mit/libXpm/dist/man/sxpm.man No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 16 22:27:36 UTC 2014
Modified Files:
xsrc/external/mit/libXfont/dist/src/FreeType: ftfuncs.c
xsrc/external/mit/libXi/dist/src: XGMotion.c XGetDCtl.c XGetDProp.c
XGetFCtl.c XGetProp.c XIPassiveGrab.c XIProperties.c XISelEv.c
XListDev.c XQueryDv.c
Log Message:
merge libSM 1.2.2, libXaw 1.0.12, libXfont 1.4.7, libXi 1.7.2,
libXmu 1.1.2, and libXpm 3.5.11 parts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXi/dist/src/XGMotion.c \
xsrc/external/mit/libXi/dist/src/XGetDCtl.c \
xsrc/external/mit/libXi/dist/src/XGetDProp.c \
xsrc/external/mit/libXi/dist/src/XGetProp.c \
xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c \
xsrc/external/mit/libXi/dist/src/XIProperties.c \
xsrc/external/mit/libXi/dist/src/XISelEv.c \
xsrc/external/mit/libXi/dist/src/XListDev.c \
xsrc/external/mit/libXi/dist/src/XQueryDv.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXi/dist/src/XGetFCtl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
diff -u xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.3 xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.4
--- xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.3 Fri May 31 01:18:45 2013
+++ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Sun Mar 16 22:27:35 2014
@@ -2050,7 +2050,7 @@ restrict_code_range_by_str(int count,uns
{
int nRanges = 0;
int result = 0;
-fsRange *ranges = NULL;
+fsRange *ranges = NULL, *oldRanges;
char const *p, *q;
p = q = str;
@@ -2119,10 +2119,13 @@ restrict_code_range_by_str(int count,uns
fflush(stderr);
#endif
nRanges++;
+oldRanges = ranges;
ranges = realloc(ranges, nRanges*sizeof(*ranges));
-if (NULL == ranges)
+if (NULL == ranges) {
+free(oldRanges);
break;
-{
+}
+else {
fsRange *r = ranges+nRanges-1;
r-min_char_low = minpoint 0xff;
@@ -2204,7 +2207,7 @@ FreeTypeSetUpTTCap( char *fileName, Font
strcpy(*dynStrRealFileName+dirLen, p2+1);
capHead = p1;
} else {
- *dynStrRealFileName = xstrdup(fileName);
+ *dynStrRealFileName = strdup(fileName);
if( *dynStrRealFileName == NULL ) {
result = AllocError;
goto quit;
@@ -2289,13 +2292,11 @@ FreeTypeSetUpTTCap( char *fileName, Font
}
}
else{
- *dynStrFTFileName = malloc(strlen(*dynStrRealFileName)+1);
+ *dynStrFTFileName = strdup(*dynStrRealFileName);
if( *dynStrFTFileName == NULL ){
result = AllocError;
goto quit;
}
- **dynStrFTFileName = '\0';
- strcat(*dynStrFTFileName,*dynStrRealFileName);
}
}
/*
@@ -2549,7 +2550,7 @@ FreeTypeSetUpTTCap( char *fileName, Font
if (SPropRecValList_search_record(listPropRecVal,
contRecValue,
CodeRange)) {
- *dynStrTTCapCodeRange = xstrdup(SPropContainer_value_str(contRecValue));
+ *dynStrTTCapCodeRange = strdup(SPropContainer_value_str(contRecValue));
if( *dynStrTTCapCodeRange == NULL ) {
result = AllocError;
goto quit;
Index: xsrc/external/mit/libXi/dist/src/XGMotion.c
diff -u xsrc/external/mit/libXi/dist/src/XGMotion.c:1.2 xsrc/external/mit/libXi/dist/src/XGMotion.c:1.3
--- xsrc/external/mit/libXi/dist/src/XGMotion.c:1.2 Thu Jun 6 06:46:32 2013
+++ xsrc/external/mit/libXi/dist/src/XGMotion.c Sun Mar 16 22:27:35 2014
@@ -124,7 +124,7 @@ XGetDeviceMotionEvents(
Xfree(bufp);
Xfree(savp);
*nEvents = 0;
- _XEatData(dpy, (unsigned long)size);
+ _XEatDataWords(dpy, rep.length);
UnlockDisplay(dpy);
SyncHandle();
return (NULL);
Index: xsrc/external/mit/libXi/dist/src/XGetDCtl.c
diff -u xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.2 xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.3
--- xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.2 Thu Jun 6 06:46:32 2013
+++ xsrc/external/mit/libXi/dist/src/XGetDCtl.c Sun Mar 16 22:27:35 2014
@@ -98,7 +98,7 @@ XGetDeviceControl(
d = Xmalloc(nbytes);
}
if (!d) {
- _XEatData(dpy, (unsigned long)nbytes);
+ _XEatDataWords(dpy, rep.length);
goto out;
}
sav = d;
@@ -122,34 +122,34 @@ XGetDeviceControl(
val_size = 3 * sizeof(int) * r-num_valuators;
if ((sizeof(xDeviceResolutionState) + val_size) nbytes)
goto out;
- size += sizeof(XDeviceResolutionState) + val_size;
+ size = sizeof(XDeviceResolutionState) + val_size;
break;
}
case DEVICE_ABS_CALIB:
{
if (sizeof(xDeviceAbsCalibState) nbytes)
goto out;
-size += sizeof(XDeviceAbsCalibState);
+size = sizeof(XDeviceAbsCalibState);
break;
}
CVS commit: xsrc/external/mit/libXfont/include
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:30:54 UTC 2014 Modified Files: xsrc/external/mit/libXfont/include: config.h Log Message: merge libXfont 1.4.7. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXfont/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/include/config.h diff -u xsrc/external/mit/libXfont/include/config.h:1.3 xsrc/external/mit/libXfont/include/config.h:1.4 --- xsrc/external/mit/libXfont/include/config.h:1.3 Sun Jan 10 09:58:24 2010 +++ xsrc/external/mit/libXfont/include/config.h Sun Mar 16 22:30:54 2014 @@ -25,6 +25,9 @@ /* Define to 1 if you have the poll.h header file. */ #define HAVE_POLL_H 1 +/* Define to 1 if you have the `readlink' function. */ +#undef HAVE_READLINK + /* Define to 1 if the system has the type `socklen_t'. */ #define HAVE_SOCKLEN_T 1 @@ -58,6 +61,10 @@ /* Support os-specific local connections */ /* #undef LOCALCONN */ +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #define PACKAGE libXfont @@ -68,13 +75,16 @@ #define PACKAGE_NAME libXfont /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libXfont 1.4.1 +#define PACKAGE_STRING libXfont 1.4.7 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libXfont +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.4.1 +#define PACKAGE_VERSION 1.4.7 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -83,10 +93,7 @@ #define PACKAGE_VERSION_MINOR 4 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 1 - -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE void +#define PACKAGE_VERSION_PATCHLEVEL 7 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -97,6 +104,28 @@ /* Support UNIX socket connections */ #define UNIXCONN 1 +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #define VERSION 1.4.1 @@ -129,3 +158,16 @@ /* Support gzip for bitmap fonts */ #define X_GZIP_FONT_COMPRESSION 1 + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE + +/* Defined if needed to expose struct msghdr.msg_control */ +#undef _XOPEN_SOURCE
CVS commit: src/lib/libm/src
Module Name:src
Committed By: dsl
Date: Sun Mar 16 22:30:44 UTC 2014
Modified Files:
src/lib/libm/src: s_exp2f.c
Log Message:
Fix overflow and underflow on i386.
The return value of a 'float' function is in the x87 %st(0) register.
This is an 80bit 'long double' register.
If you multiply 0x1p100f by 0x1p100f the caller sees 0x1p200 - not the
expected infinity.
So use a 'double' value which goes through a store-load sequence to generate
the required exception and value.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_exp2f.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_exp2f.c
diff -u src/lib/libm/src/s_exp2f.c:1.1 src/lib/libm/src/s_exp2f.c:1.2
--- src/lib/libm/src/s_exp2f.c:1.1 Mon Jan 11 16:28:39 2010
+++ src/lib/libm/src/s_exp2f.c Sun Mar 16 22:30:43 2014
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: s_exp2f.c,v 1.1 2010/01/11 16:28:39 christos Exp $);
+__RCSID($NetBSD: s_exp2f.c,v 1.2 2014/03/16 22:30:43 dsl Exp $);
#ifdef __FBSDID
__FBSDID($FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.9 2008/02/22 02:27:34 das Exp $);
#endif
@@ -39,14 +39,35 @@ __FBSDID($FreeBSD: src/lib/msun/src/s_e
#define TBLSIZE (1 TBLBITS)
static const float
-huge= 0x1p100f,
redux = 0x1.8p23f / TBLSIZE,
P1 = 0x1.62e430p-1f,
P2 = 0x1.ebfbe0p-3f,
P3 = 0x1.c6b348p-5f,
P4 = 0x1.3b2c9cp-7f;
-static volatile float twom100 = 0x1p-100f;
+/*
+ * For out of range values we need to generate the appropriate
+ * underflow or overflow trap as well as generating infinity or zero.
+ * This means we have to get the fpu to execute an instruction that
+ * will generate the trap (and not have the compiler optimise it away).
+ * This is normally done by calculating 'huge * huge' or 'tiny * tiny'.
+ *
+ * i386 is particularly problematic.
+ * The 'float' result is returned on the x87 stack, so is 'long double'.
+ * If we just multiply two 'float' values the caller will see 0x1p+/-200
+ * (not 0 or infinity).
+ * If we use 'double' the compiler does a store-load which will convert the
+ * value and generate the required exception.
+ */
+#ifdef __i386__
+static volatile double overflow = 0x1p+1000;
+static volatile double underflow = 0x1p-1000;
+#else
+static volatile float huge = 0x1p+100;
+static volatile float tiny = 0x1p-100;
+#define overflow (huge * huge)
+#define underflow (tiny * tiny)
+#endif
static const double exp2ft[TBLSIZE] = {
0x1.6a09e667f3bcdp-1,
@@ -112,9 +133,9 @@ exp2f(float x)
return (0.0); /* x is -Inf */
}
if(x = 0x1.0p7f)
- return (huge * huge); /* overflow */
+ return overflow; /* +infinity with overflow */
if(x = -0x1.2cp7f)
- return (twom100 * twom100); /* underflow */
+ return underflow; /* zero with underflow */
} else if (ix = 0x3300) { /* |x| = 0x1p-25 */
return (1.0f + x);
}
CVS import: xsrc/external/mit/libXrender/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:36:11 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXrender/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25813 Log Message: initial import of libXrender-0.9.8 Status: Vendor Tag: xorg Release Tags: libXrender-0-9-8 U xsrc/external/mit/libXrender/dist/Makefile.am U xsrc/external/mit/libXrender/dist/COPYING U xsrc/external/mit/libXrender/dist/AUTHORS U xsrc/external/mit/libXrender/dist/xrender.pc.in U xsrc/external/mit/libXrender/dist/ltmain.sh U xsrc/external/mit/libXrender/dist/README U xsrc/external/mit/libXrender/dist/install-sh U xsrc/external/mit/libXrender/dist/Makefile.in U xsrc/external/mit/libXrender/dist/aclocal.m4 U xsrc/external/mit/libXrender/dist/config.guess U xsrc/external/mit/libXrender/dist/depcomp U xsrc/external/mit/libXrender/dist/missing U xsrc/external/mit/libXrender/dist/configure.ac U xsrc/external/mit/libXrender/dist/configure U xsrc/external/mit/libXrender/dist/INSTALL U xsrc/external/mit/libXrender/dist/ChangeLog U xsrc/external/mit/libXrender/dist/config.h.in U xsrc/external/mit/libXrender/dist/config.sub U xsrc/external/mit/libXrender/dist/include/X11/extensions/Xrender.h U xsrc/external/mit/libXrender/dist/doc/libXrender.txt U xsrc/external/mit/libXrender/dist/src/Picture.c U xsrc/external/mit/libXrender/dist/src/Trap.c U xsrc/external/mit/libXrender/dist/src/FillRects.c C xsrc/external/mit/libXrender/dist/src/Xrender.c U xsrc/external/mit/libXrender/dist/src/Xrenderint.h U xsrc/external/mit/libXrender/dist/src/AddTrap.c U xsrc/external/mit/libXrender/dist/src/Composite.c U xsrc/external/mit/libXrender/dist/src/Makefile.in U xsrc/external/mit/libXrender/dist/src/Poly.c U xsrc/external/mit/libXrender/dist/src/Cursor.c U xsrc/external/mit/libXrender/dist/src/Makefile.am U xsrc/external/mit/libXrender/dist/src/Tri.c C xsrc/external/mit/libXrender/dist/src/Filter.c U xsrc/external/mit/libXrender/dist/src/FillRect.c U xsrc/external/mit/libXrender/dist/src/Glyph.c U xsrc/external/mit/libXrender/dist/src/Color.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXrender/dist
CVS import: xsrc/external/mit/libXv/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:36:12 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29802 Log Message: initial import of libXv-1.0.10 Status: Vendor Tag: xorg Release Tags: libXv-1-0-10 U xsrc/external/mit/libXv/dist/INSTALL U xsrc/external/mit/libXv/dist/config.guess U xsrc/external/mit/libXv/dist/configure U xsrc/external/mit/libXv/dist/xv.pc.in U xsrc/external/mit/libXv/dist/install-sh U xsrc/external/mit/libXv/dist/config.h.in U xsrc/external/mit/libXv/dist/aclocal.m4 U xsrc/external/mit/libXv/dist/ChangeLog U xsrc/external/mit/libXv/dist/missing U xsrc/external/mit/libXv/dist/depcomp U xsrc/external/mit/libXv/dist/README U xsrc/external/mit/libXv/dist/Makefile.am N xsrc/external/mit/libXv/dist/compile U xsrc/external/mit/libXv/dist/AUTHORS U xsrc/external/mit/libXv/dist/ltmain.sh U xsrc/external/mit/libXv/dist/Makefile.in U xsrc/external/mit/libXv/dist/COPYING U xsrc/external/mit/libXv/dist/configure.ac U xsrc/external/mit/libXv/dist/config.sub U xsrc/external/mit/libXv/dist/src/Makefile.am U xsrc/external/mit/libXv/dist/src/Xvlibint.h U xsrc/external/mit/libXv/dist/src/Xv.c U xsrc/external/mit/libXv/dist/src/Makefile.in U xsrc/external/mit/libXv/dist/man/XvQueryPortAttributes.man U xsrc/external/mit/libXv/dist/man/XvGetPortAttribute.man U xsrc/external/mit/libXv/dist/man/XvQueryAdaptors.man U xsrc/external/mit/libXv/dist/man/XvSetPortAttribute.man U xsrc/external/mit/libXv/dist/man/XvQueryExtension.man U xsrc/external/mit/libXv/dist/man/XvQueryBestSize.man U xsrc/external/mit/libXv/dist/man/XvFreeEncodingInfo.man U xsrc/external/mit/libXv/dist/man/xv-library-v2.2.txt U xsrc/external/mit/libXv/dist/man/XvShmCreateImage.man U xsrc/external/mit/libXv/dist/man/XvShmPutImage.man U xsrc/external/mit/libXv/dist/man/XvQueryEncodings.man U xsrc/external/mit/libXv/dist/man/XvFreeAdaptorInfo.man U xsrc/external/mit/libXv/dist/man/XvListImageFormats.man U xsrc/external/mit/libXv/dist/man/XvCreateImage.man U xsrc/external/mit/libXv/dist/man/XvUngrabPort.man U xsrc/external/mit/libXv/dist/man/XvGrabPort.man U xsrc/external/mit/libXv/dist/man/XvSelectPortNotify.man U xsrc/external/mit/libXv/dist/man/XvStopVideo.man U xsrc/external/mit/libXv/dist/man/XvGetVideo.man U xsrc/external/mit/libXv/dist/man/Xv.man U xsrc/external/mit/libXv/dist/man/XvSelectVideoNotify.man U xsrc/external/mit/libXv/dist/man/XvGetStill.man U xsrc/external/mit/libXv/dist/man/XvVideoNotify.man U xsrc/external/mit/libXv/dist/man/Makefile.in U xsrc/external/mit/libXv/dist/man/XvPutVideo.man U xsrc/external/mit/libXv/dist/man/XvPortNotify.man U xsrc/external/mit/libXv/dist/man/XvPutImage.man U xsrc/external/mit/libXv/dist/man/Makefile.am U xsrc/external/mit/libXv/dist/man/XvPutStill.man U xsrc/external/mit/libXv/dist/include/Makefile.am U xsrc/external/mit/libXv/dist/include/Makefile.in U xsrc/external/mit/libXv/dist/include/X11/Makefile.in U xsrc/external/mit/libXv/dist/include/X11/Makefile.am U xsrc/external/mit/libXv/dist/include/X11/extensions/Makefile.am U xsrc/external/mit/libXv/dist/include/X11/extensions/Xvlib.h U xsrc/external/mit/libXv/dist/include/X11/extensions/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/libXvMC/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:36:14 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXvMC/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22162 Log Message: initial import of libXvMC-1.0.8 Status: Vendor Tag: xorg Release Tags: libXvMC-1-0-8 U xsrc/external/mit/libXvMC/dist/config.h.in U xsrc/external/mit/libXvMC/dist/xvmc.pc.in U xsrc/external/mit/libXvMC/dist/ChangeLog U xsrc/external/mit/libXvMC/dist/configure U xsrc/external/mit/libXvMC/dist/config.sub U xsrc/external/mit/libXvMC/dist/COPYING U xsrc/external/mit/libXvMC/dist/missing U xsrc/external/mit/libXvMC/dist/config.guess U xsrc/external/mit/libXvMC/dist/depcomp U xsrc/external/mit/libXvMC/dist/README U xsrc/external/mit/libXvMC/dist/XvMC_API.txt U xsrc/external/mit/libXvMC/dist/install-sh U xsrc/external/mit/libXvMC/dist/ltmain.sh U xsrc/external/mit/libXvMC/dist/INSTALL U xsrc/external/mit/libXvMC/dist/aclocal.m4 U xsrc/external/mit/libXvMC/dist/configure.ac U xsrc/external/mit/libXvMC/dist/Makefile.in U xsrc/external/mit/libXvMC/dist/Makefile.am U xsrc/external/mit/libXvMC/dist/wrapper/XvMCWrapper.c U xsrc/external/mit/libXvMC/dist/wrapper/Makefile.in U xsrc/external/mit/libXvMC/dist/wrapper/Makefile.am U xsrc/external/mit/libXvMC/dist/src/XvMClibint.h U xsrc/external/mit/libXvMC/dist/src/Makefile.am U xsrc/external/mit/libXvMC/dist/src/Makefile.in C xsrc/external/mit/libXvMC/dist/src/XvMC.c U xsrc/external/mit/libXvMC/dist/include/Makefile.am U xsrc/external/mit/libXvMC/dist/include/Makefile.in U xsrc/external/mit/libXvMC/dist/include/X11/Makefile.in U xsrc/external/mit/libXvMC/dist/include/X11/Makefile.am U xsrc/external/mit/libXvMC/dist/include/X11/extensions/Makefile.in U xsrc/external/mit/libXvMC/dist/include/X11/extensions/Makefile.am U xsrc/external/mit/libXvMC/dist/include/X11/extensions/XvMClib.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXvMC/dist
CVS import: xsrc/external/mit/libXrandr/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:36:09 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1764 Log Message: initial import of libXrandr-1.4.2 Status: Vendor Tag: xorg Release Tags: libXrandr-1-4-2 U xsrc/external/mit/libXrandr/dist/INSTALL U xsrc/external/mit/libXrandr/dist/ltmain.sh U xsrc/external/mit/libXrandr/dist/README U xsrc/external/mit/libXrandr/dist/config.h.in U xsrc/external/mit/libXrandr/dist/config.sub U xsrc/external/mit/libXrandr/dist/configure.ac U xsrc/external/mit/libXrandr/dist/ChangeLog U xsrc/external/mit/libXrandr/dist/config.guess U xsrc/external/mit/libXrandr/dist/depcomp U xsrc/external/mit/libXrandr/dist/xrandr.pc.in U xsrc/external/mit/libXrandr/dist/missing U xsrc/external/mit/libXrandr/dist/Makefile.am U xsrc/external/mit/libXrandr/dist/configure N xsrc/external/mit/libXrandr/dist/compile U xsrc/external/mit/libXrandr/dist/AUTHORS U xsrc/external/mit/libXrandr/dist/COPYING U xsrc/external/mit/libXrandr/dist/install-sh U xsrc/external/mit/libXrandr/dist/Makefile.in U xsrc/external/mit/libXrandr/dist/aclocal.m4 U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfigAndRate.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigRotations.man U xsrc/external/mit/libXrandr/dist/man/Makefile.am U xsrc/external/mit/libXrandr/dist/man/XRRFreeScreenConfigInfo.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigTimes.man U xsrc/external/mit/libXrandr/dist/man/XRRQueryExtension.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigRates.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentRate.man U xsrc/external/mit/libXrandr/dist/man/XRRGetScreenInfo.man U xsrc/external/mit/libXrandr/dist/man/Makefile.in U xsrc/external/mit/libXrandr/dist/man/Xrandr.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentConfiguration.man U xsrc/external/mit/libXrandr/dist/man/XRRSelectInput.man U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfig.man U xsrc/external/mit/libXrandr/dist/man/XRRRootToScreen.man U xsrc/external/mit/libXrandr/dist/man/XRRQueryVersion.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigSizes.man U xsrc/external/mit/libXrandr/dist/src/XrrProviderProperty.c U xsrc/external/mit/libXrandr/dist/src/Makefile.am U xsrc/external/mit/libXrandr/dist/src/XrrCrtc.c U xsrc/external/mit/libXrandr/dist/src/Makefile.in U xsrc/external/mit/libXrandr/dist/src/XrrConfig.c U xsrc/external/mit/libXrandr/dist/src/XrrMode.c U xsrc/external/mit/libXrandr/dist/src/Xrandrint.h U xsrc/external/mit/libXrandr/dist/src/Xrandr.c U xsrc/external/mit/libXrandr/dist/src/XrrProperty.c U xsrc/external/mit/libXrandr/dist/src/XrrScreen.c C xsrc/external/mit/libXrandr/dist/src/XrrProvider.c U xsrc/external/mit/libXrandr/dist/src/XrrOutput.c U xsrc/external/mit/libXrandr/dist/include/X11/extensions/Xrandr.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXrandr/dist
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 16 22:39:09 UTC 2014
Modified Files:
xsrc/external/mit/libXrender/dist/src: Filter.c Xrender.c
xsrc/external/mit/libXvMC/dist/src: XvMC.c
Log Message:
merge libXrandr 1.4.2, libXrender 0.9.8 libXv 1.0.10 and libXvMC 1.0.8.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXrender/dist/src/Filter.c \
xsrc/external/mit/libXrender/dist/src/Xrender.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXvMC/dist/src/XvMC.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXrender/dist/src/Filter.c
diff -u xsrc/external/mit/libXrender/dist/src/Filter.c:1.2 xsrc/external/mit/libXrender/dist/src/Filter.c:1.3
--- xsrc/external/mit/libXrender/dist/src/Filter.c:1.2 Thu Jun 6 06:46:33 2013
+++ xsrc/external/mit/libXrender/dist/src/Filter.c Sun Mar 16 22:39:09 2014
@@ -90,7 +90,7 @@ XRenderQueryFilters (Display *dpy, Drawa
if (!filters)
{
- _XEatData (dpy, (unsigned long) rep.length 2);
+ _XEatDataWords(dpy, rep.length);
UnlockDisplay (dpy);
SyncHandle ();
return NULL;
Index: xsrc/external/mit/libXrender/dist/src/Xrender.c
diff -u xsrc/external/mit/libXrender/dist/src/Xrender.c:1.2 xsrc/external/mit/libXrender/dist/src/Xrender.c:1.3
--- xsrc/external/mit/libXrender/dist/src/Xrender.c:1.2 Thu Jun 6 06:46:33 2013
+++ xsrc/external/mit/libXrender/dist/src/Xrender.c Sun Mar 16 22:39:09 2014
@@ -487,7 +487,7 @@ XRenderQueryFormats (Display *dpy)
{
if (xri) Xfree (xri);
if (xData) Xfree (xData);
- _XEatData (dpy, nbytes);
+ _XEatDataWords (dpy, rep.length);
UnlockDisplay (dpy);
SyncHandle ();
return 0;
@@ -878,7 +878,7 @@ XRenderQueryPictIndexValues(Display *d
if (!values)
{
- _XEatData (dpy, nbytes);
+ _XEatDataWords (dpy, rep.length);
UnlockDisplay (dpy);
SyncHandle ();
return NULL;
Index: xsrc/external/mit/libXvMC/dist/src/XvMC.c
diff -u xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.3 xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.4
--- xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.3 Tue Dec 10 23:08:36 2013
+++ xsrc/external/mit/libXvMC/dist/src/XvMC.c Sun Mar 16 22:39:09 2014
@@ -18,6 +18,17 @@
#include X11/extensions/extutil.h
#include limits.h
+#ifndef HAVE__XEATDATAWORDS
+static inline void _XEatDataWords(Display *dpy, unsigned long n)
+{
+# ifndef LONG64
+if (n = (ULONG_MAX 2))
+_XIOError(dpy);
+# endif
+_XEatData (dpy, n 2);
+}
+#endif
+
static XExtensionInfo _xvmc_info_data;
static XExtensionInfo *xvmc_info = _xvmc_info_data;
static const char *xvmc_extension_name = XvMCName;
@@ -135,7 +146,7 @@ XvMCSurfaceInfo * XvMCListSurfaceTypes(D
surface_info[i].flags = sinfo.flags;
}
} else
- _XEatData(dpy, rep.length 2);
+ _XEatDataWords(dpy, rep.length);
}
UnlockDisplay (dpy);
@@ -208,7 +219,7 @@ XvImageFormatValues * XvMCListSubpicture
ret[i].scanline_order = Info.scanline_order;
}
} else
- _XEatData(dpy, rep.length 2);
+ _XEatDataWords(dpy, rep.length);
}
UnlockDisplay (dpy);
@@ -274,12 +285,13 @@ Status _xvmc_create_context (
context-flags = rep.flags_return;
if(rep.length) {
- *priv_data = Xmalloc(rep.length 2);
+ if (rep.length (INT_MAX 2))
+ *priv_data = Xmalloc(rep.length 2);
if(*priv_data) {
_XRead(dpy, (char*)(*priv_data), rep.length 2);
*priv_count = rep.length;
} else
- _XEatData(dpy, rep.length 2);
+ _XEatDataWords(dpy, rep.length);
}
UnlockDisplay (dpy);
@@ -355,12 +367,13 @@ Status _xvmc_create_surface (
}
if(rep.length) {
-*priv_data = Xmalloc(rep.length 2);
+if (rep.length (INT_MAX 2))
+*priv_data = Xmalloc(rep.length 2);
if(*priv_data) {
_XRead(dpy, (char*)(*priv_data), rep.length 2);
*priv_count = rep.length;
} else
-_XEatData(dpy, rep.length 2);
+_XEatDataWords(dpy, rep.length);
}
UnlockDisplay (dpy);
@@ -445,12 +458,13 @@ Status _xvmc_create_subpicture (
subpicture-component_order[3] = rep.component_order[3];
if(rep.length) {
-*priv_data = Xmalloc(rep.length 2);
+if (rep.length (INT_MAX 2))
+*priv_data = Xmalloc(rep.length 2);
if(*priv_data) {
_XRead(dpy, (char*)(*priv_data), rep.length 2);
*priv_count = rep.length;
} else
-_XEatData(dpy, rep.length 2);
+_XEatDataWords(dpy, rep.length);
}
UnlockDisplay (dpy);
@@ -559,7 +573,9 @@ Status XvMCGetDRInfo(Display *dpy, XvPor
unsigned long realSize = 0;
char *tmpBuf = NULL;
- if (rep.length (INT_MAX 2)) {
+ if ((rep.length (INT_MAX 2))
+ /* protect against overflow in strncpy below */
+ (rep.nameLen + rep.busIDLen rep.nameLen)) {
realSize =
CVS commit: xsrc/external/mit/libXrender/include
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:42:17 UTC 2014 Modified Files: xsrc/external/mit/libXrender/include: config.h Log Message: merge libXrender 0.9.8. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXrender/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXrender/include/config.h diff -u xsrc/external/mit/libXrender/include/config.h:1.3 xsrc/external/mit/libXrender/include/config.h:1.4 --- xsrc/external/mit/libXrender/include/config.h:1.3 Sat Jul 17 07:57:33 2010 +++ xsrc/external/mit/libXrender/include/config.h Sun Mar 16 22:42:17 2014 @@ -31,6 +31,9 @@ /* Define to 1 if you have the unistd.h header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `_XEatDataWords' function. */ +#undef HAVE__XEATDATAWORDS + /* Name of package */ #define PACKAGE libXrender @@ -41,13 +44,13 @@ #define PACKAGE_NAME libXrender /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libXrender 0.9.6 +#define PACKAGE_STRING libXrender 0.9.8 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libXrender /* Define to the version of this package. */ -#define PACKAGE_VERSION 0.9.6 +#define PACKAGE_VERSION 0.9.8 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 0 @@ -56,10 +59,10 @@ #define PACKAGE_VERSION_MINOR 9 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 6 +#define PACKAGE_VERSION_PATCHLEVEL 8 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 0.9.6 +#define VERSION 0.9.8
CVS commit: src/lib/libm/src
Module Name:src
Committed By: dsl
Date: Sun Mar 16 22:44:48 UTC 2014
Modified Files:
src/lib/libm/src: s_exp2.c
Log Message:
Simplify somewhat: this is C not FORTRAN-IV - we have structures!
Directly us 'ieee_double_shape_type' when ripping apart the fp number
to avoid an extra store-load in 'STRICT_ASSIGN'.
Keep 'k' as the exponent, only do 'k 20' when generating the fp number
from it.
Fix infinity and underflow returns on i386 - because the value is returned
in %st0 (x87 stack) we have to generate a long double error value.
The returned value for integers -1023 and below (which should be denormal
fp valuesr) are 'just plain wrong' (tm).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_exp2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_exp2.c
diff -u src/lib/libm/src/s_exp2.c:1.3 src/lib/libm/src/s_exp2.c:1.4
--- src/lib/libm/src/s_exp2.c:1.3 Wed Nov 6 16:49:21 2013
+++ src/lib/libm/src/s_exp2.c Sun Mar 16 22:44:48 2014
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: s_exp2.c,v 1.3 2013/11/06 16:49:21 christos Exp $);
+__RCSID($NetBSD: s_exp2.c,v 1.4 2014/03/16 22:44:48 dsl Exp $);
#ifdef __FBSDID
__FBSDID($FreeBSD: src/lib/msun/src/s_exp2.c,v 1.7 2008/02/22 02:27:34 das Exp $);
#endif
@@ -39,7 +39,6 @@ __FBSDID($FreeBSD: src/lib/msun/src/s_e
#define TBLSIZE (1 TBLBITS)
static const double
-huge = 0x1p1000,
redux= 0x1.8p52 / TBLSIZE,
P1 = 0x1.62e42fefa39efp-1,
P2 = 0x1.ebfbdff82c575p-3,
@@ -47,266 +46,276 @@ static const double
P4 = 0x1.3b2ab88f70400p-7,
P5 = 0x1.5d88003875c74p-10;
-static volatile double twom1000 = 0x1p-1000;
+#ifdef __i386__
+/* The return value is in %st(0) - we need a 'long double' error. */
+static volatile long double huge = 0x1p+16000L;
+static volatile long double tiny = 0x1p-16000L;
+#else
+static volatile double huge = 0x1p+1000;
+static volatile double tiny = 0x1p-1000;
+#endif
-static const double tbl[TBLSIZE * 2] = {
+static const struct {
+double exp2; /* exp2(z + eps) */
+double eps; /* eps */
+} tbl[TBLSIZE] = {
/* exp2(z + eps) eps */
- 0x1.6a09e667f3d5dp-1, 0x1.9880p-44,
- 0x1.6b052fa751744p-1, 0x1.8000p-50,
- 0x1.6c012750bd9fep-1, -0x1.8780p-45,
- 0x1.6cfdcddd476bfp-1, 0x1.ec00p-46,
- 0x1.6dfb23c651a29p-1, -0x1.8000p-50,
- 0x1.6ef9298593ae3p-1, -0x1.c000p-52,
- 0x1.6ff7df9519386p-1, -0x1.fd80p-45,
- 0x1.70f7466f42da3p-1, -0x1.c880p-45,
- 0x1.71f75e8ec5fc3p-1, 0x1.3c00p-46,
- 0x1.72f8286eacf05p-1, -0x1.8300p-44,
- 0x1.73f9a48a58152p-1, -0x1.0c00p-47,
- 0x1.74fbd35d7ccfcp-1, 0x1.f880p-45,
- 0x1.75feb564267f1p-1, 0x1.3e00p-47,
- 0x1.77024b1ab6d48p-1, -0x1.7d00p-45,
- 0x1.780694fde5d38p-1, -0x1.d000p-50,
- 0x1.790b938ac1d00p-1, 0x1.3000p-49,
- 0x1.7a11473eb0178p-1, -0x1.d000p-49,
- 0x1.7b17b0976d060p-1, 0x1.0400p-45,
- 0x1.7c1ed0130c133p-1, 0x1.p-53,
- 0x1.7d26a62ff8636p-1, -0x1.6900p-45,
- 0x1.7e2f336cf4e3bp-1, -0x1.2e00p-47,
- 0x1.7f3878491c3e8p-1, -0x1.4580p-45,
- 0x1.80427543e1b4ep-1, 0x1.3000p-44,
- 0x1.814d2add1071ap-1, 0x1.f000p-47,
- 0x1.82589994ccd7ep-1, -0x1.1c00p-45,
- 0x1.8364c1eb942d0p-1, 0x1.9d00p-45,
- 0x1.8471a4623cab5p-1, 0x1.7100p-43,
- 0x1.857f4179f5bbcp-1, 0x1.2600p-45,
- 0x1.868d99b4491afp-1, -0x1.2c40p-44,
- 0x1.879cad931a395p-1, -0x1.3000p-45,
- 0x1.88ac7d98a65b8p-1, -0x1.a800p-45,
- 0x1.89bd0a4785800p-1, -0x1.d000p-49,
- 0x1.8ace5422aa223p-1, 0x1.3280p-44,
- 0x1.8be05bad619fap-1, 0x1.2b40p-43,
- 0x1.8cf3216b54383p-1, -0x1.ed00p-45,
- 0x1.8e06a5e08664cp-1, -0x1.0500p-45,
- 0x1.8f1ae99157807p-1, 0x1.8280p-45,
- 0x1.902fed0282c0ep-1, -0x1.cb00p-46,
- 0x1.9145b0b91ff96p-1, -0x1.5e00p-47,
- 0x1.925c353aa2ff9p-1, 0x1.5400p-48,
- 0x1.93737b0cdc64ap-1, 0x1.7200p-46,
- 0x1.948b82b5f98aep-1, -0x1.9000p-47,
- 0x1.95a44cbc852cbp-1, 0x1.5680p-45,
- 0x1.96bdd9a766f21p-1, -0x1.6d00p-44,
- 0x1.97d829fde4e2ap-1, -0x1.1000p-47,
- 0x1.98f33e47a23a3p-1, 0x1.d000p-45,
- 0x1.9a0f170ca0604p-1, -0x1.8a40p-44,
- 0x1.9b2bb4d53ff89p-1, 0x1.55c0p-44,
- 0x1.9c49182a3f15bp-1, 0x1.6b80p-45,
- 0x1.9d674194bb8c5p-1, -0x1.c000p-49,
- 0x1.9e86319e3238ep-1, 0x1.7d00p-46,
- 0x1.9fa5e8d07f302p-1, 0x1.6400p-46,
- 0x1.a0c667b5de54dp-1, -0x1.5000p-48,
- 0x1.a1e7aed8eb8f6p-1, 0x1.9e00p-47,
- 0x1.a309bec4a2e27p-1, 0x1.ad80p-45,
- 0x1.a42c980460a5dp-1, -0x1.af00p-46,
- 0x1.a5503b23e259bp-1, 0x1.b600p-47,
- 0x1.a674a8af46213p-1, 0x1.8880p-44,
- 0x1.a799e1330b3a7p-1, 0x1.1200p-46,
- 0x1.a8bfe53c12e8dp-1, 0x1.6c00p-47,
- 0x1.a9e6b5579fcd2p-1, -0x1.9b80p-45,
- 0x1.ab0e521356fb8p-1, 0x1.b700p-45,
- 0x1.ac36bbfd3f381p-1, 0x1.9000p-50,
- 0x1.ad5ff3a3c2780p-1, 0x1.4000p-49,
- 0x1.ae89f995ad2a3p-1, -0x1.c900p-45,
- 0x1.afb4ce622f367p-1, 0x1.6500p-46,
- 0x1.b0e07298db790p-1, 0x1.fd40p-45,
- 0x1.b20ce6c9a89a9p-1, 0x1.2700p-46,
- 0x1.b33a2b84f1a4bp-1, 0x1.d470p-43,
- 0x1.b468415b747e7p-1,
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 16 22:48:35 UTC 2014
Modified Files:
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c GetFPath.c
ListExt.c ModMap.c XlibInt.c
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
xsrc/external/mit/libX11/dist/src: udcInf.c
Log Message:
merge libX11 1.6.2.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/Font.c \
xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/GetFPath.c \
xsrc/external/mit/libX11/dist/src/ListExt.c \
xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/XlibInt.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libX11/dist/src/udcInf.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.5 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.6
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.5 Thu May 30 23:09:16 2013
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Sun Mar 16 22:48:34 2014
@@ -342,7 +342,7 @@ byteM_parse_codeset(
continue;
for (j = 0; j codeset-length; j++) {
- ch = *((unsigned char *)(inbufptr + j));
+ ch = *((const unsigned char *)(inbufptr + j));
byteM_rec = byteM[j];
byteinfo = byteM_rec.byteinfo;
@@ -764,11 +764,6 @@ mbstowcs_org(
return( 0 );
}
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -923,11 +918,6 @@ wcstombs_org(
int defstr_len = strlen(default_string);
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
wc = *inbufptr++;
@@ -1084,11 +1074,6 @@ wcstocts(
int from_size = *from_left;
char *ext_seg_len = NULL;
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
wc = *inbufptr++;
@@ -1239,7 +1224,7 @@ stdc_wcstocts(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -1278,11 +1263,6 @@ ctstowcs(
return( 0 );
}
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -1564,7 +1544,7 @@ stdc_ctstowcs(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -1600,7 +1580,7 @@ stdc_cstowcs(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -1636,7 +1616,7 @@ mbstocts(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -1674,11 +1654,6 @@ mbstostr(
return( 0 );
}
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -1966,12 +1941,6 @@ wcstostr(
const char *default_string = XLC_PUBLIC(lcd, default_string);
int defstr_len = strlen(default_string);
-
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
wc = *inbufptr++;
@@ -2094,7 +2063,7 @@ stdc_wcstostr(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -2126,11 +2095,6 @@ wctocs(
char *outbufptr = *to;
int from_size = *from_left;
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
if (*from_left *to_left) {
wc = *inbufptr++;
@@ -2374,7 +2338,7 @@ ctstombs(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -2410,7 +2374,7 @@ cstombs(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -2441,11 +2405,6 @@ strtombs(
char *outbufptr = *to;
int from_size = *from_left;
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -2553,11 +2512,6 @@ strtowcs(
wchar_t *outbufptr = (wchar_t *)*to;
int from_size = *from_left;
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -2629,7 +2583,7 @@
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: dsl
Date: Sun Mar 16 22:49:27 UTC 2014
Modified Files:
src/tests/lib/libm: t_libm.h
Log Message:
Print the result as a 'long double' - on i386 a return value that
should be infinity might just be too large for 'double' and won't
get converted until it has to be saved to memory.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libm/t_libm.h
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/libm/t_libm.h
diff -u src/tests/lib/libm/t_libm.h:1.4 src/tests/lib/libm/t_libm.h:1.5
--- src/tests/lib/libm/t_libm.h:1.4 Sun Mar 16 18:42:21 2014
+++ src/tests/lib/libm/t_libm.h Sun Mar 16 22:49:27 2014
@@ -1,15 +1,18 @@
-/* $NetBSD: t_libm.h,v 1.4 2014/03/16 18:42:21 dsl Exp $ */
+/* $NetBSD: t_libm.h,v 1.5 2014/03/16 22:49:27 dsl Exp $ */
/*
* Check result of fn(arg) is correct within the bounds.
* Should be ok to do the checks using 'double' for 'float' functions.
+ * On i386 float and double values are returned on the x87 stack and might
+ * be out of range for the function - so save and print as 'long double'.
+ * (otherwise you can get 'inf != inf' reported!)
*/
#define T_LIBM_CHECK(subtest, fn, arg, expect, epsilon) do { \
- double r = fn(arg); \
+ long double r = fn(arg); \
double e = fabs(r - expect); \
if (r != expect e epsilon) \
atf_tc_fail_nonfatal( \
- subtest %u: #fn (%g) is %g (%.13a) not %g (%.13a), error %g (%.6a) %g, \
+ subtest %u: #fn (%g) is %Lg (%.14La) not %g (%.13a), error %g (%.6a) %g, \
subtest, arg, r, r, expect, expect, e, e, epsilon); \
} while (0)
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: dsl
Date: Sun Mar 16 22:51:19 UTC 2014
Modified Files:
src/tests/lib/libm: t_exp.c
Log Message:
Add a lot more tests for exp2() and exp2f().
exp2f(7.7) and exp2f(8.8) seem too far from their expected values
(especially the latter).
exp2(-1023) and below are badly broken.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/t_exp.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/libm/t_exp.c
diff -u src/tests/lib/libm/t_exp.c:1.5 src/tests/lib/libm/t_exp.c:1.6
--- src/tests/lib/libm/t_exp.c:1.5 Mon Mar 3 10:39:08 2014
+++ src/tests/lib/libm/t_exp.c Sun Mar 16 22:51:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_exp.c,v 1.5 2014/03/03 10:39:08 martin Exp $ */
+/* $NetBSD: t_exp.c,v 1.6 2014/03/16 22:51:19 dsl Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
#include atf-c.h
#include math.h
+#include t_libm.h
/* y = exp(x) */
static const struct {
@@ -50,197 +51,119 @@ static const struct {
};
/*
- * exp2(3)
+ * exp2/exp2f(3)
*/
-ATF_TC(exp2_nan);
-ATF_TC_HEAD(exp2_nan, tc)
+ATF_LIBM_TEST(exp2_is_nan, Test exp2(x) == NaN)
{
- atf_tc_set_md_var(tc, descr, Test exp2(NaN) == NaN);
+ T_LIBM_CHECK_NAN(0, exp2, T_LIBM_NAN);
+ T_LIBM_CHECK_NAN(0, exp2f, T_LIBM_NAN);
}
-ATF_TC_BODY(exp2_nan, tc)
+ATF_LIBM_TEST(exp2_is_plus_zero, Test exp2(x) == +0.0)
{
- const double x = 0.0L / 0.0L;
-
- if (isnan(exp2(x)) == 0)
- atf_tc_fail_nonfatal(exp2(NaN) != NaN);
-}
-
-ATF_TC(exp2_inf_neg);
-ATF_TC_HEAD(exp2_inf_neg, tc)
-{
- atf_tc_set_md_var(tc, descr, Test exp2(-Inf) == +0.0);
-}
-
-ATF_TC_BODY(exp2_inf_neg, tc)
-{
- const double x = -1.0L / 0.0L;
- double y = exp2(x);
-
- if (fabs(y) 0.0 || signbit(y) != 0)
- atf_tc_fail_nonfatal(exp2(-Inf) != +0.0);
-}
-
-ATF_TC(exp2_inf_pos);
-ATF_TC_HEAD(exp2_inf_pos, tc)
-{
- atf_tc_set_md_var(tc, descr, Test exp2(+Inf) == +Inf);
-}
-
-ATF_TC_BODY(exp2_inf_pos, tc)
-{
- const double x = 1.0L / 0.0L;
- double y = exp2(x);
-
- if (isinf(y) == 0 || signbit(y) != 0)
- atf_tc_fail_nonfatal(exp2(+Inf) != +Inf);
-}
-
-ATF_TC(exp2_product);
-ATF_TC_HEAD(exp2_product, tc)
-{
- atf_tc_set_md_var(tc, descr, Test exp2(x + y) == exp2(x) * exp2(y));
-}
-
-ATF_TC_BODY(exp2_product, tc)
-{
- const double x[] = { 0.0, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8 };
- const double y[] = { 8.8, 7.7, 6.6, 5.5, 4.4, 3.3, 2.2, 1.1, 0.0 };
- const double eps = 1.0e-11;
- size_t i;
-
- for (i = 0; i __arraycount(x); i++) {
-
- if (fabs(exp2(x[i] + y[i]) - (exp2(x[i]) * exp2(y[i]))) eps)
- atf_tc_fail_nonfatal(exp2(%0.01f + %0.01f) != exp2(
- %0.01f) * exp2(%0.01f), x[i], y[i], x[i], y[i]);
+ T_LIBM_CHECK_PLUS_ZERO(0, exp2, T_LIBM_MINUS_INF);
+ T_LIBM_CHECK_PLUS_ZERO(0, exp2f, T_LIBM_MINUS_INF);
+}
+
+ATF_LIBM_TEST(exp2_powers, Test exp2(x) is correct for some integer x)
+{
+ static const struct {
+ double x;
+ double d_y;
+ double f_y;
+ } v[] = {
+ { +0.0, 1.0, 1.0 },
+ { -0.0, 1.0, 1.0 },
+ {1, 0x1p1, 0x1p1 },
+ {2, 0x1p2, 0x1p2 },
+ { 100, 0x1p100, 0x1p100 },
+ { 125, 0x1p125, 0x1p125 },
+ { 126, 0x1p126, 0x1p126 },
+ { 127, 0x1p127, 0x1p127 },
+ { 128, 0x1p128, T_LIBM_PLUS_INF },
+ { 129, 0x1p129, T_LIBM_PLUS_INF },
+ { 1000, 0x1p1000, T_LIBM_PLUS_INF },
+ { 1020, 0x1p1020, T_LIBM_PLUS_INF },
+ { 1023, 0x1p1023, T_LIBM_PLUS_INF },
+ { 1024, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
+ { 1030, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
+ { 1050, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
+ { 2000, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
+ { 16383, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
+ { 16384, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
+ { 16385, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
+ { -1, 0x1p-1, 0x1p-1 },
+ { -2, 0x1p-2, 0x1p-2 },
+ { -100, 0x1p-100, 0x1p-100 },
+ { -127, 0x1p-127, 0x1p-127 },
+ { -128, 0x1p-128, 0x1p-128 },
+ { -300, 0x1p-300, 0.0},
+ { -400, 0x1p-400, 0.0},
+ {-1000, 0x1p-1000, 0.0},
+ {-1022, 0x1p-1022, 0.0},
+ /* These should be denormal numbers */
+ {-1023, 0x1p-1023, 0.0},
+ {-1024, 0x1p-1024, 0.0},
+ {-1040, 0x1p-1040, 0.0},
+ {-1060, 0x1p-1060, 0.0},
+ /* This is the smallest result gcc will allow */
+ {-1074, 0x1p-1074, 0.0},
+ {-1075, 0x0, 0.0},
+ {-1080, 0x0, 0.0},
+ {-2000, 0x0, 0.0},
+ {-16382, 0x0, 0.0},
+ {-16383, 0x0, 0.0},
+ {-16384, 0x0, 0.0},
+ };
+ unsigned int i;
+
+ for (i = 0; i __arraycount(v); i++) {
+ T_LIBM_CHECK(i, exp2, v[i].x, v[i].d_y, 0.0);
+ T_LIBM_CHECK(i, exp2f, v[i].x, v[i].f_y, 0.0);
}
}
-ATF_TC(exp2_zero_neg);
-ATF_TC_HEAD(exp2_zero_neg, tc)
-{
- atf_tc_set_md_var(tc, descr, Test exp2(-0.0) == 1.0);
-}
-
-ATF_TC_BODY(exp2_zero_neg, tc)
-{
- const double x = -0.0L;
-
- if (fabs(exp2(x) - 1.0) 0.0)
- atf_tc_fail_nonfatal(exp2(-0.0) != 1.0);
-}
-
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Sun Mar 16 22:53:17 UTC 2014
Modified Files:
src/external/mit/xorg/lib/libXi: Makefile
src/external/mit/xorg/lib/libXvMC: Makefile
Log Message:
define HAVE__XEATDATAWORDS. (XXX move into ${X11FLAGS.THREADLIB}).
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libXi/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXvMC/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXi/Makefile
diff -u src/external/mit/xorg/lib/libXi/Makefile:1.11 src/external/mit/xorg/lib/libXi/Makefile:1.12
--- src/external/mit/xorg/lib/libXi/Makefile:1.11 Fri Oct 18 01:12:00 2013
+++ src/external/mit/xorg/lib/libXi/Makefile Sun Mar 16 22:53:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/10/18 01:12:00 riz Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/16 22:53:17 mrg Exp $
.include bsd.own.mk
@@ -65,6 +65,7 @@ SRCS+= XAllowDv.c \
XExtInt.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= -DHAVE__XEATDATAWORDS
LIBDPLIBS=\
Xext ${.CURDIR}/../libXext \
Index: src/external/mit/xorg/lib/libXvMC/Makefile
diff -u src/external/mit/xorg/lib/libXvMC/Makefile:1.3 src/external/mit/xorg/lib/libXvMC/Makefile:1.4
--- src/external/mit/xorg/lib/libXvMC/Makefile:1.3 Thu Nov 6 22:28:26 2008
+++ src/external/mit/xorg/lib/libXvMC/Makefile Sun Mar 16 22:53:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:26 veego Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/16 22:53:17 mrg Exp $
.include bsd.own.mk
@@ -12,6 +12,7 @@ INCS= XvMClib.h
INCSDIR=${X11INCDIR}/X11/extensions
CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= -DHAVE__XEATDATAWORDS
LIBDPLIBS= Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Mar 16 23:07:42 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add dri2proto and presentproto.
To generate a diff of this commit:
cvs rdiff -u -r1.787 -r1.788 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.787 src/share/mk/bsd.own.mk:1.788
--- src/share/mk/bsd.own.mk:1.787 Sun Mar 16 13:34:33 2014
+++ src/share/mk/bsd.own.mk Sun Mar 16 23:07:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.787 2014/03/16 13:34:33 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.788 2014/03/16 23:07:42 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1206,9 +1206,9 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib
.for _proto in \
xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
- xinerama dri2 render resource record video xf86dga xf86misc \
+ xinerama dri2 dri3 render resource record video xf86dga xf86misc \
xf86vidmode composite damage trap gl randr fontcache xf86dri \
- xcb-
+ present xcb-
X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
.endfor
CVS commit: xsrc/external/mit/libXrender/include
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 23:25:51 UTC 2014 Modified Files: xsrc/external/mit/libXrender/include: config.h Log Message: fix the libXrender build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXrender/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXrender/include/config.h diff -u xsrc/external/mit/libXrender/include/config.h:1.4 xsrc/external/mit/libXrender/include/config.h:1.5 --- xsrc/external/mit/libXrender/include/config.h:1.4 Sun Mar 16 22:42:17 2014 +++ xsrc/external/mit/libXrender/include/config.h Sun Mar 16 23:25:50 2014 @@ -32,7 +32,7 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the `_XEatDataWords' function. */ -#undef HAVE__XEATDATAWORDS +#define HAVE__XEATDATAWORDS 1 /* Name of package */ #define PACKAGE libXrender
CVS commit: src
Module Name:src Committed By: mrg Date: Sun Mar 16 23:25:15 UTC 2014 Modified Files: src/distrib/sets/lists/xbase: mi src/distrib/sets/lists/xcomp: mi src/etc/mtree: NetBSD.dist.Xorg src/external/mit/xorg/include: Makefile src/external/mit/xorg/include/xcb-proto: Makefile src/external/mit/xorg/share/nls: Makefile Added Files: src/external/mit/xorg/include/dri3proto: Makefile src/external/mit/xorg/include/presentproto: Makefile src/external/mit/xorg/share/nls/km_KH.UTF-8: Makefile src/external/mit/xorg/share/nls/ru_RU.UTF-8: Makefile src/external/mit/xorg/share/nls/sr_CS.UTF-8: Makefile Log Message: updates for libX11 1.6.2, dri3proto and presentproto, and fix the libXrender build. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.144 -r1.145 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.12 -r1.13 src/etc/mtree/NetBSD.dist.Xorg cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/include/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/dri3proto/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/presentproto/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/include/xcb-proto/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/share/nls/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/km_KH.UTF-8/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/ru_RU.UTF-8/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/sr_CS.UTF-8/Makefile 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/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.119 src/distrib/sets/lists/xbase/mi:1.120 --- src/distrib/sets/lists/xbase/mi:1.119 Sun Aug 11 22:29:03 2013 +++ src/distrib/sets/lists/xbase/mi Sun Mar 16 23:25:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.119 2013/08/11 22:29:03 joerg Exp $ +# $NetBSD: mi,v 1.120 2014/03/16 23:25:15 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1715,6 +1715,10 @@ ./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/Compose -unknown- xorg ./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS -unknown- xorg ./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE -unknown- xorg +./usr/X11R7/lib/X11/locale/km_KH.UTF-8 base-x11-root xorg +./usr/X11R7/lib/X11/locale/km_KH.UTF-8/Compose -unknown- xorg +./usr/X11R7/lib/X11/locale/km_KH.UTF-8/XI18N_OBJS -unknown- xorg +./usr/X11R7/lib/X11/locale/km_KH.UTF-8/XLC_LOCALE -unknown- xorg ./usr/X11R7/lib/X11/locale/kobase-x11-root xorg ./usr/X11R7/lib/X11/locale/ko/Compose -unknown- xorg ./usr/X11R7/lib/X11/locale/ko/XI18N_OBJS -unknown- xorg @@ -1763,6 +1767,14 @@ ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/Compose -unknown- xorg ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS -unknown- xorg ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE -unknown- xorg +./usr/X11R7/lib/X11/locale/ru_RU.UTF-8 base-x11-root xorg +./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/Compose -unknown- xorg +./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS -unknown- xorg +./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE -unknown- xorg +./usr/X11R7/lib/X11/locale/sr_CS.UTF-8 base-x11-root xorg +./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/Compose -unknown- xorg +./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS -unknown- xorg +./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE -unknown- xorg ./usr/X11R7/lib/X11/locale/tatar-cyr base-x11-root xorg ./usr/X11R7/lib/X11/locale/tatar-cyr/Compose -unknown- xorg ./usr/X11R7/lib/X11/locale/tatar-cyr/XI18N_OBJS -unknown- xorg Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.144 src/distrib/sets/lists/xcomp/mi:1.145 --- src/distrib/sets/lists/xcomp/mi:1.144 Sun Aug 11 22:29:03 2013 +++ src/distrib/sets/lists/xcomp/mi Sun Mar 16 23:25:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.144 2013/08/11 22:29:03 joerg Exp $ +# $NetBSD: mi,v 1.145 2014/03/16 23:25:15 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -5518,6 +5518,7 @@ ./usr/X11R7/include/X11/extensions/dpmsstr.h -unknown- obsolete ./usr/X11R7/include/X11/extensions/dri2proto.h -unknown- xorg ./usr/X11R7/include/X11/extensions/dri2tokens.h -unknown- xorg +./usr/X11R7/include/X11/extensions/dri3proto.h -unknown- xorg ./usr/X11R7/include/X11/extensions/evieproto.h -unknown- xorg ./usr/X11R7/include/X11/extensions/extutil.h -unknown- xorg ./usr/X11R7/include/X11/extensions/fontcache.h -unknown- xorg @@ -5543,6 +5544,9 @@ ./usr/X11R7/include/X11/extensions/multibufst.h -unknown- obsolete ./usr/X11R7/include/X11/extensions/panoramiXext.h -unknown- xorg ./usr/X11R7/include/X11/extensions/panoramiXproto.h -unknown- xorg +./usr/X11R7/include/X11/extensions/presentproto.h -unknown- xorg
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: mrg Date: Mon Mar 17 01:03:51 UTC 2014 Modified Files: src/sys/arch/evbmips/conf: MALTA Log Message: enable FFS_EI. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/evbmips/conf/MALTA 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/evbmips/conf/MALTA diff -u src/sys/arch/evbmips/conf/MALTA:1.76 src/sys/arch/evbmips/conf/MALTA:1.77 --- src/sys/arch/evbmips/conf/MALTA:1.76 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbmips/conf/MALTA Mon Mar 17 01:03:51 2014 @@ -1,10 +1,10 @@ -# $NetBSD: MALTA,v 1.76 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: MALTA,v 1.77 2014/03/17 01:03:51 mrg Exp $ include arch/evbmips/conf/std.malta #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MALTA-$Revision: 1.76 $ +#ident MALTA-$Revision: 1.77 $ maxusers 32 @@ -81,7 +81,7 @@ file-system TMPFS # Efficient memory fi #options NFSSERVER # Sun NFS-compatible filesystem server #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independent support +options FFS_EI # FFS Endian Independent support options WAPBL # File system journaling support options FFS_NO_SNAPSHOT # No FFS snapshot support #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
CVS import: xsrc/external/mit/xtrans/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 01:06:25 UTC 2014 Update of /cvsroot/xsrc/external/mit/xtrans/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15625 Log Message: initial import of xtrans-1.3.3 Status: Vendor Tag: xorg Release Tags: xtrans-1-3-3 U xsrc/external/mit/xtrans/dist/Xtranssock.c U xsrc/external/mit/xtrans/dist/COPYING U xsrc/external/mit/xtrans/dist/Xtrans.h U xsrc/external/mit/xtrans/dist/README U xsrc/external/mit/xtrans/dist/ChangeLog U xsrc/external/mit/xtrans/dist/configure.ac U xsrc/external/mit/xtrans/dist/missing U xsrc/external/mit/xtrans/dist/Xtrans.c U xsrc/external/mit/xtrans/dist/xtrans.m4 U xsrc/external/mit/xtrans/dist/AUTHORS U xsrc/external/mit/xtrans/dist/Xtransutil.c U xsrc/external/mit/xtrans/dist/Makefile.in U xsrc/external/mit/xtrans/dist/Makefile.am U xsrc/external/mit/xtrans/dist/configure U xsrc/external/mit/xtrans/dist/INSTALL U xsrc/external/mit/xtrans/dist/config.sub U xsrc/external/mit/xtrans/dist/docbook.am U xsrc/external/mit/xtrans/dist/xtrans.pc.in U xsrc/external/mit/xtrans/dist/aclocal.m4 U xsrc/external/mit/xtrans/dist/Xtransint.h U xsrc/external/mit/xtrans/dist/transport.c U xsrc/external/mit/xtrans/dist/install-sh U xsrc/external/mit/xtrans/dist/Xtranslcl.c U xsrc/external/mit/xtrans/dist/config.guess U xsrc/external/mit/xtrans/dist/doc/xtrans.xml U xsrc/external/mit/xtrans/dist/doc/Makefile.in U xsrc/external/mit/xtrans/dist/doc/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit/xtrans/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 01:07:34 UTC 2014 Removed Files: xsrc/external/mit/xtrans/dist: Xtranstli.c Log Message: merge xtrans 1.3.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xtrans/dist/Xtranstli.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: mrg
Date: Mon Mar 17 01:09:07 UTC 2014
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/include/xtrans: Makefile
Log Message:
merge xtrans 1.3.3 (deletes Xtranstli.c -- so sad, bye bye.)
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/include/xtrans/Makefile
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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.145 src/distrib/sets/lists/xcomp/mi:1.146
--- src/distrib/sets/lists/xcomp/mi:1.145 Sun Mar 16 23:25:15 2014
+++ src/distrib/sets/lists/xcomp/mi Mon Mar 17 01:09:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.145 2014/03/16 23:25:15 mrg Exp $
+# $NetBSD: mi,v 1.146 2014/03/17 01:09:07 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -5334,7 +5334,7 @@
./usr/X11R7/include/X11/Xtrans/Xtranslcl.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtransos2.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtranssock.c -unknown- xorg
-./usr/X11R7/include/X11/Xtrans/Xtranstli.c -unknown- xorg
+./usr/X11R7/include/X11/Xtrans/Xtranstli.c -obsolete- obsolete
./usr/X11R7/include/X11/Xtrans/Xtransutil.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/transport.c -unknown- xorg
./usr/X11R7/include/X11/Xutil.h-unknown- xorg
Index: src/external/mit/xorg/include/xtrans/Makefile
diff -u src/external/mit/xorg/include/xtrans/Makefile:1.2 src/external/mit/xorg/include/xtrans/Makefile:1.3
--- src/external/mit/xorg/include/xtrans/Makefile:1.2 Sat Sep 13 04:32:29 2008
+++ src/external/mit/xorg/include/xtrans/Makefile Mon Mar 17 01:09:07 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/17 01:09:07 mrg Exp $
.include bsd.own.mk
.PATH: ${X11SRCDIR.xtrans}
INCS= Xtrans.c Xtrans.h Xtransdnet.c Xtransint.h Xtranslcl.c \
- Xtransos2.c Xtranssock.c Xtranstli.c Xtransutil.c transport.c
+ Xtransos2.c Xtranssock.c Xtransutil.c transport.c
INCSDIR=${X11INCDIR}/X11/Xtrans
NOOBJ= # defined
CVS import: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 01:18:23 UTC 2014 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26896 Log Message: initial import of pixman-0.32.4 Status: Vendor Tag: xorg Release Tags: pixman-0-32-4 U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/Makefile.win32 N xsrc/external/mit/pixman/dist/test-driver U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/config.guess U xsrc/external/mit/pixman/dist/Makefile.win32.common U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/Makefile.in U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c U xsrc/external/mit/pixman/dist/test/pdf-op-test.c U xsrc/external/mit/pixman/dist/test/composite-traps-test.c N xsrc/external/mit/pixman/dist/test/scaling-bench.c U xsrc/external/mit/pixman/dist/test/rotate-test.c U xsrc/external/mit/pixman/dist/test/scaling-test.c U xsrc/external/mit/pixman/dist/test/utils.c U xsrc/external/mit/pixman/dist/test/region-contains-test.c U xsrc/external/mit/pixman/dist/test/alpha-loop.c U xsrc/external/mit/pixman/dist/test/region-test.c U xsrc/external/mit/pixman/dist/test/region-translate-test.c U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c N xsrc/external/mit/pixman/dist/test/thread-test.c U xsrc/external/mit/pixman/dist/test/glyph-test.c U xsrc/external/mit/pixman/dist/test/infinite-loop.c U xsrc/external/mit/pixman/dist/test/composite.c U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c U xsrc/external/mit/pixman/dist/test/oob-test.c U xsrc/external/mit/pixman/dist/test/utils-prng.h U xsrc/external/mit/pixman/dist/test/affine-test.c U xsrc/external/mit/pixman/dist/test/pixel-test.c U xsrc/external/mit/pixman/dist/test/combiner-test.c U xsrc/external/mit/pixman/dist/test/utils-prng.c U xsrc/external/mit/pixman/dist/test/a1-trap-test.c U xsrc/external/mit/pixman/dist/test/Makefile.in U xsrc/external/mit/pixman/dist/test/radial-perf-test.c U xsrc/external/mit/pixman/dist/test/Makefile.am U xsrc/external/mit/pixman/dist/test/Makefile.sources U xsrc/external/mit/pixman/dist/test/alphamap.c U xsrc/external/mit/pixman/dist/test/fetch-test.c U xsrc/external/mit/pixman/dist/test/check-formats.c U xsrc/external/mit/pixman/dist/test/prng-test.c U xsrc/external/mit/pixman/dist/test/stress-test.c U xsrc/external/mit/pixman/dist/test/utils.h U xsrc/external/mit/pixman/dist/test/matrix-test.c U xsrc/external/mit/pixman/dist/test/trap-crasher.c U xsrc/external/mit/pixman/dist/test/blitters-test.c U xsrc/external/mit/pixman/dist/demos/quad2quad.c U xsrc/external/mit/pixman/dist/demos/parrot.c U xsrc/external/mit/pixman/dist/demos/convolution-test.c U xsrc/external/mit/pixman/dist/demos/gtk-utils.h U xsrc/external/mit/pixman/dist/demos/scale.c U xsrc/external/mit/pixman/dist/demos/linear-gradient.c U xsrc/external/mit/pixman/dist/demos/conical-test.c U xsrc/external/mit/pixman/dist/demos/checkerboard.c U xsrc/external/mit/pixman/dist/demos/alpha-test.c U xsrc/external/mit/pixman/dist/demos/clip-in.c U xsrc/external/mit/pixman/dist/demos/radial-test.c U xsrc/external/mit/pixman/dist/demos/srgb-trap-test.c U xsrc/external/mit/pixman/dist/demos/parrot.jpg U xsrc/external/mit/pixman/dist/demos/gtk-utils.c U xsrc/external/mit/pixman/dist/demos/composite-test.c U xsrc/external/mit/pixman/dist/demos/screen-test.c U xsrc/external/mit/pixman/dist/demos/scale.ui U xsrc/external/mit/pixman/dist/demos/Makefile.in U xsrc/external/mit/pixman/dist/demos/clip-test.c U xsrc/external/mit/pixman/dist/demos/tri-test.c U xsrc/external/mit/pixman/dist/demos/gradient-test.c U xsrc/external/mit/pixman/dist/demos/Makefile.am U xsrc/external/mit/pixman/dist/demos/srgb-test.c U xsrc/external/mit/pixman/dist/demos/trap-test.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine-float.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-common.h U xsrc/external/mit/pixman/dist/pixman/Makefile.win32 U xsrc/external/mit/pixman/dist/pixman/pixman-region32.c U xsrc/external/mit/pixman/dist/pixman/pixman-matrix.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd-asm.S U xsrc/external/mit/pixman/dist/pixman/pixman-access-accessors.c U xsrc/external/mit/pixman/dist/pixman/solaris-hwcap.mapfile
CVS commit: xsrc/external/mit/pixman/dist/pixman
Module Name:xsrc
Committed By: mrg
Date: Mon Mar 17 01:24:18 UTC 2014
Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-bits-image.c
pixman-private.h pixman.h
Log Message:
merge pixman 0.32.4.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/pixman/dist/pixman/pixman-private.h \
xsrc/external/mit/pixman/dist/pixman/pixman.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.6 xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.7
--- xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.6 Wed Jun 5 09:03:18 2013
+++ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c Mon Mar 17 01:24:18 2014
@@ -137,221 +137,6 @@ bits_image_fetch_pixel_bilinear (bits_im
return bilinear_interpolation (tl, tr, bl, br, distx, disty);
}
-static uint32_t *
-bits_image_fetch_bilinear_no_repeat_ (pixman_iter_t *iter,
- const uint32_t *mask)
-{
-
-pixman_image_t * ima = iter-image;
-int offset = iter-x;
-int line = iter-y++;
-int width = iter-width;
-uint32_t * buffer = iter-buffer;
-
-bits_image_t *bits = ima-bits;
-pixman_fixed_t x_top, x_bottom, x;
-pixman_fixed_t ux_top, ux_bottom, ux;
-pixman_vector_t v;
-uint32_t top_mask, bottom_mask;
-uint32_t *top_row;
-uint32_t *bottom_row;
-uint32_t *end;
-uint32_t zero[2] = { 0, 0 };
-uint32_t one = 1;
-int y, y1, y2;
-int disty;
-int mask_inc;
-int w;
-
-/* reference point is the center of the pixel */
-v.vector[0] = pixman_int_to_fixed (offset) + pixman_fixed_1 / 2;
-v.vector[1] = pixman_int_to_fixed (line) + pixman_fixed_1 / 2;
-v.vector[2] = pixman_fixed_1;
-
-if (!pixman_transform_point_3d (bits-common.transform, v))
- return iter-buffer;
-
-ux = ux_top = ux_bottom = bits-common.transform-matrix[0][0];
-x = x_top = x_bottom = v.vector[0] - pixman_fixed_1/2;
-
-y = v.vector[1] - pixman_fixed_1/2;
-disty = pixman_fixed_to_bilinear_weight (y);
-
-/* Load the pointers to the first and second lines from the source
- * image that bilinear code must read.
- *
- * The main trick in this code is about the check if any line are
- * outside of the image;
- *
- * When I realize that a line (any one) is outside, I change
- * the pointer to a dummy area with zeros. Once I change this, I
- * must be sure the pointer will not change, so I set the
- * variables to each pointer increments inside the loop.
- */
-y1 = pixman_fixed_to_int (y);
-y2 = y1 + 1;
-
-if (y1 0 || y1 = bits-height)
-{
- top_row = zero;
- x_top = 0;
- ux_top = 0;
-}
-else
-{
- top_row = bits-bits + y1 * bits-rowstride;
- x_top = x;
- ux_top = ux;
-}
-
-if (y2 0 || y2 = bits-height)
-{
- bottom_row = zero;
- x_bottom = 0;
- ux_bottom = 0;
-}
-else
-{
- bottom_row = bits-bits + y2 * bits-rowstride;
- x_bottom = x;
- ux_bottom = ux;
-}
-
-/* Instead of checking whether the operation uses the mast in
- * each loop iteration, verify this only once and prepare the
- * variables to make the code smaller inside the loop.
- */
-if (!mask)
-{
-mask_inc = 0;
-mask = one;
-}
-else
-{
-/* If have a mask, prepare the variables to check it */
-mask_inc = 1;
-}
-
-/* If both are zero, then the whole thing is zero */
-if (top_row == zero bottom_row == zero)
-{
- memset (buffer, 0, width * sizeof (uint32_t));
- return iter-buffer;
-}
-else if (bits-format == PIXMAN_x8r8g8b8)
-{
- if (top_row == zero)
- {
- top_mask = 0;
- bottom_mask = 0xff00;
- }
- else if (bottom_row == zero)
- {
- top_mask = 0xff00;
- bottom_mask = 0;
- }
- else
- {
- top_mask = 0xff00;
- bottom_mask = 0xff00;
- }
-}
-else
-{
- top_mask = 0;
- bottom_mask = 0;
-}
-
-end = buffer + width;
-
-/* Zero fill to the left of the image */
-while (buffer end x pixman_fixed_minus_1)
-{
- *buffer++ = 0;
- x += ux;
- x_top += ux_top;
- x_bottom += ux_bottom;
- mask += mask_inc;
-}
-
-/* Left edge
- */
-while (buffer end x 0)
-{
- uint32_t tr, br;
- int32_t distx;
-
- tr = top_row[pixman_fixed_to_int (x_top) + 1] | top_mask;
- br = bottom_row[pixman_fixed_to_int (x_bottom) + 1] | bottom_mask;
-
- distx = pixman_fixed_to_bilinear_weight (x);
-
- *buffer++ = bilinear_interpolation (0, tr, 0, br, distx, disty);
-
- x += ux;
- x_top += ux_top;
- x_bottom += ux_bottom;
- mask += mask_inc;
-}
-
-/* Main part */
-w =
CVS commit: xsrc/external/mit/pixman/include
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 01:34:01 UTC 2014 Modified Files: xsrc/external/mit/pixman/include: config.h Log Message: updates for pixman 0.32.4. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/pixman/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/pixman/include/config.h diff -u xsrc/external/mit/pixman/include/config.h:1.16 xsrc/external/mit/pixman/include/config.h:1.17 --- xsrc/external/mit/pixman/include/config.h:1.16 Sat Feb 9 02:36:39 2013 +++ xsrc/external/mit/pixman/include/config.h Mon Mar 17 01:34:01 2014 @@ -7,9 +7,15 @@ /* Whether we have alarm() */ #define HAVE_ALARM 1 +/* Whether the compiler supports __builtin_clz */ +#define HAVE_BUILTIN_CLZ 1 + /* Define to 1 if you have the dlfcn.h header file. */ #define HAVE_DLFCN_H 1 +/* Whether the tool chain supports __float128 */ +#undef HAVE_FLOAT128 + /* Define to 1 if you have the `getisax' function. */ /* #undef HAVE_GETISAX */ @@ -25,6 +31,9 @@ /* Define to 1 if you have the `pixman-1' library (-lpixman-1). */ /* #undef HAVE_LIBPIXMAN_1 */ +/* Whether we have libpng */ +#undef HAVE_LIBPNG + /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1 @@ -37,8 +46,8 @@ /* Whether we have posix_memalign() */ #define HAVE_POSIX_MEMALIGN 1 -/* Whether pthread_setspecific() is supported */ -/* #undef HAVE_PTHREAD_SETSPECIFIC */ +/* Whether pthreads is supported */ +/* #undef HAVE_PTHREADS */ /* Whether we have sigaction() */ #define HAVE_SIGACTION 1 @@ -67,6 +76,10 @@ /* Define to 1 if you have the unistd.h header file. */ #define HAVE_UNISTD_H 1 +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #define PACKAGE pixman @@ -83,6 +96,9 @@ #define PACKAGE_TARNAME pixman /* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the home page for this package. */ #define PACKAGE_URL /* Define to the version of this package. */ @@ -99,11 +115,14 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* The compiler supported TLS storage class */ +#undef TLS + /* Whether the tool chain supports __attribute__((constructor)) */ #define TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR /**/ -/* Whether the tool chain supports __thread */ -#undef TOOLCHAIN_SUPPORTS__THREAD /**/ +/* use ARM IWMMXT compiler intrinsics */ +/* #undef USE_ARM_IWMMXT */ /* use ARM NEON assembly optimizations */ /* #undef USE_ARM_NEON */ @@ -114,24 +133,29 @@ /* use GNU-style inline assembler */ #define USE_GCC_INLINE_ASM 1 -#if defined(__i386__) || defined(__x86_64__) -/* use MMX compiler intrinsics */ -#define USE_MMX 1 -#endif +/* use Loongson Multimedia Instructions */ +/* #undef USE_LOONGSON_MMI */ + +/* use MIPS DSPr2 assembly optimizations */ +/* #undef USE_MIPS_DSPR2 */ /* use OpenMP in the test suite */ #define USE_OPENMP 1 -#if defined(__x86_64__) 0 /* GCC generates unaligned accesses; see PR 44159 */ /* use SSE2 compiler intrinsics */ -#define USE_SSE2 1 -#endif +/* #undef USE_SSE2 */ + +/* use SSSE3 compiler intrinsics */ +/* #undef USE_SSSE3 */ /* use VMX compiler intrinsics */ /* #undef USE_VMX */ +/* use x86 MMX compiler intrinsics */ +/* #undef USE_X86_MMX */ + /* Version number of package */ -#define VERSION 0.28.2 +#define VERSION 0.32.4 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -145,3 +169,6 @@ #ifndef __cplusplus /* #undef inline */ #endif + +/* Define to sqrt if you do not have the `sqrtf' function. */ +#undef sqrtf
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: mrg
Date: Mon Mar 17 01:41:46 UTC 2014
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
updates for pixman 0.32.4 and x86.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/pixman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.27 src/external/mit/xorg/lib/pixman/Makefile:1.28
--- src/external/mit/xorg/lib/pixman/Makefile:1.27 Thu Jan 30 19:24:06 2014
+++ src/external/mit/xorg/lib/pixman/Makefile Mon Mar 17 01:41:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/01/30 19:24:06 riz Exp $
+# $NetBSD: Makefile,v 1.28 2014/03/17 01:41:46 mrg Exp $
NOLINT= 1 # defined
@@ -45,20 +45,21 @@ SRCS+= \
# XXX
-.if ${MACHINE_ARCH} == i386
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+. if ${MACHINE_ARCH} == i386
SRCS+= pixman-mmx.c
COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden
-. if defined(HAVE_LLVM)
+. if defined(HAVE_LLVM)
COPTS.pixman-mmx.c+= -Wno-error=attributes
+. endif
+CPPFLAGS+= -DUSE_X86_MMX
+MKDEPFLAGS+= -mmmx
. endif
-MKDEPFLAGS+= -mmmx -msse2 -fvisibility=hidden
-SRCS+= pixman-sse2.c
+SRCS+= pixman-sse2.c pixman-ssse3.c
COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
-CPPFLAGS+= -DUSE_SSE2 -DUSE_X86_MMX
-.elif ${MACHINE_ARCH} == x86_64
-SRCS+= pixman-sse2.c
-COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
-CPPFLAGS+= -DUSE_SSE2
+COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden
+CPPFLAGS+= -DUSE_SSE2 -DUSE_SSE3
+MKDEPFLAGS+= -msse2 -mssse3 -mssse3 -fvisibility=hidden
.endif
.if ${MACHINE_ARCH} == powerpc
@@ -68,7 +69,6 @@ CPPFLAGS+= -DUSE_VMX
MKDEPFLAGS+= -maltivec
.endif
-
.if !empty(MACHINE_ARCH:Mearm*)
# ARM SIMD
SRCS+= pixman-arm-simd.c \
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Mon Mar 17 01:56:14 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Add options MVSOC_INTERREGS_PBASE for *old* Armada XP board.. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/ARMADAXP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/ARMADAXP diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.6 src/sys/arch/evbarm/conf/ARMADAXP:1.7 --- src/sys/arch/evbarm/conf/ARMADAXP:1.6 Fri Aug 9 21:19:43 2013 +++ src/sys/arch/evbarm/conf/ARMADAXP Mon Mar 17 01:56:14 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: ARMADAXP,v 1.6 2013/08/09 21:19:43 aymeric Exp $ +# $NetBSD: ARMADAXP,v 1.7 2014/03/17 01:56:14 kiyohara Exp $ # # ARMADA XP DEV BOARD # @@ -172,6 +172,7 @@ options MEMSIZE=0x8000 # Marvell SoC Bus mvsoc0 at mainbus? +options MVSOC_INTERREGS_PBASE=0xd000 # On-chip Timers mvsoctmr* at mvsoc? offset ? irq ?
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 02:05:34 UTC 2014 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17563 Log Message: initial import of libpciaccess-0.13.2 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-13-2 U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/AUTHORS N xsrc/external/mit/libpciaccess/dist/compile C xsrc/external/mit/libpciaccess/dist/src/common_device_name.c C xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c C xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/man/Makefile.in 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS commit: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Mar 17 02:42:09 UTC 2014
Modified Files:
xsrc/external/mit/libpciaccess/dist/src: common_bridge.c
common_device_name.c netbsd_pci.c
Removed Files:
xsrc/external/mit/libpciaccess/dist/m4: libtool.m4 ltoptions.m4
ltsugar.m4 ltversion.m4 lt~obsolete.m4
Log Message:
merge libpciaccess 0.13.2. there are now no local changes! thanks wiz.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 \
xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.6 xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.7
--- xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.6 Sat Jun 1 09:03:25 2013
+++ xsrc/external/mit/libpciaccess/dist/src/common_bridge.c Mon Mar 17 02:42:09 2014
@@ -29,7 +29,7 @@
* \author Ian Romanick i...@us.ibm.com
*/
-#if defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include config.h
#endif
@@ -324,6 +324,8 @@ pci_device_get_bridge_buses(struct pci_d
#define PCI_CLASS_BRIDGE 0x06
#define PCI_SUBCLASS_BRIDGE_PCI 0x04
+#define PCI_CLASS_MASK 0xFF
+#define PCI_SUBCLASS_MASK 0xFF
struct pci_device *
pci_device_get_parent_bridge(struct pci_device *dev)
@@ -331,7 +333,7 @@ pci_device_get_parent_bridge(struct pci_
struct pci_id_match bridge_match = {
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
(PCI_CLASS_BRIDGE 16) | (PCI_SUBCLASS_BRIDGE_PCI 8),
-0
+(PCI_CLASS_MASK 16) | (PCI_SUBCLASS_MASK 8)
};
struct pci_device *bridge;
Index: xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.4 xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.5
--- xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.4 Sat Jun 1 09:03:25 2013
+++ xsrc/external/mit/libpciaccess/dist/src/common_device_name.c Mon Mar 17 02:42:09 2014
@@ -28,7 +28,7 @@
* with a particular device or vendor.
*/
-#if defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include config.h
#endif
@@ -80,9 +80,9 @@ typedef FILE * pci_id_file;
static pci_id_file
pci_id_file_open(void)
{
+#ifndef __sun
pci_id_file result;
-#ifndef __sun
result = fopen(PCIIDS_PATH /pci.ids, re);
if (result)
return result;
Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.12 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.13
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.12 Wed Jun 12 09:58:54 2013
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c Mon Mar 17 02:42:09 2014
@@ -21,10 +21,25 @@
#include sys/mman.h
#include sys/types.h
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
#ifdef HAVE_MTRR
#include machine/sysarch.h
#include machine/mtrr.h
+#ifdef _X86_SYSARCH_L
+/* NetBSD 5.x and newer */
#define netbsd_set_mtrr(mr, num) _X86_SYSARCH_L(set_mtrr)(mr, num)
+#else
+/* NetBSD 4.x and older */
+#ifdef __i386__
+#define netbsd_set_mtrr(mr, num) i386_set_mtrr((mr), (num))
+#endif
+#ifdef __amd64__
+#define netbsd_set_mtrr(mr, num) x86_64_set_mtrr((mr), (num))
+#endif
+#endif
#endif
#include dev/pci/pcidevs.h
@@ -248,6 +263,7 @@ pci_device_netbsd_write(struct pci_devic
return 0;
}
+#if defined(WSDISPLAYIO_GET_BUSID)
static int
pci_device_netbsd_boot_vga(struct pci_device *dev)
{
@@ -284,35 +300,7 @@ pci_device_netbsd_boot_vga(struct pci_de
return 1;
}
-
-static int
-pci_device_netbsd_map_legacy(struct pci_device *dev, pciaddr_t base,
- pciaddr_t size, unsigned map_flags, void **addr)
-{
- struct pci_device_mapping map;
- int err;
-
- map.base = base;
- map.size = size;
- map.flags = map_flags;
- map.memory = NULL;
- err = pci_device_netbsd_map_range(dev, map);
- *addr = map.memory;
-
- return err;
-}
-
-static int
-pci_device_netbsd_unmap_legacy(struct pci_device *dev, void *addr, pciaddr_t size)
-{
- struct pci_device_mapping map;
-
- map.memory = addr;
- map.size = size;
- map.flags = 0;
- return pci_device_netbsd_unmap_range(dev, map);
-}
-
+#endif
static void
pci_system_netbsd_destroy(void)
@@ -537,6 +525,322 @@ pci_device_netbsd_read_rom(struct pci_de
return 0;
}
CVS commit: xsrc/external/mit/pixman/include
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 02:49:08 UTC 2014 Modified Files: xsrc/external/mit/pixman/include: config.h Log Message: turn on PTHREADS. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/pixman/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/pixman/include/config.h diff -u xsrc/external/mit/pixman/include/config.h:1.17 xsrc/external/mit/pixman/include/config.h:1.18 --- xsrc/external/mit/pixman/include/config.h:1.17 Mon Mar 17 01:34:01 2014 +++ xsrc/external/mit/pixman/include/config.h Mon Mar 17 02:49:08 2014 @@ -47,7 +47,7 @@ #define HAVE_POSIX_MEMALIGN 1 /* Whether pthreads is supported */ -/* #undef HAVE_PTHREADS */ +#define HAVE_PTHREADS 1 /* Whether we have sigaction() */ #define HAVE_SIGACTION 1
CVS import: xsrc/external/mit/libxcb/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 03:06:49 UTC 2014 Update of /cvsroot/xsrc/external/mit/libxcb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20833 Log Message: initial import of libxcb-1.10 Status: Vendor Tag: xorg Release Tags: libxcb-1-10 U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in U xsrc/external/mit/libxcb/dist/xcb.pc.in U xsrc/external/mit/libxcb/dist/Makefile.am N xsrc/external/mit/libxcb/dist/compile U xsrc/external/mit/libxcb/dist/missing U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in U xsrc/external/mit/libxcb/dist/xcb-render.pc.in U xsrc/external/mit/libxcb/dist/xcb-res.pc.in U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in U xsrc/external/mit/libxcb/dist/xcb-record.pc.in U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in U xsrc/external/mit/libxcb/dist/config.sub U xsrc/external/mit/libxcb/dist/NEWS U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in U xsrc/external/mit/libxcb/dist/configure U xsrc/external/mit/libxcb/dist/Makefile.in U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in U xsrc/external/mit/libxcb/dist/xcb-xkb.pc.in U xsrc/external/mit/libxcb/dist/install-sh N xsrc/external/mit/libxcb/dist/xcb-present.pc.in U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in U xsrc/external/mit/libxcb/dist/config.guess U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in U xsrc/external/mit/libxcb/dist/autogen.sh U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in U xsrc/external/mit/libxcb/dist/INSTALL U xsrc/external/mit/libxcb/dist/depcomp U xsrc/external/mit/libxcb/dist/COPYING U xsrc/external/mit/libxcb/dist/README U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in U xsrc/external/mit/libxcb/dist/ltmain.sh U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in N xsrc/external/mit/libxcb/dist/xcb-dri3.pc.in U xsrc/external/mit/libxcb/dist/configure.ac U xsrc/external/mit/libxcb/dist/aclocal.m4 U xsrc/external/mit/libxcb/dist/src/xcb_windefs.h U xsrc/external/mit/libxcb/dist/src/xcb_xid.c U xsrc/external/mit/libxcb/dist/src/xcb_out.c U xsrc/external/mit/libxcb/dist/src/Makefile.am U xsrc/external/mit/libxcb/dist/src/xcb_list.c U xsrc/external/mit/libxcb/dist/src/c_client.py U xsrc/external/mit/libxcb/dist/src/xcbint.h U xsrc/external/mit/libxcb/dist/src/Makefile.in C xsrc/external/mit/libxcb/dist/src/xcb_in.c U xsrc/external/mit/libxcb/dist/src/xcbext.h U xsrc/external/mit/libxcb/dist/src/xcb_ext.c U xsrc/external/mit/libxcb/dist/src/xcb.h U xsrc/external/mit/libxcb/dist/src/xcb_auth.c U xsrc/external/mit/libxcb/dist/src/xcb_conn.c U xsrc/external/mit/libxcb/dist/src/xcb_util.c U xsrc/external/mit/libxcb/dist/src/config.h.in U xsrc/external/mit/libxcb/dist/src/man/xcb-examples.3 U xsrc/external/mit/libxcb/dist/src/man/xcb-requests.3 U xsrc/external/mit/libxcb/dist/tools/constants U xsrc/external/mit/libxcb/dist/tools/api_conv.pl U xsrc/external/mit/libxcb/dist/tools/README N xsrc/external/mit/libxcb/dist/build-aux/config.sub N xsrc/external/mit/libxcb/dist/build-aux/compile N xsrc/external/mit/libxcb/dist/build-aux/missing N xsrc/external/mit/libxcb/dist/build-aux/install-sh N xsrc/external/mit/libxcb/dist/build-aux/config.guess N xsrc/external/mit/libxcb/dist/build-aux/depcomp N xsrc/external/mit/libxcb/dist/build-aux/ltmain.sh N xsrc/external/mit/libxcb/dist/build-aux/test-driver N xsrc/external/mit/libxcb/dist/m4/lt~obsolete.m4 N xsrc/external/mit/libxcb/dist/m4/ltoptions.m4 N xsrc/external/mit/libxcb/dist/m4/xcb.m4 N xsrc/external/mit/libxcb/dist/m4/ltversion.m4 N xsrc/external/mit/libxcb/dist/m4/libtool.m4 N xsrc/external/mit/libxcb/dist/m4/ltsugar.m4 U xsrc/external/mit/libxcb/dist/tests/check_public.c U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl U xsrc/external/mit/libxcb/dist/tests/Makefile.am U xsrc/external/mit/libxcb/dist/tests/check_suites.h U xsrc/external/mit/libxcb/dist/tests/check_all.c U xsrc/external/mit/libxcb/dist/tests/Makefile.in U xsrc/external/mit/libxcb/dist/doc/Makefile.am U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in U xsrc/external/mit/libxcb/dist/doc/Makefile.in U xsrc/external/mit/libxcb/dist/doc/xkb_issues U xsrc/external/mit/libxcb/dist/doc/xkb_internals U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxcb/dist
CVS commit: xsrc/external/mit/libxcb
Module Name:xsrc
Committed By: mrg
Date: Mon Mar 17 03:08:52 UTC 2014
Modified Files:
xsrc/external/mit/libxcb/dist/src: xcb_in.c
xsrc/external/mit/libxcb/include: config.h
Removed Files:
xsrc/external/mit/libxcb/dist: acinclude.m4 test-driver
Log Message:
merge libxcb 1.10.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxcb/dist/acinclude.m4 \
xsrc/external/mit/libxcb/dist/test-driver
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libxcb/dist/src/xcb_in.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libxcb/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libxcb/dist/src/xcb_in.c
diff -u xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.2 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.3
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.2 Thu Jun 6 06:46:33 2013
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c Mon Mar 17 03:08:52 2014
@@ -60,6 +60,23 @@ struct event_list {
struct event_list *next;
};
+struct xcb_special_event {
+
+struct xcb_special_event *next;
+
+/* Match XGE events for the specific extension and event ID (the
+ * first 32 bit word after evtype)
+ */
+uint8_t extension;
+uint32_teid;
+uint32_t*stamp;
+
+struct event_list *events;
+struct event_list **events_tail;
+
+pthread_cond_t special_event_cond;
+};
+
struct reply_list {
void *reply;
struct reply_list *next;
@@ -90,11 +107,66 @@ static void remove_finished_readers(read
}
}
+#if HAVE_SENDMSG
+static int read_fds(xcb_connection_t *c, int *fds, int nfd)
+{
+int *ifds = c-in.in_fd.fd[c-in.in_fd.ifd];
+int infd = c-in.in_fd.nfd - c-in.in_fd.ifd;
+
+if (nfd infd)
+return 0;
+memcpy(fds, ifds, nfd * sizeof (int));
+c-in.in_fd.ifd += nfd;
+return 1;
+}
+#endif
+
+typedef struct xcb_ge_special_event_t {
+uint8_t response_type; /** */
+uint8_t extension; /** */
+uint16_t sequence; /** */
+uint32_t length; /** */
+uint16_t evtype; /** */
+uint8_t pad0[2]; /** */
+uint32_t eid; /** */
+uint8_t pad1[16]; /** */
+} xcb_ge_special_event_t;
+
+static int event_special(xcb_connection_t *c,
+ struct event_list *event)
+{
+struct xcb_special_event *special_event;
+struct xcb_ge_special_event_t *ges = (void *) event-event;
+
+/* Special events are always XGE events */
+if ((ges-response_type 0x7f) != XCB_XGE_EVENT)
+return 0;
+
+for (special_event = c-in.special_events;
+ special_event;
+ special_event = special_event-next)
+{
+if (ges-extension == special_event-extension
+ges-eid == special_event-eid)
+{
+*special_event-events_tail = event;
+special_event-events_tail = event-next;
+if (special_event-stamp)
+++(*special_event-stamp);
+pthread_cond_signal(special_event-special_event_cond);
+return 1;
+}
+}
+
+return 0;
+}
+
static int read_packet(xcb_connection_t *c)
{
xcb_generic_reply_t genrep;
uint64_t length = 32;
uint64_t eventlength = 0; /* length after first 32 bytes for GenericEvents */
+int nfd = 0; /* Number of file descriptors attached to the reply */
uint64_t bufsize;
void *buf;
pending_reply *pend = 0;
@@ -164,13 +236,18 @@ static int read_packet(xcb_connection_t
genrep.length = p[2] * p[3] * 2;
}
length += genrep.length * 4;
+
+/* XXX a bit of a hack -- we know that all FD replys place
+ * the number of fds in the pad0 byte */
+if (pend pend-flags XCB_REQUEST_REPLY_FDS)
+nfd = genrep.pad0;
}
/* XGE events may have sizes 32 */
if ((genrep.response_type 0x7f) == XCB_XGE_EVENT)
eventlength = genrep.length * 4;
-bufsize = length + eventlength +
+bufsize = length + eventlength + nfd * sizeof(int) +
(genrep.response_type == XCB_REPLY ? 0 : sizeof(uint32_t));
if (bufsize INT32_MAX)
buf = malloc((size_t) bufsize);
@@ -198,6 +275,17 @@ static int read_packet(xcb_connection_t
}
}
+#if HAVE_SENDMSG
+if (nfd)
+{
+if (!read_fds(c, (int *) ((char *) buf)[length], nfd))
+{
+free(buf);
+return 0;
+}
+}
+#endif
+
if(pend (pend-flags XCB_REQUEST_DISCARD_REPLY))
{
free(buf);
@@ -237,9 +325,12 @@ static int read_packet(xcb_connection_t
}
event-event = buf;
event-next = 0;
-*c-in.events_tail = event;
-c-in.events_tail = event-next;
-pthread_cond_signal(c-in.event_cond);
+
+if (!event_special(c, event)) {
+*c-in.events_tail = event;
+c-in.events_tail = event-next;
+pthread_cond_signal(c-in.event_cond);
CVS import: xsrc/external/mit/libpthread-stubs/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 03:33:02 UTC 2014 Update of /cvsroot/xsrc/external/mit/libpthread-stubs/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20713 Log Message: initial import of libpthread-stubs-0.1 Status: Vendor Tag: xorg Release Tags: libpthread-stubs-0-1 N xsrc/external/mit/libpthread-stubs/dist/configure.ac N xsrc/external/mit/libpthread-stubs/dist/README N xsrc/external/mit/libpthread-stubs/dist/pthread-stubs.pc.in N xsrc/external/mit/libpthread-stubs/dist/aclocal.m4 N xsrc/external/mit/libpthread-stubs/dist/Makefile.am N xsrc/external/mit/libpthread-stubs/dist/Makefile.in N xsrc/external/mit/libpthread-stubs/dist/config.h.in N xsrc/external/mit/libpthread-stubs/dist/configure N xsrc/external/mit/libpthread-stubs/dist/COPYING N xsrc/external/mit/libpthread-stubs/dist/config.guess N xsrc/external/mit/libpthread-stubs/dist/config.sub N xsrc/external/mit/libpthread-stubs/dist/depcomp N xsrc/external/mit/libpthread-stubs/dist/install-sh N xsrc/external/mit/libpthread-stubs/dist/ltmain.sh N xsrc/external/mit/libpthread-stubs/dist/missing N xsrc/external/mit/libpthread-stubs/dist/stubs.c No conflicts created by this import
