make(1): fix previous commit for parse_debug_options

(rillig)

make(1): reduce code size of parse_debug_options

Each access to a global variable requires a relocation.  Skip these.

(rillig)

This file is #define<space>

(skrll)

make(1): add test for passing MAKEFLAGS to sub-makes

(rillig)

Avoid reading unexpected makefiles

(sjg)

make(1): fix test varmod-to-abs with USE_ABSOLUTE_TESTNAMES=yes

When running the tests with specifying absolute filenames, it doesn't
make sense to prefix the MAKEFILE with "./", which made the tests fail on
FreeBSD.

(rillig)

Avoid problem with /usr/obj

(sjg)

Commit the ZFS file that I forgot in this previous commit:

Move the handling of PG_PAGEOUT from uvm_aio_aiodone_pages() to
uvm_page_unbusy() so that all callers of uvm_page_unbusy() don't need to
handle this flag separately.  Split out the pages part of uvm_aio_aiodone()
into uvm_aio_aiodone_pages() in rump just like in the real kernel.
In ZFS functions that can fail to copy data between the ARC and VM pages,
use uvm_aio_aiodone_pages() rather than uvm_page_unbusy() so that we can
handle these "I/O" errors.  Fixes PR 55702.

(chs)

Use "efi" boot image platform ID.

(jmcneill)

Add "efi" as a supported boot image type and derive the platform ID for
the validation entry from the default boot image instead of hard-coding
X86.

(jmcneill)

make(1): switch cache for realpath from GNode to HashTable

An unintended side effect from the GNode implementation was that the
variable modifier :tA and the other places where cached_realpath are
used could be affected by setting a variable in the global scope,
thereby "redirecting" absolute paths to completely unrelated but
existing paths.

Another unintended side effect was that filenames containing a dollar
sign would not be resolved correctly since the dollar sign would be
expanded as a variable expression by Var_Set.

While here, the debugging output for the realpath cache has been
adjusted to the standard behavior.  Previously, when a new entry was
added to the cache, this was logged for the module VAR, as a side effect
of calling Var_Set, but only if the preprocessor macro
DEBUG_REALPATH_CACHE was defined at compilation time.  When relative
paths were purged from the cache because the current directory changed
and logging for the DIR module was active, the log output went directly
to stderr instead of the usual opts.debug_file.  This deviation from the
standard behavior was probably not intended as well.

All logging concerning the realpath cache now goes into the standard
debug log file and is controlled by the -dd option, not -dv.

(rillig)

make(1): add tests for the command line option -C

(rillig)

make(1): document the -S option

This option has been available at least since 1993-03-21, and for the
same time it has been undocumented.

(rillig)

make(1): document since when the -C option is available

(rillig)

make(1): fix trailing whitespace in usage (since 2009-08-27)

(rillig)

make(1): don't modify progname in usage

(rillig)

make(1): replace a few HashTable_CreateEntry with HashTable_Set

Instead of HashTable_CreateEntry and HashEntry_Set, several places just
need the HashEntry for storing a value in it.  This makes the calling
code simpler to understand.

These parts of the code are already hard enough to understand since they
are about memory management and aliasing.  Having a too detailed API for
the HashTable only distracts from these topics.

(rillig)

PR/55802: Andreas Gustafsson: Unbreak reproducible builds.

For reproducible builds to work we need to have a consistent command
line (because the command line gets recorded in dwarf). So we can't
do:

    -ffile-prefix-map=/joe/random/src=/usr/src

because then /joe/random/src gets recorded. We do instead:

    -ffile-prefix-map=\$NETBSDSRCDIR=/usr/src

The patch restores the environment variable parsing that got lost
in the last 2 gcc upgrades.

(christos)

New sentence, new line.
Other whitespace fixes, and some Xr fixes.

(wiz)

Add "x86" to Dt

(wiz)

make(1): inline local variable in Dir_UpdateMTime

Now that the signature of cached_stats is cleaned up, the line is short
enough to contain the whole condition.

(rillig)

make(1): remove redundant struct make_stat

In the cache for stat(2) and lstat(2), only one of the two timestamps
was ever used.  To prevent a result from stat(2) leaking into the cache
for lstat(2), there have been two completely separate caches all the
time.  Using different fields in the struct was therefore unnecessary.

By removing the redundant field, the internal struct in the cache is the
same as the external struct.  This makes one of them redundant, thus
struct make_stat has been renamed to cached_stat, which better describes
its purpose, and the internal struct cache_st has been removed.

Just as before, the cache prevents any direct access to its internal
data.  When passing it to the caller, it is copied.

