DragonFlyBSD/src e2619a1 — sys/dev/virtual/nvmm Makefile, sys/platform/pc64/x86_64 genassym.cf

pc64,vkernel64: Prune includes in genassym.cf

In addition, remove the obsolete "opt_nfs.h" header dependency of
genassym.cf in sys/dev/virtual/nvmm/Makefile.
DeltaFile
+3-24sys/platform/vkernel64/x86_64/genassym.cf
+3-18sys/platform/pc64/x86_64/genassym.cf
+1-1sys/dev/virtual/nvmm/Makefile
+7-433 files

DragonFlyBSD/src b94dd92 — sys/kern genassym.sh, sys/platform/pc64/x86_64 genassym.cf genassym.c

Migrate to the newly imported genassym.sh and generated assym.h

* Remove the old sys/kern/genassym.sh, sys/sys/assym.h and genassym.c
  files.
* Migrate the genassym.c code to genassym.cf configs for genassym.sh.
* Update all sources to include the new generated "assym.h" instead of
  the old "assym.s".
* Update the kernel makefiles in sys/conf to call genassym.sh to
  generate "assym.h".
* Update libc to use genassym.sh to generate "asmcontext.h".
DeltaFile
+0-270sys/platform/pc64/x86_64/genassym.c
+269-0sys/platform/pc64/x86_64/genassym.cf
+0-121sys/platform/vkernel64/x86_64/genassym.c
+118-0sys/platform/vkernel64/x86_64/genassym.cf
+0-71sys/kern/genassym.sh
+0-52sys/sys/assym.h
+387-51431 files not shown
+486-62337 files

DragonFlyBSD/src 264f8eb — sys/conf kern.post.mk kmod.mk

sys/conf: Share compiler flags and rules between kernel and modules

* Move the common CFLAGS to bsd.kern.mk, and include it earlier in
  kern.pre.mk and kmod.sh, so the flags ordering in CFLAGS is mostly
  preserved.
* Clear the suffix rules and CFLAGS from <sys.mk> and explicitly define
  them in bsd.kern.mk, for use in the kernel and modules building.
DeltaFile
+39-1sys/conf/bsd.kern.mk
+6-16sys/conf/kern.pre.mk
+2-16sys/conf/kmod.mk
+0-2sys/conf/kern.post.mk
+47-354 files

DragonFlyBSD/src 0a4a8bc — sys/conf kmod.mk kern.pre.mk

sys/conf: Propapage CONF_CFLAGS (from makeoptions) to module build

Obtained-from: FreeBSD (commit 627693305a95135ca1ade92b4827e5f3c8208e61)
DeltaFile
+3-0sys/conf/kern.pre.mk
+1-0sys/conf/kmod.mk
+4-02 files

DragonFlyBSD/src f04e0bd — sys/platform/pc64/x86_64 genassym.c

pc64: Remove redundant symbol exports in genassym.c

The MSR_GSBASE, MSR_KGSBASE and MSR_FSBASE are constants defined in
<machine/specialreg.h> and can be used in assembly code, so no need to
redefine them.

Caught by the new genassym.sh, whose output has different value format
(e.g., `#define MSR_GSBASE 3221225729`) and thus caused redefinition
error in compilation.

While there, remove a few commented symbols as well.
DeltaFile
+0-9sys/platform/pc64/x86_64/genassym.c
+0-91 files

DragonFlyBSD/src 5717c5b — share/man/man5 Makefile genassym.cf.5, share/man/man8 Makefile genassym.sh.8

kernel: Import OpenBSD's genassym.sh tool

The new genassym.sh tool uses special inlined assembly code to create
the "assym.h" (ours named "assym.s") from constant C expressions.  It
will replace the current sys/kern/genassym.sh tool, which relies on
the special macros in <sys/assym.h> and a custom CC compilation, and
will help simplify the "assym.s" generation code in kern.post.mk and
kmod.mk.

I compared the genassym.sh tool in both NetBSD and OpenBSD and found
OpenBSD version is better maintained, so I chose their version.

