CVS commit: src/doc
Module Name:src Committed By: rillig Date: Sun Apr 10 19:54:57 UTC 2022 Modified Files: src/doc: HACKS Log Message: doc/HACKS: add bug report for internal compiler error on alpha To generate a diff of this commit: cvs rdiff -u -r1.227 -r1.228 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.227 src/doc/HACKS:1.228 --- src/doc/HACKS:1.227 Sun Apr 10 13:26:47 2022 +++ src/doc/HACKS Sun Apr 10 19:54:57 2022 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.227 2022/04/10 13:26:47 martin Exp $ +# $NetBSD: HACKS,v 1.228 2022/04/10 19:54:57 rillig Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -1041,5 +1041,6 @@ pr 56789 descr Compiling lint with -ftrapv fails with an internal gcc compiler error. -kcah + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105209 +kcah
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Sun Apr 10 19:54:57 UTC 2022 Modified Files: src/doc: HACKS Log Message: doc/HACKS: add bug report for internal compiler error on alpha To generate a diff of this commit: cvs rdiff -u -r1.227 -r1.228 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: martin Date: Sun Apr 10 13:26:47 UTC 2022 Modified Files: src/doc: HACKS Log Message: PR 56789: document gcc bug workaround for -ftrapv on alpha. To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.226 src/doc/HACKS:1.227 --- src/doc/HACKS:1.226 Tue Nov 23 23:29:55 2021 +++ src/doc/HACKS Sun Apr 10 13:26:47 2022 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.226 2021/11/23 23:29:55 thorpej Exp $ +# $NetBSD: HACKS,v 1.227 2022/04/10 13:26:47 martin Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -1031,3 +1031,15 @@ file src/tests/lib/libexecinfo/t_sig_bac descr Unit test fails to pass unless t_sig_backtrace.c is compiled with -fno-omit-frame-pointer and -DNOINLINE_HACK. kcah + +hack alpha gcc error in lint +cdate 2022/04/10 13:21:34 +who martin +port alpha +file usr.bin/xlint/Makefile.inc: 1.23 +pr 56789 +descr + Compiling lint with -ftrapv fails with an internal + gcc compiler error. +kcah +
CVS commit: src/doc
Module Name:src Committed By: martin Date: Sun Apr 10 13:26:47 UTC 2022 Modified Files: src/doc: HACKS Log Message: PR 56789: document gcc bug workaround for -ftrapv on alpha. To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: martin
Date: Sun Apr 10 13:21:34 UTC 2022
Modified Files:
src/usr.bin/xlint: Makefile.inc
Log Message:
PR 56789: avoid -ftrapv for alpha, it triggers a gcc error.
OK: rillig
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/xlint/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/usr.bin/xlint/Makefile.inc
diff -u src/usr.bin/xlint/Makefile.inc:1.22 src/usr.bin/xlint/Makefile.inc:1.23
--- src/usr.bin/xlint/Makefile.inc:1.22 Sat Apr 9 22:26:49 2022
+++ src/usr.bin/xlint/Makefile.inc Sun Apr 10 13:21:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2022/04/09 22:26:49 rillig Exp $
+# $NetBSD: Makefile.inc,v 1.23 2022/04/10 13:21:34 martin Exp $
.include
@@ -19,7 +19,9 @@ CPPFLAGS+= -I${.CURDIR}/../common
CLEANFILES+= *.gcno *.gcda *.gcov
+.if ${MACHINE_CPU} != "alpha"
CFLAGS+= ${ACTIVE_CC:Mgcc:%=-ftrapv}
+.endif
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"
CVS commit: src/usr.bin/xlint
Module Name:src Committed By: martin Date: Sun Apr 10 13:21:34 UTC 2022 Modified Files: src/usr.bin/xlint: Makefile.inc Log Message: PR 56789: avoid -ftrapv for alpha, it triggers a gcc error. OK: rillig To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.bin/xlint/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Apr 10 12:14:10 UTC 2022
Modified Files:
src/tests/usr.bin/xlint/lint1: gcc_typeof.c
src/usr.bin/xlint/lint1: cgram.y decl.c lint1.h
Log Message:
lint: fix assertion failure on duplicate qualifiers from __typeof__
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/gcc_typeof.c
cvs rdiff -u -r1.393 -r1.394 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.276 -r1.277 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.150 -r1.151 src/usr.bin/xlint/lint1/lint1.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/gcc_typeof.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_typeof.c:1.3 src/tests/usr.bin/xlint/lint1/gcc_typeof.c:1.4
--- src/tests/usr.bin/xlint/lint1/gcc_typeof.c:1.3 Sun Jul 25 15:58:24 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_typeof.c Sun Apr 10 12:14:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_typeof.c,v 1.3 2021/07/25 15:58:24 rillig Exp $ */
+/* $NetBSD: gcc_typeof.c,v 1.4 2022/04/10 12:14:10 rillig Exp $ */
# 3 "gcc_typeof.c"
/*
@@ -31,3 +31,13 @@ cast(double(*fn)(double))
/* identity cast */
take_function_double_returning_double((double (*)(double))fn);
}
+
+/*
+ * Since cgram 1.58 from 2014-02-18, when support for __typeof__ was added,
+ * and before cgram.y 1.394 from 2022-04-10, lint ran into an assertion
+ * failure when encountering a redundant type qualifier 'const' or 'volatile'
+ * in a declaration using __typeof__. Seen in sys/sys/lwp.h on x86_64, in
+ * the call atomic_load_consume(>l_mutex).
+ */
+int *volatile lock;
+const volatile __typeof__(lock) *lock_pointer =
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.393 src/usr.bin/xlint/lint1/cgram.y:1.394
--- src/usr.bin/xlint/lint1/cgram.y:1.393 Sat Apr 9 23:41:22 2022
+++ src/usr.bin/xlint/lint1/cgram.y Sun Apr 10 12:14:10 2022
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.393 2022/04/09 23:41:22 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.394 2022/04/10 12:14:10 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.393 2022/04/09 23:41:22 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.394 2022/04/10 12:14:10 rillig Exp $");
#endif
#include
@@ -878,7 +878,8 @@ notype_type_specifier: /* see C99 6.7.2
$$ = gettyp($1);
}
| T_TYPEOF T_LPAREN expression T_RPAREN { /* GCC extension */
- $$ = $3->tn_type;
+ $$ = block_dup_type($3->tn_type);
+ $$->t_typeof = true;
}
| struct_or_union_specifier {
end_declaration_level();
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.276 src/usr.bin/xlint/lint1/decl.c:1.277
--- src/usr.bin/xlint/lint1/decl.c:1.276 Sat Apr 9 23:41:22 2022
+++ src/usr.bin/xlint/lint1/decl.c Sun Apr 10 12:14:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.276 2022/04/09 23:41:22 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.277 2022/04/10 12:14:10 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.276 2022/04/09 23:41:22 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.277 2022/04/10 12:14:10 rillig Exp $");
#endif
#include
@@ -815,12 +815,13 @@ end_type(void)
dcs_adjust_storage_class();
- if (dcs->d_const && dcs->d_type->t_const) {
+ if (dcs->d_const && dcs->d_type->t_const && !dcs->d_type->t_typeof) {
lint_assert(dcs->d_type->t_typedef);
/* typedef already qualified with '%s' */
warning(68, "const");
}
- if (dcs->d_volatile && dcs->d_type->t_volatile) {
+ if (dcs->d_volatile && dcs->d_type->t_volatile &&
+ !dcs->d_type->t_typeof) {
lint_assert(dcs->d_type->t_typedef);
/* typedef already qualified with '%s' */
warning(68, "volatile");
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.150 src/usr.bin/xlint/lint1/lint1.h:1.151
--- src/usr.bin/xlint/lint1/lint1.h:1.150 Sat Apr 9 23:41:22 2022
+++ src/usr.bin/xlint/lint1/lint1.h Sun Apr 10 12:14:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.150 2022/04/09 23:41:22 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.151 2022/04/10 12:14:10 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -143,6 +143,7 @@ struct lint1_type {
bool t_proto:1; /* function prototype (t_args valid) */
bool t_vararg:1; /* prototype with '...' */
bool t_typedef:1; /* type defined with typedef */
+ bool t_typeof:1; /* type defined with GCC's __typeof__ */
bool t_bitfield:1;
/*
* Either the type is currently an enum (having t_tspec ENUM), or
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Apr 10 12:14:10 UTC 2022 Modified Files: src/tests/usr.bin/xlint/lint1: gcc_typeof.c src/usr.bin/xlint/lint1: cgram.y decl.c lint1.h Log Message: lint: fix assertion failure on duplicate qualifiers from __typeof__ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/gcc_typeof.c cvs rdiff -u -r1.393 -r1.394 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.276 -r1.277 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.150 -r1.151 src/usr.bin/xlint/lint1/lint1.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src
Committed By: martin
Date: Sun Apr 10 11:56:28 UTC 2022
Modified Files:
src/distrib/amd64/ramdisks/common: Makefile.ramdisk list.ramdisk
Log Message:
Add missing EFI bootloaders to the install kernel ramdisk,
noticed by Lloyd Parkes.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/ramdisks/common/list.ramdisk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.15 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.16
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.15 Sun Dec 29 18:26:16 2019
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Sun Apr 10 11:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.15 2019/12/29 18:26:16 christos Exp $
+# $NetBSD: Makefile.ramdisk,v 1.16 2022/04/10 11:56:28 martin Exp $
NOSANITIZER= # defined
@@ -27,6 +27,8 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \
${DESTDIR}/usr/mdec/mbr_ext \
${DESTDIR}/usr/mdec/mbr_bootsel \
${DESTDIR}/usr/mdec/gptmbr.bin \
+ ${DESTDIR}/usr/mdec/bootia32.efi \
+ ${DESTDIR}/usr/mdec/bootx64.efi \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 src/distrib/amd64/ramdisks/common/list.ramdisk:1.22
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 Mon Oct 1 17:50:08 2018
+++ src/distrib/amd64/ramdisks/common/list.ramdisk Sun Apr 10 11:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
+# $NetBSD: list.ramdisk,v 1.22 2022/04/10 11:56:28 martin Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -81,6 +81,8 @@ COPY ${DESTDIR}/usr/mdec/bootxx_ffsv1 us
COPY ${DESTDIR}/usr/mdec/bootxx_ffsv2 usr/mdec/bootxx_ffsv2
COPY ${DESTDIR}/usr/mdec/bootxx_lfsv2 usr/mdec/bootxx_lfsv2
COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
+COPY ${DESTDIR}/usr/mdec/bootia32.efi usr/mdec/bootia32.efi
+COPY ${DESTDIR}/usr/mdec/bootx64.efi usr/mdec/bootx64.efi
COPY ${DESTDIR}/usr/mdec/mbr_ext usr/mdec/mbr_ext
COPY ${DESTDIR}/usr/mdec/mbr_bootsel usr/mdec/mbr_bootsel
COPY ${DESTDIR}/usr/mdec/gptmbr.bin usr/mdec/gptmbr.bin
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src Committed By: martin Date: Sun Apr 10 11:56:28 UTC 2022 Modified Files: src/distrib/amd64/ramdisks/common: Makefile.ramdisk list.ramdisk Log Message: Add missing EFI bootloaders to the install kernel ramdisk, noticed by Lloyd Parkes. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/distrib/amd64/ramdisks/common/Makefile.ramdisk cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/ramdisks/common/list.ramdisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/membar
Module Name:src
Committed By: riastradh
Date: Sun Apr 10 11:36:32 UTC 2022
Modified Files:
src/tests/lib/libc/membar: t_dekker.c t_seqlock.c t_spinlock.c
Log Message:
membar_ops(3): Simplify alarm handling in membar tests.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/membar/t_dekker.c \
src/tests/lib/libc/membar/t_spinlock.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/membar/t_seqlock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/membar/t_dekker.c
diff -u src/tests/lib/libc/membar/t_dekker.c:1.2 src/tests/lib/libc/membar/t_dekker.c:1.3
--- src/tests/lib/libc/membar/t_dekker.c:1.2 Sat Apr 9 23:32:53 2022
+++ src/tests/lib/libc/membar/t_dekker.c Sun Apr 10 11:36:32 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: t_dekker.c,v 1.2 2022/04/09 23:32:53 riastradh Exp $ */
+/* $NetBSD: t_dekker.c,v 1.3 2022/04/10 11:36:32 riastradh Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_dekker.c,v 1.2 2022/04/09 23:32:53 riastradh Exp $");
+__RCSID("$NetBSD: t_dekker.c,v 1.3 2022/04/10 11:36:32 riastradh Exp $");
#include
#include
@@ -39,7 +39,6 @@ __RCSID("$NetBSD: t_dekker.c,v 1.2 2022/
#include
#include
#include
-#include
#include
#include
#include
@@ -95,14 +94,6 @@ unlock(unsigned me)
membar_producer();
}
-static void
-alarm_handler(int signo)
-{
-
- (void)signo;
- times_up = 1;
-}
-
static void *
thread(void *cookie)
{
@@ -135,21 +126,22 @@ ATF_TC_BODY(dekker, tc)
size_t ncpulen = sizeof(ncpu);
int error;
+ alarm(10);
+
if (sysctlbyname("hw.ncpu", , , NULL, 0) == -1)
atf_tc_fail("hw.ncpu: (%d) %s", errno, strerror(errno));
assert(ncpulen == sizeof(ncpu));
if (ncpu == 1)
atf_tc_skip("membar tests are only for multicore systems");
- if (signal(SIGALRM, alarm_handler) == SIG_ERR)
- err(1, "signal(SIGALRM");
- alarm(5);
for (i = 0; i < 2; i++) {
error = pthread_create([i], NULL, ,
(void *)(uintptr_t)i);
if (error)
errc(1, error, "pthread_create");
}
+ sleep(5);
+ times_up = 1;
for (i = 0; i < 2; i++) {
error = pthread_join(t[i], NULL);
if (error)
Index: src/tests/lib/libc/membar/t_spinlock.c
diff -u src/tests/lib/libc/membar/t_spinlock.c:1.2 src/tests/lib/libc/membar/t_spinlock.c:1.3
--- src/tests/lib/libc/membar/t_spinlock.c:1.2 Sat Apr 9 23:32:53 2022
+++ src/tests/lib/libc/membar/t_spinlock.c Sun Apr 10 11:36:32 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: t_spinlock.c,v 1.2 2022/04/09 23:32:53 riastradh Exp $ */
+/* $NetBSD: t_spinlock.c,v 1.3 2022/04/10 11:36:32 riastradh Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_spinlock.c,v 1.2 2022/04/09 23:32:53 riastradh Exp $");
+__RCSID("$NetBSD: t_spinlock.c,v 1.3 2022/04/10 11:36:32 riastradh Exp $");
#include
#include
@@ -39,7 +39,6 @@ __RCSID("$NetBSD: t_spinlock.c,v 1.2 202
#include
#include
#include
-#include
#include
#include
#include
@@ -80,14 +79,6 @@ unlock(void)
lockbit = 0;
}
-static void
-alarm_handler(int signo)
-{
-
- (void)signo;
- times_up = 1;
-}
-
static void *
thread(void *cookie)
{
@@ -125,21 +116,22 @@ ATF_TC_BODY(spinlock, tc)
size_t ncpulen = sizeof(ncpu);
int error;
+ alarm(10);
+
if (sysctlbyname("hw.ncpu", , , NULL, 0) == -1)
atf_tc_fail("hw.ncpu: (%d) %s", errno, strerror(errno));
assert(ncpulen == sizeof(ncpu));
if (ncpu == 1)
atf_tc_skip("membar tests are only for multicore systems");
- if (signal(SIGALRM, alarm_handler) == SIG_ERR)
- err(1, "signal(SIGALRM");
- alarm(5);
for (i = 0; i < 2; i++) {
error = pthread_create([i], NULL, ,
(void *)(uintptr_t)i);
if (error)
errc(1, error, "pthread_create");
}
+ sleep(5);
+ times_up = 1;
for (i = 0; i < 2; i++) {
error = pthread_join(t[i], NULL);
if (error)
Index: src/tests/lib/libc/membar/t_seqlock.c
diff -u src/tests/lib/libc/membar/t_seqlock.c:1.1 src/tests/lib/libc/membar/t_seqlock.c:1.2
--- src/tests/lib/libc/membar/t_seqlock.c:1.1 Fri Apr 8 23:35:52 2022
+++ src/tests/lib/libc/membar/t_seqlock.c Sun Apr 10 11:36:32 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: t_seqlock.c,v 1.1 2022/04/08 23:35:52 riastradh Exp $ */
+/* $NetBSD: t_seqlock.c,v 1.2 2022/04/10 11:36:32 riastradh Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_seqlock.c,v 1.1 2022/04/08 23:35:52 riastradh Exp $");
+__RCSID("$NetBSD: t_seqlock.c,v 1.2 2022/04/10 11:36:32 riastradh Exp $");
#include
#include
@@ -39,7 +39,6 @@ __RCSID("$NetBSD: t_seqlock.c,v 1.1 2022
#include
#include
#include
-#include
#include
#include
#include
@@ -64,14 +63,6 @@ volatile struct {
uint64_t results[2];
-static void
-alarm_handler(int signo)
-{
-
- (void)signo;
- times_up = 1;
-}
-
static void *
CVS commit: src/tests/lib/libc/membar
Module Name:src Committed By: riastradh Date: Sun Apr 10 11:36:32 UTC 2022 Modified Files: src/tests/lib/libc/membar: t_dekker.c t_seqlock.c t_spinlock.c Log Message: membar_ops(3): Simplify alarm handling in membar tests. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/membar/t_dekker.c \ src/tests/lib/libc/membar/t_spinlock.c cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/membar/t_seqlock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpthread
Module Name:src
Committed By: riastradh
Date: Sun Apr 10 10:38:33 UTC 2022
Modified Files:
src/lib/libpthread: pthread_attr.c pthread_cancelstub.c pthread_lock.c
pthread_misc.c pthread_mutex.c pthread_queue.h pthread_specific.c
pthread_spin.c pthread_tsd.c pthread_types.h
Log Message:
pthread: Nix trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libpthread/pthread_attr.c
cvs rdiff -u -r1.41 -r1.42 src/lib/libpthread/pthread_cancelstub.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libpthread/pthread_lock.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libpthread/pthread_misc.c
cvs rdiff -u -r1.82 -r1.83 src/lib/libpthread/pthread_mutex.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libpthread/pthread_queue.h
cvs rdiff -u -r1.27 -r1.28 src/lib/libpthread/pthread_specific.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libpthread/pthread_spin.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libpthread/pthread_tsd.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libpthread/pthread_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/lib/libpthread/pthread_attr.c
diff -u src/lib/libpthread/pthread_attr.c:1.20 src/lib/libpthread/pthread_attr.c:1.21
--- src/lib/libpthread/pthread_attr.c:1.20 Sat Feb 12 14:59:32 2022
+++ src/lib/libpthread/pthread_attr.c Sun Apr 10 10:38:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_attr.c,v 1.20 2022/02/12 14:59:32 riastradh Exp $ */
+/* $NetBSD: pthread_attr.c,v 1.21 2022/04/10 10:38:33 riastradh Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread_attr.c,v 1.20 2022/02/12 14:59:32 riastradh Exp $");
+__RCSID("$NetBSD: pthread_attr.c,v 1.21 2022/04/10 10:38:33 riastradh Exp $");
/* Need to use libc-private names for atomic operations. */
#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
@@ -113,7 +113,7 @@ pthread_attr_get_np(pthread_t thread, pt
if (p == NULL)
return ENOMEM;
- attr->pta_flags = thread->pt_flags &
+ attr->pta_flags = thread->pt_flags &
(PT_FLAG_DETACHED | PT_FLAG_SCOPE_SYSTEM | PT_FLAG_EXPLICIT_SCHED);
p->ptap_namearg = thread->pt_name;
@@ -309,7 +309,7 @@ pthread_attr_getschedparam(const pthread
p = attr->pta_private;
if (p == NULL)
memset(param, 0, sizeof(*param));
- else
+ else
*param = p->ptap_sp;
return 0;
}
Index: src/lib/libpthread/pthread_cancelstub.c
diff -u src/lib/libpthread/pthread_cancelstub.c:1.41 src/lib/libpthread/pthread_cancelstub.c:1.42
--- src/lib/libpthread/pthread_cancelstub.c:1.41 Sat Feb 12 14:59:32 2022
+++ src/lib/libpthread/pthread_cancelstub.c Sun Apr 10 10:38:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_cancelstub.c,v 1.41 2022/02/12 14:59:32 riastradh Exp $ */
+/* $NetBSD: pthread_cancelstub.c,v 1.42 2022/04/10 10:38:33 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#undef _FORTIFY_SOURCE
#include
-__RCSID("$NetBSD: pthread_cancelstub.c,v 1.41 2022/02/12 14:59:32 riastradh Exp $");
+__RCSID("$NetBSD: pthread_cancelstub.c,v 1.42 2022/04/10 10:38:33 riastradh Exp $");
/* Need to use libc-private names for atomic operations. */
#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
@@ -160,7 +160,7 @@ accept(int s, struct sockaddr *addr, soc
TESTCANCEL(self);
retval = _sys_accept(s, addr, addrlen);
TESTCANCEL(self);
-
+
return retval;
}
@@ -205,7 +205,7 @@ clock_nanosleep(clockid_t clock_id, int
TESTCANCEL(self);
retval = _sys_clock_nanosleep(clock_id, flags, rqtp, rmtp);
TESTCANCEL(self);
-
+
return retval;
}
@@ -219,7 +219,7 @@ close(int d)
TESTCANCEL(self);
retval = _sys_close(d);
TESTCANCEL(self);
-
+
return retval;
}
@@ -233,7 +233,7 @@ connect(int s, const struct sockaddr *ad
TESTCANCEL(self);
retval = _sys_connect(s, addr, namelen);
TESTCANCEL(self);
-
+
return retval;
}
@@ -264,7 +264,7 @@ fdatasync(int d)
TESTCANCEL(self);
retval = _sys_fdatasync(d);
TESTCANCEL(self);
-
+
return retval;
}
@@ -278,7 +278,7 @@ fsync(int d)
TESTCANCEL(self);
retval = _sys_fsync(d);
TESTCANCEL(self);
-
+
return retval;
}
@@ -492,7 +492,7 @@ pread(int d, void *buf, size_t nbytes, o
}
int
-__pselect50(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+__pselect50(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
const struct timespec *timeout, const sigset_t *sigmask)
{
int retval;
@@ -594,7 +594,7 @@ recvmmsg(int s, struct mmsghdr *mmsg, un
}
int
-__select50(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+__select50(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
struct timeval *timeout)
{
int retval;
Index: src/lib/libpthread/pthread_lock.c
diff -u src/lib/libpthread/pthread_lock.c:1.35 src/lib/libpthread/pthread_lock.c:1.36
---
CVS commit: src/lib/libpthread
Module Name:src Committed By: riastradh Date: Sun Apr 10 10:38:33 UTC 2022 Modified Files: src/lib/libpthread: pthread_attr.c pthread_cancelstub.c pthread_lock.c pthread_misc.c pthread_mutex.c pthread_queue.h pthread_specific.c pthread_spin.c pthread_tsd.c pthread_types.h Log Message: pthread: Nix trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libpthread/pthread_attr.c cvs rdiff -u -r1.41 -r1.42 src/lib/libpthread/pthread_cancelstub.c cvs rdiff -u -r1.35 -r1.36 src/lib/libpthread/pthread_lock.c cvs rdiff -u -r1.18 -r1.19 src/lib/libpthread/pthread_misc.c cvs rdiff -u -r1.82 -r1.83 src/lib/libpthread/pthread_mutex.c cvs rdiff -u -r1.5 -r1.6 src/lib/libpthread/pthread_queue.h cvs rdiff -u -r1.27 -r1.28 src/lib/libpthread/pthread_specific.c cvs rdiff -u -r1.9 -r1.10 src/lib/libpthread/pthread_spin.c cvs rdiff -u -r1.24 -r1.25 src/lib/libpthread/pthread_tsd.c cvs rdiff -u -r1.26 -r1.27 src/lib/libpthread/pthread_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/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Sun Apr 10 10:01:15 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: No need to flush icache for EFI RT mappings as bootaa64.efi flushed the full icache for us. (Also this avoids traps) To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 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.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Sun Apr 10 10:01:15 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: No need to flush icache for EFI RT mappings as bootaa64.efi flushed the full icache for us. (Also this avoids traps) To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 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.133 src/sys/arch/aarch64/aarch64/pmap.c:1.134 --- src/sys/arch/aarch64/aarch64/pmap.c:1.133 Sat Apr 9 23:38:31 2022 +++ src/sys/arch/aarch64/aarch64/pmap.c Sun Apr 10 10:01:15 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.133 2022/04/09 23:38:31 riastradh Exp $ */ +/* $NetBSD: pmap.c,v 1.134 2022/04/10 10:01:15 skrll Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.133 2022/04/09 23:38:31 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.134 2022/04/10 10:01:15 skrll Exp $"); #include "opt_arm_debug.h" #include "opt_cpuoptions.h" @@ -1992,7 +1992,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va, idx = l3pte_index(va); ptep = [idx]; /* as PTE */ opte = *ptep; - need_sync_icache = (prot & VM_PROT_EXECUTE); + need_sync_icache = (prot & VM_PROT_EXECUTE) && !efirt_p; /* for lock ordering for old page and new page */ pps[0] = pp;
CVS commit: src
Module Name:src Committed By: andvar Date: Sun Apr 10 09:50:47 UTC 2022 Modified Files: src/bin/sh: memalloc.c src/lib/libcurses: cr_put.c src/lib/libpam/modules/pam_unix: pam_unix.c src/libexec/httpd: bozohttpd.c src/sbin/route: route.c src/sys/arch/hp300/dev: dcm.c src/sys/arch/riscv/riscv: locore.S src/sys/arch/vax/include: scb.h src/sys/ddb: TODO src/sys/dev/fdt: fdt_port.h src/sys/dev/ic: icp.c spic.c spicvar.h src/sys/dev/pci: agpvar.h src/sys/fs/nilfs: nilfs_vnops.c src/sys/fs/udf: udf_subr.c udf_vnops.c src/sys/miscfs/genfs: layer_subr.c src/sys/net: if_tap.c src/sys/net/lagg: if_lagg_lacp.c src/sys/netinet: ip_var.h src/sys/netipsec: ipsec_output.c src/sys/rump/kern/lib/libsimplehook_tester: simplehook_tester.c src/sys/uvm: uvm_map.c src/tests/lib/libcurses/tests: inwstr src/usr.bin/scmdctl: uart.c src/usr.sbin/mopd/mopcopy: mopcopy.c Log Message: fix various typos in comments and output/log messages. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/bin/sh/memalloc.c cvs rdiff -u -r1.38 -r1.39 src/lib/libcurses/cr_put.c cvs rdiff -u -r1.17 -r1.18 src/lib/libpam/modules/pam_unix/pam_unix.c cvs rdiff -u -r1.139 -r1.140 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.168 -r1.169 src/sbin/route/route.c cvs rdiff -u -r1.89 -r1.90 src/sys/arch/hp300/dev/dcm.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/riscv/riscv/locore.S cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/include/scb.h cvs rdiff -u -r1.18 -r1.19 src/sys/ddb/TODO cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/fdt_port.h cvs rdiff -u -r1.36 -r1.37 src/sys/dev/ic/icp.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/spic.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/spicvar.h cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/agpvar.h cvs rdiff -u -r1.45 -r1.46 src/sys/fs/nilfs/nilfs_vnops.c cvs rdiff -u -r1.167 -r1.168 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.122 -r1.123 src/sys/fs/udf/udf_vnops.c cvs rdiff -u -r1.38 -r1.39 src/sys/miscfs/genfs/layer_subr.c cvs rdiff -u -r1.126 -r1.127 src/sys/net/if_tap.c cvs rdiff -u -r1.24 -r1.25 src/sys/net/lagg/if_lagg_lacp.c cvs rdiff -u -r1.133 -r1.134 src/sys/netinet/ip_var.h cvs rdiff -u -r1.84 -r1.85 src/sys/netipsec/ipsec_output.c cvs rdiff -u -r1.1 -r1.2 \ src/sys/rump/kern/lib/libsimplehook_tester/simplehook_tester.c cvs rdiff -u -r1.393 -r1.394 src/sys/uvm/uvm_map.c cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/inwstr cvs rdiff -u -r1.1 -r1.2 src/usr.bin/scmdctl/uart.c cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/mopcopy/mopcopy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: andvar
Date: Sun Apr 10 09:50:47 UTC 2022
Modified Files:
src/bin/sh: memalloc.c
src/lib/libcurses: cr_put.c
src/lib/libpam/modules/pam_unix: pam_unix.c
src/libexec/httpd: bozohttpd.c
src/sbin/route: route.c
src/sys/arch/hp300/dev: dcm.c
src/sys/arch/riscv/riscv: locore.S
src/sys/arch/vax/include: scb.h
src/sys/ddb: TODO
src/sys/dev/fdt: fdt_port.h
src/sys/dev/ic: icp.c spic.c spicvar.h
src/sys/dev/pci: agpvar.h
src/sys/fs/nilfs: nilfs_vnops.c
src/sys/fs/udf: udf_subr.c udf_vnops.c
src/sys/miscfs/genfs: layer_subr.c
src/sys/net: if_tap.c
src/sys/net/lagg: if_lagg_lacp.c
src/sys/netinet: ip_var.h
src/sys/netipsec: ipsec_output.c
src/sys/rump/kern/lib/libsimplehook_tester: simplehook_tester.c
src/sys/uvm: uvm_map.c
src/tests/lib/libcurses/tests: inwstr
src/usr.bin/scmdctl: uart.c
src/usr.sbin/mopd/mopcopy: mopcopy.c
Log Message:
fix various typos in comments and output/log messages.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/bin/sh/memalloc.c
cvs rdiff -u -r1.38 -r1.39 src/lib/libcurses/cr_put.c
cvs rdiff -u -r1.17 -r1.18 src/lib/libpam/modules/pam_unix/pam_unix.c
cvs rdiff -u -r1.139 -r1.140 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.168 -r1.169 src/sbin/route/route.c
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/hp300/dev/dcm.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/riscv/riscv/locore.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/include/scb.h
cvs rdiff -u -r1.18 -r1.19 src/sys/ddb/TODO
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/fdt_port.h
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/ic/icp.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/spic.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/spicvar.h
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/agpvar.h
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/nilfs/nilfs_vnops.c
cvs rdiff -u -r1.167 -r1.168 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.122 -r1.123 src/sys/fs/udf/udf_vnops.c
cvs rdiff -u -r1.38 -r1.39 src/sys/miscfs/genfs/layer_subr.c
cvs rdiff -u -r1.126 -r1.127 src/sys/net/if_tap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/net/lagg/if_lagg_lacp.c
cvs rdiff -u -r1.133 -r1.134 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.84 -r1.85 src/sys/netipsec/ipsec_output.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/kern/lib/libsimplehook_tester/simplehook_tester.c
cvs rdiff -u -r1.393 -r1.394 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/inwstr
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/scmdctl/uart.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/mopcopy/mopcopy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/memalloc.c
diff -u src/bin/sh/memalloc.c:1.35 src/bin/sh/memalloc.c:1.36
--- src/bin/sh/memalloc.c:1.35 Tue Oct 26 10:07:20 2021
+++ src/bin/sh/memalloc.c Sun Apr 10 09:50:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: memalloc.c,v 1.35 2021/10/26 10:07:20 kre Exp $ */
+/* $NetBSD: memalloc.c,v 1.36 2022/04/10 09:50:44 andvar Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: memalloc.c,v 1.35 2021/10/26 10:07:20 kre Exp $");
+__RCSID("$NetBSD: memalloc.c,v 1.36 2022/04/10 09:50:44 andvar Exp $");
#endif
#endif /* not lint */
@@ -349,7 +349,7 @@ ungrabstackstr(char *s, char *p)
*
* Remaining args are pointers to strings - sufficient space to hold
* the concat of the strings is allocated on the stack, the strings
- * are copied into that space, and a pointer to its start is retured.
+ * are copied into that space, and a pointer to its start is returned.
* The arg list is terminated with STSTRC_END.
*
* Use stunalloc(string) (in proper sequence) to release the string
Index: src/lib/libcurses/cr_put.c
diff -u src/lib/libcurses/cr_put.c:1.38 src/lib/libcurses/cr_put.c:1.39
--- src/lib/libcurses/cr_put.c:1.38 Tue Jan 25 03:05:06 2022
+++ src/lib/libcurses/cr_put.c Sun Apr 10 09:50:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cr_put.c,v 1.38 2022/01/25 03:05:06 blymn Exp $ */
+/* $NetBSD: cr_put.c,v 1.39 2022/04/10 09:50:44 andvar Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -36,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)cr_put.c 8.3 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: cr_put.c,v 1.38 2022/01/25 03:05:06 blymn Exp $");
+__RCSID("$NetBSD: cr_put.c,v 1.39 2022/04/10 09:50:44 andvar Exp $");
#endif
#endif/* not lint */
@@ -151,7 +151,7 @@ fgoto(int in_refresh)
* essential in some SB's because CRLF mode puts
* garbage in at end of memory), but you must use
* linefeed to scroll since down arrow won't go past
- * memory end. I turned this off after recieving Paul
+ * memory end. I turned this off after receiving Paul
* Eggert's Superbee description which wins
CVS commit: src/usr.sbin/makefs/udf
Module Name:src
Committed By: riastradh
Date: Sun Apr 10 09:22:35 UTC 2022
Modified Files:
src/usr.sbin/makefs/udf: Makefile.inc
Log Message:
makefs(8): Fix tool build -- no libutil DPADD if HOSTPROG.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/makefs/udf/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/usr.sbin/makefs/udf/Makefile.inc
diff -u src/usr.sbin/makefs/udf/Makefile.inc:1.5 src/usr.sbin/makefs/udf/Makefile.inc:1.6
--- src/usr.sbin/makefs/udf/Makefile.inc:1.5 Wed Apr 6 13:29:16 2022
+++ src/usr.sbin/makefs/udf/Makefile.inc Sun Apr 10 09:22:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2022/04/06 13:29:16 reinoud Exp $
+# $NetBSD: Makefile.inc,v 1.6 2022/04/10 09:22:35 riastradh Exp $
#
UDF= ${NETBSDSRCDIR}/sys/fs/udf
@@ -11,8 +11,10 @@ CPPFLAGS+= -I${UDF} -I${UDF_NEWFS} -I${F
SRCS += udf_core.c udf_osta.c
+.if !defined(HOSTPROG)
DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
+.endif
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Wno-error=constant-conversion
CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
CVS commit: src/usr.sbin/makefs/udf
Module Name:src Committed By: riastradh Date: Sun Apr 10 09:22:35 UTC 2022 Modified Files: src/usr.sbin/makefs/udf: Makefile.inc Log Message: makefs(8): Fix tool build -- no libutil DPADD if HOSTPROG. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/makefs/udf/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