Just as before, the field names of struct cached_stat cannot correspond
to those from struct stat, since the latter are often defined as macros.
Therefore they are prefixed with cst instead of st.

The redundancy had been added on 2020-06-05.

(rillig)

make(1): add test for undocumented path-to-abspath mapping for :tA

(rillig)

make(1): clean up Fatal

Use the shortest possible scope between va_start and the corresponding
va_end.

(rillig)

make(1): clean up InitDefSysIncPath

Flipping the arguments to strncmp puts the subject first in the
sentence. Inverting the condition makes the code flow easier to follow.

(rillig)

make(1): use progname instead of hard-coded 'make' in warning

This only affects the warning that chdir to objdir failed.  In sub-makes
the progname includes the [n], allowing to narrow down the actual cause
of the problem.

(rillig)

make(1): remove redundant parameter from str2Lst_Append

(rillig)

make(1): rename Main_SetVarObjdir to SetVarObjdir

Only exported functions should be prefixed with the module name.

(rillig)

make(1): add tests for edge cases in parsing the command line

(rillig)

make(1): use different style of accessing characters in MainParseArgs

The * is preferred for iterators.  Since argv[i] is not an iterator but
a fixed string, argv[i][0] expresses the idea "read the first character"
more directly.

(rillig)

make(1): clean up JobExec, JobStart, JobDoOutput

The comments about temporary files for shell output are no longer
relevant since the output is always handled via pipes.

(rillig)

make(1): remove indentation in JobOutput

(rillig)

Add option -n to print only the value of a sensor.
If statistics are selected with -T, then also display max, min and average.
The empty line between each display is skipped when one or more sensors are
selected with -s.

(mlelstv)

make(1): clean up comment above ParseDoDependencyTargetSpecial

(rillig)

make(1): rename DEFAULT to defaultNode

In C, uppercase names are typically used for constants, and this is not
a constant.

(rillig)

make(1): use stderr for error message about failed touch

Error messages belong on stderr, not stdout.  Since at least 1993,
stdout had been used for no good reason.  Plus, in all these years,
nobody ever tested this code path since otherwise the missing newline at
the end of the error message would have been obvious.

This is a good candidate for the "oldest bug in make" trophy.

(rillig)

Ticket #1130

(martin)