I placed this tool in sys/tools/ directory instead of sys/kern/; I think
the former is a better location as there are already some awk tools, and
this genassym.sh will also be used by libc.
DeltaFile
+187-0sys/tools/genassym.sh
+139-0share/man/man5/genassym.cf.5
+93-0share/man/man8/genassym.sh.8
+1-0share/man/man8/Makefile
+1-0share/man/man5/Makefile
+421-05 files

DragonFlyBSD/src 9ce46dc — sys/conf kmod.mk bsd.kern.mk

sys/conf: Improve ${NORMAL_FWO} command for reuse in kmod.mk

The kmod.mk previously invented its own commands to link a firmware blob
(.fwo). Given that NORMAL_FWO is available through bsd.kern.mk, improve
it and reuse it in kmod.mk.
DeltaFile
+1-10sys/conf/kmod.mk
+7-4sys/conf/bsd.kern.mk
+8-142 files

DragonFlyBSD/src 2897023 — sys/conf bsd.kern.mk kern.post.mk

sys/conf: Clean up makefiles

* Minor logic and code simplifications.
* Remove non-existent 'freebsd/net/ifdi_if.m' from MFILES, and sort the
  list.
* Remove obsolete and commented stale contents.
* Simplify the 'hack.So' generation to save a temp file.
* Move -Wno-unused-but-set-variable out of the GCC scope as it's also
  supported by Clang.
* Style and whitespace cleanups.
DeltaFile
+53-52sys/conf/kmod.mk
+25-32sys/conf/kern.pre.mk
+24-27sys/conf/kern.post.mk
+4-4sys/conf/bsd.kern.mk
+106-1154 files

DragonFlyBSD/src f0a0671 — sys/conf kern.pre.mk, sys/platform/vkernel64/conf kern.mk

vkernel64: Move hack.So handling to kern.pre.mk

That's where the SYSTEM_OBJS is defined, so it makes it easier to
maintain.
DeltaFile
+5-1sys/conf/kern.pre.mk
+0-3sys/platform/vkernel64/conf/kern.mk
+5-42 files

DragonFlyBSD/src 5a60e0b — sys/tools genassym.sh

genassym.cf: Tweak for DragonFly

* Don't always define `_KERNEL`, which would cause trouble for libc
  where only `_KERNEL_STRUCTURES` should be defined. So just remove this
  and rely on the command to define the wanted macro.
* Don't define `offsetof` to avoid redefinition error, because our
  <sys/stdint.h> always defines this macro.
DeltaFile
+0-2sys/tools/genassym.sh
+0-21 files

DragonFlyBSD/src 80ba2b0 — sys/bus/u4b/wlan/mtwfw Makefile.inc, sys/dev/disk/isp/fw/isp_1040 Makefile

kernel: Clean up .fw decoding with ${NORMAL_FW} and <bsd.dragonfly.mk>

* Reuse ${NORMAL_FW} to replace the explicit uudecode commands.
* Use ${DF.SRCTOP} from <bsd.dragonfly.mk> to simplify the complex
  paths.
DeltaFile
+3-6sys/dev/netif/iwm/fw/Makefile.inc
+3-6sys/bus/u4b/wlan/mtwfw/Makefile.inc
+3-5sys/dev/disk/isp/fw/isp_1080_it/Makefile
+3-5sys/dev/disk/isp/fw/isp_1080/Makefile
+3-5sys/dev/disk/isp/fw/isp_1040_it/Makefile
+3-5sys/dev/disk/isp/fw/isp_1040/Makefile
+18-3224 files not shown
+96-13330 files

DragonFlyBSD/src 073055e — sys/conf kern.pre.mk kern.post.mk, sys/platform/vkernel64/conf files

sys/conf/kern.pre.mk: Move ${WERROR} into CFLAGS

Commit 40ec0564adaa677a0dab5299bdd491a2245e94a0 added -Werror to the
kernel build by adjusting config(8) to add -Werror to individual build
rules, so every source in the "files" file that uses a custom
"compile-with" rule needs a manual ${WERROR} addition.

