CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: christos
Date: Tue Aug 26 07:54:27 UTC 2014
Modified Files:
src/libexec/ld.elf_so: headers.c rtld.h
Log Message:
Introduce a cast to fix the build for Elf32 on _LP64.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/libexec/ld.elf_so/headers.c
cvs rdiff -u -r1.120 -r1.121 src/libexec/ld.elf_so/rtld.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.55 src/libexec/ld.elf_so/headers.c:1.56
--- src/libexec/ld.elf_so/headers.c:1.55 Mon Aug 25 16:40:52 2014
+++ src/libexec/ld.elf_so/headers.c Tue Aug 26 03:54:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.55 2014/08/25 20:40:52 joerg Exp $ */
+/* $NetBSD: headers.c,v 1.56 2014/08/26 07:54:27 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: headers.c,v 1.55 2014/08/25 20:40:52 joerg Exp $);
+__RCSID($NetBSD: headers.c,v 1.56 2014/08/26 07:54:27 christos Exp $);
#endif /* not lint */
#include err.h
@@ -345,9 +345,9 @@ _rtld_digest_dynamic(const char *execnam
}
if (init != 0)
- obj-init = (Elf_Addr)obj-relocbase + init;
+ obj-init = (Elf_Addr) RTLD_ELF32_CAST obj-relocbase + init;
if (fini != 0)
- obj-fini = (Elf_Addr)obj-relocbase + fini;
+ obj-fini = (Elf_Addr) RTLD_ELF32_CAST obj-relocbase + fini;
if (dyn_rpath != NULL) {
_rtld_add_paths(execname, obj-rpaths, obj-strtab +
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.120 src/libexec/ld.elf_so/rtld.h:1.121
--- src/libexec/ld.elf_so/rtld.h:1.120 Mon Aug 25 16:40:52 2014
+++ src/libexec/ld.elf_so/rtld.h Tue Aug 26 03:54:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.120 2014/08/25 20:40:52 joerg Exp $ */
+/* $NetBSD: rtld.h,v 1.121 2014/08/26 07:54:27 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -475,6 +475,15 @@ Obj_Entry *_rtld_map_object(const char *
void _rtld_obj_free(Obj_Entry *);
Obj_Entry *_rtld_obj_new(void);
+/*
+ * The following uintptr_t cast is for Elf32 emulation on _LP64 systems
+ */
+#if defined(_LP64) ELFSIZE == 32
+#define RTLD_ELF32_CAST (uintptr_t)
+#else
+#define RTLD_ELF32_CAST
+#endif
+
/* function descriptors */
#ifdef __HAVE_FUNCTION_DESCRIPTORS
Elf_Addr _rtld_function_descriptor_alloc(const Obj_Entry *,
@@ -487,12 +496,12 @@ Elf_Addr _rtld_call_function_addr(const
static inline void
_rtld_call_function_void(const Obj_Entry *obj, Elf_Addr addr)
{
- ((void (*)(void))addr)();
+ ((void (*)(void)) RTLD_ELF32_CAST addr)();
}
static inline Elf_Addr
_rtld_call_function_addr(const Obj_Entry *obj, Elf_Addr addr)
{
- return ((Elf_Addr(*)(void))addr)();
+ return ((Elf_Addr(*)(void)) RTLD_ELF32_CAST addr)();
}
#endif /* __HAVE_FUNCTION_DESCRIPTORS */
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Aug 26 09:03:17 UTC 2014 Modified Files: src/sys/sys: cdefs_elf.h Log Message: alpha (and others) don't like .set name, expr. Use name = expr like elsewhere. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/sys/cdefs_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/sys/sys/cdefs_elf.h diff -u src/sys/sys/cdefs_elf.h:1.45 src/sys/sys/cdefs_elf.h:1.46 --- src/sys/sys/cdefs_elf.h:1.45 Mon Aug 25 16:40:52 2014 +++ src/sys/sys/cdefs_elf.h Tue Aug 26 05:03:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs_elf.h,v 1.45 2014/08/25 20:40:52 joerg Exp $ */ +/* $NetBSD: cdefs_elf.h,v 1.46 2014/08/26 09:03:17 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -110,12 +110,12 @@ #define __ifunc(name, resolver) \ __asm(.globl _C_LABEL_STRING(#name) \n \ .type _C_LABEL_STRING(#name) , %gnu_indirect_function\n \ - .set _C_LABEL_STRING(#name) , _C_LABEL_STRING(#resolver)) + _C_LABEL_STRING(#name) = _C_LABEL_STRING(#resolver)) #else #define __ifunc(name, resolver) \ __asm(.globl _C_LABEL_STRING(#name) \n \ .type _C_LABEL_STRING(#name) , @gnu_indirect_function\n \ - .set _C_LABEL_STRING(#name) , _C_LABEL_STRING(#resolver)) + _C_LABEL_STRING(#name) = _C_LABEL_STRING(#resolver)) #endif #if __STDC__
CVS commit: src/sys/kern
Module Name:src Committed By: manu Date: Tue Aug 26 09:38:54 UTC 2014 Modified Files: src/sys/kern: subr_tftproot.c Log Message: Fix build with TFTPROOT option enabled To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/kern/subr_tftproot.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/subr_tftproot.c diff -u src/sys/kern/subr_tftproot.c:1.12 src/sys/kern/subr_tftproot.c:1.13 --- src/sys/kern/subr_tftproot.c:1.12 Sat Dec 1 11:41:50 2012 +++ src/sys/kern/subr_tftproot.c Tue Aug 26 09:38:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_tftproot.c,v 1.12 2012/12/01 11:41:50 mbalmer Exp $ */ +/* $NetBSD: subr_tftproot.c,v 1.13 2014/08/26 09:38:54 manu Exp $ */ /*- * Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved. @@ -39,10 +39,11 @@ #include opt_md.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_tftproot.c,v 1.12 2012/12/01 11:41:50 mbalmer Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_tftproot.c,v 1.13 2014/08/26 09:38:54 manu Exp $); #include sys/param.h #include sys/types.h +#include sys/vnode.h #include sys/mount.h #include sys/lwp.h #include sys/kmem.h
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: christos Date: Tue Aug 26 10:46:39 UTC 2014 Modified Files: src/distrib/sets/lists/xdebug: md.hp300 Log Message: fix sets To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.hp300 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/xdebug/md.hp300 diff -u src/distrib/sets/lists/xdebug/md.hp300:1.3 src/distrib/sets/lists/xdebug/md.hp300:1.4 --- src/distrib/sets/lists/xdebug/md.hp300:1.3 Tue Dec 17 08:44:59 2013 +++ src/distrib/sets/lists/xdebug/md.hp300 Tue Aug 26 06:46:39 2014 @@ -1,10 +1,12 @@ -# $NetBSD: md.hp300,v 1.3 2013/12/17 13:44:59 njoly Exp $ +# $NetBSD: md.hp300,v 1.4 2014/08/26 10:46:39 christos Exp $ ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/libexa_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Tue Aug 26 10:58:13 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_pci.c
Log Message:
Implement pci_intr_setattr()
(well, kinda. it just ignores the MPSAFE param for now, but that's
easy to fix later)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci/rumpdev_pci.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/dev/lib/libpci/rumpdev_pci.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.3 src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.4
--- src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.3 Tue Apr 15 13:47:06 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_pci.c Tue Aug 26 10:58:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_pci.c,v 1.3 2014/04/15 13:47:06 pooka Exp $ */
+/* $NetBSD: rumpdev_pci.c,v 1.4 2014/08/26 10:58:13 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpdev_pci.c,v 1.3 2014/04/15 13:47:06 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpdev_pci.c,v 1.4 2014/08/26 10:58:13 pooka Exp $);
#include sys/cdefs.h
#include sys/param.h
@@ -147,6 +147,19 @@ pci_intr_establish(pci_chipset_tag_t pc,
return rumpcomp_pci_irq_establish(ih, func, arg);
}
+int
+pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ih,
+ int attr, uint64_t data)
+{
+
+ switch (attr) {
+ case PCI_INTR_MPSAFE:
+ return 0;
+ default:
+ return ENODEV;
+ }
+}
+
void
pci_intr_disestablish(pci_chipset_tag_t pc, void *not_your_above_ih)
{
CVS commit: src/tests/libexec/ld.elf_so/helper_ifunc_dso
Module Name:src
Committed By: christos
Date: Tue Aug 26 11:10:03 UTC 2014
Modified Files:
src/tests/libexec/ld.elf_so/helper_ifunc_dso: h_helper_ifunc.c
Log Message:
effectively disable the test to fix the build and explain why.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.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/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
diff -u src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.1 src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.2
--- src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.1 Mon Aug 25 16:40:53 2014
+++ src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c Tue Aug 26 07:10:02 2014
@@ -49,4 +49,15 @@ int (*resolve_ifunc(void))(void)
return e strcmp(e, 1) == 0 ? ifunc2 : ifunc1;
}
+#ifdef __HAVE_IFUNC
+// XXX: m68k, vax, mips, sh3 (and others) binutils don't support this.
+// Needs to be staged in for archs that support it.
__ifunc(ifunc, resolve_ifunc);
+#else
+int ifunc(void);
+int
+ifunc(void) {
+ const char *e = getenv(USE_IFUNC2);
+ return e strcmp(e, 1) == 0 ? ifunc2() : ifunc1();
+}
+#endif
CVS commit: src/sys/arch/arm/samsung
Module Name:src
Committed By: reinoud
Date: Tue Aug 26 11:45:49 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos_i2c.c
Log Message:
Make it compile without DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/samsung/exynos_i2c.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/samsung/exynos_i2c.c
diff -u src/sys/arch/arm/samsung/exynos_i2c.c:1.1 src/sys/arch/arm/samsung/exynos_i2c.c:1.2
--- src/sys/arch/arm/samsung/exynos_i2c.c:1.1 Wed May 21 12:19:59 2014
+++ src/sys/arch/arm/samsung/exynos_i2c.c Tue Aug 26 11:45:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_i2c.c,v 1.1 2014/05/21 12:19:59 reinoud Exp $ */
+/* $NetBSD: exynos_i2c.c,v 1.2 2014/08/26 11:45:49 reinoud Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include exynos_iic.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: exynos_i2c.c,v 1.1 2014/05/21 12:19:59 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: exynos_i2c.c,v 1.2 2014/08/26 11:45:49 reinoud Exp $);
#include sys/param.h
@@ -108,8 +108,10 @@ CFATTACH_DECL_NEW(exynos_iic, sizeof(str
static int
exynos_iic_match(device_t self, cfdata_t cf, void *aux)
{
+#ifdef DIAGNOSTIC
struct exyo_attach_args *exyoaa = aux;
struct exyo_locators *loc = exyoaa-exyo_loc;
+#endif
int i;
/* no locators expected */
CVS commit: src/lib/libm
Module Name:src
Committed By: christos
Date: Tue Aug 26 11:48:20 UTC 2014
Modified Files:
src/lib/libm: Makefile
Log Message:
Adding extra dependencies does not affect the inference rule search anymore.
XXX[1]: should that be the case?
Simplify the code anyway via selective path search.
XXX[2]: Split arch portions to arch specific files, this is a mess
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.164 src/lib/libm/Makefile:1.165
--- src/lib/libm/Makefile:1.164 Mon Aug 11 04:20:57 2014
+++ src/lib/libm/Makefile Tue Aug 26 07:48:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.164 2014/08/11 08:20:57 mrg Exp $
+# $NetBSD: Makefile,v 1.165 2014/08/26 11:48:20 christos Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -66,17 +66,14 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
.elif (${LIBC_MACHINE_CPU} == arm)
-.PATH: ${.CURDIR}/arch/arm
+.PATH.c: ${.CURDIR}/arch/arm
COMMON_SRCS+= fenv.c s_nexttowardf.c \
s_nearbyint.c s_rintl.c
COPTS.e_sqrtl.c += -DHAVE_FENV_H
COPTS.fenv.c+= -mfpu=vfp
.if (${MKSOFTFLOAT} == no)
+.PATH.S: ${.CURDIR}/arch/arm
ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
-.else
-.for i in e_sqrt.o e_sqrtf.o lrint.o lrintf.o s_fabsf.o s_fma.o s_fmaf.o
-${i} ${i:.o=.po} ${i:.o=.pico} ${i:.o=.go} ${i:.o=.ln}: ${i:.o=.c}
-.endfor
.endif
.elif (${LIBC_MACHINE_ARCH} == sparc)
.PATH: ${.CURDIR}/arch/sparc
CVS commit: src/sys/arch/arm/samsung
Module Name:src
Committed By: reinoud
Date: Tue Aug 26 11:49:40 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos_gpio.c
Log Message:
Make it compile without DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/samsung/exynos_gpio.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/samsung/exynos_gpio.c
diff -u src/sys/arch/arm/samsung/exynos_gpio.c:1.7 src/sys/arch/arm/samsung/exynos_gpio.c:1.8
--- src/sys/arch/arm/samsung/exynos_gpio.c:1.7 Thu Aug 14 15:42:31 2014
+++ src/sys/arch/arm/samsung/exynos_gpio.c Tue Aug 26 11:49:39 2014
@@ -32,7 +32,7 @@
#include gpio.h
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exynos_gpio.c,v 1.7 2014/08/14 15:42:31 reinoud Exp $);
+__KERNEL_RCSID(1, $NetBSD: exynos_gpio.c,v 1.8 2014/08/26 11:49:39 reinoud Exp $);
#include sys/param.h
#include sys/bus.h
@@ -326,8 +326,10 @@ CFATTACH_DECL_NEW(exynos_gpio, sizeof(st
static int
exynos_gpio_match(device_t parent, cfdata_t cf, void *aux)
{
+#ifdef DIAGNOSTIC
struct exyo_attach_args * const exyoaa = aux;
struct exyo_locators *loc = exyoaa-exyo_loc;
+#endif
/* no locators expected */
KASSERT(loc-loc_offset == 0);
CVS commit: src/sys/arch/arm/samsung
Module Name:src
Committed By: reinoud
Date: Tue Aug 26 11:55:54 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos_soc.c
Log Message:
Make it compile without DIAGNOSTIC by using __diagused
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/samsung/exynos_soc.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/samsung/exynos_soc.c
diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.14 src/sys/arch/arm/samsung/exynos_soc.c:1.15
--- src/sys/arch/arm/samsung/exynos_soc.c:1.14 Wed Jun 11 05:54:54 2014
+++ src/sys/arch/arm/samsung/exynos_soc.c Tue Aug 26 11:55:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_soc.c,v 1.14 2014/06/11 05:54:54 matt Exp $ */
+/* $NetBSD: exynos_soc.c,v 1.15 2014/08/26 11:55:54 reinoud Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exynos_soc.c,v 1.14 2014/06/11 05:54:54 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: exynos_soc.c,v 1.15 2014/08/26 11:55:54 reinoud Exp $);
#include sys/param.h
#include sys/bus.h
@@ -212,7 +212,7 @@ exynos_bootstrap(vaddr_t iobase, vaddr_t
{
int error;
size_t core_size, audiocore_size;
- size_t audiocore_pbase, audiocore_vbase;
+ size_t audiocore_pbase, audiocore_vbase __diagused;
#ifdef EXYNOS4
if (IS_EXYNOS4_P()) {
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Tue Aug 26 12:14:14 UTC 2014
Modified Files:
src/libexec/ld.elf_so: headers.c
Log Message:
Go back to skipping init/fini handling for ldd, makes problems for 32bit
compat on LP64.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/libexec/ld.elf_so/headers.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.56 src/libexec/ld.elf_so/headers.c:1.57
--- src/libexec/ld.elf_so/headers.c:1.56 Tue Aug 26 07:54:27 2014
+++ src/libexec/ld.elf_so/headers.c Tue Aug 26 12:14:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.56 2014/08/26 07:54:27 christos Exp $ */
+/* $NetBSD: headers.c,v 1.57 2014/08/26 12:14:14 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: headers.c,v 1.56 2014/08/26 07:54:27 christos Exp $);
+__RCSID($NetBSD: headers.c,v 1.57 2014/08/26 12:14:14 joerg Exp $);
#endif /* not lint */
#include err.h
@@ -344,10 +344,12 @@ _rtld_digest_dynamic(const char *execnam
obj-relalim = obj-pltrela;
}
+#ifdef RTLD_LOADER
if (init != 0)
- obj-init = (Elf_Addr) RTLD_ELF32_CAST obj-relocbase + init;
+ obj-init = (Elf_Addr) obj-relocbase + init;
if (fini != 0)
- obj-fini = (Elf_Addr) RTLD_ELF32_CAST obj-relocbase + fini;
+ obj-fini = (Elf_Addr) obj-relocbase + fini;
+#endif
if (dyn_rpath != NULL) {
_rtld_add_paths(execname, obj-rpaths, obj-strtab +
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Aug 26 14:44:00 UTC 2014
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Modify WMP_F_1000{X,T} to WMP_F_{FIBER,COPPER}. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.290 src/sys/dev/pci/if_wm.c:1.291
--- src/sys/dev/pci/if_wm.c:1.290 Sun Aug 24 21:15:35 2014
+++ src/sys/dev/pci/if_wm.c Tue Aug 26 14:44:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.290 2014/08/24 21:15:35 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.291 2014/08/26 14:44:00 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.290 2014/08/24 21:15:35 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.291 2014/08/26 14:44:00 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -719,69 +719,69 @@ static const struct wm_product {
const char *wmp_name;
wm_chip_type wmp_type;
int wmp_flags;
-#define WMP_F_1000X 0x01
-#define WMP_F_1000T 0x02
+#define WMP_F_FIBER 0x01
+#define WMP_F_COPPER 0x02
#define WMP_F_SERDES 0x04
} wm_products[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542,
Intel i82542 1000BASE-X Ethernet,
- WM_T_82542_2_1, WMP_F_1000X },
+ WM_T_82542_2_1, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_FIBER,
Intel i82543GC 1000BASE-X Ethernet,
- WM_T_82543, WMP_F_1000X },
+ WM_T_82543, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_COPPER,
Intel i82543GC 1000BASE-T Ethernet,
- WM_T_82543, WMP_F_1000T },
+ WM_T_82543, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_COPPER,
Intel i82544EI 1000BASE-T Ethernet,
- WM_T_82544, WMP_F_1000T },
+ WM_T_82544, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_FIBER,
Intel i82544EI 1000BASE-X Ethernet,
- WM_T_82544, WMP_F_1000X },
+ WM_T_82544, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_COPPER,
Intel i82544GC 1000BASE-T Ethernet,
- WM_T_82544, WMP_F_1000T },
+ WM_T_82544, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM,
Intel i82544GC (LOM) 1000BASE-T Ethernet,
- WM_T_82544, WMP_F_1000T },
+ WM_T_82544, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM,
Intel i82540EM 1000BASE-T Ethernet,
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM_LOM,
Intel i82540EM (LOM) 1000BASE-T Ethernet,
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM,
Intel i82540EP 1000BASE-T Ethernet,
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP,
Intel i82540EP 1000BASE-T Ethernet,
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP,
Intel i82540EP 1000BASE-T Ethernet,
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_COPPER,
Intel i82545EM 1000BASE-T Ethernet,
- WM_T_82545, WMP_F_1000T },
+ WM_T_82545, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_COPPER,
Intel i82545GM 1000BASE-T Ethernet,
- WM_T_82545_3, WMP_F_1000T },
+ WM_T_82545_3, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_FIBER,
Intel i82545GM 1000BASE-X Ethernet,
- WM_T_82545_3, WMP_F_1000X },
+ WM_T_82545_3, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_SERDES,
Intel i82545GM Gigabit Ethernet (SERDES),
@@ -789,27 +789,27 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER,
Intel i82546EB 1000BASE-T Ethernet,
- WM_T_82546, WMP_F_1000T },
+ WM_T_82546, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD,
Intel i82546EB 1000BASE-T Ethernet,
- WM_T_82546, WMP_F_1000T },
+ WM_T_82546, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_FIBER,
Intel i82545EM 1000BASE-X Ethernet,
- WM_T_82545, WMP_F_1000X },
+ WM_T_82545, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER,
Intel i82546EB 1000BASE-X Ethernet,
- WM_T_82546, WMP_F_1000X },
+ WM_T_82546, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_COPPER,
Intel i82546GB 1000BASE-T Ethernet,
- WM_T_82546_3, WMP_F_1000T },
+ WM_T_82546_3, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_FIBER,
Intel i82546GB 1000BASE-X Ethernet,
- WM_T_82546_3, WMP_F_1000X },
+ WM_T_82546_3, WMP_F_FIBER },
{ PCI_VENDOR_INTEL,
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: christos
Date: Tue Aug 26 15:06:50 UTC 2014
Modified Files:
src/libexec/ld.elf_so: headers.c
Log Message:
fix set but not used.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/libexec/ld.elf_so/headers.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.57 src/libexec/ld.elf_so/headers.c:1.58
--- src/libexec/ld.elf_so/headers.c:1.57 Tue Aug 26 08:14:14 2014
+++ src/libexec/ld.elf_so/headers.c Tue Aug 26 11:06:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.57 2014/08/26 12:14:14 joerg Exp $ */
+/* $NetBSD: headers.c,v 1.58 2014/08/26 15:06:50 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: headers.c,v 1.57 2014/08/26 12:14:14 joerg Exp $);
+__RCSID($NetBSD: headers.c,v 1.58 2014/08/26 15:06:50 christos Exp $);
#endif /* not lint */
#include err.h
@@ -74,7 +74,9 @@ _rtld_digest_dynamic(const char *execnam
bool use_pltrela = false;
Elf_Addrrelsz = 0, relasz = 0;
Elf_Addr pltrel = 0, pltrelsz = 0;
+#ifdef RTLD_LOADER
Elf_Addr init = 0, fini = 0;
+#endif
dbg((headers: digesting PT_DYNAMIC at %p, obj-dynamic));
for (dynp = obj-dynamic; dynp-d_tag != DT_NULL; ++dynp) {
@@ -227,7 +229,9 @@ _rtld_digest_dynamic(const char *execnam
break;
case DT_INIT:
+#ifdef RTLD_LOADER
init = dynp-d_un.d_ptr;
+#endif
break;
#ifdef HAVE_INITFINI_ARRAY
@@ -245,7 +249,9 @@ _rtld_digest_dynamic(const char *execnam
#endif
case DT_FINI:
+#ifdef RTLD_LOADER
fini = dynp-d_un.d_ptr;
+#endif
break;
#ifdef HAVE_INITFINI_ARRAY
CVS commit: src/external/bsd/nvi/dist/ex
Module Name:src
Committed By: aymeric
Date: Tue Aug 26 15:19:38 UTC 2014
Modified Files:
src/external/bsd/nvi/dist/ex: ex_cscope.c
Log Message:
missed setting TAG_IS_LINKED in a special case in my previous commit.
Bug reported by Brad Harder, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nvi/dist/ex/ex_cscope.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/ex/ex_cscope.c
diff -u src/external/bsd/nvi/dist/ex/ex_cscope.c:1.6 src/external/bsd/nvi/dist/ex/ex_cscope.c:1.7
--- src/external/bsd/nvi/dist/ex/ex_cscope.c:1.6 Fri Aug 22 21:28:20 2014
+++ src/external/bsd/nvi/dist/ex/ex_cscope.c Tue Aug 26 15:19:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_cscope.c,v 1.6 2014/08/22 21:28:20 aymeric Exp $ */
+/* $NetBSD: ex_cscope.c,v 1.7 2014/08/26 15:19:38 aymeric Exp $ */
/*-
* Copyright (c) 1994, 1996
* Rob Mayoff. All rights reserved.
@@ -16,7 +16,7 @@
static const char sccsid[] = Id: ex_cscope.c,v 10.21 2003/11/05 17:11:54 skimo Exp (Berkeley) Date: 2003/11/05 17:11:54 ;
#endif /* not lint */
#else
-__RCSID($NetBSD: ex_cscope.c,v 1.6 2014/08/22 21:28:20 aymeric Exp $);
+__RCSID($NetBSD: ex_cscope.c,v 1.7 2014/08/26 15:19:38 aymeric Exp $);
#endif
#include sys/param.h
@@ -542,6 +542,7 @@ cscope_find(SCR *sp, EXCMD *cmdp, const
*/
if (TAILQ_EMPTY(exp-tq)) {
TAILQ_INSERT_HEAD(exp-tq, rtqp, q);
+ F_SET(rtqp, TAG_IS_LINKED);
} else {
free(rtqp);
rtqp = TAILQ_FIRST(exp-tq);
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src Committed By: matt Date: Tue Aug 26 15:53:04 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd64.h Log Message: Make sure we default to ELFv1. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.9 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.10 --- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.9 Sat Aug 23 06:50:18 2014 +++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h Tue Aug 26 15:53:04 2014 @@ -85,7 +85,7 @@ extern int dot_symbols; #define INVALID_64BIT -m%s not supported in this configuration #define INVALID_32BIT INVALID_64BIT -#define ELFv2_ABI_CHECK (rs6000_elf_abi != 1) +#define ELFv2_ABI_CHECK (rs6000_elf_abi == 2) #undef SUBSUBTARGET_OVERRIDE_OPTIONS #define SUBSUBTARGET_OVERRIDE_OPTIONS\
CVS commit: src/usr.sbin/pcictl
Module Name:src Committed By: wiz Date: Tue Aug 26 16:21:15 UTC 2014 Modified Files: src/usr.sbin/pcictl: pcictl.8 Log Message: Use more appropriate macro for command line command argument. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/pcictl/pcictl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/pcictl/pcictl.8 diff -u src/usr.sbin/pcictl/pcictl.8:1.10 src/usr.sbin/pcictl/pcictl.8:1.11 --- src/usr.sbin/pcictl/pcictl.8:1.10 Fri Feb 25 21:40:48 2011 +++ src/usr.sbin/pcictl/pcictl.8 Tue Aug 26 16:21:15 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: pcictl.8,v 1.10 2011/02/25 21:40:48 jmcneill Exp $ +.\ $NetBSD: pcictl.8,v 1.11 2014/08/26 16:21:15 wiz Exp $ .\ .\ Copyright 2001 Wasabi Systems, Inc. .\ All rights reserved. @@ -54,7 +54,7 @@ on a PCI bus. .Pp The following commands are available: .Pp -.Nm list +.Cm list .Op Fl n .Op Fl b Ar bus .Op Fl d Ar device @@ -69,7 +69,7 @@ Any locator not specified defaults to a wildcard, or may be explicitly wildcarded by specifying .Dq any . .Pp -.Nm dump +.Cm dump .Op Fl b Ar bus .Fl d Ar device .Op Fl f Ar function
CVS commit: src/tests/libexec/ld.elf_so/helper_ifunc_dso
Module Name:src
Committed By: joerg
Date: Tue Aug 26 16:25:35 UTC 2014
Modified Files:
src/tests/libexec/ld.elf_so/helper_ifunc_dso: h_helper_ifunc.c
Log Message:
Revert. There is no such thing as __HAVE_IFUNC and there should not be
one in first place.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.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/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
diff -u src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.2 src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.3
--- src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.2 Tue Aug 26 11:10:02 2014
+++ src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c Tue Aug 26 16:25:35 2014
@@ -49,15 +49,9 @@ int (*resolve_ifunc(void))(void)
return e strcmp(e, 1) == 0 ? ifunc2 : ifunc1;
}
-#ifdef __HAVE_IFUNC
-// XXX: m68k, vax, mips, sh3 (and others) binutils don't support this.
-// Needs to be staged in for archs that support it.
-__ifunc(ifunc, resolve_ifunc);
-#else
int ifunc(void);
int
ifunc(void) {
const char *e = getenv(USE_IFUNC2);
return e strcmp(e, 1) == 0 ? ifunc2() : ifunc1();
}
-#endif
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src Committed By: matt Date: Tue Aug 26 16:39:49 UTC 2014 Modified Files: src/external/gpl3/binutils/dist/bfd: elfxx-mips.c Log Message: Allow STT_GNU_IFUNC to be a dynamic symbol. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/bfd/elfxx-mips.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/bfd/elfxx-mips.c diff -u src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.7 src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.8 --- src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.7 Sun Sep 29 14:03:29 2013 +++ src/external/gpl3/binutils/dist/bfd/elfxx-mips.c Tue Aug 26 16:39:49 2014 @@ -8626,6 +8626,7 @@ _bfd_mips_elf_adjust_dynamic_symbol (str /* Make sure we know what is going on here. */ BFD_ASSERT (dynobj != NULL (h-needs_plt + || h-type == STT_GNU_IFUNC || h-u.weakdef != NULL || (h-def_dynamic h-ref_regular
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src
Committed By: matt
Date: Tue Aug 26 17:03:51 UTC 2014
Modified Files:
src/external/gpl3/binutils/dist/bfd: elf32-m68k.c elf32-sh.c
elf32-vax.c
Log Message:
Allow STT_GNU_IFUNC to be dynamic symbols
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/bfd/elf32-m68k.c \
src/external/gpl3/binutils/dist/bfd/elf32-sh.c
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/bfd/elf32-vax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/elf32-m68k.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.4 src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.5
--- src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.4 Sun Sep 29 14:03:29 2013
+++ src/external/gpl3/binutils/dist/bfd/elf32-m68k.c Tue Aug 26 17:03:51 2014
@@ -3104,6 +3104,7 @@ elf_m68k_adjust_dynamic_symbol (struct b
/* Make sure we know what is going on here. */
BFD_ASSERT (dynobj != NULL
(h-needs_plt
+ || h-type == STT_GNU_IFUNC
|| h-u.weakdef != NULL
|| (h-def_dynamic
h-ref_regular
@@ -3112,7 +3113,7 @@ elf_m68k_adjust_dynamic_symbol (struct b
/* If this is a function, put it in the procedure linkage table. We
will fill in the contents of the procedure linkage table later,
when we know the address of the .got section. */
- if (h-type == STT_FUNC
+ if ((h-type == STT_FUNC || h-type == STT_GNU_IFUNC)
|| h-needs_plt)
{
if ((h-plt.refcount = 0
Index: src/external/gpl3/binutils/dist/bfd/elf32-sh.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.4 src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.5
--- src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.4 Sun Sep 29 14:03:29 2013
+++ src/external/gpl3/binutils/dist/bfd/elf32-sh.c Tue Aug 26 17:03:51 2014
@@ -2808,6 +2808,7 @@ sh_elf_adjust_dynamic_symbol (struct bfd
/* Make sure we know what is going on here. */
BFD_ASSERT (htab-root.dynobj != NULL
(h-needs_plt
+ || h-type == STT_GNU_IFUNC
|| h-u.weakdef != NULL
|| (h-def_dynamic
h-ref_regular
@@ -2816,7 +2817,7 @@ sh_elf_adjust_dynamic_symbol (struct bfd
/* If this is a function, put it in the procedure linkage table. We
will fill in the contents of the procedure linkage table later,
when we know the address of the .got section. */
- if (h-type == STT_FUNC
+ if ((h-type == STT_FUNC || h-type == STT_GNU_IFUNC)
|| h-needs_plt)
{
if (h-plt.refcount = 0
Index: src/external/gpl3/binutils/dist/bfd/elf32-vax.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.9 src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.10
--- src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.9 Thu Oct 3 12:06:04 2013
+++ src/external/gpl3/binutils/dist/bfd/elf32-vax.c Tue Aug 26 17:03:51 2014
@@ -946,6 +946,7 @@ elf_vax_adjust_dynamic_symbol (info, h)
/* Make sure we know what is going on here. */
BFD_ASSERT (dynobj != NULL
(h-needs_plt
+ || h-type == STT_GNU_IFUNC
|| h-u.weakdef != NULL
|| (h-def_dynamic
h-ref_regular
@@ -954,7 +955,7 @@ elf_vax_adjust_dynamic_symbol (info, h)
/* If this is a function, put it in the procedure linkage table. We
will fill in the contents of the procedure linkage table later,
when we know the address of the .got section. */
- if (h-type == STT_FUNC
+ if ((h-type == STT_FUNC || h-type == STT_GNU_IFUNC)
|| h-needs_plt)
{
if (h-plt.refcount = 0
CVS commit: src/tests/libexec/ld.elf_so/helper_ifunc_dso
Module Name:src
Committed By: joerg
Date: Tue Aug 26 17:13:42 UTC 2014
Modified Files:
src/tests/libexec/ld.elf_so/helper_ifunc_dso: h_helper_ifunc.c
Log Message:
Really revert to the original version.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.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/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
diff -u src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.3 src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.4
--- src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.3 Tue Aug 26 16:25:35 2014
+++ src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c Tue Aug 26 17:13:42 2014
@@ -49,9 +49,4 @@ int (*resolve_ifunc(void))(void)
return e strcmp(e, 1) == 0 ? ifunc2 : ifunc1;
}
-int ifunc(void);
-int
-ifunc(void) {
- const char *e = getenv(USE_IFUNC2);
- return e strcmp(e, 1) == 0 ? ifunc2() : ifunc1();
-}
+__ifunc(ifunc, resolve_ifunc);
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Tue Aug 26 17:26:06 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux: timer.h
Log Message:
Add Linux timer_pending and del_timer.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/timer.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/timer.h
diff -u src/sys/external/bsd/drm2/include/linux/timer.h:1.4 src/sys/external/bsd/drm2/include/linux/timer.h:1.5
--- src/sys/external/bsd/drm2/include/linux/timer.h:1.4 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/include/linux/timer.h Tue Aug 26 17:26:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.h,v 1.4 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: timer.h,v 1.5 2014/08/26 17:26:05 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -83,12 +83,26 @@ mod_timer_pinned(struct timer_list *time
}
static inline void
+del_timer(struct timer_list *timer)
+{
+
+ callout_stop(timer-tl_callout);
+}
+
+static inline void
del_timer_sync(struct timer_list *timer)
{
callout_halt(timer-tl_callout, NULL);
}
+static inline bool
+timer_pending(struct timer_list *timer)
+{
+
+ return callout_pending(timer-tl_callout);
+}
+
/*
* XXX This is bogus -- the Linux version does various machinations to
* give some jitter so that stuff doesn't wake up all at once.
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Tue Aug 26 17:28:15 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/via: via_dma.c via_dmablit.c
via_dmablit.h via_drv.h via_irq.c via_video.c
Added Files:
src/sys/external/bsd/drm2/via: files.via
Log Message:
Partial viadrm2 snapshot.
To do:
- autoconf attachment (shouldn't be hard)
- viafb (maybe steal unichromefb and adapt attachment structure)
- actually run it (no hardware here)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/external/bsd/drm2/dist/drm/via/via_dma.c \
src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c \
src/sys/external/bsd/drm2/dist/drm/via/via_drv.h \
src/sys/external/bsd/drm2/dist/drm/via/via_irq.c \
src/sys/external/bsd/drm2/dist/drm/via/via_video.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/via/files.via
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/via/via_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/via/via_dma.c:1.1.1.2 src/sys/external/bsd/drm2/dist/drm/via/via_dma.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/via/via_dma.c:1.1.1.2 Wed Jul 16 19:35:29 2014
+++ src/sys/external/bsd/drm2/dist/drm/via/via_dma.c Tue Aug 26 17:28:14 2014
@@ -39,6 +39,8 @@
#include via_drv.h
#include via_3d_reg.h
+#include linux/delay.h
+
#define CMDBUF_ALIGNMENT_SIZE (0x100)
#define CMDBUF_ALIGNMENT_MASK (0x0ff)
@@ -234,13 +236,21 @@ static int via_dma_init(struct drm_devic
switch (init-func) {
case VIA_INIT_DMA:
+#ifdef __NetBSD__
+ if (!DRM_SUSER())
+#else
if (!capable(CAP_SYS_ADMIN))
+#endif
retcode = -EPERM;
else
retcode = via_initialize(dev, dev_priv, init);
break;
case VIA_CLEANUP_DMA:
+#ifdef __NetBSD__
+ if (!DRM_SUSER())
+#else
if (!capable(CAP_SYS_ADMIN))
+#endif
retcode = -EPERM;
else
retcode = via_dma_cleanup(dev);
@@ -586,13 +596,11 @@ static inline void via_dummy_bitblt(drm_
static void via_cmdbuf_jump(drm_via_private_t *dev_priv)
{
- uint32_t agp_base;
uint32_t pause_addr_lo, pause_addr_hi;
uint32_t jump_addr_lo, jump_addr_hi;
volatile uint32_t *last_pause_ptr;
uint32_t dma_low_save1, dma_low_save2;
- agp_base = dev_priv-dma_offset + (uint32_t) dev_priv-agpAddr;
via_align_cmd(dev_priv, HC_HAGPBpID_JUMP, 0, jump_addr_hi,
jump_addr_lo, 0);
Index: src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c
diff -u src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c:1.1.1.2 src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c:1.1.1.2 Wed Jul 16 19:35:29 2014
+++ src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c Tue Aug 26 17:28:14 2014
@@ -41,6 +41,7 @@
#include linux/pagemap.h
#include linux/slab.h
+#include linux/timer.h
#define VIA_PGDN(x) (((unsigned long)(x)) PAGE_MASK)
#define VIA_PGOFF(x) (((unsigned long)(x)) ~PAGE_MASK)
@@ -61,8 +62,12 @@ typedef struct _drm_via_descriptor {
static void
-via_unmap_blit_from_device(struct pci_dev *pdev, drm_via_sg_info_t *vsg)
+via_unmap_blit_from_device(struct drm_device *dev, struct pci_dev *pdev,
+drm_via_sg_info_t *vsg)
{
+#ifdef __NetBSD__
+ bus_dmamap_unload(dev-dmat, vsg-dmamap);
+#else
int num_desc = vsg-num_desc;
unsigned cur_descriptor_page = num_desc / vsg-descriptors_per_page;
unsigned descriptor_this_page = num_desc % vsg-descriptors_per_page;
@@ -82,6 +87,7 @@ via_unmap_blit_from_device(struct pci_de
next = (dma_addr_t) desc_ptr-next;
desc_ptr--;
}
+#endif
}
/*
@@ -101,7 +107,9 @@ via_map_blit_for_device(struct pci_dev *
unsigned num_descriptors_this_page = 0;
unsigned char *mem_addr = xfer-mem_addr;
unsigned char *cur_mem;
+#ifndef __NetBSD__
unsigned char *first_addr = (unsigned char *)VIA_PGDN(mem_addr);
+#endif
uint32_t fb_addr = xfer-fb_addr;
uint32_t cur_fb;
unsigned long line_len;
@@ -126,18 +134,31 @@ via_map_blit_for_device(struct pci_dev *
line_len -= remaining_len;
if (mode == 1) {
+#ifdef __NetBSD__
+const bus_dma_segment_t *const seg =
+vsg-dmamap-dm_segs[atop(cur_mem)];
+desc_ptr-mem_addr =
+seg-ds_addr + trunc_page((vaddr_t)cur_mem);
+#else
desc_ptr-mem_addr =
dma_map_page(pdev-dev,
vsg-pages[VIA_PFN(cur_mem) -
VIA_PFN(first_addr)],
VIA_PGOFF(cur_mem), remaining_len,
vsg-direction);
+#endif
desc_ptr-dev_addr = cur_fb;
desc_ptr-size = remaining_len;
desc_ptr-next = (uint32_t) next;
+#ifdef __NetBSD__
+next = vsg-desc_dmamap
+-dm_segs[cur_descriptor_page].ds_addr
++ num_descriptors_this_page;
+#else
next = dma_map_single(pdev-dev, desc_ptr, sizeof(*desc_ptr),
DMA_TO_DEVICE);
+#endif
desc_ptr++;
if
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Tue Aug 26 19:49:33 UTC 2014
Modified Files:
src/libexec/ld.elf_so: rtld.h
Log Message:
Replace casts in the inline version of _rtld_call_function_void of
_rtld_call_function_addr with ifdef on RTLD_LOADER.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/libexec/ld.elf_so/rtld.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.121 src/libexec/ld.elf_so/rtld.h:1.122
--- src/libexec/ld.elf_so/rtld.h:1.121 Tue Aug 26 07:54:27 2014
+++ src/libexec/ld.elf_so/rtld.h Tue Aug 26 19:49:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.121 2014/08/26 07:54:27 christos Exp $ */
+/* $NetBSD: rtld.h,v 1.122 2014/08/26 19:49:33 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -484,6 +484,7 @@ Obj_Entry *_rtld_obj_new(void);
#define RTLD_ELF32_CAST
#endif
+#ifdef RTLD_LOADER
/* function descriptors */
#ifdef __HAVE_FUNCTION_DESCRIPTORS
Elf_Addr _rtld_function_descriptor_alloc(const Obj_Entry *,
@@ -496,14 +497,15 @@ Elf_Addr _rtld_call_function_addr(const
static inline void
_rtld_call_function_void(const Obj_Entry *obj, Elf_Addr addr)
{
- ((void (*)(void)) RTLD_ELF32_CAST addr)();
+ ((void (*)(void))addr)();
}
static inline Elf_Addr
_rtld_call_function_addr(const Obj_Entry *obj, Elf_Addr addr)
{
- return ((Elf_Addr(*)(void)) RTLD_ELF32_CAST addr)();
+ return ((Elf_Addr(*)(void))addr)();
}
#endif /* __HAVE_FUNCTION_DESCRIPTORS */
+#endif /* RTLD_LOADER */
#endif /* _RTLD_SOURCE */
CVS commit: src/sys/arch/evbarm/odroid
Module Name:src Committed By: reinoud Date: Tue Aug 26 20:33:35 UTC 2014 Modified Files: src/sys/arch/evbarm/odroid: odroid_machdep.c Log Message: Make it compile without DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/odroid/odroid_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/odroid/odroid_machdep.c diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.29 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.30 --- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.29 Mon Aug 25 16:56:14 2014 +++ src/sys/arch/evbarm/odroid/odroid_machdep.c Tue Aug 26 20:33:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: odroid_machdep.c,v 1.29 2014/08/25 16:56:14 reinoud Exp $ */ +/* $NetBSD: odroid_machdep.c,v 1.30 2014/08/26 20:33:35 reinoud Exp $ */ /* * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.29 2014/08/25 16:56:14 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.30 2014/08/26 20:33:35 reinoud Exp $); #include opt_evbarm_boardtype.h #include opt_exynos.h @@ -825,7 +825,7 @@ exynos_usb_powercycle_lan9730(device_t s struct i2c_controller *i2c; const char *pin_enable; uint8_t rdata, wdata, reg; - int error; + int error __diagused; bool ok; /*
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Tue Aug 26 21:20:05 UTC 2014 Modified Files: src/libexec/ld.elf_so: headers.c Log Message: Restore parenthesis to cast in the right order. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/libexec/ld.elf_so/headers.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/headers.c diff -u src/libexec/ld.elf_so/headers.c:1.58 src/libexec/ld.elf_so/headers.c:1.59 --- src/libexec/ld.elf_so/headers.c:1.58 Tue Aug 26 15:06:50 2014 +++ src/libexec/ld.elf_so/headers.c Tue Aug 26 21:20:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: headers.c,v 1.58 2014/08/26 15:06:50 christos Exp $ */ +/* $NetBSD: headers.c,v 1.59 2014/08/26 21:20:05 joerg Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: headers.c,v 1.58 2014/08/26 15:06:50 christos Exp $); +__RCSID($NetBSD: headers.c,v 1.59 2014/08/26 21:20:05 joerg Exp $); #endif /* not lint */ #include err.h @@ -236,7 +236,8 @@ _rtld_digest_dynamic(const char *execnam #ifdef HAVE_INITFINI_ARRAY case DT_INIT_ARRAY: - obj-init_array = (Elf_Addr *)obj-relocbase + dynp-d_un.d_ptr; + obj-init_array = + (Elf_Addr *)(obj-relocbase + dynp-d_un.d_ptr); dbg((headers: DT_INIT_ARRAY at %p, obj-init_array)); break;
CVS commit: [netbsd-7] src/sys/fs/puffs
Module Name:src
Committed By: riz
Date: Tue Aug 26 23:15:13 UTC 2014
Modified Files:
src/sys/fs/puffs [netbsd-7]: puffs_msgif.h puffs_sys.h puffs_vnops.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #52):
sys/fs/puffs/puffs_msgif.h: revision 1.81
sys/fs/puffs/puffs_sys.h: revision 1.85
sys/fs/puffs/puffs_vnops.c: revision 1.183
Add a oflags input field to open requests so that the filesystem can pass
back information about the file. Implement PUFFS_OPEN_IO_DIRECT, which
will force direct IO (bypassing page cache) for the file.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.14.1 src/sys/fs/puffs/puffs_msgif.h
cvs rdiff -u -r1.84 -r1.84.4.1 src/sys/fs/puffs/puffs_sys.h
cvs rdiff -u -r1.182 -r1.182.2.1 src/sys/fs/puffs/puffs_vnops.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/fs/puffs/puffs_msgif.h
diff -u src/sys/fs/puffs/puffs_msgif.h:1.80 src/sys/fs/puffs/puffs_msgif.h:1.80.14.1
--- src/sys/fs/puffs/puffs_msgif.h:1.80 Fri Aug 10 16:49:35 2012
+++ src/sys/fs/puffs/puffs_msgif.h Tue Aug 26 23:15:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.h,v 1.80 2012/08/10 16:49:35 manu Exp $ */
+/* $NetBSD: puffs_msgif.h,v 1.80.14.1 2014/08/26 23:15:12 riz Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -339,6 +339,9 @@ struct puffs_vfsmsg_suspend {
#define PUFFS_EXTATTRCTL_HASNODE 0x01
#define PUFFS_EXTATTRCTL_HASATTRNAME 0x02
+
+#define PUFFS_OPEN_IO_DIRECT 0x01
+
struct puffs_vfsmsg_extattrctl {
struct puffs_req pvfsr_pr;
@@ -399,6 +402,7 @@ struct puffs_vnmsg_open {
struct puffs_kcred pvnr_cred; /* OUT */
int pvnr_mode; /* OUT */
+ int pvnr_oflags; /* IN */
};
struct puffs_vnmsg_close {
Index: src/sys/fs/puffs/puffs_sys.h
diff -u src/sys/fs/puffs/puffs_sys.h:1.84 src/sys/fs/puffs/puffs_sys.h:1.84.4.1
--- src/sys/fs/puffs/puffs_sys.h:1.84 Thu Oct 17 21:03:27 2013
+++ src/sys/fs/puffs/puffs_sys.h Tue Aug 26 23:15:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_sys.h,v 1.84 2013/10/17 21:03:27 christos Exp $ */
+/* $NetBSD: puffs_sys.h,v 1.84.4.1 2014/08/26 23:15:12 riz Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -197,6 +197,8 @@ struct puffs_mount {
#define PNODE_FAF 0x004 /* issue all operations as FAF */
#define PNODE_DOINACT 0x008 /* if inactive-on-demand, call inactive */
#define PNODE_SOPEXP 0x100 /* Node reclaim postponed in sop thread */
+#define PNODE_RDIRECT 0x200 /* bypass page cache on read */
+#define PNODE_WDIRECT 0x400 /* bypass page cache on write */
#define PNODE_METACACHE_ATIME 0x10 /* cache atime metadata */
#define PNODE_METACACHE_CTIME 0x20 /* cache atime metadata */
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.182 src/sys/fs/puffs/puffs_vnops.c:1.182.2.1
--- src/sys/fs/puffs/puffs_vnops.c:1.182 Fri Jul 25 08:20:52 2014
+++ src/sys/fs/puffs/puffs_vnops.c Tue Aug 26 23:15:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.182 2014/07/25 08:20:52 dholland Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.182.2.1 2014/08/26 23:15:12 riz Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.182 2014/07/25 08:20:52 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.182.2.1 2014/08/26 23:15:12 riz Exp $);
#include sys/param.h
#include sys/buf.h
@@ -893,6 +893,7 @@ puffs_vnop_open(void *v)
PUFFS_MSG_VARS(vn, open);
struct vnode *vp = ap-a_vp;
struct puffs_mount *pmp = MPTOPUFFSMP(vp-v_mount);
+ struct puffs_node *pn = VPTOPP(vp);
int mode = ap-a_mode;
int error;
@@ -913,6 +914,12 @@ puffs_vnop_open(void *v)
PUFFS_MSG_ENQUEUEWAIT2(pmp, park_open, vp-v_data, NULL, error);
error = checkerr(pmp, error, __func__);
+ if (open_msg-pvnr_oflags PUFFS_OPEN_IO_DIRECT) {
+ if (mode FREAD)
+ pn-pn_stat |= PNODE_RDIRECT;
+ if (mode FWRITE)
+ pn-pn_stat |= PNODE_WDIRECT;
+ }
out:
DPRINTF((puffs_open: returning %d\n, error));
PUFFS_MSG_RELEASE(open);
@@ -2181,6 +2188,7 @@ puffs_vnop_read(void *v)
} */ *ap = v;
PUFFS_MSG_VARS(vn, read);
struct vnode *vp = ap-a_vp;
+ struct puffs_node *pn = VPTOPP(vp);
struct puffs_mount *pmp = MPTOPUFFSMP(vp-v_mount);
struct uio *uio = ap-a_uio;
size_t tomove, argsize;
@@ -2196,7 +2204,9 @@ puffs_vnop_read(void *v)
if (uio-uio_offset 0)
return EINVAL;
- if (vp-v_type == VREG PUFFS_USE_PAGECACHE(pmp)) {
+ if (vp-v_type == VREG
+ PUFFS_USE_PAGECACHE(pmp)
+ !(pn-pn_stat PNODE_RDIRECT)) {
const int advice = IO_ADV_DECODE(ap-a_ioflag);
while (uio-uio_resid 0) {
@@ -2301,7 +2311,9 @@ puffs_vnop_write(void *v)
mutex_enter(pn-pn_sizemtx);
- if (vp-v_type == VREG PUFFS_USE_PAGECACHE(pmp)) {
+ if (vp-v_type == VREG
+
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: riz Date: Tue Aug 26 23:15:39 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Pulled up additional changes required for ticket #52. To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.23 src/doc/CHANGES-7.0:1.1.2.24 --- src/doc/CHANGES-7.0:1.1.2.23 Sun Aug 24 09:38:36 2014 +++ src/doc/CHANGES-7.0 Tue Aug 26 23:15:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.23 2014/08/24 09:38:36 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.24 2014/08/26 23:15:39 riz Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -376,6 +376,9 @@ lib/libperfuse/perfuse_priv.h 1.33-1.3 lib/libpuffs/dispatcher.c 1.47 lib/libpuffs/puffs.h1.125 lib/libpuffs/puffs_ops.3 1.37-1.38 +sys/fs/puffs/puffs_msgif.h 1.81 +sys/fs/puffs/puffs_sys.h 1.85 +sys/fs/puffs/puffs_vnops.c 1.183 usr.sbin/perfused/msg.c1.22 Implement FUSE direct I/O.
CVS commit: src/sys/arch/evbcf/evbcf
Module Name:src Committed By: matt Date: Wed Aug 27 00:18:25 UTC 2014 Added Files: src/sys/arch/evbcf/evbcf: vectors.S Log Message: Use .S instead of .s To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbcf/evbcf/vectors.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbcf/evbcf/vectors.S diff -u /dev/null src/sys/arch/evbcf/evbcf/vectors.S:1.1 --- /dev/null Wed Aug 27 00:18:25 2014 +++ src/sys/arch/evbcf/evbcf/vectors.S Wed Aug 27 00:18:25 2014 @@ -0,0 +1,146 @@ +| $NetBSD: vectors.S,v 1.1 2014/08/27 00:18:25 matt Exp $ + +| Copyright (c) 1997 Jason R. Thorpe. All rights reserved. +| Copyright (c) 1988 University of Utah +| Copyright (c) 1990, 1993 +| The Regents of the University of California. All rights reserved. +| +| Redistribution and use in source and binary forms, with or without +| modification, are permitted provided that the following conditions +| are met: +| 1. Redistributions of source code must retain the above copyright +|notice, this list of conditions and the following disclaimer. +| 2. Redistributions in binary 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. +| 3. All advertising materials mentioning features or use of this software +|must display the following acknowledgement: +| This product includes software developed by the University of +| California, Berkeley and its contributors. +| 4. Neither the name of the University nor the names of its contributors +|may be used to endorse or promote products derived from this software +|without specific prior written permission. +| +| THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. +| +| @(#)vectors.s 8.2 (Berkeley) 1/21/94 +| + +#include machine/asm.h +RCSID($NetBSD: vectors.S,v 1.1 2014/08/27 00:18:25 matt Exp $) + +#define BADTRAP16 \ + VECTOR(badtrap) ; VECTOR(badtrap) ; \ + VECTOR(badtrap) ; VECTOR(badtrap) ; \ + VECTOR(badtrap) ; VECTOR(badtrap) ; \ + VECTOR(badtrap) ; VECTOR(badtrap) ; \ + VECTOR(badtrap) ; VECTOR(badtrap) ; \ + VECTOR(badtrap) ; VECTOR(badtrap) ; \ + VECTOR(badtrap) ; VECTOR(badtrap) ; \ + VECTOR(badtrap) ; VECTOR(badtrap) + + /* + * bus error and address error vectors are initialized + * in locore.s once we know our CPU type. + */ + + .data +GLOBAL(vectab) + VECTOR_UNUSED /* 0: (unused reset SSP) */ + VECTOR_UNUSED /* 1: NOT USED (reset PC) */ + VECTOR(accesserror) /* 2: bus error */ + VECTOR(addresserror) /* 3: address error */ + VECTOR(illinst) /* 4: illegal instruction */ + VECTOR(zerodiv) /* 5: zero divide */ + VECTOR_UNUSED /* 6: CHK instruction */ + VECTOR_UNUSED /* 7: TRAPV instruction */ + VECTOR(privinst) /* 8: privilege violation */ + VECTOR(trace) /* 9: trace */ + VECTOR(illinst) /* 10: line 1010 emulator */ + VECTOR(fpfline) /* 11: line emulator */ + VECTOR(badtrap) /* 12: non-PC breakpoint detected */ + VECTOR(coperr) /* 13: PC breakpoint detected */ + VECTOR(fmterr) /* 14: format error */ + VECTOR(badtrap) /* 15: uninitialized interrupt vector */ + VECTOR(badtrap) /* 16: unassigned, reserved */ + VECTOR(badtrap) /* 17: unassigned, reserved */ + VECTOR(badtrap) /* 18: unassigned, reserved */ + VECTOR(badtrap) /* 19: unassigned, reserved */ + VECTOR(badtrap) /* 20: unassigned, reserved */ + VECTOR(badtrap) /* 21: unassigned, reserved */ + VECTOR(badtrap) /* 22: unassigned, reserved */ + VECTOR(badtrap) /* 23: unassigned, reserved */ + VECTOR(intrhand_autovec)/* 24: spurious autovector interrupt */ + VECTOR(intrhand_autovec)/* 25: level 1 interrupt autovector */ + VECTOR(intrhand_autovec)/* 26: level 2 interrupt autovector */ + VECTOR(intrhand_autovec)/* 27: level 3 interrupt autovector */ + VECTOR(intrhand_autovec)/* 28: level 4 interrupt autovector */ + VECTOR(intrhand_autovec)/* 29: level 5 interrupt autovector */ + VECTOR(intrhand_autovec)/* 30: level 6 interrupt autovector */ + VECTOR(intrhand_autovec)/* 31: level 7 interrupt autovector */ + VECTOR(trap0) /* 32: trap 0 syscalls */ +#ifdef COMPAT_13 + VECTOR(trap1) /* 33: trap 1 compat_13_sigreturn */
CVS commit: src/sys/arch/evbcf/evbcf
Module Name:src Committed By: matt Date: Wed Aug 27 00:19:00 UTC 2014 Removed Files: src/sys/arch/evbcf/evbcf: vectors.s Log Message: Use .S instead of .s To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/sys/arch/evbcf/evbcf/vectors.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/zaurus/stand/zboot
Module Name:src
Committed By: matt
Date: Wed Aug 27 03:17:21 UTC 2014
Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile
Log Message:
Don't use ${MACHINE} but zaurus instead.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/zaurus/stand/zboot/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/arch/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.16 src/sys/arch/zaurus/stand/zboot/Makefile:1.17
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.16 Sun Jan 12 15:26:31 2014
+++ src/sys/arch/zaurus/stand/zboot/Makefile Wed Aug 27 03:17:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/12 15:26:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.17 2014/08/27 03:17:21 matt Exp $
PROG= zboot
@@ -61,7 +61,7 @@ LIBSA= ${SALIB}
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${VERSIONFILE}
${_MKTARGET_LINK}
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
- ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
+ ${VERSIONFILE} zaurus ${NEWVERSWHAT}
${CC} ${CFLAGS} ${CPPFLAGS} -c vers.c
${LD} ${LDFLAGS} -o ${PROG} ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Wed Aug 27 03:35:32 UTC 2014 Modified Files: src/sys/arch/arm/arm32: locore.S Log Message: Make the initial svcstack is doubleword aligned if EABI. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/arm32/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/locore.S diff -u src/sys/arch/arm/arm32/locore.S:1.36 src/sys/arch/arm/arm32/locore.S:1.37 --- src/sys/arch/arm/arm32/locore.S:1.36 Fri Apr 11 16:34:29 2014 +++ src/sys/arch/arm/arm32/locore.S Wed Aug 27 03:35:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.36 2014/04/11 16:34:29 matt Exp $ */ +/* $NetBSD: locore.S,v 1.37 2014/08/27 03:35:32 matt Exp $ */ /* * Copyright (C) 1994-1997 Mark Brinicombe @@ -40,7 +40,7 @@ /* What size should this really be ? It is only used by init_arm() */ #define INIT_ARM_STACK_SIZE 2048 - RCSID($NetBSD: locore.S,v 1.36 2014/04/11 16:34:29 matt Exp $) + RCSID($NetBSD: locore.S,v 1.37 2014/08/27 03:35:32 matt Exp $) /* * This is for kvm_mkdb, and should be the address of the beginning @@ -115,6 +115,9 @@ ASENTRY_NP(start) ASEND(start) .bss +#ifdef __ARM_EABI__ + .align 3 +#endif svcstk: .space INIT_ARM_STACK_SIZE
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: christos Date: Wed Aug 27 04:07:04 UTC 2014 Modified Files: src/libexec/ld.elf_so: rtld.h Log Message: remove unused define To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/libexec/ld.elf_so/rtld.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/rtld.h diff -u src/libexec/ld.elf_so/rtld.h:1.122 src/libexec/ld.elf_so/rtld.h:1.123 --- src/libexec/ld.elf_so/rtld.h:1.122 Tue Aug 26 15:49:33 2014 +++ src/libexec/ld.elf_so/rtld.h Wed Aug 27 00:07:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.h,v 1.122 2014/08/26 19:49:33 joerg Exp $ */ +/* $NetBSD: rtld.h,v 1.123 2014/08/27 04:07:04 christos Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -475,15 +475,6 @@ Obj_Entry *_rtld_map_object(const char * void _rtld_obj_free(Obj_Entry *); Obj_Entry *_rtld_obj_new(void); -/* - * The following uintptr_t cast is for Elf32 emulation on _LP64 systems - */ -#if defined(_LP64) ELFSIZE == 32 -#define RTLD_ELF32_CAST (uintptr_t) -#else -#define RTLD_ELF32_CAST -#endif - #ifdef RTLD_LOADER /* function descriptors */ #ifdef __HAVE_FUNCTION_DESCRIPTORS
CVS commit: src/distrib
Module Name:src
Committed By: christos
Date: Wed Aug 27 04:30:25 UTC 2014
Modified Files:
src/distrib/sun2/miniroot: Makefile
src/distrib/sun2/ramdisk: Makefile
src/distrib/sun3/miniroot: Makefile
src/distrib/sun3/ramdisk: Makefile
Log Message:
mark fstab .PHONY to prevent it being re-made from fstab.c in suffix rules.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/sun2/miniroot/Makefile
cvs rdiff -u -r1.23 -r1.24 src/distrib/sun2/ramdisk/Makefile
cvs rdiff -u -r1.44 -r1.45 src/distrib/sun3/miniroot/Makefile
cvs rdiff -u -r1.38 -r1.39 src/distrib/sun3/ramdisk/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/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.34 src/distrib/sun2/miniroot/Makefile:1.35
--- src/distrib/sun2/miniroot/Makefile:1.34 Mon Aug 12 12:31:28 2013
+++ src/distrib/sun2/miniroot/Makefile Wed Aug 27 00:30:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/08/12 16:31:28 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2014/08/27 04:30:25 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -54,6 +54,8 @@ install.sub: ${DISTRIBDIR}/miniroot/inst
CLEANFILES+= install.sub
+fstab: .PHONY
+
.include ${DISTRIBDIR}/common/Makefile.crunch
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
Index: src/distrib/sun2/ramdisk/Makefile
diff -u src/distrib/sun2/ramdisk/Makefile:1.23 src/distrib/sun2/ramdisk/Makefile:1.24
--- src/distrib/sun2/ramdisk/Makefile:1.23 Sun Sep 20 18:46:14 2009
+++ src/distrib/sun2/ramdisk/Makefile Wed Aug 27 00:30:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/09/20 22:46:14 abs Exp $
+# $NetBSD: Makefile,v 1.24 2014/08/27 04:30:25 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -28,6 +28,8 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
.include ${HACKSRC}/Makefile.inc
${CRUNCHBIN}: libhack.o
+fstab: .PHONY
+
.include ${DISTRIBDIR}/common/Makefile.crunch
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
Index: src/distrib/sun3/miniroot/Makefile
diff -u src/distrib/sun3/miniroot/Makefile:1.44 src/distrib/sun3/miniroot/Makefile:1.45
--- src/distrib/sun3/miniroot/Makefile:1.44 Thu Feb 11 04:06:51 2010
+++ src/distrib/sun3/miniroot/Makefile Wed Aug 27 00:30:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2010/02/11 09:06:51 roy Exp $
+# $NetBSD: Makefile,v 1.45 2014/08/27 04:30:25 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -54,6 +54,8 @@ install.sub: ${DISTRIBDIR}/miniroot/inst
CLEANFILES+= install.sub
+fstab: .PHONY
+
.include ${DISTRIBDIR}/common/Makefile.crunch
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
Index: src/distrib/sun3/ramdisk/Makefile
diff -u src/distrib/sun3/ramdisk/Makefile:1.38 src/distrib/sun3/ramdisk/Makefile:1.39
--- src/distrib/sun3/ramdisk/Makefile:1.38 Sun Sep 20 18:46:14 2009
+++ src/distrib/sun3/ramdisk/Makefile Wed Aug 27 00:30:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/09/20 22:46:14 abs Exp $
+# $NetBSD: Makefile,v 1.39 2014/08/27 04:30:25 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -29,6 +29,8 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
.include ${HACKSRC}/Makefile.inc
${CRUNCHBIN}: libhack.o
+fstab: .PHONY
+
.include ${DISTRIBDIR}/common/Makefile.crunch
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
CVS commit: [netbsd-5] src
Module Name:src Committed By: msaitoh Date: Wed Aug 27 05:18:58 UTC 2014 Modified Files: src/doc [netbsd-5]: 3RDPARTY src/etc/namedb [netbsd-5]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1912): etc/namedb/root.cache patch doc/3RDPARTYpatch Sync root.cache with the latest -current (rev. 1.18). To generate a diff of this commit: cvs rdiff -u -r1.647.2.27 -r1.647.2.28 src/doc/3RDPARTY cvs rdiff -u -r1.13.12.1 -r1.13.12.2 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.27 src/doc/3RDPARTY:1.647.2.28 --- src/doc/3RDPARTY:1.647.2.27 Fri Aug 15 22:54:35 2014 +++ src/doc/3RDPARTY Wed Aug 27 05:18:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.27 2014/08/15 22:54:35 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.28 2014/08/27 05:18:58 msaitoh Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -801,8 +801,8 @@ Notes: Beta versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS). Package: root.cache -Version: 2007110100 (Nov 01, 2007) -Current Vers: 2007110100 (Nov 01, 2007) +Version: 2014060201 (June 2, 2014) +Current Vers: 2014060201 (June 2, 2014) Maintainer: InterNIC Archive Site: ftp://ftp.internic.net/domain/named.root Home Page: ftp://ftp.internic.net/domain/named.root Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.13.12.1 src/etc/namedb/root.cache:1.13.12.2 --- src/etc/namedb/root.cache:1.13.12.1 Sun Jan 13 17:00:32 2013 +++ src/etc/namedb/root.cache Wed Aug 27 05:18:58 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.13.12.1 2013/01/13 17:00:32 bouyer Exp $ +; $NetBSD: root.cache,v 1.13.12.2 2014/08/27 05:18:58 msaitoh Exp $ ; ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers @@ -7,12 +7,12 @@ ; ; This file is made available by InterNIC ; under anonymous FTP as -; file/domain/db.cache +; file/domain/named.cache ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Feb 04, 2008 -; related version of root zone: 2008020400 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -20,69 +20,73 @@ A.ROOT-SERVERS.NET. 360 A 198.41.0.4 A.ROOT-SERVERS.NET. 360 2001:503:BA3E::2:30 ; -; formerly NS1.ISI.EDU +; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; -; formerly C.PSI.NET +; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; -; formerly TERP.UMD.EDU +; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 360 A 199.7.91.13 D.ROOT-SERVERS.NET. 360 2001:500:2D::D ; -; formerly NS.NASA.GOV +; FORMERLY NS.NASA.GOV ; .360 NSE.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 360 A 192.203.230.10 ; -; formerly NS.ISC.ORG +; FORMERLY NS.ISC.ORG ; .360 NSF.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 360 A 192.5.5.241 -F.ROOT-SERVERS.NET. 360 2001:500:2f::f +F.ROOT-SERVERS.NET. 360 2001:500:2F::F ; -; formerly NS.NIC.DDN.MIL +; FORMERLY NS.NIC.DDN.MIL ; .360 NSG.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 360 A 192.112.36.4 ; -; formerly AOS.ARL.ARMY.MIL +; FORMERLY AOS.ARL.ARMY.MIL ; .360 NSH.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 360 A 128.63.2.53 -H.ROOT-SERVERS.NET. 360 2001:500:1::803f:235 +H.ROOT-SERVERS.NET. 360 2001:500:1::803F:235 ; -; formerly NIC.NORDU.NET +; FORMERLY NIC.NORDU.NET ; .360 NSI.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 360 A 192.36.148.17 +I.ROOT-SERVERS.NET. 360 2001:7FE::53 ; -; operated by VeriSign, Inc. +; OPERATED BY VERISIGN, INC. ; .360 NSJ.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 360 A 192.58.128.30 J.ROOT-SERVERS.NET. 360 2001:503:C27::2:30 ; -; operated by RIPE NCC +; OPERATED BY RIPE NCC ; .
CVS commit: [netbsd-5-2] src
Module Name:src Committed By: msaitoh Date: Wed Aug 27 05:19:54 UTC 2014 Modified Files: src/doc [netbsd-5-2]: 3RDPARTY src/etc/namedb [netbsd-5-2]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1912): etc/namedb/root.cache patch doc/3RDPARTYpatch Sync root.cache with the latest -current (rev. 1.18). To generate a diff of this commit: cvs rdiff -u -r1.647.2.23.2.4 -r1.647.2.23.2.5 src/doc/3RDPARTY cvs rdiff -u -r1.13.24.1 -r1.13.24.2 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.23.2.4 src/doc/3RDPARTY:1.647.2.23.2.5 --- src/doc/3RDPARTY:1.647.2.23.2.4 Fri Aug 15 23:06:18 2014 +++ src/doc/3RDPARTY Wed Aug 27 05:19:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.23.2.4 2014/08/15 23:06:18 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.23.2.5 2014/08/27 05:19:54 msaitoh Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -801,8 +801,8 @@ Notes: Beta versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS). Package: root.cache -Version: 2007110100 (Nov 01, 2007) -Current Vers: 2007110100 (Nov 01, 2007) +Version: 2014060201 (June 2, 2014) +Current Vers: 2014060201 (June 2, 2014) Maintainer: InterNIC Archive Site: ftp://ftp.internic.net/domain/named.root Home Page: ftp://ftp.internic.net/domain/named.root Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.13.24.1 src/etc/namedb/root.cache:1.13.24.2 --- src/etc/namedb/root.cache:1.13.24.1 Sun Jan 13 17:07:34 2013 +++ src/etc/namedb/root.cache Wed Aug 27 05:19:54 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.13.24.1 2013/01/13 17:07:34 bouyer Exp $ +; $NetBSD: root.cache,v 1.13.24.2 2014/08/27 05:19:54 msaitoh Exp $ ; ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers @@ -7,12 +7,12 @@ ; ; This file is made available by InterNIC ; under anonymous FTP as -; file/domain/db.cache +; file/domain/named.cache ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Feb 04, 2008 -; related version of root zone: 2008020400 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -20,69 +20,73 @@ A.ROOT-SERVERS.NET. 360 A 198.41.0.4 A.ROOT-SERVERS.NET. 360 2001:503:BA3E::2:30 ; -; formerly NS1.ISI.EDU +; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; -; formerly C.PSI.NET +; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; -; formerly TERP.UMD.EDU +; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 360 A 199.7.91.13 D.ROOT-SERVERS.NET. 360 2001:500:2D::D ; -; formerly NS.NASA.GOV +; FORMERLY NS.NASA.GOV ; .360 NSE.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 360 A 192.203.230.10 ; -; formerly NS.ISC.ORG +; FORMERLY NS.ISC.ORG ; .360 NSF.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 360 A 192.5.5.241 -F.ROOT-SERVERS.NET. 360 2001:500:2f::f +F.ROOT-SERVERS.NET. 360 2001:500:2F::F ; -; formerly NS.NIC.DDN.MIL +; FORMERLY NS.NIC.DDN.MIL ; .360 NSG.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 360 A 192.112.36.4 ; -; formerly AOS.ARL.ARMY.MIL +; FORMERLY AOS.ARL.ARMY.MIL ; .360 NSH.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 360 A 128.63.2.53 -H.ROOT-SERVERS.NET. 360 2001:500:1::803f:235 +H.ROOT-SERVERS.NET. 360 2001:500:1::803F:235 ; -; formerly NIC.NORDU.NET +; FORMERLY NIC.NORDU.NET ; .360 NSI.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 360 A 192.36.148.17 +I.ROOT-SERVERS.NET. 360 2001:7FE::53 ; -; operated by VeriSign, Inc. +; OPERATED BY VERISIGN, INC. ; .360 NSJ.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 360 A 192.58.128.30 J.ROOT-SERVERS.NET. 360 2001:503:C27::2:30 ; -; operated by RIPE NCC +;
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: msaitoh Date: Wed Aug 27 05:20:20 UTC 2014 Modified Files: src/doc [netbsd-5-1]: 3RDPARTY src/etc/namedb [netbsd-5-1]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1912): etc/namedb/root.cache patch doc/3RDPARTYpatch Sync root.cache with the latest -current (rev. 1.18). To generate a diff of this commit: cvs rdiff -u -r1.647.2.12.2.13 -r1.647.2.12.2.14 src/doc/3RDPARTY cvs rdiff -u -r1.13.20.1 -r1.13.20.2 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.12.2.13 src/doc/3RDPARTY:1.647.2.12.2.14 --- src/doc/3RDPARTY:1.647.2.12.2.13 Fri Aug 15 23:02:40 2014 +++ src/doc/3RDPARTY Wed Aug 27 05:20:19 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.12.2.13 2014/08/15 23:02:40 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.12.2.14 2014/08/27 05:20:19 msaitoh Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -801,8 +801,8 @@ Notes: Beta versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS). Package: root.cache -Version: 2007110100 (Nov 01, 2007) -Current Vers: 2007110100 (Nov 01, 2007) +Version: 2014060201 (June 2, 2014) +Current Vers: 2014060201 (June 2, 2014) Maintainer: InterNIC Archive Site: ftp://ftp.internic.net/domain/named.root Home Page: ftp://ftp.internic.net/domain/named.root Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.13.20.1 src/etc/namedb/root.cache:1.13.20.2 --- src/etc/namedb/root.cache:1.13.20.1 Sun Jan 13 17:07:29 2013 +++ src/etc/namedb/root.cache Wed Aug 27 05:20:19 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.13.20.1 2013/01/13 17:07:29 bouyer Exp $ +; $NetBSD: root.cache,v 1.13.20.2 2014/08/27 05:20:19 msaitoh Exp $ ; ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers @@ -7,12 +7,12 @@ ; ; This file is made available by InterNIC ; under anonymous FTP as -; file/domain/db.cache +; file/domain/named.cache ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Feb 04, 2008 -; related version of root zone: 2008020400 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -20,69 +20,73 @@ A.ROOT-SERVERS.NET. 360 A 198.41.0.4 A.ROOT-SERVERS.NET. 360 2001:503:BA3E::2:30 ; -; formerly NS1.ISI.EDU +; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; -; formerly C.PSI.NET +; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; -; formerly TERP.UMD.EDU +; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 360 A 199.7.91.13 D.ROOT-SERVERS.NET. 360 2001:500:2D::D ; -; formerly NS.NASA.GOV +; FORMERLY NS.NASA.GOV ; .360 NSE.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 360 A 192.203.230.10 ; -; formerly NS.ISC.ORG +; FORMERLY NS.ISC.ORG ; .360 NSF.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 360 A 192.5.5.241 -F.ROOT-SERVERS.NET. 360 2001:500:2f::f +F.ROOT-SERVERS.NET. 360 2001:500:2F::F ; -; formerly NS.NIC.DDN.MIL +; FORMERLY NS.NIC.DDN.MIL ; .360 NSG.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 360 A 192.112.36.4 ; -; formerly AOS.ARL.ARMY.MIL +; FORMERLY AOS.ARL.ARMY.MIL ; .360 NSH.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 360 A 128.63.2.53 -H.ROOT-SERVERS.NET. 360 2001:500:1::803f:235 +H.ROOT-SERVERS.NET. 360 2001:500:1::803F:235 ; -; formerly NIC.NORDU.NET +; FORMERLY NIC.NORDU.NET ; .360 NSI.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 360 A 192.36.148.17 +I.ROOT-SERVERS.NET. 360 2001:7FE::53 ; -; operated by VeriSign, Inc. +; OPERATED BY VERISIGN, INC. ; .360 NSJ.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 360 A 192.58.128.30 J.ROOT-SERVERS.NET. 360 2001:503:C27::2:30 ; -; operated by RIPE NCC
CVS commit: [netbsd-5] src
Module Name:src
Committed By: msaitoh
Date: Wed Aug 27 05:47:43 UTC 2014
Modified Files:
src/sbin/ccdconfig [netbsd-5]: ccdconfig.c
src/sys/dev [netbsd-5]: ccd.c ccdvar.h
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1919):
sbin/ccdconfig/ccdconfig.c 1.54 via patch
sys/dev/ccd.c 1.152 via patch
sys/dev/ccdvar.h1.34 via patch
Switch size_t to uint64_t in appropriate places to ensure that ccd(4)
works with component and total sizes of 2TB.
Make kernel print device information when a ccd configured.
Fix some typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.2.1 src/sbin/ccdconfig/ccdconfig.c
cvs rdiff -u -r1.129.10.1 -r1.129.10.2 src/sys/dev/ccd.c
cvs rdiff -u -r1.30.10.1 -r1.30.10.2 src/sys/dev/ccdvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ccdconfig/ccdconfig.c
diff -u src/sbin/ccdconfig/ccdconfig.c:1.48 src/sbin/ccdconfig/ccdconfig.c:1.48.2.1
--- src/sbin/ccdconfig/ccdconfig.c:1.48 Sun Jul 20 01:20:21 2008
+++ src/sbin/ccdconfig/ccdconfig.c Wed Aug 27 05:47:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdconfig.c,v 1.48 2008/07/20 01:20:21 lukem Exp $ */
+/* $NetBSD: ccdconfig.c,v 1.48.2.1 2014/08/27 05:47:42 msaitoh Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1996, 1997\
The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: ccdconfig.c,v 1.48 2008/07/20 01:20:21 lukem Exp $);
+__RCSID($NetBSD: ccdconfig.c,v 1.48.2.1 2014/08/27 05:47:42 msaitoh Exp $);
#endif
#include sys/param.h
@@ -309,7 +309,7 @@ do_single(int argc, char **argv, int act
i == 0 ? '(' : ' ', cp2,
i == ccio.ccio_ndisks - 1 ? ')' : ',');
}
- printf(, %ld blocks , (long)ccio.ccio_size);
+ printf(, %ju blocks , (uintmax_t)ccio.ccio_size);
if (ccio.ccio_ileave != 0)
printf(interleaved at %d blocks\n, ccio.ccio_ileave);
else
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.129.10.1 src/sys/dev/ccd.c:1.129.10.2
--- src/sys/dev/ccd.c:1.129.10.1 Sat Apr 4 23:04:57 2009
+++ src/sys/dev/ccd.c Wed Aug 27 05:47:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.129.10.1 2009/04/04 23:04:57 snj Exp $ */
+/* $NetBSD: ccd.c,v 1.129.10.2 2014/08/27 05:47:43 msaitoh Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -127,7 +127,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.129.10.1 2009/04/04 23:04:57 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.129.10.2 2014/08/27 05:47:43 msaitoh Exp $);
+
+#if defined(_KERNEL_OPT)
+#include opt_compat_netbsd.h
+#endif
#include sys/param.h
#include sys/systm.h
@@ -449,6 +453,22 @@ ccdinit(struct ccd_softc *cs, char **cpa
ccg-ccg_ntracks = 1;
ccg-ccg_nsectors = 1024 * (1024 / ccg-ccg_secsize);
ccg-ccg_ncylinders = cs-sc_size / ccg-ccg_nsectors;
+
+ if (cs-sc_ileave 0)
+ aprint_normal(%s: Interleaving %d component%s
+ (%d block interleave)\n, cs-sc_xname,
+ cs-sc_nccdisks, (cs-sc_nccdisks != 0 ? s : ),
+ cs-sc_ileave);
+ else
+ aprint_normal(%s: Concatenating %d component%s\n,
+ cs-sc_xname,
+ cs-sc_nccdisks, (cs-sc_nccdisks != 0 ? s : ));
+ for (ix = 0; ix cs-sc_nccdisks; ix++) {
+ ci = cs-sc_cinfo[ix];
+ aprint_normal(%s: %s (%ju blocks)\n, cs-sc_xname,
+ ci-ci_path, (uintmax_t)ci-ci_size);
+ }
+ aprint_normal(%s: total %ju blocks\n, cs-sc_xname, cs-sc_size);
/*
* Create thread to handle deferred I/O.
@@ -1078,6 +1098,46 @@ ccdioctl(dev_t dev, u_long cmd, void *da
cs = ccd_softc[unit];
uc = kauth_cred_get();
+/*
+ * Compat code must not be called if on a platform where
+ * sizeof (size_t) == sizeof (uint64_t) as CCDIOCSET will
+ * be the same as CCDIOCSET_60
+ */
+#ifndef _LP64
+ switch (cmd) {
+ case CCDIOCSET_60: {
+ struct ccd_ioctl ccionew;
+ struct ccd_ioctl_60 *ccio60 =
+ (struct ccd_ioctl_60 *)data;
+ ccionew.ccio_disks = ccio-ccio_disks;
+ ccionew.ccio_ndisks = ccio-ccio_ndisks;
+ ccionew.ccio_ileave = ccio-ccio_ileave;
+ ccionew.ccio_flags = ccio-ccio_flags;
+ ccionew.ccio_unit = ccio-ccio_unit;
+ error = ccdioctl(dev, CCDIOCSET, ccionew, flag, l);
+ if (!error) {
+ /* Copy data back, adjust types if necessary */
+ ccio60-ccio_disks = ccionew.ccio_disks;
+ ccio60-ccio_ndisks = ccionew.ccio_ndisks;
+ ccio60-ccio_ileave = ccionew.ccio_ileave;
+ ccio60-ccio_flags = ccionew.ccio_flags;
+ ccio60-ccio_unit = ccionew.ccio_unit;
+ ccio60-ccio_size = (size_t)ccionew.ccio_size;
+ }
+ return error;
+ }
+ break;
+
+ case CCDIOCCLR_60:
+ /*
+ * ccio_size member not used, so existing struct OK
+ * drop through to existing non-compat version
+ */
+ cmd = CCDIOCCLR;
+ break;
+ }