Pull up following revision(s) (requested by fair in ticket #1130):

sys/sys/param.h: revision 1.679
sys/conf/param.c: revision 1.69
sys/kern/init_main.c: revision 1.533

Set a better default for MAXFILES on larger RAM machines if not
otherwise specified the kernel config file.  Arbitary numbers are
20,000 files for 16GB RAM or more and 10,000 files for 1GB RAM or
more.

TODO: Adjust this and other values totally dynamically.

(martin)

make(1): add test for the -t option in jobs mode

(rillig)

make(1): fix debug output for GNode details

(rillig)

make(1): use symbolic names in debug output of GNodes

(rillig)

make(1): clean up Job_Touch

Several more outdated comments were removed.  To compensate for that,
several new comments mark places where errors are not properly
propagated.

(rillig)

make(1): add test for touching a .MAKE target

(rillig)

make(1): add test for the command line option -t

(rillig)

make(1): rename JobClose to JobClosePipes, remove confusing comments

The comments referred to w_status, which had been there in 1993, but not
anymore.  Several other details were outdated as well.

(rillig)

make(1): fix grammar: setup -> set up

(rillig)

make(1): test ignoring errors from shell commands in jobs mode

(rillig)

make(1): replace macro DBPRINTF with JobPrintln

This macro had been bad in several ways.  Its name started with DB, an
unnecessary abbreviation for DEBUG.  Many places that used this macro
used it with the same format string, "%s\n".  This format string can
better be expressed in a function name, JobPrintln.

Only in a few places was the macro used with different format strings.
The one for "set -x" was even forced to arbitrarily separate the
argument from the format string in order to match the expected macro
parameters.

A better choice would have been to use the standard form "%s\n", "set
-x" from the beginning.  Anyway, that call is calling JobPrintln as well
now.

The remaining templates are user-specified, and if anyone should ever
define a completely custom shell with echo handling and error handling
enabled, they will easily crash make when the templates don't contain
exactly one %s conversion.  That's the responsibility of the user, and
it has always been.

(rillig)

Improve dump_trapframe output layout and fix printing of s6/s7

(skrll)

Ticket #1131

(martin)

Pull up following revision(s) (requested by hannken in ticket #1131):

sys/coda/coda_vnops.c: revision 1.114 (patch)
sys/coda/coda.h: revision 1.21 (patch)

Rewrite coda_readdir() to directly process the container file.

Passing this operation down to the file system holding the container
cannot work for anything but UFS and UFS doesn't allow reading
directory from a plain file since ~2015.

Fixes PR kern/55775 Coda client, its in-kernel part, opens wrong files ...

(martin)

Ticket #1622

(martin)

Pull up following revision(s) (requested by hannken in ticket #1622):

sys/coda/coda_vnops.c: revision 1.114 (patch)
sys/coda/coda.h: revision 1.21 (patch)

Rewrite coda_readdir() to directly process the container file.

Passing this operation down to the file system holding the container
cannot work for anything but UFS and UFS doesn't allow reading
directory from a plain file since ~2015.

Fixes PR kern/55775 Coda client, its in-kernel part, opens wrong files ...

(martin)

make(1): rename JobState to JobStatus

The status is only part of the whole state of a job.

(rillig)

Allow to select raw output for a single device or a list of sensors.

(mlelstv)

make(1): remove redundant parameter from cached_stats

The hash table for the cached data depends only on the passed flags,
therefore the caller does not need to know about their existence.

(rillig)

Rewrite coda_readdir() to directly process the container file.

Passing this operation down to the file system holding the container
cannot work for anything but UFS and UFS doesn't allow reading
directory from a plain file since ~2015.

Fixes PR kern/55775 Coda client, its in-kernel part, opens wrong files ...

(hannken)

Add coda_pathconf() always returning EINVAL.

(hannken)

Respect "lktype" in all paths in coda_root().

(hannken)

make(1): clean up cached_stats

No functional change.

(rillig)

For raw output (-x) allow to extract individual properties like drvctl -p.
E.g.

# envstat -x /vcmbox0/0/cur-value
328150000

(mlelstv)

Remove RO_OBJDIR when done

(sjg)

make(1): clarify what 'recently' means in the comments in dir.c

(rillig)

make(1): fix typo in comments

This typo may have been influenced by all the '$' in the code.

(rillig)

make(1): flatten Dir_InitCur

(rillig)

also check MKX11FONTS before installing fonts.

(mrg)

malloc(9) -> kmem(9)

(thorpej)

make(1): clean up preprocessor macros in InitVarMachine

(rillig)

Sync with xorg-server: Fix typo in comment.

(tsutsui)

Fix typo in comment.

(tsutsui)

Disable all entropy checks for now untill consensus has been found how
to properly deal with it.

(martin)

Add new make unit-test

(sjg)

Needs bsd.own.mk for MKX11.

(maya)

ossaudio(3): Clone some useful behaviour from the Solaris kernel

Both SNDCTL_DSP_SPEED and SNDCTL_DSP_CHANNELS support a special value
0 to "query the configured value without changing it". In our case,
this actually means setting and querying the hardware rate.

I don't know if OSSv3 or FreeBSD or other implementations also do this.
But it seems safe and sensible to support.

(nia)

make(1): in lint mode, check for ".else <cond>"

(rillig)

make(1): add more tests for parsing .else with argument

(rillig)

add rcsid, make font conditional on MKX11.

(maya)

make(1): flatten #ifdef in InitVarMachineArch

Without proper indentation, that chain of nested #ifndef directives was
really hard to read.

(rillig)

make(1): use bitset for IfState

Previously, the individual IfStates contained redundant information,
which was apparent in the documentation.  This led to expressions like
(state > ELSE_ACTIVE) that are hard to read since the reader has to look
up the order of the enum.

To avoid this, the state of an '.if' block is now encoded using a bitset,
encoding the properties of each state directly.  This replaces the
previous (state > ELSE_ACTIVE) with !(state & IFS_ACTIVE), which is
easier to understand.

No change in behavior.

(rillig)

make(1): replace large switch with if-else in Cond_EvalLine

(rillig)

make(1): move the comment about ".else <cond>" to the correct place

(rillig)

Fix a bug that some advertise speeds can't be set with hw.ixgN.advertise_speed
if both 2.5G and 5G are set. Fix the error message, too.

(msaitoh)

Fix typo in a debug message.

(msaitoh)

add a rendering of the Liberation Mono font for console use

(macallan)

Use explicit MAKEOBJDIR to avoid tripping over /usr/obj

(sjg)

Pass a writable flag to Main_SetObjdir to control writable check

For curdir and an explicit .OBJDIR target, we allow for
the directory to be read-only.
During InitObjdir we otherwise default to requiring objdir to be
writable - this can be controlled by env variable
MAKE_OBJDIR_CHECK_WRITABLE

Add unit-tests/objdir-writable

Reviewed by: christos rillig

(sjg)

make(1): add test for missing check on .endif with arguments

(rillig)

Hook up font-liberation-ttf to the build.

license ok'd by board.

(maya)

make(1): improve readability of IfState documentation

The words "None" and "One" looked and sounded too similar.

(rillig)

Add the generated TTF files from font-liberation-ttf

This was done using the pkgsrc package.
The build is simple enough that we can add our own generation target, but
duplicating the generation logic will probably make updates annoying.

(maya)

Avoid common symbols. Use __dead.

(joerg)

Don't use static buffers to store format strings; this is a multi-threaded
program and if we print from multiple threads we can end up overwriting the
formats while printf is formating and that can end up in tears.

(christos)

make(1): avoid race condition in test opt-debug-jobs

Thanks sjg for finding this and suggesting the fix.

(rillig)

make(1): rename local variable in Cond_EvalLine

A variable called line is not supposed to be a moving target, that's what
the name p is reserved for.

(rillig)

make(1): remove complicated code to find the definition for plain .if

(rillig)

make(1): document IfState in more detail

(rillig)

make(1): move test for missing space after .if to correct file

(rillig)

make(1): add test for missing space after .if directive

(rillig)

eliminate direct use of _res for threaded programs.

(christos)

Revert addition of pthread dependency on sqlite.

It is less trivial than expected and introduced some surprising breakage.

(nia)

PR kern/55779:

restore non-desctructive guarantee of ip_mforward() mbuf
argument. This avoids generation invalid UDP checksums
on multicast packets in ip_output().

XXX the root cause of the misguided fix in 2008 should be
XXX investigated

(kardel)

Note better kern.maxfiles defaults.

(simonb)

Fix typo in comment

(jmcneill)

make(1): clean up Cond_EvalLine

The constant MAXIF was not a maximum but an initial capacity.  Inline it
to remove the misleading name.  Likewise, MAXIF_BUMP was an unnecessary
and wrong name.

Rename the enum since it only describes a single state, not multiple.

Rename the stack of states since it describes multiple states, not one.

Add markers where to add the missing error messages for unknown
directives or extraneous cond, such as in ".else cond" or ".endif cond".

(rillig)

Set a better default for MAXFILES on larger RAM machines if not
otherwise specified the kernel config file.  Arbitary numbers are
20,000 files for 16GB RAM or more and 10,000 files for 1GB RAM or
more.

TODO: Adjust this and other values totally dynamically.

(simonb)

One more catch up with ``aarch64 is not mips'' change.
Fix evbarm-aarch64 build.

(rin)

If neither COMPAT_NETBSD32 nor MODULAR is defined, there's
no chance for lwp to be running under COMPAT_NETBSD32.

Suggested by mrg.

(rin)

pq3pci_msi_claim(): remove KASSERT that is valid when allocating MSI
vectors, while apparently invalid when freeing them.

(rin)

make(1): fix tests varmod-defined and varmod-loop regarding dollars

Some derived versions of NetBSD's make set .MAKE.SAVE_DOLLARS to no.  In
these versions, running the tests would fail.  Therefore better set
.MAKE.SAVE_DOLLARS to yes explicitly as far as necessary.

Suggested by sjg.

(rillig)

Oops, forget to commit local change necessary to support nvme(4) on RB800;
provide pci_intr_setattr(9) (no-op).

(rin)

make(1): add test for unhandled parse error in :? variable modifier

(rillig)

Comment out debugging build (it still randomly crashes though) pointed out
by wiz

(christos)

Add /var/games/warp

(christos)

Add /var/games/warp

(christos)

use strchr, strrchr, random, more lint removal, savefile in /var/games/warp
not /usr/share/games/warp...

(christos)

no need for -lcompat

(christos)

wg: Sprinkle #ifdef INET6.  Avoid unconditional use of ip6 structs.

Fixes no-INET6 build.

Based on patch from Brad Spencer:

https://mail-index.NetBSD.org/current-users/2020/11/11/msg039883.html

(riastradh)

- use termios
- enable setgid games
- enable savedir

(christos)

Fix the old leftover license note

Larry Wall: "I outgrew commercial-free licensing about 30 years ago."

(kamil)

make(1): document non-obvious special case in EvalNotEmpty

(rillig)

make(1): add tests demonstrating bugs in TryParseNumber and EvalNotEmpty

(rillig)

make(1): add test to cover the If_Eval call in EvalNotEmpty

(rillig)

make(1): fix line numbers in test cond-token-string

(rillig)

kmem_cache_create()'s "name" parameter can be on the stack,
so make a copy of it rather than keeping a pointer to it.

(chs)

remove error(1) comments

(christos)

Antivaxer support.

(christos)

can't have config.h and config.H in case-preserving but case-folding file-systems.

(christos)

don't segv if the terminal is too big.

(christos)

pray-tell where are you trying to write?

(christos)

Time warp forward 34 years so that it compiles (but not work)

(christos)

make(1): remove unreachable code from CondParser_String

The code that has been removed was not reachable from after the Var_Parse
call.  All branches after the Var_Parse are either freed properly or
return the expanded value.

(rillig)

make(1): add more tests for parsing .if directives

The details of parsing are quite tricky and not documented in the manual
page.  Record the current behavior to be a little safer in future
refactorings.

(rillig)

Reintroduce the support of MKCATPAGES

Requested by <mrg>

(kamil)

Test (epp->ep_esch->es_emul != &emul_netbsd) instead of
(epp->ep_esch->es_emul == &emul_netbsd32) to determine whether curlwp is
running on COMPAT_NETBSD32 or not.

The former is possible even if COMPAT_NETBSD32 is not built in the main
kernel. Now, compat_netbsd32 module can work on !COMPAT_NETBSD32 kernel.

Discussed with pgoyette.

XXX
Apply similar fixes, i.e., drop ``#ifdef COMPAT_NETBSD32'' conditional
codes from the rest parts of MD codes for aarch64 and mips64.

(rin)

Stop turning on EABI flag to core files dumped by OABI binaries.
This seems a bug introduced in rev 1.5:

http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/arm/arm/core_machdep.c#rev1.5

(rin)

make(1): fix error message when parsing unknown .if (since 2005-05-01)

(rillig)

rock_ridge_move_count is only incremented and can never be negative so change
%08i to %08u.
This removes a warning when compiling with tools outside ./build.sh

(reinoud)

make(1): add tests for parsing conditionals, document a parsing bug

(rillig)

make(1): add tests for edge cases in parsing conditionals

(rillig)

Catch up with aa64 is not mips change

(skrll)

Ticket #1129

(martin)

Pull up following revision(s) (requested by knakahara in ticket #1129):

tests/net/if_ipsec/t_ipsec_pfil.sh: revision 1.3
tests/net/if_ipsec/t_ipsec.sh: revision 1.11
tests/net/if_ipsec/t_ipsec_natt.sh: revision 1.4
tests/net/if_ipsec/t_ipsec_natt.sh: revision 1.5
tests/net/ipsec/t_ipsec_natt.sh: revision 1.4
tests/net/ipsec/t_ipsec_natt.sh: revision 1.5
tests/net/ipsec/common.sh: revision 1.8

Typo in error message

Refactor a little and follow new format of "npfctl list".

Fix the below ATF failures.
    - net/if_ipsec/t_ipsec_natt:ipsecif_natt_transport_null
    - net/if_ipsec/t_ipsec_natt:ipsecif_natt_transport_rijndaelcbc
    - net/ipsec/t_ipsec_natt:ipsec_natt_transport_ipv4_null
    - net/ipsec/t_ipsec_natt:ipsec_natt_transport_ipv4_rijndaelcbc
ok'ed by ozaki-r@n.o, thanks.

Fix missing "-m tranport" options.  Pointed out by k-goda@IIJ.

Using any mode SA causes unepected call path, that is,
ipsec4_common_input_cb() calls ip_input() directly instead of
ipsecif4_input().

(martin)

Remove the smap.* files

They are generated during the build.

(kamil)

Add nvme(4) and raid(4).

(rin)

Add nvme(4) and ahcisata(4).

Both work fine via miniPCIe to M.2 adapter.

(rin)

Delete trailing whitespace

(gson)

+ ./usr/share/games/warp

(kamil)

Fix typos in comment

(gson)

Add nvme(4) and raid(4).

(rin)

Integrate Warp Kit into the NetBSD build

Fix the build and make it install and run with minimal required changes.

(kamil)

make(1): document ParseEmptyArg

(rillig)

AA64 is not MIPS.

Change all KSEG references to directmap

(skrll)

make(1): remove unnecessary NULL marker from functions list

Comparing the pointer works equally well and uses less memory.

(rillig)

One more fix for big-endian machines.

Now, ld(4) at nvme(4) works perfectly for aarch64eb!

Tested on ROCKPro64 and qemu-system-aarch64.

(rin)

Revamp to the point it builds, but needs more work

(skrll)

remove someone's leftover debug printfs.

(chs)