This commit makes ${WERROR} the default by moving it to CFLAGS, and
adjust config(8) to append "-Wno-error" to the build rules if the
"nowerror" keyword is specified for a source.  As a result, all the
${WERROR} in the "files" files and in the explicit rules in makefiles
are removed.
DeltaFile
+343-343sys/conf/files
+3-10sys/conf/kern.post.mk
+1-1usr.sbin/config/mkmakefile.c
+1-1sys/platform/vkernel64/conf/files
+1-1sys/conf/kern.pre.mk
+349-3565 files

DragonFlyBSD/src 9353b8f — sys/conf kern.post.mk kern.pre.mk

sys/conf: Move COPTFLAGS and WERROR to bsd.kern.mk

* Move COPTFLAGS and WERROR to bsd.kern.mk for reusing in kern.pre.mk
  and kmod.mk.
* Adjust CFLAGS to order KCFLAGS at last, allowing it to be able to
  override some default options, because KCFLAGS is used in individual
  makefiles.
DeltaFile
+6-19sys/conf/kern.pre.mk
+7-18sys/conf/kmod.mk
+17-8sys/conf/bsd.kern.mk
+2-2sys/conf/kern.post.mk
+32-474 files

DragonFlyBSD/src 1b32850 — share/man/man5 genassym.cf.5, share/man/man8 genassym.sh.8

Update genassym.cf.5 and genassym.sh.8 man pages

* Improve markup styles.
* Adjust FILES to match ours.
* Update HISTORY to mention us.
DeltaFile
+71-63share/man/man5/genassym.cf.5
+18-14share/man/man8/genassym.sh.8
+89-772 files

DragonFlyBSD/src d37499e — etc Makefile

etc: run the sub-makes with the source tree's mk files

Pass -m ${.CURDIR}/../share/mk through .MAKEFLAGS, so the sub-makes
use the mk files from this source tree, as the top-level Makefile
already does for preinstall and upgrade, and nrelease does for
distribution.

Reviewed-by: @aly
DeltaFile
+6-0etc/Makefile
+6-01 files

DragonFlyBSD/src e4666ae — usr.bin/vi Makefile Makefile.inc, usr.bin/vi/catalog Makefile

vi: Use <bsd.dragonfly.mk> to help simplify the paths
DeltaFile
+8-10usr.bin/vi/catalog/Makefile
+2-1usr.bin/vi/vidump/Makefile
+3-0usr.bin/vi/Makefile.inc
+1-1usr.bin/vi/Makefile
+14-124 files

DragonFlyBSD/src 4ab6702 — games/fortune Makefile.inc, gnu/usr.bin/binutils227/block1 Makefile.block1

Minor cleanups to a few makefiles
DeltaFile
+4-7usr.bin/dsynth/Makefile
+1-3games/fortune/Makefile.inc
+1-2gnu/usr.bin/binutils234/block1/Makefile.block1
+1-2gnu/usr.bin/binutils227/block1/Makefile.block1
+7-144 files

DragonFlyBSD/src 587d557 — gnu/usr.bin/gdb Makefile.inc, gnu/usr.bin/gmp Makefile.inc

Use <bsd.dragonfly.mk> to simplify some complex relative paths
DeltaFile
+8-6stand/lib/Makefile
+3-1gnu/usr.bin/mpfr/Makefile
+3-1gnu/usr.bin/mpc/Makefile
+3-1gnu/usr.bin/grep/Makefile.inc
+3-1gnu/usr.bin/gmp/Makefile.inc
+3-1gnu/usr.bin/gdb/Makefile.inc
+23-113 files not shown
+31-159 files

DragonFlyBSD/src 8022d7c — lib/libc Makefile, lib/libc/gdtoa Makefile.inc

