CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Fri Sep 9 05:27:33 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make.1: only use .Pa for actual pathnames To generate a diff of this commit: cvs rdiff -u -r1.337 -r1.338 src/usr.bin/make/make.1 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: Fri Sep 9 05:27:33 UTC 2022
Modified Files:
src/usr.bin/make: make.1
Log Message:
make.1: only use .Pa for actual pathnames
To generate a diff of this commit:
cvs rdiff -u -r1.337 -r1.338 src/usr.bin/make/make.1
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/make.1
diff -u src/usr.bin/make/make.1:1.337 src/usr.bin/make/make.1:1.338
--- src/usr.bin/make/make.1:1.337 Thu Sep 8 20:22:55 2022
+++ src/usr.bin/make/make.1 Fri Sep 9 05:27:32 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.337 2022/09/08 20:22:55 rillig Exp $
+.\" $NetBSD: make.1,v 1.338 2022/09/09 05:27:32 rillig Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\"
-.Dd September 8, 2022
+.Dd September 9, 2022
.Dt MAKE 1
.Os
.Sh NAME
@@ -235,7 +235,9 @@ so the actual commands are printed as th
Let environment variables override global variables within makefiles.
.It Fl f Ar makefile
Specify a makefile to read instead of the default
-.Sq Pa makefile .
+.Pa makefile
+or
+.Pa Makefile.
If
.Ar makefile
is
@@ -953,7 +955,7 @@ Can affect the mode that
runs in.
It can contain a number of keywords:
.Bl -hang -width missing-filemon=bf.
-.It Pa compat
+.It Cm compat
Like
.Fl B ,
puts
@@ -961,7 +963,7 @@ puts
into
.Dq compat
mode.
-.It Pa meta
+.It Cm meta
Puts
.Nm
into
@@ -972,7 +974,7 @@ to capture the command run, the output g
is available, the system calls which are of interest to
.Nm .
The captured output can be very useful when diagnosing errors.
-.It Pa curdirOk= Ns Ar bf
+.It Cm curdirOk= Ns Ar bf
Normally
.Nm
does not create
@@ -982,32 +984,32 @@ files in
This can be overridden by setting
.Va bf
to a value which represents true.
-.It Pa missing-meta= Ns Ar bf
+.It Cm missing-meta= Ns Ar bf
If
.Va bf
is true, a missing
.Pa .meta
file makes the target out-of-date.
-.It Pa missing-filemon= Ns Ar bf
+.It Cm missing-filemon= Ns Ar bf
If
.Va bf
is true, missing filemon data makes the target out-of-date.
-.It Pa nofilemon
+.It Cm nofilemon
Do not use
.Xr filemon 4 .
-.It Pa env
+.It Cm env
For debugging, it can be useful to include the environment
in the
.Pa .meta
file.
-.It Pa verbose
+.It Cm verbose
If in
.Dq meta
mode, print a clue about the target being built.
This is useful if the build is otherwise running silently.
The message printed is the expanded value of
.Va .MAKE.META.PREFIX .
-.It Pa ignore-cmd
+.It Cm ignore-cmd
Some makefiles have commands which are simply not stable.
This keyword causes them to be ignored for
determining whether a target is out of date in
@@ -1015,12 +1017,12 @@ determining whether a target is out of d
mode.
See also
.Ic .NOMETA_CMP .
-.It Pa silent= Ns Ar bf
+.It Cm silent= Ns Ar bf
If
.Va bf
is true, when a .meta file is created, mark the target
.Ic .SILENT .
-.It Pa randomize-targets
+.It Cm randomize-targets
In both compat and parallel mode, do not make the targets in the usual order,
but instead randomize their order.
This mode can be used to detect undeclared dependencies between files.
@@ -1168,7 +1170,7 @@ is set in the environment or on the comm
.Sq Ev MAKEOBJDIR
is set in the environment or on the command line.)
.It
-.Cm ${.CURDIR} Ns Pa /obj. Ns Ev ${MACHINE}
+.Cm ${.CURDIR} Ns Pa /obj. Ns Cm ${MACHINE}
.It
.Cm ${.CURDIR} Ns Pa /obj
.It
CVS commit: src/external/mit/xorg/lib/libXfont2
Module Name:src
Committed By: mrg
Date: Fri Sep 9 03:56:40 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libXfont2: Makefile
Log Message:
updates for libXfont2 2.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXfont2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXfont2/Makefile
diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.8 src/external/mit/xorg/lib/libXfont2/Makefile:1.9
--- src/external/mit/xorg/lib/libXfont2/Makefile:1.8 Tue Nov 16 09:25:51 2021
+++ src/external/mit/xorg/lib/libXfont2/Makefile Fri Sep 9 03:56:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/11/16 09:25:51 nia Exp $
+# $NetBSD: Makefile,v 1.9 2022/09/09 03:56:39 mrg Exp $
USE_FORT?= yes # data-driven bugs?
@@ -103,7 +103,14 @@ INCS= libxfont2.h
INCSDIR=${X11INCDIR}/X11/fonts
CPPFLAGS+= ${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION}
-CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_CONFIG_H
+CPPFLAGS+= -DHAS_SNPRINTF
+CPPFLAGS+= -DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
+CPPFLAGS+= -DHAVE_READLINK
+CPPFLAGS+= -DHAVE_STDINT_H
+CPPFLAGS+= -DHAVE_STRLCPY
+CPPFLAGS+= -DHAVE_ERR_H
+CPPFLAGS+= -DHAVE_REALPATH
+CPPFLAGS+= -DHAS_SNPRINTF
CPPFLAGS+= -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\"
CPPFLAGS+= -I${XFONT2DIR}/src/stubs
@@ -132,5 +139,8 @@ LIBDPLIBS=\
PKGDIST= ${LIB}
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@Z_REQUIRES@,zlib,"
+
.include
.include
CVS commit: src/external/mit/xorg/lib/libXfont2
Module Name:src Committed By: mrg Date: Fri Sep 9 03:56:40 UTC 2022 Modified Files: src/external/mit/xorg/lib/libXfont2: Makefile Log Message: updates for libXfont2 2.0.6. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXfont2/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/libfontenc
Module Name:src
Committed By: mrg
Date: Fri Sep 9 03:49:19 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libfontenc: Makefile
Log Message:
updates for libfontenc 1.1.6.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libfontenc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libfontenc/Makefile
diff -u src/external/mit/xorg/lib/libfontenc/Makefile:1.3 src/external/mit/xorg/lib/libfontenc/Makefile:1.4
--- src/external/mit/xorg/lib/libfontenc/Makefile:1.3 Tue Jan 5 13:07:46 2016
+++ src/external/mit/xorg/lib/libfontenc/Makefile Fri Sep 9 03:49:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/05 13:07:46 christos Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/09 03:49:19 mrg Exp $
.include
@@ -14,6 +14,7 @@ INCSDIR=${X11INCDIR}/X11/fonts
CPPFLAGS+= -DFONTENC_NO_LIBFONT
CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
+CPPFLAGS+= -DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
CVS commit: src/external/mit/xorg/lib/libfontenc
Module Name:src Committed By: mrg Date: Fri Sep 9 03:49:19 UTC 2022 Modified Files: src/external/mit/xorg/lib/libfontenc: Makefile Log Message: updates for libfontenc 1.1.6. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libfontenc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/libFS
Module Name:src
Committed By: mrg
Date: Fri Sep 9 03:46:29 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libFS: Makefile
Log Message:
updates for libFS 1.0.9.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libFS/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libFS/Makefile
diff -u src/external/mit/xorg/lib/libFS/Makefile:1.3 src/external/mit/xorg/lib/libFS/Makefile:1.4
--- src/external/mit/xorg/lib/libFS/Makefile:1.3 Wed Apr 4 10:59:45 2012
+++ src/external/mit/xorg/lib/libFS/Makefile Fri Sep 9 03:46:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/04/04 10:59:45 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/09 03:46:29 mrg Exp $
.include
@@ -17,8 +17,12 @@ CWARNFLAGS.clang+= -Wno-string-plus-int
INCS= FSlib.h
INCSDIR=${X11INCDIR}/X11/fonts
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
-CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts \
+ -D_OPENBSD_SOURCE \
+ -DHAVE_REALLOCARRAY \
+ -DHAVE_STRNLEN \
+ -DHAVE_STRLCPY \
+ -DHAVE_SETENV
CONN_DEFINES = ${X11FLAGS.CONNECTION} -DFS_t -DTRANS_CLIENT
SOCK_DEFINES = -DBSD44SOCKETS
CVS commit: src/external/mit/xorg/lib/libFS
Module Name:src Committed By: mrg Date: Fri Sep 9 03:46:29 UTC 2022 Modified Files: src/external/mit/xorg/lib/libFS: Makefile Log Message: updates for libFS 1.0.9. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libFS/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libFS
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:45:53 UTC 2022 Modified Files: xsrc/external/mit/libFS/dist/src: fs_transport.c Removed Files: xsrc/external/mit/libFS/include: config.h Log Message: merge libFS 1.0.9. also, obsolete the local config.h since only one file needed, and replace with the pattern in every other .c file here - #ifdef HAVE_CONFIG_H around the #include. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libFS/dist/src/fs_transport.c cvs rdiff -u -r1.7 -r0 xsrc/external/mit/libFS/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libFS/dist/src/fs_transport.c diff -u xsrc/external/mit/libFS/dist/src/fs_transport.c:1.1.1.1 xsrc/external/mit/libFS/dist/src/fs_transport.c:1.2 --- xsrc/external/mit/libFS/dist/src/fs_transport.c:1.1.1.1 Wed Jul 30 02:42:04 2008 +++ xsrc/external/mit/libFS/dist/src/fs_transport.c Fri Sep 9 03:45:53 2022 @@ -27,5 +27,7 @@ # define TRANS_CLIENT #endif +#ifdef HAVE_CONFIG_H #include "config.h" /* Need to know which transport types to support */ +#endif #include
CVS commit: xsrc/external/mit/libFS
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:45:53 UTC 2022 Modified Files: xsrc/external/mit/libFS/dist/src: fs_transport.c Removed Files: xsrc/external/mit/libFS/include: config.h Log Message: merge libFS 1.0.9. also, obsolete the local config.h since only one file needed, and replace with the pattern in every other .c file here - #ifdef HAVE_CONFIG_H around the #include. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libFS/dist/src/fs_transport.c cvs rdiff -u -r1.7 -r0 xsrc/external/mit/libFS/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/libfontenc/dist
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:35:56 UTC 2022 Update of /cvsroot/xsrc/external/mit/libfontenc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9446 Log Message: initial import of libfontenc-1.1.6 Status: Vendor Tag: xorg Release Tags: libfontenc-1-1-6 U xsrc/external/mit/libfontenc/dist/missing U xsrc/external/mit/libfontenc/dist/config.guess U xsrc/external/mit/libfontenc/dist/depcomp U xsrc/external/mit/libfontenc/dist/fontenc.pc.in U xsrc/external/mit/libfontenc/dist/ChangeLog U xsrc/external/mit/libfontenc/dist/COPYING U xsrc/external/mit/libfontenc/dist/README.md U xsrc/external/mit/libfontenc/dist/compile U xsrc/external/mit/libfontenc/dist/configure U xsrc/external/mit/libfontenc/dist/config.h.in U xsrc/external/mit/libfontenc/dist/config.sub U xsrc/external/mit/libfontenc/dist/Makefile.am U xsrc/external/mit/libfontenc/dist/Makefile.in U xsrc/external/mit/libfontenc/dist/install-sh U xsrc/external/mit/libfontenc/dist/configure.ac U xsrc/external/mit/libfontenc/dist/ltmain.sh U xsrc/external/mit/libfontenc/dist/aclocal.m4 U xsrc/external/mit/libfontenc/dist/INSTALL U xsrc/external/mit/libfontenc/dist/include/X11/fonts/fontenc.h U xsrc/external/mit/libfontenc/dist/src/fontencI.h U xsrc/external/mit/libfontenc/dist/src/encparse.c N xsrc/external/mit/libfontenc/dist/src/reallocarray.h U xsrc/external/mit/libfontenc/dist/src/Makefile.am U xsrc/external/mit/libfontenc/dist/src/Makefile.in U xsrc/external/mit/libfontenc/dist/src/fontenc.c N xsrc/external/mit/libfontenc/dist/src/reallocarray.c No conflicts created by this import
CVS import: xsrc/external/mit/libfontenc/dist
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:35:56 UTC 2022 Update of /cvsroot/xsrc/external/mit/libfontenc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9446 Log Message: initial import of libfontenc-1.1.6 Status: Vendor Tag: xorg Release Tags: libfontenc-1-1-6 U xsrc/external/mit/libfontenc/dist/missing U xsrc/external/mit/libfontenc/dist/config.guess U xsrc/external/mit/libfontenc/dist/depcomp U xsrc/external/mit/libfontenc/dist/fontenc.pc.in U xsrc/external/mit/libfontenc/dist/ChangeLog U xsrc/external/mit/libfontenc/dist/COPYING U xsrc/external/mit/libfontenc/dist/README.md U xsrc/external/mit/libfontenc/dist/compile U xsrc/external/mit/libfontenc/dist/configure U xsrc/external/mit/libfontenc/dist/config.h.in U xsrc/external/mit/libfontenc/dist/config.sub U xsrc/external/mit/libfontenc/dist/Makefile.am U xsrc/external/mit/libfontenc/dist/Makefile.in U xsrc/external/mit/libfontenc/dist/install-sh U xsrc/external/mit/libfontenc/dist/configure.ac U xsrc/external/mit/libfontenc/dist/ltmain.sh U xsrc/external/mit/libfontenc/dist/aclocal.m4 U xsrc/external/mit/libfontenc/dist/INSTALL U xsrc/external/mit/libfontenc/dist/include/X11/fonts/fontenc.h U xsrc/external/mit/libfontenc/dist/src/fontencI.h U xsrc/external/mit/libfontenc/dist/src/encparse.c N xsrc/external/mit/libfontenc/dist/src/reallocarray.h U xsrc/external/mit/libfontenc/dist/src/Makefile.am U xsrc/external/mit/libfontenc/dist/src/Makefile.in U xsrc/external/mit/libfontenc/dist/src/fontenc.c N xsrc/external/mit/libfontenc/dist/src/reallocarray.c No conflicts created by this import
CVS import: xsrc/external/mit/libXfont2/dist
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:35:53 UTC 2022 Update of /cvsroot/xsrc/external/mit/libXfont2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11953 Log Message: initial import of libXfont2-2.0.6 Status: Vendor Tag: xorg Release Tags: libXfont2-2-0-6 U xsrc/external/mit/libXfont2/dist/ChangeLog U xsrc/external/mit/libXfont2/dist/Makefile.am U xsrc/external/mit/libXfont2/dist/config.guess U xsrc/external/mit/libXfont2/dist/README.md U xsrc/external/mit/libXfont2/dist/configure U xsrc/external/mit/libXfont2/dist/INSTALL U xsrc/external/mit/libXfont2/dist/config.sub U xsrc/external/mit/libXfont2/dist/Makefile.in U xsrc/external/mit/libXfont2/dist/devbook.am U xsrc/external/mit/libXfont2/dist/COPYING U xsrc/external/mit/libXfont2/dist/ltmain.sh U xsrc/external/mit/libXfont2/dist/xfont2.pc.in U xsrc/external/mit/libXfont2/dist/compile U xsrc/external/mit/libXfont2/dist/AUTHORS U xsrc/external/mit/libXfont2/dist/aclocal.m4 U xsrc/external/mit/libXfont2/dist/config.h.in U xsrc/external/mit/libXfont2/dist/configure.ac U xsrc/external/mit/libXfont2/dist/depcomp U xsrc/external/mit/libXfont2/dist/install-sh U xsrc/external/mit/libXfont2/dist/missing U xsrc/external/mit/libXfont2/dist/src/fc/fstrans.c U xsrc/external/mit/libXfont2/dist/src/fc/fsconvert.c U xsrc/external/mit/libXfont2/dist/src/fc/fservestr.h U xsrc/external/mit/libXfont2/dist/src/fc/fserve.h U xsrc/external/mit/libXfont2/dist/src/fc/fsio.c U xsrc/external/mit/libXfont2/dist/src/fc/fslibos.h U xsrc/external/mit/libXfont2/dist/src/fc/fsio.h U xsrc/external/mit/libXfont2/dist/src/fc/fserve.c U xsrc/external/mit/libXfont2/dist/src/bitmap/snfstr.h U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfread.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmap.c U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfread.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bitscale.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmapfunc.c U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfwrite.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfutils.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmaputil.c U xsrc/external/mit/libXfont2/dist/src/bitmap/fontink.c U xsrc/external/mit/libXfont2/dist/src/bitmap/snfread.c U xsrc/external/mit/libXfont2/dist/src/stubs/libxfontstubs.c U xsrc/external/mit/libXfont2/dist/src/stubs/atom.c U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.h U xsrc/external/mit/libXfont2/dist/src/FreeType/ftfuncs.h U xsrc/external/mit/libXfont2/dist/src/FreeType/fttools.c U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.c U xsrc/external/mit/libXfont2/dist/src/FreeType/ft.h U xsrc/external/mit/libXfont2/dist/src/FreeType/ftfuncs.c U xsrc/external/mit/libXfont2/dist/src/FreeType/ftenc.c U xsrc/external/mit/libXfont2/dist/src/fontfile/bunzip2.c U xsrc/external/mit/libXfont2/dist/src/fontfile/bufio.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fontencc.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fontscale.c U xsrc/external/mit/libXfont2/dist/src/fontfile/decompress.c U xsrc/external/mit/libXfont2/dist/src/fontfile/filewr.c U xsrc/external/mit/libXfont2/dist/src/fontfile/gunzip.c U xsrc/external/mit/libXfont2/dist/src/fontfile/dirfile.c U xsrc/external/mit/libXfont2/dist/src/fontfile/bitsource.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fontfile.c U xsrc/external/mit/libXfont2/dist/src/fontfile/defaults.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fontdir.c U xsrc/external/mit/libXfont2/dist/src/fontfile/renderers.c U xsrc/external/mit/libXfont2/dist/src/fontfile/catalogue.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fileio.c U xsrc/external/mit/libXfont2/dist/src/fontfile/register.c U xsrc/external/mit/libXfont2/dist/src/builtins/render.c U xsrc/external/mit/libXfont2/dist/src/builtins/fonts.c U xsrc/external/mit/libXfont2/dist/src/builtins/buildfont U xsrc/external/mit/libXfont2/dist/src/builtins/fpe.c U xsrc/external/mit/libXfont2/dist/src/builtins/dir.c U xsrc/external/mit/libXfont2/dist/src/builtins/file.c U xsrc/external/mit/libXfont2/dist/src/builtins/builtin.h U xsrc/external/mit/libXfont2/dist/src/util/private.c U xsrc/external/mit/libXfont2/dist/src/util/fontaccel.c U xsrc/external/mit/libXfont2/dist/src/util/utilbitmap.c U xsrc/external/mit/libXfont2/dist/src/util/strlcat.c U xsrc/external/mit/libXfont2/dist/src/util/miscutil.c U xsrc/external/mit/libXfont2/dist/src/util/strlcpy.c U xsrc/external/mit/libXfont2/dist/src/util/reallocarray.c U xsrc/external/mit/libXfont2/dist/src/util/patcache.c U xsrc/external/mit/libXfont2/dist/src/util/realpath.c U xsrc/external/mit/libXfont2/dist/src/util/fontutil.c U xsrc/external/mit/libXfont2/dist/src/util/fontnames.c U xsrc/external/mit/libXfont2/dist/src/util/fontxlfd.c U xsrc/external/mit/libXfont2/dist/src/util/format.c U xsrc/external/mit/libXfont2/dist/src/util/replace.h U xsrc/external/mit/libXfont2/dist/include/libxfontint.h U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fntfilio.h U
CVS import: xsrc/external/mit/libXfont2/dist
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:35:53 UTC 2022 Update of /cvsroot/xsrc/external/mit/libXfont2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11953 Log Message: initial import of libXfont2-2.0.6 Status: Vendor Tag: xorg Release Tags: libXfont2-2-0-6 U xsrc/external/mit/libXfont2/dist/ChangeLog U xsrc/external/mit/libXfont2/dist/Makefile.am U xsrc/external/mit/libXfont2/dist/config.guess U xsrc/external/mit/libXfont2/dist/README.md U xsrc/external/mit/libXfont2/dist/configure U xsrc/external/mit/libXfont2/dist/INSTALL U xsrc/external/mit/libXfont2/dist/config.sub U xsrc/external/mit/libXfont2/dist/Makefile.in U xsrc/external/mit/libXfont2/dist/devbook.am U xsrc/external/mit/libXfont2/dist/COPYING U xsrc/external/mit/libXfont2/dist/ltmain.sh U xsrc/external/mit/libXfont2/dist/xfont2.pc.in U xsrc/external/mit/libXfont2/dist/compile U xsrc/external/mit/libXfont2/dist/AUTHORS U xsrc/external/mit/libXfont2/dist/aclocal.m4 U xsrc/external/mit/libXfont2/dist/config.h.in U xsrc/external/mit/libXfont2/dist/configure.ac U xsrc/external/mit/libXfont2/dist/depcomp U xsrc/external/mit/libXfont2/dist/install-sh U xsrc/external/mit/libXfont2/dist/missing U xsrc/external/mit/libXfont2/dist/src/fc/fstrans.c U xsrc/external/mit/libXfont2/dist/src/fc/fsconvert.c U xsrc/external/mit/libXfont2/dist/src/fc/fservestr.h U xsrc/external/mit/libXfont2/dist/src/fc/fserve.h U xsrc/external/mit/libXfont2/dist/src/fc/fsio.c U xsrc/external/mit/libXfont2/dist/src/fc/fslibos.h U xsrc/external/mit/libXfont2/dist/src/fc/fsio.h U xsrc/external/mit/libXfont2/dist/src/fc/fserve.c U xsrc/external/mit/libXfont2/dist/src/bitmap/snfstr.h U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfread.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmap.c U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfread.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bitscale.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmapfunc.c U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfwrite.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfutils.c U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmaputil.c U xsrc/external/mit/libXfont2/dist/src/bitmap/fontink.c U xsrc/external/mit/libXfont2/dist/src/bitmap/snfread.c U xsrc/external/mit/libXfont2/dist/src/stubs/libxfontstubs.c U xsrc/external/mit/libXfont2/dist/src/stubs/atom.c U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.h U xsrc/external/mit/libXfont2/dist/src/FreeType/ftfuncs.h U xsrc/external/mit/libXfont2/dist/src/FreeType/fttools.c U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.c U xsrc/external/mit/libXfont2/dist/src/FreeType/ft.h U xsrc/external/mit/libXfont2/dist/src/FreeType/ftfuncs.c U xsrc/external/mit/libXfont2/dist/src/FreeType/ftenc.c U xsrc/external/mit/libXfont2/dist/src/fontfile/bunzip2.c U xsrc/external/mit/libXfont2/dist/src/fontfile/bufio.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fontencc.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fontscale.c U xsrc/external/mit/libXfont2/dist/src/fontfile/decompress.c U xsrc/external/mit/libXfont2/dist/src/fontfile/filewr.c U xsrc/external/mit/libXfont2/dist/src/fontfile/gunzip.c U xsrc/external/mit/libXfont2/dist/src/fontfile/dirfile.c U xsrc/external/mit/libXfont2/dist/src/fontfile/bitsource.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fontfile.c U xsrc/external/mit/libXfont2/dist/src/fontfile/defaults.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fontdir.c U xsrc/external/mit/libXfont2/dist/src/fontfile/renderers.c U xsrc/external/mit/libXfont2/dist/src/fontfile/catalogue.c U xsrc/external/mit/libXfont2/dist/src/fontfile/fileio.c U xsrc/external/mit/libXfont2/dist/src/fontfile/register.c U xsrc/external/mit/libXfont2/dist/src/builtins/render.c U xsrc/external/mit/libXfont2/dist/src/builtins/fonts.c U xsrc/external/mit/libXfont2/dist/src/builtins/buildfont U xsrc/external/mit/libXfont2/dist/src/builtins/fpe.c U xsrc/external/mit/libXfont2/dist/src/builtins/dir.c U xsrc/external/mit/libXfont2/dist/src/builtins/file.c U xsrc/external/mit/libXfont2/dist/src/builtins/builtin.h U xsrc/external/mit/libXfont2/dist/src/util/private.c U xsrc/external/mit/libXfont2/dist/src/util/fontaccel.c U xsrc/external/mit/libXfont2/dist/src/util/utilbitmap.c U xsrc/external/mit/libXfont2/dist/src/util/strlcat.c U xsrc/external/mit/libXfont2/dist/src/util/miscutil.c U xsrc/external/mit/libXfont2/dist/src/util/strlcpy.c U xsrc/external/mit/libXfont2/dist/src/util/reallocarray.c U xsrc/external/mit/libXfont2/dist/src/util/patcache.c U xsrc/external/mit/libXfont2/dist/src/util/realpath.c U xsrc/external/mit/libXfont2/dist/src/util/fontutil.c U xsrc/external/mit/libXfont2/dist/src/util/fontnames.c U xsrc/external/mit/libXfont2/dist/src/util/fontxlfd.c U xsrc/external/mit/libXfont2/dist/src/util/format.c U xsrc/external/mit/libXfont2/dist/src/util/replace.h U xsrc/external/mit/libXfont2/dist/include/libxfontint.h U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fntfilio.h U
CVS import: xsrc/external/mit/libXau/dist
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:35:50 UTC 2022 Update of /cvsroot/xsrc/external/mit/libXau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv65 Log Message: initial import of libXau-1.0.10 Status: Vendor Tag: xorg Release Tags: libXau-1-0-10 U xsrc/external/mit/libXau/dist/README U xsrc/external/mit/libXau/dist/AuGetBest.c U xsrc/external/mit/libXau/dist/AuRead.c U xsrc/external/mit/libXau/dist/Makefile.in U xsrc/external/mit/libXau/dist/xau.pc.in U xsrc/external/mit/libXau/dist/test-driver U xsrc/external/mit/libXau/dist/config.sub U xsrc/external/mit/libXau/dist/INSTALL U xsrc/external/mit/libXau/dist/AuUnlock.c U xsrc/external/mit/libXau/dist/AuFileName.c U xsrc/external/mit/libXau/dist/configure.ac U xsrc/external/mit/libXau/dist/ltmain.sh U xsrc/external/mit/libXau/dist/AuGetAddr.c U xsrc/external/mit/libXau/dist/Makefile.am U xsrc/external/mit/libXau/dist/AuLock.c U xsrc/external/mit/libXau/dist/AuWrite.c U xsrc/external/mit/libXau/dist/config.h.in U xsrc/external/mit/libXau/dist/config.guess U xsrc/external/mit/libXau/dist/depcomp U xsrc/external/mit/libXau/dist/missing U xsrc/external/mit/libXau/dist/AuDispose.c U xsrc/external/mit/libXau/dist/aclocal.m4 U xsrc/external/mit/libXau/dist/COPYING U xsrc/external/mit/libXau/dist/install-sh U xsrc/external/mit/libXau/dist/configure U xsrc/external/mit/libXau/dist/ChangeLog U xsrc/external/mit/libXau/dist/AUTHORS U xsrc/external/mit/libXau/dist/compile U xsrc/external/mit/libXau/dist/Autest.c U xsrc/external/mit/libXau/dist/include/X11/Xauth.h U xsrc/external/mit/libXau/dist/man/XauWriteAuth.man U xsrc/external/mit/libXau/dist/man/XauLockAuth.man U xsrc/external/mit/libXau/dist/man/XauDisposeAuth.man U xsrc/external/mit/libXau/dist/man/Makefile.in U xsrc/external/mit/libXau/dist/man/XauGetBestAuthByAddr.man U xsrc/external/mit/libXau/dist/man/XauGetAuthByAddr.man U xsrc/external/mit/libXau/dist/man/XauUnlockAuth.man U xsrc/external/mit/libXau/dist/man/Xau.man U xsrc/external/mit/libXau/dist/man/Makefile.am U xsrc/external/mit/libXau/dist/man/XauFileName.man U xsrc/external/mit/libXau/dist/man/XauReadAuth.man No conflicts created by this import
CVS import: xsrc/external/mit/libXau/dist
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:35:50 UTC 2022 Update of /cvsroot/xsrc/external/mit/libXau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv65 Log Message: initial import of libXau-1.0.10 Status: Vendor Tag: xorg Release Tags: libXau-1-0-10 U xsrc/external/mit/libXau/dist/README U xsrc/external/mit/libXau/dist/AuGetBest.c U xsrc/external/mit/libXau/dist/AuRead.c U xsrc/external/mit/libXau/dist/Makefile.in U xsrc/external/mit/libXau/dist/xau.pc.in U xsrc/external/mit/libXau/dist/test-driver U xsrc/external/mit/libXau/dist/config.sub U xsrc/external/mit/libXau/dist/INSTALL U xsrc/external/mit/libXau/dist/AuUnlock.c U xsrc/external/mit/libXau/dist/AuFileName.c U xsrc/external/mit/libXau/dist/configure.ac U xsrc/external/mit/libXau/dist/ltmain.sh U xsrc/external/mit/libXau/dist/AuGetAddr.c U xsrc/external/mit/libXau/dist/Makefile.am U xsrc/external/mit/libXau/dist/AuLock.c U xsrc/external/mit/libXau/dist/AuWrite.c U xsrc/external/mit/libXau/dist/config.h.in U xsrc/external/mit/libXau/dist/config.guess U xsrc/external/mit/libXau/dist/depcomp U xsrc/external/mit/libXau/dist/missing U xsrc/external/mit/libXau/dist/AuDispose.c U xsrc/external/mit/libXau/dist/aclocal.m4 U xsrc/external/mit/libXau/dist/COPYING U xsrc/external/mit/libXau/dist/install-sh U xsrc/external/mit/libXau/dist/configure U xsrc/external/mit/libXau/dist/ChangeLog U xsrc/external/mit/libXau/dist/AUTHORS U xsrc/external/mit/libXau/dist/compile U xsrc/external/mit/libXau/dist/Autest.c U xsrc/external/mit/libXau/dist/include/X11/Xauth.h U xsrc/external/mit/libXau/dist/man/XauWriteAuth.man U xsrc/external/mit/libXau/dist/man/XauLockAuth.man U xsrc/external/mit/libXau/dist/man/XauDisposeAuth.man U xsrc/external/mit/libXau/dist/man/Makefile.in U xsrc/external/mit/libXau/dist/man/XauGetBestAuthByAddr.man U xsrc/external/mit/libXau/dist/man/XauGetAuthByAddr.man U xsrc/external/mit/libXau/dist/man/XauUnlockAuth.man U xsrc/external/mit/libXau/dist/man/Xau.man U xsrc/external/mit/libXau/dist/man/Makefile.am U xsrc/external/mit/libXau/dist/man/XauFileName.man U xsrc/external/mit/libXau/dist/man/XauReadAuth.man No conflicts created by this import
CVS import: xsrc/external/mit/libFS/dist
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:35:48 UTC 2022 Update of /cvsroot/xsrc/external/mit/libFS/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10831 Log Message: initial import of libFS-1.0.9 Status: Vendor Tag: xorg Release Tags: libFS-1-0-9 U xsrc/external/mit/libFS/dist/config.h.in U xsrc/external/mit/libFS/dist/config.sub U xsrc/external/mit/libFS/dist/configure.ac U xsrc/external/mit/libFS/dist/ltmain.sh U xsrc/external/mit/libFS/dist/INSTALL U xsrc/external/mit/libFS/dist/aclocal.m4 U xsrc/external/mit/libFS/dist/install-sh U xsrc/external/mit/libFS/dist/Makefile.in U xsrc/external/mit/libFS/dist/libfs.pc.in U xsrc/external/mit/libFS/dist/depcomp U xsrc/external/mit/libFS/dist/missing U xsrc/external/mit/libFS/dist/config.guess U xsrc/external/mit/libFS/dist/COPYING U xsrc/external/mit/libFS/dist/ChangeLog U xsrc/external/mit/libFS/dist/README.md U xsrc/external/mit/libFS/dist/Makefile.am U xsrc/external/mit/libFS/dist/configure U xsrc/external/mit/libFS/dist/compile U xsrc/external/mit/libFS/dist/doc/FSlib.txt U xsrc/external/mit/libFS/dist/test/Makefile.in U xsrc/external/mit/libFS/dist/test/Makefile.am U xsrc/external/mit/libFS/dist/test/FSGetErrorText.c U xsrc/external/mit/libFS/dist/src/FSSynchro.c U xsrc/external/mit/libFS/dist/src/FSErrHndlr.c U xsrc/external/mit/libFS/dist/src/FSNextEv.c U xsrc/external/mit/libFS/dist/src/FSQXExt.c U xsrc/external/mit/libFS/dist/src/FSMisc.c U xsrc/external/mit/libFS/dist/src/Makefile.in U xsrc/external/mit/libFS/dist/src/FSlibos.h U xsrc/external/mit/libFS/dist/src/FSErrDis.c U xsrc/external/mit/libFS/dist/src/fs_transport.c U xsrc/external/mit/libFS/dist/src/FSListExt.c N xsrc/external/mit/libFS/dist/src/reallocarray.c U xsrc/external/mit/libFS/dist/src/Makefile.am U xsrc/external/mit/libFS/dist/src/FSQXInfo.c U xsrc/external/mit/libFS/dist/src/FSFlush.c U xsrc/external/mit/libFS/dist/src/FSFontInfo.c U xsrc/external/mit/libFS/dist/src/FSSetCats.c U xsrc/external/mit/libFS/dist/src/FSQGlyphs.c U xsrc/external/mit/libFS/dist/src/FSGetCats.c U xsrc/external/mit/libFS/dist/src/FSServName.c U xsrc/external/mit/libFS/dist/src/FSlibint.h U xsrc/external/mit/libFS/dist/src/FSOpenFont.c U xsrc/external/mit/libFS/dist/src/FSOpenServ.c U xsrc/external/mit/libFS/dist/src/FSSync.c U xsrc/external/mit/libFS/dist/src/FSFtNames.c U xsrc/external/mit/libFS/dist/src/FSQuExt.c U xsrc/external/mit/libFS/dist/src/FSConnServ.c U xsrc/external/mit/libFS/dist/src/FSlibInt.c U xsrc/external/mit/libFS/dist/src/FSClServ.c U xsrc/external/mit/libFS/dist/src/FSListCats.c U xsrc/external/mit/libFS/dist/src/FSCloseFt.c U xsrc/external/mit/libFS/dist/include/X11/fonts/FSlib.h No conflicts created by this import
CVS import: xsrc/external/mit/libFS/dist
Module Name:xsrc Committed By: mrg Date: Fri Sep 9 03:35:48 UTC 2022 Update of /cvsroot/xsrc/external/mit/libFS/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10831 Log Message: initial import of libFS-1.0.9 Status: Vendor Tag: xorg Release Tags: libFS-1-0-9 U xsrc/external/mit/libFS/dist/config.h.in U xsrc/external/mit/libFS/dist/config.sub U xsrc/external/mit/libFS/dist/configure.ac U xsrc/external/mit/libFS/dist/ltmain.sh U xsrc/external/mit/libFS/dist/INSTALL U xsrc/external/mit/libFS/dist/aclocal.m4 U xsrc/external/mit/libFS/dist/install-sh U xsrc/external/mit/libFS/dist/Makefile.in U xsrc/external/mit/libFS/dist/libfs.pc.in U xsrc/external/mit/libFS/dist/depcomp U xsrc/external/mit/libFS/dist/missing U xsrc/external/mit/libFS/dist/config.guess U xsrc/external/mit/libFS/dist/COPYING U xsrc/external/mit/libFS/dist/ChangeLog U xsrc/external/mit/libFS/dist/README.md U xsrc/external/mit/libFS/dist/Makefile.am U xsrc/external/mit/libFS/dist/configure U xsrc/external/mit/libFS/dist/compile U xsrc/external/mit/libFS/dist/doc/FSlib.txt U xsrc/external/mit/libFS/dist/test/Makefile.in U xsrc/external/mit/libFS/dist/test/Makefile.am U xsrc/external/mit/libFS/dist/test/FSGetErrorText.c U xsrc/external/mit/libFS/dist/src/FSSynchro.c U xsrc/external/mit/libFS/dist/src/FSErrHndlr.c U xsrc/external/mit/libFS/dist/src/FSNextEv.c U xsrc/external/mit/libFS/dist/src/FSQXExt.c U xsrc/external/mit/libFS/dist/src/FSMisc.c U xsrc/external/mit/libFS/dist/src/Makefile.in U xsrc/external/mit/libFS/dist/src/FSlibos.h U xsrc/external/mit/libFS/dist/src/FSErrDis.c U xsrc/external/mit/libFS/dist/src/fs_transport.c U xsrc/external/mit/libFS/dist/src/FSListExt.c N xsrc/external/mit/libFS/dist/src/reallocarray.c U xsrc/external/mit/libFS/dist/src/Makefile.am U xsrc/external/mit/libFS/dist/src/FSQXInfo.c U xsrc/external/mit/libFS/dist/src/FSFlush.c U xsrc/external/mit/libFS/dist/src/FSFontInfo.c U xsrc/external/mit/libFS/dist/src/FSSetCats.c U xsrc/external/mit/libFS/dist/src/FSQGlyphs.c U xsrc/external/mit/libFS/dist/src/FSGetCats.c U xsrc/external/mit/libFS/dist/src/FSServName.c U xsrc/external/mit/libFS/dist/src/FSlibint.h U xsrc/external/mit/libFS/dist/src/FSOpenFont.c U xsrc/external/mit/libFS/dist/src/FSOpenServ.c U xsrc/external/mit/libFS/dist/src/FSSync.c U xsrc/external/mit/libFS/dist/src/FSFtNames.c U xsrc/external/mit/libFS/dist/src/FSQuExt.c U xsrc/external/mit/libFS/dist/src/FSConnServ.c U xsrc/external/mit/libFS/dist/src/FSlibInt.c U xsrc/external/mit/libFS/dist/src/FSClServ.c U xsrc/external/mit/libFS/dist/src/FSListCats.c U xsrc/external/mit/libFS/dist/src/FSCloseFt.c U xsrc/external/mit/libFS/dist/include/X11/fonts/FSlib.h No conflicts created by this import
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Thu Sep 8 20:23:45 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: var-op-expand.exp var-op-expand.mk
Log Message:
tests/make: extend tests for the ':=' assignment operator
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/var-op-expand.exp
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/var-op-expand.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/unit-tests/var-op-expand.exp
diff -u src/usr.bin/make/unit-tests/var-op-expand.exp:1.6 src/usr.bin/make/unit-tests/var-op-expand.exp:1.7
--- src/usr.bin/make/unit-tests/var-op-expand.exp:1.6 Tue Nov 30 23:52:19 2021
+++ src/usr.bin/make/unit-tests/var-op-expand.exp Thu Sep 8 20:23:45 2022
@@ -1,7 +1,7 @@
-make: "var-op-expand.mk" line 265: Unknown modifier "s,value,replaced,"
-make: "var-op-expand.mk" line 268: warning: XXX Neither branch should be taken.
-make: "var-op-expand.mk" line 273: Unknown modifier "s,value,replaced,"
-make: "var-op-expand.mk" line 274: warning: XXX Neither branch should be taken.
+make: "var-op-expand.mk" line 274: Unknown modifier "s,value,replaced,"
+make: "var-op-expand.mk" line 277: warning: XXX Neither branch should be taken.
+make: "var-op-expand.mk" line 282: Unknown modifier "s,value,replaced,"
+make: "var-op-expand.mk" line 283: warning: XXX Neither branch should be taken.
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/var-op-expand.mk
diff -u src/usr.bin/make/unit-tests/var-op-expand.mk:1.16 src/usr.bin/make/unit-tests/var-op-expand.mk:1.17
--- src/usr.bin/make/unit-tests/var-op-expand.mk:1.16 Tue Dec 28 10:47:00 2021
+++ src/usr.bin/make/unit-tests/var-op-expand.mk Thu Sep 8 20:23:45 2022
@@ -1,4 +1,4 @@
-# $NetBSD: var-op-expand.mk,v 1.16 2021/12/28 10:47:00 rillig Exp $
+# $NetBSD: var-op-expand.mk,v 1.17 2022/09/08 20:23:45 rillig Exp $
#
# Tests for the := variable assignment operator, which expands its
# right-hand side.
@@ -37,7 +37,7 @@ VAR:= $$
.endif
-# reference to a variable containing a literal dollar sign
+# reference to a variable containing literal dollar signs
REF= $$
VAR:= ${REF}
REF= too late
@@ -49,6 +49,9 @@ REF= too late
# reference to an undefined variable
.undef UNDEF
VAR:= <${UNDEF}>
+.if ${VAR} != "<>"
+. error
+.endif
UNDEF= after
.if ${VAR} != ""
. error
@@ -68,6 +71,9 @@ REF= too late
# expression with an indirect modifier referring to an undefined variable
.undef UNDEF
VAR:= ${:${UNDEF}}
+.if ${VAR} != ""
+. error
+.endif
UNDEF= Uwas undefined
.if ${VAR} != "was undefined"
. error
@@ -99,6 +105,9 @@ UNDEF= Uwas undefined
REF2= <${REF3}>
REF= ${REF2}
VAR:= ${REF}
+.if ${VAR} != "<>"
+. error
+.endif
REF3= too late
.if ${VAR} != ""
. error
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Sep 8 20:23:45 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: var-op-expand.exp var-op-expand.mk Log Message: tests/make: extend tests for the ':=' assignment operator To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/var-op-expand.exp cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/var-op-expand.mk 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: Thu Sep 8 20:22:55 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make.1: rewrite many details in a more precise way To generate a diff of this commit: cvs rdiff -u -r1.336 -r1.337 src/usr.bin/make/make.1 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: Thu Sep 8 20:22:55 UTC 2022
Modified Files:
src/usr.bin/make: make.1
Log Message:
make.1: rewrite many details in a more precise way
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 src/usr.bin/make/make.1
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/make.1
diff -u src/usr.bin/make/make.1:1.336 src/usr.bin/make/make.1:1.337
--- src/usr.bin/make/make.1:1.336 Wed Sep 7 23:34:56 2022
+++ src/usr.bin/make/make.1 Thu Sep 8 20:22:55 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.336 2022/09/07 23:34:56 rillig Exp $
+.\" $NetBSD: make.1,v 1.337 2022/09/08 20:22:55 rillig Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\"
-.Dd September 7, 2022
+.Dd September 8, 2022
.Dt MAKE 1
.Os
.Sh NAME
@@ -626,15 +626,20 @@ References to undefined variables are
.Em not
expanded.
This can cause problems when variable modifiers are used.
+.\" See var-op-expand.mk, the section with LATER and INDIRECT.
.It Ic \&!=
Expand the value and pass it to the shell for execution,
then assign the output from the child's standard output to the variable.
Any newlines in the result are replaced with spaces.
.El
.Ss Expansion of variables
-In contexts where variables are expanded,
+In most contexts where variables are expanded,
.Ql \&$$
expands to a single dollar sign.
+In other contexts (most variable modifiers, string literals in conditions),
+.Ql \&\e$
+expands to a single dollar sign.
+.Pp
References to variables have the form
.Ql \&${ Ns Ar name Ns Oo \&: Ns Ar modifiers Oc Ns }
or
@@ -647,9 +652,9 @@ If the variable name contains a dollar,
This allows almost arbitrary variable names, however names containing dollar,
braces, parentheses or whitespace are really best avoided.
.Pp
-If the result of expanding a variable contains a dollar sign
+If the result of expanding a nested variable expression contains a dollar sign
.Pq Ql \&$ ,
-the string is expanded again.
+the string is subject to further expansion.
.Pp
Variable substitution occurs at four distinct times, depending on where
the variable is being used.
@@ -688,7 +693,7 @@ prints:
Because while
.Va a
contains
-.Ql 1 2 3
+.Ql ${:U1} ${:U2} ${:U3}
after the loop is executed,
.Va b
contains
@@ -698,7 +703,7 @@ which expands to
since after the loop completes
.Va j
contains
-.Ql 3 .
+.Ql ${:U3} .
.El
.Ss Variable classes
The four different classes of variables (in order of increasing precedence)
@@ -716,9 +721,9 @@ Variables defined as part of the command
Variables that are defined specific to a certain target.
.El
.Pp
-Local variables can be set on a dependency line, if
+Local variables can be set on a dependency line, unless
.Va .MAKE.TARGET_LOCAL_VARIABLES
-is not set to
+is set to
.Ql false .
The rest of the line
(which already has had global variables expanded)
@@ -749,7 +754,7 @@ Is redundant with respect to global vari
which have already been expanded.
.El
.Pp
-The seven built-in local variables are as follows:
+The seven built-in local variables are:
.Bl -tag -width ".Va .ARCHIVE" -offset indent
.It Va .ALLSRC
The list of all sources for this target; also known as
@@ -830,9 +835,9 @@ In addition,
sets or knows about the following variables:
.Bl -tag -width .MAKEOVERRIDES
.It Va .ALLTARGETS
-The list of all targets encountered in the Makefile.
-If evaluated during
-Makefile parsing, lists only those targets encountered thus far.
+The list of all targets encountered in the makefiles.
+If evaluated during makefile parsing,
+lists only those targets encountered thus far.
.It Va .CURDIR
A path to the directory where
.Nm
@@ -967,36 +972,40 @@ to capture the command run, the output g
is available, the system calls which are of interest to
.Nm .
The captured output can be very useful when diagnosing errors.
-.It Pa curdirOk= Ar bf
+.It Pa curdirOk= Ns Ar bf
Normally
.Nm
-does not create .meta files in
+does not create
+.Pa .meta
+files in
.Sq Va .CURDIR .
This can be overridden by setting
.Va bf
-to a value which represents True.
-.It Pa missing-meta= Ar bf
+to a value which represents true.
+.It Pa missing-meta= Ns Ar bf
If
.Va bf
-is True, a missing
+is true, a missing
.Pa .meta
file makes the target out-of-date.
-.It Pa missing-filemon= Ar bf
+.It Pa missing-filemon= Ns Ar bf
If
.Va bf
-is True, missing filemon data makes the target out-of-date.
+is true, missing filemon data makes the target out-of-date.
.It Pa nofilemon
Do not use
.Xr filemon 4 .
.It Pa env
For debugging, it can be useful to include the environment
-in the .meta file.
+in the
+.Pa .meta
+file.
.It Pa verbose
If in
.Dq meta
mode, print a clue about the target being built.
This is useful if the build is otherwise
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src
Committed By: rin
Date: Thu Sep 8 15:22:43 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_compare.c
Log Message:
fpu_compare(): Assign r by using return value from fpu_sub(),
instead of directly using >fe_f3. NFC; only for clarity.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/fpu/fpu_compare.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/powerpc/fpu/fpu_compare.c
diff -u src/sys/arch/powerpc/fpu/fpu_compare.c:1.7 src/sys/arch/powerpc/fpu/fpu_compare.c:1.8
--- src/sys/arch/powerpc/fpu/fpu_compare.c:1.7 Thu Sep 8 15:21:50 2022
+++ src/sys/arch/powerpc/fpu/fpu_compare.c Thu Sep 8 15:22:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_compare.c,v 1.7 2022/09/08 15:21:50 rin Exp $ */
+/* $NetBSD: fpu_compare.c,v 1.8 2022/09/08 15:22:43 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_compare.c,v 1.7 2022/09/08 15:21:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_compare.c,v 1.8 2022/09/08 15:22:43 rin Exp $");
#include
@@ -83,7 +83,6 @@ fpu_compare(struct fpemu *fe, int ordere
a = >fe_f1;
b = >fe_f2;
- r = >fe_f3;
if (ISNAN(a) || ISNAN(b)) {
/*
@@ -154,7 +153,7 @@ fpu_compare(struct fpemu *fe, int ordere
cc = FPSCR_FE;
goto done;
}
- fpu_sub(fe);
+ r = fpu_sub(fe);
if (ISZERO(r))
cc = FPSCR_FE;
else if (r->fp_sign)
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src Committed By: rin Date: Thu Sep 8 15:22:43 UTC 2022 Modified Files: src/sys/arch/powerpc/fpu: fpu_compare.c Log Message: fpu_compare(): Assign r by using return value from fpu_sub(), instead of directly using >fe_f3. NFC; only for clarity. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/fpu/fpu_compare.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/powerpc/fpu
Module Name:src
Committed By: rin
Date: Thu Sep 8 15:21:50 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_compare.c
Log Message:
fpu_compare(): Fix inverted logic and comment it out for now.
VXVC is raised for SNaN if VE == 0.
As we still do not support enabled exception bits, comment out
this if statement for consistency at the moment.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/fpu/fpu_compare.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/powerpc/fpu/fpu_compare.c
diff -u src/sys/arch/powerpc/fpu/fpu_compare.c:1.6 src/sys/arch/powerpc/fpu/fpu_compare.c:1.7
--- src/sys/arch/powerpc/fpu/fpu_compare.c:1.6 Sun Sep 4 13:14:57 2022
+++ src/sys/arch/powerpc/fpu/fpu_compare.c Thu Sep 8 15:21:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_compare.c,v 1.6 2022/09/04 13:14:57 rin Exp $ */
+/* $NetBSD: fpu_compare.c,v 1.7 2022/09/08 15:21:50 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_compare.c,v 1.6 2022/09/04 13:14:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_compare.c,v 1.7 2022/09/08 15:21:50 rin Exp $");
#include
@@ -95,7 +95,10 @@ fpu_compare(struct fpemu *fe, int ordere
if (ISSNAN(a) || ISSNAN(b))
cc |= FPSCR_VXSNAN;
if (ordered) {
- if (fe->fe_fpscr & FPSCR_VE || ISQNAN(a) || ISQNAN(b))
+#ifdef notyet /* XXXRO */
+ if ((fe->fe_fpscr & FPSCR_VE) == 0 ||
+ ISQNAN(a) || ISQNAN(b))
+#endif
cc |= FPSCR_VXVC;
}
goto done;
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src Committed By: rin Date: Thu Sep 8 15:21:50 UTC 2022 Modified Files: src/sys/arch/powerpc/fpu: fpu_compare.c Log Message: fpu_compare(): Fix inverted logic and comment it out for now. VXVC is raised for SNaN if VE == 0. As we still do not support enabled exception bits, comment out this if statement for consistency at the moment. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/fpu/fpu_compare.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Sep 8 10:29:36 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
Undo accidental whitespace changes from applying the patch for
ticket #1759 by applying a patch from msaitoh (NFC).
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.46 -r1.508.4.47 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.46 src/sys/dev/pci/if_wm.c:1.508.4.47
--- src/sys/dev/pci/if_wm.c:1.508.4.46 Wed Sep 7 10:09:20 2022
+++ src/sys/dev/pci/if_wm.c Thu Sep 8 10:29:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.46 2022/09/07 10:09:20 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.47 2022/09/08 10:29:36 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.46 2022/09/07 10:09:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.47 2022/09/08 10:29:36 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3168,16 +3168,16 @@ alloc_retry:
NULL, xname, "linkintr");
if (sc->sc_type >= WM_T_82542_2_1) {
- evcnt_attach_dynamic(>sc_ev_tx_xoff, EVCNT_TYPE_MISC,
- NULL, xname, "tx_xoff");
- evcnt_attach_dynamic(>sc_ev_tx_xon, EVCNT_TYPE_MISC,
- NULL, xname, "tx_xon");
- evcnt_attach_dynamic(>sc_ev_rx_xoff, EVCNT_TYPE_MISC,
- NULL, xname, "rx_xoff");
- evcnt_attach_dynamic(>sc_ev_rx_xon, EVCNT_TYPE_MISC,
- NULL, xname, "rx_xon");
- evcnt_attach_dynamic(>sc_ev_rx_macctl, EVCNT_TYPE_MISC,
- NULL, xname, "rx_macctl");
+ evcnt_attach_dynamic(>sc_ev_tx_xoff, EVCNT_TYPE_MISC,
+ NULL, xname, "tx_xoff");
+ evcnt_attach_dynamic(>sc_ev_tx_xon, EVCNT_TYPE_MISC,
+ NULL, xname, "tx_xon");
+ evcnt_attach_dynamic(>sc_ev_rx_xoff, EVCNT_TYPE_MISC,
+ NULL, xname, "rx_xoff");
+ evcnt_attach_dynamic(>sc_ev_rx_xon, EVCNT_TYPE_MISC,
+ NULL, xname, "rx_xon");
+ evcnt_attach_dynamic(>sc_ev_rx_macctl, EVCNT_TYPE_MISC,
+ NULL, xname, "rx_macctl");
}
evcnt_attach_dynamic(>sc_ev_crcerrs, EVCNT_TYPE_MISC,
@@ -3359,11 +3359,11 @@ wm_detach(device_t self, int flags __unu
evcnt_detach(>sc_ev_linkintr);
if (sc->sc_type >= WM_T_82542_2_1) {
- evcnt_detach(>sc_ev_tx_xoff);
- evcnt_detach(>sc_ev_tx_xon);
- evcnt_detach(>sc_ev_rx_xoff);
- evcnt_detach(>sc_ev_rx_xon);
- evcnt_detach(>sc_ev_rx_macctl);
+ evcnt_detach(>sc_ev_tx_xoff);
+ evcnt_detach(>sc_ev_tx_xon);
+ evcnt_detach(>sc_ev_rx_xoff);
+ evcnt_detach(>sc_ev_rx_xon);
+ evcnt_detach(>sc_ev_rx_macctl);
}
evcnt_detach(>sc_ev_crcerrs);
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Sep 8 10:29:36 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-8]: if_wm.c Log Message: Undo accidental whitespace changes from applying the patch for ticket #1759 by applying a patch from msaitoh (NFC). To generate a diff of this commit: cvs rdiff -u -r1.508.4.46 -r1.508.4.47 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: skrll
Date: Thu Sep 8 07:05:42 UTC 2022
Modified Files:
src/sys/dev/pci: if_aq.c
Log Message:
Sprinkle const. Same binary before and after.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_aq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.31 src/sys/dev/pci/if_aq.c:1.32
--- src/sys/dev/pci/if_aq.c:1.31 Sat Nov 13 21:38:48 2021
+++ src/sys/dev/pci/if_aq.c Thu Sep 8 07:05:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aq.c,v 1.31 2021/11/13 21:38:48 ryo Exp $ */
+/* $NetBSD: if_aq.c,v 1.32 2022/09/08 07:05:42 skrll Exp $ */
/**
* aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.31 2021/11/13 21:38:48 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.32 2022/09/08 07:05:42 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_aq.h"
@@ -1231,7 +1231,7 @@ aq_lookup(const struct pci_attach_args *
static int
aq_match(device_t parent, cfdata_t cf, void *aux)
{
- struct pci_attach_args *pa = aux;
+ struct pci_attach_args * const pa = aux;
if (aq_lookup(pa) != NULL)
return 1;
@@ -1242,9 +1242,9 @@ aq_match(device_t parent, cfdata_t cf, v
static void
aq_attach(device_t parent, device_t self, void *aux)
{
- struct aq_softc *sc = device_private(self);
- struct pci_attach_args *pa = aux;
- struct ifnet *ifp = >sc_ethercom.ec_if;
+ struct aq_softc * const sc = device_private(self);
+ struct pci_attach_args * const pa = aux;
+ struct ifnet * const ifp = >sc_ethercom.ec_if;
pci_chipset_tag_t pc;
pcitag_t tag;
pcireg_t command, memtype, bar;
@@ -1545,13 +1545,13 @@ aq_attach(device_t parent, device_t self
static int
aq_detach(device_t self, int flags __unused)
{
- struct aq_softc *sc = device_private(self);
- struct ifnet *ifp = >sc_ethercom.ec_if;
- int i, s;
+ struct aq_softc * const sc = device_private(self);
+ struct ifnet * const ifp = >sc_ethercom.ec_if;
+ int i;
if (sc->sc_iosize != 0) {
if (ifp->if_softc != NULL) {
- s = splnet();
+ const int s = splnet();
aq_stop(ifp, 0);
splx(s);
}
@@ -2623,7 +2623,7 @@ aq_set_mac_addr(struct aq_softc *sc, int
static int
aq_set_capability(struct aq_softc *sc)
{
- struct ifnet *ifp = >sc_ethercom.ec_if;
+ struct ifnet * const ifp = >sc_ethercom.ec_if;
int ip4csum_tx =
((ifp->if_capenable & IFCAP_CSUM_IPv4_Tx) == 0) ? 0 : 1;
int ip4csum_rx =
@@ -2689,8 +2689,8 @@ aq_set_capability(struct aq_softc *sc)
static int
aq_set_filter(struct aq_softc *sc)
{
- struct ifnet *ifp = >sc_ethercom.ec_if;
- struct ethercom *ec = >sc_ethercom;
+ struct ifnet * const ifp = >sc_ethercom.ec_if;
+ struct ethercom * const ec = >sc_ethercom;
struct ether_multi *enm;
struct ether_multistep step;
int idx, error = 0;
@@ -2752,7 +2752,7 @@ aq_set_filter(struct aq_softc *sc)
static int
aq_ifmedia_change(struct ifnet * const ifp)
{
- struct aq_softc *sc = ifp->if_softc;
+ struct aq_softc * const sc = ifp->if_softc;
aq_link_speed_t rate = AQ_LINK_NONE;
aq_link_fc_t fc = AQ_FC_NONE;
aq_link_eee_t eee = AQ_EEE_DISABLE;
@@ -2802,7 +2802,7 @@ aq_ifmedia_change(struct ifnet * const i
static void
aq_ifmedia_status(struct ifnet * const ifp, struct ifmediareq *ifmr)
{
- struct aq_softc *sc = ifp->if_softc;
+ struct aq_softc * const sc = ifp->if_softc;
/* update ifm_active */
ifmr->ifm_active = IFM_ETHER;
@@ -3246,8 +3246,8 @@ aq_hw_l3_filter_set(struct aq_softc *sc)
static void
aq_set_vlan_filters(struct aq_softc *sc)
{
- struct ethercom *ec = >sc_ethercom;
- struct ifnet *ifp = >sc_ethercom.ec_if;
+ struct ethercom * const ec = >sc_ethercom;
+ struct ifnet * const ifp = >sc_ethercom.ec_if;
struct vlanid_list *vlanidp;
int i;
@@ -3352,7 +3352,7 @@ aq_hw_init(struct aq_softc *sc)
static int
aq_update_link_status(struct aq_softc *sc)
{
- struct ifnet *ifp = >sc_ethercom.ec_if;
+ struct ifnet * const ifp = >sc_ethercom.ec_if;
aq_link_speed_t rate = AQ_LINK_NONE;
aq_link_fc_t fc = AQ_FC_NONE;
aq_link_eee_t eee = AQ_EEE_DISABLE;
@@ -4214,9 +4214,9 @@ aq_encap_txring(struct aq_softc *sc, str
static int
aq_tx_intr(void *arg)
{
- struct aq_txring *txring = arg;
- struct aq_softc *sc = txring->txr_sc;
- struct ifnet *ifp = >sc_ethercom.ec_if;
+ struct aq_txring * const txring = arg;
+ struct aq_softc * const sc = txring->txr_sc;
+ struct ifnet * const ifp = >sc_ethercom.ec_if;
struct mbuf *m;
const int ringidx = txring->txr_index;
unsigned int idx, hw_head, n = 0;
@@ -4273,9 +4273,9 @@ aq_tx_intr(void *arg)
static int
aq_rx_intr(void *arg)
{
- struct aq_rxring *rxring = arg;
- struct aq_softc *sc = rxring->rxr_sc;
- struct ifnet *ifp = >sc_ethercom.ec_if;
+ struct aq_rxring * const rxring = arg;
+ struct aq_softc * const sc = rxring->rxr_sc;
+ struct ifnet * const ifp = >sc_ethercom.ec_if;
const int ringidx =
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Thu Sep 8 07:05:42 UTC 2022 Modified Files: src/sys/dev/pci: if_aq.c Log Message: Sprinkle const. Same binary before and after. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_aq.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/i386/i386
Module Name:src Committed By: knakahara Date: Thu Sep 8 06:57:44 UTC 2022 Modified Files: src/sys/arch/i386/i386: lock_stubs.S spl.S Log Message: Fix PR port-i386/57000 (boot failure on qemu). To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/i386/lock_stubs.S cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/i386/spl.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/lock_stubs.S diff -u src/sys/arch/i386/i386/lock_stubs.S:1.37 src/sys/arch/i386/i386/lock_stubs.S:1.38 --- src/sys/arch/i386/i386/lock_stubs.S:1.37 Wed Sep 7 00:40:18 2022 +++ src/sys/arch/i386/i386/lock_stubs.S Thu Sep 8 06:57:44 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.37 2022/09/07 00:40:18 knakahara Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.38 2022/09/08 06:57:44 knakahara Exp $ */ /*- * Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.37 2022/09/07 00:40:18 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.38 2022/09/08 06:57:44 knakahara Exp $"); #include "opt_lockdebug.h" @@ -255,10 +255,10 @@ END(mutex_spin_enter) #ifndef XENPV /* - * Release a spin mutex and post a store fence. Must occupy 96 bytes. + * Release a spin mutex and post a store fence. Must occupy 128 bytes. */ ENTRY(mutex_spin_exit) - HOTPATCH(HP_NAME_MUTEX_EXIT, 96) + HOTPATCH(HP_NAME_MUTEX_EXIT, 128) movl 4(%esp), %edx movl CPUVAR(MTX_OLDSPL), %ecx incl CPUVAR(MTX_COUNT) @@ -284,7 +284,7 @@ STRONG_ALIAS(mutex_spin_exit, i686_mutex /* * Patch for i686 CPUs where cli/sti is prohibitively expensive. - * Must be the same size as mutex_spin_exit(), that is, 96 bytes. + * Must be the same size as mutex_spin_exit(), that is, 128 bytes. */ ENTRY(i686_mutex_spin_exit) mov 4(%esp),%edx Index: src/sys/arch/i386/i386/spl.S diff -u src/sys/arch/i386/i386/spl.S:1.56 src/sys/arch/i386/i386/spl.S:1.57 --- src/sys/arch/i386/i386/spl.S:1.56 Wed Sep 7 00:40:18 2022 +++ src/sys/arch/i386/i386/spl.S Thu Sep 8 06:57:44 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: spl.S,v 1.56 2022/09/07 00:40:18 knakahara Exp $ */ +/* $NetBSD: spl.S,v 1.57 2022/09/08 06:57:44 knakahara Exp $ */ /* * Copyright (c) 1998, 2007, 2008, 2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.56 2022/09/07 00:40:18 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.57 2022/09/08 06:57:44 knakahara Exp $"); #include "opt_ddb.h" #include "opt_spldebug.h" @@ -72,11 +72,11 @@ END(splraise) * void spllower(int s); * * spllower() for i486 and Pentium. Must be the same size as cx8_spllower(), - * that is, 64 bytes. This must use pushf/cli/popf as it is used early in boot + * that is, 96 bytes. This must use pushf/cli/popf as it is used early in boot * where interrupts are disabled via eflags/IE. */ ENTRY(spllower) - HOTPATCH(HP_NAME_SPLLOWER, 64) + HOTPATCH(HP_NAME_SPLLOWER, 96) #ifdef SPLDEBUG movl 4(%esp),%ecx pushl %ebp @@ -115,7 +115,7 @@ STRONG_ALIAS(spllower, cx8_spllower) * * spllower() optimized for Pentium Pro and later, which have long pipelines * that will be stalled by pushf/cli/popf. Must be the same size as - * spllower(), ie 64 bytes. Does not need to restore eflags/IE as is patched + * spllower(), ie 96 bytes. Does not need to restore eflags/IE as is patched * in once autoconf is underway. * * For cmpxchg8b, edx/ecx are the high words and eax/ebx the low.
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: knakahara Date: Thu Sep 8 06:57:44 UTC 2022 Modified Files: src/sys/arch/i386/i386: lock_stubs.S spl.S Log Message: Fix PR port-i386/57000 (boot failure on qemu). To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/i386/lock_stubs.S cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/i386/spl.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
