CVS commit: src/sbin/fsck_ffs
Module Name:src
Committed By: dholland
Date: Mon Jul 25 05:15:08 UTC 2022
Modified Files:
src/sbin/fsck_ffs: wapbl.c
Log Message:
Fix misleading fsck_ffs messages about wapbl journal replay.
Apparently fsck doesn't have a way to replay it to its internal memory
only. (Someone(TM) should implement this...)
This means that if you use -n, it can't replay the journal. But the
sequence of prints is such that it looks like it did. This is quite
misleading. Add an additional specific warning.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/fsck_ffs/wapbl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/wapbl.c
diff -u src/sbin/fsck_ffs/wapbl.c:1.5 src/sbin/fsck_ffs/wapbl.c:1.6
--- src/sbin/fsck_ffs/wapbl.c:1.5 Sat Mar 6 11:31:40 2010
+++ src/sbin/fsck_ffs/wapbl.c Mon Jul 25 05:15:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wapbl.c,v 1.5 2010/03/06 11:31:40 mlelstv Exp $ */
+/* $NetBSD: wapbl.c,v 1.6 2022/07/25 05:15:08 dholland Exp $ */
/*-
* Copyright (c) 2005,2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define WAPBL_INTERNAL
#include
-__KERNEL_RCSID(0, "$NetBSD: wapbl.c,v 1.5 2010/03/06 11:31:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wapbl.c,v 1.6 2022/07/25 05:15:08 dholland Exp $");
#include
#include
@@ -92,7 +92,16 @@ replay_wapbl(void)
{
int error;
- if (!nflag) {
+ if (nflag) {
+ /*
+ * XXX: we ought to have a mode where we can replay
+ * the journal to memory, similar to what happens in
+ * the kernel with a readonly mount. For now though
+ * just print that we aren't doing it so as to avoid
+ * lying to the user.
+ */
+ pwarn("CANNOT REPLAY JOURNAL IN -n MODE; continuing anyway\n");
+ } else {
error = wapbl_replay_write(wapbl_replay, 0);
if (error) {
pfatal("UNABLE TO REPLAY JOURNAL BLOCKS");
CVS commit: src/sbin/fsck_ffs
Module Name:src Committed By: dholland Date: Mon Jul 25 05:15:08 UTC 2022 Modified Files: src/sbin/fsck_ffs: wapbl.c Log Message: Fix misleading fsck_ffs messages about wapbl journal replay. Apparently fsck doesn't have a way to replay it to its internal memory only. (Someone(TM) should implement this...) This means that if you use -n, it can't replay the journal. But the sequence of prints is such that it looks like it did. This is quite misleading. Add an additional specific warning. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sbin/fsck_ffs/wapbl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k/m68k
Module Name:src
Committed By: chs
Date: Mon Jul 25 01:59:26 UTC 2022
Modified Files:
src/sys/arch/m68k/m68k: db_trace.c
Log Message:
use the pcb of the thread we are tracing rather than always curlwp.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/m68k/m68k/db_trace.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/m68k/m68k/db_trace.c
diff -u src/sys/arch/m68k/m68k/db_trace.c:1.59 src/sys/arch/m68k/m68k/db_trace.c:1.60
--- src/sys/arch/m68k/m68k/db_trace.c:1.59 Sun Oct 18 17:13:32 2015
+++ src/sys/arch/m68k/m68k/db_trace.c Mon Jul 25 01:59:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.59 2015/10/18 17:13:32 maxv Exp $ */
+/* $NetBSD: db_trace.c,v 1.60 2022/07/25 01:59:26 chs Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.59 2015/10/18 17:13:32 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.60 2022/07/25 01:59:26 chs Exp $");
#include
#include
@@ -393,6 +393,7 @@ db_stack_trace_print(db_expr_t addr, boo
const char * name;
struct stackpos pos;
struct pcb *pcb;
+ struct lwp *l;
#ifdef _KERNEL
bool kernel_only = true;
#endif
@@ -417,12 +418,12 @@ db_stack_trace_print(db_expr_t addr, boo
}
}
+ l = curlwp;
if (!have_addr)
stacktop(_regs, , pr);
else {
if (trace_thread) {
struct proc *p;
- struct lwp *l;
if (lwpaddr) {
l = (struct lwp *)addr;
@@ -554,7 +555,7 @@ db_stack_trace_print(db_expr_t addr, boo
* Stop tracing if frame ptr no longer points into kernel
* stack.
*/
- pcb = lwp_getpcb(curlwp);
+ pcb = lwp_getpcb(l);
if (kernel_only && !INKERNEL(pos.k_fp, pcb))
break;
if (nextframe(, pcb, kernel_only, pr) == 0)
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: chs Date: Mon Jul 25 01:59:26 UTC 2022 Modified Files: src/sys/arch/m68k/m68k: db_trace.c Log Message: use the pcb of the thread we are tracing rather than always curlwp. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/m68k/m68k/db_trace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/arch/aarch64/include
"Taylor R Campbell" writes: > Module Name: src > Committed By: riastradh > Date: Sun Jul 24 20:28:32 UTC 2022 > > Modified Files: > src/sys/arch/aarch64/include: lock.h > > Log Message: > aarch64/lock.h: Need for _HARDKERNEL. > > Add include guard while here. > > XXX Why does this aarch64-specific file have #ifdef __aarch64__? there're __aarch32__ / __arm32__ environments that supported on arm64 hosts. (clang better than gcc.) .mrg.
CVS commit: src/sys/sys
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:28:39 UTC 2022 Modified Files: src/sys/sys: lock.h Log Message: sys/lock.h: Need for nullop. But only do that we're not using SPINLOCK_BACKOFF_HOOK from . To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/sys/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/lock.h diff -u src/sys/sys/lock.h:1.91 src/sys/sys/lock.h:1.92 --- src/sys/sys/lock.h:1.91 Tue Dec 22 01:58:58 2020 +++ src/sys/sys/lock.h Sun Jul 24 20:28:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.91 2020/12/22 01:58:58 ad Exp $ */ +/* $NetBSD: lock.h,v 1.92 2022/07/24 20:28:39 riastradh Exp $ */ /*- * Copyright (c) 1999, 2000, 2006, 2007 The NetBSD Foundation, Inc. @@ -51,6 +51,7 @@ #define SPINLOCK_SPIN_HOOK #endif #ifndef SPINLOCK_BACKOFF_HOOK +#include #define SPINLOCK_BACKOFF_HOOK nullop(NULL) #endif #ifndef SPINLOCK_BACKOFF_MIN
CVS commit: src/sys/sys
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:28:39 UTC 2022 Modified Files: src/sys/sys: lock.h Log Message: sys/lock.h: Need for nullop. But only do that we're not using SPINLOCK_BACKOFF_HOOK from . To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/sys/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:28:32 UTC 2022 Modified Files: src/sys/arch/aarch64/include: lock.h Log Message: aarch64/lock.h: Need for _HARDKERNEL. Add include guard while here. XXX Why does this aarch64-specific file have #ifdef __aarch64__? To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/include/lock.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/aarch64/include/lock.h diff -u src/sys/arch/aarch64/include/lock.h:1.4 src/sys/arch/aarch64/include/lock.h:1.5 --- src/sys/arch/aarch64/include/lock.h:1.4 Sun Sep 26 20:15:04 2021 +++ src/sys/arch/aarch64/include/lock.h Sun Jul 24 20:28:32 2022 @@ -1,4 +1,9 @@ -/* $NetBSD: lock.h,v 1.4 2021/09/26 20:15:04 jmcneill Exp $ */ +/* $NetBSD: lock.h,v 1.5 2022/07/24 20:28:32 riastradh Exp $ */ + +#ifndef _AARCH64_LOCK_H_ +#define _AARCH64_LOCK_H_ + +#include #ifdef __aarch64__ # ifdef _HARDKERNEL @@ -11,3 +16,5 @@ #elif defined(__arm__) # include #endif + +#endif /* _AARCH64_LOCK_H_ */
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:28:32 UTC 2022 Modified Files: src/sys/arch/aarch64/include: lock.h Log Message: aarch64/lock.h: Need for _HARDKERNEL. Add include guard while here. XXX Why does this aarch64-specific file have #ifdef __aarch64__? To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/include/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jul 24 20:25:23 UTC 2022
Modified Files:
src/usr.bin/make: parse.c
src/usr.bin/make/unit-tests: parse.exp parse.mk
Log Message:
make: fix out-of-bounds read when parsing an invalid line
Reported by Robert Morris in https://bugs.freebsd.org/265119.
Since 2021-12-14.
To generate a diff of this commit:
cvs rdiff -u -r1.680 -r1.681 src/usr.bin/make/parse.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/parse.exp \
src/usr.bin/make/unit-tests/parse.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/parse.c
diff -u src/usr.bin/make/parse.c:1.680 src/usr.bin/make/parse.c:1.681
--- src/usr.bin/make/parse.c:1.680 Sun Jun 12 13:37:32 2022
+++ src/usr.bin/make/parse.c Sun Jul 24 20:25:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.680 2022/06/12 13:37:32 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.681 2022/07/24 20:25:23 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.680 2022/06/12 13:37:32 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.681 2022/07/24 20:25:23 rillig Exp $");
/*
* A file being read.
@@ -1104,10 +1104,12 @@ ParseDependencyOp(char **pp)
{
if (**pp == '!')
return (*pp)++, OP_FORCE;
- if ((*pp)[1] == ':')
+ if (**pp == ':' && (*pp)[1] == ':')
return *pp += 2, OP_DOUBLEDEP;
- else
+ else if (**pp == ':')
return (*pp)++, OP_DEPENDS;
+ else
+ return OP_NONE;
}
static void
@@ -1562,6 +1564,7 @@ ParseDependency(char *line)
ParseSpecial special; /* in special targets, the children are
* linked as children of the parent but not
* vice versa */
+ GNodeType op;
DEBUG1(PARSE, "ParseDependency(%s)\n", line);
p = line;
@@ -1575,7 +1578,12 @@ ParseDependency(char *line)
if (!Lst_IsEmpty(targets))
CheckSpecialMundaneMixture(special);
- ApplyDependencyOperator(ParseDependencyOp());
+ op = ParseDependencyOp();
+ if (op == OP_NONE) {
+ InvalidLineType(line);
+ goto out;
+ }
+ ApplyDependencyOperator(op);
pp_skip_whitespace();
Index: src/usr.bin/make/unit-tests/parse.exp
diff -u src/usr.bin/make/unit-tests/parse.exp:1.2 src/usr.bin/make/unit-tests/parse.exp:1.3
--- src/usr.bin/make/unit-tests/parse.exp:1.2 Sat Jan 22 17:10:51 2022
+++ src/usr.bin/make/unit-tests/parse.exp Sun Jul 24 20:25:23 2022
@@ -1,5 +1,6 @@
make: "parse.mk" line 7: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
make: "parse.mk" line 14: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
+make: "parse.mk" line 24: Invalid line type
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/parse.mk
diff -u src/usr.bin/make/unit-tests/parse.mk:1.2 src/usr.bin/make/unit-tests/parse.mk:1.3
--- src/usr.bin/make/unit-tests/parse.mk:1.2 Sat Jan 22 17:10:51 2022
+++ src/usr.bin/make/unit-tests/parse.mk Sun Jul 24 20:25:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: parse.mk,v 1.2 2022/01/22 17:10:51 rillig Exp $
+# $NetBSD: parse.mk,v 1.3 2022/07/24 20:25:23 rillig Exp $
#
# Test those parts of the parsing that do not belong in any of the other
# categories.
@@ -12,3 +12,13 @@
# expect+1: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
>> new
+
+
+# Since parse.c 1.578 from 2021-12-14 and before parse.c 1.681 from
+# 2022-07-24, if a line of a makefile could only be a dependency specification
+# but didn't contain any of the dependency operators ':', '!', '::' and its
+# expansion ended with a space, make read a single byte from the memory beyond
+# the expanded line's terminating '\0'.
+#
+# https://bugs.freebsd.org/265119
+one-target ${:U }
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jul 24 20:25:23 UTC 2022 Modified Files: src/usr.bin/make: parse.c src/usr.bin/make/unit-tests: parse.exp parse.mk Log Message: make: fix out-of-bounds read when parsing an invalid line Reported by Robert Morris in https://bugs.freebsd.org/265119. Since 2021-12-14. To generate a diff of this commit: cvs rdiff -u -r1.680 -r1.681 src/usr.bin/make/parse.c cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/parse.exp \ src/usr.bin/make/unit-tests/parse.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:05:08 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc: os_types.h Log Message: amdgpu: Define DC_FPU_START/END on Arm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h:1.4 --- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h:1.3 Sun Dec 19 11:35:07 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h Sun Jul 24 20:05:08 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: os_types.h,v 1.3 2021/12/19 11:35:07 riastradh Exp $ */ +/* $NetBSD: os_types.h,v 1.4 2022/07/24 20:05:08 riastradh Exp $ */ /* * Copyright 2012-16 Advanced Micro Devices, Inc. @@ -53,16 +53,21 @@ #define dm_error(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__) #if defined(CONFIG_DRM_AMD_DC_DCN) -#if defined(CONFIG_X86) #ifdef __NetBSD__ +#if defined(__i386__) || defined(__x86_64__) #include #define DC_FP_START() fpu_kern_enter() #define DC_FP_END() fpu_kern_leave() -#else +#elif defined(__arm__) || defined(__aarch64__) +#include +#define DC_FP_START() fpu_kern_enter() +#define DC_FP_END() fpu_kern_leave() +#endif +#else /* !__NetBSD__ */ +#if defined(CONFIG_X86) #include #define DC_FP_START() kernel_fpu_begin() #define DC_FP_END() kernel_fpu_end() -#endif #elif defined(CONFIG_PPC64) #include #include @@ -92,6 +97,7 @@ } #endif #endif +#endif /* *
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:05:08 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc: os_types.h Log Message: amdgpu: Define DC_FPU_START/END on Arm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: riastradh
Date: Sun Jul 24 20:05:01 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/amdgpu: files.amdgpu
src/sys/modules/amdgpu: Makefile
Log Message:
amdgpu: Sprinkle missing COPTS.amdgpu_float options.
For some reason x86 didn't need these but aarch64 does.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/amdgpu/files.amdgpu
diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.28 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.29
--- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.28 Sat Jul 23 12:52:09 2022
+++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu Sun Jul 24 20:05:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.amdgpu,v 1.28 2022/07/23 12:52:09 riastradh Exp $
+# $NetBSD: files.amdgpu,v 1.29 2022/07/24 20:05:00 riastradh Exp $
version 20180827
@@ -70,6 +70,7 @@ elifdef aarch64
makeoptions amdgpu "COPTS.amdgpu_float"+="-march=armv8-a"
endif
+makeoptions amdgpu "COPTS.amdgpu_dcn10_resource.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dcn20_resource.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dcn21_resource.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dcn_calc_auto.c"+="${COPTS.amdgpu_float}"
@@ -82,10 +83,12 @@ makeoptions amdgpu "COPTS.amdgpu_display
makeoptions amdgpu "COPTS.amdgpu_display_rq_dlg_calc_20.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_display_rq_dlg_calc_20v2.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_display_rq_dlg_calc_21.c"+="${COPTS.amdgpu_float}"
+makeoptions amdgpu "COPTS.amdgpu_display_rq_dlg_helpers.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dml1_display_rq_dlg_calc.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dml_common_defs.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_rc_calc.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_rc_calc_dpi.c"+="${COPTS.amdgpu_float}"
+makeoptions amdgpu "COPTS.amdgpu_rn_clk_mgr.c"+="${COPTS.amdgpu_float}"
# Local additions.
file external/bsd/drm2/amdgpu/amdgpu_module.c amdgpu
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.1 src/sys/modules/amdgpu/Makefile:1.2
--- src/sys/modules/amdgpu/Makefile:1.1 Sun Dec 19 12:39:09 2021
+++ src/sys/modules/amdgpu/Makefile Sun Jul 24 20:05:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/19 12:39:09 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/24 20:05:00 riastradh Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -54,6 +54,7 @@ CWARNFLAGS.amdgpu_navi10_ppt.c+= -Wno-ty
CWARNFLAGS.amdgpu_rn_clk_mgr.c+= -Wno-type-limits
CWARNFLAGS.amdgpu_vega10_reg_init.c+= -Wno-cast-qual
CWARNFLAGS.amdgpu_vega20_reg_init.c+= -Wno-cast-qual
+COPTS.amdgpu_dcn10_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn20_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn21_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn_calc_auto.c+= ${COPTS.amdgpu_float}
@@ -66,10 +67,12 @@ COPTS.amdgpu_display_mode_vba_21.c+= ${C
COPTS.amdgpu_display_rq_dlg_calc_20.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_display_rq_dlg_calc_20v2.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_display_rq_dlg_calc_21.c+= ${COPTS.amdgpu_float}
+COPTS.amdgpu_display_rq_dlg_helpers.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dml1_display_rq_dlg_calc.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dml_common_defs.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_rc_calc.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_rc_calc_dpi.c+= ${COPTS.amdgpu_float}
+COPTS.amdgpu_rn_clk_mgr.c+= ${COPTS.amdgpu_float}
# sed -ne 's,^file \(external/bsd/drm2/.*\)/[^/ ]* .*,.PATH: \1,gp'
CVS commit: src/sys
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:05:01 UTC 2022 Modified Files: src/sys/external/bsd/drm2/amdgpu: files.amdgpu src/sys/modules/amdgpu: Makefile Log Message: amdgpu: Sprinkle missing COPTS.amdgpu_float options. For some reason x86 didn't need these but aarch64 does. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/amdgpu/files.amdgpu cvs rdiff -u -r1.1 -r1.2 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src
Committed By: riastradh
Date: Sun Jul 24 19:24:00 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Log Message:
drm: Fix CPPFLAGS for drm scheduler code.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/external/bsd/drm2/drm/files.drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.80 src/sys/external/bsd/drm2/drm/files.drmkms:1.81
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.80 Sat Jul 23 12:52:10 2022
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Jul 24 19:23:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.80 2022/07/23 12:52:10 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.81 2022/07/24 19:23:59 riastradh Exp $
version 20180827
@@ -99,7 +99,7 @@ file external/bsd/drm2/drm/drm_scatter.c
# GPU scheduler
define drmkms_sched: drmkms
-makeoptions drmkms_sched "CPPFLAGS.drmsched"+="${CPPFLAGS.drmkms}"
+makeoptions drmkms_sched "CPPFLAGS.drmkms_sched"+="${CPPFLAGS.drmkms}"
file external/bsd/drm2/dist/drm/scheduler/sched_entity.c drmkms_sched
file external/bsd/drm2/dist/drm/scheduler/sched_fence.c drmkms_sched
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Jul 24 19:24:00 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Fix CPPFLAGS for drm scheduler code. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/external/bsd/drm2/drm/files.drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Sun Jul 24 19:23:44 UTC 2022
Modified Files:
src/sys/kern: kern_event.c
Log Message:
kern_event.c: Mark KASSERT-only static function as __diagused.
Otherwise clang objects with -Wunneeded-internal-declaration.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/kern/kern_event.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.145 src/sys/kern/kern_event.c:1.146
--- src/sys/kern/kern_event.c:1.145 Tue Jul 19 01:03:05 2022
+++ src/sys/kern/kern_event.c Sun Jul 24 19:23:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.145 2022/07/19 01:03:05 thorpej Exp $ */
+/* $NetBSD: kern_event.c,v 1.146 2022/07/24 19:23:44 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009, 2021 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#endif /* _KERNEL_OPT */
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.145 2022/07/19 01:03:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.146 2022/07/24 19:23:44 riastradh Exp $");
#include
#include
@@ -169,7 +169,7 @@ knote_foplock_exit(struct knote *kn)
mutex_exit(_TO_KIMPL(kn)->ki_foplock);
}
-static inline bool
+static inline bool __diagused
knote_foplock_owned(struct knote *kn)
{
return mutex_owned(_TO_KIMPL(kn)->ki_foplock);
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Sun Jul 24 19:23:44 UTC 2022 Modified Files: src/sys/kern: kern_event.c Log Message: kern_event.c: Mark KASSERT-only static function as __diagused. Otherwise clang objects with -Wunneeded-internal-declaration. To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.146 src/sys/kern/kern_event.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src Committed By: mrg Date: Sun Jul 24 18:04:48 UTC 2022 Modified Files: src/sys/conf: files Log Message: use defparam; noted by tnn@. To generate a diff of this commit: cvs rdiff -u -r1.1300 -r1.1301 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1300 src/sys/conf/files:1.1301 --- src/sys/conf/files:1.1300 Sat Jul 23 19:15:28 2022 +++ src/sys/conf/files Sun Jul 24 18:04:48 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1300 2022/07/23 19:15:28 mrg Exp $ +# $NetBSD: files,v 1.1301 2022/07/24 18:04:48 mrg Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -142,7 +142,7 @@ defflag opt_rnd_printf.h RND_PRINTF defflag opt_todr.h TODR_DEBUG -defopt opt_maxlwp.h MAXLWP +defparam opt_maxlwp.h MAXLWP # compatibility options #
CVS commit: src/sys/conf
Module Name:src Committed By: mrg Date: Sun Jul 24 18:04:48 UTC 2022 Modified Files: src/sys/conf: files Log Message: use defparam; noted by tnn@. To generate a diff of this commit: cvs rdiff -u -r1.1300 -r1.1301 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Jul 24 11:52:46 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket #1481 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-9.3 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.3 diff -u src/doc/CHANGES-9.3:1.1.2.112 src/doc/CHANGES-9.3:1.1.2.113 --- src/doc/CHANGES-9.3:1.1.2.112 Sun Jul 17 12:56:05 2022 +++ src/doc/CHANGES-9.3 Sun Jul 24 11:52:46 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.112 2022/07/17 12:56:05 martin Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.113 2022/07/24 11:52:46 martin Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -1885,3 +1885,8 @@ usr.bin/vmstat/vmstat.c1.255 when operating on core files. [simonb, ticket #1480] +external/mit/ctwm/libexec/ctwm_app_menu 1.5 (patch) + + Avoid generating an invalid ctwmrc when emacs is installed. + [nia, ticket #1481] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Jul 24 11:52:46 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket #1481 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/mit/ctwm/libexec
Module Name:src Committed By: martin Date: Sun Jul 24 11:51:22 UTC 2022 Modified Files: src/external/mit/ctwm/libexec [netbsd-9]: ctwm_app_menu Log Message: Pull up following revision(s) (requested by nia in ticket #1481): external/mit/ctwm/libexec/ctwm_app_menu: revision 1.5 (via patch) ctwm_app_menu: Work around "emacs being installed results in the generated ctwmrc containing invalid syntax" problem. Emacs installs a desktop file called "emacsclient" that contains "doublequotes" in its exec string. Pending a better solution for dumping escaped shell lines into the config file, hide or sanitize desktop entires that might mess up the internal ctwmrc quoting rules. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/external/mit/ctwm/libexec/ctwm_app_menu Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/mit/ctwm/libexec
Module Name:src
Committed By: martin
Date: Sun Jul 24 11:51:22 UTC 2022
Modified Files:
src/external/mit/ctwm/libexec [netbsd-9]: ctwm_app_menu
Log Message:
Pull up following revision(s) (requested by nia in ticket #1481):
external/mit/ctwm/libexec/ctwm_app_menu: revision 1.5 (via patch)
ctwm_app_menu: Work around "emacs being installed results in the
generated ctwmrc containing invalid syntax" problem. Emacs installs
a desktop file called "emacsclient" that contains "doublequotes"
in its exec string. Pending a better solution for dumping escaped
shell lines into the config file, hide or sanitize desktop entires
that might mess up the internal ctwmrc quoting rules.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/external/mit/ctwm/libexec/ctwm_app_menu
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/ctwm/libexec/ctwm_app_menu
diff -u src/external/mit/ctwm/libexec/ctwm_app_menu:1.1.2.2 src/external/mit/ctwm/libexec/ctwm_app_menu:1.1.2.3
--- src/external/mit/ctwm/libexec/ctwm_app_menu:1.1.2.2 Thu Oct 8 16:04:07 2020
+++ src/external/mit/ctwm/libexec/ctwm_app_menu Sun Jul 24 11:51:22 2022
@@ -1,12 +1,13 @@
#!/bin/sh
-# $NetBSD: ctwm_app_menu,v 1.1.2.2 2020/10/08 16:04:07 martin Exp $
+# $NetBSD: ctwm_app_menu,v 1.1.2.3 2022/07/24 11:51:22 martin Exp $
OFS=$IFS
IFS='
'
printf 'menu "appmenu"\n'
printf '{\n'
printf '\t"Applications"\tf.title\n'
-for app in $(find /usr/pkg/share/applications -name '*.desktop');
+LOCALBASE=$(pkg_info -Q LOCALBASE pkg_install 2>/dev/null || echo /usr/pkg)
+for app in $(find $LOCALBASE/share/applications -name '*.desktop')
do
name=""
exec=""
@@ -18,13 +19,18 @@ do
Name=*)
if ! [ -n "$name" ];
then
- name=$(printf '%s' "$line" | cut -c6- | tr -d '\r')
+ name=$(printf '%s' "$line" | cut -c6- | tr -d '\r"')
fi
;;
Exec=*)
if ! [ -n "$exec" ];
then
exec=$(printf '%s' "$line" | cut -c6- | sed -e 's/ %.*//g' | tr -d '\r')
+ if printf '%s' "$exec" | grep -q '"'; then
+ # results in malformed config file, better way
+ # to handle this...?
+ nodisplay="true"
+ fi
fi
;;
Terminal=true)
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src Committed By: rin Date: Sun Jul 24 10:53:18 UTC 2022 Modified Files: src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c Log Message: Revert our local fix for GCC 10.3 introduced in rev. 1.25: http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c#rev1.25 The problem has been fixed differently by upstream: - master: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=77eccbf39ed55297802bb66dff5f62507a7239e3 - gcc-10: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6142d65f4f528067f31e86bb97c07a661f2d66e7 No regression observed for ATF on oea (sandpoint), booke (evbppc), and 405 (evbppc). The system boots successfully on 403 (evbppc). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src Committed By: rin Date: Sun Jul 24 10:53:18 UTC 2022 Modified Files: src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c Log Message: Revert our local fix for GCC 10.3 introduced in rev. 1.25: http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c#rev1.25 The problem has been fixed differently by upstream: - master: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=77eccbf39ed55297802bb66dff5f62507a7239e3 - gcc-10: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6142d65f4f528067f31e86bb97c07a661f2d66e7 No regression observed for ATF on oea (sandpoint), booke (evbppc), and 405 (evbppc). The system boots successfully on 403 (evbppc). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.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/gcc/dist/gcc/config/rs6000/rs6000.c diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.30 src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.31 --- src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.30 Fri Jul 22 20:22:35 2022 +++ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Sun Jul 24 10:53:17 2022 @@ -5707,9 +5707,7 @@ rs6000_file_start (void) #ifdef USING_ELFOS_H rs6000_machine = rs6000_machine_from_flags (); - if (!(rs6000_default_cpu && rs6000_default_cpu[0]) - && !global_options_set.x_rs6000_cpu_index) -emit_asm_machine (); + emit_asm_machine (); #endif if (DEFAULT_ABI == ABI_ELFv2)
CVS commit: src/external/mit/ctwm/libexec
Module Name:src
Committed By: nia
Date: Sun Jul 24 07:38:15 UTC 2022
Modified Files:
src/external/mit/ctwm/libexec: ctwm_app_menu
Log Message:
ctwm_app_menu: Various shell script optimization suggestions by kre@.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/ctwm/libexec/ctwm_app_menu
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/ctwm/libexec/ctwm_app_menu
diff -u src/external/mit/ctwm/libexec/ctwm_app_menu:1.5 src/external/mit/ctwm/libexec/ctwm_app_menu:1.6
--- src/external/mit/ctwm/libexec/ctwm_app_menu:1.5 Fri Jul 22 17:06:46 2022
+++ src/external/mit/ctwm/libexec/ctwm_app_menu Sun Jul 24 07:38:15 2022
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: ctwm_app_menu,v 1.5 2022/07/22 17:06:46 nia Exp $
+# $NetBSD: ctwm_app_menu,v 1.6 2022/07/24 07:38:15 nia Exp $
#
# Copyright (c) 2020-2022 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -96,27 +96,27 @@ do_category()
do
case $line in
Name=*)
- if ! [ -n "$name" ];
+ if [ -z "$name" ];
then
- name=$(printf '%s' "$line" | cut -c6- | tr -d '\r' | tr -d '"')
+ name=$(printf '%s' "${line#Name=}" | tr -d '\r"')
fi
;;
Exec=*)
- if ! [ -n "$exec" ];
+ if [ -z "$exec" ];
then
- exec=$(printf '%s' "$line" | cut -c6- | sed -e 's/ %.*//g' | tr -d '\r')
+ exec=$(printf '%s' "${line#Exec=}" | sed -e 's/ %.*//g' | tr -d '\r')
+ # results in malformed config file, better way
+ # to handle this...?
if printf '%s' "$exec" | grep -q '"'; then
- # results in malformed config file, better way
- # to handle this...?
nodisplay="true"
fi
fi
;;
Terminal=true)
- terminal="true"
+ terminal=true
;;
OnlyShowIn=*|NoDisplay=true)
- nodisplay="true"
+ nodisplay=true
;;
esac
done < "$app"
CVS commit: src/external/mit/ctwm/libexec
Module Name:src Committed By: nia Date: Sun Jul 24 07:38:15 UTC 2022 Modified Files: src/external/mit/ctwm/libexec: ctwm_app_menu Log Message: ctwm_app_menu: Various shell script optimization suggestions by kre@. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/ctwm/libexec/ctwm_app_menu Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