libc: Use <bsd.dragonfly.mk> to help simplify some paths
DeltaFile
+5-3lib/libc/Makefile
+2-3lib/libc/x86_64/sys/Makefile.inc
+2-2lib/libc/thread/Makefile.inc
+2-2lib/libc/gdtoa/Makefile.inc
+1-1lib/libc/sys/Makefile.inc
+1-1lib/libc/gen/Makefile.inc
+13-121 files not shown
+14-137 files

DragonFlyBSD/src fad34d1 — gnu/lib/gcc120/libstdc++ Makefile.inc, lib/librecrypto Makefile.inc

Use <bsd.dragonfly.mk> to avoid extra path checking

These makefiles need to be included by makefiles in different
directories, so the extra path existence checks are required to handle
this.  Now just use <bsd.dragonfly.mk> to simplify this.
DeltaFile
+3-7lib/librecrypto/Makefile.inc
+1-8gnu/lib/gcc120/libstdc++/Makefile.inc
+3-2lib/libz/Makefile.stand
+7-173 files

DragonFlyBSD/src 102c72d — lib/libssh Makefile.common, libexec/sftp-server Makefile

ssh: Use <bsd.dragonfly.mk> to remove the LIBSSH_RELDIR hack
DeltaFile
+6-5lib/libssh/Makefile.common
+1-2libexec/sshd-auth/Makefile
+1-2libexec/ssh-sk-helper/Makefile
+1-2libexec/ssh-pkcs11-helper/Makefile
+1-2libexec/ssh-keysign/Makefile
+1-2libexec/sftp-server/Makefile
+11-1511 files not shown
+22-3717 files

DragonFlyBSD/src 0f1ef9a — gnu/usr.bin/binutils227/block1 Makefile.block1, gnu/usr.bin/binutils227/block2 Makefile.block2

binutils: Use <bsd.dragonfly.mk> to remove the RELTOP hack
DeltaFile
+4-9gnu/usr.bin/binutils234/block2/Makefile.block2
+4-9gnu/usr.bin/binutils227/block2/Makefile.block2
+3-8gnu/usr.bin/binutils234/block3/Makefile.gld
+3-8gnu/usr.bin/binutils227/block3/Makefile.gld
+2-7gnu/usr.bin/binutils234/block1/Makefile.block1
+2-7gnu/usr.bin/binutils227/block1/Makefile.block1
+18-486 files

DragonFlyBSD/src 0dc692e — gnu/lib/gcc80 Makefile.inc, gnu/usr.bin/cc80 Makefile.inc

cc80,gcc80: Use <bsd.dragonfly.mk> to remove RELUP/TOP_PREFIX hacks
DeltaFile
+12-11gnu/usr.bin/cc80/Makefile.inc
+7-6gnu/lib/gcc80/Makefile.inc
+1-2gnu/usr.bin/cc80/support-libs/Makefile.inc
+1-2gnu/usr.bin/cc80/drivers/Makefile.inc
+1-2gnu/usr.bin/cc80/cc_tools/Makefile.inc
+0-2gnu/usr.bin/cc80/backends/guts/guts-c/Makefile
+22-2513 files not shown
+22-4619 files

DragonFlyBSD/src 3f4028c — gnu/lib/csu Makefile.csu, gnu/lib/gcc120 Makefile.inc

cc120,gcc120: Use <bsd.dragonfly.mk> to remove RELUP/TOP_PREFIX hacks

In addition, fix the "tm.h" generation in gnu/lib/csu/Makefile.csu; it
was called from .OBJDIR so the DF.SRCTOP would fail in that case.
DeltaFile
+12-11gnu/usr.bin/cc120/Makefile.inc
+7-6gnu/lib/gcc120/Makefile.inc
+1-2gnu/usr.bin/cc120/support-libs/Makefile.inc
+1-2gnu/usr.bin/cc120/drivers/Makefile.inc
+1-2gnu/usr.bin/cc120/cc_tools/Makefile.inc
+1-1gnu/lib/csu/Makefile.csu
+23-2417 files not shown
+23-5123 files

DragonFlyBSD/src 517e6a0 — share/mk Makefile bsd.README

