CVS commit: src/sys/arch/mips
Module Name:src
Committed By: mrg
Date: Sat Aug 15 05:41:57 UTC 2020
Modified Files:
src/sys/arch/mips: README.models
Log Message:
there was no MIPS{32,64} release 4.
XXX: missing lots and lots of evbmips CPUs.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/README.models
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/README.models
diff -u src/sys/arch/mips/README.models:1.5 src/sys/arch/mips/README.models:1.6
--- src/sys/arch/mips/README.models:1.5 Sun Jun 19 10:49:34 2016
+++ src/sys/arch/mips/README.models Sat Aug 15 05:41:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: README.models,v 1.5 2016/06/19 10:49:34 rkujawa Exp $
+# $NetBSD: README.models,v 1.6 2020/08/15 05:41:57 mrg Exp $
MIPS models and architecture levels
---
@@ -26,7 +26,6 @@ These architecture levels exist:
MIPS32 MIPS64
MIPS32r2 MIPS64r2
MIPS32r3 MIPS64r3
-MIPS32r4 MIPS64r4
MIPS32r5 MIPS64r5
MIPS32r6 MIPS64r6
CVS commit: src/etc/etc.evbmips
Module Name:src
Committed By: simonb
Date: Sat Aug 15 05:03:06 UTC 2020
Modified Files:
src/etc/etc.evbmips: Makefile.inc
Log Message:
Remove a misleading space in a ".elif".
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/etc/etc.evbmips/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/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.24 src/etc/etc.evbmips/Makefile.inc:1.25
--- src/etc/etc.evbmips/Makefile.inc:1.24 Fri Jul 17 15:16:34 2020
+++ src/etc/etc.evbmips/Makefile.inc Sat Aug 15 05:03:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.24 2020/07/17 15:16:34 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.25 2020/08/15 05:03:06 simonb Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -15,7 +15,7 @@ BUILD_KERNELS= INSTALL_CI20 INSTALL_OMS
KERNEL_SETS+= P4032 P5064 P6032
-. elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64
BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64
CVS commit: src/sys/arch/mips/include
Module Name:src
Committed By: simonb
Date: Sat Aug 15 04:27:28 UTC 2020
Modified Files:
src/sys/arch/mips/include: mips_opcode.h
Log Message:
Fix value for SCE/SWE instructions.
Problem noticed by mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/include/mips_opcode.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/mips/include/mips_opcode.h
diff -u src/sys/arch/mips/include/mips_opcode.h:1.22 src/sys/arch/mips/include/mips_opcode.h:1.23
--- src/sys/arch/mips/include/mips_opcode.h:1.22 Sun Jul 26 08:08:41 2020
+++ src/sys/arch/mips/include/mips_opcode.h Sat Aug 15 04:27:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_opcode.h,v 1.22 2020/07/26 08:08:41 simonb Exp $ */
+/* $NetBSD: mips_opcode.h,v 1.23 2020/08/15 04:27:28 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -316,8 +316,8 @@ typedef union {
#define OP_CACHEE 033 /* EVA */
#define OP_SBE 034 /* EVA */
#define OP_SHE 035 /* EVA */
-#define OP_SCE 035 /* EVA */
-#define OP_SWE 035 /* EVA */
+#define OP_SCE 036 /* EVA */
+#define OP_SWE 037 /* EVA */
#define OP_BSHFL 040 /* MIPS32/64 r2 */
#define OP_SWLE 041 /* EVA */
#define OP_SWRE 042 /* EVA */
CVS commit: src/tests/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Aug 15 01:50:54 UTC 2020
Modified Files:
src/tests/usr.bin/make: t_make.sh
Log Message:
make(1): mark tests impsrc and phony-end as no longer failing
These tests have been adjusted to demonstrate the current behavior,
mentioning the expected behavior in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/make/t_make.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/make/t_make.sh
diff -u src/tests/usr.bin/make/t_make.sh:1.8 src/tests/usr.bin/make/t_make.sh:1.9
--- src/tests/usr.bin/make/t_make.sh:1.8 Mon Jun 8 19:50:10 2020
+++ src/tests/usr.bin/make/t_make.sh Sat Aug 15 01:50:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_make.sh,v 1.8 2020/06/08 19:50:10 rillig Exp $
+# $NetBSD: t_make.sh,v 1.9 2020/08/15 01:50:54 rillig Exp $
#
# Copyright (c) 2008, 2010, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,8 +35,6 @@ run_and_check()
# 49085 - adjust for more concrete PR if there is one
case ${makename} in
escape) atf_expect_fail "see PR toolchain/49085";;
- impsrc) atf_expect_fail "see PR toolchain/49085";;
- phony*) atf_expect_fail "see PR toolchain/49085";;
posix1) atf_expect_fail "see PR toolchain/49085";;
suffixes) atf_expect_fail "see PR toolchain/49085"
atf_fail "this uses up all memory and then fails";;
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Aug 15 01:49:07 UTC 2020
Modified Files:
src/usr.bin/make: Makefile
src/usr.bin/make/unit-tests: Makefile archive.mk
Log Message:
make(1): fix archive test
Even though it is commented out in this Makefile, it is still run by
atf, on purpose. This test is broken on FreeBSD, but on NetBSD it
should still be run.
Without removing the archive first, it could be left over from a
previous test failure and thus be newer than all its members, leading to
${.OODATE} being empty.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/usr.bin/make/Makefile
cvs rdiff -u -r1.91 -r1.92 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/archive.mk
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/make/Makefile
diff -u src/usr.bin/make/Makefile:1.88 src/usr.bin/make/Makefile:1.89
--- src/usr.bin/make/Makefile:1.88 Wed Aug 12 19:21:05 2020
+++ src/usr.bin/make/Makefile Sat Aug 15 01:49:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2020/08/12 19:21:05 rillig Exp $
+# $NetBSD: Makefile,v 1.89 2020/08/15 01:49:07 rillig Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -173,7 +173,7 @@ test: .MAKE
sed -i 's,^\([^:]*\): *[0-9]*:,\1: ,' *.gcov
.endif
-accept: .MAKE
+accept sync-mi: .MAKE
cd ${.CURDIR}/unit-tests && ${.MAKE} ${.TARGET}
retest:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.91 src/usr.bin/make/unit-tests/Makefile:1.92
--- src/usr.bin/make/unit-tests/Makefile:1.91 Sun Aug 9 16:32:28 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Aug 15 01:49:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2020/08/09 16:32:28 rillig Exp $
+# $NetBSD: Makefile,v 1.92 2020/08/15 01:49:07 rillig Exp $
#
# Unit tests for make(1)
#
@@ -33,7 +33,9 @@
# Each test is in a sub-makefile.
# Keep the list sorted.
-TESTS+= # archive # broken on FreeBSD
+# Any test that is commented out must be ignored in
+# src/tests/usr.bin/make/t_make.sh as well.
+TESTS+= # archive # broken on FreeBSD, enabled in t_make.sh
TESTS+= cmdline
TESTS+= comment
TESTS+= cond-late
Index: src/usr.bin/make/unit-tests/archive.mk
diff -u src/usr.bin/make/unit-tests/archive.mk:1.1 src/usr.bin/make/unit-tests/archive.mk:1.2
--- src/usr.bin/make/unit-tests/archive.mk:1.1 Mon Jul 27 18:51:03 2020
+++ src/usr.bin/make/unit-tests/archive.mk Sat Aug 15 01:49:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: archive.mk,v 1.1 2020/07/27 18:51:03 rillig Exp $
+# $NetBSD: archive.mk,v 1.2 2020/08/15 01:49:07 rillig Exp $
#
# Very basic demonstration of handling archives, based on the description
# in PSD.doc/tutorial.ms.
@@ -13,6 +13,7 @@ MAKE_CMD= ${.MAKE} -f ${MAKEFILE}
RUN?= @set -eu;
all:
+ ${RUN} ${MAKE_CMD} remove-archive
${RUN} ${MAKE_CMD} create-archive
${RUN} ${MAKE_CMD} list-archive
${RUN} ${MAKE_CMD} depend-on-existing-member
@@ -33,5 +34,5 @@ depend-on-existing-member: ${ARCHIVE}(ar
depend-on-nonexistent-member: ${ARCHIVE}(nonexistent.mk)
${RUN} echo $@
-remove-archive: ${ARCHIVE}
+remove-archive:
rm ${ARCHIVE}
CVS commit: src/sys/uvm
Module Name:src
Committed By: tnn
Date: Sat Aug 15 01:27:22 UTC 2020
Modified Files:
src/sys/uvm: uvm_page.c
Log Message:
add a __diagused to fix non-DIAGNOSTIC kernel
To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 src/sys/uvm/uvm_page.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.245 src/sys/uvm/uvm_page.c:1.246
--- src/sys/uvm/uvm_page.c:1.245 Fri Aug 14 09:06:15 2020
+++ src/sys/uvm/uvm_page.c Sat Aug 15 01:27:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.245 2020/08/14 09:06:15 chs Exp $ */
+/* $NetBSD: uvm_page.c,v 1.246 2020/08/15 01:27:22 tnn Exp $ */
/*-
* Copyright (c) 2019, 2020 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.245 2020/08/14 09:06:15 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.246 2020/08/15 01:27:22 tnn Exp $");
#include "opt_ddb.h"
#include "opt_uvm.h"
@@ -1790,7 +1790,7 @@ struct vm_page *
uvm_pagelookup(struct uvm_object *obj, voff_t off)
{
struct vm_page *pg;
- bool ddb = false;
+ bool ddb __diagused = false;
#ifdef DDB
extern int db_active;
ddb = db_active != 0;
CVS commit: src/usr.sbin/fstyp
Module Name:src
Committed By: tkusumi
Date: Fri Aug 14 18:35:57 UTC 2020
Modified Files:
src/usr.sbin/fstyp: hammer2.c
Log Message:
fstyp: Fix incorrect pfs_type test for HAMMER2 inode
taken-from: DragonFly BSD
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fstyp/hammer2.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.sbin/fstyp/hammer2.c
diff -u src/usr.sbin/fstyp/hammer2.c:1.4 src/usr.sbin/fstyp/hammer2.c:1.5
--- src/usr.sbin/fstyp/hammer2.c:1.4 Wed Jan 15 15:32:05 2020
+++ src/usr.sbin/fstyp/hammer2.c Fri Aug 14 18:35:57 2020
@@ -1,4 +1,4 @@
-/*$NetBSD: hammer2.c,v 1.4 2020/01/15 15:32:05 tkusumi Exp $ */
+/*$NetBSD: hammer2.c,v 1.5 2020/08/14 18:35:57 tkusumi Exp $ */
/*-
* Copyright (c) 2017-2019 The DragonFly Project
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hammer2.c,v 1.4 2020/01/15 15:32:05 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hammer2.c,v 1.5 2020/08/14 18:35:57 tkusumi Exp $");
#include
#include
@@ -122,7 +122,7 @@ find_pfs(FILE *fp, const hammer2_blockre
switch (bref->type) {
case HAMMER2_BREF_TYPE_INODE:
ipdata = media->ipdata;
- if (ipdata.meta.pfs_type & HAMMER2_PFSTYPE_SUPROOT) {
+ if (ipdata.meta.pfs_type == HAMMER2_PFSTYPE_SUPROOT) {
bscan = [0];
bcount = HAMMER2_SET_COUNT;
} else {
CVS commit: src/sys/arch/arc
Module Name:src
Committed By: skrll
Date: Fri Aug 14 16:53:06 UTC 2020
Modified Files:
src/sys/arch/arc/arc: arcbios.c
src/sys/arch/arc/conf: files.arc
Added Files:
src/sys/arch/arc/arc: arcbios_stubs.S
Log Message:
Fix build by splitting large amount of inline assembling into a seperate
.S file. Same stub (/trampoline) code before and after this change.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arc/arc/arcbios.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arc/arc/arcbios_stubs.S
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/arc/conf/files.arc
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/arc/arc/arcbios.c
diff -u src/sys/arch/arc/arc/arcbios.c:1.18 src/sys/arch/arc/arc/arcbios.c:1.19
--- src/sys/arch/arc/arc/arcbios.c:1.18 Fri May 29 23:02:51 2020
+++ src/sys/arch/arc/arc/arcbios.c Fri Aug 14 16:53:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios.c,v 1.18 2020/05/29 23:02:51 tsutsui Exp $ */
+/* $NetBSD: arcbios.c,v 1.19 2020/08/14 16:53:06 skrll Exp $ */
/* $OpenBSD: arcbios.c,v 1.3 1998/06/06 06:33:33 mickey Exp $ */
/*-
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: arcbios.c,v 1.18 2020/05/29 23:02:51 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcbios.c,v 1.19 2020/08/14 16:53:06 skrll Exp $");
#include
#include
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: arcbios.c,v
#include
#include
#include
-#include
#include
#include
#include
@@ -69,97 +68,6 @@ arc_dsp_stat_t arc_displayinfo; /* Save
int arc_cpu_l2cache_size = 0;
/*
- * ARC Bios trampoline code.
- * Note we have to save/restore reserved MIPS_CURLWP register.
- */
-#define ARC_Call(Name,Offset) \
-__asm("\n" \
-" .text\n" \
-" .ent " #Name "\n" \
-" .align 3\n" \
-" .set noreorder\n" \
-" .globl " #Name "\n" \
-#Name":\n" \
-" subu $29, " ___STRING(CALLFRAME_SIZ) "\n" \
-" sw $31, " ___STRING(CALLFRAME_RA) "($29)\n" \
-" sw $16, " ___STRING(CALLFRAME_SP) "($29)\n" \
-" lw $2, 0x80001020\n"\
-" lw $2," #Offset "($2)\n"\
-" jalr $2\n" \
-" move $16, " ___STRING(MIPS_CURLWP) "\n" \
-" move " ___STRING(MIPS_CURLWP) ", $16\n" \
-" lw $31, " ___STRING(CALLFRAME_RA) "($29)\n" \
-" lw $16, " ___STRING(CALLFRAME_SP) "($29)\n" \
-" j $31\n" \
-" addu $29, " ___STRING(CALLFRAME_SIZ) "\n" \
-" .end " #Name "\n" );
-
-#define ARC_Call5(Name,Offset) \
-__asm("\n" \
-" .text\n" \
-" .ent " #Name "\n" \
-" .align 3\n" \
-" .set noreorder\n" \
-" .globl " #Name "\n" \
-#Name":\n" \
-" subu $29, " ___STRING(CALLFRAME_SIZ + 4) "\n" \
-" sw $31, " ___STRING(CALLFRAME_RA + 4) "($29)\n" \
-" sw $16, " ___STRING(CALLFRAME_SP + 4) "($29)\n" \
-" lw $12, " ___STRING(CALLFRAME_SIZ + 4 + 16) "($29)\n" \
-" sw $12, 16($29)\n" \
-" lw $2, 0x80001020\n"\
-" lw $2," #Offset "($2)\n"\
-" jalr $2\n" \
-" move $16, " ___STRING(MIPS_CURLWP) "\n" \
-" move " ___STRING(MIPS_CURLWP) ", $16\n" \
-" lw $31, " ___STRING(CALLFRAME_RA + 4) "($29)\n" \
-" lw $16, " ___STRING(CALLFRAME_SP + 4) "($29)\n" \
-" j $31\n" \
-" addu $29, " ___STRING(CALLFRAME_SIZ + 4) "\n" \
-" .end " #Name "\n" );
-
-ARC_Call(Bios_Load, 0x00);
-ARC_Call5(Bios_Invoke, 0x04);
-ARC_Call(Bios_Execute, 0x08);
-ARC_Call(Bios_Halt, 0x0c);
-ARC_Call(Bios_PowerDown, 0x10);
-ARC_Call(Bios_Restart, 0x14);
-ARC_Call(Bios_Reboot, 0x18);
-ARC_Call(Bios_EnterInteractiveMode, 0x1c);
-ARC_Call(Bios_Unused1, 0x20); /* return_from_main? */
-ARC_Call(Bios_GetPeer, 0x24);
-ARC_Call(Bios_GetChild, 0x28);
-ARC_Call(Bios_GetParent, 0x2c);
-ARC_Call(Bios_GetConfigurationData, 0x30);
-ARC_Call(Bios_AddChild, 0x34);
-ARC_Call(Bios_DeleteComponent, 0x38);
-ARC_Call(Bios_GetComponent, 0x3c);
-ARC_Call(Bios_SaveConfiguration, 0x40);
-ARC_Call(Bios_GetSystemId, 0x44);
-ARC_Call(Bios_GetMemoryDescriptor, 0x48);
-ARC_Call(Bios_Unused2, 0x4c); /* signal??? */
-ARC_Call(Bios_GetTime, 0x50);
-ARC_Call(Bios_GetRelativeTime, 0x54);
-ARC_Call(Bios_GetDirectoryEntry, 0x58);
-ARC_Call(Bios_Open, 0x5c);
-ARC_Call(Bios_Close, 0x60);
-ARC_Call(Bios_Read, 0x64);
-ARC_Call(Bios_GetReadStatus, 0x68);
-ARC_Call(Bios_Write, 0x6c);
-ARC_Call(Bios_Seek, 0x70);
-ARC_Call(Bios_Mount, 0x74);
-ARC_Call(Bios_GetEnvironmentVariable, 0x78);
-ARC_Call(Bios_SetEnvironmentVariable, 0x7c);
-ARC_Call(Bios_GetFileInformation, 0x80);
-ARC_Call(Bios_SetFileInformation, 0x84);
-ARC_Call(Bios_FlushAllCaches, 0x88);
-/* note: the followings don't exist on SGI */
-#ifdef arc
-ARC_Call(Bios_TestUnicodeCharacter, 0x8c);
-ARC_Call(Bios_GetDisplayStatus, 0x90);
-#endif
-
-/*
* BIOS based console, for early stage.
*/
Index: src/sys/arch/arc/conf/files.arc
diff -u src/sys/arch/arc/conf/files.arc:1.66 src/sys/arch/arc/conf/files.arc:1.67
--- src/sys/arch/arc/conf/files.arc:1.66 Mon Jun 15 22:03:39
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Fri Aug 14 16:18:37 UTC 2020
Modified Files:
src/sys/arch/arm/arm: arm_machdep.c
src/sys/arch/arm/arm32: cpuswitch.S db_machdep.c genassym.cf
src/sys/arch/arm/include: cpu.h locore.h proc.h
src/sys/arch/arm/include/arm32: frame.h
src/sys/arch/evbarm/conf: std.generic
Log Message:
Mirror the changes to aarch64 and
- Switch to TPIDRPRW_IS_CURLWP, because curlwp is accessed much more often
by MI code. It also makes curlwp preemption safe,
- Make ASTs operate per-LWP rather than per-CPU, otherwise sometimes LWPs
can see spurious ASTs (which doesn't cause a problem, it just means some
time may be wasted).
- Make sure ASTs are always set on the same CPU as the target LWP, and
delivered via IPI if posted from a remote CPU so that they are resolved
quickly.
- Add some cache line padding to struct cpu_info.
- Add a memory barrier in a couple of places where ci_curlwp is set. This
is needed whenever an LWP that is resuming on the CPU could hold an
adaptive mutex. The barrier needs to drain the CPU's store buffer, so
that the update to ci_curlwp becomes globally visible before the LWP can
resume and call mutex_exit().
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/arm/arm/arm_machdep.c
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/arm/arm32/cpuswitch.S
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/arm32/db_machdep.c
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/arm/arm32/genassym.cf
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/include/locore.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/proc.h
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/include/arm32/frame.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.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/arm/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.63 src/sys/arch/arm/arm/arm_machdep.c:1.64
--- src/sys/arch/arm/arm/arm_machdep.c:1.63 Sat Feb 15 08:16:10 2020
+++ src/sys/arch/arm/arm/arm_machdep.c Fri Aug 14 16:18:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_machdep.c,v 1.63 2020/02/15 08:16:10 skrll Exp $ */
+/* $NetBSD: arm_machdep.c,v 1.64 2020/08/14 16:18:36 skrll Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.63 2020/02/15 08:16:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.64 2020/08/14 16:18:36 skrll Exp $");
#include
#include
@@ -241,17 +241,39 @@ cpu_need_resched(struct cpu_info *ci, st
if (flags & RESCHED_REMOTE) {
intr_ipi_send(ci->ci_kcpuset, IPI_KPREEMPT);
} else {
- atomic_or_uint(>ci_astpending, __BIT(1));
+ l->l_md.md_astpending |= __BIT(1);
}
#endif /* __HAVE_PREEMPTION */
return;
}
+
+ KASSERT((flags & RESCHED_UPREEMPT) != 0);
if (flags & RESCHED_REMOTE) {
#ifdef MULTIPROCESSOR
intr_ipi_send(ci->ci_kcpuset, IPI_AST);
#endif /* MULTIPROCESSOR */
} else {
- setsoftast(ci);
+ l->l_md.md_astpending |= __BIT(0);
+ }
+}
+
+
+/*
+ * Notify the current lwp (l) that it has a signal pending,
+ * process as soon as possible.
+ */
+void
+cpu_signotify(struct lwp *l)
+{
+
+ KASSERT(kpreempt_disabled());
+
+ if (l->l_cpu != curcpu()) {
+#ifdef MULTIPROCESSOR
+ intr_ipi_send(l->l_cpu->ci_kcpuset, IPI_AST);
+#endif
+ } else {
+ l->l_md.md_astpending |= __BIT(0);
}
}
Index: src/sys/arch/arm/arm32/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.101 src/sys/arch/arm/arm32/cpuswitch.S:1.102
--- src/sys/arch/arm/arm32/cpuswitch.S:1.101 Fri Jul 10 12:25:09 2020
+++ src/sys/arch/arm/arm32/cpuswitch.S Fri Aug 14 16:18:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.101 2020/07/10 12:25:09 skrll Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.102 2020/08/14 16:18:36 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -87,7 +87,7 @@
#include
#include
- RCSID("$NetBSD: cpuswitch.S,v 1.101 2020/07/10 12:25:09 skrll Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.102 2020/08/14 16:18:36 skrll Exp $")
/* LINTSTUB: include */
@@ -191,6 +191,7 @@ ENTRY(cpu_switchto)
/* We have a new curlwp now so make a note of it */
str r6, [r5, #(CI_CURLWP)]
+ dmb /* see comments in kern_mutex.c */
/* Get the new pcb */
ldr r7, [r6, #(L_PCB)]
@@ -388,6 +389,7 @@ ENTRY_NP(softint_switch)
mcr p15, 0, r5, c13, c0, 4 /* save new lwp */
#endif
str r5, [r7, #(CI_CURLWP)] /* save new lwp */
+ dmb/* see comments in kern_mutex.c */
#ifdef KASAN
mov r0, r5
Index: src/sys/arch/arm/arm32/db_machdep.c
diff -u src/sys/arch/arm/arm32/db_machdep.c:1.34 src/sys/arch/arm/arm32/db_machdep.c:1.35
--- src/sys/arch/arm/arm32/db_machdep.c:1.34 Fri Jul 3 10:19:18 2020
+++ src/sys/arch/arm/arm32/db_machdep.c Fri Aug 14 16:18:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD:
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src
Committed By: christos
Date: Fri Aug 14 14:42:45 UTC 2020
Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_write_disk_posix.c
Log Message:
PR/55568: Andreas Gustafsson: Set the error when failing to create a temp file.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.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/libarchive/dist/libarchive/archive_write_disk_posix.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c:1.5 src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c:1.6
--- src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c:1.5 Mon Feb 10 10:24:21 2020
+++ src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c Fri Aug 14 10:42:44 2020
@@ -2184,8 +2184,11 @@ restore_entry(struct archive_write_disk
if ((a->flags & ARCHIVE_EXTRACT_ATOMIC) &&
S_ISREG(a->st.st_mode)) {
/* Use a temporary file to extract */
-if ((a->fd = la_mktemp(a)) == -1)
+if ((a->fd = la_mktemp(a)) == -1) {
+ archive_set_error(>archive, en,
+ "Can't create '%s'", a->name);
return ARCHIVE_FAILED;
+}
a->pst = NULL;
en = 0;
} else {
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: martin
Date: Fri Aug 14 13:45:44 UTC 2020
Modified Files:
src/sys/arch/sparc/sparc: trap.c
Log Message:
PR port-sparc/55573: remove kernel message about disabled coprocessor
instructions - it is triggered by userland trying to detect availability
of sparcv9 VIS instructions.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/arch/sparc/sparc/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/trap.c
diff -u src/sys/arch/sparc/sparc/trap.c:1.198 src/sys/arch/sparc/sparc/trap.c:1.199
--- src/sys/arch/sparc/sparc/trap.c:1.198 Sat Apr 6 03:06:27 2019
+++ src/sys/arch/sparc/sparc/trap.c Fri Aug 14 13:45:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.198 2019/04/06 03:06:27 thorpej Exp $ */
+/* $NetBSD: trap.c,v 1.199 2020/08/14 13:45:44 martin Exp $ */
/*
* Copyright (c) 1996
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.198 2019/04/06 03:06:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.199 2020/08/14 13:45:44 martin Exp $");
#include "opt_ddb.h"
#include "opt_compat_sunos.h"
@@ -606,7 +606,6 @@ trap(unsigned type, int psr, int pc, str
break;
case T_CPDISABLED:
- uprintf("coprocessor instruction\n"); /* XXX */
sig = SIGILL;
KSI_INIT_TRAP();
ksi.ksi_trap = type;
CVS commit: src/usr.bin/base64
Module Name:src
Committed By: christos
Date: Fri Aug 14 13:40:26 UTC 2020
Modified Files:
src/usr.bin/base64: base64.c
Log Message:
Use fout, fin (Mustafa Dogan)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/base64/base64.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/base64/base64.c
diff -u src/usr.bin/base64/base64.c:1.2 src/usr.bin/base64/base64.c:1.3
--- src/usr.bin/base64/base64.c:1.2 Tue Jul 24 23:45:34 2018
+++ src/usr.bin/base64/base64.c Fri Aug 14 09:40:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: base64.c,v 1.2 2018/07/25 03:45:34 christos Exp $ */
+/* $NetBSD: base64.c,v 1.3 2020/08/14 13:40:25 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: base64.c,v 1.2 2018/07/25 03:45:34 christos Exp $");
+__RCSID("$NetBSD: base64.c,v 1.3 2020/08/14 13:40:25 christos Exp $");
#include
#include
@@ -226,9 +226,9 @@ doit(FILE *fout, FILE *fin, bool decode,
int e;
if (decode)
- e = b64_decode(stdout, stdin, ignore);
+ e = b64_decode(fout, fin, ignore);
else
- e = b64_encode(stdout, stdin, wrap);
+ e = b64_encode(fout, fin, wrap);
if (e == 0)
return;
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Aug 14 11:05:17 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Ticket #1049 To generate a diff of this commit: cvs rdiff -u -r1.1.2.94 -r1.1.2.95 src/doc/CHANGES-9.1 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-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.94 src/doc/CHANGES-9.1:1.1.2.95 --- src/doc/CHANGES-9.1:1.1.2.94 Thu Aug 13 15:09:35 2020 +++ src/doc/CHANGES-9.1 Fri Aug 14 11:05:16 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.94 2020/08/13 15:09:35 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.95 2020/08/14 11:05:16 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -4068,3 +4068,629 @@ etc/etc.news68k/MAKEDEV.conf 1.4 Add missing bpf(4) node for dhcpcd(8) in INSTALL floppies. [tsutsui, ticket #1048] +external/gpl3/gcc/dist/ChangeLog(apply patch) +external/gpl3/gcc/dist/LAST_UPDATED(apply patch) +external/gpl3/gcc/dist/MD5SUMS (apply patch) +external/gpl3/gcc/dist/NEWS (apply patch) +external/gpl3/gcc/dist/config/ChangeLog (apply patch) +external/gpl3/gcc/dist/contrib/ChangeLog (apply patch) +external/gpl3/gcc/dist/contrib/test_summary (apply patch) +external/gpl3/gcc/dist/contrib/header-tools/ChangeLog (apply patch) +external/gpl3/gcc/dist/contrib/reghunt/ChangeLog (apply patch) +external/gpl3/gcc/dist/contrib/regression/ChangeLog (apply patch) +external/gpl3/gcc/dist/fixincludes/ChangeLog (apply patch) +external/gpl3/gcc/dist/fixincludes/fixincl.x (apply patch) +external/gpl3/gcc/dist/fixincludes/inclhack.def (apply patch) +external/gpl3/gcc/dist/fixincludes/tests/base/architecture/ppc/math.h (apply patch) +external/gpl3/gcc/dist/fixincludes/tests/base/dispatch/object.h (apply patch) +external/gpl3/gcc/dist/fixincludes/tests/base/os/availability.h (apply patch) +external/gpl3/gcc/dist/fixincludes/tests/base/os/base.h (apply patch) +external/gpl3/gcc/dist/gcc/BASE-VER(apply patch) +external/gpl3/gcc/dist/gcc/ChangeLog(apply patch) +external/gpl3/gcc/dist/gcc/DATESTAMP(apply patch) +external/gpl3/gcc/dist/gcc/builtins.c(apply patch) +external/gpl3/gcc/dist/gcc/calls.c(apply patch) +external/gpl3/gcc/dist/gcc/cfgcleanup.c (apply patch) +external/gpl3/gcc/dist/gcc/cfghooks.c(apply patch) +external/gpl3/gcc/dist/gcc/cfghooks.h(apply patch) +external/gpl3/gcc/dist/gcc/cfgloop.h(apply patch) +external/gpl3/gcc/dist/gcc/cfgloopmanip.c (apply patch) +external/gpl3/gcc/dist/gcc/cfgrtl.c(apply patch) +external/gpl3/gcc/dist/gcc/combine.c(apply patch) +external/gpl3/gcc/dist/gcc/config.gcc(apply patch) +external/gpl3/gcc/dist/gcc/convert.c(apply patch) +external/gpl3/gcc/dist/gcc/dce.c(apply patch) +external/gpl3/gcc/dist/gcc/df-core.c(apply patch) +external/gpl3/gcc/dist/gcc/dse.c(apply patch) +external/gpl3/gcc/dist/gcc/dwarf2out.c(apply patch) +external/gpl3/gcc/dist/gcc/except.c(apply patch) +external/gpl3/gcc/dist/gcc/explow.c(apply patch) +external/gpl3/gcc/dist/gcc/expmed.c(apply patch) +external/gpl3/gcc/dist/gcc/expr.c(apply patch) +external/gpl3/gcc/dist/gcc/final.c(apply patch) +external/gpl3/gcc/dist/gcc/fold-const.c (apply patch) +external/gpl3/gcc/dist/gcc/function.c(apply patch) +external/gpl3/gcc/dist/gcc/gcse.c(apply patch) +external/gpl3/gcc/dist/gcc/gengtype-lex.c (apply patch) +external/gpl3/gcc/dist/gcc/ggc-page.c(apply patch) +external/gpl3/gcc/dist/gcc/gimple-fold.c (apply patch) +external/gpl3/gcc/dist/gcc/gimple-pretty-print.c (apply patch) +external/gpl3/gcc/dist/gcc/gimple-ssa-sprintf.c (apply patch) +external/gpl3/gcc/dist/gcc/gimple-ssa-strength-reduction.c (apply patch) +external/gpl3/gcc/dist/gcc/gimple.c(apply patch) +external/gpl3/gcc/dist/gcc/gimple.h(apply patch) +external/gpl3/gcc/dist/gcc/gimplify.c(apply patch) +external/gpl3/gcc/dist/gcc/graphite-scop-detection.c (apply patch) +external/gpl3/gcc/dist/gcc/input.c(apply patch) +external/gpl3/gcc/dist/gcc/internal-fn.c (apply patch) +external/gpl3/gcc/dist/gcc/internal-fn.h (apply patch) +external/gpl3/gcc/dist/gcc/ipa-cp.c(apply patch) +external/gpl3/gcc/dist/gcc/ipa-icf-gimple.c (apply patch) +external/gpl3/gcc/dist/gcc/ipa-inline.c (apply patch) +external/gpl3/gcc/dist/gcc/ipa-prop.c(apply patch) +external/gpl3/gcc/dist/gcc/ipa-pure-const.c (apply patch) +external/gpl3/gcc/dist/gcc/ipa-reference.c (apply patch) +external/gpl3/gcc/dist/gcc/ipa-utils.c(apply patch) +external/gpl3/gcc/dist/gcc/ipa-utils.h(apply patch) +external/gpl3/gcc/dist/gcc/ira.c(apply patch) +external/gpl3/gcc/dist/gcc/loop-unroll.c (apply patch) +external/gpl3/gcc/dist/gcc/lra-constraints.c (apply patch) +external/gpl3/gcc/dist/gcc/lra.c(apply patch)
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Fri Aug 14 11:02:42 UTC 2020
Modified Files:
src/share/mk [netbsd-9]: bsd.own.mk
src/tools/gcc [netbsd-9]: Makefile gcc-version.mk mknative-gcc
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1049):
tools/gcc/mknative-gcc: revision 1.104
tools/gcc/mknative-gcc: revision 1.105
tools/gcc/gcc-version.mk: revision 1.19
share/mk/bsd.own.mk: revision 1.1203
tools/gcc/Makefile: revision 1.98
tools/gcc/mknative-gcc.old: revision 1.7
tools/gcc/mknative-gcc.old: revision 1.8
First pass at mknative for GCC 7.5.0
To generate a diff of this commit:
cvs rdiff -u -r1.1149.2.3 -r1.1149.2.4 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.93 -r1.93.2.1 src/tools/gcc/Makefile
cvs rdiff -u -r1.16 -r1.16.2.1 src/tools/gcc/gcc-version.mk
cvs rdiff -u -r1.101 -r1.101.2.1 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1149.2.3 src/share/mk/bsd.own.mk:1.1149.2.4
--- src/share/mk/bsd.own.mk:1.1149.2.3 Mon Dec 9 15:19:30 2019
+++ src/share/mk/bsd.own.mk Fri Aug 14 11:02:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1149.2.3 2019/12/09 15:19:30 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1149.2.4 2020/08/14 11:02:42 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -75,7 +75,7 @@ EXTERNAL_GCC_SUBDIR?= gcc.old
.elif ${HAVE_GCC} == 7
EXTERNAL_GCC_SUBDIR?= gcc
.else
-EXTERNAL_GCC_SUBDIR=? /does/not/exist
+EXTERNAL_GCC_SUBDIR?= /does/not/exist
.endif
.else
MKGCCCMDS?= no
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.93 src/tools/gcc/Makefile:1.93.2.1
--- src/tools/gcc/Makefile:1.93 Tue Mar 19 05:55:00 2019
+++ src/tools/gcc/Makefile Fri Aug 14 11:02:42 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2019/03/19 05:55:00 mrg Exp $
+# $NetBSD: Makefile,v 1.93.2.1 2020/08/14 11:02:42 martin Exp $
.include
GCC_LANGUAGES=c c++ objc
-MODULE= gcc4
+MODULE= ${EXTERNAL_GCC_SUBDIR}
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
GNUHOSTDIST= ${GCCDIST}
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.16 src/tools/gcc/gcc-version.mk:1.16.2.1
--- src/tools/gcc/gcc-version.mk:1.16 Wed Mar 20 05:09:26 2019
+++ src/tools/gcc/gcc-version.mk Fri Aug 14 11:02:42 2020
@@ -1,9 +1,7 @@
-# $NetBSD: gcc-version.mk,v 1.16 2019/03/20 05:09:26 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.16.2.1 2020/08/14 11:02:42 martin Exp $
# common location for tools and native build
-.if ${HAVE_GCC} == 6
-NETBSD_GCC_VERSION=nb4 20181109
-.elif ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb3 20190319
+.if ${HAVE_GCC} == 7
+NETBSD_GCC_VERSION=nb4 20200810
.endif
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.101 src/tools/gcc/mknative-gcc:1.101.2.1
--- src/tools/gcc/mknative-gcc:1.101 Sat Feb 23 06:54:45 2019
+++ src/tools/gcc/mknative-gcc Fri Aug 14 11:02:42 2020
@@ -1,10 +1,10 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.101.2.1 2020/08/14 11:02:42 martin Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
#
-# This version is for GCC 6.4
+# This version is for GCC 7.5
# initialise
@@ -24,8 +24,15 @@ fi
. $_TOP/tools/gcc/mknative.common
-_OUTDIR="$_TOP/external/gpl3/gcc"
-_OUTDIRBASE="external/gpl3/gcc"
+case $0 in
+ *mknative-gcc.old)
+ _OUTDIRBASE="external/gpl3/gcc.old"
+ ;;
+ *)
+ _OUTDIRBASE="external/gpl3/gcc"
+ ;;
+esac
+_OUTDIR="$_TOP/$_OUTDIRBASE"
sanitise_includes () {
sed \
CVS commit: [netbsd-9] src/external/gpl3/gcc
Module Name:src Committed By: martin Date: Fri Aug 14 10:45:49 UTC 2020 Modified Files: src/external/gpl3/gcc/dist [netbsd-9]: ChangeLog LAST_UPDATED MD5SUMS NEWS src/external/gpl3/gcc/dist/config [netbsd-9]: ChangeLog src/external/gpl3/gcc/dist/contrib [netbsd-9]: ChangeLog test_summary src/external/gpl3/gcc/dist/contrib/header-tools [netbsd-9]: ChangeLog src/external/gpl3/gcc/dist/contrib/reghunt [netbsd-9]: ChangeLog src/external/gpl3/gcc/dist/contrib/regression [netbsd-9]: ChangeLog src/external/gpl3/gcc/dist/fixincludes [netbsd-9]: ChangeLog fixincl.x inclhack.def src/external/gpl3/gcc/dist/fixincludes/tests/base/architecture/ppc [netbsd-9]: math.h src/external/gpl3/gcc/dist/gcc [netbsd-9]: BASE-VER ChangeLog DATESTAMP builtins.c calls.c cfgcleanup.c cfghooks.c cfghooks.h cfgloop.h cfgloopmanip.c cfgrtl.c combine.c config.gcc convert.c dce.c df-core.c dse.c dwarf2out.c except.c explow.c expmed.c expr.c final.c fold-const.c function.c gcse.c gengtype-lex.c ggc-page.c gimple-fold.c gimple-pretty-print.c gimple-ssa-sprintf.c gimple-ssa-strength-reduction.c gimple.c gimple.h gimplify.c graphite-scop-detection.c input.c internal-fn.c internal-fn.h ipa-cp.c ipa-icf-gimple.c ipa-inline.c ipa-prop.c ipa-pure-const.c ipa-reference.c ipa-utils.c ipa-utils.h ira.c loop-unroll.c lra-constraints.c lra.c lto-streamer-in.c lto-streamer-out.c lto-streamer.h lto-wrapper.c match.pd omp-expand.c omp-low.c omp-simd-clone.c optabs.c optc-save-gen.awk opth-gen.awk opts-common.c opts-global.c opts.c resource.c rtl.h rtlanal.c store-motion.c symtab.c toplev.c tree-cfg.c tree-complex.c tree-core.h tree-data-ref.c tree-data-ref.h tree-inline.c tree-inline.h tree-loop-distribution.c tree-outof-ssa.c tree-scalar-evolution.c tree-sra.c tree-ssa-copy.c tree-ssa-dom.c tree-ssa-forwprop.c tree-ssa-loop-ch.c tree-ssa-loop-ivcanon.c tree-ssa-loop-ivopts.c tree-ssa-loop-split.c tree-ssa-math-opts.c tree-ssa-phiopt.c tree-ssa-phiprop.c tree-ssa-pre.c tree-ssa-reassoc.c tree-ssa-sccvn.c tree-ssa-sccvn.h tree-ssa-sink.c tree-ssa-strlen.c tree-ssa-structalias.c tree-ssanames.c tree-streamer-in.c tree-streamer-out.c tree-vect-data-refs.c tree-vect-slp.c tree-vect-stmts.c tree-vrp.c tree.c tree.h valtrack.c varasm.c xcoffout.c xcoffout.h src/external/gpl3/gcc/dist/gcc/brig [netbsd-9]: ChangeLog src/external/gpl3/gcc/dist/gcc/c [netbsd-9]: ChangeLog c-decl.c c-parser.c c-tree.h c-typeck.c src/external/gpl3/gcc/dist/gcc/c-family [netbsd-9]: ChangeLog c-ada-spec.c c-common.c c-lex.c c-omp.c src/external/gpl3/gcc/dist/gcc/config [netbsd-9]: darwin-c.c darwin-driver.c darwin-protos.h darwin.c darwin.h darwin.opt darwin10.h darwin9.h src/external/gpl3/gcc/dist/gcc/config/aarch64 [netbsd-9]: aarch64-c.c aarch64.md cortex-a57-fma-steering.c iterators.md src/external/gpl3/gcc/dist/gcc/config/alpha [netbsd-9]: alpha.c src/external/gpl3/gcc/dist/gcc/config/arm [netbsd-9]: arm.c arm.h arm.md constraints.md neon.md t-rtems src/external/gpl3/gcc/dist/gcc/config/avr [netbsd-9]: avr.c src/external/gpl3/gcc/dist/gcc/config/i386 [netbsd-9]: avx2intrin.h avxintrin.h cpuid.h darwin.h darwin64.h emmintrin.h i386-builtin.def i386.c i386.h i386.md sse.md t-darwin t-darwin64 src/external/gpl3/gcc/dist/gcc/config/nvptx [netbsd-9]: nvptx.c src/external/gpl3/gcc/dist/gcc/config/pa [netbsd-9]: pa.c pa.md src/external/gpl3/gcc/dist/gcc/config/rs6000 [netbsd-9]: altivec.h altivec.md crypto.md darwin.h darwin.md darwin64.h darwin7.h rs6000-builtin.def rs6000-c.c rs6000.c rs6000.md t-darwin64 t-darwin8 t-linux vsx.md src/external/gpl3/gcc/dist/gcc/config/s390 [netbsd-9]: s390-builtins.def s390.c s390.md vector.md vx-builtins.md src/external/gpl3/gcc/dist/gcc/config/sh [netbsd-9]: sh.c sh.h sh.md src/external/gpl3/gcc/dist/gcc/config/sparc [netbsd-9]: sparc.c sparc.md src/external/gpl3/gcc/dist/gcc/config/xtensa [netbsd-9]: xtensa.c src/external/gpl3/gcc/dist/gcc/cp [netbsd-9]: ChangeLog call.c class.c config-lang.in constexpr.c cp-tree.h decl.c decl2.c init.c lambda.c optimize.c parser.c pt.c semantics.c typeck.c vtable-class-hierarchy.c src/external/gpl3/gcc/dist/gcc/doc [netbsd-9]: cpp.1 cpp.info cppinternals.info extend.texi fsf-funding.7 g++.1 gcc.1 gcc.info gccinstall.info gccint.info gcov-dump.1
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: martin Date: Fri Aug 14 10:34:22 UTC 2020 Modified Files: src/sys/arch/sparc/sparc: autoconf.c Log Message: Adapt to new proplib api To generate a diff of this commit: cvs rdiff -u -r1.260 -r1.261 src/sys/arch/sparc/sparc/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/sparc/autoconf.c diff -u src/sys/arch/sparc/sparc/autoconf.c:1.260 src/sys/arch/sparc/sparc/autoconf.c:1.261 --- src/sys/arch/sparc/sparc/autoconf.c:1.260 Mon Jun 8 02:27:08 2020 +++ src/sys/arch/sparc/sparc/autoconf.c Fri Aug 14 10:34:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.260 2020/06/08 02:27:08 mrg Exp $ */ +/* $NetBSD: autoconf.c,v 1.261 2020/08/14 10:34:22 martin Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.260 2020/06/08 02:27:08 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.261 2020/08/14 10:34:22 martin Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -1636,7 +1636,7 @@ set_network_props(device_t dev, void *au prom_getether(ofnode, eaddr); dict = device_properties(dev); - blob = prop_data_create_data(eaddr, ETHER_ADDR_LEN); + blob = prop_data_create_copy(eaddr, ETHER_ADDR_LEN); prop_dictionary_set(dict, "mac-address", blob); prop_object_release(blob); }
CVS commit: src/sys/dev/vme
Module Name:src Committed By: martin Date: Fri Aug 14 10:31:40 UTC 2020 Modified Files: src/sys/dev/vme: if_ie_vme.c Log Message: Adapt to new proplib api To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/vme/if_ie_vme.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/vme/if_ie_vme.c diff -u src/sys/dev/vme/if_ie_vme.c:1.32 src/sys/dev/vme/if_ie_vme.c:1.33 --- src/sys/dev/vme/if_ie_vme.c:1.32 Thu Apr 25 10:08:46 2019 +++ src/sys/dev/vme/if_ie_vme.c Fri Aug 14 10:31:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie_vme.c,v 1.32 2019/04/25 10:08:46 msaitoh Exp $ */ +/* $NetBSD: if_ie_vme.c,v 1.33 2020/08/14 10:31:40 martin Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor @@ -140,7 +140,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.32 2019/04/25 10:08:46 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.33 2020/08/14 10:31:40 martin Exp $"); #include #include @@ -559,7 +559,7 @@ ie_vme_attach(device_t parent, device_t eaddrprop = prop_dictionary_get(device_properties(self), "mac-address"); if (eaddrprop != NULL && prop_data_size(eaddrprop) == ETHER_ADDR_LEN) - memcpy(myaddr, prop_data_data_nocopy(eaddrprop), + memcpy(myaddr, prop_data_value(eaddrprop), ETHER_ADDR_LEN); i82586_attach(sc, "multibus/vme", myaddr, media, NMEDIA, media[0]);
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: chs
Date: Fri Aug 14 09:28:29 UTC 2020
Modified Files:
src/sys/dev/ic: ld_icp.c
Log Message:
fix a bit that I missed in the device_t/softc split 8 years ago.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ic/ld_icp.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/ic/ld_icp.c
diff -u src/sys/dev/ic/ld_icp.c:1.31 src/sys/dev/ic/ld_icp.c:1.32
--- src/sys/dev/ic/ld_icp.c:1.31 Mon Feb 27 21:32:33 2017
+++ src/sys/dev/ic/ld_icp.c Fri Aug 14 09:28:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_icp.c,v 1.31 2017/02/27 21:32:33 jdolecek Exp $ */
+/* $NetBSD: ld_icp.c,v 1.32 2020/08/14 09:28:29 chs Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.31 2017/02/27 21:32:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.32 2020/08/14 09:28:29 chs Exp $");
#include
#include
@@ -167,11 +167,12 @@ ld_icp_attach(device_t parent, device_t
static int
ld_icp_detach(device_t dv, int flags)
{
+ struct ld_softc *ldsc = device_private(dv);
int rv;
- if ((rv = ldbegindetach((struct ld_softc *)dv, flags)) != 0)
+ if ((rv = ldbegindetach(ldsc, flags)) != 0)
return (rv);
- ldenddetach((struct ld_softc *) dv);
+ ldenddetach(ldsc);
return (0);
}
@@ -345,7 +346,7 @@ static void
ld_icp_adjqparam(device_t dv, int openings)
{
- ldadjqparam((struct ld_softc *) dv, openings);
+ ldadjqparam(device_private(dv), openings);
}
MODULE(MODULE_CLASS_DRIVER, ld_icp, "ld"); /* no icp module yet */
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: chs
Date: Fri Aug 14 09:26:40 UTC 2020
Modified Files:
src/sys/dev/ic: icp.c
Log Message:
restore the initialization of icp->icp_ccbs that I removed by mistake.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/icp.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/ic/icp.c
diff -u src/sys/dev/ic/icp.c:1.33 src/sys/dev/ic/icp.c:1.34
--- src/sys/dev/ic/icp.c:1.33 Sun Nov 10 21:16:35 2019
+++ src/sys/dev/ic/icp.c Fri Aug 14 09:26:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: icp.c,v 1.33 2019/11/10 21:16:35 chs Exp $ */
+/* $NetBSD: icp.c,v 1.34 2020/08/14 09:26:40 chs Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.33 2019/11/10 21:16:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.34 2020/08/14 09:26:40 chs Exp $");
#include
#include
@@ -179,6 +179,7 @@ icp_init(struct icp_softc *icp, const ch
* Allocate and initialize the command control blocks.
*/
ic = malloc(sizeof(*ic) * ICP_NCCBS, M_DEVBUF, M_WAITOK | M_ZERO);
+ icp->icp_ccbs = ic;
state++;
for (i = 0; i < ICP_NCCBS; i++, ic++) {
CVS commit: src/sys
Module Name:src
Committed By: chs
Date: Fri Aug 14 09:06:15 UTC 2020
Modified Files:
src/sys/miscfs/genfs: genfs_io.c
src/sys/uvm: uvm_extern.h uvm_object.c uvm_object.h uvm_page.c
uvm_page_status.c uvm_pager.c uvm_vnode.c
Log Message:
centralize calls from UVM to radixtree into a few functions.
in those functions, assert that the object lock is held in
the correct mode.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.230 -r1.231 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.23 -r1.24 src/sys/uvm/uvm_object.c
cvs rdiff -u -r1.38 -r1.39 src/sys/uvm/uvm_object.h
cvs rdiff -u -r1.244 -r1.245 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.5 -r1.6 src/sys/uvm/uvm_page_status.c
cvs rdiff -u -r1.128 -r1.129 src/sys/uvm/uvm_pager.c
cvs rdiff -u -r1.115 -r1.116 src/sys/uvm/uvm_vnode.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.99 src/sys/miscfs/genfs/genfs_io.c:1.100
--- src/sys/miscfs/genfs/genfs_io.c:1.99 Mon Aug 10 11:09:15 2020
+++ src/sys/miscfs/genfs/genfs_io.c Fri Aug 14 09:06:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.99 2020/08/10 11:09:15 rin Exp $ */
+/* $NetBSD: genfs_io.c,v 1.100 2020/08/14 09:06:14 chs Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.99 2020/08/10 11:09:15 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.100 2020/08/14 09:06:14 chs Exp $");
#include
#include
@@ -913,8 +913,7 @@ retry:
* shortcut if we have no pages to process.
*/
- nodirty = radix_tree_empty_tagged_tree_p(>uo_pages,
-UVM_PAGE_DIRTY_TAG);
+ nodirty = uvm_obj_clean_p(uobj);
#ifdef DIAGNOSTIC
mutex_enter(vp->v_interlock);
KASSERT((vp->v_iflag & VI_ONWORKLST) != 0 || nodirty);
@@ -922,9 +921,8 @@ retry:
#endif
if (uobj->uo_npages == 0 || (dirtyonly && nodirty)) {
mutex_enter(vp->v_interlock);
- if (vp->v_iflag & VI_ONWORKLST) {
- if (LIST_FIRST(>v_dirtyblkhd) == NULL)
-vn_syncer_remove_from_worklist(vp);
+ if (vp->v_iflag & VI_ONWORKLST && LIST_EMPTY(>v_dirtyblkhd)) {
+ vn_syncer_remove_from_worklist(vp);
}
mutex_exit(vp->v_interlock);
if (trans_mp) {
@@ -978,8 +976,7 @@ retry:
}
error = 0;
- wasclean = radix_tree_empty_tagged_tree_p(>uo_pages,
-UVM_PAGE_WRITEBACK_TAG);
+ wasclean = uvm_obj_nowriteback_p(uobj);
nextoff = startoff;
if (endoff == 0 || flags & PGO_ALLPAGES) {
endoff = trunc_page(LLONG_MAX);
@@ -1030,8 +1027,7 @@ retry:
KASSERT(pg->offset >= nextoff);
KASSERT(!dirtyonly ||
uvm_pagegetdirty(pg) != UVM_PAGE_STATUS_CLEAN ||
- radix_tree_get_tag(>uo_pages,
- pg->offset >> PAGE_SHIFT, UVM_PAGE_WRITEBACK_TAG));
+ uvm_obj_page_writeback_p(pg));
if (pg->offset >= endoff) {
break;
@@ -1245,9 +1241,7 @@ retry:
* mark pages as WRITEBACK so that concurrent
* fsync can find and wait for our activities.
*/
-radix_tree_set_tag(>uo_pages,
-pgs[i]->offset >> PAGE_SHIFT,
-UVM_PAGE_WRITEBACK_TAG);
+uvm_obj_page_set_writeback(pgs[i]);
}
if (tpg->offset < startoff || tpg->offset >= endoff)
continue;
@@ -1332,11 +1326,9 @@ retry:
* syncer list.
*/
- if ((vp->v_iflag & VI_ONWORKLST) != 0 &&
- radix_tree_empty_tagged_tree_p(>uo_pages,
- UVM_PAGE_DIRTY_TAG)) {
- if (LIST_FIRST(>v_dirtyblkhd) == NULL)
- vn_syncer_remove_from_worklist(vp);
+ if ((vp->v_iflag & VI_ONWORKLST) != 0 && uvm_obj_clean_p(uobj) &&
+ LIST_EMPTY(>v_dirtyblkhd)) {
+ vn_syncer_remove_from_worklist(vp);
}
#if !defined(DEBUG)
Index: src/sys/uvm/uvm_extern.h
diff -u src/sys/uvm/uvm_extern.h:1.230 src/sys/uvm/uvm_extern.h:1.231
--- src/sys/uvm/uvm_extern.h:1.230 Sun Jun 14 22:25:15 2020
+++ src/sys/uvm/uvm_extern.h Fri Aug 14 09:06:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_extern.h,v 1.230 2020/06/14 22:25:15 ad Exp $ */
+/* $NetBSD: uvm_extern.h,v 1.231 2020/08/14 09:06:15 chs Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -776,6 +776,14 @@ void uvm_obj_destroy(struct uvm_object
int uvm_obj_wirepages(struct uvm_object *, off_t, off_t,
struct pglist *);
void uvm_obj_unwirepages(struct uvm_object *, off_t, off_t);
+bool uvm_obj_clean_p(struct uvm_object *);
+bool uvm_obj_nowriteback_p(struct uvm_object *);
+bool uvm_obj_page_dirty_p(struct vm_page *);
+void uvm_obj_page_set_dirty(struct vm_page *);
+void uvm_obj_page_clear_dirty(struct vm_page *);
+bool uvm_obj_page_writeback_p(struct vm_page *);
+void uvm_obj_page_set_writeback(struct vm_page *);
+void uvm_obj_page_clear_writeback(struct vm_page *);
/* uvm_page.c */
int uvm_availmem(bool);
@@ -826,7 +834,6 @@ int uvn_findpages(struct uvm_object *,
unsigned int *, struct
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Fri Aug 14 08:46:54 UTC 2020
Modified Files:
src/usr.sbin/sysinst: label.c
Log Message:
PR 55572: avoid crash when answering the mount point prompt for a previously
empty mount point with an emptry sting.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/sysinst/label.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.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.20 src/usr.sbin/sysinst/label.c:1.21
--- src/usr.sbin/sysinst/label.c:1.20 Mon Jan 27 21:21:22 2020
+++ src/usr.sbin/sysinst/label.c Fri Aug 14 08:46:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.20 2020/01/27 21:21:22 martin Exp $ */
+/* $NetBSD: label.c,v 1.21 2020/08/14 08:46:54 martin Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.20 2020/01/27 21:21:22 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.21 2020/08/14 08:46:54 martin Exp $");
#endif
#include
@@ -356,7 +356,7 @@ edit_fs_mountpt(menudesc *m, void *arg)
if (last != NULL)
last[1] = 0;
- if (*first == 0 || strcmp(first, "none") == 0) {
+ if (first == NULL || *first == 0 || strcmp(first, "none") == 0) {
edit->wanted->mount[0] = 0;
edit->wanted->instflags &= ~PUIINST_MOUNT;
return 0;
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Fri Aug 14 08:19:26 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/aarch64/aarch64/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.86 src/sys/arch/aarch64/aarch64/pmap.c:1.87
--- src/sys/arch/aarch64/aarch64/pmap.c:1.86 Wed Aug 12 13:36:36 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c Fri Aug 14 08:19:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.86 2020/08/12 13:36:36 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.87 2020/08/14 08:19:26 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.86 2020/08/12 13:36:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.87 2020/08/14 08:19:26 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -1998,7 +1998,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
if (pps[0] != NULL)
pmap_pv_unlock(pps[0]);
fail0:
- if (!kenter) {
+ if (!kenter) {
pm_unlock(pm);
/* spare pv was not used. discard */
CVS commit: src/tests/share/mk
Module Name:src
Committed By: martin
Date: Fri Aug 14 06:23:49 UTC 2020
Modified Files:
src/tests/share/mk: t_test.sh
Log Message:
Fix C++ file suffix (.cpp -> .cc)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/share/mk/t_test.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/share/mk/t_test.sh
diff -u src/tests/share/mk/t_test.sh:1.2 src/tests/share/mk/t_test.sh:1.3
--- src/tests/share/mk/t_test.sh:1.2 Sat Mar 12 08:55:54 2016
+++ src/tests/share/mk/t_test.sh Fri Aug 14 06:23:49 2020
@@ -77,7 +77,7 @@ EOF
atf_test_case one_cxx
one_cxx_body() {
- cat >t_fake.cpp
