CVS commit: src/sys/arch/hpcarm/conf
Module Name:src Committed By: isaki Date: Sun Apr 14 04:16:32 UTC 2019 Modified Files: src/sys/arch/hpcarm/conf: NETBOOKPRO Log Message: Fix build error. size locater is gone. Thanks mrg@. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcarm/conf/NETBOOKPRO 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/hpcarm/conf/NETBOOKPRO diff -u src/sys/arch/hpcarm/conf/NETBOOKPRO:1.27 src/sys/arch/hpcarm/conf/NETBOOKPRO:1.28 --- src/sys/arch/hpcarm/conf/NETBOOKPRO:1.27 Sat Apr 13 08:22:59 2019 +++ src/sys/arch/hpcarm/conf/NETBOOKPRO Sun Apr 14 04:16:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: NETBOOKPRO,v 1.27 2019/04/13 08:22:59 isaki Exp $ +# $NetBSD: NETBOOKPRO,v 1.28 2019/04/14 04:16:32 isaki Exp $ # # NETBOOKPRO -- Psion Teklogix NETBOOK PRO # @@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.netbookp #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.27 $" +#ident "GENERIC-$Revision: 1.28 $" # estimated number of users maxusers 32 @@ -177,7 +177,7 @@ iic* at nbpiic? nbppcon* at iic? addr 0x13 # PCon r2025rtc* at iic? addr 0x32 # R2025S RTC -seeprom* at iic? addr 0x53 size 128 +seeprom* at iic? addr 0x53 nbppm* at nbppcon? tag 0x05 hpcapm* at nbppm?
CVS commit: src/tests/net/net
Module Name:src
Committed By: christos
Date: Sun Apr 14 01:45:30 UTC 2019
Modified Files:
src/tests/net/net: t_unix.c
Log Message:
ifix uninialized pid
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tests/net/net/t_unix.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/net/net/t_unix.c
diff -u src/tests/net/net/t_unix.c:1.17 src/tests/net/net/t_unix.c:1.18
--- src/tests/net/net/t_unix.c:1.17 Sat Feb 17 15:16:18 2018
+++ src/tests/net/net/t_unix.c Sat Apr 13 21:45:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_unix.c,v 1.17 2018/02/17 20:16:18 christos Exp $ */
+/* $NetBSD: t_unix.c,v 1.18 2019/04/14 01:45:30 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include
#ifdef __RCSID
-__RCSID("$Id: t_unix.c,v 1.17 2018/02/17 20:16:18 christos Exp $");
+__RCSID("$Id: t_unix.c,v 1.18 2019/04/14 01:45:30 christos Exp $");
#else
#define getprogname() argv[0]
#endif
@@ -140,6 +140,7 @@ peercred(int s, uid_t *euid, gid_t *egid
*pid = cred.unp_pid;
return 0;
#else
+ *pid = -1;
return getpeereid(s, euid, egid);
#endif
}
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: maya Date: Sat Apr 13 21:39:46 UTC 2019 Modified Files: src/sys/arch/mips/mips: cache_octeon.c Log Message: Remove unused declaration of __BIT and __BITS it's defined already, tested with #error. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/cache_octeon.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/mips/mips/cache_octeon.c diff -u src/sys/arch/mips/mips/cache_octeon.c:1.2 src/sys/arch/mips/mips/cache_octeon.c:1.3 --- src/sys/arch/mips/mips/cache_octeon.c:1.2 Mon Jul 11 16:15:36 2016 +++ src/sys/arch/mips/mips/cache_octeon.c Sat Apr 13 21:39:46 2019 @@ -1,7 +1,7 @@ -/* $NetBSD: cache_octeon.c,v 1.2 2016/07/11 16:15:36 matt Exp $ */ +/* $NetBSD: cache_octeon.c,v 1.3 2019/04/13 21:39:46 maya Exp $ */ #include -__KERNEL_RCSID(0, "$NetBSD: cache_octeon.c,v 1.2 2016/07/11 16:15:36 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cache_octeon.c,v 1.3 2019/04/13 21:39:46 maya Exp $"); #include #include @@ -98,16 +98,6 @@ octeon_pdcache_inv_range_index(vaddr_t v #ifdef OCTEON_ICACHE_DEBUG -#ifndef __BIT -/* __BIT(n): nth bit, where __BIT(0) == 0x1. */ -#define __BIT(__n) \ - (((__n) >= NBBY * sizeof(uintmax_t)) ? 0 : ((uintmax_t)1 << (__n))) - -/* __BITS(m, n): bits m through n, m < n. */ -#define __BITS(__m, __n) \ - ((__BIT(MAX((__m), (__n)) + 1) - 1) ^ (__BIT(MIN((__m), (__n))) - 1)) -#endif - /* icache: 16KB, 2ways */ #define OCTEON_ICACHE_VA_WAY(_va) (((_va) & __BITS(14, 13)) >> 13)
CVS commit: src/sbin
Module Name:src Committed By: maya Date: Sat Apr 13 19:29:27 UTC 2019 Modified Files: src/sbin/newfs: newfs.8 src/sbin/newfs_ext2fs: newfs_ext2fs.8 Log Message: Omit mention of old vnd(4) bug, now resolved. Via elge, thanks. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sbin/newfs/newfs.8 cvs rdiff -u -r1.13 -r1.14 src/sbin/newfs_ext2fs/newfs_ext2fs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/newfs/newfs.8 diff -u src/sbin/newfs/newfs.8:1.84 src/sbin/newfs/newfs.8:1.85 --- src/sbin/newfs/newfs.8:1.84 Mon Jul 3 21:33:42 2017 +++ src/sbin/newfs/newfs.8 Sat Apr 13 19:29:27 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: newfs.8,v 1.84 2017/07/03 21:33:42 wiz Exp $ +.\" $NetBSD: newfs.8,v 1.85 2019/04/13 19:29:27 maya Exp $ .\" .\" Copyright (c) 1983, 1987, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 .\" -.Dd June 30, 2012 +.Dd April 13, 2019 .Dt NEWFS 8 .Os .Sh NAME @@ -319,10 +319,6 @@ with the given volume name. .It Fl Z Pre-zeros the file system image created with .Fl F . -This is necessary if the image is to be used by -.Xr vnd 4 -(which doesn't support file systems with -.Sq holes ) . .El .Pp The following option overrides the standard sizes for the disk geometry. Index: src/sbin/newfs_ext2fs/newfs_ext2fs.8 diff -u src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.13 src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.14 --- src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.13 Wed Mar 6 05:11:13 2019 +++ src/sbin/newfs_ext2fs/newfs_ext2fs.8 Sat Apr 13 19:29:27 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: newfs_ext2fs.8,v 1.13 2019/03/06 05:11:13 mrg Exp $ +.\" $NetBSD: newfs_ext2fs.8,v 1.14 2019/04/13 19:29:27 maya Exp $ .\" .\" Copyright (c) 1983, 1987, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 .\" -.Dd March 5, 2019 +.Dd April 13, 2019 .Dt NEWFS_EXT2FS 8 .Os .Sh NAME @@ -208,10 +208,6 @@ This specifies a volume name for the fil .It Fl Z Pre-zeros the file system image created with .Fl F . -This is necessary if the image is to be used by -.Xr vnd 4 -(which doesn't support file systems with -.Sq holes ) . .El .Pp The following option overrides the standard sizes for the disk geometry.
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Sat Apr 13 19:15:25 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: cpu_fdt.c
Log Message:
If an enable-method property is present on the cpu node and not supported
by the kernel, try to use the enable-method from the cpus node instead.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/fdt/cpu_fdt.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/fdt/cpu_fdt.c
diff -u src/sys/arch/arm/fdt/cpu_fdt.c:1.24 src/sys/arch/arm/fdt/cpu_fdt.c:1.25
--- src/sys/arch/arm/fdt/cpu_fdt.c:1.24 Sat Apr 13 17:34:38 2019
+++ src/sys/arch/arm/fdt/cpu_fdt.c Sat Apr 13 19:15:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.24 2019/04/13 17:34:38 jmcneill Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.25 2019/04/13 19:15:25 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -30,7 +30,7 @@
#include "psci_fdt.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.24 2019/04/13 17:34:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.25 2019/04/13 19:15:25 jmcneill Exp $");
#include
#include
@@ -234,16 +234,29 @@ arm_fdt_cpu_bootstrap(void)
}
#ifdef MULTIPROCESSOR
-static int
-arm_fdt_cpu_enable(int phandle, const char *method)
+static struct arm_cpu_method *
+arm_fdt_cpu_enable_method(int phandle)
{
+ const char *method;
+
+ method = fdtbus_get_string(phandle, "enable-method");
+ if (method == NULL)
+ return NULL;
+
__link_set_decl(arm_cpu_methods, struct arm_cpu_method);
- struct arm_cpu_method * const *acm;
- __link_set_foreach(acm, arm_cpu_methods) {
- if (strcmp(method, (*acm)->acm_compat) == 0)
- return (*acm)->acm_enable(phandle);
+ struct arm_cpu_method * const *acmp;
+ __link_set_foreach(acmp, arm_cpu_methods) {
+ if (strcmp(method, (*acmp)->acm_compat) == 0)
+ return *acmp;
}
- return ENOSYS;
+
+ return NULL;
+}
+
+static int
+arm_fdt_cpu_enable(int phandle, struct arm_cpu_method *acm)
+{
+ return acm->acm_enable(phandle);
}
#endif
@@ -255,7 +268,7 @@ arm_fdt_cpu_mpstart(void)
uint64_t mpidr, bp_mpidr;
u_int cpuindex, i;
int child, error;
- const char *method;
+ struct arm_cpu_method *acm;
const int cpus = OF_finddevice("/cpus");
if (cpus == -1) {
@@ -278,15 +291,15 @@ arm_fdt_cpu_mpstart(void)
if (mpidr == bp_mpidr)
continue; /* BP already started */
- method = fdtbus_get_string(child, "enable-method");
- if (method == NULL)
- method = fdtbus_get_string(cpus, "enable-method");
- if (method == NULL)
+ acm = arm_fdt_cpu_enable_method(child);
+ if (acm == NULL)
+ acm = arm_fdt_cpu_enable_method(cpus);
+ if (acm == NULL)
continue;
- error = arm_fdt_cpu_enable(child, method);
+ error = arm_fdt_cpu_enable(child, acm);
if (error != 0) {
- aprint_error("%s: %s: unsupported enable-method\n", __func__, method);
+ aprint_error("%s: failed to enable CPU %#" PRIx64 "\n", __func__, mpidr);
continue;
}
CVS commit: src/external/gpl3/gdb/dist/gdb/config/arm
Module Name:src Committed By: christos Date: Sat Apr 13 18:04:23 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb/config/arm: nbsdelf.mh Log Message: add missing files To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/config/arm/nbsdelf.mh 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/gdb/dist/gdb/config/arm/nbsdelf.mh diff -u src/external/gpl3/gdb/dist/gdb/config/arm/nbsdelf.mh:1.7 src/external/gpl3/gdb/dist/gdb/config/arm/nbsdelf.mh:1.8 --- src/external/gpl3/gdb/dist/gdb/config/arm/nbsdelf.mh:1.7 Thu Nov 30 10:26:55 2017 +++ src/external/gpl3/gdb/dist/gdb/config/arm/nbsdelf.mh Sat Apr 13 14:04:23 2019 @@ -1,4 +1,5 @@ # Host: NetBSD/arm -NATDEPFILES= fork-child.o inf-ptrace.o nbsd-nat.o arm-nbsd-nat.o bsd-kvm.o +NATDEPFILES= fork-child.o inf-ptrace.o nbsd-nat.o arm-nbsd-nat.o bsd-kvm.o \ +arm-bsd-tdep.o arm-nbsd-tdep.o LOADLIBES= -lkvm
CVS commit: src/external/gpl3/gdb/lib
Module Name:src
Committed By: christos
Date: Sat Apr 13 18:04:04 UTC 2019
Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/arm: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/arm: gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/arm: defs.mk version.c
src/external/gpl3/gdb/lib/libgdb/arch/arm/build-gnulib: config.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd_stdint.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libbfd/arch/arm/targmatch.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gdb/lib/libdecnumber/arch/arm/gstdint.h
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/lib/libgdb/arch/arm/defs.mk
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/lib/libgdb/arch/arm/version.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libgdb/arch/arm/build-gnulib/config.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/gdb/lib/libbfd/arch/arm/bfd_stdint.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd_stdint.h:1.10 src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd_stdint.h:1.11
--- src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd_stdint.h:1.10 Wed Nov 29 13:15:29 2017
+++ src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd_stdint.h Sat Apr 13 14:04:04 2019
@@ -1,8 +1,8 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp */
-/* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp */
+/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
-/* generated for armv6--netbsdelf-eabi-gcc (NetBSD nb1 20160606) 5.4.0 */
+/* generated for armv7--netbsdelf-eabihf-gcc (NetBSD nb3 20190319) 7.4.0 */
#ifndef GCC_GENERATED_STDINT_H
#define GCC_GENERATED_STDINT_H 1
Index: src/external/gpl3/gdb/lib/libbfd/arch/arm/targmatch.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/arm/targmatch.h:1.9 src/external/gpl3/gdb/lib/libbfd/arch/arm/targmatch.h:1.10
--- src/external/gpl3/gdb/lib/libbfd/arch/arm/targmatch.h:1.9 Wed Nov 29 13:15:29 2017
+++ src/external/gpl3/gdb/lib/libbfd/arch/arm/targmatch.h Sat Apr 13 14:04:04 2019
@@ -1,6 +1,6 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp */
-/* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp */
+/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
#ifdef BFD64
#if !defined (SELECT_VECS) || defined (HAVE_aarch64_mach_o_vec)
@@ -42,6 +42,15 @@
#if !defined (SELECT_VECS) || defined (HAVE_aarch64_elf64_le_vec)
+{ "aarch64-*-netbsd*",
+_elf64_le_vec },
+#endif
+
+
+
+
+#if !defined (SELECT_VECS) || defined (HAVE_aarch64_elf64_le_vec)
+
{ "aarch64-*-fuchsia*",
_elf64_le_vec },
#endif
Index: src/external/gpl3/gdb/lib/libdecnumber/arch/arm/gstdint.h
diff -u src/external/gpl3/gdb/lib/libdecnumber/arch/arm/gstdint.h:1.10 src/external/gpl3/gdb/lib/libdecnumber/arch/arm/gstdint.h:1.11
--- src/external/gpl3/gdb/lib/libdecnumber/arch/arm/gstdint.h:1.10 Wed Nov 29 13:15:31 2017
+++ src/external/gpl3/gdb/lib/libdecnumber/arch/arm/gstdint.h Sat Apr 13 14:04:04 2019
@@ -1,8 +1,8 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp */
-/* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp */
+/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
-/* generated for armv6--netbsdelf-eabi-gcc (NetBSD nb1 20160606) 5.4.0 */
+/* generated for armv7--netbsdelf-eabihf-gcc (NetBSD nb3 20190319) 7.4.0 */
#ifndef GCC_GENERATED_STDINT_H
#define GCC_GENERATED_STDINT_H 1
Index: src/external/gpl3/gdb/lib/libgdb/arch/arm/defs.mk
diff -u src/external/gpl3/gdb/lib/libgdb/arch/arm/defs.mk:1.14 src/external/gpl3/gdb/lib/libgdb/arch/arm/defs.mk:1.15
--- src/external/gpl3/gdb/lib/libgdb/arch/arm/defs.mk:1.14 Thu Nov 30 10:26:55 2017
+++ src/external/gpl3/gdb/lib/libgdb/arch/arm/defs.mk Sat Apr 13 14:04:04 2019
@@ -1,7 +1,7 @@
# This file is automatically generated. DO NOT EDIT!
# Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp
-# Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp
+# Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp
#
G_INTERNAL_CFLAGS= -I. -I${GNUHOSTDIST}/gdb -I${GNUHOSTDIST}/gdb/common -I${GNUHOSTDIST}/gdb/config -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H -I${GNUHOSTDIST}/gdb/../include/opcode -I${GNUHOSTDIST}/gdb/../opcodes/.. -I${GNUHOSTDIST}/gdb/../readline/.. -I${GNUHOSTDIST}/gdb/../zlib -I../bfd -I${GNUHOSTDIST}/gdb/../bfd
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Sat Apr 13 18:02:37 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: arm-nbsd-nat.c
Log Message:
fix typo, unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.6
--- src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.5 Wed Jan 24 04:04:42 2018
+++ src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c Sat Apr 13 14:02:37 2019
@@ -303,7 +303,6 @@ fetch_fp_regs (struct regcache *regcache
{
struct fpreg inferior_fp_registers;
int ret;
- int regno;
ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
(PTRACE_TYPE_ARG3) _fp_registers, ptid_get_lwp(inferior_ptid));
@@ -599,7 +598,7 @@ fetch_elfcore_registers (struct regcache
static struct core_fns arm_netbsd_core_fns =
{
- bfd_target_unknown_flavour, /* core_flovour. */
+ bfd_target_unknown_flavour, /* core_flavour. */
default_check_format, /* check_format. */
default_core_sniffer, /* core_sniffer. */
fetch_core_registers, /* core_read_registers. */
@@ -608,7 +607,7 @@ static struct core_fns arm_netbsd_core_f
static struct core_fns arm_netbsd_elfcore_fns =
{
- bfd_target_elf_flavour, /* core_flovour. */
+ bfd_target_elf_flavour, /* core_flavour. */
default_check_format, /* check_format. */
default_core_sniffer, /* core_sniffer. */
fetch_elfcore_registers, /* core_read_registers. */
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Sat Apr 13 18:02:06 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: arm-bsd-tdep.c
Log Message:
fix core stack traces (missing register 25)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/gdb/arm-bsd-tdep.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/gdb/dist/gdb/arm-bsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-bsd-tdep.c:1.1.1.1 src/external/gpl3/gdb/dist/gdb/arm-bsd-tdep.c:1.2
--- src/external/gpl3/gdb/dist/gdb/arm-bsd-tdep.c:1.1.1.1 Tue Nov 28 13:18:09 2017
+++ src/external/gpl3/gdb/dist/gdb/arm-bsd-tdep.c Sat Apr 13 14:02:05 2019
@@ -83,7 +83,7 @@ armbsd_supply_gregset (const struct regs
}
if (regnum == ARM_PS_REGNUM || regnum == -1)
-regcache_raw_supply (regcache, i, regs + 16 * 4);
+regcache_raw_supply (regcache, ARM_PS_REGNUM, regs + 16 * 4);
if (len >= ARMBSD_SIZEOF_GREGS + ARMBSD_SIZEOF_FPREGS)
{
CVS commit: src/lib/libc/arch/riscv/gen
Module Name:src Committed By: maya Date: Sat Apr 13 17:54:13 UTC 2019 Modified Files: src/lib/libc/arch/riscv/gen: Makefile.inc Log Message: build the generic 128bit long double code. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/riscv/gen/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/riscv/gen/Makefile.inc diff -u src/lib/libc/arch/riscv/gen/Makefile.inc:1.1 src/lib/libc/arch/riscv/gen/Makefile.inc:1.2 --- src/lib/libc/arch/riscv/gen/Makefile.inc:1.1 Fri Sep 19 17:36:25 2014 +++ src/lib/libc/arch/riscv/gen/Makefile.inc Sat Apr 13 17:54:13 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $ +# $NetBSD: Makefile.inc,v 1.2 2019/04/13 17:54:13 maya Exp $ SRCS+= __setjmp14.S __sigsetjmp14.S _setjmp.S SRCS+= bswap16.c bswap32.c bswap64.c @@ -6,12 +6,12 @@ SRCS+= flt_rounds.c SRCS+= _lwp.c makecontext.c resumecontext.c swapcontext.S # Common ieee754 constants and functions -SRCS+= infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c -SRCS+= fpclassifyf_ieee754.c fpclassifyd_ieee754.c -SRCS+= isinff_ieee754.c isinfd_ieee754.c -SRCS+= isnanf_ieee754.c isnand_ieee754.c -SRCS+= isfinitef_ieee754.c isfinited_ieee754.c -SRCS+= signbitf_ieee754.c signbitd_ieee754.c +SRCS+= infinityf_ieee754.c infinity_ieee754.c infinityl_ieee754.c +SRCS+= fpclassifyf_ieee754.c fpclassifyd_ieee754.c fpclassifyl_ieee754.c +SRCS+= isinff_ieee754.c isinfd_ieee754.c isinfl_ieee754.c +SRCS+= isnanf_ieee754.c isnand_ieee754.c isnanl_ieee754.c +SRCS+= isfinitef_ieee754.c isfinited_ieee754.c isfinitel_ieee754.c +SRCS+= signbitf_ieee754.c signbitd_ieee754.c signbitl_ieee754.c SRCS+= fabs_ieee754.c SRCS+= nanf.c
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Sat Apr 13 17:34:38 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: cpu_fdt.c
Log Message:
Fix build w/o PSCI
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/fdt/cpu_fdt.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/fdt/cpu_fdt.c
diff -u src/sys/arch/arm/fdt/cpu_fdt.c:1.23 src/sys/arch/arm/fdt/cpu_fdt.c:1.24
--- src/sys/arch/arm/fdt/cpu_fdt.c:1.23 Sat Apr 13 17:21:49 2019
+++ src/sys/arch/arm/fdt/cpu_fdt.c Sat Apr 13 17:34:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.23 2019/04/13 17:21:49 jmcneill Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.24 2019/04/13 17:34:38 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -30,7 +30,7 @@
#include "psci_fdt.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.23 2019/04/13 17:21:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.24 2019/04/13 17:34:38 jmcneill Exp $");
#include
#include
@@ -153,7 +153,7 @@ cpu_fdt_attach(device_t parent, device_t
config_found(self, faa, NULL);
}
-#ifdef MULTIPROCESSOR
+#if defined(MULTIPROCESSOR) && (NPSCI_FDT > 0 || defined(__aarch64__))
static register_t
cpu_fdt_mpstart_pa(void)
{
@@ -165,7 +165,9 @@ cpu_fdt_mpstart_pa(void)
return pa;
}
+#endif
+#ifdef MULTIPROCESSOR
static bool
arm_fdt_cpu_okay(const int child)
{
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Sat Apr 13 17:21:49 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: cpu_fdt.c
Log Message:
The spin-table CPU enable method is only valid for 64-bit kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/fdt/cpu_fdt.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/fdt/cpu_fdt.c
diff -u src/sys/arch/arm/fdt/cpu_fdt.c:1.22 src/sys/arch/arm/fdt/cpu_fdt.c:1.23
--- src/sys/arch/arm/fdt/cpu_fdt.c:1.22 Thu Jan 31 13:06:10 2019
+++ src/sys/arch/arm/fdt/cpu_fdt.c Sat Apr 13 17:21:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.22 2019/01/31 13:06:10 skrll Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.23 2019/04/13 17:21:49 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -30,7 +30,7 @@
#include "psci_fdt.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.22 2019/01/31 13:06:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.23 2019/04/13 17:21:49 jmcneill Exp $");
#include
#include
@@ -166,33 +166,6 @@ cpu_fdt_mpstart_pa(void)
return pa;
}
-static int
-spintable_cpu_on(u_int cpuindex, paddr_t entry_point_address, paddr_t cpu_release_addr)
-{
- /*
- * we need devmap for cpu-release-addr in advance.
- * __HAVE_MM_MD_DIRECT_MAPPED_PHYS nor pmap didn't work at this point.
- */
- if (pmap_devmap_find_pa(cpu_release_addr, sizeof(paddr_t)) == NULL) {
- aprint_error("%s: devmap for cpu-release-addr"
- " 0x%08"PRIxPADDR" required\n", __func__, cpu_release_addr);
- return -1;
- } else {
- extern struct bus_space arm_generic_bs_tag;
- bus_space_handle_t ioh;
-
- bus_space_map(_generic_bs_tag, cpu_release_addr,
- sizeof(paddr_t), 0, );
- bus_space_write_4(_generic_bs_tag, ioh, 0,
- entry_point_address);
- bus_space_unmap(_generic_bs_tag, ioh, sizeof(paddr_t));
- }
-
- return 0;
-}
-#endif /* MULTIPROCESSOR */
-
-#ifdef MULTIPROCESSOR
static bool
arm_fdt_cpu_okay(const int child)
{
@@ -369,7 +342,32 @@ cpu_enable_psci(int phandle)
ARM_CPU_METHOD(psci, "psci", cpu_enable_psci);
#endif
-#if defined(MULTIPROCESSOR)
+#if defined(MULTIPROCESSOR) && defined(__aarch64__)
+static int
+spintable_cpu_on(u_int cpuindex, paddr_t entry_point_address, paddr_t cpu_release_addr)
+{
+ /*
+ * we need devmap for cpu-release-addr in advance.
+ * __HAVE_MM_MD_DIRECT_MAPPED_PHYS nor pmap didn't work at this point.
+ */
+ if (pmap_devmap_find_pa(cpu_release_addr, sizeof(paddr_t)) == NULL) {
+ aprint_error("%s: devmap for cpu-release-addr"
+ " 0x%08"PRIxPADDR" required\n", __func__, cpu_release_addr);
+ return -1;
+ } else {
+ extern struct bus_space arm_generic_bs_tag;
+ bus_space_handle_t ioh;
+
+ bus_space_map(_generic_bs_tag, cpu_release_addr,
+ sizeof(paddr_t), 0, );
+ bus_space_write_4(_generic_bs_tag, ioh, 0,
+ entry_point_address);
+ bus_space_unmap(_generic_bs_tag, ioh, sizeof(paddr_t));
+ }
+
+ return 0;
+}
+
static int
cpu_enable_spin_table(int phandle)
{
CVS commit: src/lib/libm/arch/riscv
Module Name:src Committed By: maya Date: Sat Apr 13 17:18:26 UTC 2019 Modified Files: src/lib/libm/arch/riscv: s_copysign.S Log Message: Don't alias the long double version to the double version. We now have 128bit long double (by the upstream GCC changing things) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libm/arch/riscv/s_copysign.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/libm/arch/riscv/s_copysign.S diff -u src/lib/libm/arch/riscv/s_copysign.S:1.4 src/lib/libm/arch/riscv/s_copysign.S:1.5 --- src/lib/libm/arch/riscv/s_copysign.S:1.4 Fri Mar 27 23:35:40 2015 +++ src/lib/libm/arch/riscv/s_copysign.S Sat Apr 13 17:18:26 2019 @@ -1,12 +1,9 @@ -/* $NetBSD: s_copysign.S,v 1.4 2015/03/27 23:35:40 matt Exp $ */ +/* $NetBSD: s_copysign.S,v 1.5 2019/04/13 17:18:26 maya Exp $ */ /* The contents of this file are in the public domain. */ #include -STRONG_ALIAS(_copysignl, copysign) -WEAK_ALIAS(copysignl, _copysignl) - ENTRY(copysign) fsgnj.d fa0, fa0, fa1 ret
CVS commit: src/lib/libc/arch/riscv
Module Name:src
Committed By: maya
Date: Sat Apr 13 16:08:54 UTC 2019
Modified Files:
src/lib/libc/arch/riscv: SYS.h
Log Message:
Looks like libc is too big to be able to use j. use a longer distance jump
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/riscv/SYS.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/riscv/SYS.h
diff -u src/lib/libc/arch/riscv/SYS.h:1.2 src/lib/libc/arch/riscv/SYS.h:1.3
--- src/lib/libc/arch/riscv/SYS.h:1.2 Fri Mar 27 06:44:28 2015
+++ src/lib/libc/arch/riscv/SYS.h Sat Apr 13 16:08:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: SYS.h,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/* $NetBSD: SYS.h,v 1.3 2019/04/13 16:08:54 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include
#define SYSTRAP(x) li t6,SYS_ ## x; scall
-#define JUMP_TO_CERROR() j _C_LABEL(__cerror)
+#define JUMP_TO_CERROR() tail _C_LABEL(__cerror)
/*
* Do a syscall that cannot fail (sync, get{p,u,g,eu,eg)id)
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: maya Date: Sat Apr 13 15:57:31 UTC 2019 Modified Files: src/sys/arch/riscv/include: ieee.h math.h Log Message: Our current configuration is that long double is 128bit, so reflect that in the relevant headers. Taken from sparc64. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/ieee.h \ src/sys/arch/riscv/include/math.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/riscv/include/ieee.h diff -u src/sys/arch/riscv/include/ieee.h:1.1 src/sys/arch/riscv/include/ieee.h:1.2 --- src/sys/arch/riscv/include/ieee.h:1.1 Fri Sep 19 17:36:26 2014 +++ src/sys/arch/riscv/include/ieee.h Sat Apr 13 15:57:31 2019 @@ -1,3 +1,4 @@ -/* $NetBSD: ieee.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */ +/* $NetBSD: ieee.h,v 1.2 2019/04/13 15:57:31 maya Exp $ */ +#include /* for #define __HAVE_LONG_DOUBLE 128 */ #include Index: src/sys/arch/riscv/include/math.h diff -u src/sys/arch/riscv/include/math.h:1.1 src/sys/arch/riscv/include/math.h:1.2 --- src/sys/arch/riscv/include/math.h:1.1 Fri Sep 19 17:36:26 2014 +++ src/sys/arch/riscv/include/math.h Sat Apr 13 15:57:31 2019 @@ -1,3 +1,7 @@ -/* $NetBSD: math.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */ +/* $NetBSD: math.h,v 1.2 2019/04/13 15:57:31 maya Exp $ */ #define __HAVE_NANF + +#if defined(_LP64) || defined(_KERNEL) +#define __HAVE_LONG_DOUBLE 128 +#endif
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: maya Date: Sat Apr 13 15:56:18 UTC 2019 Modified Files: src/sys/arch/riscv/include: int_fmtio.h Log Message: Provide defines for the 64bit case. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/int_fmtio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/riscv/include/int_fmtio.h diff -u src/sys/arch/riscv/include/int_fmtio.h:1.1 src/sys/arch/riscv/include/int_fmtio.h:1.2 --- src/sys/arch/riscv/include/int_fmtio.h:1.1 Fri Sep 19 17:36:26 2014 +++ src/sys/arch/riscv/include/int_fmtio.h Sat Apr 13 15:56:18 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.2 2019/04/13 15:56:18 maya Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -43,31 +43,57 @@ #define PRId8 "hhd" /* int8_t */ #define PRId16 "hd" /* int16_t */ #define PRId32 "d" /* int32_t */ +#ifdef _LP64 +#define PRId64 "ld" /* int64_t */ +#else #define PRId64 "lld" /* int64_t */ +#endif #define PRIdLEAST8 "hhd" /* int_least8_t */ #define PRIdLEAST16 "hd" /* int_least16_t */ #define PRIdLEAST32 "d" /* int_least32_t */ +#ifdef _LP64 +#define PRIdLEAST64 "ld" /* int_least64_t */ +#else #define PRIdLEAST64 "lld" /* int_least64_t */ +#endif #define PRIdFAST8 "hhd" /* int_fast8_t */ #define PRIdFAST16 "hd" /* int_fast16_t */ #define PRIdFAST32 "d" /* int_fast32_t */ +#ifdef _LP64 +#define PRIdFAST64 "ld" /* int_fast64_t */ +#define PRIdMAX "ld" /* intmax_t */ +#else #define PRIdFAST64 "lld" /* int_fast64_t */ #define PRIdMAX "lld" /* intmax_t */ +#endif #define PRIdPTR "ld" /* intptr_t */ #define PRIi8 "hhi" /* int8_t */ #define PRIi16 "hi" /* int16_t */ #define PRIi32 "i" /* int32_t */ +#ifdef _LP64 +#define PRIi64 "li" /* int64_t */ +#else #define PRIi64 "lli" /* int64_t */ +#endif #define PRIiLEAST8 "hhi" /* int_least8_t */ #define PRIiLEAST16 "hi" /* int_least16_t */ #define PRIiLEAST32 "i" /* int_least32_t */ +#ifdef _LP64 +#define PRIiLEAST64 "li" /* int_least64_t */ +#else #define PRIiLEAST64 "lli" /* int_least64_t */ +#endif #define PRIiFAST8 "hhi" /* int_fast8_t */ #define PRIiFAST16 "hi" /* int_fast16_t */ #define PRIiFAST32 "i" /* int_fast32_t */ +#ifdef _LP64 +#define PRIiFAST64 "li" /* int_fast64_t */ +#define PRIiMAX "li" /* intmax_t */ +#else #define PRIiFAST64 "lli" /* int_fast64_t */ #define PRIiMAX "lli" /* intmax_t */ +#endif #define PRIiPTR "li" /* intptr_t */ /* fprintf macros for unsigned integers */ @@ -79,57 +105,105 @@ #define PRIoLEAST8 "o" /* uint_least8_t */ #define PRIoLEAST16 "hho" /* uint_least16_t */ #define PRIoLEAST32 "ho" /* uint_least32_t */ +#ifdef _LP64 +#define PRIoLEAST64 "lo" /* uint_least64_t */ +#else #define PRIoLEAST64 "llo" /* uint_least64_t */ +#endif #define PRIoFAST8 "hho" /* uint_fast8_t */ #define PRIoFAST16 "ho" /* uint_fast16_t */ #define PRIoFAST32 "o" /* uint_fast32_t */ +#ifdef _LP64 +#define PRIoFAST64 "lo" /* uint_fast64_t */ +#define PRIoMAX "lo" /* uintmax_t */ +#else #define PRIoFAST64 "llo" /* uint_fast64_t */ #define PRIoMAX "llo" /* uintmax_t */ +#endif #define PRIoPTR "lo" /* uintptr_t */ #define PRIu8 "hhu" /* uint8_t */ #define PRIu16 "hu" /* uint16_t */ #define PRIu32 "u" /* uint32_t */ +#ifdef _LP64 +#define PRIu64 "lu" /* uint64_t */ +#else #define PRIu64 "llu" /* uint64_t */ +#endif #define PRIuLEAST8 "hhu" /* uint_least8_t */ #define PRIuLEAST16 "hu" /* uint_least16_t */ #define PRIuLEAST32 "u" /* uint_least32_t */ +#ifdef _LP64 +#define PRIuLEAST64 "lu" /* uint_least64_t */ +#else #define PRIuLEAST64 "llu" /* uint_least64_t */ +#endif #define PRIuFAST8 "hhu" /* uint_fast8_t */ #define PRIuFAST16 "hu" /* uint_fast16_t */ #define PRIuFAST32 "u" /* uint_fast32_t */ +#ifdef _LP64 +#define PRIuFAST64 "lu" /* uint_fast64_t */ +#define PRIuMAX "lu" /* uintmax_t */ +#else #define PRIuFAST64 "llu" /* uint_fast64_t */ #define PRIuMAX "llu" /* uintmax_t */ +#endif #define PRIuPTR "lu" /* uintptr_t */ #define PRIx8 "hhx" /* uint8_t */ #define PRIx16 "hx" /* uint16_t */ #define PRIx32 "x" /* uint32_t */ +#ifdef _LP64 +#define PRIx64 "lx" /* uint64_t */ +#else #define PRIx64 "llx" /* uint64_t */ +#endif #define PRIxLEAST8 "x" /* uint_least8_t */ #define PRIxLEAST16 "x" /* uint_least16_t */ #define PRIxLEAST32 "x" /* uint_least32_t */ +#ifdef _LP64 +#define PRIxLEAST64 "lx" /* uint_least64_t */ +#else #define PRIxLEAST64 "llx" /* uint_least64_t */ +#endif #define PRIxFAST8 "x" /* uint_fast8_t */ #define PRIxFAST16 "x" /* uint_fast16_t */ #define PRIxFAST32 "x" /* uint_fast32_t */ +#ifdef _LP64 +#define PRIxFAST64 "lx" /* uint_fast64_t */ +#define PRIxMAX "lx" /* uintmax_t */ +#else #define PRIxFAST64 "llx" /* uint_fast64_t */ #define PRIxMAX "llx" /* uintmax_t */
CVS commit: src/external/gpl3/gcc/dist/gcc/config/riscv
Module Name:src
Committed By: maya
Date: Sat Apr 13 15:53:32 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/riscv: netbsd.h
Log Message:
use NETBSD_LINK_SPEC_ELF rather than netbsd_link_spec.
My current guess as to why it makes a difference is that riscv, unlike other
targets, doesn't use the macro SUBTARGET_EXTRA_SPECS for anything meaningful
Fixes linking libgcc_s.so, which is now emitted as a dynamic library, not
a static object (which fails, as it has undefined references)
XXX there might be a better way of doing this
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.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/riscv/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.6 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.7
--- src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.6 Sun Feb 10 07:56:21 2019
+++ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Sat Apr 13 15:53:32 2019
@@ -57,8 +57,8 @@ Boston, MA 02111-1307, USA. */
#undef LINK_SPEC
#define LINK_SPEC \
"%{m64:-m elf64lriscv} \
- %{m32:-m elf32lriscv} \
- %(netbsd_link_spec)"
+ %{m32:-m elf32lriscv}" \
+ NETBSD_LINK_SPEC_ELF
#undef NETBSD_ENTRY_POINT
#define NETBSD_ENTRY_POINT "_start"
CVS commit: src/external/gpl3/gcc/lib/libgcc/arch/riscv64
Module Name:src
Committed By: maya
Date: Sat Apr 13 15:54:07 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libgcc/arch/riscv64: defs.mk
Log Message:
Fake mknative. enough to build libc, with other changes pending
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.3 src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.4
--- src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.3 Sun Feb 10 07:57:22 2019
+++ src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk Sat Apr 13 15:54:07 2019
@@ -3,8 +3,8 @@
# Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp
#
G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include
-G_INTERNAL_CFLAGS=-g -O2 -O2 -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector -fPIC -I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include -DHAVE_CC_TLS
-G_LIB2ADD= enable-execute-stack.c
+G_INTERNAL_CFLAGS=-g -O2 -O2 -I${GNUHOSTDIST}/libgcc/../gcc/config/riscv -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector -fPIC -I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include -DHAVE_CC_TLS
+G_LIB2ADD= ${GNUHOSTDIST}/libgcc/soft-fp/addtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/divtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/eqtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/getf2.c ${GNUHOSTDIST}/libgcc/soft-fp/letf2.c ${GNUHOSTDIST}/libgcc/soft-fp/multf3.c ${GNUHOSTDIST}/libgcc/soft-fp/negtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/subtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/unordtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfdi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfdi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatditf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunditf.c ${GNUHOSTDIST}/libgcc/soft-fp/extendsftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/extenddftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfsf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfdf2.c enable-execute-stack.c
G_LIB2ADDEH=${GNUHOSTDIST}/libgcc/unwind-dw2.c ${GNUHOSTDIST}/libgcc/unwind-dw2-fde-dip.c ${GNUHOSTDIST}/libgcc/unwind-sjlj.c ${GNUHOSTDIST}/libgcc/unwind-c.c ${GNUHOSTDIST}/libgcc/emutls.c
G_LIB2ADD_ST=
G_LIB1ASMFUNCS=
@@ -12,7 +12,7 @@ G_LIB1ASMSRC=
G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _divmoddi4 _udivdi3 _umoddi3 _udivmoddi4 _udiv_w_sdiv
G_LIB2FUNCS_ST=_eprintf __gcc_bcmp
G_LIB2FUNCS_EXTRA=
-G_LIBGCC2_CFLAGS=-O2 -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector
+G_LIBGCC2_CFLAGS=-O2 -I${GNUHOSTDIST}/libgcc/config/riscv -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector
G_SHLIB_MKMAP=${GNUHOSTDIST}/libgcc/mkmap-symver.awk
G_SHLIB_MKMAP_OPTS=
G_SHLIB_MAPFILES=libgcc-std.ver
CVS commit: src/usr.bin/xlint/xlint
Module Name:src
Committed By: christos
Date: Sat Apr 13 15:08:49 UTC 2019
Modified Files:
src/usr.bin/xlint/xlint: xlint.c
Log Message:
Undefine SSE stuff; we don't want portable code to depend on it and we
don't provide the necessary headers.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/xlint/xlint/xlint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/xlint/xlint.c
diff -u src/usr.bin/xlint/xlint/xlint.c:1.46 src/usr.bin/xlint/xlint/xlint.c:1.47
--- src/usr.bin/xlint/xlint/xlint.c:1.46 Sat Dec 24 12:43:45 2016
+++ src/usr.bin/xlint/xlint/xlint.c Sat Apr 13 11:08:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.46 2016/12/24 17:43:45 christos Exp $ */
+/* $NetBSD: xlint.c,v 1.47 2019/04/13 15:08:49 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: xlint.c,v 1.46 2016/12/24 17:43:45 christos Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.47 2019/04/13 15:08:49 christos Exp $");
#endif
#include
@@ -350,6 +350,8 @@ main(int argc, char *argv[])
#else
appcstrg(, "-U__GNUC__");
appcstrg(, "-U__PCC__");
+ appcstrg(, "-U__SSE__");
+ appcstrg(, "-U__SSE4_1__");
#endif
#if 0
appcstrg(, "-Wp,-$");
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: maya Date: Sat Apr 13 12:41:37 UTC 2019 Modified Files: src/sys/arch/riscv/include: asm.h Log Message: Handle changes since the gcc riscv toolchain was upstreamed To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/riscv/include/asm.h diff -u src/sys/arch/riscv/include/asm.h:1.2 src/sys/arch/riscv/include/asm.h:1.3 --- src/sys/arch/riscv/include/asm.h:1.2 Fri Mar 27 06:57:21 2015 +++ src/sys/arch/riscv/include/asm.h Sat Apr 13 12:41:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.2 2015/03/27 06:57:21 matt Exp $ */ +/* $NetBSD: asm.h,v 1.3 2019/04/13 12:41:36 maya Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ #endif #ifdef __PIC__ -#define PLT(x) x##@ +#define PLT(x) x##@plt #else #define PLT(x) x #endif
CVS commit: src
Module Name:src
Committed By: jmcneill
Date: Sat Apr 13 10:58:11 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
src/sys/arch/evbarm/conf: GENERIC
Log Message:
Remove sun50i support from 32-bit GENERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.32 src/distrib/utils/embedded/conf/armv7.conf:1.33
--- src/distrib/utils/embedded/conf/armv7.conf:1.32 Sat Mar 30 13:43:52 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Sat Apr 13 10:58:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.32 2019/03/30 13:43:52 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.33 2019/04/13 10:58:11 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -118,9 +118,7 @@ EOF
}
populate_sunxi() {
- # U-Boot expects 64-bit DTB files to live in an allwinner/ subdirectory
- mkdir -p "${mnt}/boot/allwinner"
- mv "${mnt}"/boot/sun50i-* "${mnt}/boot/allwinner/"
+ :
}
populate_tegra() {
Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.29 src/sys/arch/evbarm/conf/GENERIC:1.30
--- src/sys/arch/evbarm/conf/GENERIC:1.29 Sun Apr 7 13:50:29 2019
+++ src/sys/arch/evbarm/conf/GENERIC Sat Apr 13 10:58:11 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.29 2019/04/07 13:50:29 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.30 2019/04/13 10:58:11 jmcneill Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -136,24 +136,6 @@ makeoptions DTS="
sun9i-a80-cubieboard4.dts
sun9i-a80-optimus.dts
- sun50i-a64-bananapi-m64.dts
- sun50i-a64-nanopi-a64.dts
- sun50i-a64-olinuxino.dts
- sun50i-a64-orangepi-win.dts
- sun50i-a64-pine64-plus.dts
- sun50i-a64-pine64.dts
- sun50i-a64-pinebook.dts
- sun50i-a64-sopine-baseboard.dts
- sun50i-a64-teres-i.dts
-
- sun50i-h5-libretech-all-h3-cc.dts
- sun50i-h5-nanopi-neo-plus2.dts
- sun50i-h5-nanopi-neo2.dts
- sun50i-h5-orangepi-pc2.dts
- sun50i-h5-orangepi-prime.dts
- sun50i-h5-orangepi-zero-plus.dts
- sun50i-h5-orangepi-zero-plus2.dts
-
tegra124-apalis-eval.dts
tegra124-apalis-v1.2-eval.dts
tegra124-jetson-tk1.dts
@@ -188,9 +170,6 @@ options SOC_SUN7I_A20
options SOC_SUN8I_A83T
options SOC_SUN8I_H3
options SOC_SUN9I_A80
-options SOC_SUN50I_A64
-options SOC_SUN50I_H5
-options SOC_SUN50I_H6
options SOC_TEGRA124
@@ -267,10 +246,6 @@ sun8ia83tccu* at fdt? pass 2 # Allwinne
sun8ih3ccu* at fdt? pass 2 # Allwinner H3 CCU
sun8ih3rccu* at fdt? pass 2 # Allwinner H3 CCU (PRCM)
sun9ia80ccu* at fdt? pass 2 # Allwinner A80 CCU
-sun50ia64ccu* at fdt? pass 2 # Allwinner A64 CCU
-sun50ia64rccu* at fdt? pass 2 # Allwinner A64 CCU (PRCM)
-sun50ih6ccu*at fdt? pass 2 # Allwinner H6 CCU
-sun50ih6rccu* at fdt? pass 2 # Allwinner H6 CCU (PRCM)
sunxiresets* at fdt? pass 1 # Allwinner Misc. clock resets
sunxigates* at fdt? pass 1 # Allwinner Misc. clock gates
sunxigmacclk* at fdt? pass 2 # Allwinner GMAC MII/RGMII clock mux
@@ -501,7 +476,7 @@ options HDAUDIOVERBOSE
options HDAUDIO_32BIT_ACCESS
options HDAUDIO_ENABLE_HDMI
options HDAUDIO_ENABLE_DISPLAYPORT
-sun8icodec* at fdt? # Audio codec (sun8i/sun50i)
+sun8icodec* at fdt? # Audio codec (sun8i)
sunxicodec* at fdt? # Allwinner audio codec
sunxii2s* at fdt? # I2S/PCM
audio* at audiobus?
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: maya Date: Sat Apr 13 09:29:49 UTC 2019 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile Log Message: Enable TearFree by default. This avoids visual corruption that can be induced by, e.g., env LIBGL_ALWAYS_SOFTWARE=1 glmark2. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ src/external/mit/xorg/server/drivers/xf86-video-intel/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/server/drivers/xf86-video-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.30 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.31 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.30 Wed Mar 20 07:18:07 2019 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sat Apr 13 09:29:49 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/03/20 07:18:07 mrg Exp $ +# $NetBSD: Makefile,v 1.31 2019/04/13 09:29:49 maya Exp $ .include @@ -179,6 +179,8 @@ CPPFLAGS+= -DUMS=1 CPPFLAGS+= -DUSE_BACKLIGHT=1 CPPFLAGS+= -DUSE_SNA=1 CPPFLAGS+= -DUSE_UXA=1 +# XXX without this we get visual corruption, but it doesn't seem to be tearing +CPPFLAGS+= -DTEARFREE # XXX This should not be hard-coded here... DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
CVS commit: src/sys
Module Name:src Committed By: maxv Date: Sat Apr 13 08:41:37 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/conf: files src/sys/kern: subr_pool.c src/sys/sys: pool.h Log Message: Introduce POOL_QUARANTINE, a feature that creates a window during which a freed buffer cannot be reallocated. This greatly helps detecting use-after-frees, because they are not short-lived anymore. We maintain a per-pool fifo of 128 buffers. On each pool_put, we do a real free of the oldest buffer, and insert the new buffer. Before insertion, we mark the buffer as invalid with KASAN. On each pool_cache_put, we destruct the object, so it lands in pool_put, and the quarantine is handled there. POOL_QUARANTINE can be used in conjunction with KASAN to detect more use-after-free bugs. To generate a diff of this commit: cvs rdiff -u -r1.521 -r1.522 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1233 -r1.1234 src/sys/conf/files cvs rdiff -u -r1.248 -r1.249 src/sys/kern/subr_pool.c cvs rdiff -u -r1.87 -r1.88 src/sys/sys/pool.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.521 src/sys/arch/amd64/conf/GENERIC:1.522 --- src/sys/arch/amd64/conf/GENERIC:1.521 Thu Mar 28 19:00:40 2019 +++ src/sys/arch/amd64/conf/GENERIC Sat Apr 13 08:41:37 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.521 2019/03/28 19:00:40 maxv Exp $ +# $NetBSD: GENERIC,v 1.522 2019/04/13 08:41:37 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.521 $" +#ident "GENERIC-$Revision: 1.522 $" maxusers 64 # estimated number of users @@ -122,9 +122,11 @@ makeoptions DEBUG="-g" # compile full sy options KDTRACE_HOOKS # kernel DTrace hooks # Kernel Address Sanitizer (kASan). You need to disable SVS to use it. +# The quarantine is optional and can help KASAN find more use-after-frees. #makeoptions KASAN=1 # Kernel Address Sanitizer #options KASAN #no options SVS +#options POOL_QUARANTINE # Kernel Info Leak Detector. #makeoptions KLEAK=1 Index: src/sys/conf/files diff -u src/sys/conf/files:1.1233 src/sys/conf/files:1.1234 --- src/sys/conf/files:1.1233 Tue Apr 9 22:05:27 2019 +++ src/sys/conf/files Sat Apr 13 08:41:36 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1233 2019/04/09 22:05:27 pgoyette Exp $ +# $NetBSD: files,v 1.1234 2019/04/13 08:41:36 maxv Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -32,6 +32,7 @@ defflagGPROF defflagKASAN defflagKLEAK defflagKCOV +defflag opt_pool.h POOL_QUARANTINE defparam opt_copy_symtab.h makeoptions_COPY_SYMTAB Index: src/sys/kern/subr_pool.c diff -u src/sys/kern/subr_pool.c:1.248 src/sys/kern/subr_pool.c:1.249 --- src/sys/kern/subr_pool.c:1.248 Sun Apr 7 09:20:04 2019 +++ src/sys/kern/subr_pool.c Sat Apr 13 08:41:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.248 2019/04/07 09:20:04 maxv Exp $ */ +/* $NetBSD: subr_pool.c,v 1.249 2019/04/13 08:41:36 maxv Exp $ */ /* * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018 @@ -33,11 +33,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.248 2019/04/07 09:20:04 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.249 2019/04/13 08:41:36 maxv Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" #include "opt_lockdebug.h" +#include "opt_pool.h" #include "opt_kleak.h" #endif @@ -111,6 +112,19 @@ static void pool_cache_kleak_fill(pool_c #define pool_cache_kleak_fill(pc, ptr) __nothing #endif +#ifdef POOL_QUARANTINE +static void pool_quarantine_init(struct pool *); +static void pool_quarantine_flush(struct pool *); +static bool pool_put_quarantine(struct pool *, void *, +struct pool_pagelist *); +static bool pool_cache_put_quarantine(pool_cache_t, void *, paddr_t); +#else +#define pool_quarantine_init(a) __nothing +#define pool_quarantine_flush(a) __nothing +#define pool_put_quarantine(a, b, c) false +#define pool_cache_put_quarantine(a, b, c) false +#endif + #define pc_has_ctor(pc) \ (pc->pc_ctor != (int (*)(void *, void *, int))nullop) #define pc_has_dtor(pc) \ @@ -733,6 +747,7 @@ pool_init(struct pool *pp, size_t size, pp->pr_drain_hook_arg = NULL; pp->pr_freecheck = NULL; pool_redzone_init(pp, size); + pool_quarantine_init(pp); /* * Decide whether to put the page header off-page to avoid wasting too @@ -844,6 +859,8 @@ pool_destroy(struct pool *pp) struct pool_pagelist pq; struct pool_item_header *ph; + pool_quarantine_flush(pp); + /* Remove from global pool list */ mutex_enter(_head_lock); while (pp->pr_refcnt != 0) @@ -1184,7 +1201,9 @@ pool_put(struct pool *pp, void *v) LIST_INIT(); mutex_enter(>pr_lock); - pool_do_put(pp, v,
CVS commit: src/sys/arch
Module Name:src Committed By: isaki Date: Sat Apr 13 08:26:14 UTC 2019 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC src/sys/arch/atari/conf: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE Log Message: Regen. > Add drvctl to kernel which has audio device. > audiocfg(1) requires drvctl(4). To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.322 -r1.323 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.119 -r1.120 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.116 -r1.117 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.114 -r1.115 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.91 -r1.92 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.95 -r1.96 src/sys/arch/atari/conf/MILAN-PCIIDE 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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.188 src/sys/arch/amiga/conf/DRACO:1.189 --- src/sys/arch/amiga/conf/DRACO:1.188 Wed Dec 19 13:57:45 2018 +++ src/sys/arch/amiga/conf/DRACO Sat Apr 13 08:26:14 2019 @@ -1,9 +1,9 @@ -# $NetBSD: DRACO,v 1.188 2018/12/19 13:57:45 maxv Exp $ +# $NetBSD: DRACO,v 1.189 2019/04/13 08:26:14 isaki Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.135 2017/09/13 22:24:42 sevan Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.141 2019/04/13 08:22:58 isaki Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.188 $" +#ident "GENERIC-$Revision: 1.189 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -321,6 +321,7 @@ pseudo-device putter # for puffs and p pseudo-device view 4 # views (needed for grfcc) pseudo-device pty # pseudo-terminals pseudo-device clockctl # user control of clock subsystem +pseudo-device drvctl # user control of drive subsystem #pseudo-device wsfont # wsfont(4) dynamic font loading support #pseudo-device wsmux # mouse & keyboard multiplexor Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.322 src/sys/arch/amiga/conf/GENERIC:1.323 --- src/sys/arch/amiga/conf/GENERIC:1.322 Wed Dec 19 13:57:45 2018 +++ src/sys/arch/amiga/conf/GENERIC Sat Apr 13 08:26:14 2019 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.322 2018/12/19 13:57:45 maxv Exp $ +# $NetBSD: GENERIC,v 1.323 2019/04/13 08:26:14 isaki Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.135 2017/09/13 22:24:42 sevan Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.141 2019/04/13 08:22:58 isaki Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.322 $" +#ident "GENERIC-$Revision: 1.323 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -567,6 +567,7 @@ pseudo-device putter # for puffs and p pseudo-device view 4 # views (needed for grfcc) pseudo-device pty # pseudo-terminals pseudo-device clockctl # user control of clock subsystem +pseudo-device drvctl # user control of drive subsystem #pseudo-device wsfont # wsfont(4) dynamic font loading support #pseudo-device wsmux # mouse & keyboard multiplexor Index: src/sys/arch/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.119 src/sys/arch/atari/conf/ATARITT:1.120 --- src/sys/arch/atari/conf/ATARITT:1.119 Sat Mar 31 04:17:27 2018 +++ src/sys/arch/atari/conf/ATARITT Sat Apr 13 08:26:14 2019 @@ -1,11 +1,11 @@ # -# $NetBSD: ATARITT,v 1.119 2018/03/31 04:17:27 tsutsui Exp $ +# $NetBSD: ATARITT,v 1.120 2019/04/13 08:26:14 isaki Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: GENERIC.in,v 1.115 2018/01/23 14:47:54 sevan Exp $ +# NetBSD: GENERIC.in,v 1.118 2019/04/13 08:22:59 isaki Exp $ include "arch/atari/conf/std.atari" options INCLUDE_CONFIG_FILE # embed config file in kernel binary makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -64,6 +64,7 @@ pseudo-device bpfilter # berkeley packet pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation pseudo-device clockctl # user control of clock subsystem +pseudo-device drvctl # user control of drive subsystem pseudo-device ksyms # /dev/ksyms pseudo-device view 4 # View (graphics mapping) pseudo-device mouse 1 # mouse Index: src/sys/arch/atari/conf/FALCON diff -u src/sys/arch/atari/conf/FALCON:1.116 src/sys/arch/atari/conf/FALCON:1.117 ---
CVS commit: src/sys/arch
Module Name:src Committed By: isaki Date: Sat Apr 13 08:23:01 UTC 2019 Modified Files: src/sys/arch/acorn32/conf: EB7500ATX GENERIC NC src/sys/arch/algor/conf: P4032 P5064 P6032 src/sys/arch/alpha/conf: GENERIC src/sys/arch/amiga/conf: GENERIC.in src/sys/arch/amigappc/conf: GENERIC src/sys/arch/atari/conf: GENERIC.in src/sys/arch/bebox/conf: GENERIC src/sys/arch/cats/conf: GENERIC src/sys/arch/dreamcast/conf: GENERIC src/sys/arch/evbarm/conf: SMDK2410 src/sys/arch/evbmips/conf: ALCHEMY MALTA src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT PMPPC src/sys/arch/hp300/conf: GENERIC src/sys/arch/hpcarm/conf: NETBOOKPRO src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX src/sys/arch/ibmnws/conf: GENERIC src/sys/arch/iyonix/conf: GENERIC src/sys/arch/macppc/conf: MAMBO POWERMAC_G5 src/sys/arch/mmeye/conf: MMEYE_WLF src/sys/arch/netwinder/conf: GENERIC src/sys/arch/pmax/conf: GENERIC GENERIC64 src/sys/arch/sandpoint/conf: ENCPP1 src/sys/arch/sgimips/conf: GENERIC32_IP2x src/sys/arch/shark/conf: GENERIC src/sys/arch/sparc/conf: GENERIC KRUPS MRCOFFEE TADPOLE3GX src/sys/arch/sparc64/conf: NONPLUS64 src/sys/arch/vax/conf: GENERIC src/sys/arch/x68k/conf: GENERIC Log Message: Add drvctl to kernel which has audio device. audiocfg(1) requires drvctl(4). To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/acorn32/conf/EB7500ATX cvs rdiff -u -r1.127 -r1.128 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.74 -r1.75 src/sys/arch/acorn32/conf/NC cvs rdiff -u -r1.78 -r1.79 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.89 -r1.90 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.80 -r1.81 src/sys/arch/algor/conf/P6032 cvs rdiff -u -r1.392 -r1.393 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.140 -r1.141 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.35 -r1.36 src/sys/arch/amigappc/conf/GENERIC cvs rdiff -u -r1.117 -r1.118 src/sys/arch/atari/conf/GENERIC.in cvs rdiff -u -r1.158 -r1.159 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.171 -r1.172 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.130 -r1.131 src/sys/arch/dreamcast/conf/GENERIC cvs rdiff -u -r1.70 -r1.71 src/sys/arch/evbarm/conf/SMDK2410 cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbmips/conf/ALCHEMY cvs rdiff -u -r1.94 -r1.95 src/sys/arch/evbmips/conf/MALTA cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbppc/conf/PMPPC cvs rdiff -u -r1.201 -r1.202 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcarm/conf/NETBOOKPRO cvs rdiff -u -r1.238 -r1.239 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.109 -r1.110 src/sys/arch/hpcmips/conf/TX3922 cvs rdiff -u -r1.72 -r1.73 src/sys/arch/hpcmips/conf/VR41XX cvs rdiff -u -r1.52 -r1.53 src/sys/arch/ibmnws/conf/GENERIC cvs rdiff -u -r1.105 -r1.106 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.32 -r1.33 src/sys/arch/macppc/conf/MAMBO cvs rdiff -u -r1.40 -r1.41 src/sys/arch/macppc/conf/POWERMAC_G5 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mmeye/conf/MMEYE_WLF cvs rdiff -u -r1.135 -r1.136 src/sys/arch/netwinder/conf/GENERIC cvs rdiff -u -r1.197 -r1.198 src/sys/arch/pmax/conf/GENERIC cvs rdiff -u -r1.29 -r1.30 src/sys/arch/pmax/conf/GENERIC64 cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sandpoint/conf/ENCPP1 cvs rdiff -u -r1.114 -r1.115 src/sys/arch/sgimips/conf/GENERIC32_IP2x cvs rdiff -u -r1.131 -r1.132 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.264 -r1.265 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sparc/conf/KRUPS cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc/conf/MRCOFFEE cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sparc/conf/TADPOLE3GX cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc64/conf/NONPLUS64 cvs rdiff -u -r1.208 -r1.209 src/sys/arch/vax/conf/GENERIC cvs rdiff -u -r1.194 -r1.195 src/sys/arch/x68k/conf/GENERIC 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/acorn32/conf/EB7500ATX diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.67 src/sys/arch/acorn32/conf/EB7500ATX:1.68 --- src/sys/arch/acorn32/conf/EB7500ATX:1.67 Wed Aug 1 20:04:09 2018 +++ src/sys/arch/acorn32/conf/EB7500ATX Sat Apr 13 08:22:58 2019 @@ -1,4 +1,4 @@ -# $NetBSD: EB7500ATX,v 1.67 2018/08/01 20:04:09 maxv Exp $ +# $NetBSD: EB7500ATX,v 1.68 2019/04/13 08:22:58 isaki Exp $ # # EB7500ATX --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "EB7500ATX-$Revision: 1.67 $" +#ident "EB7500ATX-$Revision: 1.68 $" # estimated number of users maxusers 32 @@ -258,6 +258,7 @@ options RAID_AUTOCONFIG # auto-configu #pseudo-device fss # file system snapshot
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: maxv
Date: Sat Apr 13 06:17:33 UTC 2019
Modified Files:
src/sys/dev/pci: vioscsi.c
Log Message:
Fix use-after-free. If we're not polling, virtio_enqueue_commit() will send
the transaction, and it means 'xs' can be immediately freed. So, save the
value of xs_control beforehand.
Detected by KASAN, ok jdolecek@.
Fixes PR/54008
Reported-by: syzbot+6513c4afe66237d72...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/vioscsi.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/vioscsi.c
diff -u src/sys/dev/pci/vioscsi.c:1.20 src/sys/dev/pci/vioscsi.c:1.21
--- src/sys/dev/pci/vioscsi.c:1.20 Sun Jun 10 14:59:23 2018
+++ src/sys/dev/pci/vioscsi.c Sat Apr 13 06:17:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vioscsi.c,v 1.20 2018/06/10 14:59:23 jakllsch Exp $ */
+/* $NetBSD: vioscsi.c,v 1.21 2019/04/13 06:17:33 maxv Exp $ */
/* $OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.20 2018/06/10 14:59:23 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.21 2019/04/13 06:17:33 maxv Exp $");
#include
#include
@@ -270,6 +270,7 @@ vioscsi_scsipi_request(struct scsipi_cha
struct virtio_scsi_req_hdr *req;
struct virtqueue *vq = >sc_vqs[VIOSCSI_VQ_REQUEST];
int slot, error;
+ bool dopoll;
DPRINTF(("%s: enter\n", __func__));
@@ -418,9 +419,10 @@ stuffup:
sizeof(struct virtio_scsi_res_hdr), 0);
if (xs->xs_control & XS_CTL_DATA_IN)
virtio_enqueue(vsc, vq, slot, vr->vr_data, 0);
+ dopoll = (xs->xs_control & XS_CTL_POLL) != 0;
virtio_enqueue_commit(vsc, vq, slot, 1);
- if ((xs->xs_control & XS_CTL_POLL) == 0)
+ if (!dopoll)
return;
DPRINTF(("%s: polling...\n", __func__));