share/mk: Add bsd.dragonfly.mk to provide source tree path variables

The include file provides the DF.SRCTOP, DF.RELDIR, DF.RELTOP and
DF.OBJTOP variables to help access the source and object trees, and thus
help avoid the complex and fragile relative paths that depend on the
location of the including makefiles.

In particular, DF.SRCTOP and DF.OBJTOP defines the absolute paths to the
source and object trees, so makefiles using these variables can be
included by any other makefiles, without hacking a variable to fix the
relative-path-based addressing. For example, gnu/usr.bin/cc120 hacks
this need with the "TOP_PREFIX" variable.

This idea is inspired by FreeBSD's SRCTOP, which is defined in
<src.sys.env.mk> and is finally included by <sys.mk>, so it becomes an
early global and can be directly used by any makefiles.  We decided to
not touch <sys.mk> but place it in a separate include file (i.e.,
<bsd.dragonfly.mk>), so any makefiles that really want these variables
must explicitly include it.  By the way, NetBSD also defines the

    [3 lines not shown]
DeltaFile
+47-0share/mk/bsd.dragonfly.mk
+20-0share/mk/bsd.README
+1-0share/mk/Makefile
+68-03 files

DragonFlyBSD/src 9d07571 — share/mk Makefile

share/mk: Sort files in Makefile
DeltaFile
+20-7share/mk/Makefile
+20-71 files

DragonFlyBSD/src 4a7aa99 — sys/kern kern_sig.c

kernel: report the sender in sigwaitinfo() and sigtimedwait()

kern_sigtimedwait() returned only si_signo.  lwpsignal() records the
sender's pid and uid in ps_frominfo[] for every signal it posts, and
sendsig() copies them into the siginfo of an SA_SIGINFO handler, but a
signal taken with sigwaitinfo() or sigtimedwait() came back with si_pid
and si_uid 0.

Bug: https://bugs.dragonflybsd.org/issues/3471
Reviewed-by: @dillon
DeltaFile
+2-0sys/kern/kern_sig.c
+2-01 files

DragonFlyBSD/src 7ee46dd — sbin/mount_fuse mount_fusefs.c

mount_fusefs(8): accept and ignore the "nempty" option

ntfs-3g mounts with "nonempty" by default and libfuse passes it to
mount_fusefs.  getmntopts() treats the leading "no" as negation and
looks up "nempty", which is not in the option table, so the mount fails
with "-o nempty: option not supported".  Add the ignore entry that
FreeBSD's mount_fusefs(8) has.

Bug: https://bugs.dragonflybsd.org/issues/3459
DeltaFile
+3-1sbin/mount_fuse/mount_fusefs.c
+3-11 files

DragonFlyBSD/src 053116c — sys/vfs/fuse fuse_vnops.c

fuse: fix a lost wakeup in the I/O helper

fuse_io_thread() slept first and drained the queue only after waking.
After draining it released helper_spin and called tsleep()
unconditionally.  fuse_vop_strategy() queues a bio under helper_spin,
drops the lock and then calls wakeup(), so a wakeup that arrived
between that final spin_unlock() and the interlock taken inside
tsleep() was lost.  The helper then slept forever with the bio queued
and the caller hung in biowait().

Hold helper_spin while checking the queue and use ssleep(), which
takes the sleep-queue interlock and drops the spinlock in one step,
so the wakeup cannot be lost.

Bug: https://bugs.dragonflybsd.org/issues/3459
DeltaFile
+4-1sys/vfs/fuse/fuse_vnops.c
+4-11 files

DragonFlyBSD/src 222a25d — sys/vfs/fuse fuse_vnops.c

fuse: honor an explicit ftruncate() size

An earlier write extension sets fnp->sizeoverride, which made
fuse_set_attr() keep the old size and ignore an explicit
ftruncate().  Clear the override for FATTR_SIZE setattrs.

Bug: https://bugs.dragonflybsd.org/issues/3459
DeltaFile
+2-0sys/vfs/fuse/fuse_vnops.c
+2-01 files